From 8e586e8c6a0e9b1061e5be36a0186f7afd9200d6 Mon Sep 17 00:00:00 2001 From: Oleksandr Turytsia Date: Fri, 22 Nov 2024 12:10:49 +0100 Subject: [PATCH 1/3] Added METRICS_ENABLED, LOGS_ENABLED, EVENTS_ENABLED --- deploy/helm/templates/common-env-config-map.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deploy/helm/templates/common-env-config-map.yaml b/deploy/helm/templates/common-env-config-map.yaml index 617d7ea0..1f40cfa2 100644 --- a/deploy/helm/templates/common-env-config-map.yaml +++ b/deploy/helm/templates/common-env-config-map.yaml @@ -12,6 +12,10 @@ data: OTEL_ENVOY_ADDRESS_TLS_INSECURE: {{ quote .Values.otel.tls_insecure }} MANIFEST_VERSION: {{ quote .Chart.Version }} APP_VERSION: {{ quote .Chart.AppVersion }} + METRICS_ENABLED: {{ quote .Values.otel.metrics.enabled }} + LOGS_ENABLED: {{ quote .Values.otel.logs.enabled }} + EVENTS_ENABLED: {{ quote .Values.otel.events.enabled }} + NETWORK_EBPF_ENABLED: {{ quote .Values.ebpfNetworkMonitoring.enabled }} {{ if .Values.otel.https_proxy_url }} HTTPS_PROXY: {{ quote .Values.otel.https_proxy_url }} {{ end }} \ No newline at end of file From daa3645fda3240688589dff1682e689b7642ecc5 Mon Sep 17 00:00:00 2001 From: Oleksandr Turytsia Date: Mon, 2 Dec 2024 09:24:36 +0100 Subject: [PATCH 2/3] feat: Updated common env map --- deploy/helm/templates/common-env-config-map.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deploy/helm/templates/common-env-config-map.yaml b/deploy/helm/templates/common-env-config-map.yaml index 1f40cfa2..91ad9a8f 100644 --- a/deploy/helm/templates/common-env-config-map.yaml +++ b/deploy/helm/templates/common-env-config-map.yaml @@ -5,6 +5,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{ include "common.labels" . | indent 4 }} + config-type: common-env data: CLUSTER_NAME: {{ quote .Values.cluster.name }} CLUSTER_UID: {{ quote (include "common.cluster-uid" .) }} @@ -16,6 +17,7 @@ data: LOGS_ENABLED: {{ quote .Values.otel.logs.enabled }} EVENTS_ENABLED: {{ quote .Values.otel.events.enabled }} NETWORK_EBPF_ENABLED: {{ quote .Values.ebpfNetworkMonitoring.enabled }} + SWO_AGENT_ENABLED: {{ quote .Values.swoagent.enabled }} {{ if .Values.otel.https_proxy_url }} HTTPS_PROXY: {{ quote .Values.otel.https_proxy_url }} {{ end }} \ No newline at end of file From 8a00fa17ca8362bedcf70239ad372c8fa8c4f551 Mon Sep 17 00:00:00 2001 From: Oleksandr Turytsia Date: Mon, 2 Dec 2024 09:52:55 +0100 Subject: [PATCH 3/3] fix: label --- deploy/helm/templates/common-env-config-map.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/templates/common-env-config-map.yaml b/deploy/helm/templates/common-env-config-map.yaml index 91ad9a8f..79aec19a 100644 --- a/deploy/helm/templates/common-env-config-map.yaml +++ b/deploy/helm/templates/common-env-config-map.yaml @@ -5,7 +5,7 @@ metadata: namespace: {{ .Release.Namespace }} labels: {{ include "common.labels" . | indent 4 }} - config-type: common-env + config-type: common-env data: CLUSTER_NAME: {{ quote .Values.cluster.name }} CLUSTER_UID: {{ quote (include "common.cluster-uid" .) }}