Compose: updating ClickHouse and Grafana versions (#126)

* Fix bug with ClickHouse SQL configuration loading protobuf
* Add official ClickHouse datasource to Grafana

compose/kcg/clickhouse/create.sh

@@ -44,7 +44,7 @@ clickhouse client -n <<-EOSQL
         kafka_topic_list = 'flows',
         kafka_group_name = 'clickhouse',
         kafka_format = 'Protobuf',
-        kafka_schema = './flow.proto:FlowMessage';
+        kafka_schema = 'flow.proto:FlowMessage';
 
     CREATE TABLE IF NOT EXISTS flows_raw
     (

compose/kcg/docker-compose.yml

@@ -19,8 +19,9 @@ services:
     depends_on:
       - zookeeper
   grafana:
-    build: grafana
+    image: grafana/grafana:9.1.7
     environment:
+      - GF_INSTALL_PLUGINS=grafana-clickhouse-datasource
       - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=vertamedia-clickhouse-datasource
     ports:
       - 3000:3000
@@ -36,7 +37,7 @@ services:
     restart: always
     volumes:
       - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-  goflow:
+  goflow2:
     build:
       context: ../../
       dockerfile: Dockerfile
@@ -54,7 +55,7 @@ services:
     - -format=pb
     - -format.protobuf.fixedlen=true
   db:
-    image: yandex/clickhouse-server:21.5.6.6
+    image: clickhouse/clickhouse-server:22.6.9.11-alpine
     ports:
       - 8123:8123
     volumes:

compose/kcg/grafana/Dockerfile

@@ -3,6 +3,6 @@ FROM ubuntu AS builder
 RUN apt-get update && apt-get install -y git
 RUN git clone https://github.com/Vertamedia/clickhouse-grafana.git
 
-FROM grafana/grafana:7.5.7
+FROM grafana/grafana:9.1.7
 
 COPY --from=builder /clickhouse-grafana /var/lib/grafana/plugins

compose/kcg/grafana/datasources-ch.yml

@@ -21,7 +21,26 @@ datasources:
    basicAuthPassword: ''
    withCredentials: false
    isDefault: true
-   jsonData: {}
    secureJsonFields: {}
    version: 3
-   readOnly: false
+   readOnly: false
+ - name: ClickHouse-new
+   type: grafana-clickhouse-datasource
+   typeLogoUrl: ''
+   access: proxy
+   url: http://db:8123
+   password: ''
+   user: ''
+   database: ''
+   basicAuth: false
+   basicAuthUser: ''
+   basicAuthPassword: ''
+   withCredentials: false
+   isDefault: true
+   jsonData:
+     port: 8123
+     protocol: http
+     server: db
+   secureJsonFields: {}
+   version: 3
+   readOnly: false