From c102aef2f0b478cf32e644dfbdad7059c13799e4 Mon Sep 17 00:00:00 2001
From: ralongit <ralgotmail@gmail.com>
Date: Tue, 23 Jul 2024 12:22:37 +0300
Subject: [PATCH] Update LogzioRegion set condition

---
 config-templates/helm.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config-templates/helm.json b/config-templates/helm.json
index ce0478944..c3f8abbd5 100644
--- a/config-templates/helm.json
+++ b/config-templates/helm.json
@@ -24,14 +24,8 @@
   },
   {
     "template": "  --set metricsOrTraces.enabled=true \\",
-    "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS' || @.type=='TRACING')]",
-    "conditionalTemplates": [
-      {
-        "condition": "(datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')]) && datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')].params[?(@.name=='isObjectLogs')].value)",
-        "template": "  --set logzio-k8s-telemetry.secrets.LogzioRegion='<<LOGZIO_ACCOUNT_REGION_CODE>>' \\"
-      }
-    ]
-  },  
+    "targetElement": "((datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')]) && (&& datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')].params[?(@.name=='isObjectLogs')].value)) || @.type=='TRACING')]"
+  },
   {
     "template": "  --set logzio-k8s-telemetry.metrics.enabled=true \\",
     "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')]",
@@ -91,6 +85,9 @@
         "template": "  --set logzio-k8s-telemetry.secrets.k8sObjectsLogsToken='<<LOGZIO_LOGS_SHIPPING_TOKEN>>' \\",
         "targetElement":
         "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')].params[?(@.name=='isObjectLogs')].value"
+      },
+      {
+        "template": "  --set logzio-k8s-telemetry.secrets.LogzioRegion='<<LOGZIO_ACCOUNT_REGION_CODE>>' \\"
       }
     ]
   },
@@ -101,6 +98,9 @@
       {
         "template": "  --set logzio-k8s-telemetry.secrets.TracesToken='<<LOGZIO_TRACING_SHIPPING_TOKEN>>' \\"
       },
+      {
+        "template": "  --set logzio-k8s-telemetry.secrets.LogzioRegion='<<LOGZIO_ACCOUNT_REGION_CODE>>' \\"
+      },
       {
         "template": "  --set logzio-k8s-telemetry.spm.enabled=true \\",
         "targetElement": "capabilities[?(@ == 'SPM')]",