diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index 452a2cc272b52b9be53d2def6947776f278091d7..5e992176db4c1912edb1bdfbbdfc7645203ecc3f 100644 --- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet @@ -86,8 +86,8 @@ function(params) { namespace: am.config.namespace, }, spec: { - local r = if std.objectHasAll(am.mixin, 'prometheusRules') then am.mixin.prometheusRules else {}, - local a = if std.objectHasAll(am.mixin, 'prometheusAlerts') then am.mixin.prometheusAlerts else {}, + local r = if std.objectHasAll(am.mixin, 'prometheusRules') then am.mixin.prometheusRules.groups else [], + local a = if std.objectHasAll(am.mixin, 'prometheusAlerts') then am.mixin.prometheusAlerts.groups else [], groups: a + r, }, }, diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet index c32365894f9f8990ed4b5b202b55e7be4a06d640..fdfe3bd59eadf3dec9f05a47f755fa2aa4b08f74 100644 --- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet @@ -59,8 +59,8 @@ function(params) (import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube- namespace: ksm.config.namespace, }, spec: { - local r = if std.objectHasAll(ksm.mixin, 'prometheusRules') then ksm.mixin.prometheusRules else {}, - local a = if std.objectHasAll(ksm.mixin, 'prometheusAlerts') then ksm.mixin.prometheusAlerts else {}, + local r = if std.objectHasAll(ksm.mixin, 'prometheusRules') then ksm.mixin.prometheusRules.groups else [], + local a = if std.objectHasAll(ksm.mixin, 'prometheusAlerts') then ksm.mixin.prometheusAlerts.groups else [], groups: a + r, }, }, diff --git a/jsonnet/kube-prometheus/mixin/custom.libsonnet b/jsonnet/kube-prometheus/mixin/custom.libsonnet index 278ddc7660bb643725f44e4de02cb9412feb8045..13c36332b37e84dcbd043e22e0b0527fa8a5a7e3 100644 --- a/jsonnet/kube-prometheus/mixin/custom.libsonnet +++ b/jsonnet/kube-prometheus/mixin/custom.libsonnet @@ -34,8 +34,8 @@ function(params) { namespace: m.config.namespace, }, spec: { - local r = if std.objectHasAll(m.mixin, 'prometheusRules') then m.mixin.prometheusRules else {}, - local a = if std.objectHasAll(m.mixin, 'prometheusAlerts') then m.mixin.prometheusAlerts else {}, + local r = if std.objectHasAll(m.mixin, 'prometheusRules') then m.mixin.prometheusRules.groups else [], + local a = if std.objectHasAll(m.mixin, 'prometheusAlerts') then m.mixin.prometheusAlerts.groups else [], groups: a + r, }, }, diff --git a/jsonnet/kube-prometheus/mixin/kubernetes.libsonnet b/jsonnet/kube-prometheus/mixin/kubernetes.libsonnet index f399a5292ced394ac9019877ab2523c428d7fa60..f9e5791fdf262d850d8e9c44ebadf45d475a1ba6 100644 --- a/jsonnet/kube-prometheus/mixin/kubernetes.libsonnet +++ b/jsonnet/kube-prometheus/mixin/kubernetes.libsonnet @@ -41,8 +41,8 @@ function(params) { namespace: m.config.namespace, }, spec: { - local r = if std.objectHasAll(m.mixin, 'prometheusRules') then m.mixin.prometheusRules else {}, - local a = if std.objectHasAll(m.mixin, 'prometheusAlerts') then m.mixin.prometheusAlerts else {}, + local r = if std.objectHasAll(m.mixin, 'prometheusRules') then m.mixin.prometheusRules.groups else {}, + local a = if std.objectHasAll(m.mixin, 'prometheusAlerts') then m.mixin.prometheusAlerts.groups else {}, groups: a + r, }, }, diff --git a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet index 1c4321b188027f3f46227d6139e1fb5e9be6b59c..c5b82498f45caec0a65c0a1daa05e6f885381097 100644 --- a/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet +++ b/jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet @@ -54,8 +54,8 @@ function(params) { namespace: ne.config.namespace, }, spec: { - local r = if std.objectHasAll(ne.mixin, 'prometheusRules') then ne.mixin.prometheusRules else {}, - local a = if std.objectHasAll(ne.mixin, 'prometheusAlerts') then ne.mixin.prometheusAlerts else {}, + local r = if std.objectHasAll(ne.mixin, 'prometheusRules') then ne.mixin.prometheusRules.groups else [], + local a = if std.objectHasAll(ne.mixin, 'prometheusAlerts') then ne.mixin.prometheusAlerts.groups else [], groups: a + r, }, }, diff --git a/jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet b/jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet index b14974169e200ede2685455a8ff6fc81f626a35d..8114f91cc24968382316d4d0baa9f349d14c8bdb 100644 --- a/jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet +++ b/jsonnet/kube-prometheus/prometheus-operator/prometheus-operator.libsonnet @@ -54,8 +54,8 @@ function(params) namespace: config.namespace, }, spec: { - local r = if std.objectHasAll(po.mixin, 'prometheusRules') then po.mixin.prometheusRules else {}, - local a = if std.objectHasAll(po.mixin, 'prometheusAlerts') then po.mixin.prometheusAlerts else {}, + local r = if std.objectHasAll(po.mixin, 'prometheusRules') then po.mixin.prometheusRules.groups else [], + local a = if std.objectHasAll(po.mixin, 'prometheusAlerts') then po.mixin.prometheusAlerts.groups else [], groups: a + r, }, }, diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 1673c9e742d8484dc04b7bc2522d07f70efab3d2..76a251ff3ab4f45cb44799f78f5b33bc6286a8b0 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -60,8 +60,8 @@ function(params) { namespace: p.config.namespace, }, spec: { - local r = if std.objectHasAll(p.mixin, 'prometheusRules') then p.mixin.prometheusRules else {}, - local a = if std.objectHasAll(p.mixin, 'prometheusAlerts') then p.mixin.prometheusAlerts else {}, + local r = if std.objectHasAll(p.mixin, 'prometheusRules') then p.mixin.prometheusRules.groups else [], + local a = if std.objectHasAll(p.mixin, 'prometheusAlerts') then p.mixin.prometheusAlerts.groups else [], groups: a + r, }, },