Merge pull request #639 from kubescape/loki

remove logs from otel exporter config

Author: matthyx

charts/kubescape-operator/assets/host-scanner-definition.yaml

@@ -67,6 +67,10 @@ spec:
         - name: OTEL_COLLECTOR_SVC
           value: "otel-collector.kubescape.svc:4318"
         {{- end }}
+        {{- if .Values.configurations.otelUrl }}
+        - name: OTEL_COLLECTOR_SVC
+          value: {{ .Values.configurations.otelUrl }}
+        {{- end }}
         ports:
           - name: scanner # Do not change port name
             containerPort: 7888

charts/kubescape-operator/assets/otel-collector-config.yaml

@@ -81,11 +81,3 @@ service:
       {{- if $configurations.otel }}
         - otlp
       {{- end }}
-    logs:
-      receivers: [otlp]
-      processors: [attributes/ksCloud, batch]
-      exporters:
-        - otlp/ksCloud
-      {{- if $configurations.otel }}
-        - otlp
-      {{- end }}

charts/kubescape-operator/templates/_common.tpl

@@ -69,7 +69,7 @@ nodeAgent:
 operator:
   enabled: true
 otelCollector:
-  enabled: {{ or $configurations.ksOtel $configurations.otel }}
+  enabled: {{ and $configurations.ksOtel (not $configurations.otel) }}
 serviceDiscovery:
   enabled: {{ $configurations.submit }}
 storage:

charts/kubescape-operator/templates/kubescape/deployment.yaml

@@ -150,6 +150,10 @@ spec:
         - name: OTEL_COLLECTOR_SVC
           value: "otel-collector:4318"
         {{- end }}
+        {{- if .Values.configurations.otelUrl }}
+        - name: OTEL_COLLECTOR_SVC
+          value: {{ .Values.configurations.otelUrl }}
+        {{- end }}
         {{- if ne .Values.global.httpsProxy "" }}
         - name: HTTPS_PROXY
           value: "{{ .Values.global.httpsProxy }}"

charts/kubescape-operator/templates/kubevuln/deployment.yaml

@@ -91,6 +91,10 @@ spec:
             - name: OTEL_COLLECTOR_SVC
               value: "otel-collector:4318"
             {{- end }}
+            {{- if .Values.configurations.otelUrl }}
+            - name: OTEL_COLLECTOR_SVC
+              value: {{ .Values.configurations.otelUrl }}
+            {{- end }}
             {{- if ne .Values.global.httpsProxy "" }}
             - name: HTTPS_PROXY
               value: "{{ .Values.global.httpsProxy }}"

charts/kubescape-operator/templates/node-agent/daemonset.yaml

@@ -165,6 +165,10 @@ spec:
             - name: OTEL_COLLECTOR_SVC
               value: "otel-collector:4318"
             {{- end }}
+            {{- if .Values.configurations.otelUrl }}
+            - name: OTEL_COLLECTOR_SVC
+              value: {{ .Values.configurations.otelUrl }}
+            {{- end }}
             {{- if $components.clamAV.enabled }}
             - name: CLAMAV_SOCKET
               value: "/clamav/clamd.sock"

charts/kubescape-operator/templates/operator/deployment.yaml

@@ -104,6 +104,10 @@ spec:
             - name: OTEL_COLLECTOR_SVC
               value: "otel-collector:4318"
             {{- end }}
+            {{- if .Values.configurations.otelUrl }}
+            - name: OTEL_COLLECTOR_SVC
+              value: {{ .Values.configurations.otelUrl }}
+            {{- end }}
             {{- if ne .Values.global.httpsProxy "" }}
             - name: HTTPS_PROXY
               value: "{{ .Values.global.httpsProxy }}"

charts/kubescape-operator/templates/storage/deployment.yaml

@@ -81,6 +81,10 @@ spec:
           - name: OTEL_COLLECTOR_SVC
             value: "otel-collector:4318"
           {{- end }}
+          {{- if .Values.configurations.otelUrl }}
+          - name: OTEL_COLLECTOR_SVC
+            value: {{ .Values.configurations.otelUrl }}
+          {{- end }}
           {{- if not $configurations.virtualCrds }}
           - name: DISABLE_VIRTUAL_CRDS
             value: "true"

charts/kubescape-operator/templates/synchronizer/deployment.yaml

@@ -86,6 +86,10 @@ spec:
             - name: OTEL_COLLECTOR_SVC
               value: "otel-collector:4318"
             {{- end }}
+            {{- if .Values.configurations.otelUrl }}
+            - name: OTEL_COLLECTOR_SVC
+              value: {{ .Values.configurations.otelUrl }}
+            {{- end }}
             {{- if ne .Values.global.httpsProxy "" }}
             - name: HTTPS_PROXY
               value: "{{ .Values.global.httpsProxy }}"

charts/kubescape-operator/tests/__snapshot__/snapshot_test.yaml.snap

@@ -48,7 +48,7 @@ tests:
         admissionController: enable
         manageWorkloads: enable
       server: api.armosec.io
-      configurations.otelUrl: "otelCollector:4317"
+      configurations.otelUrl: "otelCollector.svc.monitoring:4317"
       clusterName: kind-kind
       includeNamespaces: "my-namespace"
       global:
@@ -87,7 +87,7 @@ tests:
         - batch/v1
     set:
       unittest: true
-      configurations.otelUrl: "otelCollector:4317"
+      configurations.otelUrl: "otelCollector.svc.monitoring:4317"
       clusterName: kind-kind
       excludeNamespaces: ""
       includeNamespaces: ""
@@ -134,7 +134,6 @@ tests:
         prometheusExporter: disable
         admissionController: disable
       server: api.armosec.io
-      configurations.otelUrl: "otelCollector:4317"
       clusterName: kind-kind
       excludeNamespaces: "kubescape,kube-system,kube-public,kube-node-lease,kubeconfig,gmp-system,gmp-public"
       global:
@@ -166,7 +165,7 @@ tests:
         - batch/v1
     set:
       unittest: true
-      configurations.otelUrl: "otelCollector:4317"
+      configurations.otelUrl: "otelCollector.svc.monitoring:4317"
       clusterName: kind-kind
       imageScanning:
         privateRegistries:
@@ -189,7 +188,7 @@ tests:
         - batch/v1
     set:
       unittest: true
-      configurations.otelUrl: "otelCollector:4317"
+      configurations.otelUrl: "otelCollector.svc.monitoring:4317"
       clusterName: kind-kind
       imageScanning:
         privateRegistries:
@@ -217,7 +216,7 @@ tests:
         - batch/v1
     set:
       unittest: true
-      configurations.otelUrl: "otelCollector:4317"
+      configurations.otelUrl: "otelCollector.svc.monitoring:4317"
       clusterName: kind-kind
       imagePullSecrets: quay-secret
       imagePullSecret: