diff --git a/jsonnet/kube-prometheus/platforms/aws.libsonnet b/jsonnet/kube-prometheus/platforms/aws.libsonnet index 04d67d0055e0faee5dfcb878c70cb95ce44f61c2..27a61c2b87bc25e67c29bad4c4d88041a27d3fc3 100644 --- a/jsonnet/kube-prometheus/platforms/aws.libsonnet +++ b/jsonnet/kube-prometheus/platforms/aws.libsonnet @@ -14,7 +14,7 @@ local service(name, namespace, labels, selector, ports) = { }; { - prometheus+: { + kubernetesControlPlane+: { kubeControllerManagerPrometheusDiscoveryService: service( 'kube-controller-manager-prometheus-discovery', 'kube-system', diff --git a/jsonnet/kube-prometheus/platforms/bootkube.libsonnet b/jsonnet/kube-prometheus/platforms/bootkube.libsonnet index 8e73509dd8e469b35a8256271ef90ff26b9ab01b..e4651ae92c14ab6df95ec37d0e906ec432187614 100644 --- a/jsonnet/kube-prometheus/platforms/bootkube.libsonnet +++ b/jsonnet/kube-prometheus/platforms/bootkube.libsonnet @@ -14,7 +14,7 @@ local service(name, namespace, labels, selector, ports) = { }; { - prometheus+:: { + kubernetesControlPlane+: { kubeControllerManagerPrometheusDiscoveryService: service( 'kube-controller-manager-prometheus-discovery', 'kube-system', diff --git a/jsonnet/kube-prometheus/platforms/eks.libsonnet b/jsonnet/kube-prometheus/platforms/eks.libsonnet index c72e5c8ba219964e72396b945669e10f44969181..815c1234d1b6bc6e61c981b06dbb70d7d904269a 100644 --- a/jsonnet/kube-prometheus/platforms/eks.libsonnet +++ b/jsonnet/kube-prometheus/platforms/eks.libsonnet @@ -5,7 +5,7 @@ minimumAvailableIPsTime: '10m', }, }, - prometheus+: { + kubernetesControlPlane+: { serviceMonitorCoreDNS+: { spec+: { endpoints: [ diff --git a/jsonnet/kube-prometheus/platforms/gke.libsonnet b/jsonnet/kube-prometheus/platforms/gke.libsonnet index b8b83c28b471466c21c8ee6a662b68cc84f35f5b..973eeffb86d4d05262b1ecfb5b8e81d2e372de98 100644 --- a/jsonnet/kube-prometheus/platforms/gke.libsonnet +++ b/jsonnet/kube-prometheus/platforms/gke.libsonnet @@ -1,6 +1,6 @@ (import '../addons/managed-cluster.libsonnet') + { - _config+:: { - prometheusAdapter+:: { + values+:: { + prometheusAdapter+: { config+: { resourceRules:: null, }, diff --git a/jsonnet/kube-prometheus/platforms/kops-coredns.libsonnet b/jsonnet/kube-prometheus/platforms/kops-coredns.libsonnet index 749e937c4ff72d02a5a67fc52e887327eeec5b78..b9688173f19fa10291c9c89452c0310843d38ae3 100644 --- a/jsonnet/kube-prometheus/platforms/kops-coredns.libsonnet +++ b/jsonnet/kube-prometheus/platforms/kops-coredns.libsonnet @@ -1,5 +1,5 @@ { - prometheus+:: { + kubernetesControlPlane+: { kubeDnsPrometheusDiscoveryService: { apiVersion: 'v1', kind: 'Service', diff --git a/jsonnet/kube-prometheus/platforms/kops.libsonnet b/jsonnet/kube-prometheus/platforms/kops.libsonnet index 54be338ebc92cce58bf0f5cae6236573b8654ab8..914ffb029902890348bed3f3894913c788d09d2b 100644 --- a/jsonnet/kube-prometheus/platforms/kops.libsonnet +++ b/jsonnet/kube-prometheus/platforms/kops.libsonnet @@ -14,7 +14,7 @@ local service(name, namespace, labels, selector, ports) = { }; { - prometheus+:: { + kubernetesControlPlane+: { kubeControllerManagerPrometheusDiscoveryService: service( 'kube-controller-manager-prometheus-discovery', 'kube-system', diff --git a/jsonnet/kube-prometheus/platforms/kubeadm.libsonnet b/jsonnet/kube-prometheus/platforms/kubeadm.libsonnet index 3621c2aac5d9493ef2ae2f12e6f8a24759ea333e..dec785d9de9000d45687a84fe9ae936b16b664c3 100644 --- a/jsonnet/kube-prometheus/platforms/kubeadm.libsonnet +++ b/jsonnet/kube-prometheus/platforms/kubeadm.libsonnet @@ -14,7 +14,7 @@ local service(name, namespace, labels, selector, ports) = { }; { - prometheus+: { + kubernetesControlPlane+: { kubeControllerManagerPrometheusDiscoveryService: service( 'kube-controller-manager-prometheus-discovery', 'kube-system', diff --git a/jsonnet/kube-prometheus/platforms/kubespray.libsonnet b/jsonnet/kube-prometheus/platforms/kubespray.libsonnet index f34cab677c51d99611827dcebc8786d98ea255e1..3b35e8e10526692ad7a5ddb165075f1f87a964fa 100644 --- a/jsonnet/kube-prometheus/platforms/kubespray.libsonnet +++ b/jsonnet/kube-prometheus/platforms/kubespray.libsonnet @@ -15,7 +15,7 @@ local service(name, namespace, labels, selector, ports) = { { - prometheus+: { + kubernetesControlPlane+: { kubeControllerManagerPrometheusDiscoveryService: service( 'kube-controller-manager-prometheus-discovery', 'kube-system',