Compose: updating ClickHouse and Grafana versions (#126)

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

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