Merge pull request #375 from paulfantom/release-010-backports

Author: paulfantom

.gitignore

@@ -1,5 +1,6 @@
 .vscode/
 .idea/
 cli/bin
+cli/tobs
 chart/Chart.lock
 tmp/

chart/templates/otel-auto-instrumentation.yaml

@@ -8,11 +8,17 @@ metadata:
     "helm.sh/hook-weight": "0"
 spec:
   exporter:
-    endpoint: http://{{ .Release.Name }}-otel-collector.{{ .Release.Namespace }}.svc:4317
+    endpoint: http://{{ .Release.Name }}-opentelemetry-collector.{{ .Release.Namespace }}.svc:4318
   propagators:
     - tracecontext
     - baggage
     - b3
+  python:
+    image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-python:latest
+  java:
+    image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-java:latest
+  nodejs:
+    image: ghcr.io/open-telemetry/opentelemetry-operator/autoinstrumentation-nodejs:latest
   sampler:
     type: parentbased_traceidratio
     argument: "0.25"

chart/templates/otel-collector.yaml

@@ -2,7 +2,7 @@
 apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:
-  name: {{ .Release.Name }}-tobs-opentelemetry
+  name: {{ .Release.Name }}-opentelemetry
   annotations:
     "helm.sh/hook": post-install,post-upgrade,pre-delete
     "helm.sh/hook-weight": "0"

chart/values.yaml

@@ -359,6 +359,11 @@ kube-prometheus-stack:
   #   https://github.com/grafana/helm-charts/blob/main/charts/grafana/README.md
   grafana:
     enabled: true
+    # TODO(paulfantom): remove with kube-prometheus bump
+    image:
+      repository: grafana/grafana
+      tag: 8.5.2
+      pullPolicy: IfNotPresent
     sidecar:
       datasources:
         enabled: true