From 61c5a2b801f61e603d6665d0d57b6ecb43851e74 Mon Sep 17 00:00:00 2001
From: Olaf Heydorn <olaf.heydorn@sap.com>
Date: Wed, 18 Sep 2024 11:48:38 +0200
Subject: [PATCH] Otel updates for scraping (#398)

* [otel] bump version

* [otel] switch to certmanager, build image version, different prom label

* [otel] bump chart, remove defaults
---
 opentelemetry/chart/Chart.yaml                  |  2 +-
 opentelemetry/chart/templates/smon-filelog.yaml |  2 +-
 opentelemetry/chart/values.yaml                 | 11 +++--------
 opentelemetry/plugindefinition.yaml             |  4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/opentelemetry/chart/Chart.yaml b/opentelemetry/chart/Chart.yaml
index 5a98b908..f94c21e4 100644
--- a/opentelemetry/chart/Chart.yaml
+++ b/opentelemetry/chart/Chart.yaml
@@ -4,7 +4,7 @@
 apiVersion: v2
 appVersion: v0.108.0
 name: opentelemetry-operator
-version: 0.3.5
+version: 0.3.7
 description: OpenTelemetry Operator Helm chart for Kubernetes
 icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
 type: application
diff --git a/opentelemetry/chart/templates/smon-filelog.yaml b/opentelemetry/chart/templates/smon-filelog.yaml
index f2d89e3b..0e074dce 100644
--- a/opentelemetry/chart/templates/smon-filelog.yaml
+++ b/opentelemetry/chart/templates/smon-filelog.yaml
@@ -9,7 +9,7 @@ metadata:
   annotations:
   name: opentelemetry-collector-logs
   labels:
-    prometheus: "{{ .Values.openTelemetry.prometheus }}"
+    plugin: "{{ .Values.openTelemetry.prometheus }}"
 spec:
   podMetricsEndpoints:
     - interval: 60s
diff --git a/opentelemetry/chart/values.yaml b/opentelemetry/chart/values.yaml
index af664552..ef717a30 100644
--- a/opentelemetry/chart/values.yaml
+++ b/opentelemetry/chart/values.yaml
@@ -17,14 +17,13 @@ opentelemetry-operator:
     failurePolicy: 'Ignore'
     create: true
     certManager:
-      enabled: false
-    autoGenerateCert:
       enabled: true
+    autoGenerateCert:
       recreate: false
   manager:
     collectorImage:
       repository: ghcr.io/cloudoperators/opentelemetry-collector-contrib
-      tag: sha256-bb7f1d2135e7e5b26d6888fd8a7971b4dc07d81b4c4dad257fffae1e21eb8fcf.sig
+      tag: "4072695"
     deploymentAnnotations:
       vpa-butler.cloud.sap/update-mode: Auto
     prometheusRule:
@@ -44,12 +43,8 @@ openTelemetry:
   cluster:
   region:
   logsCollector:
-    enabled: false
+    enabled: true
   prometheus:
-  podMonitor:
-    enabled: false
-  serviceMonitor:
-    enabled: false
 testFramework:
   enabled: true
   image:
diff --git a/opentelemetry/plugindefinition.yaml b/opentelemetry/plugindefinition.yaml
index 9ad73269..f3a0378d 100644
--- a/opentelemetry/plugindefinition.yaml
+++ b/opentelemetry/plugindefinition.yaml
@@ -6,14 +6,14 @@ kind: PluginDefinition
 metadata:
     name: opentelemetry
 spec:
-    version: 0.3.5
+    version: 0.3.7
     displayName: OpenTelemetry
     description: Observability framework for instrumenting, generating, collecting, and exporting telemetry data such as traces, metrics, and logs.
     icon: https://raw.githubusercontent.com/cloudoperators/greenhouse-extensions/main/opentelemetry/logo.png
     helmChart:
         name: opentelemetry-operator
         repository: oci://ghcr.io/cloudoperators/greenhouse-extensions/charts
-        version: 0.3.5
+        version: 0.3.7
     options:
         - default: true
           description: Activates the standard configuration for logs