From eaf913b5a10f5e98640c9540d546b8abb675ad35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Thu, 12 Oct 2023 19:15:01 +0200
Subject: [PATCH 01/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/values.yaml b/src/values.yaml
index a6fc3126..a5301fc0 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -220,15 +220,40 @@ grafana:
   #TODO: authentication
   adminUser: admin
   adminPassword: admin
+  datasources:
+    datasources.yaml:
+      apiVersion: 1
+      datasources:
+      - name: influx
+        type: influxdb
+        access: proxy
+        orgId: 1
+        url: "http://nussknacker-influxdb:8086"
+        database: nussknacker
+        basicAuth: true
+        isDefault: true
+        version: 1
+        editable: false
+        basicAuthUser: ${influxdb-user}
+        secureJsonData:
+          basicAuthPassword: ${influxdb-password}
+  dashboards:
+    default:
+      dashboard:
+        file: grafana/dashboard.json
+      dashboard:
+        file: grafana/nussknacker-lite-scenario.json
+      dashboard:
+        file: grafana/nussknacker-request-response-scenario.json
   rbac:
     create: true
     namespaced: true
     pspEnabled: false
   sidecar:
     dashboards:
-      enabled: true
+      enabled: false
     datasources:
-      enabled: true
+      enabled: false
   envFromSecret: "{{ .Release.Name }}-influxdb-auth"
   ingress:
     enabled: false

From 24bf8bb892fb9a1011b4a1a4b977eaf4dee21d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Thu, 12 Oct 2023 19:17:26 +0200
Subject: [PATCH 02/28] change grafana datasources, dashboards provisioning

---
 src/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Chart.yaml b/src/Chart.yaml
index a482b8dc..b4a69d2f 100644
--- a/src/Chart.yaml
+++ b/src/Chart.yaml
@@ -11,7 +11,7 @@ keywords:
   - stream processing
   - event stream processing
 type: application
-appVersion: 1.11.3
+appVersion: 1.11.3-SNAPSHOT
 dependencies:
   - name: postgresql
     version: ~12.1.15

From 6fcd293cd79b01f35de1a51180d16d35360c5407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 15:03:02 +0200
Subject: [PATCH 03/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/values.yaml b/src/values.yaml
index a5301fc0..ecedb6aa 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -177,7 +177,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.service.ports.client }}"
+      - "{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.service.ports.client.port }}"
 
 apicurio-registry:
   enabled: true

From 44c179f7c7d95b2462aa1409c68c381245933fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 15:06:55 +0200
Subject: [PATCH 04/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/values.yaml b/src/values.yaml
index ecedb6aa..da7a90e6 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -166,6 +166,9 @@ postgresql:
 
 zookeeper:
   enabled: true
+  service:
+    ports:
+      client: 2181
 
 kafka:
   enabled: true
@@ -177,7 +180,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.service.ports.client.port }}"
+      - "{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.service.ports.client }}"
 
 apicurio-registry:
   enabled: true

From d6a517a8963b93ac171841392ddaa2cd7ea441da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 15:12:05 +0200
Subject: [PATCH 05/28] change grafana datasources, dashboards provisioning

---
 .github/workflows/helm-test-workflow.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/helm-test-workflow.yaml b/.github/workflows/helm-test-workflow.yaml
index df360792..b317da51 100644
--- a/.github/workflows/helm-test-workflow.yaml
+++ b/.github/workflows/helm-test-workflow.yaml
@@ -48,7 +48,7 @@ jobs:
       - name: buildAll
         run: ./setup.sh
       - name: checkTemplate
-        run: helm template -f deploy-values.yaml --set "image.tag=${{env.NUSSKNACKER_VERSION}}" ${{env.CHART_SRC_DIR}}
+        run: helm template -f deploy-values.yaml --set "image.tag=${{env.NUSSKNACKER_VERSION}}" ${{env.CHART_SRC_DIR}} --debug
       - name: packageAll
         run: helm package ${{env.CHART_SRC_DIR}} -d dist --version "${{steps.setVersion.outputs.version}}"
       - name: Store target

