Skip to content

Commit 76ac7a0

Browse files
fix(kube-stack): inject prometheus receiver when targetAllocator enabled without scrape_configs_file
When `scrape_configs_file` is empty and `targetAllocator.enabled: true`, the OpenTelemetry Operator expects a `prometheus` receiver in the collector config so it can patch in the `target_allocator` endpoint. Without it, reconciliation fails with: "no prometheus available as part of the configuration" This change injects a minimal prometheus receiver (empty scrape_configs) when one isn't already defined, and appends `prometheus` to the metrics pipeline receivers so target-allocator scraped metrics flow through. Fixes #2210
1 parent afafcb0 commit 76ac7a0

49 files changed

Lines changed: 1842 additions & 35 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

charts/opentelemetry-kube-stack/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-kube-stack
3-
version: 0.15.0
3+
version: 0.15.1
44
description: |
55
OpenTelemetry Quickstart chart for Kubernetes.
66
Installs an operator and collector for an easy way to get started with Kubernetes observability.

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: OpAMPBridge
55
metadata:
66
name: example
77
labels:
8-
helm.sh/chart: opentelemetry-kube-stack-0.15.0
8+
helm.sh/chart: opentelemetry-kube-stack-0.15.1
99
app.kubernetes.io/version: "0.151.0"
1010
app.kubernetes.io/managed-by: Helm
1111
release: "example"

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-daemon
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-kube-stack-0.15.0
9+
helm.sh/chart: opentelemetry-kube-stack-0.15.1
1010
app.kubernetes.io/version: "0.151.0"
1111
app.kubernetes.io/managed-by: Helm
1212
release: "example"

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ spec:
6161
- "delete"
6262
- "instrumentations,opampbridges,opentelemetrycollectors"
6363
- "-l"
64-
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
64+
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Instrumentation
55
metadata:
66
name: example
77
labels:
8-
helm.sh/chart: opentelemetry-kube-stack-0.15.0
8+
helm.sh/chart: opentelemetry-kube-stack-0.15.1
99
app.kubernetes.io/version: "0.151.0"
1010
app.kubernetes.io/managed-by: Helm
1111
release: "example"

charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-logs/rendered/collector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-daemon
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-kube-stack-0.15.0
9+
helm.sh/chart: opentelemetry-kube-stack-0.15.1
1010
app.kubernetes.io/version: "0.151.0"
1111
app.kubernetes.io/managed-by: Helm
1212
release: "example"

charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-logs/rendered/hooks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ spec:
6161
- "delete"
6262
- "instrumentations,opampbridges,opentelemetrycollectors"
6363
- "-l"
64-
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
64+
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"

charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-metrics/rendered/collector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-daemon
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-kube-stack-0.15.0
9+
helm.sh/chart: opentelemetry-kube-stack-0.15.1
1010
app.kubernetes.io/version: "0.151.0"
1111
app.kubernetes.io/managed-by: Helm
1212
release: "example"

charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery-metrics/rendered/hooks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ spec:
6161
- "delete"
6262
- "instrumentations,opampbridges,opentelemetrycollectors"
6363
- "-l"
64-
- "helm.sh/chart=opentelemetry-kube-stack-0.15.0"
64+
- "helm.sh/chart=opentelemetry-kube-stack-0.15.1"

charts/opentelemetry-kube-stack/examples/daemonset-annotation-discovery/rendered/collector.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-daemon
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-kube-stack-0.15.0
9+
helm.sh/chart: opentelemetry-kube-stack-0.15.1
1010
app.kubernetes.io/version: "0.151.0"
1111
app.kubernetes.io/managed-by: Helm
1212
release: "example"

0 commit comments

Comments
 (0)