From 75f017fa750b6627638c69849a70ead9ffe0e2be Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Fri, 7 Oct 2022 16:11:44 +0200 Subject: [PATCH 01/21] chore(chart): update version --- deploy/helm/sumologic/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/Chart.yaml b/deploy/helm/sumologic/Chart.yaml index 0fa86c9cc9..ce185cbcbe 100644 --- a/deploy/helm/sumologic/Chart.yaml +++ b/deploy/helm/sumologic/Chart.yaml @@ -37,6 +37,6 @@ dependencies: repository: https://sumologic.github.io/tailing-sidecar condition: tailing-sidecar-operator.enabled - name: opentelemetry-operator - version: 0.7.0 + version: 0.13.0 repository: https://open-telemetry.github.io/opentelemetry-helm-charts condition: opentelemetry-operator.enabled From b53f0d9dac1afb4e0784e17550a016a5a5539cc0 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Fri, 7 Oct 2022 16:14:02 +0200 Subject: [PATCH 02/21] chore(tls): remove certificate creation, supported by operator chart --- deploy/helm/sumologic/templates/_helpers.tpl | 101 ------------------ .../templates/opentelemetry-operator/tls.yaml | 5 - 2 files changed, 106 deletions(-) delete mode 100644 deploy/helm/sumologic/templates/opentelemetry-operator/tls.yaml diff --git a/deploy/helm/sumologic/templates/_helpers.tpl b/deploy/helm/sumologic/templates/_helpers.tpl index 599b355f28..fe8fab5dfa 100644 --- a/deploy/helm/sumologic/templates/_helpers.tpl +++ b/deploy/helm/sumologic/templates/_helpers.tpl @@ -1517,104 +1517,3 @@ opentelemetry-operator-webhook-service {{- define "opentelemetry-operator.controller.manager.service.cert.name" -}} opentelemetry-operator-controller-manager-service-cert {{- end -}} - -{{/* -Generate certificates for opentelemetry-operator webhook - -Example usage: -{{ $certManagerEnabled := index .Values "opentelemetry-operator" "admissionWebhooks" "certManager" "enabled" }} -{{ $operatorEnabled := index .Values "opentelemetry-operator" "enabled" }} -{{- if eq ( not $certManagerEnabled ) $operatorEnabled }} -{{ ( include "opentelemetry-operator.non_certmanager" . ) }} -{{- end }} - -*/}} -{{- define "opentelemetry-operator.non_certmanager" -}} -{{- $altNames := list ( printf "%s.%s" (include "opentelemetry-operator.webhook.service.name" .) .Release.Namespace ) ( printf "%s.%s.svc" (include "opentelemetry-operator.webhook.service.name" .) .Release.Namespace ) ( printf "%s.%s.svc.cluster.local" (include "opentelemetry-operator.webhook.service.name" .) .Release.Namespace ) -}} -{{- $ca := genCA ( include "opentelemetry-operator.webhook.service.name" . ) 365 -}} -{{- $cert := genSignedCert ( include "opentelemetry-operator.webhook.service.name" . ) nil $altNames 365 $ca -}} -apiVersion: v1 -kind: Secret -type: kubernetes.io/tls -metadata: - name: {{ include "opentelemetry-operator.controller.manager.service.cert.name" . }} - labels: - {{- include "sumologic.labels.common" . | nindent 4 }} -data: - tls.crt: {{ $cert.Cert | b64enc }} - tls.key: {{ $cert.Key | b64enc }} ---- -apiVersion: admissionregistration.k8s.io/v1 -kind: MutatingWebhookConfiguration -metadata: - annotations: - cert-manager.io/inject-ca-from: {{ printf "%s/%s" .Release.Namespace ( include "opentelemetry-operator.controller.manager.service.cert.name" . ) }} - labels: - {{- include "sumologic.labels.common" . | nindent 4 }} - app.kubernetes.io/name: opentelemetry-operator - name: opentelemetry-operator-mutating-webhook-configuration -webhooks: - - admissionReviewVersions: - - v1 - clientConfig: - service: - name: {{ include "opentelemetry-operator.webhook.service.name" . }} - namespace: {{ .Release.Namespace }} - path: /mutate-opentelemetry-io-v1alpha1-instrumentation - caBundle: {{ $ca.Cert | b64enc }} - failurePolicy: Fail - name: minstrumentation.kb.io - rules: - - apiGroups: - - opentelemetry.io - apiVersions: - - v1alpha1 - operations: - - CREATE - - UPDATE - resources: - - instrumentations - sideEffects: None - - admissionReviewVersions: - - v1 - clientConfig: - service: - name: {{ include "opentelemetry-operator.webhook.service.name" . }} - namespace: {{ .Release.Namespace }} - path: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector - caBundle: {{ $ca.Cert | b64enc }} - failurePolicy: Fail - name: mopentelemetrycollector.kb.io - rules: - - apiGroups: - - opentelemetry.io - apiVersions: - - v1alpha1 - operations: - - CREATE - - UPDATE - resources: - - opentelemetrycollectors - sideEffects: None - - admissionReviewVersions: - - v1 - clientConfig: - service: - name: {{ include "opentelemetry-operator.webhook.service.name" . }} - namespace: {{ .Release.Namespace }} - path: /mutate-v1-pod - caBundle: {{ $ca.Cert | b64enc }} - failurePolicy: Ignore - name: mpod.kb.io - rules: - - apiGroups: - - "" - apiVersions: - - v1 - operations: - - CREATE - - UPDATE - resources: - - pods - sideEffects: None -{{- end -}} diff --git a/deploy/helm/sumologic/templates/opentelemetry-operator/tls.yaml b/deploy/helm/sumologic/templates/opentelemetry-operator/tls.yaml deleted file mode 100644 index 6552ad91c0..0000000000 --- a/deploy/helm/sumologic/templates/opentelemetry-operator/tls.yaml +++ /dev/null @@ -1,5 +0,0 @@ -{{ $certManagerEnabled := index .Values "opentelemetry-operator" "admissionWebhooks" "certManager" "enabled" }} -{{ $operatorEnabled := index .Values "opentelemetry-operator" "enabled" }} -{{- if eq ( not $certManagerEnabled ) $operatorEnabled }} -{{ ( include "opentelemetry-operator.non_certmanager" . ) }} -{{- end }} From 9978d72c449415e29a5169d0d2f27df8d54f2f88 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Mon, 10 Oct 2022 15:59:20 +0200 Subject: [PATCH 03/21] chore(clusterole): add opentelemetry-operator api group --- deploy/helm/sumologic/templates/clusterrole.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deploy/helm/sumologic/templates/clusterrole.yaml b/deploy/helm/sumologic/templates/clusterrole.yaml index 92126127e5..74c2701560 100644 --- a/deploy/helm/sumologic/templates/clusterrole.yaml +++ b/deploy/helm/sumologic/templates/clusterrole.yaml @@ -39,3 +39,9 @@ rules: - {{ template "sumologic.metadata.name.logs.statefulset" . }} verbs: ["use"] {{- end }} +{{- if index .Values "opentelemetry-operator" "enabled" }} +- apiGroups: ["opentelemetry.io"] + resources: + - instrumentations + verbs: ["patch", "get", "create"] +{{- end }} From 1bd7de7df9162c086d7049a042ecf479e7828963 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 12 Oct 2022 13:15:07 +0200 Subject: [PATCH 04/21] chore(instrumentation): add instrumentation configmap and job --- .../configmap-instrumentation-cr.yaml | 15 +++++ .../instrumentation-cr.yaml | 61 ------------------ .../job-instrumentation-cr.yaml | 63 +++++++++++++++++++ 3 files changed, 78 insertions(+), 61 deletions(-) create mode 100644 deploy/helm/sumologic/templates/opentelemetry-operator/configmap-instrumentation-cr.yaml delete mode 100644 deploy/helm/sumologic/templates/opentelemetry-operator/instrumentation-cr.yaml create mode 100644 deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml diff --git a/deploy/helm/sumologic/templates/opentelemetry-operator/configmap-instrumentation-cr.yaml b/deploy/helm/sumologic/templates/opentelemetry-operator/configmap-instrumentation-cr.yaml new file mode 100644 index 0000000000..71a504cc5a --- /dev/null +++ b/deploy/helm/sumologic/templates/opentelemetry-operator/configmap-instrumentation-cr.yaml @@ -0,0 +1,15 @@ +{{ $operatorEnabled := index .Values "opentelemetry-operator" "enabled" }} +{{ $tracesEnabled := .Values.sumologic.traces.enabled }} +{{ $createDefaultInstrumentation := index .Values "opentelemetry-operator" "createDefaultInstrumentation" }} +{{- if and $operatorEnabled $tracesEnabled $createDefaultInstrumentation }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation.configmap" . }} + labels: + app: {{ template "sumologic.labels.app.opentelemetry.operator.instrumentation.configmap" . }} + {{- include "sumologic.labels.common" . | nindent 4 }} +data: + instrumentation: | + {{- include "opentelemetry-operator.instrumentation.custom.resource" . | nindent 4 }} +{{- end }} diff --git a/deploy/helm/sumologic/templates/opentelemetry-operator/instrumentation-cr.yaml b/deploy/helm/sumologic/templates/opentelemetry-operator/instrumentation-cr.yaml deleted file mode 100644 index ccf7c3e0f8..0000000000 --- a/deploy/helm/sumologic/templates/opentelemetry-operator/instrumentation-cr.yaml +++ /dev/null @@ -1,61 +0,0 @@ -{{ $operatorEnabled := index .Values "opentelemetry-operator" "enabled" }} -{{ $tracesEnabled := .Values.sumologic.traces.enabled }} -{{ $createDefaultInstrumentation := index .Values "opentelemetry-operator" "createDefaultInstrumentation" }} -{{- if and $operatorEnabled $tracesEnabled $createDefaultInstrumentation }} -{{- $ctx := . -}} -{{ $watchNamespace := index .Values "opentelemetry-operator" "manager" "env" }} -{{- if eq ( get $watchNamespace "WATCH_NAMESPACE" ) "" }} -{{ fail "It is mandatory to set value for \"opentelemetry-operator.manager.env.WATCH_NAMESPACE\" when opentelemetry-operator is enabled. Value is comma separated namespaces e.g. \"ns1\\,ns2\"" }} -{{ else }} -{{- range $ns := splitList "," ( index .Values "opentelemetry-operator" "manager" "env" "WATCH_NAMESPACE" ) }} ---- -apiVersion: opentelemetry.io/v1alpha1 -kind: Instrumentation -metadata: - namespace: {{ $ns }} - name: {{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation" $ctx }} - labels: - app: {{ template "sumologic.labels.app.opentelemetry.operator.instrumentation" $ctx }} - {{- include "sumologic.labels.common" $ctx | nindent 4 }} - annotations: - "helm.sh/hook": "post-install,post-upgrade" -spec: - propagators: - - tracecontext - - baggage - - b3 - resource: - addK8sUIDAttributes: false - sampler: - type: always_on - env: - - name: OTEL_APPLICATION_NAMESPACE_NAME - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: OTEL_RESOURCE_ATTRIBUTES - value: application=$(OTEL_APPLICATION_NAMESPACE_NAME) - python: - # Force to use older image because of LOGS exporting issue - # https://github.com/open-telemetry/opentelemetry-python/issues/2594 - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.28b1 - env: - - name: OTEL_TRACES_EXPORTER - value: otlp_proto_http - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318/v1/traces - nodejs: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.27.0 - env: - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4317 - java: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.11.1 - env: - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL - value: http/protobuf - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318/v1/traces -{{- end -}} -{{- end -}} -{{- end -}} diff --git a/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml b/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml new file mode 100644 index 0000000000..9fa798ef17 --- /dev/null +++ b/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml @@ -0,0 +1,63 @@ +{{ $operatorEnabled := index .Values "opentelemetry-operator" "enabled" }} +{{ $tracesEnabled := .Values.sumologic.traces.enabled }} +{{ $createDefaultInstrumentation := index .Values "opentelemetry-operator" "createDefaultInstrumentation" }} +{{- if and $operatorEnabled $tracesEnabled $createDefaultInstrumentation }} +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation.job" . }} + labels: + app: {{ template "sumologic.labels.app.opentelemetry.operator.instrumentation.job" . }} + {{- include "sumologic.labels.common" . | nindent 4 }} +spec: + template: + spec: + serviceAccountName: {{ template "sumologic.metadata.name.roles.serviceaccount" . }} + containers: + - name: instrumentation-cr-applier + image: sumologic/kubernetes-tools + volumeMounts: + - name: instrumentation-cr-configmap + mountPath: /tmp/instrumentation-cr.yaml + subPath: instrumentation + command: ["/bin/bash", "-c"] + args: + - | + max_wait=60 + sleep_interval=5 + counter=0 + ready=false + while [[ ready != "false" ]] + do + is_ready=$(curl -s -o /dev/null -m 3 -L -w ''%{http_code}'' {{ template "opentelemetry-operator.controller.manager.metrics.service.url" . }}) + + if [[ is_ready -eq "200" ]] + then + ready=true + break + else + echo "Waiting for opentelemetry-operator-controller-manager..." + sleep $sleep_interval + counter=$(($counter + $sleep_interval)) + fi + + if [[ "$counter" -gt "$max_wait" ]] + then + echo "Couldn't reach opentelemetry-operator-controller-manager" + echo "Instrumentation resources not applied!" + break + fi + done + + if [[ $ready == true ]] + then + echo "Applying Instrumentation resources" + kubectl apply -f /tmp/instrumentation-cr.yaml + fi + volumes: + - name: instrumentation-cr-configmap + configMap: + name: {{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation.configmap" . }} + restartPolicy: OnFailure + backoffLimit: 5 +{{- end -}} From c18bf9c87004adace5fc0e74ca97707e0b3ffb49 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 12 Oct 2022 13:16:15 +0200 Subject: [PATCH 05/21] chore(helpers): add instrumentation cr generator, cleanup --- deploy/helm/sumologic/templates/_helpers.tpl | 84 ++++++++++++++++++-- 1 file changed, 79 insertions(+), 5 deletions(-) diff --git a/deploy/helm/sumologic/templates/_helpers.tpl b/deploy/helm/sumologic/templates/_helpers.tpl index fe8fab5dfa..259ba53e2f 100644 --- a/deploy/helm/sumologic/templates/_helpers.tpl +++ b/deploy/helm/sumologic/templates/_helpers.tpl @@ -183,6 +183,14 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- template "sumologic.labels.app.opentelemetry.operator" . }}-instr {{- end -}} +{{- define "sumologic.labels.app.opentelemetry.operator.instrumentation.configmap" -}} +{{- template "sumologic.labels.app.opentelemetry.operator.instrumentation" . }}-cm +{{- end -}} + +{{- define "sumologic.labels.app.opentelemetry.operator.instrumentation.job" -}} +{{- template "sumologic.labels.app.opentelemetry.operator.instrumentation" . }} +{{- end -}} + {{- define "sumologic.labels.app.otelcol" -}} {{- template "sumologic.fullname" . }}-otelcol {{- end -}} @@ -515,6 +523,14 @@ helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded {{ template "sumologic.metadata.name.opentelemetry.operator" . }}-instr {{- end -}} +{{- define "sumologic.metadata.name.opentelemetry.operator.instrumentation.configmap" -}} +{{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation" . }}-cm +{{- end -}} + +{{- define "sumologic.metadata.name.opentelemetry.operator.instrumentation.job" -}} +{{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation" . }} +{{- end -}} + {{- define "sumologic.metadata.name.otelcol" -}} {{ template "sumologic.fullname" . }}-otelcol {{- end -}} @@ -1510,10 +1526,68 @@ Example Usage: {{- printf "%s.%s" ( include "sumologic.metadata.name.otelcol.service-headless" . ) .Release.Namespace }} {{- end -}} -{{- define "opentelemetry-operator.webhook.service.name" -}} -opentelemetry-operator-webhook-service +{{- define "opentelemetry-operator.controller.manager.metrics.service.url" -}} +http://opentelemetry-operator-controller-manager-metrics-service.{{ .Release.Namespace }}:8080/metrics {{- end -}} -{{- define "opentelemetry-operator.controller.manager.service.cert.name" -}} -opentelemetry-operator-controller-manager-service-cert -{{- end -}} +{{/* +Generate Instrumentation Custom Resource for specified namespaces. +*/}} + +{{- define "opentelemetry-operator.instrumentation.custom.resource" -}} +{{- $ctx := . -}} +{{ $watchNamespace := index .Values "opentelemetry-operator" "manager" "env" }} +{{- if eq ( get $watchNamespace "WATCH_NAMESPACE" ) "" }} +{{ fail "It is mandatory to set value for \"opentelemetry-operator.manager.env.WATCH_NAMESPACE\" when opentelemetry-operator is enabled. Value is comma separated namespaces e.g. \"ns1\\,ns2\"" }} +{{ else }} +{{- range $ns := splitList "," ( index .Values "opentelemetry-operator" "manager" "env" "WATCH_NAMESPACE" ) }} +--- +apiVersion: opentelemetry.io/v1alpha1 +kind: Instrumentation +metadata: + namespace: {{ $ns }} + name: {{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation" $ctx }} + labels: + app: {{ template "sumologic.labels.app.opentelemetry.operator.instrumentation" $ctx }} + {{- include "sumologic.labels.common" $ctx | nindent 4 }} + annotations: + "helm.sh/hook": "post-install,post-upgrade" +spec: + propagators: + - tracecontext + - baggage + - b3 + - xray + resource: + addK8sUIDAttributes: false + sampler: + type: always_on + env: + - name: OTEL_APPLICATION_NAMESPACE_NAME + value: {{ $ns }} + - name: OTEL_RESOURCE_ATTRIBUTES + value: application={{ $ns }} + python: + # Force to use older image because of LOGS exporting issue + # https://github.com/open-telemetry/opentelemetry-python/issues/2594 + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.28b1 + env: + - name: OTEL_TRACES_EXPORTER + value: otlp_proto_http + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318/v1/traces + nodejs: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.27.0 + env: + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4317 + java: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.16.0 + env: + - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL + value: http/protobuf + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318/v1/traces +{{- end -}} +{{- end -}} +{{- end -}} \ No newline at end of file From 4cef75e88f609fca182fdab45f1c1ffad73ee36b Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 12 Oct 2022 13:17:03 +0200 Subject: [PATCH 06/21] chore(operator): enable webhooks --- deploy/helm/sumologic/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 39c2219742..340706323f 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -5118,7 +5118,7 @@ opentelemetry-operator: createDefaultInstrumentation: true admissionWebhooks: failurePolicy: Fail - enabled: false + enabled: true certManager: enabled: false From 9692567d9449a6436d56ea869b0039340e8ede9b Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 12 Oct 2022 13:18:24 +0200 Subject: [PATCH 07/21] chore(helpers): +\n --- deploy/helm/sumologic/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/templates/_helpers.tpl b/deploy/helm/sumologic/templates/_helpers.tpl index 259ba53e2f..11afcbf385 100644 --- a/deploy/helm/sumologic/templates/_helpers.tpl +++ b/deploy/helm/sumologic/templates/_helpers.tpl @@ -1590,4 +1590,4 @@ spec: value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318/v1/traces {{- end -}} {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} From cdb1f6c8e1a94874c62a7891e44b8ec4685eb19f Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 12 Oct 2022 14:58:53 +0200 Subject: [PATCH 08/21] chore(docs): update instrumentation url --- deploy/helm/sumologic/templates/NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/templates/NOTES.txt b/deploy/helm/sumologic/templates/NOTES.txt index c649612454..f66fa6e372 100644 --- a/deploy/helm/sumologic/templates/NOTES.txt +++ b/deploy/helm/sumologic/templates/NOTES.txt @@ -25,7 +25,7 @@ We recommend turning this property on for production environments by setting met {{- if eq .Values.sumologic.traces.enabled true }} -Please see https://help.sumologic.com/Traces/01Getting_Started_with_Transaction_Tracing to find out +Please see https://help.sumologic.com/docs/apm/traces/get-started-transaction-tracing to find out how to instrument your application and send traces. The list of endpoints in your Kubernetes cluster to which traces can be sent: {{- if eq .Values.otelagent.enabled false }} From a485431491fee2b234ddcabd33ee60303da8bb63 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 12 Oct 2022 22:14:43 +0200 Subject: [PATCH 09/21] chore(instrumentation): update configuration for dotnet and java --- deploy/helm/sumologic/templates/_helpers.tpl | 25 +++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/deploy/helm/sumologic/templates/_helpers.tpl b/deploy/helm/sumologic/templates/_helpers.tpl index 11afcbf385..9e5be2e102 100644 --- a/deploy/helm/sumologic/templates/_helpers.tpl +++ b/deploy/helm/sumologic/templates/_helpers.tpl @@ -1567,6 +1567,21 @@ spec: value: {{ $ns }} - name: OTEL_RESOURCE_ATTRIBUTES value: application={{ $ns }} + dotnet: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1 + env: + - name: OTEL_PROPAGATORS + value: tracecontext,baggage + - name: OTEL_METRICS_EXPORTER + value: none + - name: OTEL_LOGS_EXPORTER + value: none + - name: OTEL_TRACES_EXPORTER + value: otlp + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: http/protobuf + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318 python: # Force to use older image because of LOGS exporting issue # https://github.com/open-telemetry/opentelemetry-python/issues/2594 @@ -1584,10 +1599,14 @@ spec: java: image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.16.0 env: - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL + - name: OTEL_METRICS_EXPORTER + value: none + - name: OTEL_TRACES_EXPORTER + value: otlp + - name: OTEL_EXPORTER_OTLP_PROTOCOL value: http/protobuf - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318/v1/traces + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318 {{- end -}} {{- end -}} {{- end -}} From a2c6daf8ade85bccf072d088b734a23463713a62 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 12 Oct 2022 22:30:28 +0200 Subject: [PATCH 10/21] chore(tests): update instrumentation cm helm tests --- .../config.sh | 3 - .../static/instrumentation.output.yaml | 102 ------------ .../config.sh | 3 + .../static/instrumentation.input.yaml | 8 + .../static/instrumentation.output.yaml | 150 ++++++++++++++++++ 5 files changed, 161 insertions(+), 105 deletions(-) delete mode 100644 tests/helm/opentelemetry_operator_instrumentation_cr/config.sh delete mode 100644 tests/helm/opentelemetry_operator_instrumentation_cr/static/instrumentation.output.yaml create mode 100644 tests/helm/opentelemetry_operator_instrumentation_cr_configmap/config.sh create mode 100644 tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.input.yaml create mode 100644 tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr/config.sh b/tests/helm/opentelemetry_operator_instrumentation_cr/config.sh deleted file mode 100644 index f448e2848d..0000000000 --- a/tests/helm/opentelemetry_operator_instrumentation_cr/config.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -export TEST_TEMPLATE="templates/opentelemetry-operator/instrumentation-cr.yaml" diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr/static/instrumentation.output.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr/static/instrumentation.output.yaml deleted file mode 100644 index ec5fedc4bf..0000000000 --- a/tests/helm/opentelemetry_operator_instrumentation_cr/static/instrumentation.output.yaml +++ /dev/null @@ -1,102 +0,0 @@ ---- -# Source: sumologic/templates/opentelemetry-operator/instrumentation-cr.yaml -apiVersion: opentelemetry.io/v1alpha1 -kind: Instrumentation -metadata: - namespace: ot-operator1 - name: RELEASE-NAME-sumologic-ot-operator-instr - labels: - app: RELEASE-NAME-sumologic-ot-operator-instr - chart: "sumologic-%CURRENT_CHART_VERSION%" - release: "RELEASE-NAME" - heritage: "Helm" - annotations: - "helm.sh/hook": "post-install,post-upgrade" -spec: - propagators: - - tracecontext - - baggage - - b3 - resource: - addK8sUIDAttributes: false - sampler: - type: always_on - env: - - name: OTEL_APPLICATION_NAMESPACE_NAME - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: OTEL_RESOURCE_ATTRIBUTES - value: application=$(OTEL_APPLICATION_NAMESPACE_NAME) - python: - # Force to use older image because of LOGS exporting issue - # https://github.com/open-telemetry/opentelemetry-python/issues/2594 - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.28b1 - env: - - name: OTEL_TRACES_EXPORTER - value: otlp_proto_http - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318/v1/traces - nodejs: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.27.0 - env: - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317 - java: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.11.1 - env: - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL - value: http/protobuf - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318/v1/traces ---- -# Source: sumologic/templates/opentelemetry-operator/instrumentation-cr.yaml -apiVersion: opentelemetry.io/v1alpha1 -kind: Instrumentation -metadata: - namespace: ot-operator2 - name: RELEASE-NAME-sumologic-ot-operator-instr - labels: - app: RELEASE-NAME-sumologic-ot-operator-instr - chart: "sumologic-%CURRENT_CHART_VERSION%" - release: "RELEASE-NAME" - heritage: "Helm" - annotations: - "helm.sh/hook": "post-install,post-upgrade" -spec: - propagators: - - tracecontext - - baggage - - b3 - resource: - addK8sUIDAttributes: false - sampler: - type: always_on - env: - - name: OTEL_APPLICATION_NAMESPACE_NAME - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: OTEL_RESOURCE_ATTRIBUTES - value: application=$(OTEL_APPLICATION_NAMESPACE_NAME) - python: - # Force to use older image because of LOGS exporting issue - # https://github.com/open-telemetry/opentelemetry-python/issues/2594 - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.28b1 - env: - - name: OTEL_TRACES_EXPORTER - value: otlp_proto_http - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318/v1/traces - nodejs: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.27.0 - env: - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317 - java: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.11.1 - env: - - name: OTEL_EXPORTER_OTLP_TRACES_PROTOCOL - value: http/protobuf - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318/v1/traces diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/config.sh b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/config.sh new file mode 100644 index 0000000000..5177be2768 --- /dev/null +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/config.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +export TEST_TEMPLATE="templates/opentelemetry-operator/configmap-instrumentation-cr.yaml" diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.input.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.input.yaml new file mode 100644 index 0000000000..65d6ee8cfa --- /dev/null +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.input.yaml @@ -0,0 +1,8 @@ +sumologic: + traces: + enabled: true +opentelemetry-operator: + enabled: true + manager: + env: + WATCH_NAMESPACE: "ot-operator1,ot-operator2" diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml new file mode 100644 index 0000000000..8aac9ae41c --- /dev/null +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml @@ -0,0 +1,150 @@ +--- +# Source: sumologic/templates/opentelemetry-operator/configmap-instrumentation-cr.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: RELEASE-NAME-sumologic-ot-operator-instr-cm + labels: + app: RELEASE-NAME-sumologic-ot-operator-instr-cm + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" +data: + instrumentation: | + + --- + apiVersion: opentelemetry.io/v1alpha1 + kind: Instrumentation + metadata: + namespace: ot-operator1 + name: RELEASE-NAME-sumologic-ot-operator-instr + labels: + app: RELEASE-NAME-sumologic-ot-operator-instr + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" + annotations: + "helm.sh/hook": "post-install,post-upgrade" + spec: + propagators: + - tracecontext + - baggage + - b3 + - xray + resource: + addK8sUIDAttributes: false + sampler: + type: always_on + env: + - name: OTEL_APPLICATION_NAMESPACE_NAME + value: ot-operator1 + - name: OTEL_RESOURCE_ATTRIBUTES + value: application=ot-operator1 + dotnet: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1 + env: + - name: OTEL_PROPAGATORS + value: tracecontext,baggage + - name: OTEL_METRICS_EXPORTER + value: none + - name: OTEL_LOGS_EXPORTER + value: none + - name: OTEL_TRACES_EXPORTER + value: otlp + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: http/protobuf + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318 + python: + # Force to use older image because of LOGS exporting issue + # https://github.com/open-telemetry/opentelemetry-python/issues/2594 + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.28b1 + env: + - name: OTEL_TRACES_EXPORTER + value: otlp_proto_http + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318/v1/traces + nodejs: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.27.0 + env: + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317 + java: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.16.0 + env: + - name: OTEL_METRICS_EXPORTER + value: none + - name: OTEL_TRACES_EXPORTER + value: otlp + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: http/protobuf + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318 + --- + apiVersion: opentelemetry.io/v1alpha1 + kind: Instrumentation + metadata: + namespace: ot-operator2 + name: RELEASE-NAME-sumologic-ot-operator-instr + labels: + app: RELEASE-NAME-sumologic-ot-operator-instr + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" + annotations: + "helm.sh/hook": "post-install,post-upgrade" + spec: + propagators: + - tracecontext + - baggage + - b3 + - xray + resource: + addK8sUIDAttributes: false + sampler: + type: always_on + env: + - name: OTEL_APPLICATION_NAMESPACE_NAME + value: ot-operator2 + - name: OTEL_RESOURCE_ATTRIBUTES + value: application=ot-operator2 + dotnet: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1 + env: + - name: OTEL_PROPAGATORS + value: tracecontext,baggage + - name: OTEL_METRICS_EXPORTER + value: none + - name: OTEL_LOGS_EXPORTER + value: none + - name: OTEL_TRACES_EXPORTER + value: otlp + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: http/protobuf + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318 + python: + # Force to use older image because of LOGS exporting issue + # https://github.com/open-telemetry/opentelemetry-python/issues/2594 + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.28b1 + env: + - name: OTEL_TRACES_EXPORTER + value: otlp_proto_http + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318/v1/traces + nodejs: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.27.0 + env: + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317 + java: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.16.0 + env: + - name: OTEL_METRICS_EXPORTER + value: none + - name: OTEL_TRACES_EXPORTER + value: otlp + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: http/protobuf + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318 From 5e8c5960c1d7c3577e7afa6108ac616b7af2a187 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 12 Oct 2022 22:35:26 +0200 Subject: [PATCH 11/21] chore(tests): add instrumentation job helm tests --- .../config.sh | 3 + .../static/job.input.yaml | 8 +++ .../static/job.output.yaml | 62 +++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 tests/helm/opentelemetry_operator_instrumentation_cr_job/config.sh create mode 100644 tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.input.yaml create mode 100644 tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_job/config.sh b/tests/helm/opentelemetry_operator_instrumentation_cr_job/config.sh new file mode 100644 index 0000000000..995b53bd83 --- /dev/null +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_job/config.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +export TEST_TEMPLATE="templates/opentelemetry-operator/job-instrumentation-cr.yaml" diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.input.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.input.yaml new file mode 100644 index 0000000000..64e51efceb --- /dev/null +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.input.yaml @@ -0,0 +1,8 @@ +sumologic: + traces: + enabled: true +opentelemetry-operator: + enabled: true + manager: + env: + WATCH_NAMESPACE: "ot-operator1" diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml new file mode 100644 index 0000000000..fdd0104c40 --- /dev/null +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml @@ -0,0 +1,62 @@ +--- +# Source: sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml +apiVersion: batch/v1 +kind: Job +metadata: + name: RELEASE-NAME-sumologic-ot-operator-instr + labels: + app: RELEASE-NAME-sumologic-ot-operator-instr + chart: "sumologic-%CURRENT_CHART_VERSION%" + release: "RELEASE-NAME" + heritage: "Helm" +spec: + template: + spec: + serviceAccountName: RELEASE-NAME-sumologic + containers: + - name: instrumentation-cr-applier + image: sumologic/kubernetes-tools + volumeMounts: + - name: instrumentation-cr-configmap + mountPath: /tmp/instrumentation-cr.yaml + subPath: instrumentation + command: ["/bin/bash", "-c"] + args: + - | + max_wait=60 + sleep_interval=5 + counter=0 + ready=false + while [[ ready != "false" ]] + do + is_ready=$(curl -s -o /dev/null -m 3 -L -w ''%{http_code}'' http://opentelemetry-operator-controller-manager-metrics-service.sumologic:8080/metrics) + + if [[ is_ready -eq "200" ]] + then + ready=true + break + else + echo "Waiting for opentelemetry-operator-controller-manager..." + sleep $sleep_interval + counter=$(($counter + $sleep_interval)) + fi + + if [[ "$counter" -gt "$max_wait" ]] + then + echo "Couldn't reach opentelemetry-operator-controller-manager" + echo "Instrumentation resources not applied!" + break + fi + done + + if [[ $ready == true ]] + then + echo "Applying Instrumentation resources" + kubectl apply -f /tmp/instrumentation-cr.yaml + fi + volumes: + - name: instrumentation-cr-configmap + configMap: + name: RELEASE-NAME-sumologic-ot-operator-instr-cm + restartPolicy: OnFailure + backoffLimit: 5 From 46d3d4362fbf588271cc354fbfcb9f54a7a06f70 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Wed, 12 Oct 2022 22:36:04 +0200 Subject: [PATCH 12/21] chore(tests): cleanup operator tests --- .../static/instrumentation.input.yaml | 15 --- .../helm/opentelemetry_operator_tls/config.sh | 3 - .../static/tls.input.yaml | 15 --- .../static/tls.output.yaml | 91 ------------------- 4 files changed, 124 deletions(-) delete mode 100644 tests/helm/opentelemetry_operator_instrumentation_cr/static/instrumentation.input.yaml delete mode 100644 tests/helm/opentelemetry_operator_tls/config.sh delete mode 100644 tests/helm/opentelemetry_operator_tls/static/tls.input.yaml delete mode 100644 tests/helm/opentelemetry_operator_tls/static/tls.output.yaml diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr/static/instrumentation.input.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr/static/instrumentation.input.yaml deleted file mode 100644 index 40eca59ac2..0000000000 --- a/tests/helm/opentelemetry_operator_instrumentation_cr/static/instrumentation.input.yaml +++ /dev/null @@ -1,15 +0,0 @@ -fluentd: - logs: - containers: - excludeNamespaceRegex: "kube\\s+" - excludePodRegex: "^foo.*" - excludeContainerRegex: "[123+]bar$|xyz" - excludeHostRegex: hhh123 -sumologic: - traces: - enabled: true -opentelemetry-operator: - enabled: true - manager: - env: - WATCH_NAMESPACE: "ot-operator1,ot-operator2" diff --git a/tests/helm/opentelemetry_operator_tls/config.sh b/tests/helm/opentelemetry_operator_tls/config.sh deleted file mode 100644 index 2448d535ef..0000000000 --- a/tests/helm/opentelemetry_operator_tls/config.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -export TEST_TEMPLATE="templates/opentelemetry-operator/tls.yaml" diff --git a/tests/helm/opentelemetry_operator_tls/static/tls.input.yaml b/tests/helm/opentelemetry_operator_tls/static/tls.input.yaml deleted file mode 100644 index 1dde04fb17..0000000000 --- a/tests/helm/opentelemetry_operator_tls/static/tls.input.yaml +++ /dev/null @@ -1,15 +0,0 @@ -fluentd: - logs: - containers: - excludeNamespaceRegex: "kube\\s+" - excludePodRegex: "^foo.*" - excludeContainerRegex: "[123+]bar$|xyz" - excludeHostRegex: hhh123 -sumologic: - traces: - enabled: true -opentelemetry-operator: - enabled: true - manager: - env: - WATCH_NAMESPACE: "ot-operator1" diff --git a/tests/helm/opentelemetry_operator_tls/static/tls.output.yaml b/tests/helm/opentelemetry_operator_tls/static/tls.output.yaml deleted file mode 100644 index 9664f1d5e3..0000000000 --- a/tests/helm/opentelemetry_operator_tls/static/tls.output.yaml +++ /dev/null @@ -1,91 +0,0 @@ ---- -# Source: sumologic/templates/opentelemetry-operator/tls.yaml -apiVersion: v1 -kind: Secret -type: kubernetes.io/tls -metadata: - name: opentelemetry-operator-controller-manager-service-cert - labels: - chart: "sumologic-%CURRENT_CHART_VERSION%" - release: "RELEASE-NAME" - heritage: "Helm" -data: - tls.crt: "%TLS_CERTIFICATE%" - tls.key: "%TLS_CERTIFICATE%" ---- -# Source: sumologic/templates/opentelemetry-operator/tls.yaml -apiVersion: admissionregistration.k8s.io/v1 -kind: MutatingWebhookConfiguration -metadata: - annotations: - cert-manager.io/inject-ca-from: sumologic/opentelemetry-operator-controller-manager-service-cert - labels: - chart: "sumologic-%CURRENT_CHART_VERSION%" - release: "RELEASE-NAME" - heritage: "Helm" - app.kubernetes.io/name: opentelemetry-operator - name: opentelemetry-operator-mutating-webhook-configuration -webhooks: - - admissionReviewVersions: - - v1 - clientConfig: - service: - name: opentelemetry-operator-webhook-service - namespace: sumologic - path: /mutate-opentelemetry-io-v1alpha1-instrumentation - caBundle: "%CA_TLS_CERTIFICATE%" - failurePolicy: Fail - name: minstrumentation.kb.io - rules: - - apiGroups: - - opentelemetry.io - apiVersions: - - v1alpha1 - operations: - - CREATE - - UPDATE - resources: - - instrumentations - sideEffects: None - - admissionReviewVersions: - - v1 - clientConfig: - service: - name: opentelemetry-operator-webhook-service - namespace: sumologic - path: /mutate-opentelemetry-io-v1alpha1-opentelemetrycollector - caBundle: "%CA_TLS_CERTIFICATE%" - failurePolicy: Fail - name: mopentelemetrycollector.kb.io - rules: - - apiGroups: - - opentelemetry.io - apiVersions: - - v1alpha1 - operations: - - CREATE - - UPDATE - resources: - - opentelemetrycollectors - sideEffects: None - - admissionReviewVersions: - - v1 - clientConfig: - service: - name: opentelemetry-operator-webhook-service - namespace: sumologic - path: /mutate-v1-pod - caBundle: "%CA_TLS_CERTIFICATE%" - failurePolicy: Ignore - name: mpod.kb.io - rules: - - apiGroups: - - "" - apiVersions: - - v1 - operations: - - CREATE - - UPDATE - resources: - - pods - sideEffects: None From e19ac885fde9c1f119ed2e114b9c7dadf4e000ab Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Mon, 17 Oct 2022 13:41:21 +0200 Subject: [PATCH 13/21] chore(instrumentatio-cr): move instrumentation cr to confs --- .../instrumentation.cr.yaml | 72 +++++++++++++++++ deploy/helm/sumologic/templates/_helpers.tpl | 81 ------------------- .../configmap-instrumentation-cr.yaml | 4 +- .../job-instrumentation-cr.yaml | 2 +- 4 files changed, 75 insertions(+), 84 deletions(-) create mode 100644 deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml diff --git a/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml b/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml new file mode 100644 index 0000000000..1cf4ce85a7 --- /dev/null +++ b/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml @@ -0,0 +1,72 @@ +{{- $ctx := . -}} +{{ $watchNamespace := index .Values "opentelemetry-operator" "manager" "env" }} +{{- if eq ( get $watchNamespace "WATCH_NAMESPACE" ) "" }} +{{ fail "It is mandatory to set value for \"opentelemetry-operator.manager.env.WATCH_NAMESPACE\" when opentelemetry-operator is enabled. Value is comma separated namespaces e.g. \"ns1\\,ns2\"" }} +{{ else }} +{{- range $ns := splitList "," ( index .Values "opentelemetry-operator" "manager" "env" "WATCH_NAMESPACE" ) }} +--- +apiVersion: opentelemetry.io/v1alpha1 +kind: Instrumentation +metadata: + namespace: {{ $ns }} + name: {{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation" $ctx }} + labels: + app: {{ template "sumologic.labels.app.opentelemetry.operator.instrumentation" $ctx }} + {{- include "sumologic.labels.common" $ctx | nindent 4 }} +spec: + propagators: + - tracecontext + - baggage + - b3 + - xray + resource: + addK8sUIDAttributes: false + sampler: + type: always_on + env: + - name: OTEL_APPLICATION_NAMESPACE_NAME + value: {{ $ns }} + - name: OTEL_RESOURCE_ATTRIBUTES + value: application={{ $ns }} + dotnet: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1 + env: + - name: OTEL_PROPAGATORS + value: tracecontext,baggage + - name: OTEL_METRICS_EXPORTER + value: none + - name: OTEL_LOGS_EXPORTER + value: none + - name: OTEL_TRACES_EXPORTER + value: otlp + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: http/protobuf + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318 + python: + # Force to use older image because of LOGS exporting issue + # https://github.com/open-telemetry/opentelemetry-python/issues/2594 + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.28b1 + env: + - name: OTEL_TRACES_EXPORTER + value: otlp_proto_http + - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318/v1/traces + nodejs: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.27.0 + env: + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4317 + java: + image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.16.0 + env: + - name: OTEL_METRICS_EXPORTER + value: none + - name: OTEL_TRACES_EXPORTER + value: otlp + - name: OTEL_EXPORTER_OTLP_PROTOCOL + value: http/protobuf + - name: OTEL_EXPORTER_OTLP_ENDPOINT + value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318 +{{- end -}} +{{- end -}} diff --git a/deploy/helm/sumologic/templates/_helpers.tpl b/deploy/helm/sumologic/templates/_helpers.tpl index 9e5be2e102..f9a6eedf07 100644 --- a/deploy/helm/sumologic/templates/_helpers.tpl +++ b/deploy/helm/sumologic/templates/_helpers.tpl @@ -1529,84 +1529,3 @@ Example Usage: {{- define "opentelemetry-operator.controller.manager.metrics.service.url" -}} http://opentelemetry-operator-controller-manager-metrics-service.{{ .Release.Namespace }}:8080/metrics {{- end -}} - -{{/* -Generate Instrumentation Custom Resource for specified namespaces. -*/}} - -{{- define "opentelemetry-operator.instrumentation.custom.resource" -}} -{{- $ctx := . -}} -{{ $watchNamespace := index .Values "opentelemetry-operator" "manager" "env" }} -{{- if eq ( get $watchNamespace "WATCH_NAMESPACE" ) "" }} -{{ fail "It is mandatory to set value for \"opentelemetry-operator.manager.env.WATCH_NAMESPACE\" when opentelemetry-operator is enabled. Value is comma separated namespaces e.g. \"ns1\\,ns2\"" }} -{{ else }} -{{- range $ns := splitList "," ( index .Values "opentelemetry-operator" "manager" "env" "WATCH_NAMESPACE" ) }} ---- -apiVersion: opentelemetry.io/v1alpha1 -kind: Instrumentation -metadata: - namespace: {{ $ns }} - name: {{ template "sumologic.metadata.name.opentelemetry.operator.instrumentation" $ctx }} - labels: - app: {{ template "sumologic.labels.app.opentelemetry.operator.instrumentation" $ctx }} - {{- include "sumologic.labels.common" $ctx | nindent 4 }} - annotations: - "helm.sh/hook": "post-install,post-upgrade" -spec: - propagators: - - tracecontext - - baggage - - b3 - - xray - resource: - addK8sUIDAttributes: false - sampler: - type: always_on - env: - - name: OTEL_APPLICATION_NAMESPACE_NAME - value: {{ $ns }} - - name: OTEL_RESOURCE_ATTRIBUTES - value: application={{ $ns }} - dotnet: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-dotnet:0.3.1-beta.1 - env: - - name: OTEL_PROPAGATORS - value: tracecontext,baggage - - name: OTEL_METRICS_EXPORTER - value: none - - name: OTEL_LOGS_EXPORTER - value: none - - name: OTEL_TRACES_EXPORTER - value: otlp - - name: OTEL_EXPORTER_OTLP_PROTOCOL - value: http/protobuf - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318 - python: - # Force to use older image because of LOGS exporting issue - # https://github.com/open-telemetry/opentelemetry-python/issues/2594 - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:0.28b1 - env: - - name: OTEL_TRACES_EXPORTER - value: otlp_proto_http - - name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT - value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318/v1/traces - nodejs: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:0.27.0 - env: - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4317 - java: - image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:1.16.0 - env: - - name: OTEL_METRICS_EXPORTER - value: none - - name: OTEL_TRACES_EXPORTER - value: otlp - - name: OTEL_EXPORTER_OTLP_PROTOCOL - value: http/protobuf - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4318 -{{- end -}} -{{- end -}} -{{- end -}} diff --git a/deploy/helm/sumologic/templates/opentelemetry-operator/configmap-instrumentation-cr.yaml b/deploy/helm/sumologic/templates/opentelemetry-operator/configmap-instrumentation-cr.yaml index 71a504cc5a..7ed3e8b38c 100644 --- a/deploy/helm/sumologic/templates/opentelemetry-operator/configmap-instrumentation-cr.yaml +++ b/deploy/helm/sumologic/templates/opentelemetry-operator/configmap-instrumentation-cr.yaml @@ -10,6 +10,6 @@ metadata: app: {{ template "sumologic.labels.app.opentelemetry.operator.instrumentation.configmap" . }} {{- include "sumologic.labels.common" . | nindent 4 }} data: - instrumentation: | - {{- include "opentelemetry-operator.instrumentation.custom.resource" . | nindent 4 }} + instrumentation.cr.yaml: | + {{- (tpl (.Files.Get "conf/opentelemetry-operator/instrumentation.cr.yaml") .) | nindent 4 }} {{- end }} diff --git a/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml b/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml index 9fa798ef17..1b62e1f217 100644 --- a/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml +++ b/deploy/helm/sumologic/templates/opentelemetry-operator/job-instrumentation-cr.yaml @@ -19,7 +19,7 @@ spec: volumeMounts: - name: instrumentation-cr-configmap mountPath: /tmp/instrumentation-cr.yaml - subPath: instrumentation + subPath: instrumentation.cr.yaml command: ["/bin/bash", "-c"] args: - | From d7e9c53f732900c3bd0ceac98c3e0fffc57a1d41 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Mon, 17 Oct 2022 14:01:46 +0200 Subject: [PATCH 14/21] chore(instrumentation-cr): fix helm tests --- .../static/instrumentation.output.yaml | 6 +----- .../static/job.output.yaml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml index 8aac9ae41c..242f6fddfe 100644 --- a/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.output.yaml @@ -10,7 +10,7 @@ metadata: release: "RELEASE-NAME" heritage: "Helm" data: - instrumentation: | + instrumentation.cr.yaml: | --- apiVersion: opentelemetry.io/v1alpha1 @@ -23,8 +23,6 @@ data: chart: "sumologic-%CURRENT_CHART_VERSION%" release: "RELEASE-NAME" heritage: "Helm" - annotations: - "helm.sh/hook": "post-install,post-upgrade" spec: propagators: - tracecontext @@ -91,8 +89,6 @@ data: chart: "sumologic-%CURRENT_CHART_VERSION%" release: "RELEASE-NAME" heritage: "Helm" - annotations: - "helm.sh/hook": "post-install,post-upgrade" spec: propagators: - tracecontext diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml index fdd0104c40..891de9f42f 100644 --- a/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.output.yaml @@ -19,7 +19,7 @@ spec: volumeMounts: - name: instrumentation-cr-configmap mountPath: /tmp/instrumentation-cr.yaml - subPath: instrumentation + subPath: instrumentation.cr.yaml command: ["/bin/bash", "-c"] args: - | From 1a471f60e79add448c8d5b6cce27ff4dcb83efb3 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Mon, 17 Oct 2022 14:10:15 +0200 Subject: [PATCH 15/21] chore(changelog): update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e45ee9064d..8975963e1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - feat: enable remote write proxy by default [#2483] - chore: update kubernetes-tools to 2.13.0 [#2515] - feat(metadata): upgrade otelcol to v0.57.2-sumo-1 [#2526] +- chore(opentelemetry-operator): upgrade opentelemetry-operator subchart to 0.13.0 [#2561] ### Fixed @@ -30,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2510]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2510 [#2526]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2526 [#2544]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2544 +[#2561]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2561 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.17.0...main ## [v2.17.0] From 08511158dceeec56297726ad1957c958a96df40f Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Mon, 17 Oct 2022 14:27:50 +0200 Subject: [PATCH 16/21] chore(changelog): fix --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea931fc04a..f7eeb8b459 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#2510]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2510 [#2526]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2526 [#2544]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2544 +[#2554]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2554 [#2549]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2549 [#2561]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2561 [Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.17.0...main From 7486256420b078207c749163c84d0b37dc01b9a7 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Mon, 17 Oct 2022 14:29:31 +0200 Subject: [PATCH 17/21] chore(changelog): fix --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7eeb8b459..2f05a9866d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -723,7 +723,7 @@ with the [old configuration][source_processor_old_config] and apply correspondin [v2_3_0]: https://github.com/SumoLogic/sumologic-kubernetes-collection/releases/tag/v2.3.0 [v0.38.1-cfp]: https://github.com/SumoLogic/opentelemetry-collector-contrib/tree/v0.38.1-sumo/processor/cascadingfilterprocessor#cascading-filter-processor -[v0.38.1-cfp-help]: https://help.sumologic.com/Traces/03Advanced_Configuration/What_if_I_don%27t_want_to_send_all_the_tracing_data_to_Sumo_Logic%3F +[v0.38.1-cfp-help]: https://help.sumologic.com/docs/apm/traces/advanced-configuration/filter-shape-tracing-data [#1907]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/1907 [#1906]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/1906 [#1895]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/1895 From c64bd72d5f25db52586be04687b3b88f2e7de516 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Tue, 18 Oct 2022 14:02:16 +0200 Subject: [PATCH 18/21] chore(tests): update tests --- .../static/instrumentation.input.yaml | 5 ++--- .../static/job.input.yaml | 5 ++--- .../values/values_helm_opentelemetry_operator_enabled.yaml | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.input.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.input.yaml index 65d6ee8cfa..a40d91fb55 100644 --- a/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.input.yaml +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_configmap/static/instrumentation.input.yaml @@ -3,6 +3,5 @@ sumologic: enabled: true opentelemetry-operator: enabled: true - manager: - env: - WATCH_NAMESPACE: "ot-operator1,ot-operator2" + createDefaultInstrumentation: true + instrumentationNamespaces: "ot-operator1,ot-operator2" diff --git a/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.input.yaml b/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.input.yaml index 64e51efceb..f6970e66ad 100644 --- a/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.input.yaml +++ b/tests/helm/opentelemetry_operator_instrumentation_cr_job/static/job.input.yaml @@ -3,6 +3,5 @@ sumologic: enabled: true opentelemetry-operator: enabled: true - manager: - env: - WATCH_NAMESPACE: "ot-operator1" + createDefaultInstrumentation: true + instrumentationNamespaces: "ot-operator1" diff --git a/tests/integration/values/values_helm_opentelemetry_operator_enabled.yaml b/tests/integration/values/values_helm_opentelemetry_operator_enabled.yaml index aba13e2f48..fb9b040d10 100644 --- a/tests/integration/values/values_helm_opentelemetry_operator_enabled.yaml +++ b/tests/integration/values/values_helm_opentelemetry_operator_enabled.yaml @@ -4,9 +4,8 @@ sumologic: opentelemetry-operator: enabled: true - manager: - env: - WATCH_NAMESPACE: "ot-operator1,ot-operator2" + createDefaultInstrumentation: true + instrumentationNamespaces: "ot-operator1,ot-operator2" otelgateway: config: From ede055089087c2954ff8a80e6ebb9cd4e8ba311f Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Tue, 18 Oct 2022 14:03:04 +0200 Subject: [PATCH 19/21] chore(opentelemetry-operator): split instrumentation resource creation --- deploy/helm/sumologic/values.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml index 614a0dd936..e3b1de243d 100644 --- a/deploy/helm/sumologic/values.yaml +++ b/deploy/helm/sumologic/values.yaml @@ -5115,7 +5115,11 @@ tailing-sidecar-operator: ## ref: https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-operator opentelemetry-operator: enabled: false - createDefaultInstrumentation: true + + ## Specific for Tracing - Instrumentation resource creation + createDefaultInstrumentation: false + instrumentationNamespaces: "" + admissionWebhooks: failurePolicy: Fail enabled: true From 5ed5253101d917cd3208a93b9128f05f4755e989 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Tue, 18 Oct 2022 14:03:54 +0200 Subject: [PATCH 20/21] chore(opentelemetry-operator): split instrumentation resource creation --- .../conf/opentelemetry-operator/instrumentation.cr.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml b/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml index 1cf4ce85a7..4e562c5ee2 100644 --- a/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml +++ b/deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml @@ -1,9 +1,9 @@ {{- $ctx := . -}} -{{ $watchNamespace := index .Values "opentelemetry-operator" "manager" "env" }} -{{- if eq ( get $watchNamespace "WATCH_NAMESPACE" ) "" }} -{{ fail "It is mandatory to set value for \"opentelemetry-operator.manager.env.WATCH_NAMESPACE\" when opentelemetry-operator is enabled. Value is comma separated namespaces e.g. \"ns1\\,ns2\"" }} +{{ $instrumentationNamespaces := index .Values "opentelemetry-operator" }} +{{- if eq ( get $instrumentationNamespaces "instrumentationNamespaces" ) "" }} +{{ fail "No value for \"opentelemetry-operator.instrumentationNamespaces\".Value is comma separated namespaces e.g. \"ns1\\,ns2\"" }} {{ else }} -{{- range $ns := splitList "," ( index .Values "opentelemetry-operator" "manager" "env" "WATCH_NAMESPACE" ) }} +{{- range $ns := splitList "," ( index .Values "opentelemetry-operator" "instrumentationNamespaces" ) }} --- apiVersion: opentelemetry.io/v1alpha1 kind: Instrumentation From 47d4004b0b47303141c742513a34ebd921dac6c3 Mon Sep 17 00:00:00 2001 From: Mateusz Rumian Date: Tue, 18 Oct 2022 14:05:27 +0200 Subject: [PATCH 21/21] chore(readme): update parameters list --- deploy/helm/sumologic/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/helm/sumologic/README.md b/deploy/helm/sumologic/README.md index 3ee594fc00..bd59e2d7d2 100644 --- a/deploy/helm/sumologic/README.md +++ b/deploy/helm/sumologic/README.md @@ -304,8 +304,8 @@ The following table lists the configurable parameters of the Sumo Logic chart an | `telegraf-operator.default` | Name of the default output configuration. | `sumologic-prometheus` | | `telegraf-operator.data` | Telegraf sidecar configuration. | See [values.yaml] | | `opentelemetry-operator.enabled` | Flag to control deploying OpenTelemetry Operator Helm sub-chart. | `false` | -| `opentelemetry-operator.createDefaultInstrumentation` | Flag to control creation of default Instrumentation object | `true` | -| `opentelemetry-operator.manager.env.WATCH_NAMESPACE` | Used to set value for `WATCH_NAMESPACE` environment variable which specifies Namespace to watch and create Instrumentation objects. | `Nil` | +| `opentelemetry-operator.createDefaultInstrumentation` | Flag to control creation of default Instrumentation object | `false` | +| `opentelemetry-operator.instrumentationNamespaces` | Used to create `Instrumentation` resources in specified namespaces. | `Nil` | | `otelagent.enabled` | Enables OpenTelemetry Collector Agent mode DaemonSet. | `false` | | `otelagent.daemonset.nodeSelector` | Node selector for otelagent daemonset. [See docs/Best_Practices.md for more information.](../../docs/Best_Practices.md) | `{}` | | `otelagent.daemonset.priorityClassName` | Priority class name for OpenTelemetry Agent trace pods. | If not provided then set to `RELEASE-NAME-sumologic-priorityclass`. |