From 6c921f4da3a8ab5fd8f956a28154b771302d1cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 15:17:15 +0200
Subject: [PATCH 06/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/values.yaml b/src/values.yaml
index da7a90e6..cdd11dc3 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -244,9 +244,9 @@ grafana:
     default:
       dashboard:
         file: grafana/dashboard.json
-      dashboard:
+      nussknacker-lite-scenario:
         file: grafana/nussknacker-lite-scenario.json
-      dashboard:
+      nussknacker-request-response-scenario:
         file: grafana/nussknacker-request-response-scenario.json
   rbac:
     create: true

From 2994af446d1df9abe91b1a6b360c1f49b89217b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 15:19:15 +0200
Subject: [PATCH 07/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/values.yaml b/src/values.yaml
index cdd11dc3..25a33250 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -166,9 +166,6 @@ postgresql:
 
 zookeeper:
   enabled: true
-  service:
-    ports:
-      client: 2181
 
 kafka:
   enabled: true
@@ -180,7 +177,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.service.ports.client }}"
+      - "{{ .Release.Name }}-zookeeper:2181"
 
 apicurio-registry:
   enabled: true

From 710bf35d9e36256a2aa9075716974e7a85433ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 15:22:20 +0200
Subject: [PATCH 08/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/values.yaml b/src/values.yaml
index 25a33250..649afa34 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -177,7 +177,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:2181"
+      - "{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.service.ports.client | int }}"
 
 apicurio-registry:
   enabled: true

From 6d8ce711363309aa720112ba682eec9579c09355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 15:52:28 +0200
Subject: [PATCH 09/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/values.yaml b/src/values.yaml
index 649afa34..110e5e62 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -177,7 +177,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.service.ports.client | int }}"
+      - "{{ .Release.Name }}-zookeeper:{{ (((.Values.zookeeper).service).ports).client }}"
 
 apicurio-registry:
   enabled: true

From 3a74995a712cb3f576254d9088c0d63e3ff35a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 15:55:02 +0200
Subject: [PATCH 10/28] change grafana datasources, dashboards provisioning

---
 .github/workflows/helm-test-workflow.yaml | 2 +-
 src/values.yaml                           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/helm-test-workflow.yaml b/.github/workflows/helm-test-workflow.yaml
index b317da51..df360792 100644
--- a/.github/workflows/helm-test-workflow.yaml
+++ b/.github/workflows/helm-test-workflow.yaml
@@ -48,7 +48,7 @@ jobs:
       - name: buildAll
         run: ./setup.sh
       - name: checkTemplate
-        run: helm template -f deploy-values.yaml --set "image.tag=${{env.NUSSKNACKER_VERSION}}" ${{env.CHART_SRC_DIR}} --debug
+        run: helm template -f deploy-values.yaml --set "image.tag=${{env.NUSSKNACKER_VERSION}}" ${{env.CHART_SRC_DIR}}
       - name: packageAll
         run: helm package ${{env.CHART_SRC_DIR}} -d dist --version "${{steps.setVersion.outputs.version}}"
       - name: Store target
diff --git a/src/values.yaml b/src/values.yaml
index 110e5e62..62f7d846 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -234,9 +234,9 @@ grafana:
         isDefault: true
         version: 1
         editable: false
-        basicAuthUser: ${influxdb-user}
+        basicAuthUser: user
         secureJsonData:
-          basicAuthPassword: ${influxdb-password}
+          basicAuthPassword: pass
   dashboards:
     default:
       dashboard:

