From 6924b59e2d1d2675ca90c1321454b0b506e46d01 Mon Sep 17 00:00:00 2001 From: Ning Sun Date: Mon, 30 Sep 2024 21:13:38 -0700 Subject: [PATCH] feat: update images (#50) * chore: update greptime images * feat: update to latest greptime nightly and h3 function * chore: use same version of grafana image --- flight-data-ingester/docker-compose.yml | 2 +- .../grafana_provisioning/dashboards/map.json | 6 +++--- kafka-ingestion/docker-compose.yml | 2 +- nginx-log-metrics/docker-compose.yml | 2 +- nginx-log-metrics/grafana/Dockerfile | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flight-data-ingester/docker-compose.yml b/flight-data-ingester/docker-compose.yml index 3845bbf..941a3cf 100644 --- a/flight-data-ingester/docker-compose.yml +++ b/flight-data-ingester/docker-compose.yml @@ -1,6 +1,6 @@ services: greptimedb: - image: docker.io/greptime/greptimedb-dev:dev-20240901-1725202129-e56709b5 + image: docker.io/greptime/greptimedb:v0.10.0-nightly-20240930 command: standalone start --http-addr=0.0.0.0:4000 --rpc-addr=0.0.0.0:4001 --mysql-addr=0.0.0.0:4002 --postgres-addr 0.0.0.0:4003 ports: - 4000:4000 diff --git a/flight-data-ingester/grafana_provisioning/dashboards/map.json b/flight-data-ingester/grafana_provisioning/dashboards/map.json index 582e391..4ea13d6 100644 --- a/flight-data-ingester/grafana_provisioning/dashboards/map.json +++ b/flight-data-ingester/grafana_provisioning/dashboards/map.json @@ -154,7 +154,7 @@ "editorMode": "code", "format": "table", "rawQuery": true, - "rawSql": "select icao24, longitude, latitude, baro_altitude, geo_altitude, velocity, geohash(latitude, longitude, 7) as geohash, h3(latitude, longitude, 7) as h3 from icao24_state where icao24 = '$icao24' and $__timeFilter(ts) order by ts desc limit 500;", + "rawSql": "select icao24, longitude, latitude, baro_altitude, geo_altitude, velocity, geohash(latitude, longitude, 7) as geohash, h3_latlng_to_cell(latitude, longitude, 7) as h3 from icao24_state where icao24 = '$icao24' and $__timeFilter(ts) order by ts desc limit 500;", "refId": "A", "sql": { "columns": [ @@ -375,7 +375,7 @@ "editorMode": "code", "format": "table", "rawQuery": true, - "rawSql": "select\n ts,\n velocity as value\nfrom\n icao24_state\nwhere\n icao24 = '$icao24'\n and $__timeFilter(ts)\n and h3(latitude, longitude, $h3_resolution) = h3($lat, $lon, $h3_resolution)\norder by ts desc;", + "rawSql": "select\n ts,\n velocity as value\nfrom\n icao24_state\nwhere\n icao24 = '$icao24'\n and $__timeFilter(ts)\n and h3_latlng_to_cell(latitude, longitude, $h3_resolution) = h3_latlng_to_cell($lat, $lon, $h3_resolution)\norder by ts desc;", "refId": "A", "sql": { "columns": [ @@ -531,7 +531,7 @@ "editorMode": "code", "format": "table", "rawQuery": true, - "rawSql": "select\n ts,\n baro_altitude as value\nfrom\n icao24_state\nwhere\n icao24 = '$icao24'\n and $__timeFilter(ts)\n and h3(latitude, longitude, $h3_resolution) = h3($lat, $lon, $h3_resolution)\norder by\n ts desc;", + "rawSql": "select\n ts,\n baro_altitude as value\nfrom\n icao24_state\nwhere\n icao24 = '$icao24'\n and $__timeFilter(ts)\n and h3_latlng_to_cell(latitude, longitude, $h3_resolution) = h3_latlng_to_cell($lat, $lon, $h3_resolution)\norder by\n ts desc;", "refId": "A", "sql": { "columns": [ diff --git a/kafka-ingestion/docker-compose.yml b/kafka-ingestion/docker-compose.yml index 9ad7ec3..68d4a2e 100644 --- a/kafka-ingestion/docker-compose.yml +++ b/kafka-ingestion/docker-compose.yml @@ -68,7 +68,7 @@ services: command: "-c /config_data/vector.toml" greptimedb: - image: docker.io/greptime/greptimedb:v0.9.2 + image: docker.io/greptime/greptimedb:v0.9.3 command: standalone start --http-addr=0.0.0.0:4000 --rpc-addr=0.0.0.0:4001 --mysql-addr=0.0.0.0:4002 --postgres-addr 0.0.0.0:4003 ports: - 4000:4000 diff --git a/nginx-log-metrics/docker-compose.yml b/nginx-log-metrics/docker-compose.yml index 99b1267..13687cf 100644 --- a/nginx-log-metrics/docker-compose.yml +++ b/nginx-log-metrics/docker-compose.yml @@ -1,6 +1,6 @@ services: greptimedb: - image: docker.io/greptime/greptimedb:v0.10.0-nightly-20240805 + image: docker.io/greptime/greptimedb:v0.9.3 command: standalone start --http-addr=0.0.0.0:4000 --rpc-addr=0.0.0.0:4001 --mysql-addr=0.0.0.0:4002 --postgres-addr 0.0.0.0:4003 ports: - 4000:4000 diff --git a/nginx-log-metrics/grafana/Dockerfile b/nginx-log-metrics/grafana/Dockerfile index 1070d52..4e119cd 100644 --- a/nginx-log-metrics/grafana/Dockerfile +++ b/nginx-log-metrics/grafana/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/grafana/grafana:11.1.0 +FROM docker.io/grafana/grafana:11.2.0 RUN grafana cli --pluginUrl https://github.com/GreptimeTeam/greptimedb-grafana-datasource/releases/latest/download/info8fcc-greptimedb-datasource.zip plugins install info8fcc