From 63fdcaf1bb7eeed16c675e4dfcc5a5019bca2240 Mon Sep 17 00:00:00 2001 From: Ali Mosajjal Date: Mon, 23 Oct 2023 10:55:20 +1300 Subject: [PATCH] autobuild fixes changed docker-compose to `docker compose` updated clickhouse version updated panel.json to work with new clickhouse version --- autobuild.sh | 26 ++++++++++++-------------- grafana/panel.json | 6 +++--- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index 41db6bf..3cb90f0 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -11,7 +11,7 @@ EOF dockercomposetemplate=$(cat < /dev/null echo -n "Checking to see if sed exists..." which sed echo -n "Checking to see if tr exists..." @@ -144,30 +142,30 @@ old_ttl_line="TTL DnsDate + INTERVAL 30 DAY -- DNS_TTL_VARIABLE" sed -i "s/$old_ttl_line/$new_ttl_line/" ./clickhouse/tables.sql echo "Starting the containers..." -docker-compose up -d +docker compose up -d echo "Waiting 20 seconds for Containers to be fully up and running " sleep 20 echo "Create tables for Clickhouse" -docker-compose exec ch /bin/sh -c 'cat /tmp/tables.sql | clickhouse-client -h 127.0.0.1 --multiquery' +docker compose exec ch /bin/sh -c 'cat /tmp/tables.sql | clickhouse-client -h 127.0.0.1 --multiquery' echo "downloading latest version of Clickhouse plugin for Grafana" -# docker-compose exec grafana /sbin/curl -L https://github.com/Vertamedia/clickhouse-grafana/releases/download/v2.4.2/vertamedia-clickhouse-datasource-2.4.2.zip -o /tmp/vertamedia-clickhouse-datasource-2.4.2.zip -# docker-compose exec grafana unzip /tmp/vertamedia-clickhouse-datasource-2.4.2.zip -d /var/lib/grafana/plugins/ -docker-compose exec grafana grafana-cli plugins install vertamedia-clickhouse-datasource +# docker compose exec grafana /sbin/curl -L https://github.com/Vertamedia/clickhouse-grafana/releases/download/v2.4.2/vertamedia-clickhouse-datasource-2.4.2.zip -o /tmp/vertamedia-clickhouse-datasource-2.4.2.zip +# docker compose exec grafana unzip /tmp/vertamedia-clickhouse-datasource-2.4.2.zip -d /var/lib/grafana/plugins/ +docker compose exec grafana grafana-cli plugins install vertamedia-clickhouse-datasource echo "restarting grafana container after plugin installation" -docker-compose restart grafana +docker compose restart grafana sleep 10 echo "Adding the datasource to Grafana" -docker-compose exec grafana /sbin/curl -H 'Content-Type:application/json' 'http://admin:admin@127.0.0.1:3000/api/datasources' --data-raw '{"name":"ClickHouse","type":"vertamedia-clickhouse-datasource","url":"http://ch:8123","access":"proxy"}' +docker compose exec grafana /sbin/curl -H 'Content-Type:application/json' 'http://admin:admin@127.0.0.1:3000/api/datasources' --data-raw '{"name":"ClickHouse","type":"vertamedia-clickhouse-datasource","url":"http://ch:8123","access":"proxy"}' echo echo "Adding the dashboard to Grafana" dashboard_json=`cat grafana/panel.json | bin/jq '{Dashboard:.} | .Dashboard.id = null'` -docker-compose exec grafana /sbin/curl -H 'Content-Type:application/json' 'http://admin:admin@127.0.0.1:3000/api/dashboards/db' --data "$dashboard_json" +docker compose exec grafana /sbin/curl -H 'Content-Type:application/json' 'http://admin:admin@127.0.0.1:3000/api/dashboards/db' --data "$dashboard_json" echo echo diff --git a/grafana/panel.json b/grafana/panel.json index e863d91..8a606f5 100755 --- a/grafana/panel.json +++ b/grafana/panel.json @@ -731,7 +731,7 @@ "datetimeLoading": false, "formattedQuery": "SELECT 0, groupArray((IP, total)) FROM (SELECT IPv4NumToString(toUInt32(SrcIP)) AS IP,
sum(c) as total FROM $table PREWHERE IPVersion=4 WHERE $timeFilter AND Server IN($ServerName) GROUP BY SrcIP order by SrcIP)", "intervalFactor": 1, - "query": "SELECT 0, groupArray((IP, total)) FROM (SELECT IPv6NumToString(toFixedString(SrcIP, 16)) AS IP,sum(c) as total FROM DNS_SRCIP_MASK PREWHERE IPVersion=4 WHERE $timeFilter GROUP BY SrcIP order by SrcIP desc limit 20)", + "query": "SELECT 0, groupArray((IP, total)) FROM (SELECT IPv6NumToString(SrcIP) AS IP,sum(c) as total FROM DNS_SRCIP_MASK PREWHERE IPVersion=4 WHERE $timeFilter GROUP BY SrcIP order by SrcIP desc limit 20)", "refId": "A", "resultFormat": "time_series", "table": "DNS_SRCIP_MASK", @@ -796,7 +796,7 @@ "datetimeLoading": false, "formattedQuery": "SELECT 0, groupArray((IP, total)) FROM (SELECT IPv6NumToString(toFixedString(unhex(hex(SrcIP)), 16)) AS IP,
sum(c) as total FROM $table PREWHERE IPVersion=6 WHERE $timeFilter AND Server IN($ServerName) GROUP BY SrcIP order by SrcIP desc limit 20)", "intervalFactor": 1, - "query": "SELECT 0, groupArray((IP, total)) FROM (SELECT IPv6NumToString(toFixedString(SrcIP, 16)) AS IP,sum(c) as total FROM DNS_SRCIP_MASK PREWHERE IPVersion=6 WHERE $timeFilter GROUP BY SrcIP order by SrcIP desc limit 20)", + "query": "SELECT 0, groupArray((IP, total)) FROM (SELECT IPv6NumToString(SrcIP) AS IP,sum(c) as total FROM DNS_SRCIP_MASK PREWHERE IPVersion=6 WHERE $timeFilter GROUP BY SrcIP order by SrcIP desc limit 20)", "refId": "A", "resultFormat": "time_series", "table": "DNS_SRCIP_MASK", @@ -1560,4 +1560,4 @@ "name": "dnsmonster", "uid": "lyxfOy-Wz", "version": 19 - } \ No newline at end of file + }