diff --git a/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/templates/_probes.alloy.tpl b/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/templates/_probes.alloy.tpl index a7740b79ad..7fcebe8170 100644 --- a/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/templates/_probes.alloy.tpl +++ b/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/templates/_probes.alloy.tpl @@ -3,7 +3,7 @@ {{- $metricAllowList := .Values.probes.metricsTuning.includeMetrics }} {{- $metricDenyList := .Values.probes.metricsTuning.excludeMetrics }} // Prometheus Operator Probe objects -prometheus.operator.probes "pod_monitors" { +prometheus.operator.probes "probes" { {{- if .Values.probes.namespaces }} namespaces = {{ .Values.probes.namespaces | toJson }} {{- end }} diff --git a/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/tests/__snapshot__/default_test.yaml.snap b/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/tests/__snapshot__/default_test.yaml.snap index 7d561ed96c..f8e501ce61 100644 --- a/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/tests/__snapshot__/default_test.yaml.snap +++ b/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/tests/__snapshot__/default_test.yaml.snap @@ -18,7 +18,7 @@ should generate the default configuration: } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/tests/__snapshot__/labels_and_expressions_test.yaml.snap b/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/tests/__snapshot__/labels_and_expressions_test.yaml.snap index 94d199d7a2..34fb0c3bbd 100644 --- a/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/tests/__snapshot__/labels_and_expressions_test.yaml.snap +++ b/charts/k8s-monitoring/charts/feature-prometheus-operator-objects/tests/__snapshot__/labels_and_expressions_test.yaml.snap @@ -23,7 +23,7 @@ should generate the correct configuration: } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { selector { match_expression { key = "monitor" diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-metrics.alloy index b6ae91511b..7ad7cf398e 100644 --- a/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-metrics.alloy +++ b/charts/k8s-monitoring/docs/examples/auth/bearer-token/alloy-metrics.alloy @@ -70,7 +70,7 @@ declare "prometheus_operator_objects" { } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml index eca426b999..8d609f764f 100644 --- a/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/bearer-token/output.yaml @@ -140,7 +140,7 @@ data: } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-metrics.alloy index e575c2284e..dbcdbfe355 100644 --- a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-metrics.alloy +++ b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/alloy-metrics.alloy @@ -69,7 +69,7 @@ declare "prometheus_operator_objects" { } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml index 4ce605dd7b..755278a5b9 100644 --- a/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/embedded-secrets/output.yaml @@ -129,7 +129,7 @@ data: } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-metrics.alloy index 3d6ae13ec2..e79979d8d2 100644 --- a/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-metrics.alloy +++ b/charts/k8s-monitoring/docs/examples/auth/external-secrets/alloy-metrics.alloy @@ -77,7 +77,7 @@ declare "prometheus_operator_objects" { } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml index ec84b7a0e6..d88d64ab75 100644 --- a/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/external-secrets/output.yaml @@ -137,7 +137,7 @@ data: } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/auth/oauth2/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/auth/oauth2/alloy-metrics.alloy index dfbe002d64..76f0cf82b3 100644 --- a/charts/k8s-monitoring/docs/examples/auth/oauth2/alloy-metrics.alloy +++ b/charts/k8s-monitoring/docs/examples/auth/oauth2/alloy-metrics.alloy @@ -917,7 +917,7 @@ declare "prometheus_operator_objects" { } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/auth/oauth2/output.yaml b/charts/k8s-monitoring/docs/examples/auth/oauth2/output.yaml index e65da3169a..a1662b67a6 100644 --- a/charts/k8s-monitoring/docs/examples/auth/oauth2/output.yaml +++ b/charts/k8s-monitoring/docs/examples/auth/oauth2/output.yaml @@ -1060,7 +1060,7 @@ data: } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/exclude-by-namespace/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/exclude-by-namespace/alloy-metrics.alloy index 7b2df96ef1..76a8cdfd6e 100644 --- a/charts/k8s-monitoring/docs/examples/exclude-by-namespace/alloy-metrics.alloy +++ b/charts/k8s-monitoring/docs/examples/exclude-by-namespace/alloy-metrics.alloy @@ -920,7 +920,7 @@ declare "prometheus_operator_objects" { } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/exclude-by-namespace/output.yaml b/charts/k8s-monitoring/docs/examples/exclude-by-namespace/output.yaml index e84028624f..3d0845d0b2 100644 --- a/charts/k8s-monitoring/docs/examples/exclude-by-namespace/output.yaml +++ b/charts/k8s-monitoring/docs/examples/exclude-by-namespace/output.yaml @@ -1103,7 +1103,7 @@ data: } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/alloy-metrics.alloy index f9d8c5ad22..bf5c6a9ea4 100644 --- a/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/alloy-metrics.alloy +++ b/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/alloy-metrics.alloy @@ -69,7 +69,7 @@ declare "prometheus_operator_objects" { } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/output.yaml b/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/output.yaml index 114afca865..4c7e7d3cf3 100644 --- a/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/output.yaml +++ b/charts/k8s-monitoring/docs/examples/features/prometheus-operator-objects/default/output.yaml @@ -95,7 +95,7 @@ data: } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true } diff --git a/charts/k8s-monitoring/docs/examples/include-by-namespace/alloy-metrics.alloy b/charts/k8s-monitoring/docs/examples/include-by-namespace/alloy-metrics.alloy index 04ef3db102..75630cbfb0 100644 --- a/charts/k8s-monitoring/docs/examples/include-by-namespace/alloy-metrics.alloy +++ b/charts/k8s-monitoring/docs/examples/include-by-namespace/alloy-metrics.alloy @@ -912,7 +912,7 @@ declare "prometheus_operator_objects" { } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { namespaces = ["alpha","bravo","delta"] clustering { enabled = true diff --git a/charts/k8s-monitoring/docs/examples/include-by-namespace/output.yaml b/charts/k8s-monitoring/docs/examples/include-by-namespace/output.yaml index 3e9ac3f27f..879e890969 100644 --- a/charts/k8s-monitoring/docs/examples/include-by-namespace/output.yaml +++ b/charts/k8s-monitoring/docs/examples/include-by-namespace/output.yaml @@ -1095,7 +1095,7 @@ data: } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { namespaces = ["alpha","bravo","delta"] clustering { enabled = true diff --git a/charts/k8s-monitoring/tests/integration/prometheus-operator-objects/.rendered/output.yaml b/charts/k8s-monitoring/tests/integration/prometheus-operator-objects/.rendered/output.yaml index 4696909ffa..7cf71bb7b6 100644 --- a/charts/k8s-monitoring/tests/integration/prometheus-operator-objects/.rendered/output.yaml +++ b/charts/k8s-monitoring/tests/integration/prometheus-operator-objects/.rendered/output.yaml @@ -90,7 +90,7 @@ data: } // Prometheus Operator Probe objects - prometheus.operator.probes "pod_monitors" { + prometheus.operator.probes "probes" { clustering { enabled = true }