Adding OTEL (#67)

* Update 01-update_tag.yaml * update otel installation instructions (#64) * Add CICD docs (#52) * add cicd docs Signed-off-by: Matan Shkalim <[email protected]> * add diagram to readme file Signed-off-by: Matan Shkalim <[email protected]> --------- Signed-off-by: Matan Shkalim <[email protected]> * Update 01-update_tag.yaml * adding otel-collector (#53) * adding otel-collector Signed-off-by: Matthias Bertschy <[email protected]> * Bump chart versions Signed-off-by: David Wertenteil <[email protected]> --------- Signed-off-by: Matthias Bertschy <[email protected]> Signed-off-by: David Wertenteil <[email protected]> Co-authored-by: David Wertenteil <[email protected]> * update otel installation instructions Signed-off-by: David Wertenteil <[email protected]> * Update KS version Signed-off-by: David Wertenteil <[email protected]> * Removed "header" from example Signed-off-by: David Wertenteil <[email protected]> --------- Signed-off-by: Matan Shkalim <[email protected]> Signed-off-by: Matthias Bertschy <[email protected]> Signed-off-by: David Wertenteil <[email protected]> Co-authored-by: matanshk <[email protected]> Co-authored-by: Matthias Bertschy <[email protected]> --------- Signed-off-by: Matan Shkalim <[email protected]> Signed-off-by: Matthias Bertschy <[email protected]> Signed-off-by: David Wertenteil <[email protected]> Co-authored-by: matanshk <[email protected]> Co-authored-by: Matthias Bertschy <[email protected]>
kubescape · Feb 9, 2023 · c06f477 · c06f477
1 parent 28117e9
commit c06f477
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/charts/kubescape-cloud-operator/README.md b/charts/kubescape-cloud-operator/README.md
@@ -121,22 +121,14 @@ docker-compose up -d
 docker-compose logs uptrace
 ```
 
-4. Configure values.yaml
-
-```
-otelCollector:
-  enabled: true
-  endpoint:
-    host: <docker-compose host>
-    port: 14317
-    insecure: false
-    headers:
-      uptrace-dsn: 'http://project2_secret_token@<docker-compose host>:14317/2'
-```
+4. Follow the [instructions above](#installing-kubescape-operator-in-a-kubernetes-cluster-using-helm), add the OTEL collector configuration and install the operator as follows:
+
+  ```
+  --set otelCollector.enabled=true --set otelCollector.endpoint.host=<collector host> --set otelCollector.endpoint.port=14317 --set otelCollector.endpoint.insecure=false
+  ```
 
-5. Follow the [instructions above](#installing-kubescape-operator-in-a-kubernetes-cluster-using-helm)
+5. Open Uptrace UI at [http://localhost:14318/overview/2](http://localhost:14318/overview/2)
 
-6. Open Uptrace UI at [http://localhost:14318/overview/2](http://localhost:14318/overview/2)
 
 ## Chart support
 

diff --git a/charts/kubescape-cloud-operator/templates/kubescape/deployment.yaml b/charts/kubescape-cloud-operator/templates/kubescape/deployment.yaml
@@ -76,6 +76,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: KS_CONTEXT
+          value: "{{ .Values.clusterName }}"
         - name: KS_ENABLE_HOST_SCANNER
           value: "{{ .Values.kubescape.enableHostScan }}"
         - name: KS_SUBMIT

diff --git a/charts/kubescape-cloud-operator/templates/otel-collector/deployment.yaml b/charts/kubescape-cloud-operator/templates/otel-collector/deployment.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.otelCollector.enabled  }}
-{{- $cloud_provider := (include "cloud_provider" .) -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/charts/kubescape-cloud-operator/values.yaml b/charts/kubescape-cloud-operator/values.yaml
@@ -120,7 +120,7 @@ kubescape:
   image:
     # -- source code: https://github.com/kubescape/kubescape/tree/master/httphandler (public repo)
     repository: quay.io/kubescape/kubescape
-    tag: v2.1.2
+    tag: v2.1.3
     pullPolicy: Always
 
   resources:
@@ -424,6 +424,8 @@ otelCollector:
     host: ""
     port: 4317
     insecure: true
+    headers:
+      uptrace-dsn: ""
 
   image:
     repository: otel/opentelemetry-collector

diff --git a/charts/kubescape-prometheus-integrator/values.yaml b/charts/kubescape-prometheus-integrator/values.yaml
@@ -46,7 +46,7 @@ kubescape:
   image:
     # -- source code: https://github.com/kubescape/kubescape/tree/master/httphandler (public repo)
     repository: quay.io/kubescape/kubescape
-    tag: v2.1.2
+    tag: v2.1.3
     pullPolicy: IfNotPresent
 
   resources: