Skip to content

Upgrade to InfluxDB v2 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robinmanuelthiel wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Upgrade to InfluxDB v2 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
378bc01
Upgrade to InfluxDB v2
robinmanuelthiel Jan 13, 2025
db5295a
Update InfluxDB configuration in `demo/docker-compose.yaml`
robinmanuelthiel Jan 14, 2025
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
12 changes: 7 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,19 @@ services:
- influxdb

influxdb:
image: influxdb:1.8.3
image: influxdb:2.0
restart: always
volumes:
- influxdb:/var/lib/influxdb
ports:
- 8083:8083
- 8086:8086
environment:
- INFLUXDB_ADMIN_USER="admin"
- INFLUXDB_ADMIN_PASSWORD="password"
- INFLUXDB_DB="speedtest"
- DOCKER_INFLUXDB_INIT_MODE=setup
- DOCKER_INFLUXDB_INIT_USERNAME=admin
- DOCKER_INFLUXDB_INIT_PASSWORD=password
- DOCKER_INFLUXDB_INIT_ORG=myorg
- DOCKER_INFLUXDB_INIT_BUCKET=speedtest
- DOCKER_INFLUXDB_INIT_RETENTION=1w

speedtest:
image: robinmanuelthiel/speedtest:latest
Expand Down
48 changes: 6 additions & 42 deletions demo/dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,30 +84,11 @@
"measurement": "download",
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT mean(\"value\") FROM \"download\" WHERE $timeFilter GROUP BY time($__interval) fill(null)",
"rawQuery": false,
"query": "from(bucket: \"speedtest\")\n |> range(start: $__timeFrom, stop: $__timeTo)\n |> filter(fn: (r) => r[\"_measurement\"] == \"download\")\n |> filter(fn: (r) => r[\"_field\"] == \"value\")\n |> aggregateWindow(every: $__interval, fn: mean, createEmpty: false)\n |> yield(name: \"mean\")",
"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
" / 125000"
],
"type": "math"
}
]
],
"select": [],
"tags": []
},
{
Expand All @@ -129,28 +110,11 @@
"measurement": "upload",
"orderByTime": "ASC",
"policy": "default",
"query": "from(bucket: \"speedtest\")\n |> range(start: $__timeFrom, stop: $__timeTo)\n |> filter(fn: (r) => r[\"_measurement\"] == \"upload\")\n |> filter(fn: (r) => r[\"_field\"] == \"value\")\n |> aggregateWindow(every: $__interval, fn: mean, createEmpty: false)\n |> yield(name: \"mean\")",
"rawQuery": true,
"refId": "B",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"/125000"
],
"type": "math"
}
]
],
"select": [],
"tags": []
}
],
Expand Down
13 changes: 8 additions & 5 deletions demo/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,19 @@ services:
- influxdb

influxdb:
image: influxdb:1.8.3
image: influxdb:2.0
restart: always
volumes:
- influxdb:/var/lib/influxdb
ports:
- 8083:8083
- 8086:8086
environment:
- INFLUXDB_ADMIN_USER="admin"
- INFLUXDB_ADMIN_PASSWORD="password"
- INFLUXDB_DB="speedtest"
- DOCKER_INFLUXDB_INIT_MODE=setup
- DOCKER_INFLUXDB_INIT_USERNAME=admin
- DOCKER_INFLUXDB_INIT_PASSWORD=password
- DOCKER_INFLUXDB_INIT_ORG=myorg
- DOCKER_INFLUXDB_INIT_BUCKET=speedtest
- DOCKER_INFLUXDB_INIT_RETENTION=1w

speedtest:
image: robinmanuelthiel/speedtest:latest
Expand All @@ -37,6 +39,7 @@ services:
- DB_NAME=speedtest
- DB_USERNAME=admin
- DB_PASSWORD=password
- INFLUXDB_TOKEN=my-token
privileged: true # Needed for 'sleep' in the loop
depends_on:
- influxdb
Expand Down
12 changes: 9 additions & 3 deletions speedtest.sh
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ DB_USERNAME="${DB_USERNAME:-admin}"
DB_PASSWORD="${DB_PASSWORD:-password}"
SPEEDTEST_HOSTNAME="${SPEEDTEST_HOSTNAME}"
SPEEDTEST_SERVER_ID="${SPEEDTEST_SERVER_ID}"
INFLUXDB_TOKEN="${INFLUXDB_TOKEN:-my-token}"
INFLUXDB_ORG="${INFLUXDB_ORG:-my-org}"
INFLUXDB_BUCKET="${INFLUXDB_BUCKET:-speedtest}"

run_speedtest()
{
Expand Down Expand Up @@ -53,11 +56,14 @@ run_speedtest()
if $DB_SAVE;
then
echo "Saving values to database..."
curl -s -S -XPOST "$DB_HOST/write?db=$DB_NAME&precision=s&u=$DB_USERNAME&p=$DB_PASSWORD" \
curl -s -S -XPOST "$DB_HOST/api/v2/write?org=$INFLUXDB_ORG&bucket=$INFLUXDB_BUCKET&precision=s" \
-H "Authorization: Token $INFLUXDB_TOKEN" \
--data-binary "download,host=$HOSTNAME value=$DOWNLOAD $DATE"
curl -s -S -XPOST "$DB_HOST/write?db=$DB_NAME&precision=s&u=$DB_USERNAME&p=$DB_PASSWORD" \
curl -s -S -XPOST "$DB_HOST/api/v2/write?org=$INFLUXDB_ORG&bucket=$INFLUXDB_BUCKET&precision=s" \
-H "Authorization: Token $INFLUXDB_TOKEN" \
--data-binary "upload,host=$HOSTNAME value=$UPLOAD $DATE"
curl -s -S -XPOST "$DB_HOST/write?db=$DB_NAME&precision=s&u=$DB_USERNAME&p=$DB_PASSWORD" \
curl -s -S -XPOST "$DB_HOST/api/v2/write?org=$INFLUXDB_ORG&bucket=$INFLUXDB_BUCKET&precision=s" \
-H "Authorization: Token $INFLUXDB_TOKEN" \
--data-binary "ping,host=$HOSTNAME value=$PING $DATE"
echo "Values saved."
fi
Expand Down