[Release] Update helm command to align with new charts generation

README.md

@@ -174,6 +174,9 @@ Replace the `curl -fsSL` command with `cp <<LOCAL_PATH_TO_FILE>> /tmp/logzio/` w
 sudo mkdir -p /opt/logzio-agent; sudo chown -R $USER: /opt/logzio-agent; mkdir -p /tmp/logzio; cp <<LOCAL_PATH_TO_FILE>> /tmp/logzio/; tar -zxf /tmp/logzio/agent_mac.tar.gz --directory /tmp/logzio; bash /tmp/logzio/agent.bash --url=https://app.logz.io --id=<<SOME_ID>>
 ```
 
+> [!NOTE]
+> Testing changes for files outside of `/scripts` folder is currently not supported, as it requires generating a new release.
+
 4. **Test your changes:**
 
 Run the modified command locally to test your changes and ensure everything works as expected.

config-templates/helm.json

@@ -1,6 +1,21 @@
 [
   {
-    "template": "helm install -n monitoring --create-namespace --version 6.2.6 \\"
+    "template": "helm install -n monitoring --create-namespace \\"
+  },
+  {
+    "template": "  --set global.logzioRegion='<<LOGZIO_ACCOUNT_REGION_CODE>> \\",
+    "targetElement": "datasources[?(@.name=='Kubernetes')]",
+    "conditionalTemplates": [
+      {
+        "template": "  --set global.env_id='{{value}}' \\",
+        "targetElement": "datasources[?(@.name=='Kubernetes')].params[?(@.name=='envID')].value",
+        "keepAsPlaceholder": true
+      }
+    ]
+  },
+  {
+    "template": "  --set global.logzioLogsToken='<<LOGZIO_LOGS_SHIPPING_TOKEN>>' \\",
+    "targetElement": "datasources[?(@.name=='Kubernetes' || @.name=='Security' || @.name=='DeployEvents')].telemetries[?(@.type=='LOG_ANALYTICS' || (@.type=='METRICS' && @.params[?(@.name=='isObjectLogs' && @.value==true)]))]"
   },
   {
     "template": "  --set logs.enabled=true \\",
@@ -12,37 +27,19 @@
       {
         "template": "  --set logzio-fluentd.enabled=false \\"
       },
-      {
-        "template": "  --set logzio-logs-collector.secrets.logzioLogsToken='<<LOGZIO_LOGS_SHIPPING_TOKEN>>' \\"
-      },
-      {
-        "template": "  --set logzio-logs-collector.secrets.logzioRegion='<<LOGZIO_ACCOUNT_REGION_CODE>>' \\"
-      },
       {
         "template": "  --set logzio-logs-collector.fargateLogRouter.enabled=true \\",
         "condition": "$[?(@ == 'EKS')]",
         "targetElement": "datasources[?(@.name=='Kubernetes')].params[?(@.name=='isFargate')].value"
-      },
-      {
-        "template": "  --set logzio-logs-collector.secrets.env_id='{{value}}' \\",
-        "targetElement": "datasources[?(@.name=='Kubernetes')].params[?(@.name=='envID')].value",
-        "keepAsPlaceholder": true
       }
     ]
   },
-  {
-    "template": "  --set metricsOrTraces.enabled=true \\",
-    "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS' || @.type=='TRACING')]"
-  },
   {
     "template": "  --set logzio-k8s-telemetry.metrics.enabled=true \\",
     "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')]",
     "conditionalTemplates": [
       {
-        "template": "  --set logzio-k8s-telemetry.secrets.MetricsToken='<<LOGZIO_METRICS_SHIPPING_TOKEN>>' \\"
-      },
-      {
-        "template": "  --set logzio-k8s-telemetry.secrets.ListenerHost='https://<<LOGZIO_LISTENER_ADDRESS>>:8053' \\"
+        "template": "  --set global.logzioMetricsToken='<<LOGZIO_METRICS_SHIPPING_TOKEN>>' \\"
       },
       {
         "condition": "$[?(@ == 'AKS')]",
@@ -56,11 +53,6 @@
           }
         ]
       },
-      {
-        "template": "  --set logzio-k8s-telemetry.secrets.p8s_logzio_name='{{value}}' \\",
-        "targetElement": "datasources[?(@.name=='Kubernetes')].params[?(@.name=='envID')].value",
-        "keepAsPlaceholder": true
-      },
       {
         "template": "  --set logzio-k8s-telemetry.enableMetricsFilter.eks=true \\",
         "condition": "$[?(@ == 'EKS')]",
@@ -84,80 +76,39 @@
       {
         "template": "  --set logzio-k8s-telemetry.k8sObjectsConfig.enabled=true \\",
         "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='METRICS')].params[?(@.name=='isObjectLogs')].value"
-      },
-      {
-        "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>>' \\"
       }
     ]
   },
   {
-    "template": "  --set logzio-k8s-telemetry.traces.enabled=true \\",
+    "template": "  --set logzio-apm-collector.enabled=true \\",
     "targetElement": "datasources[?(@.name=='Kubernetes')].telemetries[?(@.type=='TRACING')]",
     "conditionalTemplates": [
       {
-        "template": "  --set logzio-k8s-telemetry.secrets.TracesToken='<<LOGZIO_TRACING_SHIPPING_TOKEN>>' \\"
+        "template": "  --set global.logzioTracesToken='<<LOGZIO_TRACING_SHIPPING_TOKEN>>' \\"
       },
       {
-        "template": "  --set logzio-k8s-telemetry.secrets.LogzioRegion='<<LOGZIO_ACCOUNT_REGION_CODE>>' \\"
-      },
-      {
-        "template": "  --set logzio-k8s-telemetry.spm.enabled=true \\",
+        "template": "  --set logzio-apm-collector.spm.enabled=true \\",
         "targetElement": "capabilities[?(@ == 'SPM')]",
         "conditionalTemplates": [
           {
-            "template": "  --set logzio-k8s-telemetry.secrets.env_id='{{value}}' \\",
-            "targetElement": "datasources[?(@.name=='Kubernetes')].params[?(@.name=='envID')].value",
-            "keepAsPlaceholder": true
+            "template": "  --set global.logzioSpmToken='<<LOGZIO_METRICS_SHIPPING_TOKEN>>' \\"
           },
           {
-            "template": "  --set logzio-k8s-telemetry.secrets.SpmToken='<<LOGZIO_METRICS_SHIPPING_TOKEN>>' \\"
-          },
-          {
-            "template": "  --set logzio-k8s-telemetry.serviceGraph.enabled=true \\"
+            "template": "  --set logzio-apm-collector.serviceGraph.enabled=true \\"
           }
         ]
       }
     ]
   },
   {
     "template": "  --set securityReport.enabled=true \\",
-    "targetElement": "datasources[?(@.name=='Security')]",
-    "conditionalTemplates": [
-      {
-        "template": "  --set logzio-trivy.env_id='{{value}}' \\",
-        "targetElement": "datasources[?(@.name=='Security')].params[?(@.name=='envID')].value",
-        "keepAsPlaceholder": true
-      },
-      {
-        "template": "  --set logzio-trivy.secrets.logzioShippingToken='<<LOGZIO_LOGS_SHIPPING_TOKEN>>' \\"
-      },
-      {
-        "template": "  --set logzio-trivy.secrets.logzioListener='<<LOGZIO_LISTENER_ADDRESS>>' \\"
-      }
-    ]
+    "targetElement": "datasources[?(@.name=='Security')]"
   },
   {
     "template": "  --set deployEvents.enabled=true \\",
-    "targetElement": "datasources[?(@.name=='DeployEvents')]",
-    "conditionalTemplates": [
-      {
-        "template": "  --set logzio-k8s-events.secrets.env_id='{{value}}' \\",
-        "targetElement": "datasources[?(@.name=='DeployEvents')].params[?(@.name=='envID')].value",
-        "keepAsPlaceholder": true
-      },
-      {
-        "template": "  --set logzio-k8s-events.secrets.logzioShippingToken='<<LOGZIO_LOGS_SHIPPING_TOKEN>>' \\"
-      },
-      {
-        "template": "  --set logzio-k8s-events.secrets.logzioListener='<<LOGZIO_LISTENER_ADDRESS>>' \\"
-      }
-    ]
+    "targetElement": "datasources[?(@.name=='DeployEvents')]"
   },
   {
     "template": "logzio-monitoring logzio-helm/logzio-monitoring"
   }
-]
+]

datasources/linux/kubernetes/aks/deployevents/telemetry/logs/logs.bash

@@ -19,9 +19,5 @@ load_logs_utils
 execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token'
 # Build enable deploy events Helm set
 execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set"
-# Build Logz.io deploy events logs listener URL Helm set
-execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set"
 # Build Logz.io deploy events logs token Helm set
-execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set"
-# Build Deploy events environment id Helm set
-execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set"
+execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set"

datasources/linux/kubernetes/aks/kubernetes/installer/installer.bash

@@ -28,13 +28,11 @@ if $IS_TAINT; then
 fi
 # Get environment id
 execute_task 'get_environment_id' 'Getting environment id'
-if $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then
-    # Build enable metrics or traces Helm set
-    execute_task 'build_enable_metrics_or_traces_helm_set' 'Building enable metrics or traces Helm set'
+if $IS_LOGS_OPTION_WAS_SELECTED || $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then
     # Build environment tag Helm set
-    execute_task 'build_environment_tag_helm_set' 'Building environment tag Helm set'
-    # Build environment id Helm set
-    execute_task 'build_environment_id_helm_set' 'Building environment id Helm set'
+    execute_task 'build_environment_tag_helm_set' 'Building environment id Helm set'
+    # Build region Helm set
+    execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set'
 fi
 
 DATA_SOURCE_INSTALLER_EXIT_CODE=$EXIT_CODE

datasources/linux/kubernetes/aks/kubernetes/telemetry/logs/logs.bash

@@ -23,12 +23,8 @@ execute_task 'build_enable_logs_helm_set' 'Building enable logs Helm set'
 execute_task 'build_enable_opentelemetry_log_collection_helm_set' 'Building enable opentelemetry log collection Helm set'
 # Build disable fluentd log collection Helm set
 execute_task 'build_disable_fluentd_log_collection_helm_set' 'Building disable fluentd log collection Helm set'
-# Build Logz.io logs region Helm set
-execute_task 'build_logzio_logs_region_helm_set' 'Building Logz.io logs region Helm set'
 # Build Logz.io logs token Helm set
 execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io logs token Helm set'
-# Build environment id Helm set
-execute_task 'build_environment_id_helm_set' 'Building environment id Helm set'
 # Get is scan security risks option was selected
 #execute_task "get_is_scan_security_risks_option_was_selected" "Getting is scan security risks option was selected"
 #if $IS_SCAN_SECURITY_RISKS_OPTION_WAS_SELCTED; then

datasources/linux/kubernetes/aks/kubernetes/telemetry/metrics/metrics.bash

@@ -19,8 +19,6 @@ load_metrics_utils
 execute_task 'get_logzio_metrics_token' 'Getting Logz.io metrics token'
 # Build enable metrics Helm set
 execute_task 'build_enable_metrics_helm_set' 'Building enable metrics Helm set'
-# Build Logz.io metrics listener URL Helm set
-execute_task 'build_logzio_metrics_listener_url_helm_set' 'Building Logz.io metrics listener URL Helm set'
 # Build Logz.io metrics token Helm set
 execute_task 'build_logzio_metrics_token_helm_set' 'Building Logz.io metrics token Helm set'
 # Get if Kubernetes runs on Windows OS option was selected
@@ -39,10 +37,10 @@ fi
 # Get if Kubernetes object logs option was selected
 execute_task 'get_is_object_logs_was_selected' 'Getting is Kubernetes object logs was selected'
 if $IS_OBJECT_LOGS; then
-    # Build Logz.io region Helm set
-    execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set'
-    # Build Logz.io Kubernetes object logs token Helm set
-    execute_task 'build_logzio_object_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set'
     # Build enable Kubernetes object logs Helm set
     execute_task 'build_enable_object_logs_helm_set'  'Building enable Kubernetes object logs Helm set'
+    # Build Logz.io Kubernetes object logs token Helm set
+    load_logs_utils
+    execute_task 'get_logzio_logs_token' 'Building Logz.io Kubernetes object logs token Helm set'
+    execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set'
 fi

datasources/linux/kubernetes/aks/kubernetes/telemetry/traces/traces.bash

@@ -21,8 +21,6 @@ execute_task 'get_logzio_traces_token' 'Getting Logz.io traces token'
 execute_task 'build_enable_traces_helm_set' 'Building enable traces Helm set'
 # Build Logz.io traces token Helm set
 execute_task 'build_logzio_traces_token_helm_set' 'Building Logz.io traces token Helm set'
-# Build Logz.io region Helm set
-execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set'
 # Get Logz.io SPM token
 execute_task 'get_logzio_metrics_token' 'Getting Logz.io SPM token'
 # Build enable SPM Helm set

datasources/linux/kubernetes/aks/security/telemetry/logs/logs.bash

@@ -19,9 +19,5 @@ load_logs_utils
 execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token'
 # Build enable security report Helm set
 execute_task "build_enable_security_report_helm_set" "Building enable security report Helm set"
-# Build Logz.io Trivy logs listener URL Helm set
-execute_task "build_logzio_trivy_logs_listener_url_helm_set" "Building Logz.io Trivy logs listener URL Helm set"
 # Build Logz.io Trivy logs token Helm set
-execute_task "build_logzio_trivy_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set"
-# Build Trivy environment id Helm set
-execute_task "build_trivy_environment_id_helm_set" "Building Trivy environment id Helm set"
+execute_task "build_logzio_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set"

datasources/linux/kubernetes/digitalocean/deployevents/telemetry/logs/logs.bash

@@ -19,9 +19,5 @@ load_logs_utils
 execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token'
 # Build enable deploy events Helm set
 execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set"
-# Build Logz.io deploy events logs listener URL Helm set
-execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set"
 # Build Logz.io deploy events logs token Helm set
-execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set"
-# Build Deploy events environment id Helm set
-execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set"
+execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set"

datasources/linux/kubernetes/digitalocean/kubernetes/installer/installer.bash

@@ -28,13 +28,11 @@ if $IS_TAINT; then
 fi
 # Get environment id
 execute_task 'get_environment_id' 'Getting environment id'
-if $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then
-    # Build enable metrics or traces Helm set
-    execute_task 'build_enable_metrics_or_traces_helm_set' 'Building enable metrics or traces Helm set'
+if $IS_LOGS_OPTION_WAS_SELECTED || $IS_METRICS_OPTION_WAS_SELECTED || $IS_TARCES_OPTION_WAS_SELECTED; then
     # Build environment tag Helm set
-    execute_task 'build_environment_tag_helm_set' 'Building environment tag Helm set'
-    # Build environment id Helm set
-    execute_task 'build_environment_id_helm_set' 'Building environment id Helm set'
+    execute_task 'build_environment_tag_helm_set' 'Building environment id Helm set'
+    # Build region Helm set
+    execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set'
 fi
 
 DATA_SOURCE_INSTALLER_EXIT_CODE=$EXIT_CODE

datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/logs/logs.bash

@@ -23,12 +23,8 @@ execute_task 'build_enable_logs_helm_set' 'Building enable logs Helm set'
 execute_task 'build_enable_opentelemetry_log_collection_helm_set' 'Building enable opentelemetry log collection Helm set'
 # Build disable fluentd log collection Helm set
 execute_task 'build_disable_fluentd_log_collection_helm_set' 'Building disable fluentd log collection Helm set'
-# Build Logz.io logs region Helm set
-execute_task 'build_logzio_logs_region_helm_set' 'Building Logz.io logs region Helm set'
 # Build Logz.io logs token Helm set
 execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io logs token Helm set'
-# Build environment id Helm set
-execute_task 'build_environment_id_helm_set' 'Building environment id Helm set'
 # Get is scan security risks option was selected
 #execute_task "get_is_scan_security_risks_option_was_selected" "Getting is scan security risks option was selected"
 #if $IS_SCAN_SECURITY_RISKS_OPTION_WAS_SELCTED; then

datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/metrics/metrics.bash

@@ -19,8 +19,6 @@ load_metrics_utils
 execute_task 'get_logzio_metrics_token' 'Getting Logz.io metrics token'
 # Build enable metrics Helm set
 execute_task 'build_enable_metrics_helm_set' 'Building enable metrics Helm set'
-# Build Logz.io metrics listener URL Helm set
-execute_task 'build_logzio_metrics_listener_url_helm_set' 'Building Logz.io metrics listener URL Helm set'
 # Build Logz.io metrics token Helm set
 execute_task 'build_logzio_metrics_token_helm_set' 'Building Logz.io metrics token Helm set'
 # Get if metrics filter option was selected
@@ -33,10 +31,10 @@ fi
 # Get if Kubernetes object logs option was selected
 execute_task 'get_is_object_logs_was_selected' 'Getting is Kubernetes object logs was selected'
 if $IS_OBJECT_LOGS; then
-    # Build Logz.io region Helm set
-    execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set'
-    # Build Logz.io Kubernetes object logs token Helm set
-    execute_task 'build_logzio_object_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set'
     # Build enable Kubernetes object logs Helm set
     execute_task 'build_enable_object_logs_helm_set'  'Building enable Kubernetes object logs Helm set'
+    # Build Logz.io Kubernetes object logs token Helm set
+    load_logs_utils
+    execute_task 'get_logzio_logs_token' 'Building Logz.io Kubernetes object logs token Helm set'
+    execute_task 'build_logzio_logs_token_helm_set' 'Building Logz.io Kubernetes object logs token Helm set'
 fi

datasources/linux/kubernetes/digitalocean/kubernetes/telemetry/traces/traces.bash

@@ -21,8 +21,6 @@ execute_task 'get_logzio_traces_token' 'Getting Logz.io traces token'
 execute_task 'build_enable_traces_helm_set' 'Building enable traces Helm set'
 # Build Logz.io traces token Helm set
 execute_task 'build_logzio_traces_token_helm_set' 'Building Logz.io traces token Helm set'
-# Build Logz.io region Helm set
-execute_task 'build_logzio_region_helm_set' 'Building Logz.io region Helm set'
 # Get Logz.io SPM token
 execute_task 'get_logzio_metrics_token' 'Getting Logz.io SPM token'
 # Build enable SPM Helm set

datasources/linux/kubernetes/digitalocean/security/telemetry/logs/logs.bash

@@ -19,9 +19,5 @@ load_logs_utils
 execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token'
 # Build enable security report Helm set
 execute_task "build_enable_security_report_helm_set" "Building enable security report Helm set"
-# Build Logz.io Trivy logs listener URL Helm set
-execute_task "build_logzio_trivy_logs_listener_url_helm_set" "Building Logz.io Trivy logs listener URL Helm set"
 # Build Logz.io Trivy logs token Helm set
-execute_task "build_logzio_trivy_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set"
-# Build Trivy environment id Helm set
-execute_task "build_trivy_environment_id_helm_set" "Building Trivy environment id Helm set"
+execute_task "build_logzio_logs_token_helm_set" "Building Logz.io Trivy logs token Helm set"

datasources/linux/kubernetes/eks/deployevents/telemetry/logs/logs.bash

@@ -19,9 +19,5 @@ load_logs_utils
 execute_task 'get_logzio_logs_token' 'Getting Logz.io logs token'
 # Build enable deploy events Helm set
 execute_task "build_enable_deploy_events_helm_set" "Building enable deploy events Helm set"
-# Build Logz.io deploy events logs listener URL Helm set
-execute_task "build_logzio_deploy_events_logs_listener_url_helm_set" "Building Logz.io deploy events logs listener URL Helm set"
 # Build Logz.io deploy events logs token Helm set
-execute_task "build_logzio_deploy_events_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set"
-# Build Deploy events environment id Helm set
-execute_task "build_deploy_events_environment_id_helm_set" "Building deploy events environment id Helm set"
+execute_task "build_logzio_logs_token_helm_set" "Building Logz.io deploy events logs token Helm set"