From d89a59da9180ac7e096df29ebb3fd49ebb4eab4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 16:37:50 +0200
Subject: [PATCH 11/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/values.yaml b/src/values.yaml
index 62f7d846..13194029 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -177,7 +177,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ (((.Values.zookeeper).service).ports).client }}"
+      - "{{ .Release.Name }}-zookeeper:{{ default 2181 .Values.zookeeper.service.ports.client }}"
 
 apicurio-registry:
   enabled: true

From 0cf2c84fc301e379b848769d4f90ec194f007bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 16:39:03 +0200
Subject: [PATCH 12/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/values.yaml b/src/values.yaml
index 13194029..6843a02c 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -177,7 +177,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ default 2181 .Values.zookeeper.service.ports.client }}"
+      - "{{ .Release.Name }}-zookeeper:{{ default 2181 ((.Values.zookeeper).service).ports.client }}"
 
 apicurio-registry:
   enabled: true

From 61d42c3b5e91e0e88b3ba72fbf363bfbf5db7533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 16:49:07 +0200
Subject: [PATCH 13/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/values.yaml b/src/values.yaml
index 6843a02c..2b7552b5 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -177,7 +177,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ default 2181 ((.Values.zookeeper).service).ports.client }}"
+      - "{{ .Release.Name }}-zookeeper:{{ (.Values.zookeeper.service).ports.client }}"
 
 apicurio-registry:
   enabled: true

From 86aa3d103b1bf9eec53d94f1ccb8a1cf85153f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 16:51:43 +0200
Subject: [PATCH 14/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/values.yaml b/src/values.yaml
index 2b7552b5..b6af8e4a 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -166,6 +166,9 @@ postgresql:
 
 zookeeper:
   enabled: true
+  service:
+    ports:
+      client: 2181
 
 kafka:
   enabled: true

From b29c63f2884db27de255bdf8bc75fb89529ad700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Fri, 13 Oct 2023 16:56:51 +0200
Subject: [PATCH 15/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/values.yaml b/src/values.yaml
index b6af8e4a..6d0b9a58 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -180,7 +180,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ (.Values.zookeeper.service).ports.client }}"
+      - "{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.service.ports.client }}"
 
 apicurio-registry:
   enabled: true

From f97e40b80af59f61bb8f9dada7f9b5056885b2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Mon, 16 Oct 2023 16:03:32 +0200
Subject: [PATCH 16/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/values.yaml b/src/values.yaml
index 6d0b9a58..5cb05768 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -166,9 +166,7 @@ postgresql:
 
 zookeeper:
   enabled: true
-  service:
-    ports:
-      client: 2181
+  service: {}
 
 kafka:
   enabled: true

From bb340e6536ec7e0dab06156fde3de90179fa85fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Mon, 16 Oct 2023 16:04:35 +0200
Subject: [PATCH 17/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/values.yaml b/src/values.yaml
index 5cb05768..3fdff96a 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -166,7 +166,8 @@ postgresql:
 
 zookeeper:
   enabled: true
-  service: {}
+  service:
+    ports: {}
 
 kafka:
   enabled: true

From 8dd6fe8021bbc627695aeebde675ae7b5cc60414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Mon, 16 Oct 2023 16:06:03 +0200
Subject: [PATCH 18/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/values.yaml b/src/values.yaml
index 3fdff96a..21625c2b 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -166,8 +166,6 @@ postgresql:
 
 zookeeper:
   enabled: true
-  service:
-    ports: {}
 
 kafka:
   enabled: true
@@ -179,7 +177,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ .Values.zookeeper.service.ports.client }}"
+      - "{{ .Release.Name }}-zookeeper:{{ default 2181 (.Values.zookeeper.service).ports.client }}"
 
 apicurio-registry:
   enabled: true

From c50d25fb5d1dc1ba782dfdc46a5affd421a90e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Mon, 16 Oct 2023 16:51:44 +0200
Subject: [PATCH 19/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/src/values.yaml b/src/values.yaml
index 21625c2b..8988bf4e 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -166,6 +166,9 @@ postgresql:
 
 zookeeper:
   enabled: true
+  service:
+    ports:
+      client: 2181
 
 kafka:
   enabled: true
@@ -177,7 +180,7 @@ kafka:
     enabled: false
   externalZookeeper:
     servers:
-      - "{{ .Release.Name }}-zookeeper:{{ default 2181 (.Values.zookeeper.service).ports.client }}"
+      - "{{ .Release.Name }}-zookeeper:2181"
 
 apicurio-registry:
   enabled: true
@@ -220,40 +223,15 @@ grafana:
   #TODO: authentication
   adminUser: admin
   adminPassword: admin
-  datasources:
-    datasources.yaml:
-      apiVersion: 1
-      datasources:
-      - name: influx
-        type: influxdb
-        access: proxy
-        orgId: 1
-        url: "http://nussknacker-influxdb:8086"
-        database: nussknacker
-        basicAuth: true
-        isDefault: true
-        version: 1
-        editable: false
-        basicAuthUser: user
-        secureJsonData:
-          basicAuthPassword: pass
-  dashboards:
-    default:
-      dashboard:
-        file: grafana/dashboard.json
-      nussknacker-lite-scenario:
-        file: grafana/nussknacker-lite-scenario.json
-      nussknacker-request-response-scenario:
-        file: grafana/nussknacker-request-response-scenario.json
   rbac:
     create: true
     namespaced: true
     pspEnabled: false
   sidecar:
     dashboards:
-      enabled: false
+      enabled: true
     datasources:
-      enabled: false
+      enabled: true
   envFromSecret: "{{ .Release.Name }}-influxdb-auth"
   ingress:
     enabled: false

From e9f48e1b9f148166b374b3afaaa9b3221964e6a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Mon, 16 Oct 2023 16:53:34 +0200
Subject: [PATCH 20/28] change grafana datasources, dashboards provisioning

---
 src/values.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/values.yaml b/src/values.yaml
index 8988bf4e..c298f562 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -205,6 +205,10 @@ flink:
     numberOfTaskSlots: 3
   jobmanager:
     statefulset: true
+  zookeeper:
+    service:
+      ports:
+        client: 2181
 #  prometheus:
 #    serviceMonitor:
 #      enabled: false

From e283d912842e63a9769f6fc5637bbf03e8f53500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Mon, 16 Oct 2023 17:32:03 +0200
Subject: [PATCH 21/28] change grafana datasources, dashboards provisioning

---
 src/Chart.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Chart.yaml b/src/Chart.yaml
index b4a69d2f..f85109c4 100644
--- a/src/Chart.yaml
+++ b/src/Chart.yaml
@@ -25,6 +25,7 @@ dependencies:
     version: ~11.0.3
     repository: "@bitnami"
     condition: zookeeper.enabled
+    alias: zookeeper_external
   - name: apicurio-registry
     repository: "@touk"
     version: ~0.1.5

From 144d9d4531408515f48e8194367a7f65b57127bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Mon, 16 Oct 2023 17:47:34 +0200
Subject: [PATCH 22/28] update zookeeper external config

---
 src/Chart.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Chart.lock b/src/Chart.lock
index e7505b89..7debf794 100644
--- a/src/Chart.lock
+++ b/src/Chart.lock
@@ -16,12 +16,12 @@ dependencies:
   version: 0.2.0
 - name: grafana
   repository: https://grafana.github.io/helm-charts
-  version: 6.59.4
+  version: 6.60.6
 - name: influxdb
   repository: https://helm.influxdata.com/
   version: 4.12.5
 - name: telegraf
   repository: https://helm.influxdata.com/
-  version: 1.8.34
-digest: sha256:a4235f4aca5b0785f910bc33cb813604cab949729753b88fb095814524fe269c
-generated: "2023-09-13T10:29:02.122496096+02:00"
+  version: 1.8.35
+digest: sha256:8442dbfd35216a15e2929c58ebc8c159d76210b35c85faf6c24d4195a59eeb61
+generated: "2023-10-16T17:46:33.453858+02:00"

From 6377bebc262faf9006813106c44ea7aadf05efc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Mon, 16 Oct 2023 17:55:29 +0200
Subject: [PATCH 23/28] update zookeeper external config

---
 src/Chart.lock | 4 ++--
 src/Chart.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Chart.lock b/src/Chart.lock
index 7debf794..5a42dae2 100644
--- a/src/Chart.lock
+++ b/src/Chart.lock
@@ -23,5 +23,5 @@ dependencies:
 - name: telegraf
   repository: https://helm.influxdata.com/
   version: 1.8.35
-digest: sha256:8442dbfd35216a15e2929c58ebc8c159d76210b35c85faf6c24d4195a59eeb61
-generated: "2023-10-16T17:46:33.453858+02:00"
+digest: sha256:05f1bc522e61aa06cb7d70732143ffabf828169aa93b61cc494992f044952203
+generated: "2023-10-16T17:53:49.672861+02:00"
diff --git a/src/Chart.yaml b/src/Chart.yaml
index f85109c4..ca1b0c63 100644
--- a/src/Chart.yaml
+++ b/src/Chart.yaml
@@ -25,7 +25,7 @@ dependencies:
     version: ~11.0.3
     repository: "@bitnami"
     condition: zookeeper.enabled
-    alias: zookeeper_external
+    alias: zookeeper-external
   - name: apicurio-registry
     repository: "@touk"
     version: ~0.1.5

From b7bbf5466fb8c19b49a010f07ccfe8685a76a0d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Mon, 16 Oct 2023 18:01:04 +0200
Subject: [PATCH 24/28] update zookeeper external config

---
 src/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Chart.yaml b/src/Chart.yaml
index ca1b0c63..ef12115d 100644
--- a/src/Chart.yaml
+++ b/src/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nussknacker
-version: 1.11.1-SNAPSHOT
+version: 1.11.1
 description: Nussknacker - a design, development, and deployment tool for stream processing
 home: https://nussknacker.io/
 icon: https://nussknacker.io/wp-content/uploads/2021/10/Nussknacker-short-black.svg

From b7f685ace0d279c943ab96a6a041b06efef7ea0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Mon, 16 Oct 2023 18:09:17 +0200
Subject: [PATCH 25/28] update zookeeper external config

---
 src/values.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/values.yaml b/src/values.yaml
index c298f562..8ecb9383 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -166,6 +166,8 @@ postgresql:
 
 zookeeper:
   enabled: true
+
+zookeeper-external:
   service:
     ports:
       client: 2181

From 8d9c0ac97220a7dfd2114c2d6ba610f38627067a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Tue, 17 Oct 2023 00:05:42 +0200
Subject: [PATCH 26/28] update zookeeper external config

---
 src/Chart.lock  | 4 ++--
 src/Chart.yaml  | 1 -
 src/values.yaml | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Chart.lock b/src/Chart.lock
index 5a42dae2..d4d50077 100644
--- a/src/Chart.lock
+++ b/src/Chart.lock
@@ -23,5 +23,5 @@ dependencies:
 - name: telegraf
   repository: https://helm.influxdata.com/
   version: 1.8.35
-digest: sha256:05f1bc522e61aa06cb7d70732143ffabf828169aa93b61cc494992f044952203
-generated: "2023-10-16T17:53:49.672861+02:00"
+digest: sha256:0bfbe94e721feac49cb383ff0a5a1a44bbb6e2b645e2f80725365b49fd765798
+generated: "2023-10-17T00:05:28.713913+02:00"
diff --git a/src/Chart.yaml b/src/Chart.yaml
index ef12115d..ff41a9a9 100644
--- a/src/Chart.yaml
+++ b/src/Chart.yaml
@@ -25,7 +25,6 @@ dependencies:
     version: ~11.0.3
     repository: "@bitnami"
     condition: zookeeper.enabled
-    alias: zookeeper-external
   - name: apicurio-registry
     repository: "@touk"
     version: ~0.1.5
diff --git a/src/values.yaml b/src/values.yaml
index 8ecb9383..d3309b88 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -167,11 +167,6 @@ postgresql:
 zookeeper:
   enabled: true
 
-zookeeper-external:
-  service:
-    ports:
-      client: 2181
-
 kafka:
   enabled: true
   persistence:

From 7678591b42d043fdd807ff1a9e9e6f501d61ccf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Tue, 17 Oct 2023 00:21:58 +0200
Subject: [PATCH 27/28] update grafana config

---
 src/Chart.yaml  |  2 +-
 src/values.yaml | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/Chart.yaml b/src/Chart.yaml
index ff41a9a9..b4a69d2f 100644
--- a/src/Chart.yaml
+++ b/src/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nussknacker
-version: 1.11.1
+version: 1.11.1-SNAPSHOT
 description: Nussknacker - a design, development, and deployment tool for stream processing
 home: https://nussknacker.io/
 icon: https://nussknacker.io/wp-content/uploads/2021/10/Nussknacker-short-black.svg
diff --git a/src/values.yaml b/src/values.yaml
index d3309b88..0fa116c6 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -224,15 +224,40 @@ grafana:
   #TODO: authentication
   adminUser: admin
   adminPassword: admin
+  datasources:
+    datasources.yaml:
+      apiVersion: 1
+      datasources:
+      - name: influx
+        type: influxdb
+        access: proxy
+        orgId: 1
+        url: "http://nussknacker-influxdb:8086"
+        database: nussknacker
+        basicAuth: true
+        isDefault: true
+        version: 1
+        editable: false
+        basicAuthUser: ${influxdb-user}
+        secureJsonData:
+          basicAuthPassword: ${influxdb-password}
+  dashboards:
+    default:
+      dashboard:
+        file: grafana/dashboard.json
+      nussknacker-lite-scenario:
+        file: grafana/nussknacker-lite-scenario.json
+      nussknacker-request-response-scenario:
+        file: grafana/nussknacker-request-response-scenario.json
   rbac:
     create: true
     namespaced: true
     pspEnabled: false
   sidecar:
     dashboards:
-      enabled: true
+      enabled: false
     datasources:
-      enabled: true
+      enabled: false
   envFromSecret: "{{ .Release.Name }}-influxdb-auth"
   ingress:
     enabled: false

From 872f40d05844e05be65ed3e2100d5c034048b469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Sowi=C5=84ski?= <lsw@touk.pl>
Date: Tue, 17 Oct 2023 00:24:29 +0200
Subject: [PATCH 28/28] update grafana config

---
 src/Chart.yaml  | 2 +-
 src/values.yaml | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Chart.yaml b/src/Chart.yaml
index b4a69d2f..a482b8dc 100644
--- a/src/Chart.yaml
+++ b/src/Chart.yaml
@@ -11,7 +11,7 @@ keywords:
   - stream processing
   - event stream processing
 type: application
-appVersion: 1.11.3-SNAPSHOT
+appVersion: 1.11.3
 dependencies:
   - name: postgresql
     version: ~12.1.15
diff --git a/src/values.yaml b/src/values.yaml
index 0fa116c6..691e18f4 100644
--- a/src/values.yaml
+++ b/src/values.yaml
@@ -166,6 +166,9 @@ postgresql:
 
 zookeeper:
   enabled: true
+  service:
+    ports:
+      client: 2181
 
 kafka:
   enabled: true
@@ -202,10 +205,6 @@ flink:
     numberOfTaskSlots: 3
   jobmanager:
     statefulset: true
-  zookeeper:
-    service:
-      ports:
-        client: 2181
 #  prometheus:
 #    serviceMonitor:
 #      enabled: false