Skip to content

Commit

Permalink
Otel updates for scraping (#398)
Browse files Browse the repository at this point in the history
* [otel] bump version

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

* [otel] bump chart, remove defaults
  • Loading branch information
Kuckkuck authored Sep 18, 2024
1 parent 23eb41a commit 61c5a2b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion opentelemetry/chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion opentelemetry/chart/templates/smon-filelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
annotations:
name: opentelemetry-collector-logs
labels:
prometheus: "{{ .Values.openTelemetry.prometheus }}"
plugin: "{{ .Values.openTelemetry.prometheus }}"
spec:
podMetricsEndpoints:
- interval: 60s
Expand Down
11 changes: 3 additions & 8 deletions opentelemetry/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -44,12 +43,8 @@ openTelemetry:
cluster:
region:
logsCollector:
enabled: false
enabled: true
prometheus:
podMonitor:
enabled: false
serviceMonitor:
enabled: false
testFramework:
enabled: true
image:
Expand Down
4 changes: 2 additions & 2 deletions opentelemetry/plugindefinition.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 61c5a2b

Please sign in to comment.