[opentelemetry-kube-stack] Add the helper for servicemonitor.scrapeLi… (

open-telemetry#1455) * [opentelemetry-kube-stack] Add the helper for servicemonitor.scrapeLimits * naming * version bump, make gen
jtyr · Dec 23, 2024 · 06bfb9f · 06bfb9f
1 parent fc9469c
commit 06bfb9f
Show file tree

Hide file tree

Showing 26 changed files with 45 additions and 26 deletions.
diff --git a/charts/opentelemetry-kube-stack/Chart.yaml b/charts/opentelemetry-kube-stack/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-kube-stack
-version: 0.3.6
+version: 0.3.7
 description: |
   OpenTelemetry Quickstart chart for Kubernetes.
   Installs an operator and collector for an easy way to get started with Kubernetes observability.

diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml
@@ -5,7 +5,7 @@ kind: OpAMPBridge
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"    

diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml
@@ -6,7 +6,7 @@ metadata:
   name: example-cluster-stats
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"        
@@ -187,7 +187,7 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"        

diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml
@@ -62,4 +62,4 @@ spec:
           - -c
           - |
             kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-              -l helm.sh/chart=opentelemetry-kube-stack-0.3.6
+              -l helm.sh/chart=opentelemetry-kube-stack-0.3.7
diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml
@@ -5,7 +5,7 @@ kind: Instrumentation
 metadata:
   name: example
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"    

diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml
@@ -6,7 +6,7 @@ metadata:
   name: example-daemon
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"    

diff --git a/...ube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml b/...ube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-apiserver
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...be-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml b/...be-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-controller-manager
     jobLabel: kube-controller-manager
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...k/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml b/...k/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-controller-manager
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...pentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml b/...pentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-dns
     jobLabel: kube-dns
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...metry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml b/...metry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-dns
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...entelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml b/...entelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-etcd
     jobLabel: kube-etcd
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...etry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml b/...etry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-etcd
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...ntelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml b/...ntelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-proxy
     jobLabel: kube-proxy
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...try-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml b/...try-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-proxy
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...emetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml b/...emetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: opentelemetry-kube-stack-kube-scheduler
     jobLabel: kube-scheduler
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/...kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml b/...kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: default
   labels:
     app: opentelemetry-kube-stack-kube-scheduler
-    helm.sh/chart: opentelemetry-kube-stack-0.3.6
+    helm.sh/chart: opentelemetry-kube-stack-0.3.7
     app.kubernetes.io/version: "0.107.0"
     app.kubernetes.io/managed-by: Helm
     release: "example"

diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml
@@ -62,4 +62,4 @@ spec:
           - -c
           - |
             kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
-              -l helm.sh/chart=opentelemetry-kube-stack-0.3.6
+              -l helm.sh/chart=opentelemetry-kube-stack-0.3.7
diff --git a/charts/opentelemetry-kube-stack/templates/_helpers.tpl b/charts/opentelemetry-kube-stack/templates/_helpers.tpl
@@ -286,3 +286,22 @@ Helpers for prometheus servicemonitors
   {{- $userValue := index . 3 -}}
   {{- include "opentelemetry-kube-stack.kubeVersionDefaultValue" (list $values ">= 1.23-0" $insecure $secure $userValue) -}}
 {{- end -}}
+
+{{/* Sets default scrape limits for servicemonitor */}}
+{{- define "opentelemetry-kube-stack.servicemonitor.scrapeLimits" -}}
+{{- with .sampleLimit }}
+sampleLimit: {{ . }}
+{{- end }}
+{{- with .targetLimit }}
+targetLimit: {{ . }}
+{{- end }}
+{{- with .labelLimit }}
+labelLimit: {{ . }}
+{{- end }}
+{{- with .labelNameLengthLimit }}
+labelNameLengthLimit: {{ . }}
+{{- end }}
+{{- with .labelValueLengthLimit }}
+labelValueLengthLimit: {{ . }}
+{{- end }}
+{{- end -}}
diff --git a/charts/opentelemetry-kube-stack/templates/exporters/core-dns/servicemonitor.yaml b/charts/opentelemetry-kube-stack/templates/exporters/core-dns/servicemonitor.yaml
@@ -16,7 +16,7 @@ metadata:
 {{ include "opentelemetry-kube-stack.labels" . | indent 4 }}
 spec:
   jobLabel: {{ .Values.coreDns.serviceMonitor.jobLabel }}
-  {{- include "servicemonitor.scrapeLimits" .Values.coreDns.serviceMonitor | nindent 2 }}
+  {{- include "opentelemetry-kube-stack.servicemonitor.scrapeLimits" .Values.coreDns.serviceMonitor | nindent 2 }}
   selector:
     {{- if .Values.coreDns.serviceMonitor.selector }}
     {{ tpl (toYaml .Values.coreDns.serviceMonitor.selector | nindent 4) . }}

diff --git a/charts/opentelemetry-kube-stack/templates/exporters/kube-api-server/servicemonitor.yaml b/charts/opentelemetry-kube-stack/templates/exporters/kube-api-server/servicemonitor.yaml
@@ -15,7 +15,7 @@ metadata:
   {{- end }}
 {{ include "opentelemetry-kube-stack.labels" . | indent 4 }}
 spec:
-  {{- include "servicemonitor.scrapeLimits" .Values.kubeApiServer.serviceMonitor | nindent 2 }}
+  {{- include "opentelemetry-kube-stack.servicemonitor.scrapeLimits" .Values.kubeApiServer.serviceMonitor | nindent 2 }}
   endpoints:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
     {{- if .Values.kubeApiServer.serviceMonitor.interval }}

diff --git a/.../opentelemetry-kube-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml b/.../opentelemetry-kube-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml
@@ -16,7 +16,7 @@ metadata:
 {{ include "opentelemetry-kube-stack.labels" . | indent 4 }}
 spec:
   jobLabel: {{ .Values.kubeControllerManager.serviceMonitor.jobLabel }}
-  {{- include "servicemonitor.scrapeLimits" .Values.kubeControllerManager.serviceMonitor | nindent 2 }}
+  {{- include "opentelemetry-kube-stack.servicemonitor.scrapeLimits" .Values.kubeControllerManager.serviceMonitor | nindent 2 }}
   selector:
     {{- if .Values.kubeControllerManager.serviceMonitor.selector }}
     {{ tpl (toYaml .Values.kubeControllerManager.serviceMonitor.selector | nindent 4) . }}

diff --git a/charts/opentelemetry-kube-stack/templates/exporters/kube-dns/servicemonitor.yaml b/charts/opentelemetry-kube-stack/templates/exporters/kube-dns/servicemonitor.yaml
@@ -16,7 +16,7 @@ metadata:
 {{ include "opentelemetry-kube-stack.labels" . | indent 4 }}
 spec:
   jobLabel: {{ .Values.kubeDns.serviceMonitor.jobLabel }}
-  {{- include "servicemonitor.scrapeLimits" .Values.kubeDns.serviceMonitor | nindent 2 }}
+  {{- include "opentelemetry-kube-stack.servicemonitor.scrapeLimits" .Values.kubeDns.serviceMonitor | nindent 2 }}
   selector:
     {{- if .Values.kubeDns.serviceMonitor.selector }}
     {{ tpl (toYaml .Values.kubeDns.serviceMonitor.selector | nindent 4) . }}

diff --git a/charts/opentelemetry-kube-stack/templates/exporters/kube-etcd/servicemonitor.yaml b/charts/opentelemetry-kube-stack/templates/exporters/kube-etcd/servicemonitor.yaml
@@ -16,7 +16,7 @@ metadata:
 {{ include "opentelemetry-kube-stack.labels" . | indent 4 }}
 spec:
   jobLabel: {{ .Values.kubeEtcd.serviceMonitor.jobLabel }}
-  {{- include "servicemonitor.scrapeLimits" .Values.kubeEtcd.serviceMonitor | nindent 4 }}
+  {{- include "opentelemetry-kube-stack.servicemonitor.scrapeLimits" .Values.kubeEtcd.serviceMonitor | nindent 4 }}
   selector:
     {{- if .Values.kubeEtcd.serviceMonitor.selector }}
     {{ tpl (toYaml .Values.kubeEtcd.serviceMonitor.selector | nindent 4) . }}

diff --git a/charts/opentelemetry-kube-stack/templates/exporters/kube-proxy/servicemonitor.yaml b/charts/opentelemetry-kube-stack/templates/exporters/kube-proxy/servicemonitor.yaml
@@ -16,7 +16,7 @@ metadata:
 {{ include "opentelemetry-kube-stack.labels" . | indent 4 }}
 spec:
   jobLabel: {{ .Values.kubeProxy.serviceMonitor.jobLabel }}
-  {{- include "servicemonitor.scrapeLimits" .Values.kubeProxy.serviceMonitor | nindent 2 }}
+  {{- include "opentelemetry-kube-stack.servicemonitor.scrapeLimits" .Values.kubeProxy.serviceMonitor | nindent 2 }}
   selector:
     {{- if .Values.kubeProxy.serviceMonitor.selector }}
     {{ tpl (toYaml .Values.kubeProxy.serviceMonitor.selector | nindent 4) . }}

diff --git a/charts/opentelemetry-kube-stack/templates/exporters/kube-scheduler/servicemonitor.yaml b/charts/opentelemetry-kube-stack/templates/exporters/kube-scheduler/servicemonitor.yaml
@@ -16,7 +16,7 @@ metadata:
 {{ include "opentelemetry-kube-stack.labels" . | indent 4 }}
 spec:
   jobLabel: {{ .Values.kubeScheduler.serviceMonitor.jobLabel }}
-  {{- include "servicemonitor.scrapeLimits" .Values.kubeScheduler.serviceMonitor | nindent 2 }}
+  {{- include "opentelemetry-kube-stack.servicemonitor.scrapeLimits" .Values.kubeScheduler.serviceMonitor | nindent 2 }}
   selector:
     {{- if .Values.kubeScheduler.serviceMonitor.selector }}
     {{ tpl (toYaml .Values.kubeScheduler.serviceMonitor.selector | nindent 4) . }}