Skip to content

Commit b6bfc21

Browse files
authoredJan 18, 2023
enabled the servicemonitor also for statefulsets (open-telemetry#607)
Signed-off-by: Sherif Ayad <sherif.k.ayad@gmail.com> Signed-off-by: Sherif Ayad <sherif.k.ayad@gmail.com>

35 files changed

+43
-43
lines changed
 

‎charts/opentelemetry-collector/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-collector
3-
version: 0.45.0
3+
version: 0.45.1
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

‎charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: example-opentelemetry-collector-agent
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: DaemonSet
55
metadata:
66
name: example-opentelemetry-collector-agent
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"
@@ -21,7 +21,7 @@ spec:
2121
template:
2222
metadata:
2323
annotations:
24-
checksum/config: 3f013a1b93c33e7eb18d6c910dbc162f9351f681eccc27b72a6949733436f117
24+
checksum/config: cbe25daa1f846c4dd8bb8fe767768e26ff4c3ff5bf8f529b2e9ec7b351c3f631
2525

2626
labels:
2727
app.kubernetes.io/name: opentelemetry-collector

‎charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Deployment
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"
@@ -22,7 +22,7 @@ spec:
2222
template:
2323
metadata:
2424
annotations:
25-
checksum/config: ba2c485b9b80f18114490d1c59aaa05cbef9f90c050011811ce3dc0c5d06be42
25+
checksum/config: 60124d303a04a532c7ef74b31db648ce927b5b9c36b4ebbfdcafa092ad585c22
2626

2727
labels:
2828
app.kubernetes.io/name: opentelemetry-collector

‎charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Service
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: example-opentelemetry-collector-agent
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: DaemonSet
55
metadata:
66
name: example-opentelemetry-collector-agent
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"
@@ -21,7 +21,7 @@ spec:
2121
template:
2222
metadata:
2323
annotations:
24-
checksum/config: c51fc533c0a34c593e65f8af29b8da5973fef5a793f56b1a35485527d9550391
24+
checksum/config: 5c747ad861bfa2b910c435acf7182ccfb7ba78706b659a100cb9bb805ca1def2
2525

2626
labels:
2727
app.kubernetes.io/name: opentelemetry-collector

‎charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: example-opentelemetry-collector-agent
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: DaemonSet
55
metadata:
66
name: example-opentelemetry-collector-agent
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"
@@ -21,7 +21,7 @@ spec:
2121
template:
2222
metadata:
2323
annotations:
24-
checksum/config: eaf2b849960d009c7bc70693babcb18d32c321e5e048d831bbd817da264a28a2
24+
checksum/config: 55b2e74668b76f95f152e0942cff05b04a3368452b33477c29b6b1e3fd7cf0b2
2525

2626
labels:
2727
app.kubernetes.io/name: opentelemetry-collector

‎charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: example-opentelemetry-collector-agent
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: DaemonSet
55
metadata:
66
name: example-opentelemetry-collector-agent
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"
@@ -21,7 +21,7 @@ spec:
2121
template:
2222
metadata:
2323
annotations:
24-
checksum/config: 7c7202fc4191e57958730e1dabcd4bf3bad03cdf779165bbcf7e4f8e04427cbd
24+
checksum/config: 6c4e5157feaaca3def8d302e4cfed0aa6188824ac3289e6b8eadc66ecf206c00
2525

2626
labels:
2727
app.kubernetes.io/name: opentelemetry-collector

‎charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: example-opentelemetry-collector-agent
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: DaemonSet
55
metadata:
66
name: example-opentelemetry-collector-agent
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"
@@ -21,7 +21,7 @@ spec:
2121
template:
2222
metadata:
2323
annotations:
24-
checksum/config: 7c7202fc4191e57958730e1dabcd4bf3bad03cdf779165bbcf7e4f8e04427cbd
24+
checksum/config: 6c4e5157feaaca3def8d302e4cfed0aa6188824ac3289e6b8eadc66ecf206c00
2525

2626
labels:
2727
app.kubernetes.io/name: opentelemetry-collector

‎charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Deployment
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"
@@ -22,7 +22,7 @@ spec:
2222
template:
2323
metadata:
2424
annotations:
25-
checksum/config: ba2c485b9b80f18114490d1c59aaa05cbef9f90c050011811ce3dc0c5d06be42
25+
checksum/config: 60124d303a04a532c7ef74b31db648ce927b5b9c36b4ebbfdcafa092ad585c22
2626

2727
labels:
2828
app.kubernetes.io/name: opentelemetry-collector

‎charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Service
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Deployment
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"
@@ -22,7 +22,7 @@ spec:
2222
template:
2323
metadata:
2424
annotations:
25-
checksum/config: 2f9c092b7464c7585d5b2ce0eb1560f3292039c1f9df56944cd67278a36244ba
25+
checksum/config: d490edbcc7cd0ab45649b7347348f417164094bd311069df790d61fc6fce4942
2626

2727
labels:
2828
app.kubernetes.io/name: opentelemetry-collector

‎charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Service
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Deployment
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Service
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ConfigMap
55
metadata:
66
name: example-opentelemetry-collector-statefulset
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Service
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceAccount
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: StatefulSet
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.45.0
8+
helm.sh/chart: opentelemetry-collector-0.45.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.69.0"

‎charts/opentelemetry-collector/templates/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if and .Values.serviceMonitor.enabled .Values.serviceMonitor.metricsEndpoints (eq .Values.mode "deployment") }}
1+
{{- if and .Values.serviceMonitor.enabled .Values.serviceMonitor.metricsEndpoints (or (eq .Values.mode "deployment") (eq .Values.mode "statefulset")) }}
22
apiVersion: monitoring.coreos.com/v1
33
kind: ServiceMonitor
44
metadata:

0 commit comments

Comments
 (0)
Please sign in to comment.