Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ jobs:
ls -la
- name: Run test with Influx 1.8
run: cd sitespeed.io && bin/sitespeed.js https://www.sitespeed.io -n 1 --influxdb.host 127.0.0.1 --xvfb --resultBaseUrl https://result.sitespeed.io --influxdb.annotationScreenshot=true --plugins.add ../../../lib/index.js
- name: Run test with Influx 2.6.1
- name: Run test with Influx 2.7.12
run: cd sitespeed.io && bin/sitespeed.js https://www.sitespeed.io -n 1 --influxdb.host 127.0.0.1 --influxdb.port 8087 --influxdb.version 2 --influxdb.organisation sitespeed --influxdb.token sitespeed --xvfb --resultBaseUrl https://result.sitespeed.io --influxdb.annotationScreenshot=true --influxdb.functions='min,max' --plugins.add ../../../lib/index.js
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules
node_modules
/.idea/
69 changes: 57 additions & 12 deletions test/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,64 @@
version: '3'
services:
influxdb_v1.8:
image: influxdb:1.8
ports:
- '8086:8086'
environment:
influxdb_v1.8:
image: influxdb:1.8
ports:
- '8086:8086'
environment:
- INFLUXDB_DB=sitespeed
influxdb_v2.6:
image: influxdb:2.6.1
ports:
- '8087:8086'
environment:
influxdb_v2.7:
image: influxdb:2.7.12
hostname: influxdb2
ports:
- '8087:8086'
environment:
- DOCKER_INFLUXDB_INIT_MODE=setup
- DOCKER_INFLUXDB_INIT_USERNAME=sitespeed
- DOCKER_INFLUXDB_INIT_PASSWORD=sitespeed
- DOCKER_INFLUXDB_INIT_ORG=sitespeed
- DOCKER_INFLUXDB_INIT_BUCKET=sitespeed
- DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sitespeed
- DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sitespeed
volumes:
- ./influxdb-data:/var/lib/influxdb2
- ./influxdb-config:/etc/influxdb2
grafana:
image: grafana/grafana:12.2.1
ports:
- '3000:3000'
depends_on:
- influxdb_v2.7
- influxdb_v1.8
environment:
- GF_SECURITY_ADMIN_PASSWORD=sitespeed
- GF_SECURITY_ADMIN_USER=sitespeed
- DOCKER_INFLUXDB_INIT_ORG=sitespeed
- DOCKER_INFLUXDB_INIT_BUCKET=sitespeed
- DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sitespeed
volumes:
- ./grafana-storage:/var/lib/grafana
- ./grafana-provisioning/:/etc/grafana/provisioning/

minio:
image: minio/minio:latest
container_name: minio
ports:
- "9000:9000"
- "9001:9001"
environment:
MINIO_ROOT_USER: minio
MINIO_ROOT_PASSWORD: minio123
command: server /data --console-address ":9001"

createbucket:
image: quay.io/minio/mc
depends_on:
- minio
restart: on-failure
entrypoint: >
/bin/sh -c "
/usr/bin/mc alias set dockerminio http://minio:9000 minio minio123 &&
(/usr/bin/mc mb dockerminio/sitespeed-bucket/sitespeed-results || echo 'Bucket already exists') &&
/usr/bin/mc ilm rule add --expire-days 30 dockerminio/sitespeed-bucket &&
/usr/bin/mc anonymous set public dockerminio/sitespeed-bucket &&
/usr/bin/mc admin config set dockerminio compression extensions=\".html,.css,.js\" &&
echo 'MinIO and lifecycle policy setup complete.'"

10 changes: 10 additions & 0 deletions test/docker/grafana-provisioning/dashboards/dashboard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: 1
providers:
- name: "InfluxDB 2"
folder: ''
type: file
disableDeletion: false
editable: true
options:
path: /etc/grafana/provisioning/dashboards
uid: zg5kwm57z
Loading