diff --git a/README.md b/README.md index 83b1a6359ea532d57004c995e3b465f9bac72f8f..aa3b567403be208825401fe27b857609f0933522 100644 --- a/README.md +++ b/README.md @@ -281,7 +281,7 @@ These are the available fields with their respective default values: names: 'k8s', replicas: 2, rules: {}, - enableAdminApi: 'true', + enableAdminAPI: 'true', }, alertmanager+:: { diff --git a/example.jsonnet b/example.jsonnet index aa4c50f1e2aa0e97c88a28b01f8e75bc5b76648c..db480ea8d40b614397e56ac41d1d9e5b80842751 100644 --- a/example.jsonnet +++ b/example.jsonnet @@ -4,7 +4,7 @@ local kp = (import 'kube-prometheus/kube-prometheus.libsonnet') + { }, prometheus+:: { name: 'k8s', - enableAdminApi: 'true', + enableAdminAPI: 'true', }, }; diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 915d363f8b29305da94e63a1ee6c5ea9de53e81b..814cfe60add111fca1d688fa7fab88f5604542b6 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -82,7 +82,7 @@ local configMapList = k.core.v1.configMapList; prometheusSelector: 'job="prometheus-k8s"', prometheusOperatorSelector: 'job="prometheus-operator"', - enableAdminApi: 'true', + enableAdminAPI: 'true', jobs: { Kubelet: $._config.kubeletSelector, @@ -99,7 +99,7 @@ local configMapList = k.core.v1.configMapList; prometheus+:: { rules: $.prometheusRules + $.prometheusAlerts, - enableAdminApi: $._config.enableAdminApi, + enableAdminAPI: $._config.enableAdminAPI, }, grafana+:: { diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 047a6dd072889ae6366231ebb14aa8d5c30fc034..b6ce301a0e36cdf8711a43d89bd24ff2ca963d9b 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -18,7 +18,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; prometheus+:: { name: 'k8s', - enableAdminApi: 'true', + enableAdminAPI: 'true', replicas: 2, rules: {}, renderedRules: {}, @@ -169,7 +169,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet'; replicas: $._config.prometheus.replicas, version: $._config.versions.prometheus, baseImage: $._config.imageRepos.prometheus, - enableAdminApi: $._config.prometheus.enableAdminApi, + enableAdminAPI: $._config.prometheus.enableAdminAPI, serviceAccountName: 'prometheus-' + $._config.prometheus.name, serviceMonitorSelector: {}, serviceMonitorNamespaceSelector: {}, diff --git a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml index a9b3cdfa68166fd1881843deaab0a8934b3c59c0..abbf266f307f4d58a1d5d633301fb97d7dae8ab4 100644 --- a/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml +++ b/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml @@ -1538,7 +1538,7 @@ spec: required: - name type: array - enableAdminApi: + enableAdminAPI: description: Enable access to prometheus web admin API. More info: https://prometheus.io/docs/prometheus/latest/querying/api/#tsdb-admin-apis type: boolean evaluationInterval: diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 18bdcf748aeb844770c7ec04283e3e43c336c97d..5abe34b3f344303d6cd99a09e20a05c46fc85589 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -12,7 +12,7 @@ spec: namespace: monitoring port: web baseImage: quay.io/prometheus/prometheus - enableAdminApi: true + enableAdminAPI: true nodeSelector: beta.kubernetes.io/os: linux replicas: 2