diff --git a/charts/opentelemetry-kube-stack/Chart.yaml b/charts/opentelemetry-kube-stack/Chart.yaml index 55786916a7..517ac853cc 100644 --- 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.15.0 +version: 0.15.1 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/ci/daemonset-ta-no-scrape-config-file.yaml b/charts/opentelemetry-kube-stack/ci/daemonset-ta-no-scrape-config-file.yaml new file mode 100644 index 0000000000..ff99479b4e --- /dev/null +++ b/charts/opentelemetry-kube-stack/ci/daemonset-ta-no-scrape-config-file.yaml @@ -0,0 +1,20 @@ +collectors: + daemon: + # no prometheus scrape config file + scrape_configs_file: "" + presets: + kubeletMetrics: + enabled: true + hostMetrics: + enabled: true + kubernetesAttributes: + enabled: true + clusterMetrics: + enabled: true + # target allocator configuration to discover ServiceMonitor resources and distribute scrape targets across the DaemonSet pods + targetAllocator: + enabled: true + allocationStrategy: per-node + prometheusCR: + enabled: true + serviceMonitorSelector: {} diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml index caea42608a..a386b70f95 100644 --- 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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.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 index 2c992a1436..37c8c0858b 100644 --- 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-daemon namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.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 index 3225d6dcc8..7abcc3a667 100644 --- a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml @@ -61,4 +61,4 @@ spec: - "delete" - "instrumentations,opampbridges,opentelemetrycollectors" - "-l" - - "helm.sh/chart=opentelemetry-kube-stack-0.15.0" + - "helm.sh/chart=opentelemetry-kube-stack-0.15.1" diff --git a/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml b/charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml index 9fadae5cd1..7e3fe28f80 100644 --- 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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-logs/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-logs/rendered/collector.yaml index 9c641e9cd6..c150e452ec 100644 --- a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-logs/rendered/collector.yaml +++ b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-logs/rendered/collector.yaml @@ -6,7 +6,7 @@ metadata: name: example-daemon namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-logs/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-logs/rendered/hooks.yaml index 3225d6dcc8..7abcc3a667 100644 --- a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-logs/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-logs/rendered/hooks.yaml @@ -61,4 +61,4 @@ spec: - "delete" - "instrumentations,opampbridges,opentelemetrycollectors" - "-l" - - "helm.sh/chart=opentelemetry-kube-stack-0.15.0" + - "helm.sh/chart=opentelemetry-kube-stack-0.15.1" diff --git a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-metrics/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-metrics/rendered/collector.yaml index a5b49b4375..c4a6342bd2 100644 --- a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-metrics/rendered/collector.yaml +++ b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-metrics/rendered/collector.yaml @@ -6,7 +6,7 @@ metadata: name: example-daemon namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-metrics/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-metrics/rendered/hooks.yaml index 3225d6dcc8..7abcc3a667 100644 --- a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-metrics/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-metrics/rendered/hooks.yaml @@ -61,4 +61,4 @@ spec: - "delete" - "instrumentations,opampbridges,opentelemetrycollectors" - "-l" - - "helm.sh/chart=opentelemetry-kube-stack-0.15.0" + - "helm.sh/chart=opentelemetry-kube-stack-0.15.1" diff --git a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery/rendered/collector.yaml index dee759c407..e6f55a5385 100644 --- a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery/rendered/collector.yaml +++ b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery/rendered/collector.yaml @@ -6,7 +6,7 @@ metadata: name: example-daemon namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery/rendered/hooks.yaml index 3225d6dcc8..7abcc3a667 100644 --- a/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery/rendered/hooks.yaml @@ -61,4 +61,4 @@ spec: - "delete" - "instrumentations,opampbridges,opentelemetrycollectors" - "-l" - - "helm.sh/chart=opentelemetry-kube-stack-0.15.0" + - "helm.sh/chart=opentelemetry-kube-stack-0.15.1" diff --git a/charts/opentelemetry-kube-stack/examples/default/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/default/rendered/collector.yaml index 3f4e144bc1..a030f9c8c0 100644 --- a/charts/opentelemetry-kube-stack/examples/default/rendered/collector.yaml +++ b/charts/opentelemetry-kube-stack/examples/default/rendered/collector.yaml @@ -6,7 +6,7 @@ metadata: name: example-daemon namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/default/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/default/rendered/hooks.yaml index 3225d6dcc8..7abcc3a667 100644 --- a/charts/opentelemetry-kube-stack/examples/default/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/default/rendered/hooks.yaml @@ -61,4 +61,4 @@ spec: - "delete" - "instrumentations,opampbridges,opentelemetrycollectors" - "-l" - - "helm.sh/chart=opentelemetry-kube-stack-0.15.0" + - "helm.sh/chart=opentelemetry-kube-stack-0.15.1" diff --git a/charts/opentelemetry-kube-stack/examples/isolated-multicollector-deployment/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/isolated-multicollector-deployment/rendered/collector.yaml index 96ca449389..beab5c2734 100644 --- a/charts/opentelemetry-kube-stack/examples/isolated-multicollector-deployment/rendered/collector.yaml +++ b/charts/opentelemetry-kube-stack/examples/isolated-multicollector-deployment/rendered/collector.yaml @@ -6,7 +6,7 @@ metadata: name: agent namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -232,7 +232,7 @@ metadata: name: gateway namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -365,7 +365,7 @@ metadata: name: ingress namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/isolated-multicollector-deployment/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/isolated-multicollector-deployment/rendered/hooks.yaml index 3225d6dcc8..7abcc3a667 100644 --- a/charts/opentelemetry-kube-stack/examples/isolated-multicollector-deployment/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/isolated-multicollector-deployment/rendered/hooks.yaml @@ -61,4 +61,4 @@ spec: - "delete" - "instrumentations,opampbridges,opentelemetrycollectors" - "-l" - - "helm.sh/chart=opentelemetry-kube-stack-0.15.0" + - "helm.sh/chart=opentelemetry-kube-stack-0.15.1" diff --git a/charts/opentelemetry-kube-stack/examples/no-leader-election-extension/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/no-leader-election-extension/rendered/collector.yaml index 1959a15b97..48a7957699 100644 --- a/charts/opentelemetry-kube-stack/examples/no-leader-election-extension/rendered/collector.yaml +++ b/charts/opentelemetry-kube-stack/examples/no-leader-election-extension/rendered/collector.yaml @@ -6,7 +6,7 @@ metadata: name: example-cluster-stats namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -173,7 +173,7 @@ metadata: name: example-daemon namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/no-leader-election-extension/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/no-leader-election-extension/rendered/hooks.yaml index 3225d6dcc8..7abcc3a667 100644 --- a/charts/opentelemetry-kube-stack/examples/no-leader-election-extension/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/no-leader-election-extension/rendered/hooks.yaml @@ -61,4 +61,4 @@ spec: - "delete" - "instrumentations,opampbridges,opentelemetrycollectors" - "-l" - - "helm.sh/chart=opentelemetry-kube-stack-0.15.0" + - "helm.sh/chart=opentelemetry-kube-stack-0.15.1" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml index ab2c31b2db..8bb4a114e5 100644 --- 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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml index 44bcb6fcfc..92ec8433d5 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml +++ b/charts/opentelemetry-kube-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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml index 989ef9b379..57ea57c54b 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml +++ b/charts/opentelemetry-kube-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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml index 6c6924552f..3aa23b21fe 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml +++ b/charts/opentelemetry-kube-stack/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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml index 79087a01e6..f67bf12190 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml +++ b/charts/opentelemetry-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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml index 6beb82db36..db82ca36d5 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml +++ b/charts/opentelemetry-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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml index fa816280b1..9f634d2070 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml +++ b/charts/opentelemetry-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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml index 368c7ceca4..3164220072 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml +++ b/charts/opentelemetry-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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml index 38e5142e12..53791f83e4 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml +++ b/charts/opentelemetry-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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml index 91252ef6fc..c09529280b 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml +++ b/charts/opentelemetry-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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml index f55b75cba9..fd20a57162 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml +++ b/charts/opentelemetry-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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml index 3616241b59..987620442d 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml +++ b/charts/opentelemetry-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.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.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 index 3225d6dcc8..7abcc3a667 100644 --- a/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml @@ -61,4 +61,4 @@ spec: - "delete" - "instrumentations,opampbridges,opentelemetrycollectors" - "-l" - - "helm.sh/chart=opentelemetry-kube-stack-0.15.0" + - "helm.sh/chart=opentelemetry-kube-stack-0.15.1" diff --git a/charts/opentelemetry-kube-stack/examples/secrets-csi-driver/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/secrets-csi-driver/rendered/collector.yaml index cd27ca7d2d..21bc431781 100644 --- a/charts/opentelemetry-kube-stack/examples/secrets-csi-driver/rendered/collector.yaml +++ b/charts/opentelemetry-kube-stack/examples/secrets-csi-driver/rendered/collector.yaml @@ -6,7 +6,7 @@ metadata: name: example-daemon namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.15.0 + helm.sh/chart: opentelemetry-kube-stack-0.15.1 app.kubernetes.io/version: "0.151.0" app.kubernetes.io/managed-by: Helm release: "example" diff --git a/charts/opentelemetry-kube-stack/examples/secrets-csi-driver/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/secrets-csi-driver/rendered/hooks.yaml index 3225d6dcc8..7abcc3a667 100644 --- a/charts/opentelemetry-kube-stack/examples/secrets-csi-driver/rendered/hooks.yaml +++ b/charts/opentelemetry-kube-stack/examples/secrets-csi-driver/rendered/hooks.yaml @@ -61,4 +61,4 @@ spec: - "delete" - "instrumentations,opampbridges,opentelemetrycollectors" - "-l" - - "helm.sh/chart=opentelemetry-kube-stack-0.15.0" + - "helm.sh/chart=opentelemetry-kube-stack-0.15.1" diff --git a/charts/opentelemetry-kube-stack/templates/_config.tpl b/charts/opentelemetry-kube-stack/templates/_config.tpl index e05e20c07b..0cb39498ca 100644 --- a/charts/opentelemetry-kube-stack/templates/_config.tpl +++ b/charts/opentelemetry-kube-stack/templates/_config.tpl @@ -4,6 +4,10 @@ Constructs the final config for the given collector This allows a user to supply a scrape_configs_file. This file is templated and loaded as a yaml array. If a user has already supplied a prometheus receiver config, the file's config is appended. Finally, the config is written as YAML. + +When no scrape_configs_file is supplied but the targetAllocator is enabled, a minimal prometheus +receiver (with an empty scrape_configs list) is injected if one isn't already defined, so the +target allocator has a receiver to populate. */}} {{- define "opentelemetry-kube-stack.config" -}} {{- $collector := .collector }} @@ -11,6 +15,15 @@ the config is written as YAML. {{- if .collector.scrape_configs_file }} {{- $config = (include "opentelemetry-kube-stack.collector.appendPrometheusScrapeFile" . | fromYaml) }} {{- $_ := set $collector "config" $config }} +{{- else if (dig "targetAllocator" "enabled" false .collector) }} +{{- $receivers := (dig "receivers" dict $config) }} +{{- if not (hasKey $receivers "prometheus") }} +{{- $config = (mustMergeOverwrite $config (dict "receivers" (dict "prometheus" (dict "config" (dict "scrape_configs" list))))) }} +{{- $_ := set $collector "config" $config }} +{{- end }} +{{- if and (dig "service" "pipelines" "metrics" false $config) (not (has "prometheus" (dig "service" "pipelines" "metrics" "receivers" list $config))) }} +{{- $_ := set $config.service.pipelines.metrics "receivers" (append ($config.service.pipelines.metrics.receivers | default list) "prometheus" | uniq) }} +{{- end }} {{- end }} {{- if .collector.presets.logsCollection.enabled }} {{- $_ := set $collector "exclude" (list (printf "/var/log/pods/%s_%s*_*/otc-container/*.log" .namespace (include "opentelemetry-kube-stack.collectorFullname" .))) }}