diff --git a/charts/opentelemetry-kube-stack/Chart.yaml b/charts/opentelemetry-kube-stack/Chart.yaml index 86c011e5bd..e26b4c3600 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.14.9 +version: 0.14.10 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 index 295bb14f52..d7b6ed5019 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 4a4447ebf0..a7af412271 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -486,7 +486,7 @@ spec: port: 4317 protocol: TCP env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName 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 87aa897f28..f085696679 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.14.9" + - "helm.sh/chart=opentelemetry-kube-stack-0.14.10" 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 a4c20da570..112d1d6722 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 66dc657952..8ed9d25999 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -95,7 +95,7 @@ spec: securityContext: {} env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName 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 87aa897f28..f085696679 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.14.9" + - "helm.sh/chart=opentelemetry-kube-stack-0.14.10" 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 ef07953d31..a03e663774 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -93,7 +93,7 @@ spec: securityContext: {} env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName 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 87aa897f28..f085696679 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.14.9" + - "helm.sh/chart=opentelemetry-kube-stack-0.14.10" 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 e20523e8cd..85d7f494e1 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -101,7 +101,7 @@ spec: securityContext: {} env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName 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 87aa897f28..f085696679 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.14.9" + - "helm.sh/chart=opentelemetry-kube-stack-0.14.10" diff --git a/charts/opentelemetry-kube-stack/examples/default/rendered/collector.yaml b/charts/opentelemetry-kube-stack/examples/default/rendered/collector.yaml index 39cc60b182..05fa70b0ea 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -472,7 +472,7 @@ spec: readOnly: true mountPropagation: HostToContainer env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName diff --git a/charts/opentelemetry-kube-stack/examples/default/rendered/hooks.yaml b/charts/opentelemetry-kube-stack/examples/default/rendered/hooks.yaml index 87aa897f28..f085696679 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.14.9" + - "helm.sh/chart=opentelemetry-kube-stack-0.14.10" 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 4b5912e805..c43212ceb3 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -176,7 +176,7 @@ spec: - mountPath: /var/lib/otelcol/agent name: varlibotelcol env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName @@ -232,7 +232,7 @@ metadata: name: gateway namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -315,7 +315,7 @@ spec: - mountPath: /var/lib/otelcol/gateway name: varlibotelcol env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName @@ -365,7 +365,7 @@ metadata: name: ingress namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -442,7 +442,7 @@ spec: - mountPath: /var/lib/otelcol/ingress name: varlibotelcol env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName 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 87aa897f28..f085696679 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.14.9" + - "helm.sh/chart=opentelemetry-kube-stack-0.14.10" 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 c0d7af489f..1dd70e4327 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -136,7 +136,7 @@ spec: securityContext: {} env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName @@ -173,7 +173,7 @@ metadata: name: example-daemon namespace: default labels: - helm.sh/chart: opentelemetry-kube-stack-0.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -604,7 +604,7 @@ spec: readOnly: true mountPropagation: HostToContainer env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName 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 87aa897f28..f085696679 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.14.9" + - "helm.sh/chart=opentelemetry-kube-stack-0.14.10" 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 7eafd3eb67..2c4f9b8160 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -99,7 +99,7 @@ spec: scrapeInterval: 30s serviceMonitorSelector: {} env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName 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 07f0bbbb2f..0ec287270d 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 24ab5a0eaa..800dcdc3f4 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 3434093e77..98faa52bbf 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 eaf939ff73..2e36558304 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 32230c6060..906cce132e 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 155e8ede08..0432f1d5b4 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 a8551fc136..aabd2f706f 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 a96fd01ddc..e55991e3e6 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 3b07e8745c..e58c2f95d6 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 4657eceb96..5e13a307de 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 db040cc0d1..7abb832064 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.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 87aa897f28..f085696679 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.14.9" + - "helm.sh/chart=opentelemetry-kube-stack-0.14.10" 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 1fd45f7a4e..0144f961f1 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.14.9 + helm.sh/chart: opentelemetry-kube-stack-0.14.10 app.kubernetes.io/version: "0.144.0" app.kubernetes.io/managed-by: Helm release: "example" @@ -472,7 +472,7 @@ spec: readOnly: true mountPropagation: HostToContainer env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME valueFrom: fieldRef: fieldPath: spec.nodeName 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 87aa897f28..f085696679 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.14.9" + - "helm.sh/chart=opentelemetry-kube-stack-0.14.10" diff --git a/charts/opentelemetry-kube-stack/templates/_config.tpl b/charts/opentelemetry-kube-stack/templates/_config.tpl index 1670b11c77..a9867a9ef9 100644 --- a/charts/opentelemetry-kube-stack/templates/_config.tpl +++ b/charts/opentelemetry-kube-stack/templates/_config.tpl @@ -45,6 +45,10 @@ the config is written as YAML. {{- $config = (include "opentelemetry-kube-stack.collector.applyClusterMetricsConfig" (dict "collector" $collector "namespace" .namespace) | fromYaml) -}} {{- $_ := set $collector "config" $config }} {{- end }} +{{- if or .collector.presets.resourceDetection.eks.enabled .collector.presets.resourceDetection.aks.enabled .collector.presets.resourceDetection.gcp.enabled }} +{{- $config = (include "opentelemetry-kube-stack.collector.applyResourceDetectionConfig" (dict "collector" $collector) | fromYaml) -}} +{{- $_ := set $collector "config" $config }} +{{- end }} {{- tpl (toYaml $collector.config) . | nindent 4 }} {{- end }} @@ -425,3 +429,57 @@ extensions: lease_name: {{ .leaseName }} lease_namespace: {{ .leaseNamespace }} {{- end }} + +{{- define "opentelemetry-kube-stack.collector.applyResourceDetectionConfig" -}} + +{{- $config := .collector.config }} +{{- $processors := get $config "processors" | default dict }} +{{- $resourceDetectionProcessor := get $processors "resourcedetection/env" | default dict }} +{{- $detectors := get $resourceDetectionProcessor "detectors" | default list }} + +{{- if .collector.presets.resourceDetection.aks.enabled }} +{{- $aksResourceDetectionProcessor := include "opentelemetry-kube-stack.collector.resourceDetectionAksDetectorConfig" . | fromYaml }} +{{- $resourceDetectionProcessor = mustMergeOverwrite $resourceDetectionProcessor $aksResourceDetectionProcessor }} +{{- $detectors = append $detectors "aks" | uniq }} +{{- end }} + +{{- if .collector.presets.resourceDetection.eks.enabled }} +{{- $eksResourceDetectionProcessor := include "opentelemetry-kube-stack.collector.resourceDetectionEksDetectorConfig" . | fromYaml }} +{{- $resourceDetectionProcessor = mustMergeOverwrite $resourceDetectionProcessor $eksResourceDetectionProcessor }} +{{- $detectors = append $detectors "eks" | uniq }} +{{- end }} + +{{- if .collector.presets.resourceDetection.gcp.enabled }} +{{- $gcpResourceDetectionProcessor := include "opentelemetry-kube-stack.collector.resourceDetectionGcpDetectorConfig" . | fromYaml }} +{{- $resourceDetectionProcessor = mustMergeOverwrite $resourceDetectionProcessor $gcpResourceDetectionProcessor }} +{{- $detectors = append $detectors "gcp" | uniq }} +{{- end }} +{{- $_ := set $resourceDetectionProcessor "detectors" $detectors }} + +{{- $_ := set $processors "resourcedetection/env" $resourceDetectionProcessor }} +{{- $_ := set $config "processors" $processors }} +{{- $config | toYaml }} +{{- end }} + +{{- define "opentelemetry-kube-stack.collector.resourceDetectionEksDetectorConfig" -}} +timeout: 15s +eks: + # K8S_NODE_NAME is configured by the collector deployment, no need to overwrite `node_from_env_var` + resource_attributes: + k8s.cluster.name: + enabled: true +{{- end -}} + +{{- define "opentelemetry-kube-stack.collector.resourceDetectionAksDetectorConfig" -}} +aks: + resource_attributes: + k8s.cluster.name: + enabled: true +{{- end -}} + +{{- define "opentelemetry-kube-stack.collector.resourceDetectionGcpDetectorConfig" -}} +gcp: + resource_attributes: + k8s.cluster.name: + enabled: true +{{- end -}} diff --git a/charts/opentelemetry-kube-stack/templates/collector.yaml b/charts/opentelemetry-kube-stack/templates/collector.yaml index 38941f2078..510b8b2578 100644 --- a/charts/opentelemetry-kube-stack/templates/collector.yaml +++ b/charts/opentelemetry-kube-stack/templates/collector.yaml @@ -164,7 +164,7 @@ spec: {{- toYaml . | nindent 4 }} {{- end }} env: - - name: K8S_NODE_NAME + - name: K8S_NODE_NAME {{/* used by detectors such as the EKS resource detector */}} valueFrom: fieldRef: fieldPath: spec.nodeName diff --git a/charts/opentelemetry-kube-stack/values.schema.json b/charts/opentelemetry-kube-stack/values.schema.json index 3506889269..4606715f01 100644 --- a/charts/opentelemetry-kube-stack/values.schema.json +++ b/charts/opentelemetry-kube-stack/values.schema.json @@ -1474,6 +1474,43 @@ } } } + }, + "resourceDetection": { + "type": "object", + "additionalProperties": false, + "description": "Configures resource detection processors. Each detector can be enabled individually. Base detectors 'env' and 'k8snode' are always included.", + "properties": { + "eks": { + "type": "object", + "additionalProperties": false, + "properties": { + "enabled": { + "description": "Enables the EKS resource detector to detect k8s.cluster.name and AWS resource attributes.", + "type": "boolean" + } + } + }, + "aks": { + "type": "object", + "additionalProperties": false, + "properties": { + "enabled": { + "description": "Enables the AKS resource detector to detect k8s.cluster.name and Azure resource attributes.", + "type": "boolean" + } + } + }, + "gcp": { + "type": "object", + "additionalProperties": false, + "properties": { + "enabled": { + "description": "Enables the GCP resource detector to detect k8s.cluster.name and GCP resource attributes.", + "type": "boolean" + } + } + } + } } } }, diff --git a/charts/opentelemetry-kube-stack/values.yaml b/charts/opentelemetry-kube-stack/values.yaml index 382c3d4958..2429e10939 100644 --- a/charts/opentelemetry-kube-stack/values.yaml +++ b/charts/opentelemetry-kube-stack/values.yaml @@ -493,7 +493,15 @@ defaultCRConfig: enabled: false metrics: enabled: false - + resourceDetection: + # Each detector can be enabled individually. Base detectors 'env' and 'k8snode' are always included when any detector is enabled. + # Typically used to resolve the 'k8s.cluster.name' resource attribute. + eks: + enabled: false + aks: + enabled: false + gcp: + enabled: false # Collectors is a map of collector configurations of the form: # collectors: # collectorName: @@ -537,6 +545,13 @@ collectors: enabled: false metrics: enabled: false + resourceDetection: + aks: + enabled: false + gcp: + enabled: false + eks: + enabled: false config: receivers: otlp: