Skip to content

Commit 5b9f5b3

Browse files
Renamed integrations to solutions
1 parent aa921c0 commit 5b9f5b3

2 files changed

Lines changed: 19 additions & 4 deletions

File tree

charts/amazon-cloudwatch-observability/templates/linux/_otel-container-insights-cluster-scraper-config.tpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ receivers:
4848
- {{ include "kube-state-metrics.name" . }}.{{ .Release.Namespace }}.svc:{{ .Values.kubeStateMetrics.service.port }}
4949
{{- end }}
5050

51-
{{- if .Values.otelContainerInsights.integrations.karpenter.enabled }}
51+
{{- if and .Values.otelContainerInsights.solutions.enabled .Values.otelContainerInsights.solutions.karpenter.enabled }}
5252
prometheus/cw_k8s_ci_v0_karpenter:
5353
config:
5454
scrape_configs:
@@ -60,7 +60,7 @@ receivers:
6060
- role: pod
6161
namespaces:
6262
names:
63-
- {{ .Values.otelContainerInsights.integrations.karpenter.namespace }}
63+
- {{ .Values.otelContainerInsights.solutions.karpenter.namespace }}
6464
relabel_configs:
6565
- source_labels: [__meta_kubernetes_pod_label_app_kubernetes_io_name]
6666
regex: karpenter
@@ -162,7 +162,7 @@ processors:
162162
- set(attributes["cloudwatch.pipeline"], "kube-state-metrics")
163163
{{- end }}
164164

165-
{{- if .Values.otelContainerInsights.integrations.karpenter.enabled }}
165+
{{- if and .Values.otelContainerInsights.solutions.enabled .Values.otelContainerInsights.solutions.karpenter.enabled }}
166166
transform/cw_k8s_ci_v0_set_scope_karpenter:
167167
error_mode: ignore
168168
metric_statements:
@@ -488,7 +488,7 @@ service:
488488
exporters:
489489
- otlphttp/cw_k8s_ci_v0_cwotel
490490
{{- end }}
491-
{{- if .Values.otelContainerInsights.integrations.karpenter.enabled }}
491+
{{- if and .Values.otelContainerInsights.solutions.enabled .Values.otelContainerInsights.solutions.karpenter.enabled }}
492492
metrics/cw_k8s_ci_v0_karpenter:
493493
receivers: [prometheus/cw_k8s_ci_v0_karpenter]
494494
processors:

charts/amazon-cloudwatch-observability/values.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,3 +1173,18 @@ otelContainerInsights:
11731173
cloudwatchMetricsEndpoint: ""
11741174
# Override the CloudWatch Logs OTLP endpoint. If empty, defaults to logs.<region>.amazonaws.com.
11751175
cloudwatchLogsEndpoint: ""
1176+
## ── Solutions ──────────────────────────────────────────────────────────
1177+
## Optional Prometheus metric scraping for well-known cluster components.
1178+
## Each solution is gated by its own enabled flag so customers only scrape
1179+
## what they actually run. Solutions only take effect when
1180+
## otelContainerInsights.enabled is true.
1181+
solutions:
1182+
## Global toggle: set to false to disable ALL solutions at once.
1183+
## Individual solutions won't activate even if their own enabled flag is true.
1184+
enabled: true
1185+
## Karpenter — cluster autoscaler for Kubernetes.
1186+
## Scrapes the Prometheus metrics endpoint exposed by the Karpenter controller.
1187+
karpenter:
1188+
enabled: true
1189+
## Namespace where Karpenter is deployed.
1190+
namespace: "kube-system"

0 commit comments

Comments
 (0)