From 6e4f9774784f3d67d3dfa87f208d2a99376ef1c9 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 8 Apr 2026 14:55:02 +0100
Subject: [PATCH 1/3] chore: add flag for FF Expert Insights

fixes #864
---
 helm/flowfuse/templates/configmap.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/helm/flowfuse/templates/configmap.yaml b/helm/flowfuse/templates/configmap.yaml
index c22863f3..e326a098 100644
--- a/helm/flowfuse/templates/configmap.yaml
+++ b/helm/flowfuse/templates/configmap.yaml
@@ -326,6 +326,12 @@ data:
     expert:
       enabled: {{ .Values.forge.expert.enabled | default false }}
       {{- if .Values.forge.expert.enabled }}
+      {{- if hasKey .Values.forge.expert "insights"}}
+      {{- if and (hasKey .Values.forge.expert "enabled") (.Values.forge.expert.insights.enabled)}}
+      insights:
+        enabled: true
+      {{- end }}
+      {{- end }}
       service:
         token: <%= ENV['EXPERT_TOKEN'] %>
         url: {{ ((.Values.forge.expert).service).url }}

From c18eea35556feb2a0148c59e9bb56db927def0b8 Mon Sep 17 00:00:00 2001
From: ppawlowski <piotr@devopswizards.com>
Date: Wed, 8 Apr 2026 17:45:42 +0200
Subject: [PATCH 2/3] Update expert unit tests for insights config

---
 helm/flowfuse/tests/expert_feature_test.yaml | 60 +++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/helm/flowfuse/tests/expert_feature_test.yaml b/helm/flowfuse/tests/expert_feature_test.yaml
index 67435cae..512352f8 100644
--- a/helm/flowfuse/tests/expert_feature_test.yaml
+++ b/helm/flowfuse/tests/expert_feature_test.yaml
@@ -274,4 +274,62 @@ tests:
               secretKeyRef:
                 name: flowfuse-secrets
                 key: token
-                optional: true
\ No newline at end of file
+                optional: true
+
+  - it: should not include insights configuration when insights key is absent
+    template: configmap.yaml
+    set:
+      forge.expert:
+        enabled: true
+        service:
+          url: "https://expert.example.com"
+          token: "test-token"
+    asserts:
+      - notMatchRegex:
+          path: data["flowforge.yml"]
+          pattern: "insights:"
+
+  - it: should not include insights configuration when insights.enabled is false
+    template: configmap.yaml
+    set:
+      forge.expert:
+        enabled: true
+        service:
+          url: "https://expert.example.com"
+          token: "test-token"
+        insights:
+          enabled: false
+    asserts:
+      - notMatchRegex:
+          path: data["flowforge.yml"]
+          pattern: "insights:"
+
+  - it: should include insights configuration when expert and insights are both enabled
+    template: configmap.yaml
+    set:
+      forge.expert:
+        enabled: true
+        service:
+          url: "https://expert.example.com"
+          token: "test-token"
+        insights:
+          enabled: true
+    asserts:
+      - matchRegex:
+          path: data["flowforge.yml"]
+          pattern: "insights:"
+      - matchRegex:
+          path: data["flowforge.yml"]
+          pattern: "insights:\\n\\s+enabled: true"
+
+  - it: should not include insights configuration when expert is disabled
+    template: configmap.yaml
+    set:
+      forge.expert:
+        enabled: false
+        insights:
+          enabled: true
+    asserts:
+      - notMatchRegex:
+          path: data["flowforge.yml"]
+          pattern: "insights:"

From 92c6f43edb4cc51ecac6e9d15b2d4efebdd3966b Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Wed, 8 Apr 2026 18:24:18 +0100
Subject: [PATCH 3/3] Update helm/flowfuse/templates/configmap.yaml

Co-authored-by: Piotr Pawlowski <ppawlowski@users.noreply.github.com>
---
 helm/flowfuse/templates/configmap.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/helm/flowfuse/templates/configmap.yaml b/helm/flowfuse/templates/configmap.yaml
index e326a098..a14907de 100644
--- a/helm/flowfuse/templates/configmap.yaml
+++ b/helm/flowfuse/templates/configmap.yaml
@@ -326,11 +326,9 @@ data:
     expert:
       enabled: {{ .Values.forge.expert.enabled | default false }}
       {{- if .Values.forge.expert.enabled }}
-      {{- if hasKey .Values.forge.expert "insights"}}
-      {{- if and (hasKey .Values.forge.expert "enabled") (.Values.forge.expert.insights.enabled)}}
+      {{- if ((.Values.forge.expert).insights).enabled }}
       insights:
-        enabled: true
-      {{- end }}
+        enabled: {{ .Values.forge.expert.insights.enabled | default false }}
       {{- end }}
       service:
         token: <%= ENV['EXPERT_TOKEN'] %>