From c4a20c34653c049fd9dbc83ec4d91285a125969c Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 8 Aug 2020 21:21:55 -0400 Subject: [PATCH 01/55] Initial chart direectory rename prometheus-operator to kube-prometheus See https://github.com/prometheus-community/community/issues/28#issuecomment-670406329 Signed-off-by: Scott Rigby --- charts/{prometheus-operator => kube-prometheus}/.helmignore | 0 charts/{prometheus-operator => kube-prometheus}/CONTRIBUTING.md | 0 charts/{prometheus-operator => kube-prometheus}/Chart.yaml | 0 charts/{prometheus-operator => kube-prometheus}/OWNERS | 0 charts/{prometheus-operator => kube-prometheus}/README.md | 0 .../ci/01-provision-crds-values.yaml | 0 .../ci/02-test-without-crds-values.yaml | 0 .../crds/crd-alertmanager.yaml | 0 .../crds/crd-podmonitor.yaml | 0 .../crds/crd-prometheus.yaml | 0 .../crds/crd-prometheusrules.yaml | 0 .../crds/crd-servicemonitor.yaml | 0 .../crds/crd-thanosrulers.yaml | 0 charts/{prometheus-operator => kube-prometheus}/hack/README.md | 0 .../hack/minikube/README.md | 0 .../{prometheus-operator => kube-prometheus}/hack/minikube/cmd.sh | 0 .../hack/minikube/values.yaml | 0 .../hack/requirements.txt | 0 .../hack/sync_grafana_dashboards.py | 0 .../hack/sync_prometheus_rules.py | 0 charts/{prometheus-operator => kube-prometheus}/requirements.lock | 0 charts/{prometheus-operator => kube-prometheus}/requirements.yaml | 0 .../{prometheus-operator => kube-prometheus}/templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/alertmanager/alertmanager.yaml | 0 .../templates/alertmanager/ingress.yaml | 0 .../templates/alertmanager/ingressperreplica.yaml | 0 .../templates/alertmanager/podDisruptionBudget.yaml | 0 .../templates/alertmanager/psp-role.yaml | 0 .../templates/alertmanager/psp-rolebinding.yaml | 0 .../templates/alertmanager/psp.yaml | 0 .../templates/alertmanager/secret.yaml | 0 .../templates/alertmanager/service.yaml | 0 .../templates/alertmanager/serviceaccount.yaml | 0 .../templates/alertmanager/servicemonitor.yaml | 0 .../templates/alertmanager/serviceperreplica.yaml | 0 .../templates/exporters/core-dns/service.yaml | 0 .../templates/exporters/core-dns/servicemonitor.yaml | 0 .../templates/exporters/kube-api-server/servicemonitor.yaml | 0 .../templates/exporters/kube-controller-manager/endpoints.yaml | 0 .../templates/exporters/kube-controller-manager/service.yaml | 0 .../exporters/kube-controller-manager/servicemonitor.yaml | 0 .../templates/exporters/kube-dns/service.yaml | 0 .../templates/exporters/kube-dns/servicemonitor.yaml | 0 .../templates/exporters/kube-etcd/endpoints.yaml | 0 .../templates/exporters/kube-etcd/service.yaml | 0 .../templates/exporters/kube-etcd/servicemonitor.yaml | 0 .../templates/exporters/kube-proxy/endpoints.yaml | 0 .../templates/exporters/kube-proxy/service.yaml | 0 .../templates/exporters/kube-proxy/servicemonitor.yaml | 0 .../templates/exporters/kube-scheduler/endpoints.yaml | 0 .../templates/exporters/kube-scheduler/service.yaml | 0 .../templates/exporters/kube-scheduler/servicemonitor.yaml | 0 .../templates/exporters/kube-state-metrics/serviceMonitor.yaml | 0 .../templates/exporters/kubelet/servicemonitor.yaml | 0 .../templates/exporters/node-exporter/servicemonitor.yaml | 0 .../templates/grafana/configmap-dashboards.yaml | 0 .../templates/grafana/configmaps-datasources.yaml | 0 .../templates/grafana/dashboards-1.14/apiserver.yaml | 0 .../templates/grafana/dashboards-1.14/cluster-total.yaml | 0 .../templates/grafana/dashboards-1.14/controller-manager.yaml | 0 .../templates/grafana/dashboards-1.14/etcd.yaml | 0 .../templates/grafana/dashboards-1.14/k8s-coredns.yaml | 0 .../templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml | 0 .../grafana/dashboards-1.14/k8s-resources-namespace.yaml | 0 .../templates/grafana/dashboards-1.14/k8s-resources-node.yaml | 0 .../templates/grafana/dashboards-1.14/k8s-resources-pod.yaml | 0 .../templates/grafana/dashboards-1.14/k8s-resources-workload.yaml | 0 .../dashboards-1.14/k8s-resources-workloads-namespace.yaml | 0 .../templates/grafana/dashboards-1.14/kubelet.yaml | 0 .../templates/grafana/dashboards-1.14/namespace-by-pod.yaml | 0 .../templates/grafana/dashboards-1.14/namespace-by-workload.yaml | 0 .../templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml | 0 .../templates/grafana/dashboards-1.14/node-rsrc-use.yaml | 0 .../templates/grafana/dashboards-1.14/nodes.yaml | 0 .../templates/grafana/dashboards-1.14/persistentvolumesusage.yaml | 0 .../templates/grafana/dashboards-1.14/pod-total.yaml | 0 .../grafana/dashboards-1.14/prometheus-remote-write.yaml | 0 .../templates/grafana/dashboards-1.14/prometheus.yaml | 0 .../templates/grafana/dashboards-1.14/proxy.yaml | 0 .../templates/grafana/dashboards-1.14/scheduler.yaml | 0 .../templates/grafana/dashboards-1.14/statefulset.yaml | 0 .../templates/grafana/dashboards-1.14/workload-total.yaml | 0 .../templates/grafana/dashboards/etcd.yaml | 0 .../templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml | 0 .../templates/grafana/dashboards/k8s-node-rsrc-use.yaml | 0 .../templates/grafana/dashboards/k8s-resources-cluster.yaml | 0 .../templates/grafana/dashboards/k8s-resources-namespace.yaml | 0 .../templates/grafana/dashboards/k8s-resources-pod.yaml | 0 .../templates/grafana/dashboards/k8s-resources-workload.yaml | 0 .../grafana/dashboards/k8s-resources-workloads-namespace.yaml | 0 .../templates/grafana/dashboards/nodes.yaml | 0 .../templates/grafana/dashboards/persistentvolumesusage.yaml | 0 .../templates/grafana/dashboards/pods.yaml | 0 .../templates/grafana/dashboards/statefulset.yaml | 0 .../templates/grafana/servicemonitor.yaml | 0 .../admission-webhooks/job-patch/clusterrole.yaml | 0 .../admission-webhooks/job-patch/clusterrolebinding.yaml | 0 .../admission-webhooks/job-patch/job-createSecret.yaml | 0 .../admission-webhooks/job-patch/job-patchWebhook.yaml | 0 .../prometheus-operator/admission-webhooks/job-patch/psp.yaml | 0 .../prometheus-operator/admission-webhooks/job-patch/role.yaml | 0 .../admission-webhooks/job-patch/rolebinding.yaml | 0 .../admission-webhooks/job-patch/serviceaccount.yaml | 0 .../admission-webhooks/mutatingWebhookConfiguration.yaml | 0 .../admission-webhooks/validatingWebhookConfiguration.yaml | 0 .../templates/prometheus-operator/cleanup-crds.yaml | 0 .../templates/prometheus-operator/clusterrole.yaml | 0 .../templates/prometheus-operator/clusterrolebinding.yaml | 0 .../templates/prometheus-operator/crds.yaml | 0 .../templates/prometheus-operator/deployment.yaml | 0 .../templates/prometheus-operator/psp-clusterrole.yaml | 0 .../templates/prometheus-operator/psp-clusterrolebinding.yaml | 0 .../templates/prometheus-operator/psp.yaml | 0 .../templates/prometheus-operator/service.yaml | 0 .../templates/prometheus-operator/serviceaccount.yaml | 0 .../templates/prometheus-operator/servicemonitor.yaml | 0 .../templates/prometheus/additionalAlertRelabelConfigs.yaml | 0 .../templates/prometheus/additionalAlertmanagerConfigs.yaml | 0 .../templates/prometheus/additionalPrometheusRules.yaml | 0 .../templates/prometheus/additionalScrapeConfigs.yaml | 0 .../templates/prometheus/clusterrole.yaml | 0 .../templates/prometheus/clusterrolebinding.yaml | 0 .../templates/prometheus/ingress.yaml | 0 .../templates/prometheus/ingressThanosSidecar.yaml | 0 .../templates/prometheus/ingressperreplica.yaml | 0 .../templates/prometheus/podDisruptionBudget.yaml | 0 .../templates/prometheus/podmonitors.yaml | 0 .../templates/prometheus/prometheus.yaml | 0 .../templates/prometheus/psp-clusterrole.yaml | 0 .../templates/prometheus/psp-clusterrolebinding.yaml | 0 .../templates/prometheus/psp.yaml | 0 .../templates/prometheus/rules-1.14/alertmanager.rules.yaml | 0 .../templates/prometheus/rules-1.14/etcd.yaml | 0 .../templates/prometheus/rules-1.14/general.rules.yaml | 0 .../templates/prometheus/rules-1.14/k8s.rules.yaml | 0 .../prometheus/rules-1.14/kube-apiserver-availability.rules.yaml | 0 .../templates/prometheus/rules-1.14/kube-apiserver-slos.yaml | 0 .../templates/prometheus/rules-1.14/kube-apiserver.rules.yaml | 0 .../prometheus/rules-1.14/kube-prometheus-general.rules.yaml | 0 .../rules-1.14/kube-prometheus-node-recording.rules.yaml | 0 .../templates/prometheus/rules-1.14/kube-scheduler.rules.yaml | 0 .../templates/prometheus/rules-1.14/kube-state-metrics.yaml | 0 .../templates/prometheus/rules-1.14/kubelet.rules.yaml | 0 .../templates/prometheus/rules-1.14/kubernetes-apps.yaml | 0 .../templates/prometheus/rules-1.14/kubernetes-resources.yaml | 0 .../templates/prometheus/rules-1.14/kubernetes-storage.yaml | 0 .../prometheus/rules-1.14/kubernetes-system-apiserver.yaml | 0 .../rules-1.14/kubernetes-system-controller-manager.yaml | 0 .../prometheus/rules-1.14/kubernetes-system-kubelet.yaml | 0 .../prometheus/rules-1.14/kubernetes-system-scheduler.yaml | 0 .../templates/prometheus/rules-1.14/kubernetes-system.yaml | 0 .../templates/prometheus/rules-1.14/node-exporter.rules.yaml | 0 .../templates/prometheus/rules-1.14/node-exporter.yaml | 0 .../templates/prometheus/rules-1.14/node-network.yaml | 0 .../templates/prometheus/rules-1.14/node.rules.yaml | 0 .../templates/prometheus/rules-1.14/prometheus-operator.yaml | 0 .../templates/prometheus/rules-1.14/prometheus.yaml | 0 .../templates/prometheus/rules/alertmanager.rules.yaml | 0 .../templates/prometheus/rules/etcd.yaml | 0 .../templates/prometheus/rules/general.rules.yaml | 0 .../templates/prometheus/rules/k8s.rules.yaml | 0 .../templates/prometheus/rules/kube-apiserver.rules.yaml | 0 .../prometheus/rules/kube-prometheus-node-alerting.rules.yaml | 0 .../prometheus/rules/kube-prometheus-node-recording.rules.yaml | 0 .../templates/prometheus/rules/kube-scheduler.rules.yaml | 0 .../templates/prometheus/rules/kubernetes-absent.yaml | 0 .../templates/prometheus/rules/kubernetes-apps.yaml | 0 .../templates/prometheus/rules/kubernetes-resources.yaml | 0 .../templates/prometheus/rules/kubernetes-storage.yaml | 0 .../templates/prometheus/rules/kubernetes-system.yaml | 0 .../templates/prometheus/rules/node-network.yaml | 0 .../templates/prometheus/rules/node-time.yaml | 0 .../templates/prometheus/rules/node.rules.yaml | 0 .../templates/prometheus/rules/prometheus-operator.yaml | 0 .../templates/prometheus/rules/prometheus.rules.yaml | 0 .../templates/prometheus/service.yaml | 0 .../templates/prometheus/serviceaccount.yaml | 0 .../templates/prometheus/servicemonitor.yaml | 0 .../templates/prometheus/servicemonitors.yaml | 0 .../templates/prometheus/serviceperreplica.yaml | 0 charts/{prometheus-operator => kube-prometheus}/values.yaml | 0 182 files changed, 0 insertions(+), 0 deletions(-) rename charts/{prometheus-operator => kube-prometheus}/.helmignore (100%) rename charts/{prometheus-operator => kube-prometheus}/CONTRIBUTING.md (100%) rename charts/{prometheus-operator => kube-prometheus}/Chart.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/OWNERS (100%) rename charts/{prometheus-operator => kube-prometheus}/README.md (100%) rename charts/{prometheus-operator => kube-prometheus}/ci/01-provision-crds-values.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/ci/02-test-without-crds-values.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/crds/crd-alertmanager.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/crds/crd-podmonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/crds/crd-prometheus.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/crds/crd-prometheusrules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/crds/crd-servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/crds/crd-thanosrulers.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/hack/README.md (100%) rename charts/{prometheus-operator => kube-prometheus}/hack/minikube/README.md (100%) rename charts/{prometheus-operator => kube-prometheus}/hack/minikube/cmd.sh (100%) rename charts/{prometheus-operator => kube-prometheus}/hack/minikube/values.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/hack/requirements.txt (100%) rename charts/{prometheus-operator => kube-prometheus}/hack/sync_grafana_dashboards.py (100%) rename charts/{prometheus-operator => kube-prometheus}/hack/sync_prometheus_rules.py (100%) rename charts/{prometheus-operator => kube-prometheus}/requirements.lock (100%) rename charts/{prometheus-operator => kube-prometheus}/requirements.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/NOTES.txt (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/_helpers.tpl (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/alertmanager.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/ingress.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/ingressperreplica.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/podDisruptionBudget.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/psp-role.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/psp-rolebinding.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/psp.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/secret.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/service.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/serviceaccount.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/alertmanager/serviceperreplica.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/core-dns/service.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/core-dns/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-api-server/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-controller-manager/endpoints.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-controller-manager/service.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-controller-manager/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-dns/service.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-dns/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-etcd/endpoints.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-etcd/service.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-etcd/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-proxy/endpoints.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-proxy/service.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-proxy/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-scheduler/endpoints.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-scheduler/service.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-scheduler/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kube-state-metrics/serviceMonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/kubelet/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/exporters/node-exporter/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/configmap-dashboards.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/configmaps-datasources.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/apiserver.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/cluster-total.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/controller-manager.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/etcd.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/k8s-coredns.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/k8s-resources-node.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/kubelet.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/namespace-by-pod.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/namespace-by-workload.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/node-rsrc-use.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/nodes.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/pod-total.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/prometheus.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/proxy.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/scheduler.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/statefulset.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards-1.14/workload-total.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/etcd.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/k8s-node-rsrc-use.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/k8s-resources-cluster.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/k8s-resources-namespace.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/k8s-resources-pod.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/k8s-resources-workload.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/nodes.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/persistentvolumesusage.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/pods.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/dashboards/statefulset.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/grafana/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/cleanup-crds.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/clusterrole.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/clusterrolebinding.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/crds.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/deployment.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/psp-clusterrole.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/psp-clusterrolebinding.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/psp.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/service.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/serviceaccount.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus-operator/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/additionalAlertRelabelConfigs.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/additionalAlertmanagerConfigs.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/additionalPrometheusRules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/additionalScrapeConfigs.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/clusterrole.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/clusterrolebinding.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/ingress.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/ingressThanosSidecar.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/ingressperreplica.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/podDisruptionBudget.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/podmonitors.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/prometheus.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/psp-clusterrole.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/psp-clusterrolebinding.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/psp.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/alertmanager.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/etcd.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/general.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/k8s.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kube-state-metrics.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kubelet.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kubernetes-apps.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kubernetes-resources.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kubernetes-storage.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/kubernetes-system.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/node-exporter.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/node-exporter.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/node-network.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/node.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/prometheus-operator.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules-1.14/prometheus.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/alertmanager.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/etcd.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/general.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/k8s.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/kube-apiserver.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/kube-scheduler.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/kubernetes-absent.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/kubernetes-apps.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/kubernetes-resources.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/kubernetes-storage.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/kubernetes-system.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/node-network.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/node-time.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/node.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/prometheus-operator.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/rules/prometheus.rules.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/service.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/serviceaccount.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/servicemonitor.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/servicemonitors.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/templates/prometheus/serviceperreplica.yaml (100%) rename charts/{prometheus-operator => kube-prometheus}/values.yaml (100%) diff --git a/charts/prometheus-operator/.helmignore b/charts/kube-prometheus/.helmignore similarity index 100% rename from charts/prometheus-operator/.helmignore rename to charts/kube-prometheus/.helmignore diff --git a/charts/prometheus-operator/CONTRIBUTING.md b/charts/kube-prometheus/CONTRIBUTING.md similarity index 100% rename from charts/prometheus-operator/CONTRIBUTING.md rename to charts/kube-prometheus/CONTRIBUTING.md diff --git a/charts/prometheus-operator/Chart.yaml b/charts/kube-prometheus/Chart.yaml similarity index 100% rename from charts/prometheus-operator/Chart.yaml rename to charts/kube-prometheus/Chart.yaml diff --git a/charts/prometheus-operator/OWNERS b/charts/kube-prometheus/OWNERS similarity index 100% rename from charts/prometheus-operator/OWNERS rename to charts/kube-prometheus/OWNERS diff --git a/charts/prometheus-operator/README.md b/charts/kube-prometheus/README.md similarity index 100% rename from charts/prometheus-operator/README.md rename to charts/kube-prometheus/README.md diff --git a/charts/prometheus-operator/ci/01-provision-crds-values.yaml b/charts/kube-prometheus/ci/01-provision-crds-values.yaml similarity index 100% rename from charts/prometheus-operator/ci/01-provision-crds-values.yaml rename to charts/kube-prometheus/ci/01-provision-crds-values.yaml diff --git a/charts/prometheus-operator/ci/02-test-without-crds-values.yaml b/charts/kube-prometheus/ci/02-test-without-crds-values.yaml similarity index 100% rename from charts/prometheus-operator/ci/02-test-without-crds-values.yaml rename to charts/kube-prometheus/ci/02-test-without-crds-values.yaml diff --git a/charts/prometheus-operator/crds/crd-alertmanager.yaml b/charts/kube-prometheus/crds/crd-alertmanager.yaml similarity index 100% rename from charts/prometheus-operator/crds/crd-alertmanager.yaml rename to charts/kube-prometheus/crds/crd-alertmanager.yaml diff --git a/charts/prometheus-operator/crds/crd-podmonitor.yaml b/charts/kube-prometheus/crds/crd-podmonitor.yaml similarity index 100% rename from charts/prometheus-operator/crds/crd-podmonitor.yaml rename to charts/kube-prometheus/crds/crd-podmonitor.yaml diff --git a/charts/prometheus-operator/crds/crd-prometheus.yaml b/charts/kube-prometheus/crds/crd-prometheus.yaml similarity index 100% rename from charts/prometheus-operator/crds/crd-prometheus.yaml rename to charts/kube-prometheus/crds/crd-prometheus.yaml diff --git a/charts/prometheus-operator/crds/crd-prometheusrules.yaml b/charts/kube-prometheus/crds/crd-prometheusrules.yaml similarity index 100% rename from charts/prometheus-operator/crds/crd-prometheusrules.yaml rename to charts/kube-prometheus/crds/crd-prometheusrules.yaml diff --git a/charts/prometheus-operator/crds/crd-servicemonitor.yaml b/charts/kube-prometheus/crds/crd-servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/crds/crd-servicemonitor.yaml rename to charts/kube-prometheus/crds/crd-servicemonitor.yaml diff --git a/charts/prometheus-operator/crds/crd-thanosrulers.yaml b/charts/kube-prometheus/crds/crd-thanosrulers.yaml similarity index 100% rename from charts/prometheus-operator/crds/crd-thanosrulers.yaml rename to charts/kube-prometheus/crds/crd-thanosrulers.yaml diff --git a/charts/prometheus-operator/hack/README.md b/charts/kube-prometheus/hack/README.md similarity index 100% rename from charts/prometheus-operator/hack/README.md rename to charts/kube-prometheus/hack/README.md diff --git a/charts/prometheus-operator/hack/minikube/README.md b/charts/kube-prometheus/hack/minikube/README.md similarity index 100% rename from charts/prometheus-operator/hack/minikube/README.md rename to charts/kube-prometheus/hack/minikube/README.md diff --git a/charts/prometheus-operator/hack/minikube/cmd.sh b/charts/kube-prometheus/hack/minikube/cmd.sh similarity index 100% rename from charts/prometheus-operator/hack/minikube/cmd.sh rename to charts/kube-prometheus/hack/minikube/cmd.sh diff --git a/charts/prometheus-operator/hack/minikube/values.yaml b/charts/kube-prometheus/hack/minikube/values.yaml similarity index 100% rename from charts/prometheus-operator/hack/minikube/values.yaml rename to charts/kube-prometheus/hack/minikube/values.yaml diff --git a/charts/prometheus-operator/hack/requirements.txt b/charts/kube-prometheus/hack/requirements.txt similarity index 100% rename from charts/prometheus-operator/hack/requirements.txt rename to charts/kube-prometheus/hack/requirements.txt diff --git a/charts/prometheus-operator/hack/sync_grafana_dashboards.py b/charts/kube-prometheus/hack/sync_grafana_dashboards.py similarity index 100% rename from charts/prometheus-operator/hack/sync_grafana_dashboards.py rename to charts/kube-prometheus/hack/sync_grafana_dashboards.py diff --git a/charts/prometheus-operator/hack/sync_prometheus_rules.py b/charts/kube-prometheus/hack/sync_prometheus_rules.py similarity index 100% rename from charts/prometheus-operator/hack/sync_prometheus_rules.py rename to charts/kube-prometheus/hack/sync_prometheus_rules.py diff --git a/charts/prometheus-operator/requirements.lock b/charts/kube-prometheus/requirements.lock similarity index 100% rename from charts/prometheus-operator/requirements.lock rename to charts/kube-prometheus/requirements.lock diff --git a/charts/prometheus-operator/requirements.yaml b/charts/kube-prometheus/requirements.yaml similarity index 100% rename from charts/prometheus-operator/requirements.yaml rename to charts/kube-prometheus/requirements.yaml diff --git a/charts/prometheus-operator/templates/NOTES.txt b/charts/kube-prometheus/templates/NOTES.txt similarity index 100% rename from charts/prometheus-operator/templates/NOTES.txt rename to charts/kube-prometheus/templates/NOTES.txt diff --git a/charts/prometheus-operator/templates/_helpers.tpl b/charts/kube-prometheus/templates/_helpers.tpl similarity index 100% rename from charts/prometheus-operator/templates/_helpers.tpl rename to charts/kube-prometheus/templates/_helpers.tpl diff --git a/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml b/charts/kube-prometheus/templates/alertmanager/alertmanager.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/alertmanager.yaml rename to charts/kube-prometheus/templates/alertmanager/alertmanager.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/ingress.yaml b/charts/kube-prometheus/templates/alertmanager/ingress.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/ingress.yaml rename to charts/kube-prometheus/templates/alertmanager/ingress.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/ingressperreplica.yaml b/charts/kube-prometheus/templates/alertmanager/ingressperreplica.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/ingressperreplica.yaml rename to charts/kube-prometheus/templates/alertmanager/ingressperreplica.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml b/charts/kube-prometheus/templates/alertmanager/podDisruptionBudget.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml rename to charts/kube-prometheus/templates/alertmanager/podDisruptionBudget.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/psp-role.yaml b/charts/kube-prometheus/templates/alertmanager/psp-role.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/psp-role.yaml rename to charts/kube-prometheus/templates/alertmanager/psp-role.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/psp-rolebinding.yaml b/charts/kube-prometheus/templates/alertmanager/psp-rolebinding.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/psp-rolebinding.yaml rename to charts/kube-prometheus/templates/alertmanager/psp-rolebinding.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/psp.yaml b/charts/kube-prometheus/templates/alertmanager/psp.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/psp.yaml rename to charts/kube-prometheus/templates/alertmanager/psp.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/secret.yaml b/charts/kube-prometheus/templates/alertmanager/secret.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/secret.yaml rename to charts/kube-prometheus/templates/alertmanager/secret.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/service.yaml b/charts/kube-prometheus/templates/alertmanager/service.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/service.yaml rename to charts/kube-prometheus/templates/alertmanager/service.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml b/charts/kube-prometheus/templates/alertmanager/serviceaccount.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml rename to charts/kube-prometheus/templates/alertmanager/serviceaccount.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml b/charts/kube-prometheus/templates/alertmanager/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml rename to charts/kube-prometheus/templates/alertmanager/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/alertmanager/serviceperreplica.yaml b/charts/kube-prometheus/templates/alertmanager/serviceperreplica.yaml similarity index 100% rename from charts/prometheus-operator/templates/alertmanager/serviceperreplica.yaml rename to charts/kube-prometheus/templates/alertmanager/serviceperreplica.yaml diff --git a/charts/prometheus-operator/templates/exporters/core-dns/service.yaml b/charts/kube-prometheus/templates/exporters/core-dns/service.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/core-dns/service.yaml rename to charts/kube-prometheus/templates/exporters/core-dns/service.yaml diff --git a/charts/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml rename to charts/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-api-server/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml rename to charts/kube-prometheus/templates/exporters/kube-api-server/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-controller-manager/endpoints.yaml b/charts/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-controller-manager/endpoints.yaml rename to charts/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-controller-manager/service.yaml b/charts/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-controller-manager/service.yaml rename to charts/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml rename to charts/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-dns/service.yaml b/charts/kube-prometheus/templates/exporters/kube-dns/service.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-dns/service.yaml rename to charts/kube-prometheus/templates/exporters/kube-dns/service.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-dns/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml rename to charts/kube-prometheus/templates/exporters/kube-dns/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml b/charts/kube-prometheus/templates/exporters/kube-etcd/endpoints.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml rename to charts/kube-prometheus/templates/exporters/kube-etcd/endpoints.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-etcd/service.yaml b/charts/kube-prometheus/templates/exporters/kube-etcd/service.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-etcd/service.yaml rename to charts/kube-prometheus/templates/exporters/kube-etcd/service.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-etcd/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml rename to charts/kube-prometheus/templates/exporters/kube-etcd/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-proxy/endpoints.yaml b/charts/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-proxy/endpoints.yaml rename to charts/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-proxy/service.yaml b/charts/kube-prometheus/templates/exporters/kube-proxy/service.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-proxy/service.yaml rename to charts/kube-prometheus/templates/exporters/kube-proxy/service.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml rename to charts/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml b/charts/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml rename to charts/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-scheduler/service.yaml b/charts/kube-prometheus/templates/exporters/kube-scheduler/service.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-scheduler/service.yaml rename to charts/kube-prometheus/templates/exporters/kube-scheduler/service.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml rename to charts/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-state-metrics/serviceMonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml rename to charts/kube-prometheus/templates/exporters/kube-state-metrics/serviceMonitor.yaml diff --git a/charts/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml rename to charts/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/node-exporter/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml rename to charts/kube-prometheus/templates/exporters/node-exporter/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml b/charts/kube-prometheus/templates/grafana/configmap-dashboards.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml rename to charts/kube-prometheus/templates/grafana/configmap-dashboards.yaml diff --git a/charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml b/charts/kube-prometheus/templates/grafana/configmaps-datasources.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml rename to charts/kube-prometheus/templates/grafana/configmaps-datasources.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/etcd.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/etcd.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-coredns.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-coredns.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml rename to charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml b/charts/kube-prometheus/templates/grafana/dashboards/etcd.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/etcd.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml b/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml b/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml b/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/pods.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/pods.yaml diff --git a/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml b/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml rename to charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml diff --git a/charts/prometheus-operator/templates/grafana/servicemonitor.yaml b/charts/kube-prometheus/templates/grafana/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/grafana/servicemonitor.yaml rename to charts/kube-prometheus/templates/grafana/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml rename to charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml rename to charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml rename to charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml rename to charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml rename to charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml rename to charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml rename to charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml rename to charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml rename to charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml rename to charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml b/charts/kube-prometheus/templates/prometheus-operator/cleanup-crds.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml rename to charts/kube-prometheus/templates/prometheus-operator/cleanup-crds.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml b/charts/kube-prometheus/templates/prometheus-operator/clusterrole.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml rename to charts/kube-prometheus/templates/prometheus-operator/clusterrole.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml b/charts/kube-prometheus/templates/prometheus-operator/clusterrolebinding.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml rename to charts/kube-prometheus/templates/prometheus-operator/clusterrolebinding.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/crds.yaml b/charts/kube-prometheus/templates/prometheus-operator/crds.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/crds.yaml rename to charts/kube-prometheus/templates/prometheus-operator/crds.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml b/charts/kube-prometheus/templates/prometheus-operator/deployment.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/deployment.yaml rename to charts/kube-prometheus/templates/prometheus-operator/deployment.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml b/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrole.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml rename to charts/kube-prometheus/templates/prometheus-operator/psp-clusterrole.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml b/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrolebinding.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml rename to charts/kube-prometheus/templates/prometheus-operator/psp-clusterrolebinding.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/psp.yaml b/charts/kube-prometheus/templates/prometheus-operator/psp.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/psp.yaml rename to charts/kube-prometheus/templates/prometheus-operator/psp.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/service.yaml b/charts/kube-prometheus/templates/prometheus-operator/service.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/service.yaml rename to charts/kube-prometheus/templates/prometheus-operator/service.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml b/charts/kube-prometheus/templates/prometheus-operator/serviceaccount.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml rename to charts/kube-prometheus/templates/prometheus-operator/serviceaccount.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml b/charts/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml rename to charts/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml b/charts/kube-prometheus/templates/prometheus/additionalAlertRelabelConfigs.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml rename to charts/kube-prometheus/templates/prometheus/additionalAlertRelabelConfigs.yaml diff --git a/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml b/charts/kube-prometheus/templates/prometheus/additionalAlertmanagerConfigs.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml rename to charts/kube-prometheus/templates/prometheus/additionalAlertmanagerConfigs.yaml diff --git a/charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml b/charts/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml rename to charts/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml b/charts/kube-prometheus/templates/prometheus/additionalScrapeConfigs.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml rename to charts/kube-prometheus/templates/prometheus/additionalScrapeConfigs.yaml diff --git a/charts/prometheus-operator/templates/prometheus/clusterrole.yaml b/charts/kube-prometheus/templates/prometheus/clusterrole.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/clusterrole.yaml rename to charts/kube-prometheus/templates/prometheus/clusterrole.yaml diff --git a/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml b/charts/kube-prometheus/templates/prometheus/clusterrolebinding.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml rename to charts/kube-prometheus/templates/prometheus/clusterrolebinding.yaml diff --git a/charts/prometheus-operator/templates/prometheus/ingress.yaml b/charts/kube-prometheus/templates/prometheus/ingress.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/ingress.yaml rename to charts/kube-prometheus/templates/prometheus/ingress.yaml diff --git a/charts/prometheus-operator/templates/prometheus/ingressThanosSidecar.yaml b/charts/kube-prometheus/templates/prometheus/ingressThanosSidecar.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/ingressThanosSidecar.yaml rename to charts/kube-prometheus/templates/prometheus/ingressThanosSidecar.yaml diff --git a/charts/prometheus-operator/templates/prometheus/ingressperreplica.yaml b/charts/kube-prometheus/templates/prometheus/ingressperreplica.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/ingressperreplica.yaml rename to charts/kube-prometheus/templates/prometheus/ingressperreplica.yaml diff --git a/charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/charts/kube-prometheus/templates/prometheus/podDisruptionBudget.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml rename to charts/kube-prometheus/templates/prometheus/podDisruptionBudget.yaml diff --git a/charts/prometheus-operator/templates/prometheus/podmonitors.yaml b/charts/kube-prometheus/templates/prometheus/podmonitors.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/podmonitors.yaml rename to charts/kube-prometheus/templates/prometheus/podmonitors.yaml diff --git a/charts/prometheus-operator/templates/prometheus/prometheus.yaml b/charts/kube-prometheus/templates/prometheus/prometheus.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/prometheus.yaml rename to charts/kube-prometheus/templates/prometheus/prometheus.yaml diff --git a/charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml b/charts/kube-prometheus/templates/prometheus/psp-clusterrole.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml rename to charts/kube-prometheus/templates/prometheus/psp-clusterrole.yaml diff --git a/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml b/charts/kube-prometheus/templates/prometheus/psp-clusterrolebinding.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml rename to charts/kube-prometheus/templates/prometheus/psp-clusterrolebinding.yaml diff --git a/charts/prometheus-operator/templates/prometheus/psp.yaml b/charts/kube-prometheus/templates/prometheus/psp.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/psp.yaml rename to charts/kube-prometheus/templates/prometheus/psp.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/etcd.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/etcd.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kube-state-metrics.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-state-metrics.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kubelet.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubelet.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml rename to charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/etcd.yaml b/charts/kube-prometheus/templates/prometheus/rules/etcd.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/etcd.yaml rename to charts/kube-prometheus/templates/prometheus/rules/etcd.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml rename to charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml rename to charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml rename to charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml rename to charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml rename to charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/node-network.yaml b/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/node-network.yaml rename to charts/kube-prometheus/templates/prometheus/rules/node-network.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/node-time.yaml b/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/node-time.yaml rename to charts/kube-prometheus/templates/prometheus/rules/node-time.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml b/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml rename to charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml diff --git a/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml rename to charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml diff --git a/charts/prometheus-operator/templates/prometheus/service.yaml b/charts/kube-prometheus/templates/prometheus/service.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/service.yaml rename to charts/kube-prometheus/templates/prometheus/service.yaml diff --git a/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml b/charts/kube-prometheus/templates/prometheus/serviceaccount.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/serviceaccount.yaml rename to charts/kube-prometheus/templates/prometheus/serviceaccount.yaml diff --git a/charts/prometheus-operator/templates/prometheus/servicemonitor.yaml b/charts/kube-prometheus/templates/prometheus/servicemonitor.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/servicemonitor.yaml rename to charts/kube-prometheus/templates/prometheus/servicemonitor.yaml diff --git a/charts/prometheus-operator/templates/prometheus/servicemonitors.yaml b/charts/kube-prometheus/templates/prometheus/servicemonitors.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/servicemonitors.yaml rename to charts/kube-prometheus/templates/prometheus/servicemonitors.yaml diff --git a/charts/prometheus-operator/templates/prometheus/serviceperreplica.yaml b/charts/kube-prometheus/templates/prometheus/serviceperreplica.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus/serviceperreplica.yaml rename to charts/kube-prometheus/templates/prometheus/serviceperreplica.yaml diff --git a/charts/prometheus-operator/values.yaml b/charts/kube-prometheus/values.yaml similarity index 100% rename from charts/prometheus-operator/values.yaml rename to charts/kube-prometheus/values.yaml From 50dbbaf8aa4ff130007e121e46911050811e6976 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 8 Aug 2020 21:41:14 -0400 Subject: [PATCH 02/55] First attempt at data change of prometheus-operator to kube-prometheus Signed-off-by: Scott Rigby --- charts/kube-prometheus/.helmignore | 2 +- charts/kube-prometheus/CONTRIBUTING.md | 2 +- charts/kube-prometheus/Chart.yaml | 4 +- charts/kube-prometheus/README.md | 641 ++---------------- charts/kube-prometheus/hack/README.md | 4 +- charts/kube-prometheus/hack/minikube/cmd.sh | 6 +- .../hack/sync_grafana_dashboards.py | 10 +- .../hack/sync_prometheus_rules.py | 18 +- charts/kube-prometheus/templates/NOTES.txt | 6 +- charts/kube-prometheus/templates/_helpers.tpl | 38 +- .../templates/alertmanager/alertmanager.yaml | 16 +- .../templates/alertmanager/ingress.yaml | 8 +- .../alertmanager/ingressperreplica.yaml | 14 +- .../alertmanager/podDisruptionBudget.yaml | 10 +- .../templates/alertmanager/psp-role.yaml | 10 +- .../alertmanager/psp-rolebinding.yaml | 14 +- .../templates/alertmanager/psp.yaml | 6 +- .../templates/alertmanager/secret.yaml | 8 +- .../templates/alertmanager/service.yaml | 10 +- .../alertmanager/serviceaccount.yaml | 8 +- .../alertmanager/servicemonitor.yaml | 12 +- .../alertmanager/serviceperreplica.yaml | 16 +- .../templates/exporters/core-dns/service.yaml | 6 +- .../exporters/core-dns/servicemonitor.yaml | 10 +- .../kube-api-server/servicemonitor.yaml | 8 +- .../kube-controller-manager/endpoints.yaml | 6 +- .../kube-controller-manager/service.yaml | 6 +- .../servicemonitor.yaml | 10 +- .../templates/exporters/kube-dns/service.yaml | 6 +- .../exporters/kube-dns/servicemonitor.yaml | 10 +- .../exporters/kube-etcd/endpoints.yaml | 6 +- .../exporters/kube-etcd/service.yaml | 6 +- .../exporters/kube-etcd/servicemonitor.yaml | 10 +- .../exporters/kube-proxy/endpoints.yaml | 6 +- .../exporters/kube-proxy/service.yaml | 6 +- .../exporters/kube-proxy/servicemonitor.yaml | 10 +- .../exporters/kube-scheduler/endpoints.yaml | 6 +- .../exporters/kube-scheduler/service.yaml | 6 +- .../kube-scheduler/servicemonitor.yaml | 10 +- .../kube-state-metrics/serviceMonitor.yaml | 8 +- .../exporters/kubelet/servicemonitor.yaml | 8 +- .../node-exporter/servicemonitor.yaml | 8 +- .../grafana/configmap-dashboards.yaml | 8 +- .../grafana/configmaps-datasources.yaml | 12 +- .../grafana/dashboards-1.14/apiserver.yaml | 10 +- .../dashboards-1.14/cluster-total.yaml | 10 +- .../dashboards-1.14/controller-manager.yaml | 10 +- .../grafana/dashboards-1.14/etcd.yaml | 10 +- .../grafana/dashboards-1.14/k8s-coredns.yaml | 8 +- .../k8s-resources-cluster.yaml | 10 +- .../k8s-resources-namespace.yaml | 10 +- .../dashboards-1.14/k8s-resources-node.yaml | 10 +- .../dashboards-1.14/k8s-resources-pod.yaml | 10 +- .../k8s-resources-workload.yaml | 10 +- .../k8s-resources-workloads-namespace.yaml | 10 +- .../grafana/dashboards-1.14/kubelet.yaml | 10 +- .../dashboards-1.14/namespace-by-pod.yaml | 10 +- .../namespace-by-workload.yaml | 10 +- .../node-cluster-rsrc-use.yaml | 10 +- .../dashboards-1.14/node-rsrc-use.yaml | 10 +- .../grafana/dashboards-1.14/nodes.yaml | 10 +- .../persistentvolumesusage.yaml | 10 +- .../grafana/dashboards-1.14/pod-total.yaml | 10 +- .../prometheus-remote-write.yaml | 10 +- .../grafana/dashboards-1.14/prometheus.yaml | 10 +- .../grafana/dashboards-1.14/proxy.yaml | 10 +- .../grafana/dashboards-1.14/scheduler.yaml | 10 +- .../grafana/dashboards-1.14/statefulset.yaml | 10 +- .../dashboards-1.14/workload-total.yaml | 10 +- .../templates/grafana/dashboards/etcd.yaml | 10 +- .../dashboards/k8s-cluster-rsrc-use.yaml | 10 +- .../grafana/dashboards/k8s-node-rsrc-use.yaml | 10 +- .../dashboards/k8s-resources-cluster.yaml | 10 +- .../dashboards/k8s-resources-namespace.yaml | 10 +- .../grafana/dashboards/k8s-resources-pod.yaml | 10 +- .../dashboards/k8s-resources-workload.yaml | 10 +- .../k8s-resources-workloads-namespace.yaml | 10 +- .../templates/grafana/dashboards/nodes.yaml | 10 +- .../dashboards/persistentvolumesusage.yaml | 10 +- .../templates/grafana/dashboards/pods.yaml | 10 +- .../grafana/dashboards/statefulset.yaml | 10 +- .../templates/grafana/servicemonitor.yaml | 10 +- .../job-patch/clusterrole.yaml | 8 +- .../job-patch/clusterrolebinding.yaml | 12 +- .../job-patch/job-createSecret.yaml | 22 +- .../job-patch/job-patchWebhook.yaml | 22 +- .../admission-webhooks/job-patch/psp.yaml | 6 +- .../admission-webhooks/job-patch/role.yaml | 8 +- .../job-patch/rolebinding.yaml | 14 +- .../job-patch/serviceaccount.yaml | 8 +- .../mutatingWebhookConfiguration.yaml | 10 +- .../validatingWebhookConfiguration.yaml | 10 +- .../prometheus-operator/cleanup-crds.yaml | 16 +- .../prometheus-operator/clusterrole.yaml | 6 +- .../clusterrolebinding.yaml | 12 +- .../prometheus-operator/deployment.yaml | 24 +- .../prometheus-operator/psp-clusterrole.yaml | 8 +- .../psp-clusterrolebinding.yaml | 12 +- .../templates/prometheus-operator/psp.yaml | 6 +- .../prometheus-operator/service.yaml | 10 +- .../prometheus-operator/serviceaccount.yaml | 8 +- .../prometheus-operator/servicemonitor.yaml | 12 +- .../additionalAlertRelabelConfigs.yaml | 8 +- .../additionalAlertmanagerConfigs.yaml | 8 +- .../prometheus/additionalPrometheusRules.yaml | 16 +- .../prometheus/additionalScrapeConfigs.yaml | 8 +- .../templates/prometheus/clusterrole.yaml | 8 +- .../prometheus/clusterrolebinding.yaml | 12 +- .../templates/prometheus/ingress.yaml | 8 +- .../prometheus/ingressThanosSidecar.yaml | 8 +- .../prometheus/ingressperreplica.yaml | 14 +- .../prometheus/podDisruptionBudget.yaml | 10 +- .../templates/prometheus/podmonitors.yaml | 6 +- .../templates/prometheus/prometheus.yaml | 28 +- .../templates/prometheus/psp-clusterrole.yaml | 8 +- .../prometheus/psp-clusterrolebinding.yaml | 12 +- .../templates/prometheus/psp.yaml | 6 +- .../rules-1.14/alertmanager.rules.yaml | 14 +- .../templates/prometheus/rules-1.14/etcd.yaml | 10 +- .../prometheus/rules-1.14/general.rules.yaml | 10 +- .../prometheus/rules-1.14/k8s.rules.yaml | 10 +- .../kube-apiserver-availability.rules.yaml | 10 +- .../rules-1.14/kube-apiserver-slos.yaml | 10 +- .../rules-1.14/kube-apiserver.rules.yaml | 10 +- .../kube-prometheus-general.rules.yaml | 10 +- .../kube-prometheus-node-recording.rules.yaml | 10 +- .../rules-1.14/kube-scheduler.rules.yaml | 10 +- .../rules-1.14/kube-state-metrics.yaml | 10 +- .../prometheus/rules-1.14/kubelet.rules.yaml | 10 +- .../rules-1.14/kubernetes-apps.yaml | 10 +- .../rules-1.14/kubernetes-resources.yaml | 10 +- .../rules-1.14/kubernetes-storage.yaml | 10 +- .../kubernetes-system-apiserver.yaml | 10 +- .../kubernetes-system-controller-manager.yaml | 10 +- .../rules-1.14/kubernetes-system-kubelet.yaml | 10 +- .../kubernetes-system-scheduler.yaml | 10 +- .../rules-1.14/kubernetes-system.yaml | 10 +- .../rules-1.14/node-exporter.rules.yaml | 10 +- .../prometheus/rules-1.14/node-exporter.yaml | 10 +- .../prometheus/rules-1.14/node-network.yaml | 10 +- .../prometheus/rules-1.14/node.rules.yaml | 10 +- .../rules-1.14/prometheus-operator.yaml | 14 +- .../prometheus/rules-1.14/prometheus.yaml | 14 +- .../prometheus/rules/alertmanager.rules.yaml | 16 +- .../templates/prometheus/rules/etcd.yaml | 10 +- .../prometheus/rules/general.rules.yaml | 10 +- .../templates/prometheus/rules/k8s.rules.yaml | 10 +- .../rules/kube-apiserver.rules.yaml | 10 +- .../kube-prometheus-node-alerting.rules.yaml | 10 +- .../kube-prometheus-node-recording.rules.yaml | 10 +- .../rules/kube-scheduler.rules.yaml | 10 +- .../prometheus/rules/kubernetes-absent.yaml | 18 +- .../prometheus/rules/kubernetes-apps.yaml | 10 +- .../rules/kubernetes-resources.yaml | 10 +- .../prometheus/rules/kubernetes-storage.yaml | 10 +- .../prometheus/rules/kubernetes-system.yaml | 10 +- .../prometheus/rules/node-network.yaml | 10 +- .../templates/prometheus/rules/node-time.yaml | 10 +- .../prometheus/rules/node.rules.yaml | 10 +- .../prometheus/rules/prometheus-operator.yaml | 14 +- .../prometheus/rules/prometheus.rules.yaml | 14 +- .../templates/prometheus/service.yaml | 10 +- .../templates/prometheus/serviceaccount.yaml | 8 +- .../templates/prometheus/servicemonitor.yaml | 12 +- .../templates/prometheus/servicemonitors.yaml | 6 +- .../prometheus/serviceperreplica.yaml | 16 +- charts/kube-prometheus/values.yaml | 4 +- 167 files changed, 922 insertions(+), 1415 deletions(-) diff --git a/charts/kube-prometheus/.helmignore b/charts/kube-prometheus/.helmignore index aba2fa8ce401..93bf1ec02c38 100644 --- a/charts/kube-prometheus/.helmignore +++ b/charts/kube-prometheus/.helmignore @@ -23,4 +23,4 @@ OWNERS hack/ ci/ -prometheus-operator-*.tgz +kube-prometheus-*.tgz diff --git a/charts/kube-prometheus/CONTRIBUTING.md b/charts/kube-prometheus/CONTRIBUTING.md index 44533af6e599..f672237fdefb 100644 --- a/charts/kube-prometheus/CONTRIBUTING.md +++ b/charts/kube-prometheus/CONTRIBUTING.md @@ -2,7 +2,7 @@ ## How to contribute to this chart 1. Fork this repository, develop and test your Chart. 1. Bump the chart version for every change. -1. Ensure PR title has the prefix `[stable/prometheus-operator]` +1. Ensure PR title has the prefix `[kube-prometheus]` 1. When making changes to rules or dashboards, see the README.md section on how to sync data from upstream repositories 1. Check the `hack/minikube` folder has scripts to set up minikube and components of this chart that will allow all components to be scraped. You can use this configuration when validating your changes. 1. Check for changes of RBAC rules. diff --git a/charts/kube-prometheus/Chart.yaml b/charts/kube-prometheus/Chart.yaml index 325bf46a3caf..e6acb4cf4e4f 100644 --- a/charts/kube-prometheus/Chart.yaml +++ b/charts/kube-prometheus/Chart.yaml @@ -7,7 +7,7 @@ maintainers: - name: bismarck - name: gianrubio email: gianrubio@gmail.com -name: prometheus-operator +name: kube-prometheus sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator @@ -15,7 +15,7 @@ sources: version: 9.3.1 appVersion: 0.38.1 tillerVersion: ">=2.12.0" -home: https://github.com/coreos/prometheus-operator +home: https://github.com/coreos/kube-prometheus keywords: - operator - prometheus diff --git a/charts/kube-prometheus/README.md b/charts/kube-prometheus/README.md index 6f378b1ea212..1bf1e143ccae 100644 --- a/charts/kube-prometheus/README.md +++ b/charts/kube-prometheus/README.md @@ -1,58 +1,54 @@ -# prometheus-operator +# kube-prometheus -Installs [prometheus-operator](https://github.com/coreos/prometheus-operator) to create/configure/manage Prometheus clusters atop Kubernetes. This chart includes multiple components and is suitable for a variety of use-cases. +Installs [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus), a collection of Kubernetes manifests, [Grafana](http://grafana.com/) dashboards, and [Prometheus rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with [Prometheus](https://prometheus.io/) using the [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator). -The default installation is intended to suit monitoring a kubernetes cluster the chart is deployed onto. It closely matches the kube-prometheus project. -- [prometheus-operator](https://github.com/coreos/prometheus-operator) -- [prometheus](https://prometheus.io/) -- [alertmanager](https://prometheus.io/) -- [node-exporter](https://github.com/helm/charts/tree/master/stable/prometheus-node-exporter) -- [kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) -- [grafana](https://github.com/helm/charts/tree/master/stable/grafana) -- service monitors to scrape internal kubernetes components - - kube-apiserver - - kube-scheduler - - kube-controller-manager - - etcd - - kube-dns/coredns - - kube-proxy +See the [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus) README for details about components, dashboards, and alerts. -With the installation, the chart also includes dashboards and alerts. +* This chart was formerly named `prometheus-operator` chart, and renamed to more clearly reflect that it installs the `kube-prometheus` project, within which Prometheus Operator is only one component. -The same chart can be used to run multiple prometheus instances in the same cluster if required. To achieve this, the other components need to be disabled - it is necessary to run only one instance of prometheus-operator and a pair of alertmanager pods for an HA configuration. +## Prerequisites + - Kubernetes 1.10+ with Beta APIs + - Helm 2.12+ (If using Helm < 2.14, [see below for CRD workaround](#Helm-fails-to-create-CRDs)) -## TL;DR; +## Add repos ```console -$ helm install stable/prometheus-operator +$ helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +$ helm repo add stable https://kubernetes-charts.storage.googleapis.com/ ``` -## Introduction +## Install -This chart bootstraps a [prometheus-operator](https://github.com/coreos/prometheus-operator) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. The chart can be installed multiple times to create separate Prometheus instances managed by Prometheus Operator. +```console +$ helm install [RELEASE_NAME] prometheus-community/kube-prometheus +``` -## Prerequisites - - Kubernetes 1.10+ with Beta APIs - - Helm 2.12+ (If using Helm < 2.14, [see below for CRD workaround](#Helm-fails-to-create-CRDs)) +### Dependencies -## Installing the Chart +By default this chart installs [dependent charts](https://helm.sh/docs/helm/helm_dependency/): -To install the chart with the release name `my-release`: +- [stable/kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) +- [stable/prometheus-node-exporter](https://github.com/helm/charts/tree/master/stable/prometheus-node-exporter) +- [stable/grafana](https://github.com/helm/charts/tree/master/stable/grafana) -```console -$ helm install --name my-release stable/prometheus-operator -``` +### Multiple releases -The command deploys prometheus-operator on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +The same chart can be used to run multiple Prometheus instances in the same cluster if required. To achieve this, it is necessary to run only one instance of prometheus-operator and a pair of alertmanager pods for an HA configuration, while all other components need to be disabled. To disable a dependency during installation, set `kubeStateMetrics.enabled`, `nodeExporter.enabled` and `grafana.enabled` to `false`. -The default installation includes Prometheus Operator, Alertmanager, Grafana, and configuration for scraping Kubernetes infrastructure. +## Configuration -## Uninstalling the Chart +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments: -To uninstall/delete the `my-release` deployment: +```console +$ helm show values prometheus-community/kube-prometheus +``` + +You may also `helm show values` on this chart's [dependencies](#dependencies) for additional options. + +## Uninstall ```console -$ helm delete my-release +$ helm uninstall [RELEASE_NAME] ``` The command removes all the Kubernetes components associated with the chart and deletes the release. @@ -95,10 +91,38 @@ kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/re 3. Install the chart, but disable the CRD provisioning by setting `prometheusOperator.createCustomResource=false` ```console -$ helm install --name my-release stable/prometheus-operator --set prometheusOperator.createCustomResource=false +$ helm install [RELEASE_NAME] prometheus-community/kube-prometheus --set prometheusOperator.createCustomResource=false ``` -## Upgrading an existing Release to a new major version +## PrometheusRules Admission Webhooks + +With Prometheus Operator version 0.30+, the core Prometheus Operator pod exposes an endpoint that will integrate with the `validatingwebhookconfiguration` Kubernetes feature to prevent malformed rules from being added to the cluster. + +### How the Chart Configures the Hooks +A validating and mutating webhook configuration requires the endpoint to which the request is sent to use TLS. It is possible to set up custom certificates to do this, but in most cases, a self-signed certificate is enough. The setup of this component requires some more complex orchestration when using helm. The steps are created to be idempotent and to allow turning the feature on and off without running into helm quirks. +1. A pre-install hook provisions a certificate into the same namespace using a format compatible with provisioning using end-user certificates. If the certificate already exists, the hook exits. +2. The prometheus operator pod is configured to use a TLS proxy container, which will load that certificate. +3. Validating and Mutating webhook configurations are created in the cluster, with their failure mode set to Ignore. This allows rules to be created by the same chart at the same time, even though the webhook has not yet been fully set up - it does not have the correct CA field set. +4. A post-install hook reads the CA from the secret created by step 1 and patches the Validating and Mutating webhook configurations. This process will allow a custom CA provisioned by some other process to also be patched into the webhook configurations. The chosen failure policy is also patched into the webhook configurations + +### Alternatives +It should be possible to use [jetstack/cert-manager](https://github.com/jetstack/cert-manager) if a more complete solution is required, but it has not been tested. + +### Limitations +Because the operator can only run as a single pod, there is potential for this component failure to cause rule deployment failure. Because this risk is outweighed by the benefit of having validation, the feature is enabled by default. + +## Developing Prometheus Rules and Grafana Dashboards + +This chart Grafana Dashboards and Prometheus Rules are just a copy from coreos/prometheus-operator and other sources, synced (with alterations) by scripts in [hack](hack) folder. In order to introduce any changes you need to first [add them to the original repo](https://github.com/coreos/kube-prometheus/blob/master/docs/developing-prometheus-rules-and-grafana-dashboards.md) and then sync there by scripts. + +## Further Information + +For more in-depth documentation of configuration options meanings, please see +- [Prometheus Operator](https://github.com/coreos/prometheus-operator) +- [Prometheus](https://prometheus.io/docs/introduction/overview/) +- [Grafana](https://github.com/helm/charts/tree/master/stable/grafana#grafana-helm-chart) + +## Migrating from stable/prometheus-operator chart A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. @@ -110,11 +134,11 @@ Version 9 of the helm chart removes the existing `additionalScrapeConfigsExterna Due to new template functions being used in the rules in version 8.x.x of the chart, an upgrade to Prometheus Operator and Prometheus is necessary in order to support them. First, upgrade to the latest version of 7.x.x ```sh -helm upgrade stable/prometheus-operator --version 7.4.0 +helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus --version 7.4.0 ``` Then upgrade to 8.x.x ```sh -helm upgrade stable/prometheus-operator +helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus ``` Minimal recommended Prometheus version for this chart release is `2.12.x` @@ -135,523 +159,7 @@ The prometheus operator does not support annotation-based discovery of services, By default, Prometheus discovers ServiceMonitors within its namespace, that are labeled with the same release tag as the prometheus-operator release. Sometimes, you may need to discover custom ServiceMonitors, for example used to scrape data from third-party applications. An easy way of doing this, without compromising the default ServiceMonitors discovery, is allowing Prometheus to discover all ServiceMonitors within its namespace, without applying label filtering. To do so, you can set `prometheus.prometheusSpec.serviceMonitorSelectorNilUsesHelmValues` to `false`. -## Configuration - -The following tables list the configurable parameters of the prometheus-operator chart and their default values. - -### General -| Parameter | Description | Default | -| ----- | ----------- | ------ | -| `additionalPrometheusRulesMap` | Map of `prometheusRule` objects to create with the key used as the name of the rule spec. If defined, this will take precedence over `additionalPrometheusRules`. See https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusrulespec. | `nil` | -| `additionalPrometheusRules` | *DEPRECATED* Will be removed in a future release. Please use **additionalPrometheusRulesMap** instead. List of `prometheusRule` objects to create. See https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusrulespec. | `[]` | -| `commonLabels` | Labels to apply to all resources | `[]` | -| `defaultRules.annotations` | Annotations for default rules for monitoring the cluster | `{}` | -| `defaultRules.appNamespacesTarget` | Specify target Namespaces for app alerts | `".*"` | -| `defaultRules.create` | Create default rules for monitoring the cluster | `true` | -| `defaultRules.labels` | Labels for default rules for monitoring the cluster | `{}` | -| `defaultRules.runbookUrl` | URL prefix for default rule runbook_url annotations | `https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#` | -| `defaultRules.rules.PrometheusOperator` | Create Prometheus Operator default rules| `true` | -| `defaultRules.rules.alertmanager` | Create default rules for Alert Manager | `true` | -| `defaultRules.rules.etcd` | Create default rules for ETCD | `true` | -| `defaultRules.rules.general` | Create General default rules| `true` | -| `defaultRules.rules.k8s` | Create K8S default rules| `true` | -| `defaultRules.rules.kubeApiserver` | Create Api Server default rules| `true` | -| `defaultRules.rules.kubeApiserverAvailability` | Create Api Server Availability default rules| `true` | -| `defaultRules.rules.kubeApiserverError` | Create Api Server Error default rules| `true` | -| `defaultRules.rules.kubeApiserverSlos` | Create Api Server SLOs default rules| `true` | -| `defaultRules.rules.kubelet` | Create kubelet default rules | `true` | -| `defaultRules.rules.kubePrometheusGeneral` | Create general default rules | `true` | -| `defaultRules.rules.kubePrometheusNodeAlerting` | Create Node Alerting default rules| `true` | -| `defaultRules.rules.kubePrometheusNodeRecording` | Create Node Recording default rules| `true` | -| `defaultRules.rules.kubeScheduler` | Create Kubernetes Scheduler default rules| `true` | -| `defaultRules.rules.kubernetesAbsent` | Create Kubernetes Absent (example API Server down) default rules| `true` | -| `defaultRules.rules.kubernetesApps` | Create Kubernetes Apps default rules| `true` | -| `defaultRules.rules.kubernetesResources` | Create Kubernetes Resources default rules| `true` | -| `defaultRules.rules.kubernetesStorage` | Create Kubernetes Storage default rules| `true` | -| `defaultRules.rules.kubernetesSystem` | Create Kubernetes System default rules| `true` | -| `defaultRules.rules.kubeStateMetrics` | Create kube-state-metrics default rules | `true` | -| `defaultRules.rules.network` | Create networking default rules | `true` | -| `defaultRules.rules.node` | Create Node default rules | `true` | -| `defaultRules.rules.prometheus` | Create Prometheus default rules| `true` | -| `defaultRules.rules.time` | Create time default rules | `true` | -| `fullnameOverride` | Provide a name to substitute for the full names of resources |`""`| -| `global.imagePullSecrets` | Reference to one or more secrets to be used when pulling images | `[]` | -| `global.rbac.create` | Create RBAC resources | `true` | -| `global.rbac.pspEnabled` | Create pod security policy resources | `true` | -| `global.rbac.pspAnnotations` | Add annotations to the PSP configurations | `{}` | -| `kubeTargetVersionOverride` | Provide a target gitVersion of K8S, in case .Capabilites.KubeVersion is not available (e.g. `helm template`) |`""`| -| `nameOverride` | Provide a name in place of `prometheus-operator` |`""`| -| `namespaceOverride` | Override the deployment namespace | `""` (`Release.Namespace`) | -| `kubeTargetVersionOverride` | Provide a k8s version |`""`| - -### Prometheus Operator -| Parameter | Description | Default | -| ----- | ----------- | ------ | -| `prometheusOperator.admissionWebhooks.enabled` | Create PrometheusRules admission webhooks. Mutating webhook will patch PrometheusRules objects indicating they were validated. Validating webhook will check the rules syntax. | `true` | -| `prometheusOperator.admissionWebhooks.failurePolicy` | Failure policy for admission webhooks | `Fail` | -| `prometheusOperator.admissionWebhooks.patch.enabled` | If true, will use a pre and post install hooks to generate a CA and certificate to use for the prometheus operator tls proxy, and patch the created webhooks with the CA. | `true` | -| `prometheusOperator.admissionWebhooks.patch.image.pullPolicy` | Image pull policy for the webhook integration jobs | `IfNotPresent` | -| `prometheusOperator.admissionWebhooks.patch.image.repository` | Repository to use for the webhook integration jobs | `jettech/kube-webhook-certgen` | -| `prometheusOperator.admissionWebhooks.patch.image.tag` | Tag to use for the webhook integration jobs | `v1.2.1` | -| `prometheusOperator.admissionWebhooks.patch.image.sha` | Sha to use for the webhook integration jobs (optional) | `` | -| `prometheusOperator.admissionWebhooks.patch.resources` | Resource limits for admission webhook | `{}` | -| `prometheusOperator.admissionWebhooks.patch.nodeSelector` | Node selector for running admission hook patch jobs | `nil` | -| `prometheusOperator.admissionWebhooks.patch.podAnnotations` | Annotations for the webhook job pods | `nil` | -| `prometheusOperator.admissionWebhooks.patch.priorityClassName` | Priority class for the webhook integration jobs | `nil` | -| `prometheusOperator.affinity` | Assign custom affinity rules to the prometheus operator https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ | `{}` | -| `prometheusOperator.cleanupCustomResource` | Attempt to delete CRDs when the release is removed. This option may be useful while testing but is not recommended, as deleting the CRD definition will delete resources and prevent the operator from being able to clean up resources that it manages | `false` | -| `prometheusOperator.configReloaderCpu` | Set the prometheus config reloader side-car CPU limit. If unset, uses the prometheus-operator project default | `nil` | -| `prometheusOperator.configReloaderMemory` | Set the prometheus config reloader side-car memory limit. If unset, uses the prometheus-operator project default | `nil` | -| `prometheusOperator.configmapReloadImage.repository` | Repository for configmapReload image | `docker.io/jimmidyson/configmap-reload` | -| `prometheusOperator.configmapReloadImage.tag` | Tag for configmapReload image | `v0.3.0` | -| `prometheusOperator.configmapReloadImage.sha` | Sha for configmapReload image (optional) | `` | -| `prometheusOperator.createCustomResource` | Create CRDs. Required if deploying anything besides the operator itself as part of the release. The operator will create / update these on startup. If your Helm version < 2.10 you will have to either create the CRDs first or deploy the operator first, then the rest of the resources. Regardless of value of this, Helm v3+ will install the CRDs if those are not present already. Use `--skip-crds` with `helm install` if you want to skip CRD creation | `true` | -| `prometheusOperator.namespaces` | Namespaces to scope the interaction of the Prometheus Operator and the apiserver (allow list). This is mutually exclusive with `denyNamespaces`. Setting this to an empty object will disable the configuration | `{}` | -| `prometheusOperator.namespaces.releaseNamespace` | Include the release namespace | `false` | -| `prometheusOperator.namespaces.additional` | Include additional namespaces besides the release namespace | `[]` | -| `prometheusOperator.manageCrds` |If true prometheus operator will create and update its CRDs on startup (for operator `. AlertManager configurations specified are appended to the configurations generated by the Prometheus Operator. As AlertManager configs are appended, the user is responsible to make sure it is valid. Note that using this feature may expose the possibility to break upgrades of Prometheus. It is advised to review Prometheus release notes to ensure that no incompatible AlertManager configs are going to break Prometheus after the upgrade. | `{}` | -| `prometheus.prometheusSpec.additionalAlertRelabelConfigs` | AdditionalAlertRelabelConfigs allows specifying additional Prometheus alert relabel configurations. Alert relabel configurations specified are appended to the configurations generated by the Prometheus Operator. Alert relabel configurations specified must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs. As alert relabel configs are appended, the user is responsible to make sure it is valid. Note that using this feature may expose the possibility to break upgrades of Prometheus. It is advised to review Prometheus release notes to ensure that no incompatible alert relabel configs are going to break Prometheus after the upgrade. | `[]` | -| `prometheus.prometheusSpec.additionalScrapeConfigsSecret.enabled` | Enable additional scrape configs that are managed externally to this chart. Note that the prometheus will fail to provision if the correct secret does not exist. | `false` | -| `prometheus.prometheusSpec.additionalScrapeConfigsSecret.name` | Name of the secret that Prometheus should use for the additional scrape configuration. | `""` | -| `prometheus.prometheusSpec.additionalScrapeConfigsSecret.key` | Name of the key inside the secret specified under `additionalScrapeConfigsSecret.name` to be used for the additional scrape configuration. | `""` | -| `prometheus.prometheusSpec.additionalScrapeConfigs` | AdditionalScrapeConfigs allows specifying additional Prometheus scrape configurations. Scrape configurations are appended to the configurations generated by the Prometheus Operator. Job configurations must have the form as specified in the official Prometheus documentation: https://prometheus.io/docs/prometheus/latest/configuration/configuration/#. As scrape configs are appended, the user is responsible to make sure it is valid. Note that using this feature may expose the possibility to break upgrades of Prometheus. It is advised to review Prometheus release notes to ensure that no incompatible scrape configs are going to break Prometheus after the upgrade. | `[]` | -| `prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations` | additionalPrometheusSecretsAnnotations allows to add annotations to the kubernetes secret. This can be useful when deploying via spinnaker to disable versioning on the secret, strategy.spinnaker.io/versioned: 'false' | `{}` | -| `prometheus.prometheusSpec.affinity` | Assign custom affinity rules to the prometheus instance https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ | `{}` | -| `prometheus.prometheusSpec.alertingEndpoints` | Alertmanagers to which alerts will be sent https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#alertmanagerendpoints Default configuration will connect to the alertmanager deployed as part of this release | `[]` | -| `prometheus.prometheusSpec.apiserverConfig` | Custom `kubernetes_sd_config` https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#apiserverconfig Default configuration will connect to current Kubernetes cluster | `{}` | -| `prometheus.prometheusSpec.configMaps` | ConfigMaps is a list of ConfigMaps in the same namespace as the Prometheus object, which shall be mounted into the Prometheus Pods. The ConfigMaps are mounted into /etc/prometheus/configmaps/ | `[]` | -| `prometheus.prometheusSpec.containers` | Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to a Prometheus pod. |`[]`| -| `prometheus.prometheusSpec.initContainers` | InitContainers allows injecting specialized containers that run before app containers. This is meant to pre-configure and tune mounted volume permissions. |`[]`| -| `prometheus.prometheusSpec.disableCompaction` | If true, pass --storage.tsdb.max-block-duration=2h to prometheus. This is already done if using Thanos |`false`| -| `prometheus.prometheusSpec.enableAdminAPI` | EnableAdminAPI enables Prometheus the administrative HTTP API which includes functionality such as deleting time series. | `false` | -| `prometheus.prometheusSpec.enforcedNamespaceLabel` | enforces adding a namespace label of origin for each alert and metric that is user created. | `""` | -| `prometheus.prometheusSpec.evaluationInterval` | Interval between consecutive evaluations. | `""` | -| `prometheus.prometheusSpec.externalLabels` | The labels to add to any time series or alerts when communicating with external systems (federation, remote storage, Alertmanager). | `{}` | -| `prometheus.prometheusSpec.externalUrl` | The external URL the Prometheus instances will be available under. This is necessary to generate correct URLs. This is necessary if Prometheus is not served from root of a DNS name. | `""` | -| `prometheus.prometheusSpec.image.repository` | Base image to use for a Prometheus deployment. | `quay.io/prometheus/prometheus` | -| `prometheus.prometheusSpec.image.tag` | Tag of Prometheus container image to be deployed. | `v2.18.2` | -| `prometheus.prometheusSpec.image.sha` | Sha of Prometheus container image to be deployed (optional). | `` | -| `prometheus.prometheusSpec.listenLocal` | ListenLocal makes the Prometheus server listen on loopback, so that it does not bind against the Pod IP. | `false` | -| `prometheus.prometheusSpec.logFormat` | Log format for Prometheus to be configured with. | `logfmt` | -| `prometheus.prometheusSpec.logLevel` | Log level for Prometheus to be configured with. | `info` | -| `prometheus.prometheusSpec.nodeSelector` | Define which Nodes the Pods are scheduled on. | `{}` | -| `prometheus.prometheusSpec.paused` | When a Prometheus deployment is paused, no actions except for deletion will be performed on the underlying objects. | `false` | -| `prometheus.prometheusSpec.podAntiAffinityTopologyKey` | If anti-affinity is enabled sets the topologyKey to use for anti-affinity. This can be changed to, for example `failure-domain.beta.kubernetes.io/zone`| `kubernetes.io/hostname` | -| `prometheus.prometheusSpec.podAntiAffinity` | Pod anti-affinity can prevent the scheduler from placing Prometheus replicas on the same node. The default value "soft" means that the scheduler should *prefer* to not schedule two replica pods onto the same node but no guarantee is provided. The value "hard" means that the scheduler is *required* to not schedule two replica pods onto the same node. The value "" will disable pod anti-affinity so that no anti-affinity rules will be configured. | `""` | -| `prometheus.prometheusSpec.podMetadata` | Standard object’s metadata. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata Metadata Labels and Annotations gets propagated to the prometheus pods. | `{}` | -| `prometheus.prometheusSpec.priorityClassName` | Priority class assigned to the Pods | `""` | -| `prometheus.prometheusSpec.prometheusExternalLabelNameClear` | If true, the Operator won't add the external label used to denote Prometheus instance name. | `false` | -| `prometheus.prometheusSpec.prometheusExternalLabelName` | Name of the external label used to denote Prometheus instance name. | `""` | -| `prometheus.prometheusSpec.query` | QuerySpec defines the query command line flags when starting Prometheus. Not all parameters are supported by the operator - [see coreos documentation](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#queryspec) | `{}` | -| `prometheus.prometheusSpec.remoteRead` | If specified, the remote_read spec. This is an experimental feature, it may change in any upcoming release in a breaking way. | `[]` | -| `prometheus.prometheusSpec.remoteWrite` | If specified, the remote_write spec. This is an experimental feature, it may change in any upcoming release in a breaking way. | `[]` | -| `prometheus.prometheusSpec.remoteWriteDashboards` | Enable/Disable Grafana dashboards provisioning for prometheus remote write feature | `false` | -| `prometheus.prometheusSpec.replicaExternalLabelNameClear` | If true, the Operator won't add the external label used to denote replica name. | `false` | -| `prometheus.prometheusSpec.replicaExternalLabelName` | Name of the external label used to denote replica name. | `""` | -| `prometheus.prometheusSpec.replicas` | Number of instances to deploy for a Prometheus deployment. | `1` | -| `prometheus.prometheusSpec.resources` | Define resources requests and limits for single Pods. | `{}` | -| `prometheus.prometheusSpec.retentionSize` | Used Storage Prometheus shall retain data for. Example 50GiB (50 Gigabyte). Can be combined with prometheus.prometheusSpec.retention | `""` | -| `prometheus.prometheusSpec.walCompression` | Enable compression of the write-ahead log using Snappy. This flag is only available in versions of Prometheus >= 2.11.0. | `false` | -| `prometheus.prometheusSpec.retention` | Time duration Prometheus shall retain data for. Must match the regular expression `[0-9]+(ms\|s\|m\|h\|d\|w\|y)` (milliseconds seconds minutes hours days weeks years). | `10d` | -| `prometheus.prometheusSpec.routePrefix` | The route prefix Prometheus registers HTTP handlers for. This is useful, if using ExternalURL and a proxy is rewriting HTTP routes of a request, and the actual ExternalURL is still true, but the server serves requests under a different route prefix. For example for use with `kubectl proxy`. | `/` | -| `prometheus.prometheusSpec.ruleNamespaceSelector` | Namespaces to be selected for PrometheusRules discovery. If nil, select own namespace. See [namespaceSelector](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#namespaceselector) for usage | `{}` | -| `prometheus.prometheusSpec.ruleSelectorNilUsesHelmValues` | If true, a nil or {} value for prometheus.prometheusSpec.ruleSelector will cause the prometheus resource to be created with selectors based on values in the helm deployment, which will also match the PrometheusRule resources created. | `true` | -| `prometheus.prometheusSpec.ruleSelector` | A selector to select which PrometheusRules to mount for loading alerting rules from. Until (excluding) Prometheus Operator v0.24.0 Prometheus Operator will migrate any legacy rule ConfigMaps to PrometheusRule custom resources selected by RuleSelector. Make sure it does not match any config maps that you do not want to be migrated. If {}, select all PrometheusRules | `{}` | -| `prometheus.prometheusSpec.scrapeInterval` | Interval between consecutive scrapes. | `""` | -| `prometheus.prometheusSpec.secrets` | Secrets is a list of Secrets in the same namespace as the Prometheus object, which shall be mounted into the Prometheus Pods. The Secrets are mounted into /etc/prometheus/secrets/. Secrets changes after initial creation of a Prometheus object are not reflected in the running Pods. To change the secrets mounted into the Prometheus Pods, the object must be deleted and recreated with the new list of secrets. | `[]` | -| `prometheus.prometheusSpec.securityContext` | SecurityContext holds pod-level security attributes and common container settings. This defaults to non root user with uid 1000 and gid 2000 in order to support migration from operator version <0.26. | `{"runAsGroup": 2000, "runAsNonRoot": true, "runAsUser": 1000, "fsGroup": 2000}` | -| `prometheus.prometheusSpec.serviceMonitorNamespaceSelector` | Namespaces to be selected for ServiceMonitor discovery. See [metav1.LabelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#labelselector-v1-meta) for usage | `{}` | -| `prometheus.prometheusSpec.serviceMonitorSelectorNilUsesHelmValues` | If true, a nil or {} value for prometheus.prometheusSpec.serviceMonitorSelector will cause the prometheus resource to be created with selectors based on values in the helm deployment, which will also match the servicemonitors created | `true` | -| `prometheus.prometheusSpec.serviceMonitorSelector` | ServiceMonitors to be selected for target discovery. If {}, select all ServiceMonitors | `{}` | -| `prometheus.additionalPodMonitors` | List of `PodMonitor` objects to create. See https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#podmonitorspec | `[]` | -| `prometheus.prometheusSpec.podMonitorSelectorNilUsesHelmValues` | If true, a nil or {} value for prometheus.prometheusSpec.podMonitorSelector will cause the prometheus resource to be created with selectors based on values in the helm deployment, which will also match the podmonitors created | `true` | -| `prometheus.prometheusSpec.podMonitorSelector` | PodMonitors to be selected for target discovery. If {}, select all PodMonitors | `{}` | -| `prometheus.prometheusSpec.podMonitorNamespaceSelector` | Namespaces to be selected for PodMonitor discovery. See [metav1.LabelSelector](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#labelselector-v1-meta) for usage | `{}` | -| `prometheus.prometheusSpec.storageSpec` | Storage spec to specify how storage shall be used. | `{}` | -| `prometheus.prometheusSpec.thanos` | Thanos configuration allows configuring various aspects of a Prometheus server in a Thanos environment. This section is experimental, it may change significantly without deprecation notice in any release.This is experimental and may change significantly without backward compatibility in any release. See https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#thanosspec | `{}` | -| `prometheus.prometheusSpec.tolerations` | If specified, the pod's tolerations. | `[]` | -| `prometheus.prometheusSpec.volumes` | Additional Volumes on the output StatefulSet definition. | `[]` | -| `prometheus.prometheusSpec.volumeMounts` | Additional VolumeMounts on the output StatefulSet definition. | `[]` | -| `prometheus.service.additionalPorts` | Additional Prometheus Service ports to add for NodePort service type | `[]` | -| `prometheus.service.annotations` | Prometheus Service Annotations | `{}` | -| `prometheus.service.clusterIP` | Prometheus service clusterIP IP | `""` | -| `prometheus.service.externalIPs` | List of IP addresses at which the Prometheus server service is available | `[]` | -| `prometheus.service.labels` | Prometheus Service Labels | `{}` | -| `prometheus.service.loadBalancerIP` | Prometheus Loadbalancer IP | `""` | -| `prometheus.service.loadBalancerSourceRanges` | Prometheus Load Balancer Source Ranges | `[]` | -| `prometheus.service.nodePort` | Prometheus Service port for NodePort service type | `30090` | -| `prometheus.service.port` | Port for Prometheus Service to listen on | `9090` | -| `prometheus.service.sessionAffinity` | Prometheus Service Session Affinity | `""` | -| `prometheus.service.targetPort` | Prometheus Service internal port | `9090` | -| `prometheus.service.type` | Prometheus Service type | `ClusterIP` | -| `prometheus.serviceAccount.create` | Create a default serviceaccount for prometheus to use | `true` | -| `prometheus.serviceAccount.name` | Name for prometheus serviceaccount | `""` | -| `prometheus.serviceAccount.annotations` | Annotations to add to the serviceaccount | `""` | -| `prometheus.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `""` | -| `prometheus.serviceMonitor.scheme` | HTTP scheme to use for scraping. Can be used with `tlsConfig` for example if using istio mTLS. | `""` | -| `prometheus.serviceMonitor.tlsConfig` | TLS configuration to use when scraping the endpoint. For example if using istio mTLS. Of type: [*TLSConfig](https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#tlsconfig). | `{}` | -| `prometheus.serviceMonitor.bearerTokenFile` | Bearer token used to scrape the Prometheus server | `nil` | -| `prometheus.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping the prometheus instance. | `` | -| `prometheus.serviceMonitor.relabelings` | The `relabel_configs` for scraping the prometheus instance. | `` | -| `prometheus.serviceMonitor.selfMonitor` | Create a `serviceMonitor` to automatically monitor the prometheus instance | `true` | -| `prometheus.servicePerReplica.annotations` | Prometheus per replica Service Annotations | `{}` | -| `prometheus.servicePerReplica.enabled` | If true, create a Service for each Prometheus server replica in the StatefulSet | `false` | -| `prometheus.servicePerReplica.labels` | Prometheus per replica Service Labels | `{}` | -| `prometheus.servicePerReplica.loadBalancerSourceRanges` | Prometheus per replica Service Loadbalancer Source Ranges | `[]` | -| `prometheus.servicePerReplica.nodePort` | Prometheus per replica Service port for NodePort Service type | `30091` | -| `prometheus.servicePerReplica.port` | Port for Prometheus per replica Service to listen on | `9090` | -| `prometheus.servicePerReplica.targetPort` | Prometheus per replica Service internal port | `9090` | -| `prometheus.servicePerReplica.type` | Prometheus per replica Service type | `ClusterIP` | -| `prometheus.thanosIngress.enabled` | Enable Ingress for Thanos Sidecar * ingress controller needs to support [gRPC](https://thanos.io/quick-tutorial.md/#store-api) | `false` | -| `prometheus.thanosIngress.servicePort` | Ingress Service Port for Thanos Sidecar | `10901` | -| `prometheus.thanosIngress.paths` | Ingress paths for Thanos Sidecar | `[]` | -| `prometheus.thanosIngress.annotations` | Ingress annotations for Thanos Sidecar | `{}` | -| `prometheus.thanosIngress.labels` | Ingress labels for Thanos Sidecar | `{}` | -| `prometheus.thanosIngress.hosts | Ingress hosts for Thanos Sidecar | `[]` | -| `prometheus.thanosIngress.tls | Ingress tls for Thanos Sidecar | `[]` | - -### Alertmanager -| Parameter | Description | Default | -| ----- | ----------- | ------ | -| `alertmanager.alertmanagerSpec.additionalPeers` | AdditionalPeers allows injecting a set of additional Alertmanagers to peer with to form a highly available cluster. | `[]` | -| `alertmanager.alertmanagerSpec.affinity` | Assign custom affinity rules to the alertmanager instance https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ | `{}` | -| `alertmanager.alertmanagerSpec.configMaps` | ConfigMaps is a list of ConfigMaps in the same namespace as the Alertmanager object, which shall be mounted into the Alertmanager Pods. The ConfigMaps are mounted into /etc/alertmanager/configmaps/ | `[]` | -| `alertmanager.alertmanagerSpec.configSecret` | ConfigSecret is the name of a Kubernetes Secret in the same namespace as the Alertmanager object, which contains configuration for this Alertmanager instance. Defaults to 'alertmanager-' The secret is mounted into /etc/alertmanager/config. | `""` | -| `alertmanager.alertmanagerSpec.containers` | Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to an Alertmanager pod. | `[]` | -| `alertmanager.alertmanagerSpec.externalUrl` | The external URL the Alertmanager instances will be available under. This is necessary to generate correct URLs. This is necessary if Alertmanager is not served from root of a DNS name. | `""` | -| `alertmanager.alertmanagerSpec.image.repository` | Base image that is used to deploy pods, without tag. | `quay.io/prometheus/alertmanager` | -| `alertmanager.alertmanagerSpec.image.tag` | Tag of Alertmanager container image to be deployed. | `v0.21.0` | -| `alertmanager.alertmanagerSpec.image.sha` | Sha of Alertmanager container image to be deployed (optional). | `` | -| `alertmanager.alertmanagerSpec.listenLocal` | ListenLocal makes the Alertmanager server listen on loopback, so that it does not bind against the Pod IP. Note this is only for the Alertmanager UI, not the gossip communication. | `false` | -| `alertmanager.alertmanagerSpec.logFormat` | Log format for Alertmanager to be configured with. | `logfmt` | -| `alertmanager.alertmanagerSpec.logLevel` | Log level for Alertmanager to be configured with. | `info` | -| `alertmanager.alertmanagerSpec.nodeSelector` | Define which Nodes the Pods are scheduled on. | `{}` | -| `alertmanager.alertmanagerSpec.paused` | If set to true all actions on the underlying managed objects are not going to be performed, except for delete actions. | `false` | -| `alertmanager.alertmanagerSpec.podAntiAffinityTopologyKey` | If anti-affinity is enabled sets the topologyKey to use for anti-affinity. This can be changed to, for example `failure-domain.beta.kubernetes.io/zone`| `kubernetes.io/hostname` | -| `alertmanager.alertmanagerSpec.podAntiAffinity` | Pod anti-affinity can prevent the scheduler from placing Prometheus replicas on the same node. The default value "soft" means that the scheduler should *prefer* to not schedule two replica pods onto the same node but no guarantee is provided. The value "hard" means that the scheduler is *required* to not schedule two replica pods onto the same node. The value "" will disable pod anti-affinity so that no anti-affinity rules will be configured. | `""` | -| `alertmanager.alertmanagerSpec.podMetadata` | Standard object’s metadata. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#metadata Metadata Labels and Annotations gets propagated to the prometheus pods. | `{}` | -| `alertmanager.alertmanagerSpec.priorityClassName` | Priority class assigned to the Pods | `""` | -| `alertmanager.alertmanagerSpec.replicas` | Size is the expected size of the alertmanager cluster. The controller will eventually make the size of the running cluster equal to the expected size. | `1` | -| `alertmanager.alertmanagerSpec.resources` | Define resources requests and limits for single Pods. | `{}` | -| `alertmanager.alertmanagerSpec.retention` | Time duration Alertmanager shall retain data for. Value must match the regular expression `[0-9]+(ms\|s\|m\|h)` (milliseconds seconds minutes hours). | `120h` | -| `alertmanager.alertmanagerSpec.routePrefix` | The route prefix Alertmanager registers HTTP handlers for. This is useful, if using ExternalURL and a proxy is rewriting HTTP routes of a request, and the actual ExternalURL is still true, but the server serves requests under a different route prefix. For example for use with `kubectl proxy`. | `/` | -| `alertmanager.alertmanagerSpec.secrets` | Secrets is a list of Secrets in the same namespace as the Alertmanager object, which shall be mounted into the Alertmanager Pods. The Secrets are mounted into /etc/alertmanager/secrets/. | `[]` | -| `alertmanager.alertmanagerSpec.securityContext` | SecurityContext holds pod-level security attributes and common container settings. This defaults to non root user with uid 1000 and gid 2000 in order to support migration from operator version < 0.26 | `{"runAsGroup": 20000, "runAsNonRoot": true, "runAsUser": 1000, "fsGroup": 2000}` | -| `alertmanager.alertmanagerSpec.storage` | Storage is the definition of how storage will be used by the Alertmanager instances. | `{}` | -| `alertmanager.alertmanagerSpec.tolerations` | If specified, the pod's tolerations. | `[]` | -| `alertmanager.alertmanagerSpec.useExistingSecret` | Use an existing secret for configuration (all defined config from values.yaml will be ignored) | `false` | -| `alertmanager.alertmanagerSpec.volumes` | Volumes allows configuration of additional volumes on the output StatefulSet definition. Volumes specified will be appended to other volumes that are generated as a result of StorageSpec objects. | | -| `alertmanager.alertmanagerSpec.volumeMounts` | VolumeMounts allows configuration of additional VolumeMounts on the output StatefulSet definition. VolumeMounts specified will be appended to other VolumeMounts in the alertmanager container, that are generated as a result of StorageSpec objects. | | -| `alertmanager.apiVersion` | Api that prometheus will use to communicate with alertmanager. Possible values are v1, v2 | `v2` | -| `alertmanager.config` | Provide YAML to configure Alertmanager. See https://prometheus.io/docs/alerting/configuration/#configuration-file. The default provided works to suppress the Watchdog alert from `defaultRules.create` | `{"global":{"resolve_timeout":"5m"},"route":{"group_by":["job"],"group_wait":"30s","group_interval":"5m","repeat_interval":"12h","receiver":"null","routes":[{"match":{"alertname":"Watchdog"},"receiver":"null"}]},"receivers":[{"name":"null"}]}` | -| `alertmanager.enabled` | Deploy alertmanager | `true` | -| `alertmanager.ingress.annotations` | Alertmanager Ingress annotations | `{}` | -| `alertmanager.ingress.enabled` | If true, Alertmanager Ingress will be created | `false` | -| `alertmanager.ingress.hosts` | Alertmanager Ingress hostnames | `[]` | -| `alertmanager.ingress.labels` | Alertmanager Ingress additional labels | `{}` | -| `alertmanager.ingress.paths` | Alertmanager Ingress paths | `[]` | -| `alertmanager.ingress.tls` | Alertmanager Ingress TLS configuration (YAML) | `[]` | -| `alertmanager.ingressPerReplica.annotations` | Alertmanager pre replica Ingress annotations | `{}` | -| `alertmanager.ingressPerReplica.enabled` | If true, create an Ingress for each Alertmanager replica in the StatefulSet | `false` | -| `alertmanager.ingressPerReplica.hostPrefix` | | `""` | -| `alertmanager.ingressPerReplica.hostDomain` | | `""` | -| `alertmanager.ingressPerReplica.labels` | Alertmanager per replica Ingress additional labels | `{}` | -| `alertmanager.ingressPerReplica.paths` | Alertmanager per replica Ingress paths | `[]` | -| `alertmanager.ingressPerReplica.tlsSecretName` | Secret name containing the TLS certificate for Alertmanager per replica ingress | `[]` | -| `alertmanager.ingressPerReplica.tlsSecretPerReplica.enabled` | If true, create an secret for TLS certificate for each Ingress | `false` | -| `alertmanager.ingressPerReplica.tlsSecretPerReplica.prefix` | Secret name prefix | `""` | -| `alertmanager.podDisruptionBudget.enabled` | If true, create a pod disruption budget for Alertmanager pods. The created resource cannot be modified once created - it must be deleted to perform a change | `false` | -| `alertmanager.podDisruptionBudget.maxUnavailable` | Maximum number / percentage of pods that may be made unavailable | `""` | -| `alertmanager.podDisruptionBudget.minAvailable` | Minimum number / percentage of pods that should remain scheduled | `1` | -| `alertmanager.secret.annotations` | Alertmanager Secret annotations | `{}` | -| `alertmanager.service.annotations` | Alertmanager Service annotations | `{}` | -| `alertmanager.service.clusterIP` | Alertmanager service clusterIP IP | `""` | -| `alertmanager.service.externalIPs` | List of IP addresses at which the Alertmanager server service is available | `[]` | -| `alertmanager.service.labels` | Alertmanager Service Labels | `{}` | -| `alertmanager.service.loadBalancerIP` | Alertmanager Loadbalancer IP | `""` | -| `alertmanager.service.loadBalancerSourceRanges` | Alertmanager Load Balancer Source Ranges | `[]` | -| `alertmanager.service.nodePort` | Alertmanager Service port for NodePort service type | `30903` | -| `alertmanager.service.port` | Port for Alertmanager Service to listen on | `9093` | -| `alertmanager.service.targetPort` | AlertManager Service internal port | `9093` | -| `alertmanager.service.type` | Alertmanager Service type | `ClusterIP` | -| `alertmanager.servicePerReplica.annotations` | Alertmanager per replica Service Annotations | `{}` | -| `alertmanager.servicePerReplica.enabled` | If true, create a Service for each Alertmanager replica in the StatefulSet | `false` | -| `alertmanager.servicePerReplica.labels` | Alertmanager per replica Service Labels | `{}` | -| `alertmanager.servicePerReplica.loadBalancerSourceRanges` | Alertmanager per replica Service Loadbalancer Source Ranges | `[]` | -| `alertmanager.servicePerReplica.nodePort` | Alertmanager per replica Service port for NodePort Service type | `30904` | -| `alertmanager.servicePerReplica.port` | Port for Alertmanager per replica Service to listen on | `9093` | -| `alertmanager.servicePerReplica.targetPort` | Alertmanager per replica Service internal port | `9093` | -| `alertmanager.servicePerReplica.type` | Alertmanager per replica Service type | `ClusterIP` | -| `alertmanager.serviceAccount.create` | Create a `serviceAccount` for alertmanager | `true` | -| `alertmanager.serviceAccount.name` | Name for Alertmanager service account | `""` | -| `alertmanager.serviceAccount.annotations` | Annotations to add to the serviceaccount | `""` | -| `alertmanager.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `alertmanager.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping the alertmanager instance. | `` | -| `alertmanager.serviceMonitor.relabelings` | The `relabel_configs` for scraping the alertmanager instance. | `` | -| `alertmanager.serviceMonitor.selfMonitor` | Create a `serviceMonitor` to automatically monitor the alartmanager instance | `true` | -| `alertmanager.tplConfig` | Pass the Alertmanager configuration directives through Helm's templating engine. If the Alertmanager configuration contains Alertmanager templates, they'll need to be properly escaped so that they are not interpreted by Helm | `false` | - -### Grafana -This is not a full list of the possible values. - -For a full list of configurable values please refer to the [Grafana chart](https://github.com/helm/charts/tree/master/stable/grafana#configuration). - -| Parameter | Description | Default | -| ----- | ----------- | ------ | -| `grafana.additionalDataSources` | Configure additional grafana datasources (passed through tpl) | `[]` | -| `grafana.adminPassword` | Admin password to log into the grafana UI | "prom-operator" | -| `grafana.defaultDashboardsEnabled` | Deploy default dashboards. These are loaded using the sidecar | `true` | -| `grafana.enabled` | If true, deploy the grafana sub-chart | `true` | -| `grafana.extraConfigmapMounts` | Additional grafana server configMap volume mounts | `[]` | -| `grafana.grafana.ini` | Grafana's primary configuration | `{}` -| `grafana.image.tag` | Image tag. (`Must be >= 5.0.0`) | `6.2.5` | -| `grafana.ingress.annotations` | Ingress annotations for Grafana | `{}` | -| `grafana.ingress.enabled` | Enables Ingress for Grafana | `false` | -| `grafana.ingress.hosts` | Ingress accepted hostnames for Grafana| `[]` | -| `grafana.ingress.labels` | Custom labels for Grafana Ingress | `{}` | -| `grafana.ingress.tls` | Ingress TLS configuration for Grafana | `[]` | -| `grafana.namespaceOverride` | Override the deployment namespace of grafana | `""` (`Release.Namespace`) | -| `grafana.rbac.pspUseAppArmor` | Enforce AppArmor in created PodSecurityPolicy (requires rbac.pspEnabled) | `true` | -| `grafana.service.portName` | Allow to customize Grafana service portname. Will be used by servicemonitor as well | `service` | -| `grafana.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping the grafana instance. | `` | -| `grafana.serviceMonitor.relabelings` | The `relabel_configs` for scraping the grafana instance. | `` | -| `grafana.serviceMonitor.selfMonitor` | Create a `serviceMonitor` to automatically monitor the grafana instance | `true` | -| `grafana.sidecar.dashboards.enabled` | Enable the Grafana sidecar to automatically load dashboards with a label `{{ grafana.sidecar.dashboards.label }}=1` | `true` | -| `grafana.sidecar.dashboards.annotations` | Create annotations on dashboard configmaps | `{}` | -| `grafana.sidecar.dashboards.label` | If the sidecar is enabled, configmaps with this label will be loaded into Grafana as dashboards | `grafana_dashboard` | -| `grafana.sidecar.datasources.annotations` | Create annotations on datasource configmaps | `{}` | -| `grafana.sidecar.datasources.createPrometheusReplicasDatasources` | Create datasource for each Pod of Prometheus StatefulSet i.e. `Prometheus-0`, `Prometheus-1` | `false` | -| `grafana.sidecar.datasources.defaultDatasourceEnabled` | Enable Grafana `Prometheus` default datasource | `true` | -| `grafana.sidecar.datasources.enabled` | Enable the Grafana sidecar to automatically load datasources with a label `{{ grafana.sidecar.datasources.label }}=1` | `true` | -| `grafana.sidecar.datasources.label` | If the sidecar is enabled, configmaps with this label will be loaded into Grafana as datasources configurations | `grafana_datasource` | - -### Exporters -| Parameter | Description | Default | -| ----- | ----------- | ------ | -| `coreDns.enabled` | Deploy coreDns scraping components. Use either this or kubeDns | true | -| `coreDns.service.port` | CoreDns port | `9153` | -| `coreDns.service.selector` | CoreDns service selector | `{"k8s-app" : "kube-dns" }` | -| `coreDns.service.targetPort` | CoreDns targetPort | `9153` | -| `coreDns.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `coreDns.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping CoreDns. | `` | -| `coreDns.serviceMonitor.relabelings` | The `relabel_configs` for scraping CoreDNS. | `` | -| `kube-state-metrics.namespaceOverride` | Override the deployment namespace of kube-state-metrics | `""` (`Release.Namespace`) | -| `kube-state-metrics.podSecurityPolicy.enabled` | Create pod security policy resource for kube-state-metrics. | `true` | -| `kube-state-metrics.rbac.create` | Create RBAC components in kube-state-metrics. See `global.rbac.create` | `true` | -| `kubeApiServer.enabled` | Deploy `serviceMonitor` to scrape the Kubernetes API server | `true` | -| `kubeApiServer.relabelings` | Relablings for the API Server ServiceMonitor | `[]` | -| `kubeApiServer.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `kubeApiServer.serviceMonitor.jobLabel` | The name of the label on the target service to use as the job name in prometheus | `component` | -| `kubeApiServer.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping the Kubernetes API server. | `` | -| `kubeApiServer.serviceMonitor.relabelings` | The `relabel_configs` for scraping the Kubernetes API server. | `` | -| `kubeApiServer.serviceMonitor.selector` | The service selector | `{"matchLabels":{"component":"apiserver","provider":"kubernetes"}}` | -| `kubeApiServer.tlsConfig.insecureSkipVerify` | Skip TLS certificate validation when scraping | `false` | -| `kubeApiServer.tlsConfig.serverName` | Name of the server to use when validating TLS certificate | `kubernetes` | -| `kubeControllerManager.enabled` | Deploy a `service` and `serviceMonitor` to scrape the Kubernetes controller-manager | `true` | -| `kubeControllerManager.endpoints` | Endpoints where Controller-manager runs. Provide this if running Controller-manager outside the cluster | `[]` | -| `kubeControllerManager.service.port` | Controller-manager port for the service runs on | `10252` | -| `kubeControllerManager.service.selector` | Controller-manager service selector | `{"component" : "kube-controller-manager" }` | -| `kubeControllerManager.service.targetPort` | Controller-manager targetPort for the service runs on | `10252` | -| `kubeControllerManager.serviceMonitor.https` | Controller-manager service scrape over https | `false` | -| `kubeControllerManager.serviceMonitor.insecureSkipVerify` | Skip TLS certificate validation when scraping | `null` | -| `kubeControllerManager.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `kubeControllerManager.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping the scheduler. | `` | -| `kubeControllerManager.serviceMonitor.relabelings` | The `relabel_configs` for scraping the scheduler. | `` | -| `kubeControllerManager.serviceMonitor.serverName` | Name of the server to use when validating TLS certificate | `null` | -| `kubeDns.enabled` | Deploy kubeDns scraping components. Use either this or coreDns| `false` | -| `kubeDns.service.dnsmasq.port` | Dnsmasq service port | `10054` | -| `kubeDns.service.dnsmasq.targetPort` | Dnsmasq service targetPort | `10054` | -| `kubeDns.service.skydns.port` | Skydns service port | `10055` | -| `kubeDns.service.skydns.targetPort` | Skydns service targetPort | `10055` | -| `kubeDns.service.selector` | kubeDns service selector | `{"k8s-app" : "kube-dns" }` | -| `kubeDns.serviceMonitor.dnsmasqMetricRelabelings` | The `metric_relabel_configs` for scraping dnsmasq kubeDns. | `` | -| `kubeDns.serviceMonitor.dnsmasqRelabelings` | The `relabel_configs` for scraping dnsmasq kubeDns. | `` | -| `kubeDns.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `kubeDns.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping kubeDns. | `` | -| `kubeDns.serviceMonitor.relabelings` | The `relabel_configs` for scraping kubeDns. | `` | -| `kubeEtcd.enabled` | Deploy components to scrape etcd | `true` | -| `kubeEtcd.endpoints` | Endpoints where etcd runs. Provide this if running etcd outside the cluster | `[]` | -| `kubeEtcd.service.port` | Etcd port | `4001` | -| `kubeEtcd.service.selector` | Selector for etcd if running inside the cluster | `{"component":"etcd"}` | -| `kubeEtcd.service.targetPort` | Etcd targetPort | `4001` | -| `kubeEtcd.serviceMonitor.caFile` | Certificate authority file to use when connecting to etcd. See `prometheus.prometheusSpec.secrets` | `""` | -| `kubeEtcd.serviceMonitor.certFile` | Client certificate file to use when connecting to etcd. See `prometheus.prometheusSpec.secrets` | `""` | -| `kubeEtcd.serviceMonitor.insecureSkipVerify` | Skip validating etcd TLS certificate when scraping | `false` | -| `kubeEtcd.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `kubeEtcd.serviceMonitor.keyFile` | Client key file to use when connecting to etcd. See `prometheus.prometheusSpec.secrets` | `""` | -| `kubeEtcd.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping Etcd. | `` | -| `kubeEtcd.serviceMonitor.relabelings` | The `relabel_configs` for scraping Etcd. | `` | -| `kubeEtcd.serviceMonitor.scheme` | Etcd servicemonitor scheme | `http` | -| `kubeEtcd.serviceMonitor.serverName` | Etcd server name to validate certificate against when scraping | `""` | -| `kubeProxy.enabled` | Deploy a `service` and `serviceMonitor` to scrape the Kubernetes proxy | `true` | -| `kubeProxy.endpoints` | Endpoints where proxy runs. Provide this if running proxy outside the cluster | `[]` | -| `kubeProxy.service.port` | Kubernetes proxy port for the service runs on | `10249` | -| `kubeProxy.service.selector` | Kubernetes proxy service selector | `{"k8s-app" : "kube-proxy" }` | -| `kubeProxy.service.targetPort` | Kubernetes proxy targetPort for the service runs on | `10249` | -| `kubeProxy.serviceMonitor.https` | Kubernetes proxy service scrape over https | `false` | -| `kubeProxy.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `kubeProxy.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping the Kubernetes proxy. | `` | -| `kubeProxy.serviceMonitor.relabelings` | The `relabel_configs` for scraping the Kubernetes proxy. | `` | -| `kubeScheduler.enabled` | Deploy a `service` and `serviceMonitor` to scrape the Kubernetes scheduler | `true` | -| `kubeScheduler.endpoints` | Endpoints where scheduler runs. Provide this if running scheduler outside the cluster | `[]` | -| `kubeScheduler.service.port` | Scheduler port for the service runs on | `10251` | -| `kubeScheduler.service.selector` | Scheduler service selector | `{"component" : "kube-scheduler" }` | -| `kubeScheduler.service.targetPort` | Scheduler targetPort for the service runs on | `10251` | -| `kubeScheduler.serviceMonitor.https` | Scheduler service scrape over https | `false` | -| `kubeScheduler.serviceMonitor.insecureSkipVerify` | Skip TLS certificate validation when scraping | `null` | -| `kubeScheduler.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `kubeScheduler.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping the Kubernetes scheduler. | `` | -| `kubeScheduler.serviceMonitor.relabelings` | The `relabel_configs` for scraping the Kubernetes scheduler. | `` | -| `kubeScheduler.serviceMonitor.serverName` | Name of the server to use when validating TLS certificate | `null` | -| `kubeStateMetrics.enabled` | Deploy the `kube-state-metrics` chart and configure a servicemonitor to scrape | `true` | -| `kubeStateMetrics.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `kubeStateMetrics.serviceMonitor.metricRelabelings` | Metric relablings for the `kube-state-metrics` ServiceMonitor | `[]` | -| `kubeStateMetrics.serviceMonitor.relabelings` | The `relabel_configs` for scraping `kube-state-metrics`. | `` | -| `kubelet.enabled` | Deploy servicemonitor to scrape the kubelet service. See also `prometheusOperator.kubeletService` | `true` | -| `kubelet.namespace` | Namespace where the kubelet is deployed. See also `prometheusOperator.kubeletService.namespace` | `kube-system` | -| `kubelet.serviceMonitor.cAdvisor` | Enable scraping `/metrics/cadvisor` from kubelet's service | `true` | -| `kubelet.serviceMonitor.cAdvisorMetricRelabelings` | The `metric_relabel_configs` for scraping cAdvisor. | `` | -| `kubelet.serviceMonitor.cAdvisorRelabelings` | The `relabel_configs` for scraping cAdvisor. | `[{"sourceLabels":["__metrics_path__"], "targetLabel":"metrics_path"}]` | -| `kubelet.serviceMonitor.probes` | Enable scraping `/metrics/probes` from kubelet's service | `true` | -| `kubelet.serviceMonitor.probesMetricRelabelings` | The `metric_relabel_configs` for scraping kubelet. | `` | -| `kubelet.serviceMonitor.probesRelabelings` | The `relabel_configs` for scraping kubelet. | `[{"sourceLabels":["__metrics_path__"], "targetLabel":"metrics_path"}]` | -| `kubelet.serviceMonitor.resource` | Enable scraping `/metrics/resource/v1alpha1` from kubelet's service | `true` | -| `kubelet.serviceMonitor.resourceMetricRelabelings` | The `metric_relabel_configs` for scraping `/metrics/resource/v1alpha1`. | `` | -| `kubelet.serviceMonitor.resourceRelabelings` | The `relabel_configs` for scraping cAdvisor. | `[{"sourceLabels":["__metrics_path__"], "targetLabel":"metrics_path"}]` | -| `kubelet.serviceMonitor.https` | Enable scraping of the kubelet over HTTPS. For more information, see https://github.com/coreos/prometheus-operator/issues/926 | `true` | -| `kubelet.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `kubelet.serviceMonitor.scrapeTimeout` | Scrape timeout. If not set, the Prometheus default scrape timeout is used | `nil` | -| `kubelet.serviceMonitor.metricRelabelings` | The `metric_relabel_configs` for scraping kubelet. | `` | -| `kubelet.serviceMonitor.relabelings` | The `relabel_configs` for scraping kubelet. | `[{"sourceLabels":["__metrics_path__"], "targetLabel":"metrics_path"}]` | -| `nodeExporter.enabled` | Deploy the `prometheus-node-exporter` and scrape it | `true` | -| `nodeExporter.jobLabel` | The name of the label on the target service to use as the job name in prometheus. See `prometheus-node-exporter.podLabels.jobLabel=node-exporter` default | `jobLabel` | -| `nodeExporter.serviceMonitor.interval` | Scrape interval. If not set, the Prometheus default scrape interval is used | `nil` | -| `nodeExporter.serviceMonitor.scrapeTimeout` | How long until a scrape request times out. If not set, the Prometheus default scape timeout is used | `nil` | -| `nodeExporter.serviceMonitor.metricRelabelings` | Metric relablings for the `prometheus-node-exporter` ServiceMonitor | `[]` | -| `nodeExporter.serviceMonitor.relabelings` | The `relabel_configs` for scraping the `prometheus-node-exporter`. | `` | -| `prometheus-node-exporter.extraArgs` | Additional arguments for the node exporter container | `["--collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/)", "--collector.filesystem.ignored-fs-types=^(autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$"]` | -| `prometheus-node-exporter.namespaceOverride` | Override the deployment namespace of node exporter | `""` (`Release.Namespace`) | -| `prometheus-node-exporter.podLabels` | Additional labels for pods in the DaemonSet | `{"jobLabel":"node-exporter"}` | - - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```console -$ helm install --name my-release stable/prometheus-operator --set prometheusOperator.enabled=true -``` - -Alternatively, one or more YAML files that specify the values for the above parameters can be provided while installing the chart. For example, - -```console -$ helm install --name my-release stable/prometheus-operator -f values1.yaml,values2.yaml -``` - -> **Tip**: You can use the default [values.yaml](values.yaml) - - -## PrometheusRules Admission Webhooks - -With Prometheus Operator version 0.30+, the core Prometheus Operator pod exposes an endpoint that will integrate with the `validatingwebhookconfiguration` Kubernetes feature to prevent malformed rules from being added to the cluster. - -### How the Chart Configures the Hooks -A validating and mutating webhook configuration requires the endpoint to which the request is sent to use TLS. It is possible to set up custom certificates to do this, but in most cases, a self-signed certificate is enough. The setup of this component requires some more complex orchestration when using helm. The steps are created to be idempotent and to allow turning the feature on and off without running into helm quirks. -1. A pre-install hook provisions a certificate into the same namespace using a format compatible with provisioning using end-user certificates. If the certificate already exists, the hook exits. -2. The prometheus operator pod is configured to use a TLS proxy container, which will load that certificate. -3. Validating and Mutating webhook configurations are created in the cluster, with their failure mode set to Ignore. This allows rules to be created by the same chart at the same time, even though the webhook has not yet been fully set up - it does not have the correct CA field set. -4. A post-install hook reads the CA from the secret created by step 1 and patches the Validating and Mutating webhook configurations. This process will allow a custom CA provisioned by some other process to also be patched into the webhook configurations. The chosen failure policy is also patched into the webhook configurations - -### Alternatives -It should be possible to use [jetstack/cert-manager](https://github.com/jetstack/cert-manager) if a more complete solution is required, but it has not been tested. - -### Limitations -Because the operator can only run as a single pod, there is potential for this component failure to cause rule deployment failure. Because this risk is outweighed by the benefit of having validation, the feature is enabled by default. - -## Developing Prometheus Rules and Grafana Dashboards - -This chart Grafana Dashboards and Prometheus Rules are just a copy from coreos/prometheus-operator and other sources, synced (with alterations) by scripts in [hack](hack) folder. In order to introduce any changes you need to first [add them to the original repo](https://github.com/coreos/kube-prometheus/blob/master/docs/developing-prometheus-rules-and-grafana-dashboards.md) and then sync there by scripts. - -## Further Information - -For more in-depth documentation of configuration options meanings, please see -- [Prometheus Operator](https://github.com/coreos/prometheus-operator) -- [Prometheus](https://prometheus.io/docs/introduction/overview/) -- [Grafana](https://github.com/helm/charts/tree/master/stable/grafana#grafana-helm-chart) - -# Migrating from coreos/prometheus-operator chart +## Migrating from coreos/prometheus-operator chart The multiple charts have been combined into a single chart that installs prometheus operator, prometheus, alertmanager, grafana as well as the multitude of exporters necessary to monitor a cluster. @@ -661,23 +169,22 @@ The capabilities of the old chart are all available in the new chart, including You can check out the tickets for this change [here](https://github.com/coreos/prometheus-operator/issues/592) and [here](https://github.com/helm/charts/pull/6765). -## High-level overview of Changes -The chart has 3 dependencies, that can be seen in the chart's requirements file: -https://github.com/helm/charts/blob/master/stable/prometheus-operator/requirements.yaml +### High-level overview of Changes + +#### Added dependencies -### Node-Exporter, Kube-State-Metrics -These components are loaded as dependencies into the chart. The source for both charts is found in the same repository. They are relatively simple components. +The chart has added 3 [dependencies](#dependencies). -### Grafana -The Grafana chart is more feature-rich than this chart - it contains a sidecar that is able to load data sources and dashboards from configmaps deployed into the same cluster. For more information check out the [documentation for the chart](https://github.com/helm/charts/tree/master/stable/grafana) +- Node-Exporter, Kube-State-Metrics: These components are loaded as dependencies into the chart. The source for both charts is found in the same repository. They are relatively simple components. +- Grafana: The Grafana chart is more feature-rich than this chart - it contains a sidecar that is able to load data sources and dashboards from configmaps deployed into the same cluster. For more information check out the [documentation for the chart](https://github.com/helm/charts/tree/master/stable/grafana) -### Coreos CRDs +#### Coreos CRDs The CRDs are provisioned using crd-install hooks, rather than relying on a separate chart installation. If you already have these CRDs provisioned and don't want to remove them, you can disable the CRD creation by these hooks by passing `prometheusOperator.createCustomResource=false` (not required if using Helm v3). -### Kubelet Service +#### Kubelet Service Because the kubelet service has a new name in the chart, make sure to clean up the old kubelet service in the `kube-system` namespace to prevent counting container metrics twice. -### Persistent Volumes +#### Persistent Volumes If you would like to keep the data of the current persistent volumes, it should be possible to attach existing volumes to new PVCs and PVs that are created using the conventions in the new chart. For example, in order to use an existing Azure disk for a helm release called `prometheus-migration` the following resources can be created: ``` apiVersion: v1 @@ -728,7 +235,7 @@ status: The PVC will take ownership of the PV and when you create a release using a persistent volume claim template it will use the existing PVCs as they match the naming convention used by the chart. For other cloud providers similar approaches can be used. -### KubeProxy +#### KubeProxy The metrics bind address of kube-proxy is default to `127.0.0.1:10249` that prometheus instances **cannot** access to. You should expose metrics by changing `metricsBindAddress` field value to `0.0.0.0:10249` if you want to collect them. diff --git a/charts/kube-prometheus/hack/README.md b/charts/kube-prometheus/hack/README.md index d383726d9bd3..e5a8de90766a 100644 --- a/charts/kube-prometheus/hack/README.md +++ b/charts/kube-prometheus/hack/README.md @@ -1,4 +1,4 @@ -# prometheus-operator hacks +# kube-prometheus hacks ## [sync_prometheus_rules.py](sync_prometheus_rules.py) @@ -50,4 +50,4 @@ Currently following imported: - run sync_grafana_dashboards.py inside your fork of this repo - send PR with changes to this repo -[CoreDNS dashboard](https://github.com/helm/charts/blob/master/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml) is the only dashboard which is maintained in this repo and can be changed without import. +[CoreDNS dashboard](https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-coredns.yaml) is the only dashboard which is maintained in this repo and can be changed without import. diff --git a/charts/kube-prometheus/hack/minikube/cmd.sh b/charts/kube-prometheus/hack/minikube/cmd.sh index e0dfe2cc0d74..abeafce30791 100755 --- a/charts/kube-prometheus/hack/minikube/cmd.sh +++ b/charts/kube-prometheus/hack/minikube/cmd.sh @@ -36,7 +36,7 @@ if [ "$1" = "init-etcd-secret" ]; then fi -if [ "$1" = "prometheus-operator" ]; then +if [ "$1" = "upgrade-install" ]; then helm upgrade $HELM_RELEASE_NAME $CHART \ --namespace $NAMESPACE \ --values $VALUES_FILES \ @@ -66,13 +66,13 @@ Commands: the normal installation will not allow scraping of the kubelet, scheduler or controller-manager components init-helm - initialize helm and update repository so that we can install - the prometheus-operator chart. This has to be run only once after + the kube-prometheus chart. This has to be run only once after a minikube installation is done init-etcd-secret - pulls the certs used to access etcd from the api server and creates a secret in the monitoring namespace with them. The values files in the install command assume that this secret exists and is valid. If not, then prometheus will not start - prometheus-operator - install or upgrade the prometheus operator chart in the cluster + upgrade-install - install or upgrade the kube-prometheus chart in the cluster port-forward - starts port-forwarding for prometheus, alertmanager, grafana localhost:9090 - prometheus localhost:9093 - alertmanager diff --git a/charts/kube-prometheus/hack/sync_grafana_dashboards.py b/charts/kube-prometheus/hack/sync_grafana_dashboards.py index d899963591dd..9ef550147aff 100755 --- a/charts/kube-prometheus/hack/sync_grafana_dashboards.py +++ b/charts/kube-prometheus/hack/sync_grafana_dashboards.py @@ -71,23 +71,23 @@ def new_representer(dumper, data): header = '''{{- /* Generated from '%(name)s' from %(url)s Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=%(min_kubernetes)s" $kubeTargetVersion) (semverCompare "<%(max_kubernetes)s" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled%(condition)s }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%%s-%%s" (include "prometheus-operator.fullname" $) "%(name)s" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%%s-%%s" (include "kube-prometheus.fullname" $) "%(name)s" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: ''' diff --git a/charts/kube-prometheus/hack/sync_prometheus_rules.py b/charts/kube-prometheus/hack/sync_prometheus_rules.py index b7c40df8bcbc..49a5a80e01f2 100755 --- a/charts/kube-prometheus/hack/sync_prometheus_rules.py +++ b/charts/kube-prometheus/hack/sync_prometheus_rules.py @@ -98,16 +98,16 @@ def new_representer(dumper, data): replacement_map = { 'job="prometheus-operator"': { 'replacement': 'job="{{ $operatorJob }}"', - 'init': '{{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }}'}, + 'init': '{{- $operatorJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "operator" }}'}, 'job="prometheus-k8s"': { 'replacement': 'job="{{ $prometheusJob }}"', - 'init': '{{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }}'}, + 'init': '{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }}'}, 'job="alertmanager-main"': { 'replacement': 'job="{{ $alertmanagerJob }}"', - 'init': '{{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }}'}, + 'init': '{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager" }}'}, 'namespace="monitoring"': { 'replacement': 'namespace="{{ $namespace }}"', - 'init': '{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }}'}, + 'init': '{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }}'}, 'alertmanager-$1': { 'replacement': '$1', 'init': ''}, @@ -128,18 +128,18 @@ def new_representer(dumper, data): header = '''{{- /* Generated from '%(name)s' group from %(url)s Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=%(min_kubernetes)s" $kubeTargetVersion) (semverCompare "<%(max_kubernetes)s" $kubeTargetVersion) .Values.defaultRules.create%(condition)s }}%(init_line)s apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%%s-%%s" (include "prometheus-operator.fullname" .) "%(name)s" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%%s-%%s" (include "kube-prometheus.fullname" .) "%(name)s" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/NOTES.txt b/charts/kube-prometheus/templates/NOTES.txt index 4ef1bc3c8dfb..ab9c2d30cb21 100644 --- a/charts/kube-prometheus/templates/NOTES.txt +++ b/charts/kube-prometheus/templates/NOTES.txt @@ -1,5 +1,5 @@ -The Prometheus Operator has been installed. Check its status by running: - kubectl --namespace {{ template "prometheus-operator.namespace" . }} get pods -l "release={{ $.Release.Name }}" +kube-prometheus has been installed. Check its status by running: + kubectl --namespace {{ template "kube-prometheus.namespace" . }} get pods -l "release={{ $.Release.Name }}" -Visit https://github.com/coreos/prometheus-operator for instructions on how +Visit https://github.com/prometheus-operator/kube-prometheus for instructions on how to create & configure Alertmanager and Prometheus instances using the Operator. \ No newline at end of file diff --git a/charts/kube-prometheus/templates/_helpers.tpl b/charts/kube-prometheus/templates/_helpers.tpl index a7c481de5842..ade0a02f0dfd 100644 --- a/charts/kube-prometheus/templates/_helpers.tpl +++ b/charts/kube-prometheus/templates/_helpers.tpl @@ -1,6 +1,6 @@ {{/* vim: set filetype=mustache: */}} {{/* Expand the name of the chart. This is suffixed with -alertmanager, which means subtract 13 from longest 63 available */}} -{{- define "prometheus-operator.name" -}} +{{- define "kube-prometheus.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 50 | trimSuffix "-" -}} {{- end }} @@ -11,7 +11,7 @@ If release name contains chart name it will be used as a full name. The components in this chart create additional resources that expand the longest created name strings. The longest name that gets created adds and extra 37 characters, so truncation should be 63-35=26. */}} -{{- define "prometheus-operator.fullname" -}} +{{- define "kube-prometheus.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 26 | trimSuffix "-" -}} {{- else -}} @@ -25,28 +25,28 @@ The longest name that gets created adds and extra 37 characters, so truncation s {{- end -}} {{/* Fullname suffixed with operator */}} -{{- define "prometheus-operator.operator.fullname" -}} -{{- printf "%s-operator" (include "prometheus-operator.fullname" .) -}} +{{- define "kube-prometheus.operator.fullname" -}} +{{- printf "%s-operator" (include "kube-prometheus.fullname" .) -}} {{- end }} {{/* Fullname suffixed with prometheus */}} -{{- define "prometheus-operator.prometheus.fullname" -}} -{{- printf "%s-prometheus" (include "prometheus-operator.fullname" .) -}} +{{- define "kube-prometheus.prometheus.fullname" -}} +{{- printf "%s-prometheus" (include "kube-prometheus.fullname" .) -}} {{- end }} {{/* Fullname suffixed with alertmanager */}} -{{- define "prometheus-operator.alertmanager.fullname" -}} -{{- printf "%s-alertmanager" (include "prometheus-operator.fullname" .) -}} +{{- define "kube-prometheus.alertmanager.fullname" -}} +{{- printf "%s-alertmanager" (include "kube-prometheus.fullname" .) -}} {{- end }} {{/* Create chart name and version as used by the chart label. */}} -{{- define "prometheus-operator.chartref" -}} +{{- define "kube-prometheus.chartref" -}} {{- replace "+" "_" .Chart.Version | printf "%s-%s" .Chart.Name -}} {{- end }} {{/* Generate basic labels */}} -{{- define "prometheus-operator.labels" }} -chart: {{ template "prometheus-operator.chartref" . }} +{{- define "kube-prometheus.labels" }} +chart: {{ template "kube-prometheus.chartref" . }} release: {{ $.Release.Name | quote }} heritage: {{ $.Release.Service | quote }} {{- if .Values.commonLabels}} @@ -54,28 +54,28 @@ heritage: {{ $.Release.Service | quote }} {{- end }} {{- end }} -{{/* Create the name of prometheus-operator service account to use */}} -{{- define "prometheus-operator.operator.serviceAccountName" -}} +{{/* Create the name of kube-prometheus service account to use */}} +{{- define "kube-prometheus.operator.serviceAccountName" -}} {{- if .Values.prometheusOperator.serviceAccount.create -}} - {{ default (include "prometheus-operator.operator.fullname" .) .Values.prometheusOperator.serviceAccount.name }} + {{ default (include "kube-prometheus.operator.fullname" .) .Values.prometheusOperator.serviceAccount.name }} {{- else -}} {{ default "default" .Values.prometheusOperator.serviceAccount.name }} {{- end -}} {{- end -}} {{/* Create the name of prometheus service account to use */}} -{{- define "prometheus-operator.prometheus.serviceAccountName" -}} +{{- define "kube-prometheus.prometheus.serviceAccountName" -}} {{- if .Values.prometheus.serviceAccount.create -}} - {{ default (include "prometheus-operator.prometheus.fullname" .) .Values.prometheus.serviceAccount.name }} + {{ default (include "kube-prometheus.prometheus.fullname" .) .Values.prometheus.serviceAccount.name }} {{- else -}} {{ default "default" .Values.prometheus.serviceAccount.name }} {{- end -}} {{- end -}} {{/* Create the name of alertmanager service account to use */}} -{{- define "prometheus-operator.alertmanager.serviceAccountName" -}} +{{- define "kube-prometheus.alertmanager.serviceAccountName" -}} {{- if .Values.alertmanager.serviceAccount.create -}} - {{ default (include "prometheus-operator.alertmanager.fullname" .) .Values.alertmanager.serviceAccount.name }} + {{ default (include "kube-prometheus.alertmanager.fullname" .) .Values.alertmanager.serviceAccount.name }} {{- else -}} {{ default "default" .Values.alertmanager.serviceAccount.name }} {{- end -}} @@ -84,7 +84,7 @@ heritage: {{ $.Release.Service | quote }} {{/* Allow the release namespace to be overridden for multi-namespace deployments in combined charts */}} -{{- define "prometheus-operator.namespace" -}} +{{- define "kube-prometheus.namespace" -}} {{- if .Values.namespaceOverride -}} {{- .Values.namespaceOverride -}} {{- else -}} diff --git a/charts/kube-prometheus/templates/alertmanager/alertmanager.yaml b/charts/kube-prometheus/templates/alertmanager/alertmanager.yaml index 7bc2465ce193..06a0d7a76a1b 100644 --- a/charts/kube-prometheus/templates/alertmanager/alertmanager.yaml +++ b/charts/kube-prometheus/templates/alertmanager/alertmanager.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: Alertmanager metadata: - name: {{ template "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-alertmanager +{{ include "kube-prometheus.labels" . | indent 4 }} spec: {{- if .Values.alertmanager.alertmanagerSpec.image }} baseImage: {{ .Values.alertmanager.alertmanagerSpec.image.repository }} @@ -17,13 +17,13 @@ spec: {{- end }} replicas: {{ .Values.alertmanager.alertmanagerSpec.replicas }} listenLocal: {{ .Values.alertmanager.alertmanagerSpec.listenLocal }} - serviceAccountName: {{ template "prometheus-operator.alertmanager.serviceAccountName" . }} + serviceAccountName: {{ template "kube-prometheus.alertmanager.serviceAccountName" . }} {{- if .Values.alertmanager.alertmanagerSpec.externalUrl }} externalUrl: "{{ .Values.alertmanager.alertmanagerSpec.externalUrl }}" {{- else if and .Values.alertmanager.ingress.enabled .Values.alertmanager.ingress.hosts }} externalUrl: "http://{{ index .Values.alertmanager.ingress.hosts 0 }}{{ .Values.alertmanager.alertmanagerSpec.routePrefix }}" {{- else }} - externalUrl: http://{{ template "prometheus-operator.fullname" . }}-alertmanager.{{ template "prometheus-operator.namespace" . }}:{{ .Values.alertmanager.service.port }} + externalUrl: http://{{ template "kube-prometheus.fullname" . }}-alertmanager.{{ template "kube-prometheus.namespace" . }}:{{ .Values.alertmanager.service.port }} {{- end }} {{- if .Values.alertmanager.alertmanagerSpec.nodeSelector }} nodeSelector: @@ -75,7 +75,7 @@ spec: labelSelector: matchLabels: app: alertmanager - alertmanager: {{ template "prometheus-operator.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus.fullname" . }}-alertmanager {{- else if eq .Values.alertmanager.alertmanagerSpec.podAntiAffinity "soft" }} podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -85,7 +85,7 @@ spec: labelSelector: matchLabels: app: alertmanager - alertmanager: {{ template "prometheus-operator.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus.fullname" . }}-alertmanager {{- end }} {{- end }} {{- if .Values.alertmanager.alertmanagerSpec.tolerations }} diff --git a/charts/kube-prometheus/templates/alertmanager/ingress.yaml b/charts/kube-prometheus/templates/alertmanager/ingress.yaml index 41bdcd03a5ea..8edf1820e20f 100644 --- a/charts/kube-prometheus/templates/alertmanager/ingress.yaml +++ b/charts/kube-prometheus/templates/alertmanager/ingress.yaml @@ -1,5 +1,5 @@ {{- if and .Values.alertmanager.enabled .Values.alertmanager.ingress.enabled }} -{{- $serviceName := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }} +{{- $serviceName := printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager" }} {{- $servicePort := .Values.alertmanager.service.port -}} {{- $routePrefix := list .Values.alertmanager.alertmanagerSpec.routePrefix }} {{- $paths := .Values.alertmanager.ingress.paths | default $routePrefix -}} @@ -11,17 +11,17 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ $serviceName }} - namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ template "kube-prometheus.namespace" . }} {{- if .Values.alertmanager.ingress.annotations }} annotations: {{ toYaml .Values.alertmanager.ingress.annotations | indent 4 }} {{- end }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager + app: {{ template "kube-prometheus.name" . }}-alertmanager {{- if .Values.alertmanager.ingress.labels }} {{ toYaml .Values.alertmanager.ingress.labels | indent 4 }} {{- end }} -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} spec: rules: {{- if .Values.alertmanager.ingress.hosts }} diff --git a/charts/kube-prometheus/templates/alertmanager/ingressperreplica.yaml b/charts/kube-prometheus/templates/alertmanager/ingressperreplica.yaml index 7e08c42504cd..7ab162d14dd8 100644 --- a/charts/kube-prometheus/templates/alertmanager/ingressperreplica.yaml +++ b/charts/kube-prometheus/templates/alertmanager/ingressperreplica.yaml @@ -5,8 +5,8 @@ apiVersion: v1 kind: List metadata: - name: {{ include "prometheus-operator.fullname" $ }}-alertmanager-ingressperreplica - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ include "kube-prometheus.fullname" $ }}-alertmanager-ingressperreplica + namespace: {{ template "kube-prometheus.namespace" . }} items: {{ range $i, $e := until $count }} - kind: Ingress @@ -16,11 +16,11 @@ items: apiVersion: extensions/v1beta1 {{ end -}} metadata: - name: {{ include "prometheus-operator.fullname" $ }}-alertmanager-{{ $i }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ include "kube-prometheus.fullname" $ }}-alertmanager-{{ $i }} + namespace: {{ template "kube-prometheus.namespace" $ }} labels: - app: {{ include "prometheus-operator.name" $ }}-alertmanager -{{ include "prometheus-operator.labels" $ | indent 8 }} + app: {{ include "kube-prometheus.name" $ }}-alertmanager +{{ include "kube-prometheus.labels" $ | indent 8 }} {{- if $ingressValues.labels }} {{ toYaml $ingressValues.labels | indent 8 }} {{- end }} @@ -36,7 +36,7 @@ items: {{- range $p := $ingressValues.paths }} - path: {{ tpl $p $ }} backend: - serviceName: {{ include "prometheus-operator.fullname" $ }}-alertmanager-{{ $i }} + serviceName: {{ include "kube-prometheus.fullname" $ }}-alertmanager-{{ $i }} servicePort: {{ $servicePort }} {{- end -}} {{- if or $ingressValues.tlsSecretName $ingressValues.tlsSecretPerReplica.enabled }} diff --git a/charts/kube-prometheus/templates/alertmanager/podDisruptionBudget.yaml b/charts/kube-prometheus/templates/alertmanager/podDisruptionBudget.yaml index 963b7c6ac28a..53812193994d 100644 --- a/charts/kube-prometheus/templates/alertmanager/podDisruptionBudget.yaml +++ b/charts/kube-prometheus/templates/alertmanager/podDisruptionBudget.yaml @@ -2,11 +2,11 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: {{ template "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-alertmanager +{{ include "kube-prometheus.labels" . | indent 4 }} spec: {{- if .Values.alertmanager.podDisruptionBudget.minAvailable }} minAvailable: {{ .Values.alertmanager.podDisruptionBudget.minAvailable }} @@ -17,5 +17,5 @@ spec: selector: matchLabels: app: alertmanager - alertmanager: {{ template "prometheus-operator.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus.fullname" . }}-alertmanager {{- end }} diff --git a/charts/kube-prometheus/templates/alertmanager/psp-role.yaml b/charts/kube-prometheus/templates/alertmanager/psp-role.yaml index c3f8b4b42f09..88cd439790e4 100644 --- a/charts/kube-prometheus/templates/alertmanager/psp-role.yaml +++ b/charts/kube-prometheus/templates/alertmanager/psp-role.yaml @@ -2,11 +2,11 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-alertmanager +{{ include "kube-prometheus.labels" . | indent 4 }} rules: {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if semverCompare "> 1.15.0-0" $kubeTargetVersion }} @@ -17,5 +17,5 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "prometheus-operator.fullname" . }}-alertmanager + - {{ template "kube-prometheus.fullname" . }}-alertmanager {{- end }} diff --git a/charts/kube-prometheus/templates/alertmanager/psp-rolebinding.yaml b/charts/kube-prometheus/templates/alertmanager/psp-rolebinding.yaml index 797150336ad2..ade3b39e9863 100644 --- a/charts/kube-prometheus/templates/alertmanager/psp-rolebinding.yaml +++ b/charts/kube-prometheus/templates/alertmanager/psp-rolebinding.yaml @@ -2,17 +2,17 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ template "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-alertmanager +{{ include "kube-prometheus.labels" . | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ template "prometheus-operator.fullname" . }}-alertmanager + name: {{ template "kube-prometheus.fullname" . }}-alertmanager subjects: - kind: ServiceAccount - name: {{ template "prometheus-operator.alertmanager.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.alertmanager.serviceAccountName" . }} + namespace: {{ template "kube-prometheus.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus/templates/alertmanager/psp.yaml b/charts/kube-prometheus/templates/alertmanager/psp.yaml index 9726175abefa..b0f424cbed1c 100644 --- a/charts/kube-prometheus/templates/alertmanager/psp.yaml +++ b/charts/kube-prometheus/templates/alertmanager/psp.yaml @@ -2,14 +2,14 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "prometheus-operator.fullname" . }}-alertmanager + name: {{ template "kube-prometheus.fullname" . }}-alertmanager labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager + app: {{ template "kube-prometheus.name" . }}-alertmanager {{- if .Values.global.rbac.pspAnnotations }} annotations: {{ toYaml .Values.global.rbac.pspAnnotations | indent 4 }} {{- end }} -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/kube-prometheus/templates/alertmanager/secret.yaml b/charts/kube-prometheus/templates/alertmanager/secret.yaml index a543bbf60d0e..81d9d78a7d92 100644 --- a/charts/kube-prometheus/templates/alertmanager/secret.yaml +++ b/charts/kube-prometheus/templates/alertmanager/secret.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Secret metadata: - name: alertmanager-{{ template "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: alertmanager-{{ template "kube-prometheus.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus.namespace" . }} {{- if .Values.alertmanager.secret.annotations }} annotations: {{ toYaml .Values.alertmanager.secret.annotations | indent 4 }} {{- end }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-alertmanager +{{ include "kube-prometheus.labels" . | indent 4 }} data: {{- if .Values.alertmanager.tplConfig }} alertmanager.yaml: {{ tpl (toYaml .Values.alertmanager.config) . | b64enc | quote }} diff --git a/charts/kube-prometheus/templates/alertmanager/service.yaml b/charts/kube-prometheus/templates/alertmanager/service.yaml index 8324e3b662cb..c3c01ee476ac 100644 --- a/charts/kube-prometheus/templates/alertmanager/service.yaml +++ b/charts/kube-prometheus/templates/alertmanager/service.yaml @@ -2,12 +2,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager + app: {{ template "kube-prometheus.name" . }}-alertmanager self-monitor: {{ .Values.alertmanager.serviceMonitor.selfMonitor | quote }} -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.alertmanager.service.labels }} {{ toYaml .Values.alertmanager.service.labels | indent 4 }} {{- end }} @@ -42,6 +42,6 @@ spec: protocol: TCP selector: app: alertmanager - alertmanager: {{ template "prometheus-operator.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus.fullname" . }}-alertmanager type: "{{ .Values.alertmanager.service.type }}" {{- end }} diff --git a/charts/kube-prometheus/templates/alertmanager/serviceaccount.yaml b/charts/kube-prometheus/templates/alertmanager/serviceaccount.yaml index 378e0351c079..e00bd68b3e88 100644 --- a/charts/kube-prometheus/templates/alertmanager/serviceaccount.yaml +++ b/charts/kube-prometheus/templates/alertmanager/serviceaccount.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "prometheus-operator.alertmanager.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.alertmanager.serviceAccountName" . }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-alertmanager +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.alertmanager.serviceAccount.annotations }} annotations: {{ toYaml .Values.alertmanager.serviceAccount.annotations | indent 4 }} diff --git a/charts/kube-prometheus/templates/alertmanager/servicemonitor.yaml b/charts/kube-prometheus/templates/alertmanager/servicemonitor.yaml index 6e90d327d7bd..9d517dd722f8 100644 --- a/charts/kube-prometheus/templates/alertmanager/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/alertmanager/servicemonitor.yaml @@ -2,20 +2,20 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-alertmanager +{{ include "kube-prometheus.labels" . | indent 4 }} spec: selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-alertmanager + app: {{ template "kube-prometheus.name" . }}-alertmanager release: {{ $.Release.Name | quote }} self-monitor: "true" namespaceSelector: matchNames: - - {{ printf "%s" (include "prometheus-operator.namespace" .) | quote }} + - {{ printf "%s" (include "kube-prometheus.namespace" .) | quote }} endpoints: - port: {{ .Values.alertmanager.alertmanagerSpec.portName }} {{- if .Values.alertmanager.serviceMonitor.interval }} diff --git a/charts/kube-prometheus/templates/alertmanager/serviceperreplica.yaml b/charts/kube-prometheus/templates/alertmanager/serviceperreplica.yaml index 8bb061218431..0beccdcb4c03 100644 --- a/charts/kube-prometheus/templates/alertmanager/serviceperreplica.yaml +++ b/charts/kube-prometheus/templates/alertmanager/serviceperreplica.yaml @@ -4,18 +4,18 @@ apiVersion: v1 kind: List metadata: - name: {{ include "prometheus-operator.fullname" $ }}-alertmanager-serviceperreplica - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ include "kube-prometheus.fullname" $ }}-alertmanager-serviceperreplica + namespace: {{ template "kube-prometheus.namespace" . }} items: {{- range $i, $e := until $count }} - apiVersion: v1 kind: Service metadata: - name: {{ include "prometheus-operator.fullname" $ }}-alertmanager-{{ $i }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ include "kube-prometheus.fullname" $ }}-alertmanager-{{ $i }} + namespace: {{ template "kube-prometheus.namespace" $ }} labels: - app: {{ include "prometheus-operator.name" $ }}-alertmanager -{{ include "prometheus-operator.labels" $ | indent 8 }} + app: {{ include "kube-prometheus.name" $ }}-alertmanager +{{ include "kube-prometheus.labels" $ | indent 8 }} {{- if $serviceValues.annotations }} annotations: {{ toYaml $serviceValues.annotations | indent 8 }} @@ -39,8 +39,8 @@ items: targetPort: {{ $serviceValues.targetPort }} selector: app: alertmanager - alertmanager: {{ template "prometheus-operator.fullname" $ }}-alertmanager - statefulset.kubernetes.io/pod-name: alertmanager-{{ include "prometheus-operator.fullname" $ }}-alertmanager-{{ $i }} + alertmanager: {{ template "kube-prometheus.fullname" $ }}-alertmanager + statefulset.kubernetes.io/pod-name: alertmanager-{{ include "kube-prometheus.fullname" $ }}-alertmanager-{{ $i }} type: "{{ $serviceValues.type }}" {{- end }} {{- end }} diff --git a/charts/kube-prometheus/templates/exporters/core-dns/service.yaml b/charts/kube-prometheus/templates/exporters/core-dns/service.yaml index 707e5ca328a4..bbe7db929db8 100644 --- a/charts/kube-prometheus/templates/exporters/core-dns/service.yaml +++ b/charts/kube-prometheus/templates/exporters/core-dns/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "prometheus-operator.fullname" . }}-coredns + name: {{ template "kube-prometheus.fullname" . }}-coredns labels: - app: {{ template "prometheus-operator.name" . }}-coredns + app: {{ template "kube-prometheus.name" . }}-coredns jobLabel: coredns -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml index fa3ad9cd7114..81416b26c3a4 100644 --- a/charts/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-coredns - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-coredns + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-coredns -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-coredns +{{ include "kube-prometheus.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-coredns + app: {{ template "kube-prometheus.name" . }}-coredns release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus/templates/exporters/kube-api-server/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-api-server/servicemonitor.yaml index f4945771e0eb..7b3aa4fea112 100644 --- a/charts/kube-prometheus/templates/exporters/kube-api-server/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-api-server/servicemonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-apiserver - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-apiserver + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-apiserver -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-apiserver +{{ include "kube-prometheus.labels" . | indent 4 }} spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token diff --git a/charts/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml b/charts/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml index 205364fc3e4e..770ba29903ba 100644 --- a/charts/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Endpoints metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-controller-manager + name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager labels: - app: {{ template "prometheus-operator.name" . }}-kube-controller-manager + app: {{ template "kube-prometheus.name" . }}-kube-controller-manager k8s-app: kube-controller-manager -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml b/charts/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml index 70458fdae443..fddc2969bd8a 100644 --- a/charts/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-controller-manager + name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager labels: - app: {{ template "prometheus-operator.name" . }}-kube-controller-manager + app: {{ template "kube-prometheus.name" . }}-kube-controller-manager jobLabel: kube-controller-manager -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml index 7edc60bada7a..dfba34793480 100644 --- a/charts/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-controller-manager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-controller-manager -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-kube-controller-manager +{{ include "kube-prometheus.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-kube-controller-manager + app: {{ template "kube-prometheus.name" . }}-kube-controller-manager release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus/templates/exporters/kube-dns/service.yaml b/charts/kube-prometheus/templates/exporters/kube-dns/service.yaml index 84ffb9685b74..f95c47ef9d0b 100644 --- a/charts/kube-prometheus/templates/exporters/kube-dns/service.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-dns/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-dns + name: {{ template "kube-prometheus.fullname" . }}-kube-dns labels: - app: {{ template "prometheus-operator.name" . }}-kube-dns + app: {{ template "kube-prometheus.name" . }}-kube-dns jobLabel: kube-dns -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus/templates/exporters/kube-dns/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-dns/servicemonitor.yaml index 19ce523deb44..2cd40bfbc4cc 100644 --- a/charts/kube-prometheus/templates/exporters/kube-dns/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-dns/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-dns - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-kube-dns + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-dns -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-kube-dns +{{ include "kube-prometheus.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-kube-dns + app: {{ template "kube-prometheus.name" . }}-kube-dns release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus/templates/exporters/kube-etcd/endpoints.yaml b/charts/kube-prometheus/templates/exporters/kube-etcd/endpoints.yaml index ee603de76f70..e28f4f159f7e 100644 --- a/charts/kube-prometheus/templates/exporters/kube-etcd/endpoints.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-etcd/endpoints.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Endpoints metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-etcd + name: {{ template "kube-prometheus.fullname" . }}-kube-etcd labels: - app: {{ template "prometheus-operator.name" . }}-kube-etcd + app: {{ template "kube-prometheus.name" . }}-kube-etcd k8s-app: etcd-server -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/kube-prometheus/templates/exporters/kube-etcd/service.yaml b/charts/kube-prometheus/templates/exporters/kube-etcd/service.yaml index af9e8cae40b4..c1d287f4c54c 100644 --- a/charts/kube-prometheus/templates/exporters/kube-etcd/service.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-etcd/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-etcd + name: {{ template "kube-prometheus.fullname" . }}-kube-etcd labels: - app: {{ template "prometheus-operator.name" . }}-kube-etcd + app: {{ template "kube-prometheus.name" . }}-kube-etcd jobLabel: kube-etcd -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus/templates/exporters/kube-etcd/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-etcd/servicemonitor.yaml index 4c716606a441..07c0d4e608ce 100644 --- a/charts/kube-prometheus/templates/exporters/kube-etcd/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-etcd/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-etcd - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-kube-etcd + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-etcd -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-kube-etcd +{{ include "kube-prometheus.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-kube-etcd + app: {{ template "kube-prometheus.name" . }}-kube-etcd release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml b/charts/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml index 3a71c397e623..882682b17922 100644 --- a/charts/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Endpoints metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-proxy + name: {{ template "kube-prometheus.fullname" . }}-kube-proxy labels: - app: {{ template "prometheus-operator.name" . }}-kube-proxy + app: {{ template "kube-prometheus.name" . }}-kube-proxy k8s-app: kube-proxy -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/kube-prometheus/templates/exporters/kube-proxy/service.yaml b/charts/kube-prometheus/templates/exporters/kube-proxy/service.yaml index b1117523787a..55a6c5a41f03 100644 --- a/charts/kube-prometheus/templates/exporters/kube-proxy/service.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-proxy/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-proxy + name: {{ template "kube-prometheus.fullname" . }}-kube-proxy labels: - app: {{ template "prometheus-operator.name" . }}-kube-proxy + app: {{ template "kube-prometheus.name" . }}-kube-proxy jobLabel: kube-proxy -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml index 16bc28bb64a8..7118e7561783 100644 --- a/charts/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-proxy - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-kube-proxy + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-proxy -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-kube-proxy +{{ include "kube-prometheus.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-kube-proxy + app: {{ template "kube-prometheus.name" . }}-kube-proxy release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml b/charts/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml index 2c0c327f60cc..7c13ec1e5503 100644 --- a/charts/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Endpoints metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-scheduler + name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler labels: - app: {{ template "prometheus-operator.name" . }}-kube-scheduler + app: {{ template "kube-prometheus.name" . }}-kube-scheduler k8s-app: kube-scheduler -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/kube-prometheus/templates/exporters/kube-scheduler/service.yaml b/charts/kube-prometheus/templates/exporters/kube-scheduler/service.yaml index d74409658dff..b655f64bd19f 100644 --- a/charts/kube-prometheus/templates/exporters/kube-scheduler/service.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-scheduler/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-scheduler + name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler labels: - app: {{ template "prometheus-operator.name" . }}-kube-scheduler + app: {{ template "kube-prometheus.name" . }}-kube-scheduler jobLabel: kube-scheduler -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml index 08795f41207f..01deb019efac 100644 --- a/charts/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-scheduler - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-scheduler -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-kube-scheduler +{{ include "kube-prometheus.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-kube-scheduler + app: {{ template "kube-prometheus.name" . }}-kube-scheduler release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/charts/kube-prometheus/templates/exporters/kube-state-metrics/serviceMonitor.yaml index 3630361b8008..367803d419a5 100644 --- a/charts/kube-prometheus/templates/exporters/kube-state-metrics/serviceMonitor.yaml +++ b/charts/kube-prometheus/templates/exporters/kube-state-metrics/serviceMonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-kube-state-metrics - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-kube-state-metrics + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-state-metrics -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-kube-state-metrics +{{ include "kube-prometheus.labels" . | indent 4 }} spec: jobLabel: app.kubernetes.io/name endpoints: diff --git a/charts/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml index e0d6b856ea2d..af71d69f061e 100644 --- a/charts/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-kubelet - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-kubelet + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kubelet -{{- include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-kubelet +{{- include "kube-prometheus.labels" . | indent 4 }} spec: endpoints: {{- if .Values.kubelet.serviceMonitor.https }} diff --git a/charts/kube-prometheus/templates/exporters/node-exporter/servicemonitor.yaml b/charts/kube-prometheus/templates/exporters/node-exporter/servicemonitor.yaml index 82efdbf749f1..c1e8e9301f2c 100644 --- a/charts/kube-prometheus/templates/exporters/node-exporter/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/exporters/node-exporter/servicemonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-node-exporter - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-node-exporter + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-node-exporter -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-node-exporter +{{ include "kube-prometheus.labels" . | indent 4 }} spec: jobLabel: {{ .Values.nodeExporter.jobLabel }} selector: diff --git a/charts/kube-prometheus/templates/grafana/configmap-dashboards.yaml b/charts/kube-prometheus/templates/grafana/configmap-dashboards.yaml index c4d4cb93d933..215355c9cd08 100644 --- a/charts/kube-prometheus/templates/grafana/configmap-dashboards.yaml +++ b/charts/kube-prometheus/templates/grafana/configmap-dashboards.yaml @@ -9,14 +9,14 @@ items: - apiVersion: v1 kind: ConfigMap metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" $ }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 6 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 6 }} data: {{ $dashboardName }}.json: {{ $.Files.Get $path | toJson }} {{- end }} diff --git a/charts/kube-prometheus/templates/grafana/configmaps-datasources.yaml b/charts/kube-prometheus/templates/grafana/configmaps-datasources.yaml index 40198b56d829..a1b373e15dc1 100644 --- a/charts/kube-prometheus/templates/grafana/configmaps-datasources.yaml +++ b/charts/kube-prometheus/templates/grafana/configmaps-datasources.yaml @@ -2,16 +2,16 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "prometheus-operator.fullname" . }}-grafana-datasource - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-grafana-datasource + namespace: {{ template "kube-prometheus.namespace" . }} {{- if .Values.grafana.sidecar.datasources.annotations }} annotations: {{ toYaml .Values.grafana.sidecar.datasources.annotations | indent 4 }} {{- end }} labels: {{ $.Values.grafana.sidecar.datasources.label }}: "1" - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: datasource.yaml: |- apiVersion: 1 @@ -19,14 +19,14 @@ data: {{- if .Values.grafana.sidecar.datasources.defaultDatasourceEnabled }} - name: Prometheus type: prometheus - url: http://{{ template "prometheus-operator.fullname" . }}-prometheus:{{ .Values.prometheus.service.port }}/{{ trimPrefix "/" .Values.prometheus.prometheusSpec.routePrefix }} + url: http://{{ template "kube-prometheus.fullname" . }}-prometheus:{{ .Values.prometheus.service.port }}/{{ trimPrefix "/" .Values.prometheus.prometheusSpec.routePrefix }} access: proxy isDefault: true {{- if .Values.grafana.sidecar.datasources.createPrometheusReplicasDatasources }} {{- range until (int .Values.prometheus.prometheusSpec.replicas) }} - name: Prometheus-{{ . }} type: prometheus - url: http://prometheus-{{ template "prometheus-operator.fullname" $ }}-prometheus-{{ . }}.prometheus-operated:9090/{{ trimPrefix "/" $.Values.prometheus.prometheusSpec.routePrefix }} + url: http://prometheus-{{ template "kube-prometheus.fullname" $ }}-prometheus-{{ . }}.prometheus-operated:9090/{{ trimPrefix "/" $.Values.prometheus.prometheusSpec.routePrefix }} access: proxy isDefault: false {{- end }} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml index 33a26d80be1d..7d3f342f674e 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'apiserver' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeApiServer.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "apiserver" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "apiserver" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: apiserver.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml index 27ea3ba5741f..d853896e1c57 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'cluster-total' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "cluster-total" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "cluster-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: cluster-total.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml index 005b01ce24d6..66295f00e37d 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'controller-manager' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeControllerManager.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "controller-manager" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "controller-manager" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: controller-manager.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/etcd.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/etcd.yaml index ba49364422a8..cf41e78bf091 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/etcd.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/etcd.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'etcd' from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/grafana.json Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeEtcd.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: etcd.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-coredns.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-coredns.yaml index 9b78d24747f0..65bdff66b2ca 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-coredns.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-coredns.yaml @@ -4,16 +4,16 @@ apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-coredns" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-coredns" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-coredns.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml index 88358545e12f..eec14793db58 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-cluster.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml index 56f6d21d797b..1ad58dc78141 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-namespace.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml index 8c26ddacb7f3..c114fe946442 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-node' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-node.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml index 78768bac17b5..4035f619c49a 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-pod.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml index 2e668dddd3c3..fff54d2d3b38 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-workload.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml index 619862628ec7..d1c80d54cc63 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-workloads-namespace.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml index 5396d5e174b6..5e0a95635d15 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'kubelet' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubelet.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "kubelet" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "kubelet" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: kubelet.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml index 707e633d5f1b..de26b11ba365 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'namespace-by-pod' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "namespace-by-pod" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "namespace-by-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: namespace-by-pod.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml index 6af9c532e957..124c44bc921e 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'namespace-by-workload' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "namespace-by-workload" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "namespace-by-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: namespace-by-workload.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml index 175bf9078ea1..a42d290253b1 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'node-cluster-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.nodeExporter.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "node-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "node-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: node-cluster-rsrc-use.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml index 03ad9f7cca67..18c560178b90 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'node-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.nodeExporter.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "node-rsrc-use" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "node-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: node-rsrc-use.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml index c70474488fcf..9edcb758eb0e 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'nodes' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: nodes.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml index d61d5b776bc1..df831cc584b0 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: persistentvolumesusage.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml index 9e46de174354..e1037aa9634f 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'pod-total' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "pod-total" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "pod-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: pod-total.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml index a0b64fdbc046..09a97f1d0e5e 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'prometheus-remote-write' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.prometheus.prometheusSpec.remoteWriteDashboards }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "prometheus-remote-write" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "prometheus-remote-write" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: prometheus-remote-write.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml index 88d1098e0315..057f32a59d21 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'prometheus' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "prometheus" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: prometheus.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml index c5ef1efbe506..925dc05e475f 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'proxy' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeProxy.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "proxy" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "proxy" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: proxy.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml index 8ef20780987e..ad03aca2d056 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'scheduler' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeScheduler.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "scheduler" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "scheduler" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: scheduler.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml index 694bd1f77c8b..44f58b209952 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'statefulset' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: statefulset.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml index 6674cdcf84a6..29f28f25192f 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'workload-total' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "workload-total" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "workload-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: workload-total.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/etcd.yaml b/charts/kube-prometheus/templates/grafana/dashboards/etcd.yaml index b634fb58403e..02b00d3f4c91 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/etcd.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/etcd.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'etcd' from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/grafana.json Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeEtcd.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: etcd.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml index 1aebf9c6616a..a006d5be7a50 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-cluster-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-cluster-rsrc-use.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml index 4dd0e8546566..11ea8fe2f174 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-node-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-node-rsrc-use" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-node-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-node-rsrc-use.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml index 9ad60b43982b..b21bdf7a7632 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-cluster.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml index 8a6701360f35..3ad7b13e7695 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-namespace.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml index 32c8bbc77dea..e56ef4c1ac72 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-pod.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml index 3c1c5910e296..58705ed5fd1c 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-workload.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml index 362140e3e863..10cfe68a324a 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: k8s-resources-workloads-namespace.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml b/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml index cc1ae90d277d..bc470381c2b2 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'nodes' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: nodes.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml b/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml index 66e8c9951022..fdb1b27b701f 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: persistentvolumesusage.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml b/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml index 9f7f5ac75fe8..40834a0476f9 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'pods' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "pods" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "pods" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: pods.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml b/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml index c6d943fff311..cc9c6873839c 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'statefulset' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-grafana +{{ include "kube-prometheus.labels" $ | indent 4 }} data: statefulset.json: |- { diff --git a/charts/kube-prometheus/templates/grafana/servicemonitor.yaml b/charts/kube-prometheus/templates/grafana/servicemonitor.yaml index daf72b335f57..bab04bea6aa1 100644 --- a/charts/kube-prometheus/templates/grafana/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/grafana/servicemonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-grafana - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-grafana + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-grafana -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-grafana +{{ include "kube-prometheus.labels" . | indent 4 }} spec: selector: matchLabels: @@ -14,7 +14,7 @@ spec: app.kubernetes.io/instance: {{ $.Release.Name | quote }} namespaceSelector: matchNames: - - {{ printf "%s" (include "prometheus-operator.namespace" .) | quote }} + - {{ printf "%s" (include "kube-prometheus.namespace" .) | quote }} endpoints: - port: {{ .Values.grafana.service.portName }} {{- if .Values.grafana.serviceMonitor.interval }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml index 03e161839b0c..7afb9c8a076c 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml @@ -2,13 +2,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-admission +{{- include "kube-prometheus.labels" $ | indent 4 }} rules: - apiGroups: - admissionregistration.k8s.io @@ -28,6 +28,6 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "prometheus-operator.fullname" . }}-admission + - {{ template "kube-prometheus.fullname" . }}-admission {{- end }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml index 8da76caaa02a..79f8b3286af9 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml @@ -2,19 +2,19 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-admission +{{- include "kube-prometheus.labels" $ | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus.fullname" . }}-admission subjects: - kind: ServiceAccount - name: {{ template "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-admission + namespace: {{ template "kube-prometheus.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml index 093cdbea2af0..5f7b69533d51 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml @@ -2,14 +2,14 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission-create - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-admission-create + namespace: {{ template "kube-prometheus.namespace" . }} annotations: "helm.sh/hook": pre-install,pre-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "prometheus-operator.name" $ }}-admission-create -{{- include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-admission-create +{{- include "kube-prometheus.labels" $ | indent 4 }} spec: {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }} # Alpha feature since k8s 1.12 @@ -17,14 +17,14 @@ spec: {{- end }} template: metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission-create + name: {{ template "kube-prometheus.fullname" . }}-admission-create {{- with .Values.prometheusOperator.admissionWebhooks.patch.podAnnotations }} annotations: {{ toYaml . | indent 8 }} {{- end }} labels: - app: {{ template "prometheus-operator.name" $ }}-admission-create -{{- include "prometheus-operator.labels" $ | indent 8 }} + app: {{ template "kube-prometheus.name" $ }}-admission-create +{{- include "kube-prometheus.labels" $ | indent 8 }} spec: {{- if .Values.prometheusOperator.admissionWebhooks.patch.priorityClassName }} priorityClassName: {{ .Values.prometheusOperator.admissionWebhooks.patch.priorityClassName }} @@ -39,13 +39,13 @@ spec: imagePullPolicy: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.pullPolicy }} args: - create - - --host={{ template "prometheus-operator.operator.fullname" . }},{{ template "prometheus-operator.operator.fullname" . }}.{{ template "prometheus-operator.namespace" . }}.svc - - --namespace={{ template "prometheus-operator.namespace" . }} - - --secret-name={{ template "prometheus-operator.fullname" . }}-admission + - --host={{ template "kube-prometheus.operator.fullname" . }},{{ template "kube-prometheus.operator.fullname" . }}.{{ template "kube-prometheus.namespace" . }}.svc + - --namespace={{ template "kube-prometheus.namespace" . }} + - --secret-name={{ template "kube-prometheus.fullname" . }}-admission resources: {{ toYaml .Values.prometheusOperator.admissionWebhooks.patch.resources | indent 12 }} restartPolicy: OnFailure - serviceAccountName: {{ template "prometheus-operator.fullname" . }}-admission + serviceAccountName: {{ template "kube-prometheus.fullname" . }}-admission {{- with .Values.prometheusOperator.admissionWebhooks.patch.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml index ca1788a9e75e..307d2ea2c564 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml @@ -2,14 +2,14 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission-patch - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-admission-patch + namespace: {{ template "kube-prometheus.namespace" . }} annotations: "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "prometheus-operator.name" $ }}-admission-patch -{{- include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-admission-patch +{{- include "kube-prometheus.labels" $ | indent 4 }} spec: {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }} # Alpha feature since k8s 1.12 @@ -17,14 +17,14 @@ spec: {{- end }} template: metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission-patch + name: {{ template "kube-prometheus.fullname" . }}-admission-patch {{- with .Values.prometheusOperator.admissionWebhooks.patch.podAnnotations }} annotations: {{ toYaml . | indent 8 }} {{- end }} labels: - app: {{ template "prometheus-operator.name" $ }}-admission-patch -{{- include "prometheus-operator.labels" $ | indent 8 }} + app: {{ template "kube-prometheus.name" $ }}-admission-patch +{{- include "kube-prometheus.labels" $ | indent 8 }} spec: {{- if .Values.prometheusOperator.admissionWebhooks.patch.priorityClassName }} priorityClassName: {{ .Values.prometheusOperator.admissionWebhooks.patch.priorityClassName }} @@ -39,14 +39,14 @@ spec: imagePullPolicy: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.pullPolicy }} args: - patch - - --webhook-name={{ template "prometheus-operator.fullname" . }}-admission - - --namespace={{ template "prometheus-operator.namespace" . }} - - --secret-name={{ template "prometheus-operator.fullname" . }}-admission + - --webhook-name={{ template "kube-prometheus.fullname" . }}-admission + - --namespace={{ template "kube-prometheus.namespace" . }} + - --secret-name={{ template "kube-prometheus.fullname" . }}-admission - --patch-failure-policy={{ .Values.prometheusOperator.admissionWebhooks.failurePolicy }} resources: {{ toYaml .Values.prometheusOperator.admissionWebhooks.patch.resources | indent 12 }} restartPolicy: OnFailure - serviceAccountName: {{ template "prometheus-operator.fullname" . }}-admission + serviceAccountName: {{ template "kube-prometheus.fullname" . }}-admission {{- with .Values.prometheusOperator.admissionWebhooks.patch.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml index 42ad8828e9bf..af2ac57f78b9 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml @@ -2,17 +2,17 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "prometheus-operator.name" . }}-admission + app: {{ template "kube-prometheus.name" . }}-admission {{- if .Values.global.rbac.pspAnnotations }} annotations: {{ toYaml .Values.global.rbac.pspAnnotations | indent 4 }} {{- end }} -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml index 5ead639f574f..9e90a7e8d4d8 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml @@ -2,14 +2,14 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-admission + namespace: {{ template "kube-prometheus.namespace" . }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-admission +{{- include "kube-prometheus.labels" $ | indent 4 }} rules: - apiGroups: - "" diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml index aa6a4fc017b8..746b703113b3 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml @@ -2,20 +2,20 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-admission + namespace: {{ template "kube-prometheus.namespace" . }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-admission +{{- include "kube-prometheus.labels" $ | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ template "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus.fullname" . }}-admission subjects: - kind: ServiceAccount - name: {{ template "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-admission + namespace: {{ template "kube-prometheus.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml index b3052e0daa35..c54bd917b2be 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml @@ -2,14 +2,14 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-admission + namespace: {{ template "kube-prometheus.namespace" . }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-admission +{{- include "kube-prometheus.labels" $ | indent 4 }} imagePullSecrets: {{ toYaml .Values.global.imagePullSecrets | indent 2 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml index 30319453f49c..8f5317813034 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml @@ -2,10 +2,10 @@ apiVersion: admissionregistration.k8s.io/v1beta1 kind: MutatingWebhookConfiguration metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus.fullname" . }}-admission labels: - app: {{ template "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-admission +{{- include "kube-prometheus.labels" $ | indent 4 }} webhooks: - name: prometheusrulemutate.monitoring.coreos.com {{- if .Values.prometheusOperator.admissionWebhooks.patch.enabled }} @@ -25,7 +25,7 @@ webhooks: - UPDATE clientConfig: service: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ template "prometheus-operator.operator.fullname" $ }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus.operator.fullname" $ }} path: /admission-prometheusrules/mutate {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml index 3d26f46798d8..78a2cb8e1bc4 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml @@ -2,10 +2,10 @@ apiVersion: admissionregistration.k8s.io/v1beta1 kind: ValidatingWebhookConfiguration metadata: - name: {{ template "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus.fullname" . }}-admission labels: - app: {{ template "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus.name" $ }}-admission +{{- include "kube-prometheus.labels" $ | indent 4 }} webhooks: - name: prometheusrulemutate.monitoring.coreos.com {{- if .Values.prometheusOperator.admissionWebhooks.patch.enabled }} @@ -25,7 +25,7 @@ webhooks: - UPDATE clientConfig: service: - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ template "prometheus-operator.operator.fullname" $ }} + namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus.operator.fullname" $ }} path: /admission-prometheusrules/validate {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/cleanup-crds.yaml b/charts/kube-prometheus/templates/prometheus-operator/cleanup-crds.yaml index f104020f30ca..9094ba24e466 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/cleanup-crds.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/cleanup-crds.yaml @@ -2,25 +2,25 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator-cleanup - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-operator-cleanup + namespace: {{ template "kube-prometheus.namespace" . }} annotations: "helm.sh/hook": pre-delete "helm.sh/hook-weight": "3" "helm.sh/hook-delete-policy": hook-succeeded labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 4 }} spec: template: metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator-cleanup + name: {{ template "kube-prometheus.fullname" . }}-operator-cleanup labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 8 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 8 }} spec: {{- if .Values.global.rbac.create }} - serviceAccountName: {{ template "prometheus-operator.operator.serviceAccountName" . }} + serviceAccountName: {{ template "kube-prometheus.operator.serviceAccountName" . }} {{- end }} containers: - name: kubectl diff --git a/charts/kube-prometheus/templates/prometheus-operator/clusterrole.yaml b/charts/kube-prometheus/templates/prometheus-operator/clusterrole.yaml index 64fac28c8358..f180acdfee05 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/clusterrole.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/clusterrole.yaml @@ -2,10 +2,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator + name: {{ template "kube-prometheus.fullname" . }}-operator labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 4 }} rules: {{- if or .Values.prometheusOperator.manageCrds .Values.prometheusOperator.cleanupCustomResource }} - apiGroups: diff --git a/charts/kube-prometheus/templates/prometheus-operator/clusterrolebinding.yaml b/charts/kube-prometheus/templates/prometheus-operator/clusterrolebinding.yaml index f2ac0d9961ea..d755d368df10 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/clusterrolebinding.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/clusterrolebinding.yaml @@ -2,16 +2,16 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator + name: {{ template "kube-prometheus.fullname" . }}-operator labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "prometheus-operator.fullname" . }}-operator + name: {{ template "kube-prometheus.fullname" . }}-operator subjects: - kind: ServiceAccount - name: {{ template "prometheus-operator.operator.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.operator.serviceAccountName" . }} + namespace: {{ template "kube-prometheus.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/deployment.yaml b/charts/kube-prometheus/templates/prometheus-operator/deployment.yaml index 0f81b6c25490..fd720055a3bc 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/deployment.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/deployment.yaml @@ -1,24 +1,24 @@ -{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }} +{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} {{- if .Values.prometheusOperator.enabled }} apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-operator + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 4 }} spec: replicas: 1 selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-operator + app: {{ template "kube-prometheus.name" . }}-operator release: {{ $.Release.Name | quote }} template: metadata: labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 8 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 8 }} {{- if .Values.prometheusOperator.podLabels }} {{ toYaml .Values.prometheusOperator.podLabels | indent 8 }} {{- end }} @@ -31,7 +31,7 @@ spec: priorityClassName: {{ .Values.prometheusOperator.priorityClassName }} {{- end }} containers: - - name: {{ template "prometheus-operator.name" . }} + - name: {{ template "kube-prometheus.name" . }} {{- if .Values.prometheusOperator.image.sha }} image: "{{ .Values.prometheusOperator.image.repository }}:{{ .Values.prometheusOperator.image.tag }}@sha256:{{ .Values.prometheusOperator.image.sha }}" {{- else }} @@ -43,7 +43,7 @@ spec: - --manage-crds={{ .Values.prometheusOperator.manageCrds }} {{- end }} {{- if .Values.prometheusOperator.kubeletService.enabled }} - - --kubelet-service={{ .Values.prometheusOperator.kubeletService.namespace }}/{{ template "prometheus-operator.fullname" . }}-kubelet + - --kubelet-service={{ .Values.prometheusOperator.kubeletService.namespace }}/{{ template "kube-prometheus.fullname" . }}-kubelet {{- end }} {{- if .Values.prometheusOperator.logFormat }} - --log-format={{ .Values.prometheusOperator.logFormat }} @@ -116,13 +116,13 @@ spec: - name: tls-proxy-secret secret: defaultMode: 420 - secretName: {{ template "prometheus-operator.fullname" . }}-admission + secretName: {{ template "kube-prometheus.fullname" . }}-admission {{- end }} {{- if .Values.prometheusOperator.securityContext }} securityContext: {{ toYaml .Values.prometheusOperator.securityContext | indent 8 }} {{- end }} - serviceAccountName: {{ template "prometheus-operator.operator.serviceAccountName" . }} + serviceAccountName: {{ template "kube-prometheus.operator.serviceAccountName" . }} {{- if .Values.prometheusOperator.hostNetwork }} hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrole.yaml b/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrole.yaml index a5c5ce7e6f52..44fa8b815b2f 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrole.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrole.yaml @@ -2,10 +2,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator-psp + name: {{ template "kube-prometheus.fullname" . }}-operator-psp labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 4 }} rules: {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if semverCompare "> 1.15.0-0" $kubeTargetVersion }} @@ -16,5 +16,5 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "prometheus-operator.fullname" . }}-operator + - {{ template "kube-prometheus.fullname" . }}-operator {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrolebinding.yaml b/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrolebinding.yaml index 07404127533a..111d7984dfda 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrolebinding.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrolebinding.yaml @@ -2,16 +2,16 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator-psp + name: {{ template "kube-prometheus.fullname" . }}-operator-psp labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "prometheus-operator.fullname" . }}-operator-psp + name: {{ template "kube-prometheus.fullname" . }}-operator-psp subjects: - kind: ServiceAccount - name: {{ template "prometheus-operator.operator.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.operator.serviceAccountName" . }} + namespace: {{ template "kube-prometheus.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/psp.yaml b/charts/kube-prometheus/templates/prometheus-operator/psp.yaml index 307bc312d9b8..95a0e5fb9766 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/psp.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/psp.yaml @@ -2,14 +2,14 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator + name: {{ template "kube-prometheus.fullname" . }}-operator labels: - app: {{ template "prometheus-operator.name" . }}-operator + app: {{ template "kube-prometheus.name" . }}-operator {{- if .Values.global.rbac.pspAnnotations }} annotations: {{ toYaml .Values.global.rbac.pspAnnotations | indent 4 }} {{- end }} -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/kube-prometheus/templates/prometheus-operator/service.yaml b/charts/kube-prometheus/templates/prometheus-operator/service.yaml index b5d75b0fc7ba..d06bebb07fcc 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/service.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-operator + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.prometheusOperator.service.labels }} {{ toYaml .Values.prometheusOperator.service.labels | indent 4 }} {{- end }} @@ -47,7 +47,7 @@ spec: targetPort: https {{- end }} selector: - app: {{ template "prometheus-operator.name" . }}-operator + app: {{ template "kube-prometheus.name" . }}-operator release: {{ $.Release.Name | quote }} type: "{{ .Values.prometheusOperator.service.type }}" {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/serviceaccount.yaml b/charts/kube-prometheus/templates/prometheus-operator/serviceaccount.yaml index 637ed3fe091d..f669bb12a2d2 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/serviceaccount.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/serviceaccount.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "prometheus-operator.operator.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.operator.serviceAccountName" . }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 4 }} imagePullSecrets: {{ toYaml .Values.global.imagePullSecrets | indent 2 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml b/charts/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml index dfda03ab7c46..b59a2d07ecfa 100644 --- a/charts/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-operator + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-operator +{{ include "kube-prometheus.labels" . | indent 4 }} spec: endpoints: - port: http @@ -24,9 +24,9 @@ spec: {{- end }} selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-operator + app: {{ template "kube-prometheus.name" . }}-operator release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: - - {{ printf "%s" (include "prometheus-operator.namespace" .) | quote }} + - {{ printf "%s" (include "kube-prometheus.namespace" .) | quote }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/additionalAlertRelabelConfigs.yaml b/charts/kube-prometheus/templates/prometheus/additionalAlertRelabelConfigs.yaml index 33227dc56721..8760d086e39f 100644 --- a/charts/kube-prometheus/templates/prometheus/additionalAlertRelabelConfigs.yaml +++ b/charts/kube-prometheus/templates/prometheus/additionalAlertRelabelConfigs.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus-am-relabel-confg - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-prometheus-am-relabel-confg + namespace: {{ template "kube-prometheus.namespace" . }} {{- if .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations }} annotations: {{ toYaml .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations | indent 4 }} {{- end }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus-am-relabel-confg -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus-am-relabel-confg +{{ include "kube-prometheus.labels" . | indent 4 }} data: additional-alert-relabel-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalAlertRelabelConfigs | b64enc | quote }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/additionalAlertmanagerConfigs.yaml b/charts/kube-prometheus/templates/prometheus/additionalAlertmanagerConfigs.yaml index 61ba8c00763b..8ae8488a77c7 100644 --- a/charts/kube-prometheus/templates/prometheus/additionalAlertmanagerConfigs.yaml +++ b/charts/kube-prometheus/templates/prometheus/additionalAlertmanagerConfigs.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus-am-confg - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-prometheus-am-confg + namespace: {{ template "kube-prometheus.namespace" . }} {{- if .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations }} annotations: {{ toYaml .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations | indent 4 }} {{- end }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus-am-confg -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus-am-confg +{{ include "kube-prometheus.labels" . | indent 4 }} data: additional-alertmanager-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs | b64enc | quote }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml b/charts/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml index 4fa471e7480c..df1fce5e2599 100644 --- a/charts/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml +++ b/charts/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml @@ -7,11 +7,11 @@ items: - apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ template "prometheus-operator.name" $ }}-{{ $prometheusRuleName }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ template "kube-prometheus.name" $ }}-{{ $prometheusRuleName }} + namespace: {{ template "kube-prometheus.namespace" $ }} labels: - app: {{ template "prometheus-operator.name" $ }} -{{ include "prometheus-operator.labels" $ | indent 8 }} + app: {{ template "kube-prometheus.name" $ }} +{{ include "kube-prometheus.labels" $ | indent 8 }} {{- if $prometheusRule.additionalLabels }} {{ toYaml $prometheusRule.additionalLabels | indent 8 }} {{- end }} @@ -24,11 +24,11 @@ items: - apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ template "prometheus-operator.name" $ }}-{{ .name }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ template "kube-prometheus.name" $ }}-{{ .name }} + namespace: {{ template "kube-prometheus.namespace" $ }} labels: - app: {{ template "prometheus-operator.name" $ }} -{{ include "prometheus-operator.labels" $ | indent 8 }} + app: {{ template "kube-prometheus.name" $ }} +{{ include "kube-prometheus.labels" $ | indent 8 }} {{- if .additionalLabels }} {{ toYaml .additionalLabels | indent 8 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/additionalScrapeConfigs.yaml b/charts/kube-prometheus/templates/prometheus/additionalScrapeConfigs.yaml index 1158b3467c64..b918475d747a 100644 --- a/charts/kube-prometheus/templates/prometheus/additionalScrapeConfigs.yaml +++ b/charts/kube-prometheus/templates/prometheus/additionalScrapeConfigs.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus-scrape-confg - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-prometheus-scrape-confg + namespace: {{ template "kube-prometheus.namespace" . }} {{- if .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations }} annotations: {{ toYaml .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations | indent 4 }} {{- end }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus-scrape-confg -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus-scrape-confg +{{ include "kube-prometheus.labels" . | indent 4 }} data: additional-scrape-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalScrapeConfigs | b64enc | quote }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/clusterrole.yaml b/charts/kube-prometheus/templates/prometheus/clusterrole.yaml index 4dc3dc183afe..8dd98c628f09 100644 --- a/charts/kube-prometheus/templates/prometheus/clusterrole.yaml +++ b/charts/kube-prometheus/templates/prometheus/clusterrole.yaml @@ -2,10 +2,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus + name: {{ template "kube-prometheus.fullname" . }}-prometheus labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus +{{ include "kube-prometheus.labels" . | indent 4 }} rules: - apiGroups: - "" @@ -15,7 +15,7 @@ rules: - get - list - watch -# This permission are not in the prometheus-operator repo +# This permission are not in the kube-prometheus repo # they're grabbed from https://github.com/prometheus/prometheus/blob/master/documentation/examples/rbac-setup.yml - apiGroups: [""] resources: diff --git a/charts/kube-prometheus/templates/prometheus/clusterrolebinding.yaml b/charts/kube-prometheus/templates/prometheus/clusterrolebinding.yaml index c31952330845..f486a5254e71 100644 --- a/charts/kube-prometheus/templates/prometheus/clusterrolebinding.yaml +++ b/charts/kube-prometheus/templates/prometheus/clusterrolebinding.yaml @@ -2,17 +2,17 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus + name: {{ template "kube-prometheus.fullname" . }}-prometheus labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus +{{ include "kube-prometheus.labels" . | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "prometheus-operator.fullname" . }}-prometheus + name: {{ template "kube-prometheus.fullname" . }}-prometheus subjects: - kind: ServiceAccount - name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.prometheus.serviceAccountName" . }} + namespace: {{ template "kube-prometheus.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/ingress.yaml b/charts/kube-prometheus/templates/prometheus/ingress.yaml index 2a9c4e6080f4..ba70bbfbe9a3 100644 --- a/charts/kube-prometheus/templates/prometheus/ingress.yaml +++ b/charts/kube-prometheus/templates/prometheus/ingress.yaml @@ -1,5 +1,5 @@ {{- if and .Values.prometheus.enabled .Values.prometheus.ingress.enabled }} -{{- $serviceName := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }} +{{- $serviceName := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }} {{- $servicePort := .Values.prometheus.service.port -}} {{- $routePrefix := list .Values.prometheus.prometheusSpec.routePrefix }} {{- $paths := .Values.prometheus.ingress.paths | default $routePrefix -}} @@ -15,10 +15,10 @@ metadata: {{ toYaml .Values.prometheus.ingress.annotations | indent 4 }} {{- end }} name: {{ $serviceName }} - namespace: {{ template "prometheus-operator.namespace" . }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.prometheus.ingress.labels }} {{ toYaml .Values.prometheus.ingress.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/ingressThanosSidecar.yaml b/charts/kube-prometheus/templates/prometheus/ingressThanosSidecar.yaml index 6bf8ef8c0efe..a66742d14dbd 100644 --- a/charts/kube-prometheus/templates/prometheus/ingressThanosSidecar.yaml +++ b/charts/kube-prometheus/templates/prometheus/ingressThanosSidecar.yaml @@ -1,5 +1,5 @@ {{- if and .Values.prometheus.enabled .Values.prometheus.thanosIngress.enabled }} -{{- $serviceName := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }} +{{- $serviceName := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }} {{- $thanosPort := .Values.prometheus.thanosIngress.servicePort -}} {{- $routePrefix := list .Values.prometheus.prometheusSpec.routePrefix }} {{- $paths := .Values.prometheus.thanosIngress.paths | default $routePrefix -}} @@ -10,10 +10,10 @@ metadata: annotations: {{ toYaml .Values.prometheus.thanosIngress.annotations | indent 4 }} {{- end }} - name: {{ template "prometheus-operator.fullname" . }}-thanos-gateway + name: {{ template "kube-prometheus.fullname" . }}-thanos-gateway labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.prometheus.thanosIngress.labels }} {{ toYaml .Values.prometheus.thanosIngress.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/ingressperreplica.yaml b/charts/kube-prometheus/templates/prometheus/ingressperreplica.yaml index 1eb49a6c60ab..09b33449fbaf 100644 --- a/charts/kube-prometheus/templates/prometheus/ingressperreplica.yaml +++ b/charts/kube-prometheus/templates/prometheus/ingressperreplica.yaml @@ -5,8 +5,8 @@ apiVersion: v1 kind: List metadata: - name: {{ include "prometheus-operator.fullname" $ }}-prometheus-ingressperreplica - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ include "kube-prometheus.fullname" $ }}-prometheus-ingressperreplica + namespace: {{ template "kube-prometheus.namespace" $ }} items: {{ range $i, $e := until $count }} - kind: Ingress @@ -16,11 +16,11 @@ items: apiVersion: extensions/v1beta1 {{ end -}} metadata: - name: {{ include "prometheus-operator.fullname" $ }}-prometheus-{{ $i }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ include "kube-prometheus.fullname" $ }}-prometheus-{{ $i }} + namespace: {{ template "kube-prometheus.namespace" $ }} labels: - app: {{ include "prometheus-operator.name" $ }}-prometheus -{{ include "prometheus-operator.labels" $ | indent 8 }} + app: {{ include "kube-prometheus.name" $ }}-prometheus +{{ include "kube-prometheus.labels" $ | indent 8 }} {{- if $ingressValues.labels }} {{ toYaml $ingressValues.labels | indent 8 }} {{- end }} @@ -36,7 +36,7 @@ items: {{- range $p := $ingressValues.paths }} - path: {{ tpl $p $ }} backend: - serviceName: {{ include "prometheus-operator.fullname" $ }}-prometheus-{{ $i }} + serviceName: {{ include "kube-prometheus.fullname" $ }}-prometheus-{{ $i }} servicePort: {{ $servicePort }} {{- end -}} {{- if or $ingressValues.tlsSecretName $ingressValues.tlsSecretPerReplica.enabled }} diff --git a/charts/kube-prometheus/templates/prometheus/podDisruptionBudget.yaml b/charts/kube-prometheus/templates/prometheus/podDisruptionBudget.yaml index 2853ac73b42e..b80e09b35cf4 100644 --- a/charts/kube-prometheus/templates/prometheus/podDisruptionBudget.yaml +++ b/charts/kube-prometheus/templates/prometheus/podDisruptionBudget.yaml @@ -2,11 +2,11 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus +{{ include "kube-prometheus.labels" . | indent 4 }} spec: {{- if .Values.prometheus.podDisruptionBudget.minAvailable }} minAvailable: {{ .Values.prometheus.podDisruptionBudget.minAvailable }} @@ -17,5 +17,5 @@ spec: selector: matchLabels: app: prometheus - prometheus: {{ template "prometheus-operator.fullname" . }}-prometheus + prometheus: {{ template "kube-prometheus.fullname" . }}-prometheus {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/podmonitors.yaml b/charts/kube-prometheus/templates/prometheus/podmonitors.yaml index 7cbf76985f9a..94c87320366a 100644 --- a/charts/kube-prometheus/templates/prometheus/podmonitors.yaml +++ b/charts/kube-prometheus/templates/prometheus/podmonitors.yaml @@ -7,10 +7,10 @@ items: kind: PodMonitor metadata: name: {{ .name }} - namespace: {{ template "prometheus-operator.namespace" $ }} + namespace: {{ template "kube-prometheus.namespace" $ }} labels: - app: {{ template "prometheus-operator.name" $ }}-prometheus -{{ include "prometheus-operator.labels" $ | indent 8 }} + app: {{ template "kube-prometheus.name" $ }}-prometheus +{{ include "kube-prometheus.labels" $ | indent 8 }} {{- if .additionalLabels }} {{ toYaml .additionalLabels | indent 8 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/prometheus.yaml b/charts/kube-prometheus/templates/prometheus/prometheus.yaml index 210fd50fe901..c0de08d51222 100644 --- a/charts/kube-prometheus/templates/prometheus/prometheus.yaml +++ b/charts/kube-prometheus/templates/prometheus/prometheus.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: Prometheus metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.prometheus.annotations }} annotations: {{ toYaml .Values.prometheus.annotations | indent 4 }} @@ -17,8 +17,8 @@ spec: {{- if .Values.prometheus.prometheusSpec.alertingEndpoints }} {{ toYaml .Values.prometheus.prometheusSpec.alertingEndpoints | indent 6 }} {{- else if .Values.alertmanager.enabled }} - - namespace: {{ template "prometheus-operator.namespace" . }} - name: {{ template "prometheus-operator.fullname" . }}-alertmanager + - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-alertmanager port: {{ .Values.alertmanager.alertmanagerSpec.portName }} {{- if .Values.alertmanager.alertmanagerSpec.routePrefix }} pathPrefix: "{{ .Values.alertmanager.alertmanagerSpec.routePrefix }}" @@ -57,7 +57,7 @@ spec: {{- else if and .Values.prometheus.ingress.enabled .Values.prometheus.ingress.hosts }} externalUrl: "http://{{ tpl (index .Values.prometheus.ingress.hosts 0) . }}{{ .Values.prometheus.prometheusSpec.routePrefix }}" {{- else }} - externalUrl: http://{{ template "prometheus-operator.fullname" . }}-prometheus.{{ template "prometheus-operator.namespace" . }}:{{ .Values.prometheus.service.port }} + externalUrl: http://{{ template "kube-prometheus.fullname" . }}-prometheus.{{ template "kube-prometheus.namespace" . }}:{{ .Values.prometheus.service.port }} {{- end }} {{- if .Values.prometheus.prometheusSpec.nodeSelector }} nodeSelector: @@ -97,7 +97,7 @@ spec: configMaps: {{ toYaml .Values.prometheus.prometheusSpec.configMaps | indent 4 }} {{- end }} - serviceAccountName: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} + serviceAccountName: {{ template "kube-prometheus.prometheus.serviceAccountName" . }} {{- if .Values.prometheus.prometheusSpec.serviceMonitorSelector }} serviceMonitorSelector: {{ toYaml .Values.prometheus.prometheusSpec.serviceMonitorSelector | indent 4 }} @@ -154,7 +154,7 @@ spec: {{- else if .Values.prometheus.prometheusSpec.ruleSelectorNilUsesHelmValues }} ruleSelector: matchLabels: - app: {{ template "prometheus-operator.name" . }} + app: {{ template "kube-prometheus.name" . }} release: {{ $.Release.Name | quote }} {{ else }} ruleSelector: {} @@ -183,7 +183,7 @@ spec: labelSelector: matchLabels: app: prometheus - prometheus: {{ template "prometheus-operator.fullname" . }}-prometheus + prometheus: {{ template "kube-prometheus.fullname" . }}-prometheus {{- else if eq .Values.prometheus.prometheusSpec.podAntiAffinity "soft" }} podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -193,7 +193,7 @@ spec: labelSelector: matchLabels: app: prometheus - prometheus: {{ template "prometheus-operator.fullname" . }}-prometheus + prometheus: {{ template "kube-prometheus.fullname" . }}-prometheus {{- end }} {{- end }} {{- if .Values.prometheus.prometheusSpec.tolerations }} @@ -206,7 +206,7 @@ spec: {{- end }} {{- if .Values.prometheus.prometheusSpec.additionalScrapeConfigs }} additionalScrapeConfigs: - name: {{ template "prometheus-operator.fullname" . }}-prometheus-scrape-confg + name: {{ template "kube-prometheus.fullname" . }}-prometheus-scrape-confg key: additional-scrape-configs.yaml {{- end }} {{- if .Values.prometheus.prometheusSpec.additionalScrapeConfigsSecret.enabled }} @@ -216,12 +216,12 @@ spec: {{- end }} {{- if .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs }} additionalAlertManagerConfigs: - name: {{ template "prometheus-operator.fullname" . }}-prometheus-am-confg + name: {{ template "kube-prometheus.fullname" . }}-prometheus-am-confg key: additional-alertmanager-configs.yaml {{- end }} {{- if .Values.prometheus.prometheusSpec.additionalAlertRelabelConfigs }} additionalAlertRelabelConfigs: - name: {{ template "prometheus-operator.fullname" . }}-prometheus-am-relabel-confg + name: {{ template "kube-prometheus.fullname" . }}-prometheus-am-relabel-confg key: additional-alert-relabel-configs.yaml {{- end }} {{- if .Values.prometheus.prometheusSpec.containers }} diff --git a/charts/kube-prometheus/templates/prometheus/psp-clusterrole.yaml b/charts/kube-prometheus/templates/prometheus/psp-clusterrole.yaml index d5523d662cfd..675faacedd15 100644 --- a/charts/kube-prometheus/templates/prometheus/psp-clusterrole.yaml +++ b/charts/kube-prometheus/templates/prometheus/psp-clusterrole.yaml @@ -2,10 +2,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus-psp + name: {{ template "kube-prometheus.fullname" . }}-prometheus-psp labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus +{{ include "kube-prometheus.labels" . | indent 4 }} rules: {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if semverCompare "> 1.15.0-0" $kubeTargetVersion }} @@ -16,5 +16,5 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "prometheus-operator.fullname" . }}-prometheus + - {{ template "kube-prometheus.fullname" . }}-prometheus {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/psp-clusterrolebinding.yaml b/charts/kube-prometheus/templates/prometheus/psp-clusterrolebinding.yaml index cf26f49d1121..5382feb4a7f3 100644 --- a/charts/kube-prometheus/templates/prometheus/psp-clusterrolebinding.yaml +++ b/charts/kube-prometheus/templates/prometheus/psp-clusterrolebinding.yaml @@ -2,17 +2,17 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus-psp + name: {{ template "kube-prometheus.fullname" . }}-prometheus-psp labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus +{{ include "kube-prometheus.labels" . | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "prometheus-operator.fullname" . }}-prometheus-psp + name: {{ template "kube-prometheus.fullname" . }}-prometheus-psp subjects: - kind: ServiceAccount - name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.prometheus.serviceAccountName" . }} + namespace: {{ template "kube-prometheus.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/psp.yaml b/charts/kube-prometheus/templates/prometheus/psp.yaml index 4ba198155db7..6ad90236324e 100644 --- a/charts/kube-prometheus/templates/prometheus/psp.yaml +++ b/charts/kube-prometheus/templates/prometheus/psp.yaml @@ -2,14 +2,14 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus + name: {{ template "kube-prometheus.fullname" . }}-prometheus labels: - app: {{ template "prometheus-operator.name" . }}-prometheus + app: {{ template "kube-prometheus.name" . }}-prometheus {{- if .Values.global.rbac.pspAnnotations }} annotations: {{ toYaml .Values.global.rbac.pspAnnotations | indent 4 }} {{- end }} -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml index dc84fdf23750..44cf8c18bc33 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml @@ -1,20 +1,20 @@ {{- /* Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.alertmanager }} -{{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }} -{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }} +{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager" }} +{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/etcd.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/etcd.yaml index 97a9825d8ddb..48db02f2b051 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/etcd.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/etcd.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'etcd' group from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/etcd3_alert.rules.yml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeEtcd.enabled .Values.defaultRules.rules.etcd }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml index 4ccd9441cf38..4b6de43b0fa8 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'general.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.general }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml index 8131f05e9ec0..4487a2f303c0 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'k8s.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.k8s }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml index 76bcd1ab7af9..74b1fc2c2735 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-apiserver-availability.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserverAvailability }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-apiserver-availability.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-apiserver-availability.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml index 5549bfb19158..e491b7dcd1a9 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-apiserver-slos' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserverSlos }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-apiserver-slos" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-apiserver-slos" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml index 804c68c638f0..ce0643536b06 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserver }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml index 85c541841caf..1288e8c9c37c 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-prometheus-general.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusGeneral }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-prometheus-general.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus-general.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml index f8bafd91e5f2..0836d6c9e28e 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeRecording }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml index ec718ceffa5c..ebff45e454c1 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml index b67b1bc10b9a..e6ed7cf8d42f 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-state-metrics' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeStateMetrics.enabled .Values.defaultRules.rules.kubeStateMetrics }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-state-metrics" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-state-metrics" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml index d8ae0b3d22e6..259bd3bb31d9 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubelet.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubelet.enabled .Values.defaultRules.rules.kubelet }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubelet.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubelet.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml index e13c9c463afe..0fee185278b0 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml @@ -1,7 +1,7 @@ {{- /* Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeStateMetrics.enabled .Values.defaultRules.rules.kubernetesApps }} @@ -9,11 +9,11 @@ https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml index b9e473730e5d..d00f3b34efbd 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesResources }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml index f2573966a134..87fe7c79652f 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml @@ -1,7 +1,7 @@ {{- /* Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesStorage }} @@ -9,11 +9,11 @@ https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml index 39200b774cb6..c5a77b626d35 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system-apiserver' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system-apiserver" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system-apiserver" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml index 6214d7751043..218848213492 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system-controller-manager' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeControllerManager.enabled }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system-controller-manager" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system-controller-manager" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml index ab10d6270524..55299502b3cc 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system-kubelet' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system-kubelet" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system-kubelet" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml index 84e3b1abd85f..1f8396857c0d 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system-scheduler' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system-scheduler" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system-scheduler" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml index 05d9b67d5ea8..665bb46985fd 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml index 7adf85db3679..089f591d5af3 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node-exporter.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node-exporter.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node-exporter.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml index 9e10a5771222..0a99cc647189 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node-exporter' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node-exporter" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node-exporter" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml index b4b206d860c8..4c0c5101b460 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node-network' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.network }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml index 1e754b2001de..29e9e4d05d9b 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml index 939bc749f5a0..8707af933af9 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml @@ -1,20 +1,20 @@ {{- /* Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheusOperator }} -{{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }} -{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }} +{{- $operatorJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "operator" }} +{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus-operator" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml index 71883f7efa26..94276ff8b2e1 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml @@ -1,20 +1,20 @@ {{- /* Generated from 'prometheus' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheus }} -{{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }} -{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }} +{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }} +{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml index 5444023970eb..609d357a2185 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml @@ -1,21 +1,21 @@ {{- /* Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.alertmanager }} -{{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }} -{{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }} -{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }} +{{- $operatorJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "operator" }} +{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager" }} +{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/etcd.yaml b/charts/kube-prometheus/templates/prometheus/rules/etcd.yaml index 6abda2d31bae..c9a45d286495 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/etcd.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/etcd.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'etcd' group from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/etcd3_alert.rules.yml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeEtcd.enabled .Values.defaultRules.rules.etcd }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml index d220cb3898f9..11dee23cc1da 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'general.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.general }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml index 71c75fcc4f62..b02e4a2dc527 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'k8s.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.k8s }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml index 5e565317b973..7dcdc5e794ba 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserver }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml index 09a7c754ae29..1725e0cc3df9 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-prometheus-node-alerting.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeAlerting }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-prometheus-node-alerting.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus-node-alerting.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml index fc0f48305f82..45921798e579 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeRecording }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml index 3861fa639871..ea2b5f7cf09b 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml index 7391f16ba361..9dd2eadab93b 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml @@ -1,22 +1,22 @@ {{- /* Generated from 'kubernetes-absent' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesAbsent }} -{{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }} -{{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }} -{{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }} -{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }} +{{- $operatorJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "operator" }} +{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }} +{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager" }} +{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-absent" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-absent" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml index fa82f0811f06..cd2e20063839 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml @@ -1,7 +1,7 @@ {{- /* Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeStateMetrics.enabled .Values.defaultRules.rules.kubernetesApps }} @@ -9,11 +9,11 @@ https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml index ee51ebd0721c..fb895c8b9194 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesResources }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml index 715924b863c1..e826ce1744da 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml @@ -1,7 +1,7 @@ {{- /* Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesStorage }} @@ -9,11 +9,11 @@ https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml index 36a119314521..e5665efabefe 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml b/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml index 1de2a621c19a..a7caa9a1f7fb 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node-network' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.network }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml b/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml index b53a6af2c659..90ac135ca78e 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node-time' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.time }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node-time" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node-time" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml index bd2c50fe5ac3..130ef816589d 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml b/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml index 9975be3691ea..64583abc5055 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml @@ -1,20 +1,20 @@ {{- /* Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheusOperator }} -{{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }} -{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }} +{{- $operatorJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "operator" }} +{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus-operator" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml index 9cd2eea08ce3..2a8febea12fb 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml @@ -1,20 +1,20 @@ {{- /* Generated from 'prometheus.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheus }} -{{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }} -{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }} +{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }} +{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/service.yaml b/charts/kube-prometheus/templates/prometheus/service.yaml index e38b4813a712..1e5f9620bd99 100644 --- a/charts/kube-prometheus/templates/prometheus/service.yaml +++ b/charts/kube-prometheus/templates/prometheus/service.yaml @@ -2,12 +2,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus + app: {{ template "kube-prometheus.name" . }}-prometheus self-monitor: {{ .Values.prometheus.serviceMonitor.selfMonitor | quote }} -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.prometheus.service.labels }} {{ toYaml .Values.prometheus.service.labels | indent 4 }} {{- end }} @@ -44,7 +44,7 @@ spec: {{- end }} selector: app: prometheus - prometheus: {{ template "prometheus-operator.fullname" . }}-prometheus + prometheus: {{ template "kube-prometheus.fullname" . }}-prometheus {{- if .Values.prometheus.service.sessionAffinity }} sessionAffinity: {{ .Values.prometheus.service.sessionAffinity }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/serviceaccount.yaml b/charts/kube-prometheus/templates/prometheus/serviceaccount.yaml index 273e79f6e337..3cfe9f939923 100644 --- a/charts/kube-prometheus/templates/prometheus/serviceaccount.yaml +++ b/charts/kube-prometheus/templates/prometheus/serviceaccount.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.prometheus.serviceAccountName" . }} + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus +{{ include "kube-prometheus.labels" . | indent 4 }} {{- if .Values.prometheus.serviceAccount.annotations }} annotations: {{ toYaml .Values.prometheus.serviceAccount.annotations | indent 4 }} diff --git a/charts/kube-prometheus/templates/prometheus/servicemonitor.yaml b/charts/kube-prometheus/templates/prometheus/servicemonitor.yaml index 26addda30a54..65116d948be9 100644 --- a/charts/kube-prometheus/templates/prometheus/servicemonitor.yaml +++ b/charts/kube-prometheus/templates/prometheus/servicemonitor.yaml @@ -2,20 +2,20 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus.name" . }}-prometheus +{{ include "kube-prometheus.labels" . | indent 4 }} spec: selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-prometheus + app: {{ template "kube-prometheus.name" . }}-prometheus release: {{ $.Release.Name | quote }} self-monitor: "true" namespaceSelector: matchNames: - - {{ printf "%s" (include "prometheus-operator.namespace" .) | quote }} + - {{ printf "%s" (include "kube-prometheus.namespace" .) | quote }} endpoints: - port: {{ .Values.prometheus.prometheusSpec.portName }} {{- if .Values.prometheus.serviceMonitor.interval }} diff --git a/charts/kube-prometheus/templates/prometheus/servicemonitors.yaml b/charts/kube-prometheus/templates/prometheus/servicemonitors.yaml index 183da7bdf6b5..ae1e259c26d8 100644 --- a/charts/kube-prometheus/templates/prometheus/servicemonitors.yaml +++ b/charts/kube-prometheus/templates/prometheus/servicemonitors.yaml @@ -7,10 +7,10 @@ items: kind: ServiceMonitor metadata: name: {{ .name }} - namespace: {{ template "prometheus-operator.namespace" $ }} + namespace: {{ template "kube-prometheus.namespace" $ }} labels: - app: {{ template "prometheus-operator.name" $ }}-prometheus -{{ include "prometheus-operator.labels" $ | indent 8 }} + app: {{ template "kube-prometheus.name" $ }}-prometheus +{{ include "kube-prometheus.labels" $ | indent 8 }} {{- if .additionalLabels }} {{ toYaml .additionalLabels | indent 8 }} {{- end }} diff --git a/charts/kube-prometheus/templates/prometheus/serviceperreplica.yaml b/charts/kube-prometheus/templates/prometheus/serviceperreplica.yaml index 802e0e3a3173..704f1d0e0225 100644 --- a/charts/kube-prometheus/templates/prometheus/serviceperreplica.yaml +++ b/charts/kube-prometheus/templates/prometheus/serviceperreplica.yaml @@ -4,18 +4,18 @@ apiVersion: v1 kind: List metadata: - name: {{ include "prometheus-operator.fullname" $ }}-prometheus-serviceperreplica - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ include "kube-prometheus.fullname" $ }}-prometheus-serviceperreplica + namespace: {{ template "kube-prometheus.namespace" . }} items: {{- range $i, $e := until $count }} - apiVersion: v1 kind: Service metadata: - name: {{ include "prometheus-operator.fullname" $ }}-prometheus-{{ $i }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ include "kube-prometheus.fullname" $ }}-prometheus-{{ $i }} + namespace: {{ template "kube-prometheus.namespace" $ }} labels: - app: {{ include "prometheus-operator.name" $ }}-prometheus -{{ include "prometheus-operator.labels" $ | indent 8 }} + app: {{ include "kube-prometheus.name" $ }}-prometheus +{{ include "kube-prometheus.labels" $ | indent 8 }} {{- if $serviceValues.annotations }} annotations: {{ toYaml $serviceValues.annotations | indent 8 }} @@ -39,8 +39,8 @@ items: targetPort: {{ $serviceValues.targetPort }} selector: app: prometheus - prometheus: {{ include "prometheus-operator.fullname" $ }}-prometheus - statefulset.kubernetes.io/pod-name: prometheus-{{ include "prometheus-operator.fullname" $ }}-prometheus-{{ $i }} + prometheus: {{ include "kube-prometheus.fullname" $ }}-prometheus + statefulset.kubernetes.io/pod-name: prometheus-{{ include "kube-prometheus.fullname" $ }}-prometheus-{{ $i }} type: "{{ $serviceValues.type }}" {{- end }} {{- end }} diff --git a/charts/kube-prometheus/values.yaml b/charts/kube-prometheus/values.yaml index bcbccb6f5f61..91128e35290b 100644 --- a/charts/kube-prometheus/values.yaml +++ b/charts/kube-prometheus/values.yaml @@ -1,8 +1,8 @@ -# Default values for prometheus-operator. +# Default values for kube-prometheus. # This is a YAML-formatted file. # Declare variables to be passed into your templates. -## Provide a name in place of prometheus-operator for `app:` labels +## Provide a name in place of kube-prometheus for `app:` labels ## nameOverride: "" From 4d3097138ce2d47ca7d8c100e26234e3f42c8f09 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 8 Aug 2020 21:53:06 -0400 Subject: [PATCH 03/55] Helm GH Action files as-is from https://github.com/helm/charts-repo-actions-demo Signed-off-by: Scott Rigby --- .github/workflows/lint-test.yaml | 30 +++++++++++++++++++++++++ .github/workflows/release.yaml | 38 ++++++++++++++++++++++++++++++++ ct.yaml | 7 ++++++ 3 files changed, 75 insertions(+) create mode 100644 .github/workflows/lint-test.yaml create mode 100644 .github/workflows/release.yaml create mode 100644 ct.yaml diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml new file mode 100644 index 000000000000..1c1f7cc8d090 --- /dev/null +++ b/.github/workflows/lint-test.yaml @@ -0,0 +1,30 @@ +name: Lint and Test Charts + +on: pull_request + +jobs: + lint-test: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Fetch history + run: git fetch --prune --unshallow + + - name: Run chart-testing (lint) + id: lint + uses: helm/chart-testing-action@v1.0.0-rc.2 + with: + command: lint + config: ct.yaml + + - name: Create kind cluster + uses: helm/kind-action@v1.0.0-rc.1 + if: steps.lint.outputs.changed == 'true' + + - name: Run chart-testing (install) + uses: helm/chart-testing-action@v1.0.0-rc.2 + with: + command: install + config: ct.yaml diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 000000000000..a3af01e46ee6 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,38 @@ +name: Release Charts + +on: + push: + branches: + - master + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Fetch history + run: git fetch --prune --unshallow + + - name: Configure Git + run: | + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + + # See https://github.com/helm/chart-releaser-action/issues/6 + - name: Install Helm + run: | + curl -fsSLo get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 + chmod 700 get_helm.sh + ./get_helm.sh + + - name: Add dependency chart repos + run: | + helm repo add stable https://kubernetes-charts.storage.googleapis.com/ + helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/ + + - name: Run chart-releaser + uses: helm/chart-releaser-action@v1.0.0-rc.2 + env: + CR_TOKEN: "${{ secrets.CR_TOKEN }}" diff --git a/ct.yaml b/ct.yaml new file mode 100644 index 000000000000..451beb91cf68 --- /dev/null +++ b/ct.yaml @@ -0,0 +1,7 @@ +# See https://github.com/helm/chart-testing#configuration +remote: origin +chart-dirs: + - charts +chart-repos: + - bitnami=https://charts.bitnami.com +helm-extra-args: --timeout 600s From 2301461b9c9ec1415478bcc5ef25421ac03a2744 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 8 Aug 2020 21:54:16 -0400 Subject: [PATCH 04/55] Bump chart-testing action to v1.0.0. See https://github.com/helm/charts-repo-actions-demo/pull/20 Signed-off-by: Scott Rigby --- .github/workflows/lint-test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 1c1f7cc8d090..9decd3e73b82 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -14,7 +14,7 @@ jobs: - name: Run chart-testing (lint) id: lint - uses: helm/chart-testing-action@v1.0.0-rc.2 + uses: helm/chart-testing-action@v1.0.0 with: command: lint config: ct.yaml @@ -24,7 +24,7 @@ jobs: if: steps.lint.outputs.changed == 'true' - name: Run chart-testing (install) - uses: helm/chart-testing-action@v1.0.0-rc.2 + uses: helm/chart-testing-action@v1.0.0 with: command: install config: ct.yaml From 9ebf148804bb72f152cca4ded2fd42a81bea3466 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 8 Aug 2020 21:55:40 -0400 Subject: [PATCH 05/55] Changes to chart testing config file for this repo Signed-off-by: Scott Rigby --- ct.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ct.yaml b/ct.yaml index 451beb91cf68..5ca34d5dfa5f 100644 --- a/ct.yaml +++ b/ct.yaml @@ -1,7 +1,8 @@ # See https://github.com/helm/chart-testing#configuration remote: origin +target-branch: main chart-dirs: - charts chart-repos: - - bitnami=https://charts.bitnami.com + - stable=https://kubernetes-charts.storage.googleapis.com/ helm-extra-args: --timeout 600s From c584acb60fe55bbc201b0425aa73c14f9945fca3 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 8 Aug 2020 21:56:15 -0400 Subject: [PATCH 06/55] Use built-in GITHUB_TOKEN now that GH Actions bug is fixed. See https://github.com/helm/chart-releaser-action/pull/26 Signed-off-by: Scott Rigby --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a3af01e46ee6..4fb649d95058 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -35,4 +35,4 @@ jobs: - name: Run chart-releaser uses: helm/chart-releaser-action@v1.0.0-rc.2 env: - CR_TOKEN: "${{ secrets.CR_TOKEN }}" + CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From da0b4e0b64adf43728b954182e78f56fe5b29959 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 8 Aug 2020 21:59:56 -0400 Subject: [PATCH 07/55] Test actions with version bump to prometheus chart Signed-off-by: Scott Rigby --- charts/prometheus/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml index b825d5f1f60c..811c22388dd5 100644 --- a/charts/prometheus/Chart.yaml +++ b/charts/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 11.11.1 +version: 11.11.2 appVersion: 2.19.0 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ From fef0c4646bec96f16a9f539dbef51f542022e7ac Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 15 Aug 2020 12:15:01 -0400 Subject: [PATCH 08/55] Bump chart-releaser-action and kind-action to v1.0.0 Signed-off-by: Scott Rigby --- .github/workflows/lint-test.yaml | 2 +- .github/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 9decd3e73b82..c758ac4571da 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -20,7 +20,7 @@ jobs: config: ct.yaml - name: Create kind cluster - uses: helm/kind-action@v1.0.0-rc.1 + uses: helm/kind-action@v1.0.0 if: steps.lint.outputs.changed == 'true' - name: Run chart-testing (install) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4fb649d95058..47bb00087d58 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,6 +33,6 @@ jobs: helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/ - name: Run chart-releaser - uses: helm/chart-releaser-action@v1.0.0-rc.2 + uses: helm/chart-releaser-action@v1.0.0 env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From b5f43fdc0af32f557d8d192b4cdc2a99d549d051 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 15 Aug 2020 12:15:26 -0400 Subject: [PATCH 09/55] Release from main not master branch Signed-off-by: Scott Rigby --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 47bb00087d58..8b099d1d6fe1 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,7 +3,7 @@ name: Release Charts on: push: branches: - - master + - main jobs: release: From e727021b3259c7395e9fed51a279cd6648e87ff9 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 15 Aug 2020 12:22:32 -0400 Subject: [PATCH 10/55] Revert "Test actions with version bump to prometheus chart" This reverts commit 81c50e5a7ab6322d6755ec853de0d9babc36ae67. Signed-off-by: Scott Rigby --- charts/prometheus/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml index 811c22388dd5..b825d5f1f60c 100644 --- a/charts/prometheus/Chart.yaml +++ b/charts/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 11.11.2 +version: 11.11.1 appVersion: 2.19.0 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ From 5ba0e886328d2e3d461b5a2540eb83761c6f295d Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 15 Aug 2020 13:49:00 -0400 Subject: [PATCH 11/55] Allow requirements lock files Signed-off-by: Scott Rigby --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aaee2d0385ee..436d09adc62a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -# Helm chart automated files +# Chart dependencies /charts/*/charts -/charts/*/requirements.lock From 52eae40e4fc5fe20e9d5348641950a5c4e41e0c5 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sun, 16 Aug 2020 16:21:26 -0400 Subject: [PATCH 12/55] Initial CODEOWNERS file (#18) Signed-off-by: Scott Rigby --- .github/CODEOWNERS | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000000..d26cef14cfb0 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,20 @@ +# See https://github.com/scottrigby/prometheus-helm-charts/issues/12 +# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners + +charts/prometheus/ @gianrubio @zanhsieh @Xtigyro +charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f +charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio +charts/prometheus-cloudwatch-exporter/ @gianrubio @torstenwalter @asherf +charts/prometheus-consul-exporter @timm088 +charts/prometheus-couchdb-exporter @gkarthiks +charts/prometheus-mongodb-exporter @steven-sheehy +charts/prometheus-mysql-exporter @juanchimienti @monotek +charts/prometheus-nats-exporter @okgolove @caarlos0 +charts/prometheus-node-exporter @gianrubio @vsliouniaev +charts/prometheus-operator @vsliouniaev @bismarck @gianrubio +charts/prometheus-postgres-exporter @gianrubio +charts/prometheus-pushgateway @gianrubio @cstaud +charts/prometheus-rabbitmq-exporter @juanchimienti +charts/prometheus-redis-exporter @acondrat +charts/prometheus-snmp-exporter @miouge1 +charts/prometheus-to-sd @acondrat From a94381a181b8d78b6650eb1c52a80b0d33ea7ab2 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Thu, 20 Aug 2020 07:29:08 -0400 Subject: [PATCH 13/55] Prep initial charts indexing (#14) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [stable/prometheus] update prometheus to 2.20.1 and cm reloader to 0.4.0 (#23506) * updated prometheus to 2.20.1 and cm reloader to 0.4.0 Signed-off-by: André Bauer * fix xpp version Signed-off-by: André Bauer * Deprecate prometheus-operator chart before helm repo index, so that it won't be listed in the hubs Signed-off-by: Scott Rigby * Update prometheus-community/prometheus chart. Needed to update references to stable repo, but took the opportunity to reorganize, fix and simplify README Signed-off-by: Scott Rigby * Add Helm 3 commands before Helm 2. Add helm update command. Reorganize the 'Upgrading Chart' section Signed-off-by: Scott Rigby * Fix header Signed-off-by: Scott Rigby * Fix markdown linting Signed-off-by: Scott Rigby * Add direct links to values.yaml configuration file for easy browsing by end users without the CLI Signed-off-by: Scott Rigby * Remove prometheus chart OWNERS file Signed-off-by: Scott Rigby * Update prometheus-adapter chart README and bump version Signed-off-by: Scott Rigby * prometheus chart: Return updated, working command example for Sharing Alerts Between Services Signed-off-by: Scott Rigby * prometheus-adapter: fix configure command typos Signed-off-by: Scott Rigby * prometheus-blackbox-exporter: Update readme, delete OWNERS file and bump chart version Signed-off-by: Scott Rigby * prometheus-cloudwatch-exporter: Update Readme with new template, delete OWNERS file, bump chart version, update CHANGELOG Signed-off-by: Scott Rigby * prometheus-consul-exporter: Update Readme per new template and bump chart Signed-off-by: Scott Rigby * prometheus-couchdb-exporter: Update Readme per new template and bump chart version Signed-off-by: Scott Rigby * prometheus-mongodb-exporter: Update Readme per new template, remove OWNERS file, bump chart version Signed-off-by: Scott Rigby * prometheus-couchdb-exporter: Fix k8s 1.16 deprecated PodSecurityPolicy in the extensions/v1beta1 API version Signed-off-by: Scott Rigby * prometheus-couchdb-exporter: Fix bad YAML indentation. How did this ever work? Signed-off-by: Scott Rigby * prometheus-mysql-exporter: update readme per new template, remove OWNERS file, bump chart version Signed-off-by: Scott Rigby * prometheus-nats-exporter: update readme per new template, move specific config note to values.yaml, remove OWNERS file, bump chart version Signed-off-by: Scott Rigby * prometheus-node-exporter: update readme per new template, remove OWNERS file, bump chart version Signed-off-by: Scott Rigby * prometheus-postgres-exporter: update readme per new template, remove OWNERS file, bump chart version Signed-off-by: Scott Rigby * prometheus-pushgateway: update readme per new template, remove OWNERS file, bump chart version Signed-off-by: Scott Rigby * prometheus-rabbitmq-exporter: update readme per new template, bump chart version Signed-off-by: Scott Rigby * prometheus-redis-exporter: update readme per new template, remove OWNERS file, bump chart version Signed-off-by: Scott Rigby * prometheus-snmp-exporter: update readme per new template, remove OWNERS file, bump chart version Signed-off-by: Scott Rigby * prometheus-to-sd: update readme per new template, remove OWNERS file, bump chart version Signed-off-by: Scott Rigby * prometheus-to-sd: fix deprecated deployment apps/v1beta1 Signed-off-by: Scott Rigby * Remove instructions for stable repos from all charts, except prometheus and deprecated prometheus-operator, as only those have dependencies on stable charts Signed-off-by: Scott Rigby * Temporary workaround github API rate limiting Signed-off-by: Scott Rigby * prometheus-to-sd: missing required field "selector" in io.k8s.api.apps.v1.DeploymentSpec Signed-off-by: Scott Rigby * disable chart testing for prometheus-to-sd. If not running on GCE, will error: "Failed to get GCE config" Signed-off-by: Scott Rigby Co-authored-by: André Bauer --- charts/kube-prometheus/Chart.yaml | 13 +- charts/prometheus-adapter/Chart.yaml | 2 +- charts/prometheus-adapter/OWNERS | 8 - charts/prometheus-adapter/README.md | 133 +++--- .../prometheus-blackbox-exporter/Chart.yaml | 2 +- charts/prometheus-blackbox-exporter/OWNERS | 6 - charts/prometheus-blackbox-exporter/README.md | 144 ++---- .../CHANGELOG.md | 6 +- .../prometheus-cloudwatch-exporter/Chart.yaml | 2 +- charts/prometheus-cloudwatch-exporter/OWNERS | 8 - .../prometheus-cloudwatch-exporter/README.md | 131 ++---- charts/prometheus-consul-exporter/Chart.yaml | 2 +- charts/prometheus-consul-exporter/README.md | 97 ++-- charts/prometheus-couchdb-exporter/Chart.yaml | 2 +- charts/prometheus-couchdb-exporter/README.md | 97 ++-- .../templates/deployment.yaml | 4 +- .../templates/podsecuritypolicy.yaml | 2 +- charts/prometheus-mongodb-exporter/Chart.yaml | 2 +- charts/prometheus-mongodb-exporter/OWNERS | 4 - charts/prometheus-mongodb-exporter/README.md | 112 ++--- charts/prometheus-mysql-exporter/Chart.yaml | 2 +- charts/prometheus-mysql-exporter/OWNERS | 6 - charts/prometheus-mysql-exporter/README.md | 108 ++--- charts/prometheus-nats-exporter/Chart.yaml | 2 +- charts/prometheus-nats-exporter/OWNERS | 6 - charts/prometheus-nats-exporter/README.md | 96 ++-- charts/prometheus-nats-exporter/values.yaml | 1 + charts/prometheus-node-exporter/Chart.yaml | 2 +- charts/prometheus-node-exporter/OWNERS | 6 - charts/prometheus-node-exporter/README.md | 103 ++--- .../prometheus-postgres-exporter/Chart.yaml | 2 +- charts/prometheus-postgres-exporter/README.md | 102 ++--- charts/prometheus-pushgateway/Chart.yaml | 2 +- charts/prometheus-pushgateway/OWNERS | 6 - charts/prometheus-pushgateway/README.md | 99 ++--- .../prometheus-rabbitmq-exporter/Chart.yaml | 2 +- charts/prometheus-rabbitmq-exporter/README.md | 116 +++-- charts/prometheus-redis-exporter/Chart.yaml | 2 +- charts/prometheus-redis-exporter/OWNERS | 4 - charts/prometheus-redis-exporter/README.md | 137 +++--- charts/prometheus-snmp-exporter/Chart.yaml | 2 +- charts/prometheus-snmp-exporter/OWNERS | 4 - charts/prometheus-snmp-exporter/README.md | 121 ++--- charts/prometheus-to-sd/Chart.yaml | 2 +- charts/prometheus-to-sd/OWNERS | 4 - charts/prometheus-to-sd/README.md | 84 ++-- .../templates/deployment.yaml | 6 +- charts/prometheus/Chart.yaml | 4 +- charts/prometheus/OWNERS | 8 - charts/prometheus/README.md | 416 ++++-------------- charts/prometheus/values.yaml | 6 +- ct.yaml | 3 + 52 files changed, 821 insertions(+), 1420 deletions(-) delete mode 100644 charts/prometheus-adapter/OWNERS delete mode 100644 charts/prometheus-blackbox-exporter/OWNERS delete mode 100644 charts/prometheus-cloudwatch-exporter/OWNERS delete mode 100644 charts/prometheus-mongodb-exporter/OWNERS delete mode 100644 charts/prometheus-mysql-exporter/OWNERS delete mode 100644 charts/prometheus-nats-exporter/OWNERS delete mode 100644 charts/prometheus-node-exporter/OWNERS delete mode 100644 charts/prometheus-pushgateway/OWNERS delete mode 100644 charts/prometheus-redis-exporter/OWNERS delete mode 100644 charts/prometheus-snmp-exporter/OWNERS delete mode 100644 charts/prometheus-to-sd/OWNERS delete mode 100644 charts/prometheus/OWNERS diff --git a/charts/kube-prometheus/Chart.yaml b/charts/kube-prometheus/Chart.yaml index e6acb4cf4e4f..4e1134d4162b 100644 --- a/charts/kube-prometheus/Chart.yaml +++ b/charts/kube-prometheus/Chart.yaml @@ -1,18 +1,15 @@ apiVersion: v1 -description: Provides easy monitoring definitions for Kubernetes services, and deployment and management of Prometheus instances. +deprecated: true +description: DEPRECATED - This chart will be renamed. See https://github.com/prometheus-community/community/issues/28#issuecomment-670406329 icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png engine: gotpl -maintainers: - - name: vsliouniaev - - name: bismarck - - name: gianrubio - email: gianrubio@gmail.com -name: kube-prometheus +maintainers: [] +name: prometheus-operator sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 9.3.1 +version: 9.3.2 appVersion: 0.38.1 tillerVersion: ">=2.12.0" home: https://github.com/coreos/kube-prometheus diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml index ff45bd5fc49a..da0078ed2847 100644 --- a/charts/prometheus-adapter/Chart.yaml +++ b/charts/prometheus-adapter/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus-adapter -version: 2.5.0 +version: 2.5.1 appVersion: v0.7.0 description: A Helm chart for k8s prometheus adapter home: https://github.com/DirectXMan12/k8s-prometheus-adapter diff --git a/charts/prometheus-adapter/OWNERS b/charts/prometheus-adapter/OWNERS deleted file mode 100644 index 0c15fcf3445d..000000000000 --- a/charts/prometheus-adapter/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -approvers: - - mattiasgees - - steven-sheehy - - hectorj2f -reviewers: - - mattiasgees - - steven-sheehy - - hectorj2f diff --git a/charts/prometheus-adapter/README.md b/charts/prometheus-adapter/README.md index cda90cbf3351..1fe1fad661d4 100644 --- a/charts/prometheus-adapter/README.md +++ b/charts/prometheus-adapter/README.md @@ -6,22 +6,74 @@ Installs the [Prometheus Adapter](https://github.com/DirectXMan12/k8s-prometheus Kubernetes 1.14+ -## Installing the Chart +## Get Repo Info -To install the chart with the release name `my-release`: +```console +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update +``` + +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ + +## Install Chart + +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-adapter + +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-adapter +``` + +_See [configuration](#configuration) below._ + +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ + +## Uninstall Chart ```console -$ helm install --name my-release stable/prometheus-adapter +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -This command deploys the prometheus adapter with the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +This removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ + +## Upgrading Chart + +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install +``` + +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +## Configuration + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: + +```console +# Helm 2 +$ helm inspect values prometheus-community/prometheus-adapter + +# Helm 3 +$ helm show values prometheus-community/prometheus-adapter +``` -## Using the Chart +### Prometheus Service Endpoint To use the chart, ensure the `prometheus.url` and `prometheus.port` are configured with the correct Prometheus service endpoint. If Prometheus is exposed under HTTPS the host's CA Bundle must be exposed to the container using `extraVolumes` and `extraVolumeMounts`. +### Adapter Rules + Additionally, the chart comes with a set of default rules out of the box but they may pull in too many metrics or not map them correctly for your needs. Therefore, it is recommended to populate `rules.custom` with a list of rules (see the [config document](https://github.com/DirectXMan12/k8s-prometheus-adapter/blob/master/docs/config.md) for the proper format). +### Horizontal Pod Autoscaler Metrics + Finally, to configure your Horizontal Pod Autoscaler to use the custom metric, see the custom metrics section of the [HPA walkthrough](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale-walkthrough/#autoscaling-on-multiple-metrics-and-custom-metrics). The Prometheus Adapter can serve three different [metrics APIs](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/#support-for-metrics-apis): @@ -30,7 +82,7 @@ The Prometheus Adapter can serve three different [metrics APIs](https://kubernet Enabling this option will cause custom metrics to be served at `/apis/custom.metrics.k8s.io/v1beta1`. Enabled by default when `rules.default` is true, but can be customized by populating `rules.custom`: -``` +```yaml rules: custom: - seriesQuery: '{__name__=~"^some_metric_count$"}' @@ -46,7 +98,7 @@ rules: Enabling this option will cause external metrics to be served at `/apis/external.metrics.k8s.io/v1beta1`. Can be enabled by populating `rules.external`: -``` +```yaml rules: external: - seriesQuery: '{__name__=~"^some_metric_count$"}' @@ -62,7 +114,7 @@ rules: Enabling this option will cause resource metrics to be served at `/apis/metrics.k8s.io/v1beta1`. Resource metrics will allow pod CPU and Memory metrics to be used in [Horizontal Pod Autoscalers](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) as well as the `kubectl top` command. Can be enabled by populating `rules.resource`: -``` +```yaml rules: resource: cpu: @@ -93,68 +145,3 @@ rules: ``` **NOTE:** Setting a value for `rules.resource` will also deploy the resource metrics API service, providing the same functionality as [metrics-server](https://github.com/helm/charts/tree/master/stable/metrics-server). As such it is not possible to deploy them both in the same cluster. - -## Uninstalling the Chart - -To uninstall/delete the `my-release` deployment: - -```console -$ helm delete my-release -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters of the Prometheus Adapter chart and their default values. - -| Parameter | Description | Default | -| ------------------------------- | ------------------------------------------------------------------------------- | --------------------------------------------| -| `affinity` | Node affinity | `{}` | -| `image.repository` | Image repository | `directxman12/k8s-prometheus-adapter-amd64` | -| `image.tag` | Image tag | `v0.7.0` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `image.pullSecrets` | Image pull secrets | `{}` | -| `logLevel` | Log level | `4` | -| `listenPort` | Port that application would listen on in the container | `6443` | -| `metricsRelistInterval` | Interval at which to re-list the set of all available metrics from Prometheus | `1m` | -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `podLabels` | Labels to add to the pod | `{}` | -| `podAnnotations` | Annotations to add to the pod | `{}` | -| `priorityClassName` | Pod priority | `` | -| `prometheus.url` | Url of where we can find the Prometheus service | `http://prometheus.default.svc` | -| `prometheus.port` | Port of where we can find the Prometheus service, zero to omit this option | `9090` | -| `prometheus.path` | Custom path to append to the prometheus URL | `` | -| `rbac.create` | If true, create & use RBAC resources | `true` | -| `resources` | CPU/Memory resource requests/limits | `{}` | -| `rules.default` | If `true`, enable a set of default rules in the configmap | `true` | -| `rules.custom` | A list of custom configmap rules | `[]` | -| `rules.existing` | The name of an existing configMap with rules. Overrides default, custom and external. | `` | -| `rules.external` | A list of custom rules for external metrics API | `[]` | -| `rules.resource` | `resourceRules` to set in configmap rules | `{}` | -| `service.annotations` | Annotations to add to the service | `{}` | -| `service.port` | Service port to expose | `443` | -| `service.type` | Type of service to create | `ClusterIP` | -| `serviceAccount.create` | If true, create & use Serviceaccount | `true` | -| `serviceAccount.name` | If not set and create is true, a name is generated using the fullname template | `` | -| `tls.enable` | If true, use the provided certificates. If false, generate self-signed certs | `false` | -| `tls.ca` | Public CA file that signed the APIService (ignored if tls.enable=false) | `` | -| `tls.key` | Private key of the APIService (ignored if tls.enable=false) | `` | -| `tls.certificate` | Public key of the APIService (ignored if tls.enable=false) | `` | -| `extraVolumeMounts` | Any extra volumes mounts | `[]` | -| `extraVolumes` | Any extra volumes | `[]` | -| `tolerations` | List of node taints to tolerate | `[]` | - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```console -$ helm install --name my-release \ - --set logLevel=1 \ - stable/prometheus-adapter -``` - -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, - -```console -$ helm install --name my-release -f values.yaml stable/prometheus-adapter -``` diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml index e77c06e682cf..200035423ee1 100644 --- a/charts/prometheus-blackbox-exporter/Chart.yaml +++ b/charts/prometheus-blackbox-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Prometheus Blackbox Exporter name: prometheus-blackbox-exporter -version: 4.3.0 +version: 4.3.1 appVersion: 0.16.0 home: https://github.com/prometheus/blackbox_exporter sources: diff --git a/charts/prometheus-blackbox-exporter/OWNERS b/charts/prometheus-blackbox-exporter/OWNERS deleted file mode 100644 index e6bd0652f83b..000000000000 --- a/charts/prometheus-blackbox-exporter/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -approvers: -- desaintmartin -- gianrubio -reviewers: -- desaintmartin -- gianrubio diff --git a/charts/prometheus-blackbox-exporter/README.md b/charts/prometheus-blackbox-exporter/README.md index a54c019d5deb..9d5ab39791a5 100644 --- a/charts/prometheus-blackbox-exporter/README.md +++ b/charts/prometheus-blackbox-exporter/README.md @@ -4,141 +4,93 @@ Prometheus exporter for blackbox testing Learn more: [https://github.com/prometheus/blackbox_exporter](https://github.com/prometheus/blackbox_exporter) -## TL;DR; - -```bash -$ helm install stable/prometheus-blackbox-exporter -``` - -## Introduction - This chart creates a Blackbox-Exporter deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. ## Prerequisites - Kubernetes 1.8+ with Beta APIs enabled -## Installing the Chart - -To install the chart with the release name `my-release`: +## Get Repo Info -```bash -$ helm install --name my-release stable/prometheus-blackbox-exporter +```console +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update ``` -The command deploys Blackbox Exporter on the Kubernetes cluster using the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -## Uninstalling the Chart +## Install Chart -To uninstall/delete the `my-release` deployment: +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-blackbox-exporter -```bash -$ helm delete --purge my-release +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-blackbox-exporter ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. -## Configuration +_See [configuration](#configuration) below._ -The following table lists the configurable parameters of the Blackbox-Exporter chart and their default values. - -| Parameter | Description | Default | -| ----------------------------------------- | -------------------------------------------------------------------------------- | ---------------------------------------------------------------------------- | -| `kind` | You can choose between `Deployment` or `DaemonSet` | `Deployment` | -| `config` | Prometheus blackbox configuration | {} | -| `secretConfig` | Whether to treat blackbox configuration as secret | `false` | -| `extraArgs` | Optional flags for blackbox | `[]` | -| `image.repository` | container image repository | `prom/blackbox-exporter` | -| `image.tag` | container image tag | `v0.15.1` | -| `image.pullPolicy` | container image pull policy | `IfNotPresent` | -| `image.pullSecrets` | container image pull secrets | `[]` | -| `ingress.annotations` | Ingress annotations | None | -| `ingress.enabled` | Enables Ingress | `false` | -| `ingress.hosts` | Ingress accepted hostnames | None | -| `ingress.path` | Ingress accepted path | `/` | -| `ingress.tls` | Ingress TLS configuration | None | -| `nodeSelector` | node labels for pod assignment | `{}` | -| `runAsUser` | User to run blackbox-exporter container as | `1000` | -| `readOnlyRootFilesystem` | Set blackbox-exporter file-system to read-only | `true` | -| `runAsNonRoot` | Run blackbox-exporter as non-root | `true` | -| `tolerations` | node tolerations for pod assignment | `[]` | -| `affinity` | node affinity for pod assignment | `{}` | -| `podAnnotations` | annotations to add to each pod | `{}` | -| `podDisruptionBudget` | pod disruption budget | `{}` | -| `pspEnabled` | create pod security policy resources | `true` | -| `priorityClassName` | priority class name | None | -| `allowIcmp` | whether to enable ICMP probes, by giving the pods `CAP_NET_RAW` and running as root | `false` | -| `resources` | pod resource requests & limits | `{}` | -| `restartPolicy` | container restart policy | `Always` | -| `livenessProbe` | Container liveness probe | See values.yaml | -| `readinessProbe` | Container readiness probe | See values.yaml | -| `networkPolicy.enabled` | Enable network policy and allow access from anywhere | `false` | -| `networkPolicy.allowMonitoringNamespace` | Limit access only from monitoring namespace | `false` | -| `service.annotations` | annotations for the service | `{}` | -| `service.labels` | additional labels for the service | None | -| `service.type` | type of service to create | `ClusterIP` | -| `service.port` | port for the blackbox http service | `9115` | -| `service.externalIPs` | list of external ips | [] | -| `serviceAccount.create` | Specifies whether a service account should be created. | `true` | -| `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template | | -| `serviceAccount.annotations` | ServiceAccount annotations | | -| `serviceMonitor.enabled` | If true, a ServiceMonitor CRD is created for a prometheus operator | `false` | -| `serviceMonitor.defaults.labels` | Labels for prometheus operator | `{}` | -| `serviceMonitor.defaults.interval` | Interval for prometheus operator endpoint | `30s` | -| `serviceMonitor.defaults.scrapeTimeout` | Scrape timeout for prometheus operator endpoint | `30s` | -| `serviceMonitor.defaults.module` | The module that blackbox will use if serviceMonitor is enabled | `http_2xx` | -| `serviceMonitor.targets.[]` | List of targets to scrape | `[]` | -| `serviceMonitor.targets.[].name` | Human readable name for the job. It will also appear in job labels in Prometheus | `example` | -| `serviceMonitor.targets.[].url` | The URL that blackbox will scrape if serviceMonitor is enabled | `http://example.com/healthz` | -| `serviceMonitor.targets.[].labels` | See above in `serviceMonitor.defaults` | `{{ serviceMonitor.defaults.labels }` | -| `serviceMonitor.targets.[].interval` | See above in `serviceMonitor.defaults` | `{{ serviceMonitor.defaults.interval }}` | -| `serviceMonitor.targets.[].scrapeTimeout` | See above in `serviceMonitor.defaults` | `{{ serviceMonitor.defaults.scrateTimeout }}` | -| `serviceMonitor.targets.[].module` | See above in `serviceMonitor.defaults` | `{{ serviceMonitor.defaults.module }}` | -| `prometheusRule.enabled` | Set this to true to create PrometheusRule for Prometheus operator | `false` | -| `prometheusRule.additionalLabels` | Additional labels that can be passed to PrometheusRule | `{}` | -| `prometheusRule.namespace` | Namespace where PrometheusRule resource should be created | | -| `prometheusRule.rules` | [PrometheusRule](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) to be created | `[]` | -| `strategy` | strategy used to replace old Pods with new ones | `{"rollingUpdate":{"maxSurge":1,"maxUnavailable":0},"type":"RollingUpdate"}` | - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -```bash -$ helm install --name my-release \ - --set key_1=value_1,key_2=value_2 \ - stable/prometheus-blackbox-exporter -``` +## Uninstall Chart -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, +```console +# Helm 3 +$ helm uninstall [RELEASE_NAME] -```bash -# example for staging -$ helm install --name my-release -f values.yaml stable/prometheus-blackbox-exporter +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -> **Tip**: You can use the default [values.yaml](values.yaml) +This removes all the Kubernetes components associated with the chart and deletes the release. -## Upgrading an existing Release to a new major version +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ -### 4.0.0 +## Upgrading Chart + +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install +``` + +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +### To 4.0.0 This version create the service account by default and introduce pod security policy, it can be enabled by setting `pspEnabled: true`. -### 2.0.0 +### To 2.0.0 This version removes the `podDisruptionBudget.enabled` parameter and changes the default value of `podDisruptionBudget` to `{}`, in order to fix Helm 3 compatibility. In order to upgrade, please remove `podDisruptionBudget.enabled` from your custom values.yaml file and set the content of `podDisruptionBudget`, for example: + ```yaml podDisruptionBudget: maxUnavailable: 0 ``` -### 1.0.0 +### To 1.0.0 This version introduce the new recommended labels. In order to upgrade, delete the Deployment before upgrading: + ```bash -$ kubectl delete deployment my-release-prometheus-blackbox-exporter +kubectl delete deployment [RELEASE_NAME]-prometheus-blackbox-exporter ``` Note that this will cause downtime of the blackbox. + +## Configuration + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: + +```console +# Helm 2 +$ helm inspect values prometheus-community/prometheus + +# Helm 3 +$ helm show values prometheus-community/prometheus +``` diff --git a/charts/prometheus-cloudwatch-exporter/CHANGELOG.md b/charts/prometheus-cloudwatch-exporter/CHANGELOG.md index ac22eeb960ae..c5997a24a04b 100644 --- a/charts/prometheus-cloudwatch-exporter/CHANGELOG.md +++ b/charts/prometheus-cloudwatch-exporter/CHANGELOG.md @@ -4,9 +4,12 @@ This file documents all notable changes to prometheus-cloudwatch-exporter Helm Chart. The release numbering uses [semantic versioning](http://semver.org). - NOTE: The change log until version 0.4.10 is auto generated based on git commits. Those include a reference to the git commit to be able to get more details. +## 0.8.4 + +Chart moved from stable to prometheus-community helm repo + ## 0.8.1 Add secrets checksum annotation to deployment (#22449) @@ -127,4 +130,3 @@ commit: 647b56cc4 Add cloudwatch exporter (#4022) commit: 0f730f26e - diff --git a/charts/prometheus-cloudwatch-exporter/Chart.yaml b/charts/prometheus-cloudwatch-exporter/Chart.yaml index 5cd05ab0b9a6..4ff637d2c1d5 100644 --- a/charts/prometheus-cloudwatch-exporter/Chart.yaml +++ b/charts/prometheus-cloudwatch-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.8.0" description: A Helm chart for prometheus cloudwatch-exporter name: prometheus-cloudwatch-exporter -version: 0.8.3 +version: 0.8.4 home: https://github.com/prometheus/cloudwatch_exporter sources: - https://github.com/prometheus/cloudwatch_exporter diff --git a/charts/prometheus-cloudwatch-exporter/OWNERS b/charts/prometheus-cloudwatch-exporter/OWNERS deleted file mode 100644 index b24fbcfa4e72..000000000000 --- a/charts/prometheus-cloudwatch-exporter/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -approvers: -- gianrubio -- torstenwalter -- asherf -reviewers: -- gianrubio -- torstenwalter -- asherf diff --git a/charts/prometheus-cloudwatch-exporter/README.md b/charts/prometheus-cloudwatch-exporter/README.md index 466ca376ebd8..8bf9b2ae5902 100644 --- a/charts/prometheus-cloudwatch-exporter/README.md +++ b/charts/prometheus-cloudwatch-exporter/README.md @@ -1,14 +1,6 @@ -# Cloudwatch exporter +# Prometheus Cloudwatch Exporter -* Installs [cloudwatch exporter](http://github.com/prometheus/cloudwatch_exporter) - -## TL;DR; - -```console -$ helm install stable/prometheus-cloudwatch-exporter -``` - -## Introduction +An exporter for [Amazon CloudWatch](http://aws.amazon.com/cloudwatch/), for Prometheus. This chart bootstraps a [cloudwatch exporter](http://github.com/prometheus/cloudwatch_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. @@ -17,95 +9,68 @@ This chart bootstraps a [cloudwatch exporter](http://github.com/prometheus/cloud - [kube2iam](../../stable/kube2iam) installed to used the **aws.role** config option otherwise configure **aws.aws_access_key_id** and **aws.aws_secret_access_key** or **aws.secret.name** - Or an [IAM Role for service account](https://aws.amazon.com/blogs/opensource/introducing-fine-grained-iam-roles-service-accounts/) attached to a service account with an annotation. If you run the pod as nobody in `securityContext.runAsUser` then also set `securityContext.fsGroup` to the same value so it will be able to access to the mounted secret. -## Installing the Chart - -To install the chart with the release name `my-release`: +## Get Repo Info ```console -$ # pass AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY as values -$ helm install --name my-release stable/prometheus-cloudwatch-exporter --set aws.aws_access_key_id=$AWS_ACCESS_KEY_ID,aws.aws_secret_access_key=$AWS_SECRET_ACCESS_KEY +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update +``` + +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -$ # or store them in a secret and pass its name as a value -$ kubectl create secret generic --from-literal=access_key=$AWS_ACCESS_KEY_ID --from-literal=secret_key=$AWS_SECRET_ACCESS_KEY -$ helm install --name my-release stable/prometheus-cloudwatch-exporter --set aws.secret.name= +## Install Chart + +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-cloudwatch-exporter -$ # or add a role to aws with the [correct policy](https://github.com/prometheus/cloudwatch_exporter#credentials-and-permissions) to add to cloud watch and pass its name as a value -$ helm install --name my-release stable/prometheus-cloudwatch-exporter --set awsRole= +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-cloudwatch-exporter ``` -The command deploys Cloudwatch exporter on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +_See [configuration](#configuration) below._ -## Uninstalling the Chart +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -To uninstall/delete the `my-release` deployment: +## Uninstall Chart ```console -$ helm delete my-release +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters of the Cloudwatch Exporter chart and their default values. - -| Parameter | Description | Default | -| --------------------------------- | ----------------------------------------------------------------------- | --------------------------- | -| `image.repository` | Image | `prom/cloudwatch-exporter` | -| `image.tag` | Image tag | `cloudwatch_exporter-0.8.0` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `command` | Container entrypoint command | `[]` | -| `containerPort` | Application listening port | `9106` | -| `service.type` | Service type | `ClusterIP` | -| `service.port` | The service port | `80` | -| `service.portName` | The name of the service port | `http` | -| `service.annotations` | Custom annotations for service | `{}` | -| `service.labels` | Additional custom labels for the service | `{}` | -| `resources` | | `{}` | -| `aws.role` | AWS IAM Role To Use | | -| `aws.aws_access_key_id` | AWS access key id | | -| `aws.aws_secret_access_key` | AWS secret access key | | -| `aws.secret.name` | The name of a pre-created secret in which AWS credentials are stored | | -| `aws.secret.includesSessionToken` | Whether or not the pre-created secret contains an AWS STS session token | | -| `config` | Cloudwatch exporter configuration | `example configuration` | -| `rbac.create` | If true, create & use RBAC resources | `false` | -| `serviceAccount.create` | Specifies whether a service account should be created. | `true` | -| `serviceAccount.name` | Name of the service account. | | -| `serviceAccount.annotations` | Custom annotations for service account. | `{}` | -| `tolerations` | Add tolerations | `[]` | -| `nodeSelector` | node labels for pod assignment | `{}` | -| `affinity` | node/pod affinities | `{}` | -| `livenessProbe` | Liveness probe settings | | -| `readinessProbe` | Readiness probe settings | | -| `serviceMonitor.enabled` | Use servicemonitor from prometheus operator | `false` | -| `serviceMonitor.namespace` | Namespace thes Servicemonitor is installed in | | -| `serviceMonitor.interval` | How frequently Prometheus should scrape | | -| `serviceMonitor.telemetryPath` | path to cloudwatch-exporter telemtery-path | | -| `serviceMonitor.labels` | labels for the ServiceMonitor passed to Prometheus Operator | `{}` | -| `serviceMonitor.timeout` | Timeout after which the scrape is ended | | -| `serviceMonitor.relabelings` | RelabelConfigs to apply to samples before scraping. | | -| `serviceMonitor.metricRelabelings`| MetricRelabelConfigs to apply to samples before ingestion. | | -| `prometheusRule.enabled` | Namespace thes PrometheusRule is installed in | `false` | -| `prometheusRule.namespace` | Use PrometheusRule from prometheus operator | | -| `prometheusRule.labels` | labels for the prometheusRule passed to Prometheus Operator | | -| `prometheusRule.rules` | Specify alerting rules in YAML format for PrometheusRule | | -| `ingress.enabled` | Enables Ingress | `false` | -| `ingress.annotations` | Ingress annotations | `{}` | -| `ingress.labels` | Custom labels | `{}` | -| `ingress.hosts` | Ingress accepted hostnames | `[]` | -| `ingress.tls` | Ingress TLS configuration | `[]` | -| `securityContext` | Security Context for the pod | `{}` | - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, +This removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ + +## Upgrading Chart ```console -$ helm install --name my-release \ - --set aws.role=my-aws-role \ - stable/prometheus-cloudwatch-exporter +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +## Configuring + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: ```console -$ helm install --name my-release -f values.yaml stable/prometheus-cloudwatch-exporter +# Helm 2 +$ helm inspect values prometheus-community/prometheus-cloudwatch-exporter + +# Helm 3 +$ helm show values prometheus-community/prometheus-cloudwatch-exporter ``` + +### AWS Credentials or Role + +For Cloudwatch Exporter to operate properly, you must configure either AWS credentials or an AWS role with the [correct policy](https://github.com/prometheus/cloudwatch_exporter#credentials-and-permissions). + +- To configure AWS credentials by value, set `aws.aws_access_key_id` to your [AWS_ACCESS_KEY_ID], and `aws.aws_secret_access_key` to [AWS_SECRET_ACCESS_KEY]. +- To configure AWS credentials by secret, you must store them in a secret (`kubectl create secret generic [SECRET_NAME] --from-literal=access_key=[AWS_ACCESS_KEY_ID] --from-literal=secret_key=[AWS_SECRET_ACCESS_KEY]`) and set `aws.secret.name` to [SECRET_NAME] +- To configure an AWS role (with correct policy linked above), set `awsRole` to [ROLL_NAME] diff --git a/charts/prometheus-consul-exporter/Chart.yaml b/charts/prometheus-consul-exporter/Chart.yaml index beca3203d664..37d56a830a1a 100644 --- a/charts/prometheus-consul-exporter/Chart.yaml +++ b/charts/prometheus-consul-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.4.0" description: A Helm chart for the Prometheus Consul Exporter name: prometheus-consul-exporter -version: 0.1.5 +version: 0.1.6 keywords: - metrics - consul diff --git a/charts/prometheus-consul-exporter/README.md b/charts/prometheus-consul-exporter/README.md index 8bc685617405..48d8b04e4aeb 100644 --- a/charts/prometheus-consul-exporter/README.md +++ b/charts/prometheus-consul-exporter/README.md @@ -1,60 +1,75 @@ -# Consul Exporter +# Prometheus Consul Exporter -Prometheus exporter for Consul metrics. -Learn more: https://github.com/prometheus/consul_exporter +A Prometheus exporter for [Consul](https://www.consul.io/) metrics. -## TL:DR +This chart creates a [Consul Exporter](https://github.com/prometheus/consul_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. -```bash -$ helm install stable/consul-exporter -``` -```bash -$ helm install stable/consul-exporter --set consulServer=my.consul.com:8500 -``` +## Prerequisites -## Introduction +- Kubernetes 1.8+ with Beta APIs enabled -This chart creates a Consul-Exporter deployment on a -[Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +## Get Repo Info -## Prerequisites +```console +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update +``` -- Kubernetes 1.8+ with Beta APIs enabled +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ + +## Install Chart -## Installing the Chart +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-consul-exporter -To install the chart with the release name `my-release`: -```bash -$ helm install --name my-release stable/consul-exporter +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-consul-exporter ``` -```bash -$ helm install --name my-release stable/consul-exporter --set consulServer=my.consul.com --set consulPort=8500 + +_See [configuration](#configuration) below._ + +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ + +## Uninstall Chart + +```console +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command deploys Consul-Exporter on the Kubernetes cluster using the -default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. -## Uninstalling the Chart +This removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ -To uninstall/delete the `my-release` deployment: -```bash -$ helm delete --purge my-release +## Upgrading Chart + +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ ## Configuration -Check the [Flags](https://github.com/prometheus/consul_exporter#flags) list and add to the options block in your value overrides. +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: -Specify each parameter using the `--set key=value[,key=value]` argument to -`helm install`. For example, -```bash -$ helm install --name my-release \ - --set key_1=value_1,key_2=value_2 \ - stable/consul-exporter -``` -Alternatively, a YAML file that specifies the values for the parameters can be -provided while installing the chart. For example, -```bash -# example for staging -$ helm install --name my-release -f values.yaml stable/consul-exporter +```console +# Helm 2 +$ helm inspect values prometheus-community/prometheus-consul-exporter + +# Helm 3 +$ helm show values prometheus-community/prometheus-consul-exporter ``` + +### Consul Server Info + +Set `consulServer` to `[MY_CONSUL_HOST]:[MY_CONSUL_PORT]`. + +### Flags + +Check the [Flags](https://github.com/prometheus/consul_exporter#flags) list and add to the `options` block in your value overrides. diff --git a/charts/prometheus-couchdb-exporter/Chart.yaml b/charts/prometheus-couchdb-exporter/Chart.yaml index ac1d169717ae..aaf8d4847b72 100644 --- a/charts/prometheus-couchdb-exporter/Chart.yaml +++ b/charts/prometheus-couchdb-exporter/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "1.0" description: A Helm chart to export the metrics from couchdb in Prometheus format. name: prometheus-couchdb-exporter home: https://github.com/gesellix/couchdb-prometheus-exporter -version: 0.1.1 +version: 0.1.2 keywords: - couchdb-exporter sources: diff --git a/charts/prometheus-couchdb-exporter/README.md b/charts/prometheus-couchdb-exporter/README.md index 716b0988877f..a49042238c3a 100644 --- a/charts/prometheus-couchdb-exporter/README.md +++ b/charts/prometheus-couchdb-exporter/README.md @@ -1,80 +1,67 @@ # prometheus-couchdb-exporter -[couchdb-prometheus-exporter](https://github.com/gesellix/couchdb-prometheus-exporter) is a Prometheus exporter for CouchDB metrics. +A Prometheus exporter for [CouchDB](https://couchdb.apache.org/) metrics. -## TL;DR; +This chart bootstraps a [CouchDB Exporter](https://github.com/gesellix/couchdb-prometheus-exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. -```bash -$ helm install stable/prometheus-couchdb-exporter +## Prerequisites + +- Kubernetes 1.8+ with Beta APIs enabled + +## Get Repo Info + +```console +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update ``` -## Introduction +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -This chart bootstraps a [couchdb-exporter](https://github.com/gesellix/couchdb-prometheus-exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +## Install Chart -## Prerequisites +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-couchdb-exporter -- Kubernetes 1.8+ with Beta APIs enabled +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-couchdb-exporter +``` + +_See [configuration](#configuration) below._ -## Installing the Chart +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -To install the chart with the release name `my-release`: +## Uninstall Chart -```bash -$ helm install --name my-release stable/prometheus-couchdb-exporter +```console +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command deploys prometheus-couchdb-exporter on the Kubernetes cluster in the default configuration. +This removes all the Kubernetes components associated with the chart and deletes the release. -## Uninstalling the Chart +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ -To uninstall/delete the `my-release` deployment: +## Upgrading Chart -```bash -$ helm delete my-release +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ ## Configuration -The following table lists the configurable parameters and their default values. - -| Parameter | Description | Default | -| ---------------------- | --------------------------------------------------- | --------------------------------------- | -| `replicaCount` | desired number of prometheus-couchdb-exporter pods | `1` | -| `image.repository` | prometheus-couchdb-exporter image repository | `gesellix/couchdb-prometheus-exporter` | -| `image.tag` | prometheus-couchdb-exporter image tag | `16` | -| `image.pullPolicy` | image pull policy | `IfNotPresent` | -| `service.type` | desired service type | `ClusterIP` | -| `service.port` | service external port | `9984` | -| `ingress.enabled` | enable ingress controller resource | `false` | -| `ingress.annotations` | annotations for the host's ingress records | `false` | -| `ingress.path` | path for the ingress route | `/` | -| `ingress.hosts` | list of host address for ingress creation | | -| `ingress.tls` | utilize TLS backend in ingress | | -| `resources` | cpu/memory resource requests/limits | {} | -| `nodeSelector` | node labels for pod assignment | {} | -| `tolerations` | tolerations for pod assignment | {} | -| `affinity` | affinity settings for proxy pod assignments | {} | -| `couchdb.uri` | address of the couchdb | `http://couchdb.default.svc:5984` | -| `couchdb.databases` | comma separated databases to monitor | `_all_dbs` | -| `couchdb.username` | username for couchdb | | -| `couchdb.password` | password for couchdb | | - - -For more information please refer to the [couchdb-prometheus-exporter]https://github.com/gesellix/couchdb-prometheus-exporter) documentation. - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```bash -$ helm install --name my-release \ - --set "couchdb.uri=http://mycouchdb:5984" \ - stable/prometheus-couchdb-exporter -``` +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, +```console +# Helm 2 +$ helm inspect values prometheus-community/prometheus-couchdb-exporter -```bash -$ helm install --name my-release -f values.yaml stable/prometheus-couchdb-exporter +# Helm 3 +$ helm show values prometheus-community/prometheus-couchdb-exporter ``` diff --git a/charts/prometheus-couchdb-exporter/templates/deployment.yaml b/charts/prometheus-couchdb-exporter/templates/deployment.yaml index 805748bb6559..d0d9cf919b5d 100644 --- a/charts/prometheus-couchdb-exporter/templates/deployment.yaml +++ b/charts/prometheus-couchdb-exporter/templates/deployment.yaml @@ -43,12 +43,12 @@ spec: httpGet: path: / port: http - initialDelaySeconds: 60 + initialDelaySeconds: 60 readinessProbe: httpGet: path: / port: http - initialDelaySeconds: 60 + initialDelaySeconds: 60 resources: {{ toYaml .Values.resources | indent 12 }} {{- with .Values.nodeSelector }} diff --git a/charts/prometheus-couchdb-exporter/templates/podsecuritypolicy.yaml b/charts/prometheus-couchdb-exporter/templates/podsecuritypolicy.yaml index d2da180a436e..5b08c4a1a988 100644 --- a/charts/prometheus-couchdb-exporter/templates/podsecuritypolicy.yaml +++ b/charts/prometheus-couchdb-exporter/templates/podsecuritypolicy.yaml @@ -1,5 +1,5 @@ {{- if .Values.rbac.pspEnabled }} -apiVersion: extensions/v1beta1 +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-couchdb-exporter.fullname" . }} diff --git a/charts/prometheus-mongodb-exporter/Chart.yaml b/charts/prometheus-mongodb-exporter/Chart.yaml index 781e0bb24b63..42194317e4d3 100644 --- a/charts/prometheus-mongodb-exporter/Chart.yaml +++ b/charts/prometheus-mongodb-exporter/Chart.yaml @@ -13,4 +13,4 @@ maintainers: name: prometheus-mongodb-exporter sources: - https://github.com/percona/mongodb_exporter -version: 2.8.0 +version: 2.8.1 diff --git a/charts/prometheus-mongodb-exporter/OWNERS b/charts/prometheus-mongodb-exporter/OWNERS deleted file mode 100644 index deb841ab740d..000000000000 --- a/charts/prometheus-mongodb-exporter/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -approvers: - - steven-sheehy -reviewers: - - steven-sheehy diff --git a/charts/prometheus-mongodb-exporter/README.md b/charts/prometheus-mongodb-exporter/README.md index 60dae784a906..a367613276af 100644 --- a/charts/prometheus-mongodb-exporter/README.md +++ b/charts/prometheus-mongodb-exporter/README.md @@ -1,70 +1,80 @@ # Prometheus MongoDB Exporter +A Prometheus exporter for [MongoDB](https://www.mongodb.com/) metrics. + Installs the [MongoDB Exporter](https://github.com/percona/mongodb_exporter) for [Prometheus](https://prometheus.io/). The MongoDB Exporter collects and exports oplog, replica set, server status, sharding and storage engine metrics. -## Installing the Chart +## Get Repo Info + +```console +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update +``` + +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ + +## Install Chart + +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-mongodb-exporter + +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-mongodb-exporter +``` + +_See [configuration](#configuration) below._ + +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -To install the chart with the release name `my-release`: +## Uninstall Chart ```console -$ helm upgrade --install my-release stable/prometheus-mongodb-exporter +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -This command deploys the MongoDB Exporter with the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +This removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ -## Using the Chart +## Upgrading Chart -To use the chart, ensure the `mongodb.uri` is populated with a valid [MongoDB URI](https://docs.mongodb.com/manual/reference/connection-string) -or an existing secret (in the releases namespace) containing the key defined on `existingSecret.key`, with the URI is referred via `existingSecret.name`. If no secret key is defined, the default value is `mongodb-uri`. -If the MongoDB server requires authentication, credentials should be populated in the connection string as well. The MongoDB Exporter supports -connecting to either a MongoDB replica set member, shard, or standalone instance. +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install +``` -The chart comes with a ServiceMonitor for use with the [Prometheus Operator](https://github.com/helm/charts/tree/master/stable/prometheus-operator). -If you're not using the Prometheus Operator, you can disable the ServiceMonitor by setting `serviceMonitor.enabled` to `false` and instead -populate the `podAnnotations` as below: +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +## Configuration + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: + +```console +# Helm 2 +$ helm inspect values prometheus-community/prometheus-mongodb-exporter + +# Helm 3 +$ helm show values prometheus-community/prometheus-mongodb-exporter +``` + +### MongoDB Server Connection + +To use the chart, ensure the `mongodb.uri` is populated with a valid [MongoDB URI](https://docs.mongodb.com/manual/reference/connection-string) or an existing secret (in the releases namespace) containing the key defined on `existingSecret.key`, with the URI is referred via `existingSecret.name`. If no secret key is defined, the default value is `mongodb-uri`. + +If the MongoDB server requires authentication, credentials should be populated in the connection string as well. The MongoDB Exporter supports connecting to either a MongoDB replica set member, shard, or standalone instance. + +### Service Monitor + +The chart comes with a ServiceMonitor for use with the [Prometheus Operator](https://github.com/helm/charts/tree/master/stable/prometheus-operator). If you're not using the Prometheus Operator, you can disable the ServiceMonitor by setting `serviceMonitor.enabled` to `false` and instead populate the `podAnnotations` as below: ```yaml podAnnotations: prometheus.io/scrape: "true" prometheus.io/port: "metrics" ``` - -## Configuration - -| Parameter | Description | Default | -|-----------|-------------|---------| -| `affinity` | Node/pod affinities | `{}` | -| `annotations` | Annotations to be added to the pods | `{}` | -| `existingSecret.name` | Refer to an existing secret name instead of using `mongodb.uri` | `` | -| `existingSecret.key` | Refer to an existing secret key | `mongodb-uri` | -| `extraArgs` | The extra command line arguments to pass to the MongoDB Exporter | See values.yaml | -| `fullnameOverride` | Override the full chart name | `` | -| `image.pullPolicy` | MongoDB Exporter image pull policy | `IfNotPresent` | -| `image.repository` | MongoDB Exporter image name | `ssheehy/mongodb-exporter` | -| `image.tag` | MongoDB Exporter image tag | `0.10.0` | -| `imagePullSecrets` | List of container registry secrets | `[]` | -| `mongodb.uri` | The [URI](https://docs.mongodb.com/manual/reference/connection-string) to connect to MongoDB | `` | -| `nameOverride` | Override the application name | `` | -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `podAnnotations` | Annotations to be added to all pods | `{}` | -| `port` | The container port to listen on | `9216` | -| `priorityClassName` | Pod priority class name | `` | -| `replicas` | Number of replicas in the replica set | `1` | -| `resources` | Pod resource requests and limits | `{}` | -| `env` | Extra environment variables passed to pod | `{}` | -| `securityContext` | Security context for the pod | See values.yaml | -| `service.labels` | Additional labels for the service definition | `{}` | -| `service.annotations` | Annotations to be added to the service | `{}` | -| `service.port` | The port to expose | `9216` | -| `service.type` | The type of service to expose | `ClusterIP` | -| `serviceAccount.create` | If `true`, create the service account | `true` | -| `serviceAccount.name` | Name of the service account | `` | -| `serviceMonitor.enabled` | Set to true if using the Prometheus Operator | `true` | -| `serviceMonitor.interval` | Interval at which metrics should be scraped | `30s` | -| `serviceMonitor.scrapeTimeout` | Interval at which metric scrapes should time out | `10s` | -| `serviceMonitor.namespace` | The namespace where the Prometheus Operator is deployed | `` | -| `serviceMonitor.additionalLabels` | Additional labels to add to the ServiceMonitor | `{}` | -| `serviceMonitor.targetLabels` | Set of labels to transfer on the Kubernetes Service onto the target. | `[]` -| `serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion. | `[]` | -| `tolerations` | List of node taints to tolerate | `[]` | diff --git a/charts/prometheus-mysql-exporter/Chart.yaml b/charts/prometheus-mysql-exporter/Chart.yaml index 533ed7f5764f..34d1ada24cd1 100644 --- a/charts/prometheus-mysql-exporter/Chart.yaml +++ b/charts/prometheus-mysql-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for prometheus mysql exporter with cloudsqlproxy name: prometheus-mysql-exporter -version: 0.7.0 +version: 0.7.1 home: https://github.com/prometheus/mysqld_exporter appVersion: v0.11.0 sources: diff --git a/charts/prometheus-mysql-exporter/OWNERS b/charts/prometheus-mysql-exporter/OWNERS deleted file mode 100644 index 2cd2a992b0dd..000000000000 --- a/charts/prometheus-mysql-exporter/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -approvers: -- juanchimienti -- monotek -reviewers: -- juanchimienti -- monotek diff --git a/charts/prometheus-mysql-exporter/README.md b/charts/prometheus-mysql-exporter/README.md index f970acf49e26..0a9a9a53e384 100644 --- a/charts/prometheus-mysql-exporter/README.md +++ b/charts/prometheus-mysql-exporter/README.md @@ -1,97 +1,79 @@ # Prometheus Mysql Exporter -- Installs prometheus [mysql exporter](https://github.com/prometheus/mysqld_exporter) +A Prometheus exporter for [MySQL](https://www.mysql.com/) metrics. -## TL;DR; +This chart bootstraps a Prometheus [MySQL Exporter](http://github.com/prometheus/mysql_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +## Get Repo Info ```console -$ helm install stable/prometheus-mysql-exporter +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update ``` -## Introduction +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ + +## Install Chart + +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-mysql-exporter + +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-mysql-exporter +``` -This chart bootstraps a prometheus [mysql exporter](http://github.com/prometheus/mysql_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. The exporter can connect to mysql directly or using the [Cloud SQL Proxy](https://cloud.google.com/sql/docs/mysql/sql-proxy). +_See [configuration](#configuration) below._ -## Installing the Chart +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -To install the chart with the release name `my-release`: +## Uninstall Chart ```console -$ helm install --name my-release stable/prometheus-mysql-exporter --set mysql.user="username",mysql.pass="password",mysql.host="example.com",mysql.port="3306" +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command deploys a mysql exporter on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +This removes all the Kubernetes components associated with the chart and deletes the release. -## Uninstalling the Chart +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ -To uninstall/delete the `my-release` deployment: +## Upgrading Chart ```console -$ helm delete my-release +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ ## Configuration -The following table lists the configurable parameters of the mysql exporter chart and their default values. - -| Parameter | Description | Default | -| -------------------------------------- | -----------------------------------------------------------| ---------------------------------- | -| `replicaCount` | Amount of pods for the deployment | `1` | -| `image.repository` | Image repository | `prom/mysqld-exporter` | -| `image.tag` | Image tag | `v0.11.0` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `service.name` | Service name | `mysql-exporter` | -| `service.labels` | Additional labels for the service | `{}` | -| `service.annotations` | Annotations to be added to the service | `{}` | -| `service.type` | Service type | `ClusterIP` | -| `service.externalport` | The service port | `9104` | -| `service.internalPort` | The target port of the container | `9104` | -| `resources` | CPU/Memory resource requests/limits | `{}` | -| `annotations` | pod annotations for easier discovery | `see values.yaml` | -| `collectors` | Collector configuration | `see values.yaml` | -| `podLabels` | Additional labels to add to each pod | `{}` | -| `mysql.db` | MySQL connection db (optional) | `""` | -| `mysql.host` | MySQL connection host | `localhost` | -| `mysql.param` | MySQL connection parameters (optional) | `"tcp"` | -| `mysql.pass` | MySQL connection password | `password` | -| `mysql.port` | MySQL connection port | `3306` | -| `mysql.protocol` | MySQL connection protocol (optional) | `""` | -| `mysql.user` | MySQL connection username | `exporter` | -| `mysql.existingSecret` | Use existing kubernetes secret for DATA_SOURCE_NAME | `false` | -| `cloudsqlproxy.enabled` | Flag to enable the connection using Cloud SQL Proxy | `false` | -| `cloudsqlproxy.image.repo` | Cloud SQL Proxy image repository | `gcr.io/cloudsql-docker/gce-proxy` | -| `cloudsqlproxy.image.tag` | Cloud SQL Proxy image tag | `1.14` | -| `cloudsqlproxy.image.pullPolicy` | Cloud SQL Proxy image pull policy | `IfNotPresent` | -| `cloudsqlproxy.instanceConnectionName` | Google Cloud instance connection name | `project:us-central1:dbname` | -| `cloudsqlproxy.port` | Cloud SQL Proxy listening port | `3306` | -| `cloudsqlproxy.credentials` | Cloud SQL Proxy service account credentials | `bogus credential file` | -| `serviceMonitor.enabled` | Integration with prometheus-operator | `false` | -| `serviceMonitor.interval` | Interval for polling this exporter | | -| `serviceMonitor.scrapeTimeout` | Timeout where exporter is considered faulty | | -| `serviceMonitor.jobLabel` | Label to use to retrieve the job name from | `""` | -| `serviceMonitor.targetLabels` | Labels to transfer from service onto the target | `[]` | -| `serviceMonitor.podTargetLabels` | Labels to transfor from pod onto the target | `[]` | -| `serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion. | `[]` | - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: ```console -$ helm install --name my-release \ - --set mysql.user="username",mysql.password="password",mysql.host="localhost",mysql.port="3306" \ - stable/prometheus-mysql-exporter +# Helm 2 +$ helm inspect values prometheus-community/prometheus-mysql-exporter + +# Helm 3 +$ helm show values prometheus-community/prometheus-mysql-exporter ``` -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, +### MySQL Connection -```console -$ helm install --name my-release -f values.yaml stable/prometheus-mysql-exporter -``` +The exporter can connect to mysql directly or using the [Cloud SQL Proxy](https://cloud.google.com/sql/docs/mysql/sql-proxy). + +- To configure direct MySQL connection by value, set `mysql.user`, `mysql.pass`, `mysql.host` and `mysql.port` (see additional options in the `mysql` configuration block) +- To configure direct MySQL connnetion by secret, you must store a connection string in a secret, and set `mysql.existingSecret` to `[SECRET_NAME]` + +### Exporter Documentation and Params Documentation for the MySQL Exporter can be found here: () A mysql params overview can be found here: () -## Collector Flags +### Collector Flags Available collector flags can be found in the [values.yaml](https://github.com/kilhyunjun/charts/blob/master/stable/prometheus-mysql-exporter/values.yaml) and a description of each flag can be found in the [mysqld_exporter](https://github.com/prometheus/mysqld_exporter#collector-flags) repository. diff --git a/charts/prometheus-nats-exporter/Chart.yaml b/charts/prometheus-nats-exporter/Chart.yaml index c12aed56b999..79fddcf86d18 100644 --- a/charts/prometheus-nats-exporter/Chart.yaml +++ b/charts/prometheus-nats-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.6.2" description: A Helm chart for prometheus-nats-exporter name: prometheus-nats-exporter -version: 2.5.0 +version: 2.5.1 home: https://github.com/nats-io/prometheus-nats-exporter sources: - https://github.com/nats-io/prometheus-nats-exporter diff --git a/charts/prometheus-nats-exporter/OWNERS b/charts/prometheus-nats-exporter/OWNERS deleted file mode 100644 index 8759f021871b..000000000000 --- a/charts/prometheus-nats-exporter/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -approvers: -- okgolove -- caarlos0 -reviewers: -- okgolove -- caarlos0 diff --git a/charts/prometheus-nats-exporter/README.md b/charts/prometheus-nats-exporter/README.md index 83ad94e7cb7e..0aa415426140 100644 --- a/charts/prometheus-nats-exporter/README.md +++ b/charts/prometheus-nats-exporter/README.md @@ -1,83 +1,63 @@ # Prometheus NATS Exporter -* Installs prometheus [NATS exporter](https://github.com/nats-io/prometheus-nats-exporter) +An Prometheus Exporter for [NATS](https://github.com/nats-io/k8s) metrics. -## TL;DR; +This chart bootstraps a prometheus [NATS Exporter](https://github.com/nats-io/prometheus-nats-exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +## Get Repo Info ```console -$ helm install incubator/prometheus-nats-exporter +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update ``` -## Introduction - -This chart bootstraps a prometheus [NATS exporter](https://github.com/nats-io/prometheus-nats-exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - -## Installing the Chart +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -To install the chart with the release name `my-release`: +## Install Chart ```console -$ helm install --name my-release stable/prometheus-nats-exporter +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-nats-exporter + +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-nats-exporter ``` -The command deploys NATS exporter on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +_See [configuration](#configuration) below._ -## Uninstalling the Chart +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -To uninstall/delete the `my-release` deployment: +## Uninstall Chart ```console -$ helm delete my-release +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters of the postgres Exporter chart and their default values. - -| Parameter | Description | Default | -| --------------------------------- | ------------------------------------------------------- | ------------------------------------------------ | -| `image` | Image | `synadia/prometheus-nats-exporter` | -| `imageTag` | Image tag | `0.6.2` | -| `imagePullPolicy` | Image pull policy | `IfNotPresent` | -| `service.type` | Service type | `ClusterIP` | -| `service.port` | The service port | `80` | -| `service.targetPort` | The target port of the container | `7777` | -| `serviceMonitor.enabled` | Set to true if using the Prometheus Operator | `false` | -| `serviceMonitor.interval` | Interval at which metrics should be scraped | `` | -| `serviceMonitor.namespace` | The namespace where the Prometheus Operator is deployed | `` | -| `serviceMonitor.additionalLabels` | Additional labels to add to the ServiceMonitor | `{}` | -| `resources` | | `{}` | -| `config.nats.service` | NATS monitoring [service name][svc-name] | `nats-nats-monitoring` | -| `config.nats.namespace` | Namespace in which NATS deployed | `default` | -| `config.nats.port` | NATS monitoring service port | `8222` | -| `config.metrics.varz` | NATS varz metrics | `true` | -| `config.metrics.channelz` | NATS channelz metrics | `true` | -| `config.metrics.connz` | NATS connz metrics | `true` | -| `config.metrics.routez` | NATS routez metrics | `true` | -| `config.metrics.serverz` | NATS serverz metrics | `true` | -| `config.metrics.subz` | NATS subz metrics | `true` | -| `config.metrics.gatewayz | NATS gatewayz metrics | `true` | -| `tolerations` | Add tolerations | `[]` | -| `nodeSelector` | node labels for pod assignment | `{}` | -| `affinity` | node/pod affinities | `{}` | -| `annotations` | Deployment annotations | `{}` | -| `extraContainers` | Additional sidecar containers | `""` | -| `extraVolumes` | Additional volumes for use in extraContainers | `""` | - -[svc-name]: https://github.com/helm/charts/blob/master/stable/nats/templates/monitoring-svc.yaml - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, +This removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ + +## Upgrading Chart ```console -$ helm install --name my-release stable/prometheus-nats-exporter \ - --set config.nats.service=nats-production-nats-monitoring \ - --set config.metrics.subz=false +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +## Configuring + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: ```console -$ helm install --name my-release stable/prometheus-nats-exporter -f values.yaml +# Helm 2 +$ helm inspect values prometheus-community/prometheus-nats-exporter + +# Helm 3 +$ helm show values prometheus-community/prometheus-nats-exporter ``` diff --git a/charts/prometheus-nats-exporter/values.yaml b/charts/prometheus-nats-exporter/values.yaml index bd26c22bbbae..7de0f86d2770 100644 --- a/charts/prometheus-nats-exporter/values.yaml +++ b/charts/prometheus-nats-exporter/values.yaml @@ -35,6 +35,7 @@ resources: {} config: nats: + # See https://github.com/helm/charts/blob/master/stable/nats/templates/monitoring-svc.yaml service: nats-nats-monitoring namespace: default port: 8222 diff --git a/charts/prometheus-node-exporter/Chart.yaml b/charts/prometheus-node-exporter/Chart.yaml index 25a2a3ecb429..4e7fad8f492b 100644 --- a/charts/prometheus-node-exporter/Chart.yaml +++ b/charts/prometheus-node-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.0.1 description: A Helm chart for prometheus node-exporter name: prometheus-node-exporter -version: 1.11.1 +version: 1.11.2 home: https://github.com/prometheus/node_exporter/ sources: - https://github.com/prometheus/node_exporter/ diff --git a/charts/prometheus-node-exporter/OWNERS b/charts/prometheus-node-exporter/OWNERS deleted file mode 100644 index 4f1dd4862df4..000000000000 --- a/charts/prometheus-node-exporter/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -approvers: -- gianrubio -- vsliouniaev -reviewers: -- gianrubio -- vsliouniaev \ No newline at end of file diff --git a/charts/prometheus-node-exporter/README.md b/charts/prometheus-node-exporter/README.md index d9cc50bcd0dc..babde05e0682 100644 --- a/charts/prometheus-node-exporter/README.md +++ b/charts/prometheus-node-exporter/README.md @@ -1,90 +1,63 @@ # Prometheus Node Exporter -* Installs prometheus [node exporter](https://github.com/prometheus/node_exporter) +Prometheus exporter for hardware and OS metrics exposed by *NIX kernels, written in Go with pluggable metric collectors. -## TL;DR; +This chart bootstraps a prometheus [Node Exporter](http://github.com/prometheus/node_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +## Get Repo Info ```console -$ helm install stable/prometheus-node-exporter +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update ``` -## Introduction - -This chart bootstraps a prometheus [node exporter](http://github.com/prometheus/node_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - -## Installing the Chart +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -To install the chart with the release name `my-release`: +## Install Chart ```console -$ helm install --name my-release stable/prometheus-node-exporter +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-node-exporter + +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-node-exporter ``` -The command deploys node exporter on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +_See [configuration](#configuration) below._ -## Uninstalling the Chart +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -To uninstall/delete the `my-release` deployment: +## Uninstall Chart ```console -$ helm delete my-release +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters of the Node Exporter chart and their default values. - -| Parameter | Description | Default | -| ------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------ | -| `image.repository` | Image repository | `quay.io/prometheus/node-exporter` | -| `image.tag` | Image tag | `v1.0.1` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `extraArgs` | Additional container arguments | `[]` | -| `extraHostVolumeMounts` | Additional host volume mounts | `[]` | -| `podAnnotations` | Annotations to be added to node exporter pods | `{}` | -| `podLabels` | Additional labels to be added to pods | `{}` | -| `rbac.create` | If true, create & use RBAC resources | `true` | -| `rbac.pspEnabled` | Specifies whether a PodSecurityPolicy should be created. | `true` | -| `resources` | CPU/Memory resource requests/limits | `{}` | -| `service.type` | Service type | `ClusterIP` | -| `service.port` | The service port | `9100` | -| `service.targetPort` | The target port of the container | `9100` | -| `service.nodePort` | The node port of the service | | -| `service.listenOnAllInterfaces` | If true, listen on all interfaces using IP `0.0.0.0`. Else listen on the IP address pod has been assigned by Kubernetes. | `true` | -| `service.annotations` | Kubernetes service annotations | `{prometheus.io/scrape: "true"}` | -| `serviceAccount.create` | Specifies whether a service account should be created. | `true` | -| `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template | | -| `serviceAccount.imagePullSecrets` | Specify image pull secrets | `[]` | -| `securityContext` | SecurityContext | See values.yaml | -| `affinity` | A group of affinity scheduling rules for pod assignment | `{}` | -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `tolerations` | List of node taints to tolerate | `- effect: NoSchedule operator: Exists` | -| `priorityClassName` | Name of Priority Class to assign pods | `nil` | -| `endpoints` | list of addresses that have node exporter deployed outside of the cluster | `[]` | -| `hostNetwork` | Whether to expose the service to the host network | `true` | -| `prometheus.monitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false` | -| `prometheus.monitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}` | -| `prometheus.monitor.namespace` | namespace where servicemonitor resource should be created | `the same namespace as prometheus node exporter` | -| `prometheus.monitor.relabelings` | Relabelings that should be applied on the ServerMonitor | `{}` | -| `prometheus.monitor.scrapeTimeout` | Timeout after which the scrape is ended | `10s` | -| `configmaps` | Allow mounting additional configmaps. | `[]` | -| `namespaceOverride` | Override the deployment namespace | `""` (`Release.Namespace`) | -| `updateStrategy` | Configure a custom update strategy for the daemonset | `Rolling update with 1 max unavailable` | -| `sidecars` | Additional containers for export metrics to text file | `[]` | | -| `sidecarVolumeMount` | Volume for sidecar containers | `[]` | | - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, +This removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ + +## Upgrading Chart ```console -$ helm install --name my-release \ - --set serviceAccount.name=node-exporter \ - stable/prometheus-node-exporter +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +## Configuring + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: ```console -$ helm install --name my-release -f values.yaml stable/prometheus-node-exporter +# Helm 2 +$ helm inspect values prometheus-community/prometheus-node-exporter + +# Helm 3 +$ helm show values prometheus-community/prometheus-node-exporter ``` diff --git a/charts/prometheus-postgres-exporter/Chart.yaml b/charts/prometheus-postgres-exporter/Chart.yaml index 02b6e8e80246..96115481859e 100644 --- a/charts/prometheus-postgres-exporter/Chart.yaml +++ b/charts/prometheus-postgres-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.8.0" description: A Helm chart for prometheus postgres-exporter name: prometheus-postgres-exporter -version: 1.3.0 +version: 1.3.1 home: https://github.com/wrouesnel/postgres_exporter sources: - https://github.com/wrouesnel/postgres_exporter diff --git a/charts/prometheus-postgres-exporter/README.md b/charts/prometheus-postgres-exporter/README.md index 090fa7e37521..fdd5e820c191 100644 --- a/charts/prometheus-postgres-exporter/README.md +++ b/charts/prometheus-postgres-exporter/README.md @@ -1,89 +1,63 @@ # Prometheus Postgres Exporter -* Installs prometheus [postgres exporter](https://github.com/wrouesnel/postgres_exporter) +Prometheus exporter for [PostgreSQL](https://www.postgresql.org/about/servers/) server metrics. -## TL;DR; +This chart bootstraps a prometheus [postgres exporter](https://github.com/wrouesnel/postgres_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +## Get Repo Info ```console -$ helm install stable/prometheus-postgres-exporter +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update ``` -## Introduction - -This chart bootstraps a prometheus [postgres exporter](https://github.com/wrouesnel/postgres_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - -## Installing the Chart +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -To install the chart with the release name `my-release`: +## Install Chart ```console -$ helm install --name my-release stable/prometheus-postgres-exporter +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-postgres-exporter + +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-postgres-exporter ``` -The command deploys postgres exporter on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +_See [configuration](#configuration) below._ -## Uninstalling the Chart +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -To uninstall/delete the `my-release` deployment: +## Uninstall Chart ```console -$ helm delete my-release +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters of the postgres Exporter chart and their default values. - -| Parameter | Description | Default | -| ------------------------------- | ------------------------------------------ | ---------------------------------------------------------- | -| `image` | Image | `wrouesnel/postgres_exporter` | -| `imageTag` | Image tag | `v0.5.1` | -| `imagePullPolicy` | Image pull policy | `IfNotPresent` | -| `service.annotations` | annotations for the service | `{}` | -| `service.type` | Service type | `ClusterIP` | -| `service.port` | The service port | `80` | -| `service.targetPort` | The target port of the container | `9187` | -| `service.name` | Name of the service port | `http` | -| `service.labels` | Labels to add to the service | `{}` | -| `serviceMonitor.enabled` | Use servicemonitor from prometheus operator | `false` | -| `serviceMonitor.namespace` | Namespace thes Servicemonitor is installed in | | -| `serviceMonitor.interval` | How frequently Prometheus should scrape | | -| `serviceMonitor.telemetryPath` | path to cloudwatch-exporter telemtery-path | | -| `serviceMonitor.labels` | labels for the ServiceMonitor passed to Prometheus Operator | `{}` | -| `serviceMonitor.timeout` | Timeout after which the scrape is ended | | -| `resources` | | `{}` | -| `config.datasource` | Postgresql datasource configuration | see [values.yaml](values.yaml) | -| `config.datasourceSecret` | Postgresql datasource configuration from secret | see [values.yaml](values.yaml) | -| `config.queries` | SQL queries that the exporter will run | [postgres exporter defaults](https://github.com/wrouesnel/postgres_exporter/blob/master/queries.yaml) | -| `config.disableDefaultMetrics` | Specifies whether to use only metrics from `queries.yaml`| `false` | -| `config.autoDiscoverDatabases` | Specifies whether to autodiscover all databases | `false` | -| `config.excludeDatabases` | When autodiscover is enabled, list databases to exclude| `[]` | -| `rbac.create` | Specifies whether RBAC resources should be created.| `true` | -| `rbac.pspEnabled` | Specifies whether a PodSecurityPolicy should be created.| `true` | -| `serviceAccount.create` | Specifies whether a service account should be created.| `true` | -| `serviceAccount.name` | Name of the service account.| | -| `tolerations` | Add tolerations | `[]` | -| `nodeSelector` | node labels for pod assignment | `{}` | -| `affinity` | node/pod affinities | `{}` | -| `annotations` | Deployment annotations | `{}` | -| `podLabels` | Additional labels to add to each pod | `{}` | -| `extraContainers` | Additional sidecar containers | `""` | -| `extraVolumes` | Additional volumes for use in extraContainers | `""` | -| `securityContext` | Security options the pod should run with. [More info](https://kubernetes.io/docs/concepts/policy/security-context/) | `{}` | - - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, +This removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ + +## Upgrading Chart ```console -$ helm install --name my-release \ - --set serviceAccount.name=postgres \ - stable/prometheus-postgres-exporter +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +## Configuring + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: ```console -$ helm install --name my-release -f values.yaml stable/prometheus-postgres-exporter +# Helm 2 +$ helm inspect values prometheus-community/prometheus-postgres-exporter + +# Helm 3 +$ helm show values prometheus-community/prometheus-postgres-exporter ``` diff --git a/charts/prometheus-pushgateway/Chart.yaml b/charts/prometheus-pushgateway/Chart.yaml index f612e0847817..932322c3f634 100644 --- a/charts/prometheus-pushgateway/Chart.yaml +++ b/charts/prometheus-pushgateway/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.2.0" description: A Helm chart for prometheus pushgateway name: prometheus-pushgateway -version: 1.4.1 +version: 1.4.2 home: https://github.com/prometheus/pushgateway sources: - https://github.com/prometheus/pushgateway diff --git a/charts/prometheus-pushgateway/OWNERS b/charts/prometheus-pushgateway/OWNERS deleted file mode 100644 index 6cbedf33929b..000000000000 --- a/charts/prometheus-pushgateway/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -approvers: -- gianrubio -- cstaud -reviewers: -- gianrubio -- cstaud \ No newline at end of file diff --git a/charts/prometheus-pushgateway/README.md b/charts/prometheus-pushgateway/README.md index ed0171d8da39..9f0ac5e86690 100644 --- a/charts/prometheus-pushgateway/README.md +++ b/charts/prometheus-pushgateway/README.md @@ -1,92 +1,63 @@ # Prometheus Pushgateway -* Installs prometheus [pushgateway](https://github.com/prometheus/pushgateway) +This chart bootstraps a prometheus [pushgateway](http://github.com/prometheus/pushgateway) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +An optional prometheus `ServiceMonitor` can be enabled, should you wish to use this gateway with a [Prometheus Operator](https://github.com/coreos/prometheus-operator). -## TL;DR; +## Get Repo Info ```console -$ helm install stable/prometheus-pushgateway +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update ``` -## Introduction +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -This chart bootstraps a prometheus [pushgateway](http://github.com/prometheus/pushgateway) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +## Install Chart -An optional prometheus `ServiceMonitor` can be enabled, should you wish to use this gateway with a [Prometheus Operator](https://github.com/coreos/prometheus-operator). +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-pushgateway -## Installing the Chart +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-pushgateway +``` -To install the chart with the release name `my-release`: +_See [configuration](#configuration) below._ + +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ + +## Uninstall Chart ```console -$ helm install --name my-release stable/prometheus-pushgateway +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command deploys pushgateway on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +This removes all the Kubernetes components associated with the chart and deletes the release. -## Uninstalling the Chart +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ -To uninstall/delete the `my-release` deployment: +## Upgrading Chart ```console -$ helm delete my-release +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ ## Configuration -The following table lists the configurable parameters of the pushgateway chart and their default values. - -| Parameter | Description | Default | -| --------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | --------------------------------- | -| `affinity` | Affinity settings for pod assignment | `{}` | -| `extraArgs` | Optional flags for pushgateway | `[]` | -| `extraVars` | Optional environment variables for pushgateway | `[]` | -| `image.repository` | Image repository | `prom/pushgateway` | -| `image.tag` | Image tag | `v1.2.0` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `ingress.enabled` | Enables Ingress for pushgateway | `false` | -| `ingress.annotations` | Ingress annotations | `{}` | -| `ingress.hosts` | Ingress accepted hostnames | `nil` | -| `ingress.tls` | Ingress TLS configuration | `[]` | -| `resources` | CPU/Memory resource requests/limits | `{}` | -| `replicaCount` | Number of replicas | `1` | -| `strategy` | Deployment strategy | `{ "type": "Recreate" }` | -| `service.type` | Service type | `ClusterIP` | -| `service.port` | The service port | `9091` | -| `service.nodePort` | The optional service node port when `service.type` is `NodePort` | `` | -| `service.targetPort` | The target port of the container | `9091` | -| `serviceAnnotations` | Annotations for the service | `{}` | -| `serviceLabels` | Labels for service | `{}` | -| `serviceAccount.create` | Specifies whether a service account should be created. | `true` | -| `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template | | -| `tolerations` | List of node taints to tolerate | `{}` | -| `nodeSelector` | Node labels for pod assignment | `{}` | -| `podAnnotations` | Annotations for pod | `{}` | -| `podLabels` | Labels for pod | `{}` | -| `serviceAccountLabels` | Labels for service account | `{}` | -| `persistentVolumeLabels` | Labels for persistent volume | `{}` | -| `serviceMonitor.enabled` | if `true`, creates a Prometheus Operator ServiceMonitor | `false` | -| `serviceMonitor.namespace` | Namespace which Prometheus is running in | `monitoring` | -| `serviceMonitor.interval` | How frequently to scrape metrics (use by default, falling back to Prometheus' default) | `nil` | -| `serviceMonitor.scrapeTimeout` | How long to scrape metrics before timing out. (use by default, falling back to Prometheus' default) | `nil` | -| `serviceMonitor.additionalLables` | Used to pass Labels that are required by the Installed Prometheus Operator | `{}` | -| `serviceMonitor.honorLabels` | if `true`, label conflicts are resolved by keeping label values from the scraped data | `true` | -| `podDisruptionBudget` | If set, create a PodDisruptionBudget with the items in this map set in the spec | `` | -| `networkPolicy.allowAll` | Allow connectivity from all pods in the cluster | `` | -| `networkPolicy.customSelectors` | Allow connectivity from pods that match a list of podSelectors and namespaceSelectors | `` | - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: ```console -$ helm install --name my-release \ - --set serviceAccount.name=pushgateway \ - stable/prometheus-pushgateway -``` - -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, +# Helm 2 +$ helm inspect values prometheus-community/prometheus-pushgateway -```console -$ helm install --name my-release -f values.yaml stable/prometheus-pushgateway +# Helm 3 +$ helm show values prometheus-community/prometheus-pushgateway ``` diff --git a/charts/prometheus-rabbitmq-exporter/Chart.yaml b/charts/prometheus-rabbitmq-exporter/Chart.yaml index d64cbcf38368..0415b879c732 100644 --- a/charts/prometheus-rabbitmq-exporter/Chart.yaml +++ b/charts/prometheus-rabbitmq-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Rabbitmq metrics exporter for prometheus name: prometheus-rabbitmq-exporter -version: 0.5.5 +version: 0.5.6 appVersion: v0.29.0 home: https://github.com/kbudde/rabbitmq_exporter sources: diff --git a/charts/prometheus-rabbitmq-exporter/README.md b/charts/prometheus-rabbitmq-exporter/README.md index 0fcd057ebe91..6c87062708a0 100644 --- a/charts/prometheus-rabbitmq-exporter/README.md +++ b/charts/prometheus-rabbitmq-exporter/README.md @@ -1,88 +1,72 @@ # prometheus-rabbitmq-exporter -[rabbitmq_exporter](https://github.com/kbudde/rabbitmq_exporter) is a Prometheus exporter for rabbitmq metrics. +Prometheus Exporter for [RabbitMQ](https://www.rabbitmq.com/) metrics. -## TL;DR; +This chart bootstraps a [RabbitMQ Exporter](https://github.com/kbudde/rabbitmq_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. -```bash -$ helm install stable/prometheus-rabbitmq-exporter -``` +## Prerequisites -## Introduction +- Kubernetes 1.8+ with Beta APIs enabled -This chart bootstraps a [rabbitmq_exporter](https://github.com/kbudde/rabbitmq_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +## Get Repo Info -## Prerequisites +```console +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update +``` -- Kubernetes 1.8+ with Beta APIs enabled +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -## Installing the Chart +## Install Chart -To install the chart with the release name `my-release`: +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-rabbitmq-exporter -```bash -$ helm install --name my-release stable/prometheus-rabbitmq-exporter +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-rabbitmq-exporter ``` -The command deploys prometheus-rabbitmq-exporter on the Kubernetes cluster in the default configuration. +_See [configuration](#configuration) below._ -## Uninstalling the Chart +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -To uninstall/delete the `my-release` deployment: +## Uninstall Chart -```bash -$ helm delete my-release +```console +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters and their default values. - -| Parameter | Description | Default | -| ------------------------ | ---------------------------------------------------------------------- | ------------------------- | -| `replicaCount` | desired number of prometheus-rabbitmq-exporter pods | `1` | -| `image.repository` | prometheus-rabbitmq-exporter image repository | `kbudde/rabbitmq-exporter`| -| `image.tag` | prometheus-rabbitmq-exporter image tag | `v0.29.0` | -| `image.pullPolicy` | image pull policy | `IfNotPresent` | -| `service.type` | desired service type | `ClusterIP` | -| `service.internalport` | service listening port | `9419` | -| `service.externalPort` | public service port | `9419` | -| `resources` | cpu/memory resource requests/limits | {} | -| `loglevel` | exporter log level | {} | -| `rabbitmq.url` | rabbitmq management url | `http://myrabbit:15672` | -| `rabbitmq.user` | rabbitmq user login | `guest` | -| `rabbitmq.password` | rabbitmq password login | `guest` | -| `rabbitmq.existingPasswordSecret` | existing secret name containing password key | `~` | -| `rabbitmq.capabilities` | comma-separated list of capabilities supported by the RabbitMQ server | `bert,no_sort` | -| `rabbitmq.include_queues`| regex queue filter. just matching names are exported | `.*` | -| `rabbitmq.skip_queues` | regex, matching queue names are not exported | `^$` | -| `rabbitmq.include_vhost` | regex vhost filter. Only queues in matching vhosts are exported | `.*` | -| `rabbitmq.skip_vhost` | regex, matching vhost names are not exported. First performs include_vhost, then skip_vhost | `^$` | -| `rabbitmq.skip_verify` | true/0 will ignore certificate errors of the management plugin | `false` | -| `rabbitmq.exporters` | List of enabled modules. Just "connections" is not enabled by default | `exchange,node,overview,queue` | -| `rabbitmq.output_format` | Log ouput format. TTY and JSON are suported | `TTY` | -| `rabbitmq.timeout` | timeout in seconds for retrieving data from management plugin | `30` | -| `rabbitmq.max_queues` | max number of queues before we drop metrics (disabled if set to 0) | `0` | -| `annotations` | pod annotations for easier discovery | {} | -| `prometheus.monitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false` | -| `prometheus.monitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | {} | -| `prometheus.monitor.interval` | Interval at which Prometheus Operator scrapes exporter | `15s` | -| `prometheus.monitor.namespace` | Selector to select which namespaces the Endpoints objects are discovered from. | [] | - -For more information please refer to the [rabbitmq_exporter](https://github.com/kbudde/rabbitmq_exporter) documentation. - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```bash -$ helm install --name my-release \ - --set "rabbitmq.url=http://myrabbit:15672" \ - stable/prometheus-rabbitmq-exporter +This removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ + +## Upgrading Chart + +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +## Configuring + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: -```bash -$ helm install --name my-release -f values.yaml stable/prometheus-rabbitmq-exporter +```console +# Helm 2 +$ helm inspect values prometheus-community/prometheus-rabbitmq-exporter + +# Helm 3 +$ helm show values prometheus-community/prometheus-rabbitmq-exporter ``` + +### RabbitMQ Connection + +- To configure RabbitMQ connection by value, set `rabbitmq.url`, `rabbitmq.user` and `rabbitmq.password` (see additional options in the `rabbitmq` configuration block) +- To configure RabbitMQ password by secret, you must store the password string in a secret, and set `rabbitmq.existingPasswordSecret` to `[SECRET_NAME]` diff --git a/charts/prometheus-redis-exporter/Chart.yaml b/charts/prometheus-redis-exporter/Chart.yaml index 133697834ae1..3b1beef4497c 100644 --- a/charts/prometheus-redis-exporter/Chart.yaml +++ b/charts/prometheus-redis-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.3.4 description: Prometheus exporter for Redis metrics name: prometheus-redis-exporter -version: 3.5.0 +version: 3.5.1 home: https://github.com/oliver006/redis_exporter sources: - https://github.com/oliver006/redis_exporter diff --git a/charts/prometheus-redis-exporter/OWNERS b/charts/prometheus-redis-exporter/OWNERS deleted file mode 100644 index 493906f56983..000000000000 --- a/charts/prometheus-redis-exporter/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -approvers: -- acondrat -reviewers: -- acondrat diff --git a/charts/prometheus-redis-exporter/README.md b/charts/prometheus-redis-exporter/README.md index 6cb7974cfc33..659950d3d29f 100644 --- a/charts/prometheus-redis-exporter/README.md +++ b/charts/prometheus-redis-exporter/README.md @@ -1,103 +1,87 @@ # prometheus-redis-exporter -[redis_exporter](https://github.com/oliver006/redis_exporter) is a Prometheus exporter for Redis metrics. +Prometheus exporter for [Redis](https://redis.io/) metrics. -## TL;DR; +This chart bootstraps a [Redis exporter](https://github.com/oliver006/redis_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. -```bash -$ helm install stable/prometheus-redis-exporter -``` +## Prerequisites -## Introduction +- Kubernetes 1.10+ with Beta APIs enabled -This chart bootstraps a [redis_exporter](https://github.com/oliver006/redis_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +## Get Repo Info -## Prerequisites +```console +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update +``` -- Kubernetes 1.10+ with Beta APIs enabled +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -## Installing the Chart +## Install Chart -To install the chart with the release name `my-release`: +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-redis-exporter -```bash -$ helm install --name my-release stable/prometheus-redis-exporter +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-redis-exporter ``` -The command deploys prometheus-redis-exporter on the Kubernetes cluster in the default configuration. +_See [configuration](#configuration) below._ + +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -## Uninstalling the Chart +## Uninstall Chart -To uninstall/delete the `my-release` deployment: +```console +# Helm 3 +$ helm uninstall [RELEASE_NAME] -```bash -$ helm delete my-release +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. - -## Configuration - -The following table lists the configurable parameters and their default values. - -| Parameter | Description | Default | -| ---------------------- | --------------------------------------------------- | ------------------------- | -| `replicaCount` | desired number of prometheus-redis-exporter pods | `1` | -| `image.repository` | prometheus-redis-exporter image repository | `oliver006/redis_exporter`| -| `image.tag` | prometheus-redis-exporter image tag | `v1.3.4` | -| `image.pullPolicy` | image pull policy | `IfNotPresent` | -| `image.pullSecrets` | image pull secrets | {} | -| `extraArgs` | extra arguments for the binary; possible values [here](https://github.com/oliver006/redis_exporter#flags)| {} -| `env` | additional environment variables in YAML format. Can be used to pass credentials as env variables (via secret) as per the image readme [here](https://github.com/oliver006/redis_exporter#environment-variables) | {} | -| `resources` | cpu/memory resource requests/limits | {} | -| `tolerations` | toleration labels for pod assignment | {} | -| `affinity` | affinity settings for pod assignment | {} | -| `service.type` | desired service type | `ClusterIP` | -| `service.port` | service external port | `9121` | -| `service.annotations` | Custom annotations for service | `{}` | -| `service.labels` | Additional custom labels for the service | `{}` | -| `redisAddress` | Address of the Redis instance to scrape. Use `rediss://` for SSL. | `redis://myredis:6379` | -| `annotations` | pod annotations for easier discovery | {} | -| `rbac.create` | Specifies whether RBAC resources should be created.| `true` | -| `rbac.pspEnabled` | Specifies whether a PodSecurityPolicy should be created.| `true` | -| `serviceAccount.create` | Specifies whether a service account should be created.| `true` | -| `serviceAccount.name` | Name of the service account.| | -| `serviceMonitor.enabled` | Use servicemonitor from prometheus operator | `false` | -| `serviceMonitor.namespace` | Namespace this servicemonitor is installed in | | -| `serviceMonitor.interval` | How frequently Prometheus should scrape | | -| `serviceMonitor.telemetryPath` | Path to redis-exporter telemtery-path | | -| `serviceMonitor.labels` | Labels for the servicemonitor passed to Prometheus Operator | `{}` | -| `serviceMonitor.timeout` | Timeout after which the scrape is ended | | -| `serviceMonitor.targetLabels` | Set of labels to transfer on the Kubernetes Service onto the target. | | -| `serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion. | | -| `prometheusRule.enabled` | Set this to true to create prometheusRules for Prometheus operator | `false` | -| `prometheusRule.additionalLabels` | Additional labels that can be used so prometheusRules will be discovered by Prometheus | `{}` | -| `prometheusRule.namespace` | namespace where prometheusRules resource should be created | | -| `prometheusRule.rules` | [rules](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) to be created, check values for an example. | `[]` | -| `script.configmap` | Let you run a custom lua script from a configmap. The corresponding environment variable `REDIS_EXPORTER_SCRIPT` will be set automatically || -| `script.keyname` | Name of the key inside configmap which contains your script || -| `auth.enabled` | Specifies whether redis uses authentication | `false` | -| `auth.secret.name` | Name of existing redis secret (ignores redisPassword) || -| `auth.secret.key` | Name of key containing password to be retrieved from the existing secret || -| `auth.redisPassword` | Redis password (when not stored in a secret) || +This removes all the Kubernetes components associated with the chart and deletes the release. -For more information please refer to the [redis_exporter](https://github.com/oliver006/redis_exporter) documentation. +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, +## Upgrading Chart -```bash -$ helm install --name my-release \ - --set "redisAddress=redis://myredis:6379" \ - stable/prometheus-redis-exporter +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +### To 3.0.1 + + The default tag for the exporter image is now `v1.x.x`. This major release includes changes to the names of various metrics and no longer directly supports the configuration (and scraping) of multiple redis instances; that is now the Prometheus server's responsibility. You'll want to use [this dashboard](https://github.com/oliver006/redis_exporter/blob/master/contrib/grafana_prometheus_redis_dashboard.json) now. Please see the [redis_exporter github page](https://github.com/oliver006/redis_exporter#upgrading-from-0x-to-1x) for more details. + +## Configuring + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: -```bash -$ helm install --name my-release -f values.yaml stable/prometheus-redis-exporter +```console +# Helm 2 +$ helm inspect values prometheus-community/prometheus-redis-exporter + +# Helm 3 +$ helm show values prometheus-community/prometheus-redis-exporter ``` + +For more information please refer to the [redis_exporter](https://github.com/oliver006/redis_exporter) documentation. + +### Redis Connection + +- To configure RabbitMQ connection set `redisAddress` string (example format: `redis://myredis:6379`) +- To configure auth by value, set `auth.enabled` to `true`, and `auth.redisPassword` value +- To configure auth by secret, set `auth.secret.name` and `auth.secret.key` values + ### Using a custom LUA-Script + First, you need to deploy the script with a configmap. This is an example script from mentioned in the [redis_exporter-image repository](https://github.com/oliver006/redis_exporter/blob/master/contrib/sample_collect_script.lua) + ```yaml apiVersion: v1 kind: ConfigMap @@ -127,10 +111,5 @@ data: return result ``` -If you want to use this script for collecting metrics, you could do this by just set `script.configmap` to the name of the configmap (e.g. `prometheus-redis-exporter-script`) and `script.keyname` to the configmap-key holding the script (eg. `script`). The required variables inside the container will be set automatically. -## Upgrading - -### To 3.0.1 - - The default tag for the exporter image is now `v1.x.x`. This major release includes changes to the names of various metrics and no longer directly supports the configuration (and scraping) of multiple redis instances; that is now the Prometheus server's responsibility. You'll want to use [this dashboard](https://github.com/oliver006/redis_exporter/blob/master/contrib/grafana_prometheus_redis_dashboard.json) now. Please see the [redis_exporter github page](https://github.com/oliver006/redis_exporter#upgrading-from-0x-to-1x) for more details. +If you want to use this script for collecting metrics, you could do this by just set `script.configmap` to the name of the configmap (e.g. `prometheus-redis-exporter-script`) and `script.keyname` to the configmap-key holding the script (eg. `script`). The required variables inside the container will be set automatically. diff --git a/charts/prometheus-snmp-exporter/Chart.yaml b/charts/prometheus-snmp-exporter/Chart.yaml index d99f47f76909..5d9b7cb6d564 100644 --- a/charts/prometheus-snmp-exporter/Chart.yaml +++ b/charts/prometheus-snmp-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Prometheus SNMP Exporter name: prometheus-snmp-exporter -version: 0.0.5 +version: 0.0.6 appVersion: 0.14.0 home: https://github.com/prometheus/snmp_exporter sources: diff --git a/charts/prometheus-snmp-exporter/OWNERS b/charts/prometheus-snmp-exporter/OWNERS deleted file mode 100644 index 48b09f34c54a..000000000000 --- a/charts/prometheus-snmp-exporter/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -approvers: -- miouge1 -reviewers: -- miouge1 diff --git a/charts/prometheus-snmp-exporter/README.md b/charts/prometheus-snmp-exporter/README.md index da4754431d75..0f62b580d504 100644 --- a/charts/prometheus-snmp-exporter/README.md +++ b/charts/prometheus-snmp-exporter/README.md @@ -1,109 +1,80 @@ # Prometheus SNMP Exporter -Prometheus exporter for snmp monitoring +An Prometheus exporter that exposes information gathered from SNMP. -Learn more: [https://github.com/prometheus/snmp_exporter](https://github.com/prometheus/snmp_exporter) +This chart creates a [SNMP Exporter](https://github.com/prometheus/snmp_exporter) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. -## TL;DR; +## Prerequisites + +- Kubernetes 1.8+ with Beta APIs enabled + +## Get Repo Info -```bash -$ helm install stable/prometheus-snmp-exporter +```console +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update ``` -## Introduction +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -This chart creates a SNMP-Exporter deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +## Install Chart -## Prerequisites +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-snmp-exporter -- Kubernetes 1.8+ with Beta APIs enabled +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-snmp-exporter +``` + +_See [configuration](#configuration) below._ -## Installing the Chart +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -To install the chart with the release name `my-release`: +## Uninstall Chart -```bash -$ helm install --name my-release stable/prometheus-snmp-exporter +```console +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command deploys SNMP Exporter on the Kubernetes cluster using the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +This removes all the Kubernetes components associated with the chart and deletes the release. -## Uninstalling the Chart +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ -To uninstall/delete the `my-release` deployment: +## Upgrading Chart -```bash -$ helm delete --purge my-release +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ ## Configuration -The following table lists the configurable parameters of the SNMP-Exporter chart and their default values. - -| Parameter | Description | Default | -| -------------------------------------- | ----------------------------------------------- | ----------------------------- | -| `config` | Prometheus SNMP configuration | {} | -| `configmapReload.name` | configmap-reload container name | `configmap-reload` | -| `configmapReload.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload` | -| `configmapReload.image.tag` | configmap-reload container image tag | `v0.2.2` | -| `configmapReload.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent` | -| `configmapReload.extraArgs` | Additional configmap-reload container arguments | `{}` | -| `configmapReload.extraConfigmapMounts` | Additional configmap-reload configMap mounts | `[]` | -| `configmapReload.resources` | configmap-reload pod resource requests & limits | `{}` | -| `extraArgs` | Optional flags for exporter | `[]` | -| `image.repository` | container image repository | `prom/snmp-exporter` | -| `image.tag` | container image tag | `v0.12.0` | -| `image.pullPolicy` | container image pull policy | `IfNotPresent` | -| `ingress.annotations` | Ingress annotations | None | -| `ingress.enabled` | Enables Ingress | `false` | -| `ingress.hosts` | Ingress accepted hostnames | None | -| `ingress.tls` | Ingress TLS configuration | None | -| `nodeSelector` | node labels for pod assignment | `{}` | -| `tolerations` | node tolerations for pod assignment | `[]` | -| `affinity` | node affinity for pod assignment | `{}` | -| `podAnnotations` | annotations to add to each pod | `{}` | -| `resources` | pod resource requests & limits | `{}` | -| `restartPolicy` | container restart policy | `Always` | -| `service.annotations` | annotations for the service | `{}` | -| `service.labels` | additional labels for the service | None | -| `service.type` | type of service to create | `ClusterIP` | -| `service.port` | port for the snmp http service | `9116` | -| `service.externalIPs` | list of external ips | [] | -| `rbac.create` | Use Role-based Access Control | `true` | -| `serviceAccount.create` | Should we create a ServiceAccount | `true` | -| `serviceAccount.name` | Name of the ServiceAccount to use | `null` | -| `serviceMonitor.enabled` | Enables ServiceMonitor | `false` | -| `serviceMonitor.params.enabled` | Enables params for serviceMonitor | `false` | -| `serviceMonitor.params.conf.module` | Module to use for scrapes | `[]` | -| `serviceMonitor.params.conf.target` | List of target(s) to scrape | `[]` | - - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```bash -$ helm install --name my-release \ - --set key_1=value_1,key_2=value_2 \ - stable/prometheus-snmp-exporter -``` +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, +```console +# Helm 2 +$ helm inspect values prometheus-community/prometheus-snmp-exporter -```bash -# example for staging -$ helm install --name my-release -f values.yaml stable/prometheus-snmp-exporter +# Helm 3 +$ helm show values prometheus-community/prometheus-snmp-exporter ``` -> **Tip**: You can use the default [values.yaml](values.yaml) - -## Prometheus Configuration +See [prometheus/snmp_exporter/README.md](https://github.com/prometheus/snmp_exporter/) for further information. +### Prometheus Configuration The snmp exporter needs to be passed the address as a parameter, this can be done with relabelling. Example config: -``` +```yaml scrape_configs: - job_name: 'snmp' static_configs: @@ -120,5 +91,3 @@ scrape_configs: - target_label: __address__ replacement: my-service-name:9116 # The SNMP exporter's Service name and port. ``` - -See [prometheus/snmp_exporter/README.md](https://github.com/prometheus/snmp_exporter/) for further information. diff --git a/charts/prometheus-to-sd/Chart.yaml b/charts/prometheus-to-sd/Chart.yaml index 707e96ca3094..861807c740fc 100644 --- a/charts/prometheus-to-sd/Chart.yaml +++ b/charts/prometheus-to-sd/Chart.yaml @@ -9,4 +9,4 @@ maintainers: - name: acondrat email: arcadie.condrat@gmail.com name: prometheus-to-sd -version: 0.3.0 +version: 0.3.1 diff --git a/charts/prometheus-to-sd/OWNERS b/charts/prometheus-to-sd/OWNERS deleted file mode 100644 index 493906f56983..000000000000 --- a/charts/prometheus-to-sd/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -approvers: -- acondrat -reviewers: -- acondrat diff --git a/charts/prometheus-to-sd/README.md b/charts/prometheus-to-sd/README.md index 60f080b53bfd..9650843abb50 100644 --- a/charts/prometheus-to-sd/README.md +++ b/charts/prometheus-to-sd/README.md @@ -2,67 +2,71 @@ [prometheus-to-sd](https://github.com/GoogleCloudPlatform/k8s-stackdriver/tree/master/prometheus-to-sd) is a simple component that can scrape metrics stored in prometheus text format from one or multiple components and push them to the Stackdriver -## TL;DR; - -```bash -$ helm install stable/prometheus-to-sd -``` - - ## Prerequisites - a service exposing metrics in prometheus format - k8s cluster should run on GCE or GKE -## Installing the Chart - -To install the chart with the release name `my-release`: +## Get Repo Info -```bash -$ helm install --name my-release stable/prometheus-to-sd +```console +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo update ``` -The command deploys prometheus-to-sd on the Kubernetes cluster in the default configuration. +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ -## Uninstalling the Chart +## Install Chart -To uninstall/delete the `my-release` deployment: +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus-to-sd -```bash -$ helm delete my-release +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus-to-sd ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. +_See [configuration](#configuration) below._ -## Configuration +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -The following table lists the configurable parameters and their default values. +## Uninstall Chart -| Parameter | Description | Default | -| ------------------ | ----------------------------------------------------------------------------------------- | ---------------------------------------------------------- | -| `image.repository` | prometheus-to-sd image repository | `gcr.io/google-containers/prometheus-to-sd` | -| `image.tag` | prometheus-to-sd image tag | `v0.5.2` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `resources` | CPU/Memory resource requests/limits | `{}` | -| `port` | Profiler port | `6060` | -| `metricSources` | Sources for metrics in the next format: component-name:http://host:port?whitelisted=a,b,c | `{"kube-state-metrics": "http://kube-state-metrics:8080"}` | -| `nodeSelector` | node labels for pod assignment | `{}` | -| `tolerations` | tolerations for node taints | `[]` | +```console +# Helm 3 +$ helm uninstall [RELEASE_NAME] -For more information please refer to the [prometheus-to-sd](https://github.com/GoogleCloudPlatform/k8s-stackdriver/tree/master/prometheus-to-sd) documentation. +# Helm 2 +# helm delete --purge [RELEASE_NAME] +``` + +This removes all the Kubernetes components associated with the chart and deletes the release. -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ -```bash -$ helm install --name my-release \ - --set "metricsSources.kube-state-metrics=http://kube-state-metrics:8080" \ - stable/prometheus-to-sd +## Upgrading Chart + +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install ``` -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +## Configuration + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: -```bash -$ helm install --name my-release -f values.yaml stable/prometheus-to-sd +```console +# Helm 2 +$ helm inspect values prometheus-community/prometheus-to-sd + +# Helm 3 +$ helm show values prometheus-community/prometheus-to-sd ``` -Multiple metrics sources can be defined. +For more information please refer to the [prometheus-to-sd](https://github.com/GoogleCloudPlatform/k8s-stackdriver/tree/master/prometheus-to-sd) documentation. + +### Metrics Sources + +Multiple metrics sources can be defined. To configure, set `metricsSources` value (example: `http://kube-state-metrics:8080`) diff --git a/charts/prometheus-to-sd/templates/deployment.yaml b/charts/prometheus-to-sd/templates/deployment.yaml index 1bb4773ec40b..6f4d2b4b2eb2 100644 --- a/charts/prometheus-to-sd/templates/deployment.yaml +++ b/charts/prometheus-to-sd/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "prometheus-to-sd.fullname" . }} @@ -9,6 +9,10 @@ metadata: heritage: {{ .Release.Service }} spec: replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app: {{ template "prometheus-to-sd.name" . }} + release: {{ .Release.Name }} template: metadata: labels: diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml index b825d5f1f60c..68227dd0b897 100644 --- a/charts/prometheus/Chart.yaml +++ b/charts/prometheus/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: prometheus -version: 11.11.1 -appVersion: 2.19.0 +version: 11.12.1 +appVersion: 2.20.1 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png diff --git a/charts/prometheus/OWNERS b/charts/prometheus/OWNERS deleted file mode 100644 index a290687fbf47..000000000000 --- a/charts/prometheus/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -approvers: -- gianrubio -- zanhsieh -- Xtigyro -reviewers: -- gianrubio -- zanhsieh -- Xtigyro diff --git a/charts/prometheus/README.md b/charts/prometheus/README.md index c6d80402be24..c1ae66c49a8d 100644 --- a/charts/prometheus/README.md +++ b/charts/prometheus/README.md @@ -2,57 +2,82 @@ [Prometheus](https://prometheus.io/), a [Cloud Native Computing Foundation](https://cncf.io/) project, is a systems and service monitoring system. It collects metrics from configured targets at given intervals, evaluates rule expressions, displays the results, and can trigger alerts if some condition is observed to be true. -## TL;DR; - -```console -helm install stable/prometheus -``` - -## Introduction - This chart bootstraps a [Prometheus](https://prometheus.io/) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. ## Prerequisites - Kubernetes 1.3+ with Beta APIs enabled -## Installing the Chart +## Get Repo Info -To install the chart with the release name `my-release`: +```console +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo add stable https://kubernetes-charts.storage.googleapis.com/ +helm repo update +``` + +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ + +## Install Chart ```console -helm install --name my-release stable/prometheus +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/prometheus + +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/prometheus ``` -The command deploys Prometheus on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. +_See [configuration](#configuration) below._ + +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -> **Tip**: List all releases using `helm list` +## Dependencies -## Uninstalling the Chart +By default this chart installs additional, dependent charts: -To uninstall/delete the `my-release` deployment: +- [stable/kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) + +To disable the dependency during installation, set `kubeStateMetrics.enabled` to `false`. + +_See [helm dependency](https://helm.sh/docs/helm/helm_dependency/) for command documentation._ + +## Uninstall Chart ```console -helm delete my-release +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. +This removes all the Kubernetes components associated with the chart and deletes the release. -## Prometheus 2.x +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ -Prometheus version 2.x has made changes to alertmanager, storage and recording rules. Check out the migration guide [here](https://prometheus.io/docs/prometheus/2.0/migration/) +## Upgrading Chart -Users of this chart will need to update their alerting rules to the new format before they can upgrade. +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] [CHART] --install +``` + +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ -## Upgrading from previous chart versions. +### To 9.0 -Version 9.0 adds a new option to enable or disable the Prometheus Server. -This supports the use case of running a Prometheus server in one k8s cluster and scraping exporters in another cluster while using the same chart for each deployment. -To install the server `server.enabled` must be set to `true`. +Version 9.0 adds a new option to enable or disable the Prometheus Server. This supports the use case of running a Prometheus server in one k8s cluster and scraping exporters in another cluster while using the same chart for each deployment. To install the server `server.enabled` must be set to `true`. + +### To 5.0 As of version 5.0, this chart uses Prometheus 2.x. This version of prometheus introduces a new data format and is not compatible with prometheus 1.x. It is recommended to install this as a new release, as updating existing releases will not work. See the [prometheus docs](https://prometheus.io/docs/prometheus/latest/migration/#storage) for instructions on retaining your old data. -### Example migration +Prometheus version 2.x has made changes to alertmanager, storage and recording rules. Check out the migration guide [here](https://prometheus.io/docs/prometheus/2.0/migration/). + +Users of this chart will need to update their alerting rules to the new format before they can upgrade. + +### Example Migration Assuming you have an existing release of the prometheus chart, named `prometheus-old`. In order to update to prometheus 2.x while keeping your old data do the following: @@ -90,16 +115,23 @@ Assuming you have an existing release of the prometheus chart, named `prometheus Old data will be available when you query the new prometheus instance. -## Scraping Pod Metrics via Annotations +## Configuration + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands: + +```console +# Helm 2 +$ helm inspect values prometheus-community/prometheus + +# Helm 3 +$ helm show values prometheus-community/prometheus +``` + +You may similarly use the above configuration commands on each chart [dependency](#dependencies) to see it's configurations. + +### Scraping Pod Metrics via Annotations -This chart uses a default configuration that causes prometheus -to scrape a variety of kubernetes resource types, provided they have the correct annotations. -In this section we describe how to configure pods to be scraped; -for information on how other resource types can be scraped you can -do a `helm template` to get the kubernetes resource definitions, -and then reference the prometheus configuration in the ConfigMap against the prometheus documentation -for [relabel_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) -and [kubernetes_sd_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config). +This chart uses a default configuration that causes prometheus to scrape a variety of kubernetes resource types, provided they have the correct annotations. In this section we describe how to configure pods to be scraped; for information on how other resource types can be scraped you can do a `helm template` to get the kubernetes resource definitions, and then reference the prometheus configuration in the ConfigMap against the prometheus documentation for [relabel_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) and [kubernetes_sd_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config). In order to get prometheus to scrape pods, you must add annotations to the the pods as below: @@ -109,309 +141,13 @@ metadata: prometheus.io/scrape: "true" prometheus.io/path: /metrics prometheus.io/port: "8080" -spec: -... ``` -You should adjust `prometheus.io/path` based on the URL that your pod serves metrics from. -`prometheus.io/port` should be set to the port that your pod serves metrics from. -Note that the values for `prometheus.io/scrape` and `prometheus.io/port` must be -enclosed in double quotes. - -## Configuration - -The following table lists the configurable parameters of the Prometheus chart and their default values. - -Parameter | Description | Default ---------- | ----------- | ------- -`alertmanager.enabled` | If true, create alertmanager | `true` -`alertmanager.name` | alertmanager container name | `alertmanager` -`alertmanager.useClusterRole` | Use a ClusterRole (and ClusterRoleBinding). If set to false - we define a Role and RoleBinding in the defined namespaces ONLY. This makes alertmanager work - for users who do not have ClusterAdmin privs, but wants alertmanager to operate on their own namespaces, instead of clusterwide. | `alertmanager` -`alertmanager.useExistingRole` | Set to a rolename to use existing role - skipping role creating - but still doing serviceaccount and rolebinding to the rolename set here. | `alertmanager` -`alertmanager.image.repository` | alertmanager container image repository | `prom/alertmanager` -`alertmanager.image.tag` | alertmanager container image tag | `v0.21.0` -`alertmanager.image.pullPolicy` | alertmanager container image pull policy | `IfNotPresent` -`alertmanager.prefixURL` | The prefix slug at which the server can be accessed | `` -`alertmanager.baseURL` | The external url at which the server can be accessed | `"http://localhost:9093"` -`alertmanager.extraArgs` | Additional alertmanager container arguments | `{}` -`alertmanager.extraSecretMounts` | Additional alertmanager Secret mounts | `[]` -`alertmanager.configMapOverrideName` | Prometheus alertmanager ConfigMap override where full-name is `{{.Release.Name}}-{{.Values.alertmanager.configMapOverrideName}}` and setting this value will prevent the default alertmanager ConfigMap from being generated | `""` -`alertmanager.configFromSecret` | The name of a secret in the same kubernetes namespace which contains the Alertmanager config, setting this value will prevent the default alertmanager ConfigMap from being generated | `""` -`alertmanager.configFileName` | The configuration file name to be loaded to alertmanager. Must match the key within configuration loaded from ConfigMap/Secret. | `alertmanager.yml` -`alertmanager.ingress.enabled` | If true, alertmanager Ingress will be created | `false` -`alertmanager.ingress.annotations` | alertmanager Ingress annotations | `{}` -`alertmanager.ingress.extraLabels` | alertmanager Ingress additional labels | `{}` -`alertmanager.ingress.hosts` | alertmanager Ingress hostnames | `[]` -`alertmanager.ingress.extraPaths` | Ingress extra paths to prepend to every alertmanager host configuration. Useful when configuring [custom actions with AWS ALB Ingress Controller](https://kubernetes-sigs.github.io/aws-alb-ingress-controller/guide/ingress/annotation/#actions) | `[]` -`alertmanager.ingress.tls` | alertmanager Ingress TLS configuration (YAML) | `[]` -`alertmanager.nodeSelector` | node labels for alertmanager pod assignment | `{}` -`alertmanager.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]` -`alertmanager.affinity` | pod affinity | `{}` -`alertmanager.podDisruptionBudget.enabled` | If true, create a PodDisruptionBudget | `false` -`alertmanager.podDisruptionBudget.maxUnavailable` | Maximum unavailable instances in PDB | `1` -`alertmanager.schedulerName` | alertmanager alternate scheduler name | `nil` -`alertmanager.persistentVolume.enabled` | If true, alertmanager will create a Persistent Volume Claim | `true` -`alertmanager.persistentVolume.accessModes` | alertmanager data Persistent Volume access modes | `[ReadWriteOnce]` -`alertmanager.persistentVolume.annotations` | Annotations for alertmanager Persistent Volume Claim | `{}` -`alertmanager.persistentVolume.existingClaim` | alertmanager data Persistent Volume existing claim name | `""` -`alertmanager.persistentVolume.mountPath` | alertmanager data Persistent Volume mount root path | `/data` -`alertmanager.persistentVolume.size` | alertmanager data Persistent Volume size | `2Gi` -`alertmanager.persistentVolume.storageClass` | alertmanager data Persistent Volume Storage Class | `unset` -`alertmanager.persistentVolume.volumeBindingMode` | alertmanager data Persistent Volume Binding Mode | `unset` -`alertmanager.persistentVolume.subPath` | Subdirectory of alertmanager data Persistent Volume to mount | `""` -`alertmanager.podAnnotations` | annotations to be added to alertmanager pods | `{}` -`alertmanager.podLabels` | labels to be added to Prometheus AlertManager pods | `{}` -`alertmanager.podSecurityPolicy.annotations` | Specify pod annotations in the pod security policy | `{}` | -`alertmanager.replicaCount` | desired number of alertmanager pods | `1` -`alertmanager.statefulSet.enabled` | If true, use a statefulset instead of a deployment for pod management | `false` -`alertmanager.statefulSet.podManagementPolicy` | podManagementPolicy of alertmanager pods | `OrderedReady` -`alertmanager.statefulSet.headless.annotations` | annotations for alertmanager headless service | `{}` -`alertmanager.statefulSet.headless.labels` | labels for alertmanager headless service | `{}` -`alertmanager.statefulSet.headless.enableMeshPeer` | If true, enable the mesh peer endpoint for the headless service | `false` -`alertmanager.statefulSet.headless.servicePort` | alertmanager headless service port | `80` -`alertmanager.priorityClassName` | alertmanager priorityClassName | `nil` -`alertmanager.resources` | alertmanager pod resource requests & limits | `{}` -`alertmanager.securityContext` | Custom [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) for Alert Manager containers | `{}` -`alertmanager.service.annotations` | annotations for alertmanager service | `{}` -`alertmanager.service.clusterIP` | internal alertmanager cluster service IP | `""` -`alertmanager.service.externalIPs` | alertmanager service external IP addresses | `[]` -`alertmanager.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` -`alertmanager.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` -`alertmanager.service.servicePort` | alertmanager service port | `80` -`alertmanager.service.sessionAffinity` | Session Affinity for alertmanager service, can be `None` or `ClientIP` | `None` -`alertmanager.service.type` | type of alertmanager service to create | `ClusterIP` -`alertmanager.strategy` | Deployment strategy | `{ "type": "RollingUpdate" }` -`alertmanagerFiles.alertmanager.yml` | Prometheus alertmanager configuration | example configuration -`configmapReload.prometheus.enabled` | If false, the configmap-reload container for Prometheus will not be deployed | `true` -`configmapReload.prometheus.name` | configmap-reload container name | `configmap-reload` -`configmapReload.prometheus.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload` -`configmapReload.prometheus.image.tag` | configmap-reload container image tag | `v0.3.0` -`configmapReload.prometheus.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent` -`configmapReload.prometheus.extraArgs` | Additional configmap-reload container arguments | `{}` -`configmapReload.prometheus.extraVolumeDirs` | Additional configmap-reload volume directories | `{}` -`configmapReload.prometheus.extraConfigmapMounts` | Additional configmap-reload configMap mounts | `[]` -`configmapReload.prometheus.resources` | configmap-reload pod resource requests & limits | `{}` -`configmapReload.alertmanager.enabled` | If false, the configmap-reload container for AlertManager will not be deployed | `true` -`configmapReload.alertmanager.name` | configmap-reload container name | `configmap-reload` -`configmapReload.alertmanager.image.repository` | configmap-reload container image repository | `jimmidyson/configmap-reload` -`configmapReload.alertmanager.image.tag` | configmap-reload container image tag | `v0.3.0` -`configmapReload.alertmanager.image.pullPolicy` | configmap-reload container image pull policy | `IfNotPresent` -`configmapReload.alertmanager.extraArgs` | Additional configmap-reload container arguments | `{}` -`configmapReload.alertmanager.extraVolumeDirs` | Additional configmap-reload volume directories | `{}` -`configmapReload.alertmanager.extraConfigmapMounts` | Additional configmap-reload configMap mounts | `[]` -`configmapReload.alertmanager.resources` | configmap-reload pod resource requests & limits | `{}` -`initChownData.enabled` | If false, don't reset data ownership at startup | true -`initChownData.name` | init-chown-data container name | `init-chown-data` -`initChownData.image.repository` | init-chown-data container image repository | `busybox` -`initChownData.image.tag` | init-chown-data container image tag | `latest` -`initChownData.image.pullPolicy` | init-chown-data container image pull policy | `IfNotPresent` -`initChownData.resources` | init-chown-data pod resource requests & limits | `{}` -`kubeStateMetrics.enabled` | If true, create kube-state-metrics sub-chart, see the [kube-state-metrics chart for configuration options](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) | `true` -`kube-state-metrics` | [kube-state-metrics configuration options](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) | `Same as sub-chart's` -`nodeExporter.enabled` | If true, create node-exporter | `true` -`nodeExporter.name` | node-exporter container name | `node-exporter` -`nodeExporter.image.repository` | node-exporter container image repository| `prom/node-exporter` -`nodeExporter.image.tag` | node-exporter container image tag | `v1.0.1` -`nodeExporter.image.pullPolicy` | node-exporter container image pull policy | `IfNotPresent` -`nodeExporter.extraArgs` | Additional node-exporter container arguments | `{}` -`nodeExporter.extraInitContainers` | Init containers to launch alongside the node-exporter | `[]` -`nodeExporter.extraHostPathMounts` | Additional node-exporter hostPath mounts | `[]` -`nodeExporter.extraConfigmapMounts` | Additional node-exporter configMap mounts | `[]` -`nodeExporter.hostNetwork` | If true, node-exporter pods share the host network namespace | `true` -`nodeExporter.hostPID` | If true, node-exporter pods share the host PID namespace | `true` -`nodeExporter.nodeSelector` | node labels for node-exporter pod assignment | `{}` -`nodeExporter.podAnnotations` | annotations to be added to node-exporter pods | `{}` -`nodeExporter.pod.labels` | labels to be added to node-exporter pods | `{}` -`nodeExporter.podDisruptionBudget.enabled` | If true, create a PodDisruptionBudget | `false` -`nodeExporter.podDisruptionBudget.maxUnavailable` | Maximum unavailable instances in PDB | `1` -`nodeExporter.podSecurityPolicy.annotations` | Specify pod annotations in the pod security policy | `{}` | -`nodeExporter.podSecurityPolicy.enabled` | Specify if a Pod Security Policy for node-exporter must be created | `false` -`nodeExporter.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]` -`nodeExporter.priorityClassName` | node-exporter priorityClassName | `nil` -`nodeExporter.resources` | node-exporter resource requests and limits (YAML) | `{}` -`nodeExporter.securityContext` | securityContext for containers in pod | `{}` -`nodeExporter.service.annotations` | annotations for node-exporter service | `{prometheus.io/scrape: "true"}` -`nodeExporter.service.clusterIP` | internal node-exporter cluster service IP | `None` -`nodeExporter.service.externalIPs` | node-exporter service external IP addresses | `[]` -`nodeExporter.service.hostPort` | node-exporter service host port | `9100` -`nodeExporter.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` -`nodeExporter.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` -`nodeExporter.service.servicePort` | node-exporter service port | `9100` -`nodeExporter.service.type` | type of node-exporter service to create | `ClusterIP` -`podSecurityPolicy.enabled` | If true, create & use pod security policies resources | `false` -`pushgateway.enabled` | If true, create pushgateway | `true` -`pushgateway.name` | pushgateway container name | `pushgateway` -`pushgateway.image.repository` | pushgateway container image repository | `prom/pushgateway` -`pushgateway.image.tag` | pushgateway container image tag | `v1.2.0` -`pushgateway.image.pullPolicy` | pushgateway container image pull policy | `IfNotPresent` -`pushgateway.extraArgs` | Additional pushgateway container arguments | `{}` -`pushgateway.extraInitContainers` | Init containers to launch alongside the pushgateway | `[]` -`pushgateway.ingress.enabled` | If true, pushgateway Ingress will be created | `false` -`pushgateway.ingress.annotations` | pushgateway Ingress annotations | `{}` -`pushgateway.ingress.hosts` | pushgateway Ingress hostnames | `[]` -`pushgateway.ingress.extraPaths` | Ingress extra paths to prepend to every pushgateway host configuration. Useful when configuring [custom actions with AWS ALB Ingress Controller](https://kubernetes-sigs.github.io/aws-alb-ingress-controller/guide/ingress/annotation/#actions) | `[]` -`pushgateway.ingress.tls` | pushgateway Ingress TLS configuration (YAML) | `[]` -`pushgateway.nodeSelector` | node labels for pushgateway pod assignment | `{}` -`pushgateway.podAnnotations` | annotations to be added to pushgateway pods | `{}` -`pushgateway.podSecurityPolicy.annotations` | Specify pod annotations in the pod security policy | `{}` | -`pushgateway.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]` -`pushgateway.replicaCount` | desired number of pushgateway pods | `1` -`pushgateway.podDisruptionBudget.enabled` | If true, create a PodDisruptionBudget | `false` -`pushgateway.podDisruptionBudget.maxUnavailable` | Maximum unavailable instances in PDB | `1` -`pushgateway.schedulerName` | pushgateway alternate scheduler name | `nil` -`pushgateway.persistentVolume.enabled` | If true, Prometheus pushgateway will create a Persistent Volume Claim | `false` -`pushgateway.persistentVolume.accessModes` | Prometheus pushgateway data Persistent Volume access modes | `[ReadWriteOnce]` -`pushgateway.persistentVolume.annotations` | Prometheus pushgateway data Persistent Volume annotations | `{}` -`pushgateway.persistentVolume.existingClaim` | Prometheus pushgateway data Persistent Volume existing claim name | `""` -`pushgateway.persistentVolume.mountPath` | Prometheus pushgateway data Persistent Volume mount root path | `/data` -`pushgateway.persistentVolume.size` | Prometheus pushgateway data Persistent Volume size | `2Gi` -`pushgateway.persistentVolume.storageClass` | Prometheus pushgateway data Persistent Volume Storage Class | `unset` -`pushgateway.persistentVolume.volumeBindingMode` | Prometheus pushgateway data Persistent Volume Binding Mode | `unset` -`pushgateway.persistentVolume.subPath` | Subdirectory of Prometheus server data Persistent Volume to mount | `""` -`pushgateway.priorityClassName` | pushgateway priorityClassName | `nil` -`pushgateway.resources` | pushgateway pod resource requests & limits | `{}` -`pushgateway.service.annotations` | annotations for pushgateway service | `{}` -`pushgateway.service.clusterIP` | internal pushgateway cluster service IP | `""` -`pushgateway.service.externalIPs` | pushgateway service external IP addresses | `[]` -`pushgateway.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` -`pushgateway.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` -`pushgateway.service.servicePort` | pushgateway service port | `9091` -`pushgateway.service.type` | type of pushgateway service to create | `ClusterIP` -`pushgateway.strategy` | Deployment strategy | `{ "type": "RollingUpdate" }` -`rbac.create` | If true, create & use RBAC resources | `true` -`server.enabled` | If false, Prometheus server will not be created | `true` -`server.name` | Prometheus server container name | `server` -`server.image.repository` | Prometheus server container image repository | `prom/prometheus` -`server.image.tag` | Prometheus server container image tag | `v2.19.0` -`server.image.pullPolicy` | Prometheus server container image pull policy | `IfNotPresent` -`server.configPath` | Path to a prometheus server config file on the container FS | `/etc/config/prometheus.yml` -`server.global.scrape_interval` | How frequently to scrape targets by default | `1m` -`server.global.scrape_timeout` | How long until a scrape request times out | `10s` -`server.global.evaluation_interval` | How frequently to evaluate rules | `1m` -`server.remoteWrite` | The remote write feature of Prometheus allow transparently sending samples. | `[]` -`server.remoteRead` | The remote read feature of Prometheus allow transparently receiving samples. | `[]` -`server.extraArgs` | Additional Prometheus server container arguments | `{}` -`server.extraFlags` | Additional Prometheus server container flags | `["web.enable-lifecycle"]` -`server.extraInitContainers` | Init containers to launch alongside the server | `[]` -`server.prefixURL` | The prefix slug at which the server can be accessed |`` -`server.baseURL` | The external url at which the server can be accessed | `` -`server.env` | Prometheus server environment variables | `[]` -`server.extraHostPathMounts` | Additional Prometheus server hostPath mounts | `[]` -`server.extraConfigmapMounts` | Additional Prometheus server configMap mounts | `[]` -`server.extraSecretMounts` | Additional Prometheus server Secret mounts | `[]` -`server.extraVolumeMounts` | Additional Prometheus server Volume mounts | `[]` -`server.extraVolumes` | Additional Prometheus server Volumes | `[]` -`server.configMapOverrideName` | Prometheus server ConfigMap override where full-name is `{{.Release.Name}}-{{.Values.server.configMapOverrideName}}` and setting this value will prevent the default server ConfigMap from being generated | `""` -`server.ingress.enabled` | If true, Prometheus server Ingress will be created | `false` -`server.ingress.annotations` | Prometheus server Ingress annotations | `[]` -`server.ingress.extraLabels` | Prometheus server Ingress additional labels | `{}` -`server.ingress.hosts` | Prometheus server Ingress hostnames | `[]` -`server.ingress.extraPaths` | Ingress extra paths to prepend to every Prometheus server host configuration. Useful when configuring [custom actions with AWS ALB Ingress Controller](https://kubernetes-sigs.github.io/aws-alb-ingress-controller/guide/ingress/annotation/#actions) | `[]` -`server.ingress.tls` | Prometheus server Ingress TLS configuration (YAML) | `[]` -`server.nodeSelector` | node labels for Prometheus server pod assignment | `{}` -`server.tolerations` | node taints to tolerate (requires Kubernetes >=1.6) | `[]` -`server.affinity` | pod affinity | `{}` -`server.podDisruptionBudget.enabled` | If true, create a PodDisruptionBudget | `false` -`server.podDisruptionBudget.maxUnavailable` | Maximum unavailable instances in PDB | `1` -`server.priorityClassName` | Prometheus server priorityClassName | `nil` -`server.enableServiceLinks` | Set service environment variables in Prometheus server pods | `true` -`server.schedulerName` | Prometheus server alternate scheduler name | `nil` -`server.persistentVolume.enabled` | If true, Prometheus server will create a Persistent Volume Claim | `true` -`server.persistentVolume.accessModes` | Prometheus server data Persistent Volume access modes | `[ReadWriteOnce]` -`server.persistentVolume.annotations` | Prometheus server data Persistent Volume annotations | `{}` -`server.persistentVolume.existingClaim` | Prometheus server data Persistent Volume existing claim name | `""` -`server.persistentVolume.mountPath` | Prometheus server data Persistent Volume mount root path | `/data` -`server.persistentVolume.size` | Prometheus server data Persistent Volume size | `8Gi` -`server.persistentVolume.storageClass` | Prometheus server data Persistent Volume Storage Class | `unset` -`server.persistentVolume.volumeBindingMode` | Prometheus server data Persistent Volume Binding Mode | `unset` -`server.persistentVolume.subPath` | Subdirectory of Prometheus server data Persistent Volume to mount | `""` -`server.emptyDir.sizeLimit` | emptyDir sizeLimit if a Persistent Volume is not used | `""` -`server.podAnnotations` | annotations to be added to Prometheus server pods | `{}` -`server.podLabels` | labels to be added to Prometheus server pods | `{}` -`server.alertmanagers` | Prometheus AlertManager configuration for the Prometheus server | `{}` -`server.deploymentAnnotations` | annotations to be added to Prometheus server deployment | `{}` -`server.podSecurityPolicy.annotations` | Specify pod annotations in the pod security policy | `{}` | -`server.replicaCount` | desired number of Prometheus server pods | `1` -`server.statefulSet.enabled` | If true, use a statefulset instead of a deployment for pod management | `false` -`server.statefulSet.annotations` | annotations to be added to Prometheus server stateful set | `{}` -`server.statefulSet.labels` | labels to be added to Prometheus server stateful set | `{}` -`server.statefulSet.podManagementPolicy` | podManagementPolicy of server pods | `OrderedReady` -`server.statefulSet.headless.annotations` | annotations for Prometheus server headless service | `{}` -`server.statefulSet.headless.labels` | labels for Prometheus server headless service | `{}` -`server.statefulSet.headless.servicePort` | Prometheus server headless service port | `80` -`server.statefulSet.headless.gRPC.enabled` | If true, open a second port on the service for gRPC | `false` -`server.statefulSet.headless.gRPC.servicePort` | Prometheus service gRPC port, (ignored if `server.service.gRPC.enabled` is not `true`) | `10901` -`server.statefulSet.headless.gRPC.nodePort` | Port to be used as gRPC nodePort in the prometheus service | `0` -`server.readinessProbeInitialDelay` | the initial delay for the Prometheus server readiness probe | `30` -`server.readinessProbePeriodSeconds` | how often (in seconds) to perform the Prometheus server readiness probe | `5` -`server.readinessProbeTimeout` | the timeout for the Prometheus server readiness probe | `30` -`server.readinessProbeFailureThreshold` | the failure threshold for the Prometheus server readiness probe | `3` -`server.readinessProbeSuccessThreshold` | the success threshold for the Prometheus server readiness probe | `1` -`server.livenessProbeInitialDelay` | the initial delay for the Prometheus server liveness probe | `30` -`server.livenessProbePeriodSeconds` | how often (in seconds) to perform the Prometheus server liveness probe | `15` -`server.livenessProbeTimeout` | the timeout for the Prometheus server liveness probe | `30` -`server.livenessProbeFailureThreshold` | the failure threshold for the Prometheus server liveness probe | `3` -`server.livenessProbeSuccessThreshold` | the success threshold for the Prometheus server liveness probe | `1` -`server.resources` | Prometheus server resource requests and limits | `{}` -`server.verticalAutoscaler.enabled` | If true a VPA object will be created for the controller (either StatefulSet or Deployemnt, based on above configs) | `false` -`server.securityContext` | Custom [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) for server containers | `{}` -`server.service.annotations` | annotations for Prometheus server service | `{}` -`server.service.clusterIP` | internal Prometheus server cluster service IP | `""` -`server.service.externalIPs` | Prometheus server service external IP addresses | `[]` -`server.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` -`server.service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | `[]` -`server.service.nodePort` | Port to be used as the service NodePort (ignored if `server.service.type` is not `NodePort`) | `0` -`server.service.servicePort` | Prometheus server service port | `80` -`server.service.sessionAffinity` | Session Affinity for server service, can be `None` or `ClientIP` | `None` -`server.service.type` | type of Prometheus server service to create | `ClusterIP` -`server.service.gRPC.enabled` | If true, open a second port on the service for gRPC | `false` -`server.service.gRPC.servicePort` | Prometheus service gRPC port, (ignored if `server.service.gRPC.enabled` is not `true`) | `10901` -`server.service.gRPC.nodePort` | Port to be used as gRPC nodePort in the prometheus service | `0` -`server.service.statefulsetReplica.enabled` | If true, send the traffic from the service to only one replica of the replicaset | `false` -`server.service.statefulsetReplica.replica` | Which replica to send the traffice to | `0` -`server.hostAliases` | /etc/hosts-entries in container(s) | [] -`server.sidecarContainers` | array of snippets with your sidecar containers for prometheus server | `""` -`server.strategy` | Deployment strategy | `{ "type": "RollingUpdate" }` -`serviceAccounts.alertmanager.create` | If true, create the alertmanager service account | `true` -`serviceAccounts.alertmanager.name` | name of the alertmanager service account to use or create | `{{ prometheus.alertmanager.fullname }}` -`serviceAccounts.alertmanager.annotations` | annotations for the alertmanager service account | `{}` -`serviceAccounts.nodeExporter.create` | If true, create the nodeExporter service account | `true` -`serviceAccounts.nodeExporter.name` | name of the nodeExporter service account to use or create | `{{ prometheus.nodeExporter.fullname }}` -`serviceAccounts.nodeExporter.annotations` | annotations for the nodeExporter service account | `{}` -`serviceAccounts.pushgateway.create` | If true, create the pushgateway service account | `true` -`serviceAccounts.pushgateway.name` | name of the pushgateway service account to use or create | `{{ prometheus.pushgateway.fullname }}` -`serviceAccounts.pushgateway.annotations` | annotations for the pushgateway service account | `{}` -`serviceAccounts.server.create` | If true, create the server service account | `true` -`serviceAccounts.server.name` | name of the server service account to use or create | `{{ prometheus.server.fullname }}` -`serviceAccounts.server.annotations` | annotations for the server service account | `{}` -`server.terminationGracePeriodSeconds` | Prometheus server Pod termination grace period | `300` -`server.retention` | (optional) Prometheus data retention | `"15d"` -`serverFiles.alerts` | (Deprecated) Prometheus server alerts configuration | `{}` -`serverFiles.rules` | (Deprecated) Prometheus server rules configuration | `{}` -`serverFiles.alerting_rules.yml` | Prometheus server alerts configuration | `{}` -`serverFiles.recording_rules.yml` | Prometheus server rules configuration | `{}` -`serverFiles.prometheus.yml` | Prometheus server scrape configuration | example configuration -`extraScrapeConfigs` | Prometheus server additional scrape configuration | "" -`alertRelabelConfigs` | Prometheus server [alert relabeling configs](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alert_relabel_configs) for H/A prometheus | "" -`networkPolicy.enabled` | Enable NetworkPolicy | `false` -`forceNamespace` | Force resources to be namespaced | `null` | - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```console -helm install stable/prometheus --name my-release \ - --set server.terminationGracePeriodSeconds=360 -``` - -Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example, - -```console -helm install stable/prometheus --name my-release -f values.yaml -``` +You should adjust `prometheus.io/path` based on the URL that your pod serves metrics from. `prometheus.io/port` should be set to the port that your pod serves metrics from. Note that the values for `prometheus.io/scrape` and `prometheus.io/port` must be enclosed in double quotes. -> **Tip**: You can use the default [values.yaml](values.yaml) +### Sharing Alerts Between Services -Note that you have multiple yaml files. This is particularly useful when you have alerts belonging to multiple services in the cluster. For example, +Note that when [installing](#install-chart) or [upgrading](#upgrading-chart) you may use multiple values override files. This is particularly useful when you have alerts belonging to multiple services in the cluster. For example, ```yaml # values.yaml @@ -433,7 +169,7 @@ serverFiles: ``` ```console -helm install stable/prometheus --name my-release -f values.yaml -f service1-alert.yaml -f service2-alert.yaml +helm install [RELEASE_NAME] prometheus-community/prometheus -f values.yaml -f service1-alert.yaml -f service2-alert.yaml ``` ### RBAC Configuration @@ -452,7 +188,7 @@ Prometheus is configured through [prometheus.yml](https://prometheus.io/docs/ope ### Ingress TLS -If your cluster allows automatic creation/retrieval of TLS certificates (e.g. [kube-lego](https://github.com/jetstack/kube-lego)), please refer to the documentation for that mechanism. +If your cluster allows automatic creation/retrieval of TLS certificates (e.g. [cert-manager](https://github.com/jetstack/cert-manager)), please refer to the documentation for that mechanism. To manually configure TLS, first create/retrieve a key & certificate pair for the address(es) you wish to protect. Then create a TLS secret in the namespace: @@ -486,12 +222,8 @@ server: ### NetworkPolicy -Enabling Network Policy for Prometheus will secure connections to Alert Manager -and Kube State Metrics by only accepting connections from Prometheus Server. -All inbound connections to Prometheus Server are still allowed. +Enabling Network Policy for Prometheus will secure connections to Alert Manager and Kube State Metrics by only accepting connections from Prometheus Server. All inbound connections to Prometheus Server are still allowed. -To enable network policy for Prometheus, install a networking plugin that -implements the Kubernetes NetworkPolicy spec, and set `networkPolicy.enabled` to true. +To enable network policy for Prometheus, install a networking plugin that implements the Kubernetes NetworkPolicy spec, and set `networkPolicy.enabled` to true. -If NetworkPolicy is enabled for Prometheus' scrape targets, you may also need -to manually create a networkpolicy which allows it. +If NetworkPolicy is enabled for Prometheus' scrape targets, you may also need to manually create a networkpolicy which allows it. diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml index c326cd6f2fe8..1045f2712733 100644 --- a/charts/prometheus/values.yaml +++ b/charts/prometheus/values.yaml @@ -332,7 +332,7 @@ configmapReload: ## image: repository: jimmidyson/configmap-reload - tag: v0.3.0 + tag: v0.4.0 pullPolicy: IfNotPresent ## Additional configmap-reload container arguments @@ -370,7 +370,7 @@ configmapReload: ## image: repository: jimmidyson/configmap-reload - tag: v0.3.0 + tag: v0.4.0 pullPolicy: IfNotPresent ## Additional configmap-reload container arguments @@ -568,7 +568,7 @@ server: ## image: repository: prom/prometheus - tag: v2.19.2 + tag: v2.20.1 pullPolicy: IfNotPresent ## prometheus server priorityClassName diff --git a/ct.yaml b/ct.yaml index 5ca34d5dfa5f..59f6b1d56d48 100644 --- a/ct.yaml +++ b/ct.yaml @@ -6,3 +6,6 @@ chart-dirs: chart-repos: - stable=https://kubernetes-charts.storage.googleapis.com/ helm-extra-args: --timeout 600s +excluded-charts: + # If not running on GCE, will error: "Failed to get GCE config" + - prometheus-to-sd From 08fa4144d041067ac05eb7e360d4e42fade222d7 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 07:35:20 -0400 Subject: [PATCH 14/55] Add kube-prometheus chart maintainers to CODEOWNERS after merging main Signed-off-by: Scott Rigby --- .github/CODEOWNERS | 1 + charts/kube-prometheus/OWNERS | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 charts/kube-prometheus/OWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d26cef14cfb0..1afca5e5d12e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,6 +1,7 @@ # See https://github.com/scottrigby/prometheus-helm-charts/issues/12 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners +charts/kube-prometheus/ @vsliouniaev @bismarck @gianrubio charts/prometheus/ @gianrubio @zanhsieh @Xtigyro charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio diff --git a/charts/kube-prometheus/OWNERS b/charts/kube-prometheus/OWNERS deleted file mode 100644 index 9231f2531dc4..000000000000 --- a/charts/kube-prometheus/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -approvers: -- vsliouniaev -- bismarck -- gianrubio -reviewers: -- vsliouniaev -- bismarck -- gianrubio From 4ce796641349ebcc7509ac9ba55f84c217720431 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 07:55:02 -0400 Subject: [PATCH 15/55] Un-deprecate chart within renaming to kube-prometheus PR Signed-off-by: Scott Rigby --- charts/kube-prometheus/Chart.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/charts/kube-prometheus/Chart.yaml b/charts/kube-prometheus/Chart.yaml index 4e1134d4162b..77c63068eadd 100644 --- a/charts/kube-prometheus/Chart.yaml +++ b/charts/kube-prometheus/Chart.yaml @@ -1,10 +1,13 @@ apiVersion: v1 -deprecated: true -description: DEPRECATED - This chart will be renamed. See https://github.com/prometheus-community/community/issues/28#issuecomment-670406329 +description: prometheus-operator collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png engine: gotpl -maintainers: [] -name: prometheus-operator +maintainers: + - name: vsliouniaev + - name: bismarck + - name: gianrubio + email: gianrubio@gmail.com +name: kube-prometheus sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator From 2e12e182f24bdc5d2cebe393759a959eec3986d6 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 08:15:23 -0400 Subject: [PATCH 16/55] Change all references to old coreos/prometheus-operator and coreos/kube-prometheus git repos to the new prometheus-operator github org Signed-off-by: Scott Rigby --- charts/kube-prometheus/Chart.yaml | 7 ++-- charts/kube-prometheus/README.md | 23 ++++++------ .../crds/crd-alertmanager.yaml | 2 +- .../kube-prometheus/crds/crd-podmonitor.yaml | 2 +- .../kube-prometheus/crds/crd-prometheus.yaml | 2 +- .../crds/crd-prometheusrules.yaml | 2 +- .../crds/crd-servicemonitor.yaml | 2 +- .../crds/crd-thanosrulers.yaml | 2 +- charts/kube-prometheus/hack/README.md | 12 +++---- .../hack/sync_grafana_dashboards.py | 4 +-- .../hack/sync_prometheus_rules.py | 4 +-- .../grafana/dashboards-1.14/apiserver.yaml | 2 +- .../dashboards-1.14/cluster-total.yaml | 2 +- .../dashboards-1.14/controller-manager.yaml | 2 +- .../k8s-resources-cluster.yaml | 2 +- .../k8s-resources-namespace.yaml | 2 +- .../dashboards-1.14/k8s-resources-node.yaml | 2 +- .../dashboards-1.14/k8s-resources-pod.yaml | 2 +- .../k8s-resources-workload.yaml | 2 +- .../k8s-resources-workloads-namespace.yaml | 2 +- .../grafana/dashboards-1.14/kubelet.yaml | 2 +- .../dashboards-1.14/namespace-by-pod.yaml | 2 +- .../namespace-by-workload.yaml | 2 +- .../node-cluster-rsrc-use.yaml | 2 +- .../dashboards-1.14/node-rsrc-use.yaml | 2 +- .../grafana/dashboards-1.14/nodes.yaml | 2 +- .../persistentvolumesusage.yaml | 2 +- .../grafana/dashboards-1.14/pod-total.yaml | 2 +- .../prometheus-remote-write.yaml | 2 +- .../grafana/dashboards-1.14/prometheus.yaml | 2 +- .../grafana/dashboards-1.14/proxy.yaml | 2 +- .../grafana/dashboards-1.14/scheduler.yaml | 2 +- .../grafana/dashboards-1.14/statefulset.yaml | 2 +- .../dashboards-1.14/workload-total.yaml | 2 +- .../dashboards/k8s-cluster-rsrc-use.yaml | 2 +- .../grafana/dashboards/k8s-node-rsrc-use.yaml | 2 +- .../dashboards/k8s-resources-cluster.yaml | 2 +- .../dashboards/k8s-resources-namespace.yaml | 2 +- .../grafana/dashboards/k8s-resources-pod.yaml | 2 +- .../dashboards/k8s-resources-workload.yaml | 2 +- .../k8s-resources-workloads-namespace.yaml | 2 +- .../templates/grafana/dashboards/nodes.yaml | 2 +- .../dashboards/persistentvolumesusage.yaml | 2 +- .../templates/grafana/dashboards/pods.yaml | 2 +- .../grafana/dashboards/statefulset.yaml | 2 +- .../rules-1.14/alertmanager.rules.yaml | 2 +- .../prometheus/rules-1.14/general.rules.yaml | 2 +- .../prometheus/rules-1.14/k8s.rules.yaml | 2 +- .../kube-apiserver-availability.rules.yaml | 2 +- .../rules-1.14/kube-apiserver-slos.yaml | 2 +- .../rules-1.14/kube-apiserver.rules.yaml | 2 +- .../kube-prometheus-general.rules.yaml | 2 +- .../kube-prometheus-node-recording.rules.yaml | 2 +- .../rules-1.14/kube-scheduler.rules.yaml | 2 +- .../rules-1.14/kube-state-metrics.yaml | 2 +- .../prometheus/rules-1.14/kubelet.rules.yaml | 2 +- .../rules-1.14/kubernetes-apps.yaml | 2 +- .../rules-1.14/kubernetes-resources.yaml | 2 +- .../rules-1.14/kubernetes-storage.yaml | 2 +- .../kubernetes-system-apiserver.yaml | 2 +- .../kubernetes-system-controller-manager.yaml | 2 +- .../rules-1.14/kubernetes-system-kubelet.yaml | 2 +- .../kubernetes-system-scheduler.yaml | 2 +- .../rules-1.14/kubernetes-system.yaml | 2 +- .../rules-1.14/node-exporter.rules.yaml | 2 +- .../prometheus/rules-1.14/node-exporter.yaml | 2 +- .../prometheus/rules-1.14/node-network.yaml | 2 +- .../prometheus/rules-1.14/node.rules.yaml | 2 +- .../rules-1.14/prometheus-operator.yaml | 2 +- .../prometheus/rules-1.14/prometheus.yaml | 2 +- .../prometheus/rules/alertmanager.rules.yaml | 2 +- .../prometheus/rules/general.rules.yaml | 2 +- .../templates/prometheus/rules/k8s.rules.yaml | 2 +- .../rules/kube-apiserver.rules.yaml | 2 +- .../kube-prometheus-node-alerting.rules.yaml | 2 +- .../kube-prometheus-node-recording.rules.yaml | 2 +- .../rules/kube-scheduler.rules.yaml | 2 +- .../prometheus/rules/kubernetes-absent.yaml | 2 +- .../prometheus/rules/kubernetes-apps.yaml | 2 +- .../rules/kubernetes-resources.yaml | 2 +- .../prometheus/rules/kubernetes-storage.yaml | 2 +- .../prometheus/rules/kubernetes-system.yaml | 2 +- .../prometheus/rules/node-network.yaml | 2 +- .../templates/prometheus/rules/node-time.yaml | 2 +- .../prometheus/rules/node.rules.yaml | 2 +- .../prometheus/rules/prometheus-operator.yaml | 2 +- .../prometheus/rules/prometheus.rules.yaml | 2 +- charts/kube-prometheus/values.yaml | 36 +++++++++---------- 88 files changed, 124 insertions(+), 126 deletions(-) diff --git a/charts/kube-prometheus/Chart.yaml b/charts/kube-prometheus/Chart.yaml index 77c63068eadd..3c2047f3256b 100644 --- a/charts/kube-prometheus/Chart.yaml +++ b/charts/kube-prometheus/Chart.yaml @@ -9,13 +9,12 @@ maintainers: email: gianrubio@gmail.com name: kube-prometheus sources: - - https://github.com/coreos/kube-prometheus - - https://github.com/coreos/prometheus-operator - - https://coreos.com/operators/prometheus + - https://github.com/prometheus-operator/kube-prometheus + - https://github.com/prometheus-operator/prometheus-operator version: 9.3.2 appVersion: 0.38.1 tillerVersion: ">=2.12.0" -home: https://github.com/coreos/kube-prometheus +home: https://github.com/prometheus-operator/kube-prometheus keywords: - operator - prometheus diff --git a/charts/kube-prometheus/README.md b/charts/kube-prometheus/README.md index 1bf1e143ccae..88f316a37518 100644 --- a/charts/kube-prometheus/README.md +++ b/charts/kube-prometheus/README.md @@ -78,13 +78,12 @@ You should upgrade to Helm 2.14 + in order to avoid this issue. However, if you 1. Create CRDs ```console -kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml -kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml -kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml -kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml -kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml -kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml - +kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml +kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml +kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml +kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml +kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml +kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml ``` 2. Wait for CRDs to be created, which should only take a few seconds @@ -113,12 +112,12 @@ Because the operator can only run as a single pod, there is potential for this c ## Developing Prometheus Rules and Grafana Dashboards -This chart Grafana Dashboards and Prometheus Rules are just a copy from coreos/prometheus-operator and other sources, synced (with alterations) by scripts in [hack](hack) folder. In order to introduce any changes you need to first [add them to the original repo](https://github.com/coreos/kube-prometheus/blob/master/docs/developing-prometheus-rules-and-grafana-dashboards.md) and then sync there by scripts. +This chart Grafana Dashboards and Prometheus Rules are just a copy from [prometheus-operator/prometheus-operator](https://github.com/prometheus-operator/prometheus-operator) and other sources, synced (with alterations) by scripts in [hack](hack) folder. In order to introduce any changes you need to first [add them to the original repo](https://github.com/prometheus-operator/kube-prometheus/blob/master/docs/developing-prometheus-rules-and-grafana-dashboards.md) and then sync there by scripts. ## Further Information For more in-depth documentation of configuration options meanings, please see -- [Prometheus Operator](https://github.com/coreos/prometheus-operator) +- [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator) - [Prometheus](https://prometheus.io/docs/introduction/overview/) - [Grafana](https://github.com/helm/charts/tree/master/stable/grafana#grafana-helm-chart) @@ -154,7 +153,7 @@ invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]s If this error has already been encountered, a `helm history` command can be used to determine which release has worked, then `helm rollback` to the release, then `helm upgrade --force` to this new one ## prometheus.io/scrape -The prometheus operator does not support annotation-based discovery of services, using the `serviceMonitor` CRD in its place as it provides far more configuration options. For information on how to use servicemonitors, please see the documentation on the coreos/prometheus-operator documentation here: [Running Exporters](https://github.com/coreos/prometheus-operator/blob/master/Documentation/user-guides/running-exporters.md) +The prometheus operator does not support annotation-based discovery of services, using the `serviceMonitor` CRD in its place as it provides far more configuration options. For information on how to use servicemonitors, please see the documentation on the `prometheus-operator/prometheus-operator` documentation here: [Running Exporters](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/running-exporters.md) By default, Prometheus discovers ServiceMonitors within its namespace, that are labeled with the same release tag as the prometheus-operator release. Sometimes, you may need to discover custom ServiceMonitors, for example used to scrape data from third-party applications. An easy way of doing this, without compromising the default ServiceMonitors discovery, is allowing Prometheus to discover all ServiceMonitors within its namespace, without applying label filtering. To do so, you can set `prometheus.prometheusSpec.serviceMonitorSelectorNilUsesHelmValues` to `false`. @@ -167,7 +166,7 @@ There is no simple and direct migration path between the charts as the changes a The capabilities of the old chart are all available in the new chart, including the ability to run multiple prometheus instances on a single cluster - you will need to disable the parts of the chart you do not wish to deploy. -You can check out the tickets for this change [here](https://github.com/coreos/prometheus-operator/issues/592) and [here](https://github.com/helm/charts/pull/6765). +You can check out the tickets for this change [here](https://github.com/prometheus-operator/prometheus-operator/issues/592) and [here](https://github.com/helm/charts/pull/6765). ### High-level overview of Changes @@ -178,7 +177,7 @@ The chart has added 3 [dependencies](#dependencies). - Node-Exporter, Kube-State-Metrics: These components are loaded as dependencies into the chart. The source for both charts is found in the same repository. They are relatively simple components. - Grafana: The Grafana chart is more feature-rich than this chart - it contains a sidecar that is able to load data sources and dashboards from configmaps deployed into the same cluster. For more information check out the [documentation for the chart](https://github.com/helm/charts/tree/master/stable/grafana) -#### Coreos CRDs +#### CoreOS CRDs The CRDs are provisioned using crd-install hooks, rather than relying on a separate chart installation. If you already have these CRDs provisioned and don't want to remove them, you can disable the CRD creation by these hooks by passing `prometheusOperator.createCustomResource=false` (not required if using Helm v3). #### Kubelet Service diff --git a/charts/kube-prometheus/crds/crd-alertmanager.yaml b/charts/kube-prometheus/crds/crd-alertmanager.yaml index cbf9fc27f9b2..0f79b366a28a 100644 --- a/charts/kube-prometheus/crds/crd-alertmanager.yaml +++ b/charts/kube-prometheus/crds/crd-alertmanager.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/charts/kube-prometheus/crds/crd-podmonitor.yaml b/charts/kube-prometheus/crds/crd-podmonitor.yaml index ab2af4e7cb3a..4f2bc5791af6 100644 --- a/charts/kube-prometheus/crds/crd-podmonitor.yaml +++ b/charts/kube-prometheus/crds/crd-podmonitor.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/charts/kube-prometheus/crds/crd-prometheus.yaml b/charts/kube-prometheus/crds/crd-prometheus.yaml index 3699396f1c85..858efa5af983 100644 --- a/charts/kube-prometheus/crds/crd-prometheus.yaml +++ b/charts/kube-prometheus/crds/crd-prometheus.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/charts/kube-prometheus/crds/crd-prometheusrules.yaml b/charts/kube-prometheus/crds/crd-prometheusrules.yaml index 3f5cb492399e..1383c098d270 100644 --- a/charts/kube-prometheus/crds/crd-prometheusrules.yaml +++ b/charts/kube-prometheus/crds/crd-prometheusrules.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/charts/kube-prometheus/crds/crd-servicemonitor.yaml b/charts/kube-prometheus/crds/crd-servicemonitor.yaml index e631c2c0901c..0af32cb5dd06 100644 --- a/charts/kube-prometheus/crds/crd-servicemonitor.yaml +++ b/charts/kube-prometheus/crds/crd-servicemonitor.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/charts/kube-prometheus/crds/crd-thanosrulers.yaml b/charts/kube-prometheus/crds/crd-thanosrulers.yaml index e7b935a99860..2e8f26a4c741 100644 --- a/charts/kube-prometheus/crds/crd-thanosrulers.yaml +++ b/charts/kube-prometheus/crds/crd-thanosrulers.yaml @@ -1,4 +1,4 @@ -# https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml +# https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: diff --git a/charts/kube-prometheus/hack/README.md b/charts/kube-prometheus/hack/README.md index e5a8de90766a..4020b64057f5 100644 --- a/charts/kube-prometheus/hack/README.md +++ b/charts/kube-prometheus/hack/README.md @@ -6,17 +6,17 @@ This script generates prometheus rules set for alertmanager from any properly fo Currently following imported: -- [coreos/kube-prometheus rules set](https://github.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml) +- [prometheus-operator/kube-prometheus rules set](https://github.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml) - In order to modify these rules: - prepare and merge PR into [kubernetes-mixin](https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/rules) master and/or release branch - - run import inside your fork of [coreos/kube-prometheus](https://github.com/coreos/kube-prometheus/tree/master) + - run import inside your fork of [prometheus-operator/kube-prometheus](https://github.com/kube-prometheus/kube-prometheus/tree/master) ```bash jb update make generate-in-docker ``` - - prepare and merge PR with imported changes into coreos/kube-prometheus master and/or release branch + - prepare and merge PR with imported changes into `prometheus-operator/kube-prometheus` master and/or release branch - run sync_prometheus_rules.py inside your fork of this repo - send PR with changes to this repo - [etcd-io/etc rules set](https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/etcd3_alert.rules.yml) @@ -31,17 +31,17 @@ This script generates grafana dashboards from json files, splitting them to sepa Currently following imported: -- [coreos/kube-prometheus dashboards](https://github.com/coreos/kube-prometheus/manifests/grafana-deployment.yaml) +- [prometheus-operator/kube-prometheus dashboards](https://github.com/kube-prometheus/kube-prometheus/manifests/grafana-deployment.yaml) - In order to modify these dashboards: - prepare and merge PR into [kubernetes-mixin](https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/dashboards) master and/or release branch - - run import inside your fork of [coreos/kube-prometheus](https://github.com/coreos/kube-prometheus/tree/master) + - run import inside your fork of [prometheus-operator/kube-prometheus](https://github.com/kube-prometheus/kube-prometheus/tree/master) ```bash jb update make generate-in-docker ``` - - prepare and merge PR with imported changes into coreos/kube-prometheus master and/or release branch + - prepare and merge PR with imported changes into `prometheus-operator/kube-prometheus` master and/or release branch - run sync_grafana_dashboards.py inside your fork of this repo - send PR with changes to this repo - [etcd-io/etc dashboard](https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/grafana.json) diff --git a/charts/kube-prometheus/hack/sync_grafana_dashboards.py b/charts/kube-prometheus/hack/sync_grafana_dashboards.py index 9ef550147aff..76364b6010cd 100755 --- a/charts/kube-prometheus/hack/sync_grafana_dashboards.py +++ b/charts/kube-prometheus/hack/sync_grafana_dashboards.py @@ -26,7 +26,7 @@ def new_representer(dumper, data): # Source files list charts = [ { - 'source': 'https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml', + 'source': 'https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml', 'destination': '../templates/grafana/dashboards-1.14', 'type': 'yaml', 'min_kubernetes': '1.14.0-0' @@ -38,7 +38,7 @@ def new_representer(dumper, data): 'min_kubernetes': '1.14.0-0' }, { - 'source': 'https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml', + 'source': 'https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml', 'destination': '../templates/grafana/dashboards', 'type': 'yaml', 'min_kubernetes': '1.10.0-0', diff --git a/charts/kube-prometheus/hack/sync_prometheus_rules.py b/charts/kube-prometheus/hack/sync_prometheus_rules.py index 49a5a80e01f2..a294582240c7 100755 --- a/charts/kube-prometheus/hack/sync_prometheus_rules.py +++ b/charts/kube-prometheus/hack/sync_prometheus_rules.py @@ -25,7 +25,7 @@ def new_representer(dumper, data): # Source files list charts = [ { - 'source': 'https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml', + 'source': 'https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml', 'destination': '../templates/prometheus/rules-1.14', 'min_kubernetes': '1.14.0-0' }, @@ -35,7 +35,7 @@ def new_representer(dumper, data): 'min_kubernetes': '1.14.0-0' }, { - 'source': 'https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml', + 'source': 'https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml', 'destination': '../templates/prometheus/rules', 'min_kubernetes': '1.10.0-0', 'max_kubernetes': '1.14.0-0' diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml index 7d3f342f674e..7c2f070f72b3 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'apiserver' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'apiserver' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml index d853896e1c57..efb41761aef5 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'cluster-total' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'cluster-total' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml index 66295f00e37d..953a88496557 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'controller-manager' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'controller-manager' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml index eec14793db58..43f7f04558bb 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml index 1ad58dc78141..7243badd9a77 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml index c114fe946442..527ac49bc137 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-node' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-node' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml index 4035f619c49a..28349a3764fb 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml index fff54d2d3b38..64fa2bd8eaee 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml index d1c80d54cc63..acfea7479697 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml index 5e0a95635d15..b0eca9aa81e9 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubelet' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'kubelet' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml index de26b11ba365..4f762c7b4127 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'namespace-by-pod' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'namespace-by-pod' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml index 124c44bc921e..e61b9b928dcf 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'namespace-by-workload' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'namespace-by-workload' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml index a42d290253b1..a2be7782e71a 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-cluster-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'node-cluster-rsrc-use' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml index 18c560178b90..13789584c485 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'node-rsrc-use' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml index 9edcb758eb0e..6cbd28019eba 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'nodes' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'nodes' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml index df831cc584b0..0b8b374a3a26 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml index e1037aa9634f..d65718642c9f 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'pod-total' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'pod-total' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml index 09a97f1d0e5e..ac84aad73c94 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus-remote-write' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'prometheus-remote-write' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml index 057f32a59d21..2a3200423e4c 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'prometheus' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml index 925dc05e475f..c8bf1706dab1 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'proxy' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'proxy' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml index ad03aca2d056..0d6fd367ed13 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'scheduler' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'scheduler' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml index 44f58b209952..96d8bb5db17f 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'statefulset' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'statefulset' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml index 29f28f25192f..66e7888d4cfe 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'workload-total' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'workload-total' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml index a006d5be7a50..029f86ae0d85 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-cluster-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-cluster-rsrc-use' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml index 11ea8fe2f174..4a98a8457bf1 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-node-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-node-rsrc-use' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml index b21bdf7a7632..737ef14426e2 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml index 3ad7b13e7695..8629ae5c2fc4 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml index e56ef4c1ac72..192d9ef23d8d 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml index 58705ed5fd1c..84c14abaeb46 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml index 10cfe68a324a..e464e030817d 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml b/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml index bc470381c2b2..09c28781953e 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'nodes' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'nodes' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml b/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml index fdb1b27b701f..6ac4844848f9 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml b/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml index 40834a0476f9..415d623b2b76 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'pods' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'pods' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml b/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml index cc9c6873839c..621eb1f43d70 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'statefulset' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'statefulset' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml index 44cf8c18bc33..a12a8d45e22b 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml index 4b6de43b0fa8..948d9f420cbd 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'general.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'general.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml index 4487a2f303c0..ecc833385d9d 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'k8s.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml index 74b1fc2c2735..9ecd9efd7179 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-apiserver-availability.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-apiserver-availability.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml index e491b7dcd1a9..d1c6d7351ec0 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-apiserver-slos' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-apiserver-slos' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml index ce0643536b06..8eddeea075cf 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml index 1288e8c9c37c..a42389611fbe 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-prometheus-general.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-prometheus-general.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml index 0836d6c9e28e..0fc67cfdbd98 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml index ebff45e454c1..f68bd4955053 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml index e6ed7cf8d42f..a303b225641a 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-state-metrics' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-state-metrics' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml index 259bd3bb31d9..8b8db4dc0e73 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubelet.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubelet.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml index 0fee185278b0..5165f5d2f7e5 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml index d00f3b34efbd..65c08d894c93 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml index 87fe7c79652f..dfd36e961142 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml index c5a77b626d35..9052c8f857a1 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system-apiserver' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system-apiserver' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml index 218848213492..d964db5d6183 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system-controller-manager' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system-controller-manager' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml index 55299502b3cc..87f8293bb5a4 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system-kubelet' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system-kubelet' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml index 1f8396857c0d..57d45c8bde33 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system-scheduler' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system-scheduler' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml index 665bb46985fd..dd6bb82a7ff1 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml index 089f591d5af3..3dfe4c974c1e 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-exporter.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'node-exporter.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml index 0a99cc647189..1382596fd9e0 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-exporter' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'node-exporter' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml index 4c0c5101b460..a92cdca6f0d1 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-network' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'node-network' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml index 29e9e4d05d9b..83e0df915456 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'node.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml index 8707af933af9..98a7a7cad668 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml index 94276ff8b2e1..ef6d76a699bd 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'prometheus' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml index 609d357a2185..c24d8dca6235 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml index 11dee23cc1da..9f60a0437d57 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'general.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'general.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml index b02e4a2dc527..c74108d923b2 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'k8s.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml index 7dcdc5e794ba..70ce711ba8a7 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml index 1725e0cc3df9..bbd3f1776bdb 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-prometheus-node-alerting.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kube-prometheus-node-alerting.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml index 45921798e579..c6ca1ee9d496 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml index ea2b5f7cf09b..1577ea16cf7c 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml index 9dd2eadab93b..6729390120aa 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-absent' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kubernetes-absent' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml index cd2e20063839..3b33f1df7761 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml index fb895c8b9194..cf4b572fed78 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml index e826ce1744da..fb672401566c 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml index e5665efabefe..da6de4ed9c0f 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml b/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml index a7caa9a1f7fb..ccb9f1d40b1d 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-network' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'node-network' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml b/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml index 90ac135ca78e..c51c53f734be 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-time' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'node-time' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml index 130ef816589d..268eff940cc6 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'node.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml b/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml index 64583abc5055..13592391d965 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml index 2a8febea12fb..b45e45398439 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'prometheus.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/values.yaml b/charts/kube-prometheus/values.yaml index 91128e35290b..f3e0b6fe6656 100644 --- a/charts/kube-prometheus/values.yaml +++ b/charts/kube-prometheus/values.yaml @@ -323,7 +323,7 @@ alertmanager: # action: replace ## Settings affecting alertmanagerSpec - ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#alertmanagerspec + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#alertmanagerspec ## alertmanagerSpec: ## Standard object’s metadata. More info: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata @@ -376,7 +376,7 @@ alertmanager: retention: 120h ## Storage is the definition of how storage will be used by the Alertmanager instances. - ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/user-guides/storage.md + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md ## storage: {} # volumeClaimTemplate: @@ -650,7 +650,7 @@ kubelet: interval: "" ## Enable scraping the kubelet over https. For requirements to enable this see - ## https://github.com/coreos/prometheus-operator/issues/926 + ## https://github.com/prometheus-operator/prometheus-operator/issues/926 ## https: true @@ -1250,7 +1250,7 @@ prometheusOperator: # logLevel: error ## If true, the operator will create and maintain a service for scraping kubelets - ## ref: https://github.com/coreos/prometheus-operator/blob/master/helm/prometheus-operator/README.md + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/helm/prometheus-operator/README.md ## kubeletService: enabled: true @@ -1555,7 +1555,7 @@ prometheus: scheme: "" ## tlsConfig: TLS configuration to use when scraping the endpoint. For example if using istio mTLS. - ## Of type: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#tlsconfig + ## Of type: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#tlsconfig tlsConfig: {} bearerTokenFile: @@ -1578,14 +1578,14 @@ prometheus: # action: replace ## Settings affecting prometheusSpec - ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#prometheusspec ## prometheusSpec: ## If true, pass --storage.tsdb.max-block-duration=2h to prometheus. This is already done if using Thanos ## disableCompaction: false ## APIServerConfig - ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#apiserverconfig + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#apiserverconfig ## apiserverConfig: {} @@ -1624,7 +1624,7 @@ prometheus: # effect: "NoSchedule" ## Alertmanagers to which alerts will be sent - ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#alertmanagerendpoints + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#alertmanagerendpoints ## ## Default configuration will connect to the alertmanager deployed as part of this release ## @@ -1680,13 +1680,13 @@ prometheus: configMaps: [] ## QuerySpec defines the query command line flags when starting Prometheus. - ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#queryspec + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#queryspec ## query: {} ## Namespaces to be selected for PrometheusRules discovery. ## If nil, select own namespace. Namespaces to be selected for ServiceMonitor discovery. - ## See https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#namespaceselector for usage + ## See https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#namespaceselector for usage ## ruleNamespaceSelector: {} @@ -1731,7 +1731,7 @@ prometheus: # prometheus: somelabel ## Namespaces to be selected for ServiceMonitor discovery. - ## See https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#namespaceselector for usage + ## See https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#namespaceselector for usage ## serviceMonitorNamespaceSelector: {} @@ -1751,7 +1751,7 @@ prometheus: # prometheus: somelabel ## Namespaces to be selected for PodMonitor discovery. - ## See https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#namespaceselector for usage + ## See https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#namespaceselector for usage ## podMonitorNamespaceSelector: {} @@ -1822,12 +1822,12 @@ prometheus: # - e2e-az2 ## The remote_read spec configuration for Prometheus. - ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#remotereadspec + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#remotereadspec remoteRead: [] # - url: http://remote1/read ## The remote_write spec configuration for Prometheus. - ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#remotewritespec + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#remotewritespec remoteWrite: [] # - url: http://remote1/push @@ -1841,7 +1841,7 @@ prometheus: # memory: 400Mi ## Prometheus StorageSpec for persistent data - ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/user-guides/storage.md + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md ## storageSpec: {} # volumeClaimTemplate: @@ -1941,7 +1941,7 @@ prometheus: ## SecurityContext holds pod-level security attributes and common container settings. ## This defaults to non root user with uid 1000 and gid 2000. - ## https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md + ## https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md ## securityContext: runAsGroup: 2000 @@ -1956,7 +1956,7 @@ prometheus: ## Thanos configuration allows configuring various aspects of a Prometheus server in a Thanos environment. ## This section is experimental, it may change significantly without deprecation notice in any release. ## This is experimental and may change significantly without backward compatibility in any release. - ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#thanosspec + ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#thanosspec ## thanos: {} @@ -2096,6 +2096,6 @@ prometheus: # matchNames: [] ## Endpoints of the selected pods to be monitored - ## https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#podmetricsendpoint + ## https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/api.md#podmetricsendpoint ## # podMetricsEndpoints: [] From b45902c997dcb3410d80252aa3cb6cfd01a8900a Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 08:26:10 -0400 Subject: [PATCH 17/55] Remove stray CODEOWNERS rule for charts/prometheus-operator/ Signed-off-by: Scott Rigby --- .github/CODEOWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1afca5e5d12e..4a6f7b6be8a3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,7 +12,6 @@ charts/prometheus-mongodb-exporter @steven-sheehy charts/prometheus-mysql-exporter @juanchimienti @monotek charts/prometheus-nats-exporter @okgolove @caarlos0 charts/prometheus-node-exporter @gianrubio @vsliouniaev -charts/prometheus-operator @vsliouniaev @bismarck @gianrubio charts/prometheus-postgres-exporter @gianrubio charts/prometheus-pushgateway @gianrubio @cstaud charts/prometheus-rabbitmq-exporter @juanchimienti From 849e6f4e1f10935399de24455bbdcb6c452cbd39 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 08:29:01 -0400 Subject: [PATCH 18/55] Fix typo Signed-off-by: Scott Rigby --- charts/kube-prometheus/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kube-prometheus/Chart.yaml b/charts/kube-prometheus/Chart.yaml index 3c2047f3256b..59d71769f9f8 100644 --- a/charts/kube-prometheus/Chart.yaml +++ b/charts/kube-prometheus/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -description: prometheus-operator collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. +description: kube-prometheus collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png engine: gotpl maintainers: From 2376e67b6289b6f18858177a52d4b8faf8fe82c1 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 16:21:36 -0400 Subject: [PATCH 19/55] Update charts/kube-prometheus/hack/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby --- charts/kube-prometheus/hack/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kube-prometheus/hack/README.md b/charts/kube-prometheus/hack/README.md index 4020b64057f5..381f3f8efd0a 100644 --- a/charts/kube-prometheus/hack/README.md +++ b/charts/kube-prometheus/hack/README.md @@ -9,7 +9,7 @@ Currently following imported: - [prometheus-operator/kube-prometheus rules set](https://github.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml) - In order to modify these rules: - prepare and merge PR into [kubernetes-mixin](https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/rules) master and/or release branch - - run import inside your fork of [prometheus-operator/kube-prometheus](https://github.com/kube-prometheus/kube-prometheus/tree/master) + - run import inside your fork of [prometheus-operator/kube-prometheus](https://github.com/prometheus-operator/kube-prometheus/tree/master) ```bash jb update From 9d321b299d91f986e859ee86cbd951db070577e4 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 16:22:55 -0400 Subject: [PATCH 20/55] Update charts/kube-prometheus/hack/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby --- charts/kube-prometheus/hack/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kube-prometheus/hack/README.md b/charts/kube-prometheus/hack/README.md index 381f3f8efd0a..f0b38c4fe278 100644 --- a/charts/kube-prometheus/hack/README.md +++ b/charts/kube-prometheus/hack/README.md @@ -6,7 +6,7 @@ This script generates prometheus rules set for alertmanager from any properly fo Currently following imported: -- [prometheus-operator/kube-prometheus rules set](https://github.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml) +- [prometheus-operator/kube-prometheus rules set](https://github.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml) - In order to modify these rules: - prepare and merge PR into [kubernetes-mixin](https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/rules) master and/or release branch - run import inside your fork of [prometheus-operator/kube-prometheus](https://github.com/prometheus-operator/kube-prometheus/tree/master) From 8decfc31f2d3ca1c617dac0048f6b6d4092ab0f9 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 16:23:15 -0400 Subject: [PATCH 21/55] Update charts/kube-prometheus/hack/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby --- charts/kube-prometheus/hack/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kube-prometheus/hack/README.md b/charts/kube-prometheus/hack/README.md index f0b38c4fe278..e666a9b37951 100644 --- a/charts/kube-prometheus/hack/README.md +++ b/charts/kube-prometheus/hack/README.md @@ -31,7 +31,7 @@ This script generates grafana dashboards from json files, splitting them to sepa Currently following imported: -- [prometheus-operator/kube-prometheus dashboards](https://github.com/kube-prometheus/kube-prometheus/manifests/grafana-deployment.yaml) +- [prometheus-operator/kube-prometheus dashboards](https://github.com/prometheus-operator/kube-prometheus/manifests/grafana-deployment.yaml) - In order to modify these dashboards: - prepare and merge PR into [kubernetes-mixin](https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/dashboards) master and/or release branch - run import inside your fork of [prometheus-operator/kube-prometheus](https://github.com/kube-prometheus/kube-prometheus/tree/master) From a187122c5238f5e7f13f4add6efabde34ac47da1 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 16:23:43 -0400 Subject: [PATCH 22/55] Update charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby --- .../templates/prometheus/rules/prometheus-operator.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml b/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml index 13592391d965..956efb8d9a8f 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} @@ -40,4 +40,4 @@ spec: for: 10m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} From de611e1d86037d25e5e75a925c58eac3f9a83192 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 16:24:06 -0400 Subject: [PATCH 23/55] Update charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby --- .../templates/prometheus/rules/node.rules.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml index 268eff940cc6..4c4453f9c726 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'node.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} @@ -199,4 +199,4 @@ spec: ) ) by (node) record: 'node:node_inodes_free:' -{{- end }} \ No newline at end of file +{{- end }} From b8831e8ad384685dee90478a5af5116d2399fc83 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 16:24:15 -0400 Subject: [PATCH 24/55] Update charts/kube-prometheus/templates/prometheus/rules/node-network.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby --- .../templates/prometheus/rules/node-network.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml b/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml index ccb9f1d40b1d..8cf11342da5b 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-network' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'node-network' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} @@ -45,4 +45,4 @@ spec: for: 2m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} From 2b3bac7736e468f10834fb8d60ebeaf31add1747 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 16:24:40 -0400 Subject: [PATCH 25/55] Update charts/kube-prometheus/templates/prometheus/rules/node-time.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby --- .../kube-prometheus/templates/prometheus/rules/node-time.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml b/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml index c51c53f734be..62e2df0ef852 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-time' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'node-time' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} @@ -31,4 +31,4 @@ spec: for: 2m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} From 2ce5527c31fce71f185dabad148bf41cc0ccb361 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 16:24:58 -0400 Subject: [PATCH 26/55] Update charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby --- .../templates/prometheus/rules/kubernetes-system.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml index da6de4ed9c0f..7106a5a488e4 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} @@ -142,4 +142,4 @@ spec: expr: apiserver_client_certificate_expiration_seconds_count{job="apiserver"} > 0 and histogram_quantile(0.01, sum by (job, le) (rate(apiserver_client_certificate_expiration_seconds_bucket{job="apiserver"}[5m]))) < 86400 labels: severity: critical -{{- end }} \ No newline at end of file +{{- end }} From 732713040f4f15c54af99b2b27a41e682e2f2670 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 16:32:16 -0400 Subject: [PATCH 27/55] Update charts/kube-prometheus/README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby --- charts/kube-prometheus/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kube-prometheus/README.md b/charts/kube-prometheus/README.md index 88f316a37518..fa99aed18dba 100644 --- a/charts/kube-prometheus/README.md +++ b/charts/kube-prometheus/README.md @@ -28,7 +28,7 @@ $ helm install [RELEASE_NAME] prometheus-community/kube-prometheus By default this chart installs [dependent charts](https://helm.sh/docs/helm/helm_dependency/): - [stable/kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) -- [stable/prometheus-node-exporter](https://github.com/helm/charts/tree/master/stable/prometheus-node-exporter) +- [stable/prometheus-node-exporter](https://github.com/prometheus-community/helm-charts/tree/main/prometheus-node-exporter) - [stable/grafana](https://github.com/helm/charts/tree/master/stable/grafana) ### Multiple releases From 940afde59257d21f826c8473d067c02db40d309e Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 17:40:15 -0400 Subject: [PATCH 28/55] Update dependency location and remove README note about chart source (it's easy to determine chart source from the dependency definition) Signed-off-by: Scott Rigby --- charts/kube-prometheus/README.md | 2 +- charts/kube-prometheus/requirements.lock | 12 ++++++------ charts/kube-prometheus/requirements.yaml | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/charts/kube-prometheus/README.md b/charts/kube-prometheus/README.md index fa99aed18dba..253651639749 100644 --- a/charts/kube-prometheus/README.md +++ b/charts/kube-prometheus/README.md @@ -174,7 +174,7 @@ You can check out the tickets for this change [here](https://github.com/promethe The chart has added 3 [dependencies](#dependencies). -- Node-Exporter, Kube-State-Metrics: These components are loaded as dependencies into the chart. The source for both charts is found in the same repository. They are relatively simple components. +- Node-Exporter, Kube-State-Metrics: These components are loaded as dependencies into the chart, and are relatively simple components. - Grafana: The Grafana chart is more feature-rich than this chart - it contains a sidecar that is able to load data sources and dashboards from configmaps deployed into the same cluster. For more information check out the [documentation for the chart](https://github.com/helm/charts/tree/master/stable/grafana) #### CoreOS CRDs diff --git a/charts/kube-prometheus/requirements.lock b/charts/kube-prometheus/requirements.lock index a1de41d27426..f50ae550732f 100644 --- a/charts/kube-prometheus/requirements.lock +++ b/charts/kube-prometheus/requirements.lock @@ -1,12 +1,12 @@ dependencies: - name: kube-state-metrics repository: https://kubernetes-charts.storage.googleapis.com/ - version: 2.8.10 + version: 2.8.14 - name: prometheus-node-exporter - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 1.10.0 + repository: https://prometheus-community.github.io/helm-charts + version: 1.11.2 - name: grafana repository: https://kubernetes-charts.storage.googleapis.com/ - version: 5.3.0 -digest: sha256:4cafebfa80daacbd651defea2a7cad3074e8022114d27d76a3baa1861998981b -generated: "2020-06-22T12:36:10.4861206Z" + version: 5.3.6 +digest: sha256:41a371d4e1748156048d5930ba8e3141d4bbe2118d938f50c7761b90d4b4594e +generated: "2020-08-21T16:53:58.66669-04:00" diff --git a/charts/kube-prometheus/requirements.yaml b/charts/kube-prometheus/requirements.yaml index 7562db7b5c0a..24c7fda60fc9 100644 --- a/charts/kube-prometheus/requirements.yaml +++ b/charts/kube-prometheus/requirements.yaml @@ -6,8 +6,8 @@ dependencies: condition: kubeStateMetrics.enabled - name: prometheus-node-exporter - version: "1.10.*" - repository: https://kubernetes-charts.storage.googleapis.com/ + version: "1.11.*" + repository: https://prometheus-community.github.io/helm-charts condition: nodeExporter.enabled - name: grafana From 7143e7ee53e3eb766983279222ed42e965650bfc Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 18:31:54 -0400 Subject: [PATCH 29/55] Fix markdownlint Signed-off-by: Scott Rigby --- charts/kube-prometheus/README.md | 74 +++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 25 deletions(-) diff --git a/charts/kube-prometheus/README.md b/charts/kube-prometheus/README.md index 253651639749..a62dec109282 100644 --- a/charts/kube-prometheus/README.md +++ b/charts/kube-prometheus/README.md @@ -4,23 +4,24 @@ Installs [kube-prometheus](https://github.com/prometheus-operator/kube-prometheu See the [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus) README for details about components, dashboards, and alerts. -* This chart was formerly named `prometheus-operator` chart, and renamed to more clearly reflect that it installs the `kube-prometheus` project, within which Prometheus Operator is only one component. +- This chart was formerly named `prometheus-operator` chart, and renamed to more clearly reflect that it installs the `kube-prometheus` project, within which Prometheus Operator is only one component. ## Prerequisites - - Kubernetes 1.10+ with Beta APIs - - Helm 2.12+ (If using Helm < 2.14, [see below for CRD workaround](#Helm-fails-to-create-CRDs)) + +- Kubernetes 1.10+ with Beta APIs +- Helm 2.12+ (If using Helm < 2.14, [see below for CRD workaround](#Helm-fails-to-create-CRDs)) ## Add repos ```console -$ helm repo add prometheus-community https://prometheus-community.github.io/helm-charts -$ helm repo add stable https://kubernetes-charts.storage.googleapis.com/ +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo add stable https://kubernetes-charts.storage.googleapis.com/ ``` ## Install ```console -$ helm install [RELEASE_NAME] prometheus-community/kube-prometheus +helm install [RELEASE_NAME] prometheus-community/kube-prometheus ``` ### Dependencies @@ -40,7 +41,7 @@ The same chart can be used to run multiple Prometheus instances in the same clus See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments: ```console -$ helm show values prometheus-community/kube-prometheus +helm show values prometheus-community/kube-prometheus ``` You may also `helm show values` on this chart's [dependencies](#dependencies) for additional options. @@ -48,7 +49,7 @@ You may also `helm show values` on this chart's [dependencies](#dependencies) fo ## Uninstall ```console -$ helm uninstall [RELEASE_NAME] +helm uninstall [RELEASE_NAME] ``` The command removes all the Kubernetes components associated with the chart and deletes the release. @@ -67,6 +68,7 @@ kubectl delete crd thanosrulers.monitoring.coreos.com ## Work-Arounds for Known Issues ### Running on private GKE clusters + When Google configure the control plane for private clusters, they automatically configure VPC peering between your Kubernetes cluster’s network and a separate Google managed project. In order to restrict what Google are able to access within your cluster, the firewall rules configured restrict access to your Kubernetes pods. This means that in order to use the webhook component with a GKE private cluster, you must configure an additional firewall rule to allow the GKE control plane access to your webhook pod. You can read more information on how to add firewall rules for the GKE control plane nodes in the [GKE docs](https://cloud.google.com/kubernetes-engine/docs/how-to/private-clusters#add_firewall_rules) @@ -74,40 +76,46 @@ You can read more information on how to add firewall rules for the GKE control p Alternatively, you can disable the hooks by setting `prometheusOperator.admissionWebhooks.enabled=false`. ### Helm fails to create CRDs + You should upgrade to Helm 2.14 + in order to avoid this issue. However, if you are stuck with an earlier Helm release you should instead use the following approach: Due to a bug in helm, it is possible for the 5 CRDs that are created by this chart to fail to get fully deployed before Helm attempts to create resources that require them. This affects all versions of Helm with a [potential fix pending](https://github.com/helm/helm/pull/5112). In order to work around this issue when installing the chart you will need to make sure all 5 CRDs exist in the cluster first and disable their previsioning by the chart: 1. Create CRDs -```console -kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml -kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml -kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml -kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml -kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml -kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml -``` -2. Wait for CRDs to be created, which should only take a few seconds + ```console + kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml + kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml + kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml + kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml + kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml + kubectl apply -f https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/release-0.38/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml + ``` +2. Wait for CRDs to be created, which should only take a few seconds 3. Install the chart, but disable the CRD provisioning by setting `prometheusOperator.createCustomResource=false` -```console -$ helm install [RELEASE_NAME] prometheus-community/kube-prometheus --set prometheusOperator.createCustomResource=false -``` + + ```console + helm install [RELEASE_NAME] prometheus-community/kube-prometheus --set prometheusOperator.createCustomResource=false + ``` ## PrometheusRules Admission Webhooks With Prometheus Operator version 0.30+, the core Prometheus Operator pod exposes an endpoint that will integrate with the `validatingwebhookconfiguration` Kubernetes feature to prevent malformed rules from being added to the cluster. ### How the Chart Configures the Hooks + A validating and mutating webhook configuration requires the endpoint to which the request is sent to use TLS. It is possible to set up custom certificates to do this, but in most cases, a self-signed certificate is enough. The setup of this component requires some more complex orchestration when using helm. The steps are created to be idempotent and to allow turning the feature on and off without running into helm quirks. + 1. A pre-install hook provisions a certificate into the same namespace using a format compatible with provisioning using end-user certificates. If the certificate already exists, the hook exits. 2. The prometheus operator pod is configured to use a TLS proxy container, which will load that certificate. 3. Validating and Mutating webhook configurations are created in the cluster, with their failure mode set to Ignore. This allows rules to be created by the same chart at the same time, even though the webhook has not yet been fully set up - it does not have the correct CA field set. 4. A post-install hook reads the CA from the secret created by step 1 and patches the Validating and Mutating webhook configurations. This process will allow a custom CA provisioned by some other process to also be patched into the webhook configurations. The chosen failure policy is also patched into the webhook configurations ### Alternatives + It should be possible to use [jetstack/cert-manager](https://github.com/jetstack/cert-manager) if a more complete solution is required, but it has not been tested. ### Limitations + Because the operator can only run as a single pod, there is potential for this component failure to cause rule deployment failure. Because this risk is outweighed by the benefit of having validation, the feature is enabled by default. ## Developing Prometheus Rules and Grafana Dashboards @@ -117,6 +125,7 @@ This chart Grafana Dashboards and Prometheus Rules are just a copy from [prometh ## Further Information For more in-depth documentation of configuration options meanings, please see + - [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator) - [Prometheus](https://prometheus.io/docs/introduction/overview/) - [Grafana](https://github.com/helm/charts/tree/master/stable/grafana#grafana-helm-chart) @@ -127,32 +136,42 @@ A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. ### Upgrading from 8.x.x to 9.x.x + Version 9 of the helm chart removes the existing `additionalScrapeConfigsExternal` in favour of `additionalScrapeConfigsSecret`. This change lets users specify the secret name and secret key to use for the additional scrape configuration of prometheus. This is useful for users that have prometheus-operator as a subchart and also have a template that creates the additional scrape configuration. ### Upgrading from 7.x.x to 8.x.x + Due to new template functions being used in the rules in version 8.x.x of the chart, an upgrade to Prometheus Operator and Prometheus is necessary in order to support them. First, upgrade to the latest version of 7.x.x + ```sh helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus --version 7.4.0 ``` + Then upgrade to 8.x.x + ```sh helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus ``` + Minimal recommended Prometheus version for this chart release is `2.12.x` ### Upgrading from 6.x.x to 7.x.x + Due to a change in grafana subchart, version 7.x.x now requires Helm >= 2.12.0. ### Upgrading from 5.x.x to 6.x.x + Due to a change in deployment labels of kube-state-metrics, the upgrade requires `helm upgrade --force` in order to re-create the deployment. If this is not done an error will occur indicating that the deployment cannot be modified: -``` +```console invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable ``` + If this error has already been encountered, a `helm history` command can be used to determine which release has worked, then `helm rollback` to the release, then `helm upgrade --force` to this new one ## prometheus.io/scrape + The prometheus operator does not support annotation-based discovery of services, using the `serviceMonitor` CRD in its place as it provides far more configuration options. For information on how to use servicemonitors, please see the documentation on the `prometheus-operator/prometheus-operator` documentation here: [Running Exporters](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/running-exporters.md) By default, Prometheus discovers ServiceMonitors within its namespace, that are labeled with the same release tag as the prometheus-operator release. @@ -178,14 +197,18 @@ The chart has added 3 [dependencies](#dependencies). - Grafana: The Grafana chart is more feature-rich than this chart - it contains a sidecar that is able to load data sources and dashboards from configmaps deployed into the same cluster. For more information check out the [documentation for the chart](https://github.com/helm/charts/tree/master/stable/grafana) #### CoreOS CRDs + The CRDs are provisioned using crd-install hooks, rather than relying on a separate chart installation. If you already have these CRDs provisioned and don't want to remove them, you can disable the CRD creation by these hooks by passing `prometheusOperator.createCustomResource=false` (not required if using Helm v3). #### Kubelet Service + Because the kubelet service has a new name in the chart, make sure to clean up the old kubelet service in the `kube-system` namespace to prevent counting container metrics twice. #### Persistent Volumes + If you would like to keep the data of the current persistent volumes, it should be possible to attach existing volumes to new PVCs and PVs that are created using the conventions in the new chart. For example, in order to use an existing Azure disk for a helm release called `prometheus-migration` the following resources can be created: -``` + +```yaml apiVersion: v1 kind: PersistentVolume metadata: @@ -206,7 +229,8 @@ spec: storageClassName: prometheus volumeMode: Filesystem ``` -``` + +```yaml apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -240,11 +264,11 @@ The metrics bind address of kube-proxy is default to `127.0.0.1:10249` that prom Depending on the cluster, the relevant part `config.conf` will be in ConfigMap `kube-system/kube-proxy` or `kube-system/kube-proxy-config`. For example: -``` +```console kubectl -n kube-system edit cm kube-proxy ``` -``` +```yaml apiVersion: v1 data: config.conf: |- From 0e7149e2c6c73022d3d7bbea7ceff9b445303c44 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 18:37:56 -0400 Subject: [PATCH 30/55] Update kube-prometheus per new README template. See #14 Signed-off-by: Scott Rigby --- charts/kube-prometheus/README.md | 161 ++++++++++++++++++------------- 1 file changed, 92 insertions(+), 69 deletions(-) diff --git a/charts/kube-prometheus/README.md b/charts/kube-prometheus/README.md index a62dec109282..0ef0c499e8c7 100644 --- a/charts/kube-prometheus/README.md +++ b/charts/kube-prometheus/README.md @@ -4,55 +4,62 @@ Installs [kube-prometheus](https://github.com/prometheus-operator/kube-prometheu See the [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus) README for details about components, dashboards, and alerts. -- This chart was formerly named `prometheus-operator` chart, and renamed to more clearly reflect that it installs the `kube-prometheus` project, within which Prometheus Operator is only one component. +_Note: This chart was formerly named `prometheus-operator` chart, now renamed to more clearly reflect that it installs the `kube-prometheus` project, within which Prometheus Operator is only one component._ ## Prerequisites - Kubernetes 1.10+ with Beta APIs - Helm 2.12+ (If using Helm < 2.14, [see below for CRD workaround](#Helm-fails-to-create-CRDs)) -## Add repos +## Get Repo Info ```console helm repo add prometheus-community https://prometheus-community.github.io/helm-charts helm repo add stable https://kubernetes-charts.storage.googleapis.com/ +helm repo update ``` -## Install +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ + +## Install Chart ```console -helm install [RELEASE_NAME] prometheus-community/kube-prometheus +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/kube-prometheus + +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/kube-prometheus ``` -### Dependencies +_See [configuration](#configuration) below._ + +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ -By default this chart installs [dependent charts](https://helm.sh/docs/helm/helm_dependency/): +## Dependencies + +By default this chart installs additional, dependent charts: - [stable/kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) - [stable/prometheus-node-exporter](https://github.com/prometheus-community/helm-charts/tree/main/prometheus-node-exporter) - [stable/grafana](https://github.com/helm/charts/tree/master/stable/grafana) -### Multiple releases - -The same chart can be used to run multiple Prometheus instances in the same cluster if required. To achieve this, it is necessary to run only one instance of prometheus-operator and a pair of alertmanager pods for an HA configuration, while all other components need to be disabled. To disable a dependency during installation, set `kubeStateMetrics.enabled`, `nodeExporter.enabled` and `grafana.enabled` to `false`. +To disable dependencies during installation, see [multiple releases](#multiple-releases) below. -## Configuration +_See [helm dependency](https://helm.sh/docs/helm/helm_dependency/) for command documentation._ -See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments: +## Uninstall Chart ```console -helm show values prometheus-community/kube-prometheus -``` - -You may also `helm show values` on this chart's [dependencies](#dependencies) for additional options. - -## Uninstall +# Helm 3 +$ helm uninstall [RELEASE_NAME] -```console -helm uninstall [RELEASE_NAME] +# Helm 2 +# helm delete --purge [RELEASE_NAME] ``` -The command removes all the Kubernetes components associated with the chart and deletes the release. +This removes all the Kubernetes components associated with the chart and deletes the release. + +_See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command documentation._ CRDs created by this chart are not removed by default and should be manually cleaned up: @@ -65,6 +72,67 @@ kubectl delete crd alertmanagers.monitoring.coreos.com kubectl delete crd thanosrulers.monitoring.coreos.com ``` +## Upgrading Chart + +```console +# Helm 3 or 2 +$ helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus +``` + +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +### Migrating from stable/prometheus-operator chart + +A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions. + +### From 8.x to 9.x + +Version 9 of the helm chart removes the existing `additionalScrapeConfigsExternal` in favour of `additionalScrapeConfigsSecret`. This change lets users specify the secret name and secret key to use for the additional scrape configuration of prometheus. This is useful for users that have prometheus-operator as a subchart and also have a template that creates the additional scrape configuration. + +### From 7.x to 8.x + +Due to new template functions being used in the rules in version 8.x.x of the chart, an upgrade to Prometheus Operator and Prometheus is necessary in order to support them. First, upgrade to the latest version of 7.x.x + +```sh +helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus --version 7.5.0 +``` + +Then upgrade to 8.x.x + +```sh +helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus --version [8.x.x] +``` + +Minimal recommended Prometheus version for this chart release is `2.12.x` + +### From 6.x to 7.x + +Due to a change in grafana subchart, version 7.x.x now requires Helm >= 2.12.0. + +### From 5.x to 6.x + +Due to a change in deployment labels of kube-state-metrics, the upgrade requires `helm upgrade --force` in order to re-create the deployment. If this is not done an error will occur indicating that the deployment cannot be modified: + +```console +invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable +``` + +If this error has already been encountered, a `helm history` command can be used to determine which release has worked, then `helm rollback` to the release, then `helm upgrade --force` to this new one + +## Configuration + +See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments: + +```console +helm show values prometheus-community/kube-prometheus +``` + +You may also `helm show values` on this chart's [dependencies](#dependencies) for additional options. + +### Multiple releases + +The same chart can be used to run multiple Prometheus instances in the same cluster if required. To achieve this, it is necessary to run only one instance of prometheus-operator and a pair of alertmanager pods for an HA configuration, while all other components need to be disabled. To disable a dependency during installation, set `kubeStateMetrics.enabled`, `nodeExporter.enabled` and `grafana.enabled` to `false`. + ## Work-Arounds for Known Issues ### Running on private GKE clusters @@ -91,11 +159,7 @@ You should upgrade to Helm 2.14 + in order to avoid this issue. However, if you ``` 2. Wait for CRDs to be created, which should only take a few seconds -3. Install the chart, but disable the CRD provisioning by setting `prometheusOperator.createCustomResource=false` - - ```console - helm install [RELEASE_NAME] prometheus-community/kube-prometheus --set prometheusOperator.createCustomResource=false - ``` +3. [Install](#install-chart) the chart, but disable the CRD provisioning by setting `prometheusOperator.createCustomResource` to `false` ## PrometheusRules Admission Webhooks @@ -130,52 +194,11 @@ For more in-depth documentation of configuration options meanings, please see - [Prometheus](https://prometheus.io/docs/introduction/overview/) - [Grafana](https://github.com/helm/charts/tree/master/stable/grafana#grafana-helm-chart) -## Migrating from stable/prometheus-operator chart - -A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an -incompatible breaking change needing manual actions. - -### Upgrading from 8.x.x to 9.x.x - -Version 9 of the helm chart removes the existing `additionalScrapeConfigsExternal` in favour of `additionalScrapeConfigsSecret`. This change lets users specify the secret name and secret key to use for the additional scrape configuration of prometheus. This is useful for users that have prometheus-operator as a subchart and also have a template that creates the additional scrape configuration. - -### Upgrading from 7.x.x to 8.x.x - -Due to new template functions being used in the rules in version 8.x.x of the chart, an upgrade to Prometheus Operator and Prometheus is necessary in order to support them. -First, upgrade to the latest version of 7.x.x - -```sh -helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus --version 7.4.0 -``` - -Then upgrade to 8.x.x - -```sh -helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus -``` - -Minimal recommended Prometheus version for this chart release is `2.12.x` - -### Upgrading from 6.x.x to 7.x.x - -Due to a change in grafana subchart, version 7.x.x now requires Helm >= 2.12.0. - -### Upgrading from 5.x.x to 6.x.x - -Due to a change in deployment labels of kube-state-metrics, the upgrade requires `helm upgrade --force` in order to re-create the deployment. If this is not done an error will occur indicating that the deployment cannot be modified: - -```console -invalid: spec.selector: Invalid value: v1.LabelSelector{MatchLabels:map[string]string{"app.kubernetes.io/name":"kube-state-metrics"}, MatchExpressions:[]v1.LabelSelectorRequirement(nil)}: field is immutable -``` - -If this error has already been encountered, a `helm history` command can be used to determine which release has worked, then `helm rollback` to the release, then `helm upgrade --force` to this new one - ## prometheus.io/scrape The prometheus operator does not support annotation-based discovery of services, using the `serviceMonitor` CRD in its place as it provides far more configuration options. For information on how to use servicemonitors, please see the documentation on the `prometheus-operator/prometheus-operator` documentation here: [Running Exporters](https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/running-exporters.md) -By default, Prometheus discovers ServiceMonitors within its namespace, that are labeled with the same release tag as the prometheus-operator release. -Sometimes, you may need to discover custom ServiceMonitors, for example used to scrape data from third-party applications. An easy way of doing this, without compromising the default ServiceMonitors discovery, is allowing Prometheus to discover all ServiceMonitors within its namespace, without applying label filtering. To do so, you can set `prometheus.prometheusSpec.serviceMonitorSelectorNilUsesHelmValues` to `false`. +By default, Prometheus discovers ServiceMonitors within its namespace, that are labeled with the same release tag as the prometheus-operator release. Sometimes, you may need to discover custom ServiceMonitors, for example used to scrape data from third-party applications. An easy way of doing this, without compromising the default ServiceMonitors discovery, is allowing Prometheus to discover all ServiceMonitors within its namespace, without applying label filtering. To do so, you can set `prometheus.prometheusSpec.serviceMonitorSelectorNilUsesHelmValues` to `false`. ## Migrating from coreos/prometheus-operator chart @@ -193,12 +216,12 @@ You can check out the tickets for this change [here](https://github.com/promethe The chart has added 3 [dependencies](#dependencies). -- Node-Exporter, Kube-State-Metrics: These components are loaded as dependencies into the chart, and are relatively simple components. +- Node-Exporter, Kube-State-Metrics: These components are loaded as dependencies into the chart, and are relatively simple components - Grafana: The Grafana chart is more feature-rich than this chart - it contains a sidecar that is able to load data sources and dashboards from configmaps deployed into the same cluster. For more information check out the [documentation for the chart](https://github.com/helm/charts/tree/master/stable/grafana) #### CoreOS CRDs -The CRDs are provisioned using crd-install hooks, rather than relying on a separate chart installation. If you already have these CRDs provisioned and don't want to remove them, you can disable the CRD creation by these hooks by passing `prometheusOperator.createCustomResource=false` (not required if using Helm v3). +The CRDs are provisioned using crd-install hooks, rather than relying on a separate chart installation. If you already have these CRDs provisioned and don't want to remove them, you can disable the CRD creation by these hooks by setting `prometheusOperator.createCustomResource` to `false` (not required if using Helm v3). #### Kubelet Service From fa1d5b4a63407710302b3b4ba3df64ed7d07dfb6 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Fri, 21 Aug 2020 18:41:26 -0400 Subject: [PATCH 31/55] Remove requirements lock file for now, otherwise if we release the chart before transferring repo ownership the digest will differ. See helm pkg downloader Manager Build() method check for resolveRepoNames() Signed-off-by: Scott Rigby --- charts/kube-prometheus/requirements.lock | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 charts/kube-prometheus/requirements.lock diff --git a/charts/kube-prometheus/requirements.lock b/charts/kube-prometheus/requirements.lock deleted file mode 100644 index f50ae550732f..000000000000 --- a/charts/kube-prometheus/requirements.lock +++ /dev/null @@ -1,12 +0,0 @@ -dependencies: -- name: kube-state-metrics - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 2.8.14 -- name: prometheus-node-exporter - repository: https://prometheus-community.github.io/helm-charts - version: 1.11.2 -- name: grafana - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 5.3.6 -digest: sha256:41a371d4e1748156048d5930ba8e3141d4bbe2118d938f50c7761b90d4b4594e -generated: "2020-08-21T16:53:58.66669-04:00" From 143b136feef1c14740770d47c970d5161bdaf08b Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Mon, 24 Aug 2020 07:42:12 -0400 Subject: [PATCH 32/55] Non-functional: update commented links to CRD sources Co-authored-by: Quentin Bisson Signed-off-by: Scott Rigby --- charts/kube-prometheus/hack/sync_grafana_dashboards.py | 4 ++-- charts/kube-prometheus/hack/sync_prometheus_rules.py | 4 ++-- .../templates/grafana/dashboards-1.14/apiserver.yaml | 2 +- .../templates/grafana/dashboards-1.14/cluster-total.yaml | 2 +- .../templates/grafana/dashboards-1.14/controller-manager.yaml | 2 +- .../grafana/dashboards-1.14/k8s-resources-cluster.yaml | 2 +- .../grafana/dashboards-1.14/k8s-resources-namespace.yaml | 2 +- .../templates/grafana/dashboards-1.14/k8s-resources-node.yaml | 2 +- .../templates/grafana/dashboards-1.14/k8s-resources-pod.yaml | 2 +- .../grafana/dashboards-1.14/k8s-resources-workload.yaml | 2 +- .../dashboards-1.14/k8s-resources-workloads-namespace.yaml | 2 +- .../templates/grafana/dashboards-1.14/kubelet.yaml | 2 +- .../templates/grafana/dashboards-1.14/namespace-by-pod.yaml | 2 +- .../grafana/dashboards-1.14/namespace-by-workload.yaml | 2 +- .../grafana/dashboards-1.14/node-cluster-rsrc-use.yaml | 2 +- .../templates/grafana/dashboards-1.14/node-rsrc-use.yaml | 2 +- .../templates/grafana/dashboards-1.14/nodes.yaml | 2 +- .../grafana/dashboards-1.14/persistentvolumesusage.yaml | 2 +- .../templates/grafana/dashboards-1.14/pod-total.yaml | 2 +- .../grafana/dashboards-1.14/prometheus-remote-write.yaml | 2 +- .../templates/grafana/dashboards-1.14/prometheus.yaml | 2 +- .../templates/grafana/dashboards-1.14/proxy.yaml | 2 +- .../templates/grafana/dashboards-1.14/scheduler.yaml | 2 +- .../templates/grafana/dashboards-1.14/statefulset.yaml | 2 +- .../templates/grafana/dashboards-1.14/workload-total.yaml | 2 +- .../templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml | 2 +- .../templates/grafana/dashboards/k8s-node-rsrc-use.yaml | 2 +- .../templates/grafana/dashboards/k8s-resources-cluster.yaml | 2 +- .../templates/grafana/dashboards/k8s-resources-namespace.yaml | 2 +- .../templates/grafana/dashboards/k8s-resources-pod.yaml | 2 +- .../templates/grafana/dashboards/k8s-resources-workload.yaml | 2 +- .../grafana/dashboards/k8s-resources-workloads-namespace.yaml | 2 +- .../kube-prometheus/templates/grafana/dashboards/nodes.yaml | 2 +- .../templates/grafana/dashboards/persistentvolumesusage.yaml | 2 +- charts/kube-prometheus/templates/grafana/dashboards/pods.yaml | 2 +- .../templates/grafana/dashboards/statefulset.yaml | 2 +- .../templates/prometheus/rules-1.14/alertmanager.rules.yaml | 2 +- .../templates/prometheus/rules-1.14/general.rules.yaml | 2 +- .../templates/prometheus/rules-1.14/k8s.rules.yaml | 2 +- .../rules-1.14/kube-apiserver-availability.rules.yaml | 2 +- .../templates/prometheus/rules-1.14/kube-apiserver-slos.yaml | 2 +- .../templates/prometheus/rules-1.14/kube-apiserver.rules.yaml | 2 +- .../prometheus/rules-1.14/kube-prometheus-general.rules.yaml | 2 +- .../rules-1.14/kube-prometheus-node-recording.rules.yaml | 2 +- .../templates/prometheus/rules-1.14/kube-scheduler.rules.yaml | 2 +- .../templates/prometheus/rules-1.14/kube-state-metrics.yaml | 2 +- .../templates/prometheus/rules-1.14/kubelet.rules.yaml | 2 +- .../templates/prometheus/rules-1.14/kubernetes-apps.yaml | 2 +- .../templates/prometheus/rules-1.14/kubernetes-resources.yaml | 2 +- .../templates/prometheus/rules-1.14/kubernetes-storage.yaml | 2 +- .../prometheus/rules-1.14/kubernetes-system-apiserver.yaml | 2 +- .../rules-1.14/kubernetes-system-controller-manager.yaml | 2 +- .../prometheus/rules-1.14/kubernetes-system-kubelet.yaml | 2 +- .../prometheus/rules-1.14/kubernetes-system-scheduler.yaml | 2 +- .../templates/prometheus/rules-1.14/kubernetes-system.yaml | 2 +- .../templates/prometheus/rules-1.14/node-exporter.rules.yaml | 2 +- .../templates/prometheus/rules-1.14/node-exporter.yaml | 2 +- .../templates/prometheus/rules-1.14/node-network.yaml | 2 +- .../templates/prometheus/rules-1.14/node.rules.yaml | 2 +- .../templates/prometheus/rules-1.14/prometheus-operator.yaml | 2 +- .../templates/prometheus/rules-1.14/prometheus.yaml | 2 +- .../templates/prometheus/rules/alertmanager.rules.yaml | 2 +- .../templates/prometheus/rules/general.rules.yaml | 2 +- .../kube-prometheus/templates/prometheus/rules/k8s.rules.yaml | 2 +- .../templates/prometheus/rules/kube-apiserver.rules.yaml | 2 +- .../prometheus/rules/kube-prometheus-node-alerting.rules.yaml | 2 +- .../rules/kube-prometheus-node-recording.rules.yaml | 2 +- .../templates/prometheus/rules/kube-scheduler.rules.yaml | 2 +- .../templates/prometheus/rules/kubernetes-absent.yaml | 2 +- .../templates/prometheus/rules/kubernetes-apps.yaml | 2 +- .../templates/prometheus/rules/kubernetes-resources.yaml | 2 +- .../templates/prometheus/rules/kubernetes-storage.yaml | 2 +- .../templates/prometheus/rules/prometheus.rules.yaml | 2 +- 73 files changed, 75 insertions(+), 75 deletions(-) diff --git a/charts/kube-prometheus/hack/sync_grafana_dashboards.py b/charts/kube-prometheus/hack/sync_grafana_dashboards.py index 76364b6010cd..8d8a22d0a2bf 100755 --- a/charts/kube-prometheus/hack/sync_grafana_dashboards.py +++ b/charts/kube-prometheus/hack/sync_grafana_dashboards.py @@ -26,7 +26,7 @@ def new_representer(dumper, data): # Source files list charts = [ { - 'source': 'https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml', + 'source': 'https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml', 'destination': '../templates/grafana/dashboards-1.14', 'type': 'yaml', 'min_kubernetes': '1.14.0-0' @@ -38,7 +38,7 @@ def new_representer(dumper, data): 'min_kubernetes': '1.14.0-0' }, { - 'source': 'https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml', + 'source': 'https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml', 'destination': '../templates/grafana/dashboards', 'type': 'yaml', 'min_kubernetes': '1.10.0-0', diff --git a/charts/kube-prometheus/hack/sync_prometheus_rules.py b/charts/kube-prometheus/hack/sync_prometheus_rules.py index a294582240c7..12f4ca545302 100755 --- a/charts/kube-prometheus/hack/sync_prometheus_rules.py +++ b/charts/kube-prometheus/hack/sync_prometheus_rules.py @@ -25,7 +25,7 @@ def new_representer(dumper, data): # Source files list charts = [ { - 'source': 'https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml', + 'source': 'https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml', 'destination': '../templates/prometheus/rules-1.14', 'min_kubernetes': '1.14.0-0' }, @@ -35,7 +35,7 @@ def new_representer(dumper, data): 'min_kubernetes': '1.14.0-0' }, { - 'source': 'https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml', + 'source': 'https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml', 'destination': '../templates/prometheus/rules', 'min_kubernetes': '1.10.0-0', 'max_kubernetes': '1.14.0-0' diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml index 7c2f070f72b3..bbda34c9c430 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'apiserver' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'apiserver' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml index efb41761aef5..9ed9bbd10057 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'cluster-total' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'cluster-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml index 953a88496557..88ef1943a24b 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'controller-manager' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'controller-manager' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml index 43f7f04558bb..e5efe15cd40a 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml index 7243badd9a77..7a8fce75345e 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml index 527ac49bc137..b88a8ff3f374 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-node' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-node' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml index 28349a3764fb..94c60f904103 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml index 64fa2bd8eaee..10226affa5b9 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml index acfea7479697..000b7e7f995a 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml index b0eca9aa81e9..279f7e2399f7 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubelet' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'kubelet' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml index 4f762c7b4127..2a77e0d4e0f1 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'namespace-by-pod' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'namespace-by-pod' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml index e61b9b928dcf..9dae8d01e052 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'namespace-by-workload' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'namespace-by-workload' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml index a2be7782e71a..337493635239 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-cluster-rsrc-use' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'node-cluster-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml index 13789584c485..bf242b9a9365 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-rsrc-use' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'node-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml index 6cbd28019eba..65626e20fd1e 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'nodes' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'nodes' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml index 0b8b374a3a26..54a948af69f8 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml index d65718642c9f..89f8df08edbf 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'pod-total' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'pod-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml index ac84aad73c94..7b8a45794068 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus-remote-write' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'prometheus-remote-write' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml index 2a3200423e4c..1df20dcd3474 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'prometheus' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml index c8bf1706dab1..dbb0f9c77a47 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'proxy' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'proxy' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml index 0d6fd367ed13..11b7ce87a39d 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'scheduler' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'scheduler' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml index 96d8bb5db17f..c284f17928ce 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'statefulset' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'statefulset' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml b/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml index 66e7888d4cfe..a3333105a19c 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'workload-total' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml +Generated from 'workload-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml index 029f86ae0d85..a1634cc071b9 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-cluster-rsrc-use' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-cluster-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml index 4a98a8457bf1..353f88157171 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-node-rsrc-use' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-node-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml index 737ef14426e2..e8ad685e8968 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml index 8629ae5c2fc4..2e83b9145a49 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml index 192d9ef23d8d..e8dbfb3daecd 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml index 84c14abaeb46..b02f76d4ea64 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml index e464e030817d..f7a784239532 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml b/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml index 09c28781953e..e8690cae9bc8 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'nodes' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'nodes' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml b/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml index 6ac4844848f9..20a86df9edec 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml b/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml index 415d623b2b76..6b8b10f2d1e2 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'pods' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'pods' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml b/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml index 621eb1f43d70..250b6c55d316 100644 --- a/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml +++ b/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'statefulset' from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml +Generated from 'statefulset' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml index a12a8d45e22b..0f7eab8d2460 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml index 948d9f420cbd..f4e891a09860 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'general.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'general.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml index ecc833385d9d..2551ead3d86e 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'k8s.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml index 9ecd9efd7179..593b809db776 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-apiserver-availability.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-apiserver-availability.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml index d1c6d7351ec0..d2c7feb6efb9 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-apiserver-slos' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-apiserver-slos' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml index 8eddeea075cf..12d6ac4d192d 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml index a42389611fbe..53f16aaa2dd5 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-prometheus-general.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-prometheus-general.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml index 0fc67cfdbd98..7f3dcf65e47a 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml index f68bd4955053..c6ba3e6f34ba 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml index a303b225641a..66e87c8ab4a2 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-state-metrics' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kube-state-metrics' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml index 8b8db4dc0e73..40ae07ab06b0 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubelet.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubelet.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml index 5165f5d2f7e5..dd72bf496e15 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml index 65c08d894c93..3658c40dba78 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml index dfd36e961142..0804c438e975 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml index 9052c8f857a1..d0a48003252c 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system-apiserver' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system-apiserver' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml index d964db5d6183..5cb19afaa1a7 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system-controller-manager' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system-controller-manager' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml index 87f8293bb5a4..c6abbedb3c7d 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system-kubelet' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system-kubelet' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml index 57d45c8bde33..8126eab6ecae 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system-scheduler' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system-scheduler' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml index dd6bb82a7ff1..a9a5f4ebb7b0 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml index 3dfe4c974c1e..b3cdde2bbd64 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-exporter.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'node-exporter.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml index 1382596fd9e0..1d046f99706e 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-exporter' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'node-exporter' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml index a92cdca6f0d1..7181d85b1004 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node-network' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'node-network' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml index 83e0df915456..00a2e713b511 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'node.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'node.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml index 98a7a7cad668..bd5db28d40fd 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml index ef6d76a699bd..5c4a9e9c2c76 100644 --- a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/master/manifests/prometheus-rules.yaml +Generated from 'prometheus' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml index c24d8dca6235..eb62f0597440 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml index 9f60a0437d57..768a5bd7f1e5 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'general.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'general.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml index c74108d923b2..b745939b8886 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'k8s.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'k8s.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml index 70ce711ba8a7..47e248071469 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml index bbd3f1776bdb..0a424b34f4ae 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-prometheus-node-alerting.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kube-prometheus-node-alerting.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml index c6ca1ee9d496..438bb0a1e6fd 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml index 1577ea16cf7c..600cdaced96c 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml index 6729390120aa..64bab360885f 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-absent' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kubernetes-absent' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml index 3b33f1df7761..60a8eb28941b 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml index cf4b572fed78..c98996d01176 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml index fb672401566c..8a6e6ba121af 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} diff --git a/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml b/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml index b45e45398439..bd2fdb1d8498 100644 --- a/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml +++ b/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml @@ -1,5 +1,5 @@ {{- /* -Generated from 'prometheus.rules' group from https://raw.githubusercontent.com/kube-prometheus/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml +Generated from 'prometheus.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack */ -}} From 8551937ede91d8b34911f171472fa20fc24e3375 Mon Sep 17 00:00:00 2001 From: Torsten Walter Date: Tue, 25 Aug 2020 00:24:22 +0200 Subject: [PATCH 33/55] Add GitHub superlinter to lint markdown (#26) * Create linter.yml Signed-off-by: Torsten Walter Co-authored-by: Scott Rigby Signed-off-by: Scott Rigby --- .github/workflows/linter.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/linter.yml diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml new file mode 100644 index 000000000000..b42b43619d65 --- /dev/null +++ b/.github/workflows/linter.yml @@ -0,0 +1,20 @@ +name: Lint Code Base + +# Documentation: +# https://help.github.com/en/articles/workflow-syntax-for-github-actions + +on: pull_request + +jobs: + build: + name: Lint Code Base + runs-on: ubuntu-latest + steps: + - name: Checkout Code + uses: actions/checkout@v2 + - name: Lint Code Base + uses: github/super-linter@v3 + env: + VALIDATE_ALL_CODEBASE: false + DEFAULT_BRANCH: main + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 0dc6452fe0b325bb8497f191886db9b5652b71e5 Mon Sep 17 00:00:00 2001 From: Torsten Walter Date: Wed, 26 Aug 2020 01:21:38 +0200 Subject: [PATCH 34/55] Add configuration for Stale GitHub app (#27) Signed-off-by: Scott Rigby --- .github/stale.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000000..b2fa40e2f549 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,16 @@ +# Number of days of inactivity before an issue becomes stale +daysUntilStale: 30 +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 14 +# Issues with these labels will never be considered stale +exemptLabels: + - lifecycle/frozen +staleLabel: lifecycle/stale +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Any further update will + cause the issue/pull request to no longer be considered stale. Thank you for your contributions. +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: > + This issue is being automatically closed due to inactivity. From 8cb19078abbe3536ce2255d93d33c007edd4abe9 Mon Sep 17 00:00:00 2001 From: Torsten Walter Date: Fri, 28 Aug 2020 08:09:20 +0200 Subject: [PATCH 35/55] disabled failing linters and fixed markdown issues (#32) - fixes markdown issues reported by markdownlint - disabled yamllint as helm templates are never valid - disabled the other linters as there is a problem with a shell script and some python code once that is fixed we could enable them again Signed-off-by: Torsten Walter Signed-off-by: Scott Rigby --- .github/workflows/linter.yml | 5 +++++ CODE_OF_CONDUCT.md | 2 +- CONTRIBUTING.md | 4 ++-- README.md | 2 +- charts/kube-prometheus/hack/minikube/README.md | 4 +++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index b42b43619d65..a9db4fd855b4 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -16,5 +16,10 @@ jobs: uses: github/super-linter@v3 env: VALIDATE_ALL_CODEBASE: false + VALIDATE_BASH: false + VALIDATE_PYTHON: false + VALIDATE_PYTHON_FLAKE8: false + VALIDATE_PYTHON_BLACK: false + VALIDATE_YAML: false DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 33f4373ea1a1..ffc6abbbe5a2 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,3 @@ -## Community Code of Conduct +# Community Code of Conduct Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c20622aa9a14..26163fe6851f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ Contributions are welcome via GitHub pull requests. This document outlines the p The Developer Certificate of Origin (DCO) is a lightweight way for contributors to certify that they wrote or otherwise have the right to submit the code they are contributing to the project. Here is the full text of the [DCO](http://developercertificate.org/). Contributors must sign-off that they adhere to these requirements by adding a `Signed-off-by` line to commit messages. -``` +```text This is my commit message Signed-off-by: Random J Developer @@ -14,7 +14,7 @@ Signed-off-by: Random J Developer See `git help commit`: -``` +```text -s, --signoff Add Signed-off-by line by the committer at the end of the commit log message. The meaning of a signoff depends on the project, but it typically diff --git a/README.md b/README.md index 5bb604ba9455..d1ba6ac6d723 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Please refer to Helm's [documentation](https://helm.sh/docs/) to get started. Once Helm is set up properly, add the repo as follows: ```console -$ helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts ``` You can then run `helm search repo prometheus-community` to see the charts. diff --git a/charts/kube-prometheus/hack/minikube/README.md b/charts/kube-prometheus/hack/minikube/README.md index a5db53be6417..353967ede518 100644 --- a/charts/kube-prometheus/hack/minikube/README.md +++ b/charts/kube-prometheus/hack/minikube/README.md @@ -1,3 +1,5 @@ +# Testing on Minikube + The configuration in this folder lets you locally test the setup on minikube. Use cmd.sh to set up components and hack a working etcd scrape configuration. Run the commands in the sequence listed in the script to get a local working minikube cluster. -If you're using windows, there's a commented-out section that you should add to the minikube command. \ No newline at end of file +If you're using windows, there's a commented-out section that you should add to the minikube command. From faa9e79b85d27f9b1175083e51e29e59b90031c4 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 5 Sep 2020 14:27:39 -0400 Subject: [PATCH 36/55] Rename chart dir Signed-off-by: Scott Rigby --- charts/{kube-prometheus => kube-prometheus-stack}/.helmignore | 0 charts/{kube-prometheus => kube-prometheus-stack}/CONTRIBUTING.md | 0 charts/{kube-prometheus => kube-prometheus-stack}/Chart.yaml | 0 charts/{kube-prometheus => kube-prometheus-stack}/README.md | 0 .../ci/01-provision-crds-values.yaml | 0 .../ci/02-test-without-crds-values.yaml | 0 .../crds/crd-alertmanager.yaml | 0 .../crds/crd-podmonitor.yaml | 0 .../crds/crd-prometheus.yaml | 0 .../crds/crd-prometheusrules.yaml | 0 .../crds/crd-servicemonitor.yaml | 0 .../crds/crd-thanosrulers.yaml | 0 charts/{kube-prometheus => kube-prometheus-stack}/hack/README.md | 0 .../hack/minikube/README.md | 0 .../hack/minikube/cmd.sh | 0 .../hack/minikube/values.yaml | 0 .../hack/requirements.txt | 0 .../hack/sync_grafana_dashboards.py | 0 .../hack/sync_prometheus_rules.py | 0 .../{kube-prometheus => kube-prometheus-stack}/requirements.yaml | 0 .../templates/NOTES.txt | 0 .../templates/_helpers.tpl | 0 .../templates/alertmanager/alertmanager.yaml | 0 .../templates/alertmanager/ingress.yaml | 0 .../templates/alertmanager/ingressperreplica.yaml | 0 .../templates/alertmanager/podDisruptionBudget.yaml | 0 .../templates/alertmanager/psp-role.yaml | 0 .../templates/alertmanager/psp-rolebinding.yaml | 0 .../templates/alertmanager/psp.yaml | 0 .../templates/alertmanager/secret.yaml | 0 .../templates/alertmanager/service.yaml | 0 .../templates/alertmanager/serviceaccount.yaml | 0 .../templates/alertmanager/servicemonitor.yaml | 0 .../templates/alertmanager/serviceperreplica.yaml | 0 .../templates/exporters/core-dns/service.yaml | 0 .../templates/exporters/core-dns/servicemonitor.yaml | 0 .../templates/exporters/kube-api-server/servicemonitor.yaml | 0 .../templates/exporters/kube-controller-manager/endpoints.yaml | 0 .../templates/exporters/kube-controller-manager/service.yaml | 0 .../exporters/kube-controller-manager/servicemonitor.yaml | 0 .../templates/exporters/kube-dns/service.yaml | 0 .../templates/exporters/kube-dns/servicemonitor.yaml | 0 .../templates/exporters/kube-etcd/endpoints.yaml | 0 .../templates/exporters/kube-etcd/service.yaml | 0 .../templates/exporters/kube-etcd/servicemonitor.yaml | 0 .../templates/exporters/kube-proxy/endpoints.yaml | 0 .../templates/exporters/kube-proxy/service.yaml | 0 .../templates/exporters/kube-proxy/servicemonitor.yaml | 0 .../templates/exporters/kube-scheduler/endpoints.yaml | 0 .../templates/exporters/kube-scheduler/service.yaml | 0 .../templates/exporters/kube-scheduler/servicemonitor.yaml | 0 .../templates/exporters/kube-state-metrics/serviceMonitor.yaml | 0 .../templates/exporters/kubelet/servicemonitor.yaml | 0 .../templates/exporters/node-exporter/servicemonitor.yaml | 0 .../templates/grafana/configmap-dashboards.yaml | 0 .../templates/grafana/configmaps-datasources.yaml | 0 .../templates/grafana/dashboards-1.14/apiserver.yaml | 0 .../templates/grafana/dashboards-1.14/cluster-total.yaml | 0 .../templates/grafana/dashboards-1.14/controller-manager.yaml | 0 .../templates/grafana/dashboards-1.14/etcd.yaml | 0 .../templates/grafana/dashboards-1.14/k8s-coredns.yaml | 0 .../templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml | 0 .../grafana/dashboards-1.14/k8s-resources-namespace.yaml | 0 .../templates/grafana/dashboards-1.14/k8s-resources-node.yaml | 0 .../templates/grafana/dashboards-1.14/k8s-resources-pod.yaml | 0 .../templates/grafana/dashboards-1.14/k8s-resources-workload.yaml | 0 .../dashboards-1.14/k8s-resources-workloads-namespace.yaml | 0 .../templates/grafana/dashboards-1.14/kubelet.yaml | 0 .../templates/grafana/dashboards-1.14/namespace-by-pod.yaml | 0 .../templates/grafana/dashboards-1.14/namespace-by-workload.yaml | 0 .../templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml | 0 .../templates/grafana/dashboards-1.14/node-rsrc-use.yaml | 0 .../templates/grafana/dashboards-1.14/nodes.yaml | 0 .../templates/grafana/dashboards-1.14/persistentvolumesusage.yaml | 0 .../templates/grafana/dashboards-1.14/pod-total.yaml | 0 .../grafana/dashboards-1.14/prometheus-remote-write.yaml | 0 .../templates/grafana/dashboards-1.14/prometheus.yaml | 0 .../templates/grafana/dashboards-1.14/proxy.yaml | 0 .../templates/grafana/dashboards-1.14/scheduler.yaml | 0 .../templates/grafana/dashboards-1.14/statefulset.yaml | 0 .../templates/grafana/dashboards-1.14/workload-total.yaml | 0 .../templates/grafana/dashboards/etcd.yaml | 0 .../templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml | 0 .../templates/grafana/dashboards/k8s-node-rsrc-use.yaml | 0 .../templates/grafana/dashboards/k8s-resources-cluster.yaml | 0 .../templates/grafana/dashboards/k8s-resources-namespace.yaml | 0 .../templates/grafana/dashboards/k8s-resources-pod.yaml | 0 .../templates/grafana/dashboards/k8s-resources-workload.yaml | 0 .../grafana/dashboards/k8s-resources-workloads-namespace.yaml | 0 .../templates/grafana/dashboards/nodes.yaml | 0 .../templates/grafana/dashboards/persistentvolumesusage.yaml | 0 .../templates/grafana/dashboards/pods.yaml | 0 .../templates/grafana/dashboards/statefulset.yaml | 0 .../templates/grafana/servicemonitor.yaml | 0 .../admission-webhooks/job-patch/clusterrole.yaml | 0 .../admission-webhooks/job-patch/clusterrolebinding.yaml | 0 .../admission-webhooks/job-patch/job-createSecret.yaml | 0 .../admission-webhooks/job-patch/job-patchWebhook.yaml | 0 .../prometheus-operator/admission-webhooks/job-patch/psp.yaml | 0 .../prometheus-operator/admission-webhooks/job-patch/role.yaml | 0 .../admission-webhooks/job-patch/rolebinding.yaml | 0 .../admission-webhooks/job-patch/serviceaccount.yaml | 0 .../admission-webhooks/mutatingWebhookConfiguration.yaml | 0 .../admission-webhooks/validatingWebhookConfiguration.yaml | 0 .../templates/prometheus-operator/cleanup-crds.yaml | 0 .../templates/prometheus-operator/clusterrole.yaml | 0 .../templates/prometheus-operator/clusterrolebinding.yaml | 0 .../templates/prometheus-operator/crds.yaml | 0 .../templates/prometheus-operator/deployment.yaml | 0 .../templates/prometheus-operator/psp-clusterrole.yaml | 0 .../templates/prometheus-operator/psp-clusterrolebinding.yaml | 0 .../templates/prometheus-operator/psp.yaml | 0 .../templates/prometheus-operator/service.yaml | 0 .../templates/prometheus-operator/serviceaccount.yaml | 0 .../templates/prometheus-operator/servicemonitor.yaml | 0 .../templates/prometheus/additionalAlertRelabelConfigs.yaml | 0 .../templates/prometheus/additionalAlertmanagerConfigs.yaml | 0 .../templates/prometheus/additionalPrometheusRules.yaml | 0 .../templates/prometheus/additionalScrapeConfigs.yaml | 0 .../templates/prometheus/clusterrole.yaml | 0 .../templates/prometheus/clusterrolebinding.yaml | 0 .../templates/prometheus/ingress.yaml | 0 .../templates/prometheus/ingressThanosSidecar.yaml | 0 .../templates/prometheus/ingressperreplica.yaml | 0 .../templates/prometheus/podDisruptionBudget.yaml | 0 .../templates/prometheus/podmonitors.yaml | 0 .../templates/prometheus/prometheus.yaml | 0 .../templates/prometheus/psp-clusterrole.yaml | 0 .../templates/prometheus/psp-clusterrolebinding.yaml | 0 .../templates/prometheus/psp.yaml | 0 .../templates/prometheus/rules-1.14/alertmanager.rules.yaml | 0 .../templates/prometheus/rules-1.14/etcd.yaml | 0 .../templates/prometheus/rules-1.14/general.rules.yaml | 0 .../templates/prometheus/rules-1.14/k8s.rules.yaml | 0 .../prometheus/rules-1.14/kube-apiserver-availability.rules.yaml | 0 .../templates/prometheus/rules-1.14/kube-apiserver-slos.yaml | 0 .../templates/prometheus/rules-1.14/kube-apiserver.rules.yaml | 0 .../prometheus/rules-1.14/kube-prometheus-general.rules.yaml | 0 .../rules-1.14/kube-prometheus-node-recording.rules.yaml | 0 .../templates/prometheus/rules-1.14/kube-scheduler.rules.yaml | 0 .../templates/prometheus/rules-1.14/kube-state-metrics.yaml | 0 .../templates/prometheus/rules-1.14/kubelet.rules.yaml | 0 .../templates/prometheus/rules-1.14/kubernetes-apps.yaml | 0 .../templates/prometheus/rules-1.14/kubernetes-resources.yaml | 0 .../templates/prometheus/rules-1.14/kubernetes-storage.yaml | 0 .../prometheus/rules-1.14/kubernetes-system-apiserver.yaml | 0 .../rules-1.14/kubernetes-system-controller-manager.yaml | 0 .../prometheus/rules-1.14/kubernetes-system-kubelet.yaml | 0 .../prometheus/rules-1.14/kubernetes-system-scheduler.yaml | 0 .../templates/prometheus/rules-1.14/kubernetes-system.yaml | 0 .../templates/prometheus/rules-1.14/node-exporter.rules.yaml | 0 .../templates/prometheus/rules-1.14/node-exporter.yaml | 0 .../templates/prometheus/rules-1.14/node-network.yaml | 0 .../templates/prometheus/rules-1.14/node.rules.yaml | 0 .../templates/prometheus/rules-1.14/prometheus-operator.yaml | 0 .../templates/prometheus/rules-1.14/prometheus.yaml | 0 .../templates/prometheus/rules/alertmanager.rules.yaml | 0 .../templates/prometheus/rules/etcd.yaml | 0 .../templates/prometheus/rules/general.rules.yaml | 0 .../templates/prometheus/rules/k8s.rules.yaml | 0 .../templates/prometheus/rules/kube-apiserver.rules.yaml | 0 .../prometheus/rules/kube-prometheus-node-alerting.rules.yaml | 0 .../prometheus/rules/kube-prometheus-node-recording.rules.yaml | 0 .../templates/prometheus/rules/kube-scheduler.rules.yaml | 0 .../templates/prometheus/rules/kubernetes-absent.yaml | 0 .../templates/prometheus/rules/kubernetes-apps.yaml | 0 .../templates/prometheus/rules/kubernetes-resources.yaml | 0 .../templates/prometheus/rules/kubernetes-storage.yaml | 0 .../templates/prometheus/rules/kubernetes-system.yaml | 0 .../templates/prometheus/rules/node-network.yaml | 0 .../templates/prometheus/rules/node-time.yaml | 0 .../templates/prometheus/rules/node.rules.yaml | 0 .../templates/prometheus/rules/prometheus-operator.yaml | 0 .../templates/prometheus/rules/prometheus.rules.yaml | 0 .../templates/prometheus/service.yaml | 0 .../templates/prometheus/serviceaccount.yaml | 0 .../templates/prometheus/servicemonitor.yaml | 0 .../templates/prometheus/servicemonitors.yaml | 0 .../templates/prometheus/serviceperreplica.yaml | 0 charts/{kube-prometheus => kube-prometheus-stack}/values.yaml | 0 180 files changed, 0 insertions(+), 0 deletions(-) rename charts/{kube-prometheus => kube-prometheus-stack}/.helmignore (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/CONTRIBUTING.md (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/Chart.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/README.md (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/ci/01-provision-crds-values.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/ci/02-test-without-crds-values.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/crds/crd-alertmanager.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/crds/crd-podmonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/crds/crd-prometheus.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/crds/crd-prometheusrules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/crds/crd-servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/crds/crd-thanosrulers.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/hack/README.md (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/hack/minikube/README.md (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/hack/minikube/cmd.sh (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/hack/minikube/values.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/hack/requirements.txt (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/hack/sync_grafana_dashboards.py (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/hack/sync_prometheus_rules.py (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/requirements.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/NOTES.txt (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/_helpers.tpl (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/alertmanager.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/ingress.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/ingressperreplica.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/podDisruptionBudget.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/psp-role.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/psp-rolebinding.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/psp.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/secret.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/service.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/serviceaccount.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/alertmanager/serviceperreplica.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/core-dns/service.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/core-dns/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-api-server/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-controller-manager/endpoints.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-controller-manager/service.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-controller-manager/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-dns/service.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-dns/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-etcd/endpoints.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-etcd/service.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-etcd/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-proxy/endpoints.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-proxy/service.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-proxy/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-scheduler/endpoints.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-scheduler/service.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-scheduler/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kube-state-metrics/serviceMonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/kubelet/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/exporters/node-exporter/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/configmap-dashboards.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/configmaps-datasources.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/apiserver.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/cluster-total.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/controller-manager.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/etcd.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-coredns.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-node.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/kubelet.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/namespace-by-pod.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/namespace-by-workload.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/node-rsrc-use.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/nodes.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/pod-total.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/prometheus.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/proxy.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/scheduler.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/statefulset.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards-1.14/workload-total.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/etcd.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/k8s-node-rsrc-use.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/k8s-resources-cluster.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/k8s-resources-namespace.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/k8s-resources-pod.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/k8s-resources-workload.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/nodes.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/persistentvolumesusage.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/pods.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/dashboards/statefulset.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/grafana/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/cleanup-crds.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/clusterrole.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/clusterrolebinding.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/crds.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/deployment.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/psp-clusterrole.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/psp-clusterrolebinding.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/psp.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/service.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/serviceaccount.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus-operator/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/additionalAlertRelabelConfigs.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/additionalAlertmanagerConfigs.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/additionalPrometheusRules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/additionalScrapeConfigs.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/clusterrole.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/clusterrolebinding.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/ingress.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/ingressThanosSidecar.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/ingressperreplica.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/podDisruptionBudget.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/podmonitors.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/prometheus.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/psp-clusterrole.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/psp-clusterrolebinding.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/psp.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/alertmanager.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/etcd.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/general.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/k8s.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-state-metrics.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubelet.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-apps.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-resources.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-storage.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-system.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/node-exporter.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/node-exporter.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/node-network.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/node.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/prometheus-operator.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules-1.14/prometheus.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/alertmanager.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/etcd.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/general.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/k8s.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/kube-apiserver.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/kube-scheduler.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/kubernetes-absent.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/kubernetes-apps.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/kubernetes-resources.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/kubernetes-storage.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/kubernetes-system.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/node-network.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/node-time.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/node.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/prometheus-operator.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/rules/prometheus.rules.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/service.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/serviceaccount.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/servicemonitor.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/servicemonitors.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/templates/prometheus/serviceperreplica.yaml (100%) rename charts/{kube-prometheus => kube-prometheus-stack}/values.yaml (100%) diff --git a/charts/kube-prometheus/.helmignore b/charts/kube-prometheus-stack/.helmignore similarity index 100% rename from charts/kube-prometheus/.helmignore rename to charts/kube-prometheus-stack/.helmignore diff --git a/charts/kube-prometheus/CONTRIBUTING.md b/charts/kube-prometheus-stack/CONTRIBUTING.md similarity index 100% rename from charts/kube-prometheus/CONTRIBUTING.md rename to charts/kube-prometheus-stack/CONTRIBUTING.md diff --git a/charts/kube-prometheus/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml similarity index 100% rename from charts/kube-prometheus/Chart.yaml rename to charts/kube-prometheus-stack/Chart.yaml diff --git a/charts/kube-prometheus/README.md b/charts/kube-prometheus-stack/README.md similarity index 100% rename from charts/kube-prometheus/README.md rename to charts/kube-prometheus-stack/README.md diff --git a/charts/kube-prometheus/ci/01-provision-crds-values.yaml b/charts/kube-prometheus-stack/ci/01-provision-crds-values.yaml similarity index 100% rename from charts/kube-prometheus/ci/01-provision-crds-values.yaml rename to charts/kube-prometheus-stack/ci/01-provision-crds-values.yaml diff --git a/charts/kube-prometheus/ci/02-test-without-crds-values.yaml b/charts/kube-prometheus-stack/ci/02-test-without-crds-values.yaml similarity index 100% rename from charts/kube-prometheus/ci/02-test-without-crds-values.yaml rename to charts/kube-prometheus-stack/ci/02-test-without-crds-values.yaml diff --git a/charts/kube-prometheus/crds/crd-alertmanager.yaml b/charts/kube-prometheus-stack/crds/crd-alertmanager.yaml similarity index 100% rename from charts/kube-prometheus/crds/crd-alertmanager.yaml rename to charts/kube-prometheus-stack/crds/crd-alertmanager.yaml diff --git a/charts/kube-prometheus/crds/crd-podmonitor.yaml b/charts/kube-prometheus-stack/crds/crd-podmonitor.yaml similarity index 100% rename from charts/kube-prometheus/crds/crd-podmonitor.yaml rename to charts/kube-prometheus-stack/crds/crd-podmonitor.yaml diff --git a/charts/kube-prometheus/crds/crd-prometheus.yaml b/charts/kube-prometheus-stack/crds/crd-prometheus.yaml similarity index 100% rename from charts/kube-prometheus/crds/crd-prometheus.yaml rename to charts/kube-prometheus-stack/crds/crd-prometheus.yaml diff --git a/charts/kube-prometheus/crds/crd-prometheusrules.yaml b/charts/kube-prometheus-stack/crds/crd-prometheusrules.yaml similarity index 100% rename from charts/kube-prometheus/crds/crd-prometheusrules.yaml rename to charts/kube-prometheus-stack/crds/crd-prometheusrules.yaml diff --git a/charts/kube-prometheus/crds/crd-servicemonitor.yaml b/charts/kube-prometheus-stack/crds/crd-servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/crds/crd-servicemonitor.yaml rename to charts/kube-prometheus-stack/crds/crd-servicemonitor.yaml diff --git a/charts/kube-prometheus/crds/crd-thanosrulers.yaml b/charts/kube-prometheus-stack/crds/crd-thanosrulers.yaml similarity index 100% rename from charts/kube-prometheus/crds/crd-thanosrulers.yaml rename to charts/kube-prometheus-stack/crds/crd-thanosrulers.yaml diff --git a/charts/kube-prometheus/hack/README.md b/charts/kube-prometheus-stack/hack/README.md similarity index 100% rename from charts/kube-prometheus/hack/README.md rename to charts/kube-prometheus-stack/hack/README.md diff --git a/charts/kube-prometheus/hack/minikube/README.md b/charts/kube-prometheus-stack/hack/minikube/README.md similarity index 100% rename from charts/kube-prometheus/hack/minikube/README.md rename to charts/kube-prometheus-stack/hack/minikube/README.md diff --git a/charts/kube-prometheus/hack/minikube/cmd.sh b/charts/kube-prometheus-stack/hack/minikube/cmd.sh similarity index 100% rename from charts/kube-prometheus/hack/minikube/cmd.sh rename to charts/kube-prometheus-stack/hack/minikube/cmd.sh diff --git a/charts/kube-prometheus/hack/minikube/values.yaml b/charts/kube-prometheus-stack/hack/minikube/values.yaml similarity index 100% rename from charts/kube-prometheus/hack/minikube/values.yaml rename to charts/kube-prometheus-stack/hack/minikube/values.yaml diff --git a/charts/kube-prometheus/hack/requirements.txt b/charts/kube-prometheus-stack/hack/requirements.txt similarity index 100% rename from charts/kube-prometheus/hack/requirements.txt rename to charts/kube-prometheus-stack/hack/requirements.txt diff --git a/charts/kube-prometheus/hack/sync_grafana_dashboards.py b/charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py similarity index 100% rename from charts/kube-prometheus/hack/sync_grafana_dashboards.py rename to charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py diff --git a/charts/kube-prometheus/hack/sync_prometheus_rules.py b/charts/kube-prometheus-stack/hack/sync_prometheus_rules.py similarity index 100% rename from charts/kube-prometheus/hack/sync_prometheus_rules.py rename to charts/kube-prometheus-stack/hack/sync_prometheus_rules.py diff --git a/charts/kube-prometheus/requirements.yaml b/charts/kube-prometheus-stack/requirements.yaml similarity index 100% rename from charts/kube-prometheus/requirements.yaml rename to charts/kube-prometheus-stack/requirements.yaml diff --git a/charts/kube-prometheus/templates/NOTES.txt b/charts/kube-prometheus-stack/templates/NOTES.txt similarity index 100% rename from charts/kube-prometheus/templates/NOTES.txt rename to charts/kube-prometheus-stack/templates/NOTES.txt diff --git a/charts/kube-prometheus/templates/_helpers.tpl b/charts/kube-prometheus-stack/templates/_helpers.tpl similarity index 100% rename from charts/kube-prometheus/templates/_helpers.tpl rename to charts/kube-prometheus-stack/templates/_helpers.tpl diff --git a/charts/kube-prometheus/templates/alertmanager/alertmanager.yaml b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/alertmanager.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/ingress.yaml b/charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/ingress.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/ingressperreplica.yaml b/charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/ingressperreplica.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/podDisruptionBudget.yaml b/charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/podDisruptionBudget.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/psp-role.yaml b/charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/psp-role.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/psp-rolebinding.yaml b/charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/psp-rolebinding.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/psp.yaml b/charts/kube-prometheus-stack/templates/alertmanager/psp.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/psp.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/psp.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/secret.yaml b/charts/kube-prometheus-stack/templates/alertmanager/secret.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/secret.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/secret.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/service.yaml b/charts/kube-prometheus-stack/templates/alertmanager/service.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/service.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/service.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/serviceaccount.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/alertmanager/serviceperreplica.yaml b/charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml similarity index 100% rename from charts/kube-prometheus/templates/alertmanager/serviceperreplica.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml diff --git a/charts/kube-prometheus/templates/exporters/core-dns/service.yaml b/charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/core-dns/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml diff --git a/charts/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/core-dns/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/core-dns/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/core-dns/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-api-server/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-api-server/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-api-server/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-api-server/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/endpoints.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-controller-manager/endpoints.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/endpoints.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-controller-manager/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-dns/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-dns/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-dns/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-dns/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-dns/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-dns/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-etcd/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/endpoints.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-etcd/endpoints.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-etcd/endpoints.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-etcd/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-etcd/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-etcd/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-etcd/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-etcd/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/endpoints.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-proxy/endpoints.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-proxy/endpoints.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-proxy/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-proxy/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-proxy/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-proxy/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/endpoints.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-scheduler/endpoints.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-scheduler/endpoints.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-scheduler/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-scheduler/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-scheduler/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kube-state-metrics/serviceMonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml diff --git a/charts/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kubelet/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/kubelet/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kubelet/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/exporters/node-exporter/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/node-exporter/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/exporters/node-exporter/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/node-exporter/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/grafana/configmap-dashboards.yaml b/charts/kube-prometheus-stack/templates/grafana/configmap-dashboards.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/configmap-dashboards.yaml rename to charts/kube-prometheus-stack/templates/grafana/configmap-dashboards.yaml diff --git a/charts/kube-prometheus/templates/grafana/configmaps-datasources.yaml b/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/configmaps-datasources.yaml rename to charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/apiserver.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/apiserver.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/apiserver.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/cluster-total.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/cluster-total.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/cluster-total.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/controller-manager.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/controller-manager.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/controller-manager.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/etcd.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/etcd.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/etcd.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/etcd.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-coredns.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-coredns.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-coredns.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-coredns.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-node.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-node.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-node.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/kubelet.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/kubelet.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/kubelet.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-pod.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-pod.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-pod.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-workload.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/namespace-by-workload.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-workload.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-rsrc-use.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/node-rsrc-use.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-rsrc-use.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/nodes.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/nodes.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/nodes.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/pod-total.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/pod-total.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/pod-total.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/prometheus.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/proxy.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/proxy.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/proxy.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/scheduler.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/scheduler.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/scheduler.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/statefulset.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/statefulset.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/statefulset.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/workload-total.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards-1.14/workload-total.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/workload-total.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/etcd.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/etcd.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/etcd.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/etcd.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-node-rsrc-use.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/k8s-node-rsrc-use.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-node-rsrc-use.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-cluster.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-cluster.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-cluster.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-namespace.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-namespace.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-namespace.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-pod.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-pod.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-pod.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workload.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workload.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workload.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/nodes.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/nodes.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/nodes.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/persistentvolumesusage.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/persistentvolumesusage.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/persistentvolumesusage.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/pods.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/pods.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/pods.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/pods.yaml diff --git a/charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/statefulset.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/dashboards/statefulset.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/statefulset.yaml diff --git a/charts/kube-prometheus/templates/grafana/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/grafana/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/grafana/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/grafana/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/cleanup-crds.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/cleanup-crds.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/cleanup-crds.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/cleanup-crds.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/clusterrole.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/clusterrolebinding.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/crds.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/crds.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/crds.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/crds.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/deployment.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/deployment.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/psp-clusterrole.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/psp-clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/psp-clusterrolebinding.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/psp.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/psp.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/service.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/service.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/serviceaccount.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml diff --git a/charts/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus-operator/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/prometheus/additionalAlertRelabelConfigs.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalAlertRelabelConfigs.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/additionalAlertRelabelConfigs.yaml rename to charts/kube-prometheus-stack/templates/prometheus/additionalAlertRelabelConfigs.yaml diff --git a/charts/kube-prometheus/templates/prometheus/additionalAlertmanagerConfigs.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalAlertmanagerConfigs.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/additionalAlertmanagerConfigs.yaml rename to charts/kube-prometheus-stack/templates/prometheus/additionalAlertmanagerConfigs.yaml diff --git a/charts/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/additionalPrometheusRules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/additionalScrapeConfigs.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalScrapeConfigs.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/additionalScrapeConfigs.yaml rename to charts/kube-prometheus-stack/templates/prometheus/additionalScrapeConfigs.yaml diff --git a/charts/kube-prometheus/templates/prometheus/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/clusterrole.yaml rename to charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml diff --git a/charts/kube-prometheus/templates/prometheus/clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus/clusterrolebinding.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/clusterrolebinding.yaml rename to charts/kube-prometheus-stack/templates/prometheus/clusterrolebinding.yaml diff --git a/charts/kube-prometheus/templates/prometheus/ingress.yaml b/charts/kube-prometheus-stack/templates/prometheus/ingress.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/ingress.yaml rename to charts/kube-prometheus-stack/templates/prometheus/ingress.yaml diff --git a/charts/kube-prometheus/templates/prometheus/ingressThanosSidecar.yaml b/charts/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/ingressThanosSidecar.yaml rename to charts/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml diff --git a/charts/kube-prometheus/templates/prometheus/ingressperreplica.yaml b/charts/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/ingressperreplica.yaml rename to charts/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml diff --git a/charts/kube-prometheus/templates/prometheus/podDisruptionBudget.yaml b/charts/kube-prometheus-stack/templates/prometheus/podDisruptionBudget.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/podDisruptionBudget.yaml rename to charts/kube-prometheus-stack/templates/prometheus/podDisruptionBudget.yaml diff --git a/charts/kube-prometheus/templates/prometheus/podmonitors.yaml b/charts/kube-prometheus-stack/templates/prometheus/podmonitors.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/podmonitors.yaml rename to charts/kube-prometheus-stack/templates/prometheus/podmonitors.yaml diff --git a/charts/kube-prometheus/templates/prometheus/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/prometheus.yaml rename to charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml diff --git a/charts/kube-prometheus/templates/prometheus/psp-clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrole.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/psp-clusterrole.yaml rename to charts/kube-prometheus-stack/templates/prometheus/psp-clusterrole.yaml diff --git a/charts/kube-prometheus/templates/prometheus/psp-clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrolebinding.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/psp-clusterrolebinding.yaml rename to charts/kube-prometheus-stack/templates/prometheus/psp-clusterrolebinding.yaml diff --git a/charts/kube-prometheus/templates/prometheus/psp.yaml b/charts/kube-prometheus-stack/templates/prometheus/psp.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/psp.yaml rename to charts/kube-prometheus-stack/templates/prometheus/psp.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/alertmanager.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/alertmanager.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/alertmanager.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/etcd.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/etcd.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/general.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/general.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/general.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/k8s.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/k8s.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/k8s.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-state-metrics.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kube-state-metrics.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-state-metrics.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubelet.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kubelet.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubelet.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-apps.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-apps.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-apps.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-resources.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-resources.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-resources.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-storage.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-storage.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-storage.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/kubernetes-system.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/node-exporter.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-network.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/node-network.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-network.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/node.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus-operator.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus-operator.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus-operator.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules-1.14/prometheus.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/alertmanager.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/alertmanager.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/alertmanager.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/etcd.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/etcd.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/etcd.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/etcd.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/general.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/general.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/general.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/k8s.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/k8s.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/k8s.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-apiserver.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/kube-apiserver.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kube-apiserver.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-scheduler.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/kube-scheduler.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kube-scheduler.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-absent.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/kubernetes-absent.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-absent.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-apps.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/kubernetes-apps.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-apps.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-resources.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/kubernetes-resources.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-resources.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-storage.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/kubernetes-storage.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-storage.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-system.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-system.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/node-network.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/node-network.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/node-network.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/node-network.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/node-time.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/node-time.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/node-time.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/node-time.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/node.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/node.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus-operator.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/prometheus-operator.yaml diff --git a/charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus.rules.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/rules/prometheus.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/prometheus.rules.yaml diff --git a/charts/kube-prometheus/templates/prometheus/service.yaml b/charts/kube-prometheus-stack/templates/prometheus/service.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/service.yaml rename to charts/kube-prometheus-stack/templates/prometheus/service.yaml diff --git a/charts/kube-prometheus/templates/prometheus/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/prometheus/serviceaccount.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/serviceaccount.yaml rename to charts/kube-prometheus-stack/templates/prometheus/serviceaccount.yaml diff --git a/charts/kube-prometheus/templates/prometheus/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/prometheus/servicemonitor.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/prometheus/servicemonitor.yaml diff --git a/charts/kube-prometheus/templates/prometheus/servicemonitors.yaml b/charts/kube-prometheus-stack/templates/prometheus/servicemonitors.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/servicemonitors.yaml rename to charts/kube-prometheus-stack/templates/prometheus/servicemonitors.yaml diff --git a/charts/kube-prometheus/templates/prometheus/serviceperreplica.yaml b/charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml similarity index 100% rename from charts/kube-prometheus/templates/prometheus/serviceperreplica.yaml rename to charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml diff --git a/charts/kube-prometheus/values.yaml b/charts/kube-prometheus-stack/values.yaml similarity index 100% rename from charts/kube-prometheus/values.yaml rename to charts/kube-prometheus-stack/values.yaml From d24a534301abdba274fb927f13eac7771317457b Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 5 Sep 2020 14:28:01 -0400 Subject: [PATCH 37/55] Update CODEOWNERS for new chart dir name Signed-off-by: Scott Rigby --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4a6f7b6be8a3..aa3c8f449f68 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,7 +1,7 @@ # See https://github.com/scottrigby/prometheus-helm-charts/issues/12 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners -charts/kube-prometheus/ @vsliouniaev @bismarck @gianrubio +charts/kube-prometheus-stack/ @vsliouniaev @bismarck @gianrubio charts/prometheus/ @gianrubio @zanhsieh @Xtigyro charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio From a13fb8c496c8470e045cb9f791f1298bdfbf7f56 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 5 Sep 2020 14:51:54 -0400 Subject: [PATCH 38/55] Rename instances of kube-prometheus to kube-prometheus-stack. Take care to leave references to the upstream kube-prometheus project (and related configs) as kube-prometheus Signed-off-by: Scott Rigby --- charts/kube-prometheus-stack/CONTRIBUTING.md | 6 ++- charts/kube-prometheus-stack/Chart.yaml | 4 +- charts/kube-prometheus-stack/README.md | 18 ++++----- charts/kube-prometheus-stack/hack/README.md | 4 +- .../hack/minikube/cmd.sh | 4 +- .../hack/sync_grafana_dashboards.py | 10 ++--- .../hack/sync_prometheus_rules.py | 18 ++++----- .../kube-prometheus-stack/templates/NOTES.txt | 2 +- .../templates/_helpers.tpl | 38 +++++++++---------- .../templates/alertmanager/alertmanager.yaml | 16 ++++---- .../templates/alertmanager/ingress.yaml | 8 ++-- .../alertmanager/ingressperreplica.yaml | 14 +++---- .../alertmanager/podDisruptionBudget.yaml | 10 ++--- .../templates/alertmanager/psp-role.yaml | 10 ++--- .../alertmanager/psp-rolebinding.yaml | 14 +++---- .../templates/alertmanager/psp.yaml | 6 +-- .../templates/alertmanager/secret.yaml | 8 ++-- .../templates/alertmanager/service.yaml | 10 ++--- .../alertmanager/serviceaccount.yaml | 8 ++-- .../alertmanager/servicemonitor.yaml | 12 +++--- .../alertmanager/serviceperreplica.yaml | 16 ++++---- .../templates/exporters/core-dns/service.yaml | 6 +-- .../exporters/core-dns/servicemonitor.yaml | 10 ++--- .../kube-api-server/servicemonitor.yaml | 8 ++-- .../kube-controller-manager/endpoints.yaml | 6 +-- .../kube-controller-manager/service.yaml | 6 +-- .../servicemonitor.yaml | 10 ++--- .../templates/exporters/kube-dns/service.yaml | 6 +-- .../exporters/kube-dns/servicemonitor.yaml | 10 ++--- .../exporters/kube-etcd/endpoints.yaml | 6 +-- .../exporters/kube-etcd/service.yaml | 6 +-- .../exporters/kube-etcd/servicemonitor.yaml | 10 ++--- .../exporters/kube-proxy/endpoints.yaml | 6 +-- .../exporters/kube-proxy/service.yaml | 6 +-- .../exporters/kube-proxy/servicemonitor.yaml | 10 ++--- .../exporters/kube-scheduler/endpoints.yaml | 6 +-- .../exporters/kube-scheduler/service.yaml | 6 +-- .../kube-scheduler/servicemonitor.yaml | 10 ++--- .../kube-state-metrics/serviceMonitor.yaml | 8 ++-- .../exporters/kubelet/servicemonitor.yaml | 8 ++-- .../node-exporter/servicemonitor.yaml | 8 ++-- .../grafana/configmap-dashboards.yaml | 8 ++-- .../grafana/configmaps-datasources.yaml | 12 +++--- .../grafana/dashboards-1.14/apiserver.yaml | 10 ++--- .../dashboards-1.14/cluster-total.yaml | 10 ++--- .../dashboards-1.14/controller-manager.yaml | 10 ++--- .../grafana/dashboards-1.14/etcd.yaml | 10 ++--- .../grafana/dashboards-1.14/k8s-coredns.yaml | 8 ++-- .../k8s-resources-cluster.yaml | 10 ++--- .../k8s-resources-namespace.yaml | 10 ++--- .../dashboards-1.14/k8s-resources-node.yaml | 10 ++--- .../dashboards-1.14/k8s-resources-pod.yaml | 10 ++--- .../k8s-resources-workload.yaml | 10 ++--- .../k8s-resources-workloads-namespace.yaml | 10 ++--- .../grafana/dashboards-1.14/kubelet.yaml | 10 ++--- .../dashboards-1.14/namespace-by-pod.yaml | 10 ++--- .../namespace-by-workload.yaml | 10 ++--- .../node-cluster-rsrc-use.yaml | 10 ++--- .../dashboards-1.14/node-rsrc-use.yaml | 10 ++--- .../grafana/dashboards-1.14/nodes.yaml | 10 ++--- .../persistentvolumesusage.yaml | 10 ++--- .../grafana/dashboards-1.14/pod-total.yaml | 10 ++--- .../prometheus-remote-write.yaml | 10 ++--- .../grafana/dashboards-1.14/prometheus.yaml | 10 ++--- .../grafana/dashboards-1.14/proxy.yaml | 10 ++--- .../grafana/dashboards-1.14/scheduler.yaml | 10 ++--- .../grafana/dashboards-1.14/statefulset.yaml | 10 ++--- .../dashboards-1.14/workload-total.yaml | 10 ++--- .../templates/grafana/dashboards/etcd.yaml | 10 ++--- .../dashboards/k8s-cluster-rsrc-use.yaml | 10 ++--- .../grafana/dashboards/k8s-node-rsrc-use.yaml | 10 ++--- .../dashboards/k8s-resources-cluster.yaml | 10 ++--- .../dashboards/k8s-resources-namespace.yaml | 10 ++--- .../grafana/dashboards/k8s-resources-pod.yaml | 10 ++--- .../dashboards/k8s-resources-workload.yaml | 10 ++--- .../k8s-resources-workloads-namespace.yaml | 10 ++--- .../templates/grafana/dashboards/nodes.yaml | 10 ++--- .../dashboards/persistentvolumesusage.yaml | 10 ++--- .../templates/grafana/dashboards/pods.yaml | 10 ++--- .../grafana/dashboards/statefulset.yaml | 10 ++--- .../templates/grafana/servicemonitor.yaml | 10 ++--- .../job-patch/clusterrole.yaml | 8 ++-- .../job-patch/clusterrolebinding.yaml | 12 +++--- .../job-patch/job-createSecret.yaml | 22 +++++------ .../job-patch/job-patchWebhook.yaml | 22 +++++------ .../admission-webhooks/job-patch/psp.yaml | 6 +-- .../admission-webhooks/job-patch/role.yaml | 8 ++-- .../job-patch/rolebinding.yaml | 14 +++---- .../job-patch/serviceaccount.yaml | 8 ++-- .../mutatingWebhookConfiguration.yaml | 10 ++--- .../validatingWebhookConfiguration.yaml | 10 ++--- .../prometheus-operator/cleanup-crds.yaml | 16 ++++---- .../prometheus-operator/clusterrole.yaml | 6 +-- .../clusterrolebinding.yaml | 12 +++--- .../prometheus-operator/deployment.yaml | 24 ++++++------ .../prometheus-operator/psp-clusterrole.yaml | 8 ++-- .../psp-clusterrolebinding.yaml | 12 +++--- .../templates/prometheus-operator/psp.yaml | 6 +-- .../prometheus-operator/service.yaml | 10 ++--- .../prometheus-operator/serviceaccount.yaml | 8 ++-- .../prometheus-operator/servicemonitor.yaml | 12 +++--- .../additionalAlertRelabelConfigs.yaml | 8 ++-- .../additionalAlertmanagerConfigs.yaml | 8 ++-- .../prometheus/additionalPrometheusRules.yaml | 16 ++++---- .../prometheus/additionalScrapeConfigs.yaml | 8 ++-- .../templates/prometheus/clusterrole.yaml | 6 +-- .../prometheus/clusterrolebinding.yaml | 12 +++--- .../templates/prometheus/ingress.yaml | 8 ++-- .../prometheus/ingressThanosSidecar.yaml | 8 ++-- .../prometheus/ingressperreplica.yaml | 14 +++---- .../prometheus/podDisruptionBudget.yaml | 10 ++--- .../templates/prometheus/podmonitors.yaml | 6 +-- .../templates/prometheus/prometheus.yaml | 28 +++++++------- .../templates/prometheus/psp-clusterrole.yaml | 8 ++-- .../prometheus/psp-clusterrolebinding.yaml | 12 +++--- .../templates/prometheus/psp.yaml | 6 +-- .../rules-1.14/alertmanager.rules.yaml | 14 +++---- .../templates/prometheus/rules-1.14/etcd.yaml | 10 ++--- .../prometheus/rules-1.14/general.rules.yaml | 10 ++--- .../prometheus/rules-1.14/k8s.rules.yaml | 10 ++--- .../kube-apiserver-availability.rules.yaml | 10 ++--- .../rules-1.14/kube-apiserver-slos.yaml | 10 ++--- .../rules-1.14/kube-apiserver.rules.yaml | 10 ++--- .../kube-prometheus-general.rules.yaml | 10 ++--- .../kube-prometheus-node-recording.rules.yaml | 10 ++--- .../rules-1.14/kube-scheduler.rules.yaml | 10 ++--- .../rules-1.14/kube-state-metrics.yaml | 10 ++--- .../prometheus/rules-1.14/kubelet.rules.yaml | 10 ++--- .../rules-1.14/kubernetes-apps.yaml | 10 ++--- .../rules-1.14/kubernetes-resources.yaml | 10 ++--- .../rules-1.14/kubernetes-storage.yaml | 10 ++--- .../kubernetes-system-apiserver.yaml | 10 ++--- .../kubernetes-system-controller-manager.yaml | 10 ++--- .../rules-1.14/kubernetes-system-kubelet.yaml | 10 ++--- .../kubernetes-system-scheduler.yaml | 10 ++--- .../rules-1.14/kubernetes-system.yaml | 10 ++--- .../rules-1.14/node-exporter.rules.yaml | 10 ++--- .../prometheus/rules-1.14/node-exporter.yaml | 10 ++--- .../prometheus/rules-1.14/node-network.yaml | 10 ++--- .../prometheus/rules-1.14/node.rules.yaml | 10 ++--- .../rules-1.14/prometheus-operator.yaml | 14 +++---- .../prometheus/rules-1.14/prometheus.yaml | 14 +++---- .../prometheus/rules/alertmanager.rules.yaml | 16 ++++---- .../templates/prometheus/rules/etcd.yaml | 10 ++--- .../prometheus/rules/general.rules.yaml | 10 ++--- .../templates/prometheus/rules/k8s.rules.yaml | 10 ++--- .../rules/kube-apiserver.rules.yaml | 10 ++--- .../kube-prometheus-node-alerting.rules.yaml | 10 ++--- .../kube-prometheus-node-recording.rules.yaml | 10 ++--- .../rules/kube-scheduler.rules.yaml | 10 ++--- .../prometheus/rules/kubernetes-absent.yaml | 18 ++++----- .../prometheus/rules/kubernetes-apps.yaml | 10 ++--- .../rules/kubernetes-resources.yaml | 10 ++--- .../prometheus/rules/kubernetes-storage.yaml | 10 ++--- .../prometheus/rules/kubernetes-system.yaml | 10 ++--- .../prometheus/rules/node-network.yaml | 10 ++--- .../templates/prometheus/rules/node-time.yaml | 10 ++--- .../prometheus/rules/node.rules.yaml | 10 ++--- .../prometheus/rules/prometheus-operator.yaml | 14 +++---- .../prometheus/rules/prometheus.rules.yaml | 14 +++---- .../templates/prometheus/service.yaml | 10 ++--- .../templates/prometheus/serviceaccount.yaml | 8 ++-- .../templates/prometheus/servicemonitor.yaml | 12 +++--- .../templates/prometheus/servicemonitors.yaml | 6 +-- .../prometheus/serviceperreplica.yaml | 16 ++++---- charts/kube-prometheus-stack/values.yaml | 4 +- 166 files changed, 855 insertions(+), 853 deletions(-) diff --git a/charts/kube-prometheus-stack/CONTRIBUTING.md b/charts/kube-prometheus-stack/CONTRIBUTING.md index f672237fdefb..f6ce2a323528 100644 --- a/charts/kube-prometheus-stack/CONTRIBUTING.md +++ b/charts/kube-prometheus-stack/CONTRIBUTING.md @@ -1,10 +1,12 @@ # Contributing Guidelines + ## How to contribute to this chart + 1. Fork this repository, develop and test your Chart. 1. Bump the chart version for every change. -1. Ensure PR title has the prefix `[kube-prometheus]` +1. Ensure PR title has the prefix `[kube-prometheus-stack]` 1. When making changes to rules or dashboards, see the README.md section on how to sync data from upstream repositories 1. Check the `hack/minikube` folder has scripts to set up minikube and components of this chart that will allow all components to be scraped. You can use this configuration when validating your changes. 1. Check for changes of RBAC rules. 1. Check for changes in CRD specs. -1. PR must pass the linter (`helm lint`) \ No newline at end of file +1. PR must pass the linter (`helm lint`) diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 59d71769f9f8..ea40d09fc2d4 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -description: kube-prometheus collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. +description: kube-prometheus-stack collects Kubernetes manifests, Grafana dashboards, and Prometheus rules combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with Prometheus using the Prometheus Operator. icon: https://raw.githubusercontent.com/prometheus/prometheus.github.io/master/assets/prometheus_logo-cb55bb5c346.png engine: gotpl maintainers: @@ -7,7 +7,7 @@ maintainers: - name: bismarck - name: gianrubio email: gianrubio@gmail.com -name: kube-prometheus +name: kube-prometheus-stack sources: - https://github.com/prometheus-operator/kube-prometheus - https://github.com/prometheus-operator/prometheus-operator diff --git a/charts/kube-prometheus-stack/README.md b/charts/kube-prometheus-stack/README.md index 0ef0c499e8c7..4819336e91db 100644 --- a/charts/kube-prometheus-stack/README.md +++ b/charts/kube-prometheus-stack/README.md @@ -1,10 +1,10 @@ -# kube-prometheus +# kube-prometheus-stack -Installs [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus), a collection of Kubernetes manifests, [Grafana](http://grafana.com/) dashboards, and [Prometheus rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with [Prometheus](https://prometheus.io/) using the [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator). +Installs the [kube-prometheus stack](https://github.com/prometheus-operator/kube-prometheus), a collection of Kubernetes manifests, [Grafana](http://grafana.com/) dashboards, and [Prometheus rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) combined with documentation and scripts to provide easy to operate end-to-end Kubernetes cluster monitoring with [Prometheus](https://prometheus.io/) using the [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator). See the [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus) README for details about components, dashboards, and alerts. -_Note: This chart was formerly named `prometheus-operator` chart, now renamed to more clearly reflect that it installs the `kube-prometheus` project, within which Prometheus Operator is only one component._ +_Note: This chart was formerly named `prometheus-operator` chart, now renamed to more clearly reflect that it installs the `kube-prometheus` project stack, within which Prometheus Operator is only one component._ ## Prerequisites @@ -25,10 +25,10 @@ _See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation ```console # Helm 3 -$ helm install [RELEASE_NAME] prometheus-community/kube-prometheus +$ helm install [RELEASE_NAME] prometheus-community/kube-prometheus-stack # Helm 2 -$ helm install --name [RELEASE_NAME] prometheus-community/kube-prometheus +$ helm install --name [RELEASE_NAME] prometheus-community/kube-prometheus-stack ``` _See [configuration](#configuration) below._ @@ -76,7 +76,7 @@ kubectl delete crd thanosrulers.monitoring.coreos.com ```console # Helm 3 or 2 -$ helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus +$ helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus-stack ``` _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ @@ -94,13 +94,13 @@ Version 9 of the helm chart removes the existing `additionalScrapeConfigsExterna Due to new template functions being used in the rules in version 8.x.x of the chart, an upgrade to Prometheus Operator and Prometheus is necessary in order to support them. First, upgrade to the latest version of 7.x.x ```sh -helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus --version 7.5.0 +helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus-stack --version 7.5.0 ``` Then upgrade to 8.x.x ```sh -helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus --version [8.x.x] +helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus-stack --version [8.x.x] ``` Minimal recommended Prometheus version for this chart release is `2.12.x` @@ -124,7 +124,7 @@ If this error has already been encountered, a `helm history` command can be used See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments: ```console -helm show values prometheus-community/kube-prometheus +helm show values prometheus-community/kube-prometheus-stack ``` You may also `helm show values` on this chart's [dependencies](#dependencies) for additional options. diff --git a/charts/kube-prometheus-stack/hack/README.md b/charts/kube-prometheus-stack/hack/README.md index e666a9b37951..53c3d6ea1e06 100644 --- a/charts/kube-prometheus-stack/hack/README.md +++ b/charts/kube-prometheus-stack/hack/README.md @@ -1,4 +1,4 @@ -# kube-prometheus hacks +# kube-prometheus-stack hacks ## [sync_prometheus_rules.py](sync_prometheus_rules.py) @@ -50,4 +50,4 @@ Currently following imported: - run sync_grafana_dashboards.py inside your fork of this repo - send PR with changes to this repo -[CoreDNS dashboard](https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus/templates/grafana/dashboards-1.14/k8s-coredns.yaml) is the only dashboard which is maintained in this repo and can be changed without import. +[CoreDNS dashboard](https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-coredns.yaml) is the only dashboard which is maintained in this repo and can be changed without import. diff --git a/charts/kube-prometheus-stack/hack/minikube/cmd.sh b/charts/kube-prometheus-stack/hack/minikube/cmd.sh index abeafce30791..2df3402a73e8 100755 --- a/charts/kube-prometheus-stack/hack/minikube/cmd.sh +++ b/charts/kube-prometheus-stack/hack/minikube/cmd.sh @@ -66,13 +66,13 @@ Commands: the normal installation will not allow scraping of the kubelet, scheduler or controller-manager components init-helm - initialize helm and update repository so that we can install - the kube-prometheus chart. This has to be run only once after + the kube-prometheus-stack chart. This has to be run only once after a minikube installation is done init-etcd-secret - pulls the certs used to access etcd from the api server and creates a secret in the monitoring namespace with them. The values files in the install command assume that this secret exists and is valid. If not, then prometheus will not start - upgrade-install - install or upgrade the kube-prometheus chart in the cluster + upgrade-install - install or upgrade the kube-prometheus-stack chart in the cluster port-forward - starts port-forwarding for prometheus, alertmanager, grafana localhost:9090 - prometheus localhost:9093 - alertmanager diff --git a/charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py b/charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py index 8d8a22d0a2bf..e88dbb070603 100755 --- a/charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py +++ b/charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py @@ -71,23 +71,23 @@ def new_representer(dumper, data): header = '''{{- /* Generated from '%(name)s' from %(url)s Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=%(min_kubernetes)s" $kubeTargetVersion) (semverCompare "<%(max_kubernetes)s" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled%(condition)s }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%%s-%%s" (include "kube-prometheus.fullname" $) "%(name)s" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%%s-%%s" (include "kube-prometheus-stack.fullname" $) "%(name)s" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: ''' diff --git a/charts/kube-prometheus-stack/hack/sync_prometheus_rules.py b/charts/kube-prometheus-stack/hack/sync_prometheus_rules.py index 12f4ca545302..b7879d32e4cf 100755 --- a/charts/kube-prometheus-stack/hack/sync_prometheus_rules.py +++ b/charts/kube-prometheus-stack/hack/sync_prometheus_rules.py @@ -98,16 +98,16 @@ def new_representer(dumper, data): replacement_map = { 'job="prometheus-operator"': { 'replacement': 'job="{{ $operatorJob }}"', - 'init': '{{- $operatorJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "operator" }}'}, + 'init': '{{- $operatorJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "operator" }}'}, 'job="prometheus-k8s"': { 'replacement': 'job="{{ $prometheusJob }}"', - 'init': '{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }}'}, + 'init': '{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus" }}'}, 'job="alertmanager-main"': { 'replacement': 'job="{{ $alertmanagerJob }}"', - 'init': '{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager" }}'}, + 'init': '{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "alertmanager" }}'}, 'namespace="monitoring"': { 'replacement': 'namespace="{{ $namespace }}"', - 'init': '{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }}'}, + 'init': '{{- $namespace := printf "%s" (include "kube-prometheus-stack.namespace" .) }}'}, 'alertmanager-$1': { 'replacement': '$1', 'init': ''}, @@ -128,18 +128,18 @@ def new_representer(dumper, data): header = '''{{- /* Generated from '%(name)s' group from %(url)s Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=%(min_kubernetes)s" $kubeTargetVersion) (semverCompare "<%(max_kubernetes)s" $kubeTargetVersion) .Values.defaultRules.create%(condition)s }}%(init_line)s apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%%s-%%s" (include "kube-prometheus.fullname" .) "%(name)s" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%%s-%%s" (include "kube-prometheus-stack.fullname" .) "%(name)s" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/NOTES.txt b/charts/kube-prometheus-stack/templates/NOTES.txt index ab9c2d30cb21..51e94f50641e 100644 --- a/charts/kube-prometheus-stack/templates/NOTES.txt +++ b/charts/kube-prometheus-stack/templates/NOTES.txt @@ -1,5 +1,5 @@ kube-prometheus has been installed. Check its status by running: - kubectl --namespace {{ template "kube-prometheus.namespace" . }} get pods -l "release={{ $.Release.Name }}" + kubectl --namespace {{ template "kube-prometheus-stack.namespace" . }} get pods -l "release={{ $.Release.Name }}" Visit https://github.com/prometheus-operator/kube-prometheus for instructions on how to create & configure Alertmanager and Prometheus instances using the Operator. \ No newline at end of file diff --git a/charts/kube-prometheus-stack/templates/_helpers.tpl b/charts/kube-prometheus-stack/templates/_helpers.tpl index ade0a02f0dfd..8a3d1b76fca0 100644 --- a/charts/kube-prometheus-stack/templates/_helpers.tpl +++ b/charts/kube-prometheus-stack/templates/_helpers.tpl @@ -1,6 +1,6 @@ {{/* vim: set filetype=mustache: */}} {{/* Expand the name of the chart. This is suffixed with -alertmanager, which means subtract 13 from longest 63 available */}} -{{- define "kube-prometheus.name" -}} +{{- define "kube-prometheus-stack.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 50 | trimSuffix "-" -}} {{- end }} @@ -11,7 +11,7 @@ If release name contains chart name it will be used as a full name. The components in this chart create additional resources that expand the longest created name strings. The longest name that gets created adds and extra 37 characters, so truncation should be 63-35=26. */}} -{{- define "kube-prometheus.fullname" -}} +{{- define "kube-prometheus-stack.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 26 | trimSuffix "-" -}} {{- else -}} @@ -25,28 +25,28 @@ The longest name that gets created adds and extra 37 characters, so truncation s {{- end -}} {{/* Fullname suffixed with operator */}} -{{- define "kube-prometheus.operator.fullname" -}} -{{- printf "%s-operator" (include "kube-prometheus.fullname" .) -}} +{{- define "kube-prometheus-stack.operator.fullname" -}} +{{- printf "%s-operator" (include "kube-prometheus-stack.fullname" .) -}} {{- end }} {{/* Fullname suffixed with prometheus */}} -{{- define "kube-prometheus.prometheus.fullname" -}} -{{- printf "%s-prometheus" (include "kube-prometheus.fullname" .) -}} +{{- define "kube-prometheus-stack.prometheus.fullname" -}} +{{- printf "%s-prometheus" (include "kube-prometheus-stack.fullname" .) -}} {{- end }} {{/* Fullname suffixed with alertmanager */}} -{{- define "kube-prometheus.alertmanager.fullname" -}} -{{- printf "%s-alertmanager" (include "kube-prometheus.fullname" .) -}} +{{- define "kube-prometheus-stack.alertmanager.fullname" -}} +{{- printf "%s-alertmanager" (include "kube-prometheus-stack.fullname" .) -}} {{- end }} {{/* Create chart name and version as used by the chart label. */}} -{{- define "kube-prometheus.chartref" -}} +{{- define "kube-prometheus-stack.chartref" -}} {{- replace "+" "_" .Chart.Version | printf "%s-%s" .Chart.Name -}} {{- end }} {{/* Generate basic labels */}} -{{- define "kube-prometheus.labels" }} -chart: {{ template "kube-prometheus.chartref" . }} +{{- define "kube-prometheus-stack.labels" }} +chart: {{ template "kube-prometheus-stack.chartref" . }} release: {{ $.Release.Name | quote }} heritage: {{ $.Release.Service | quote }} {{- if .Values.commonLabels}} @@ -54,28 +54,28 @@ heritage: {{ $.Release.Service | quote }} {{- end }} {{- end }} -{{/* Create the name of kube-prometheus service account to use */}} -{{- define "kube-prometheus.operator.serviceAccountName" -}} +{{/* Create the name of kube-prometheus-stack service account to use */}} +{{- define "kube-prometheus-stack.operator.serviceAccountName" -}} {{- if .Values.prometheusOperator.serviceAccount.create -}} - {{ default (include "kube-prometheus.operator.fullname" .) .Values.prometheusOperator.serviceAccount.name }} + {{ default (include "kube-prometheus-stack.operator.fullname" .) .Values.prometheusOperator.serviceAccount.name }} {{- else -}} {{ default "default" .Values.prometheusOperator.serviceAccount.name }} {{- end -}} {{- end -}} {{/* Create the name of prometheus service account to use */}} -{{- define "kube-prometheus.prometheus.serviceAccountName" -}} +{{- define "kube-prometheus-stack.prometheus.serviceAccountName" -}} {{- if .Values.prometheus.serviceAccount.create -}} - {{ default (include "kube-prometheus.prometheus.fullname" .) .Values.prometheus.serviceAccount.name }} + {{ default (include "kube-prometheus-stack.prometheus.fullname" .) .Values.prometheus.serviceAccount.name }} {{- else -}} {{ default "default" .Values.prometheus.serviceAccount.name }} {{- end -}} {{- end -}} {{/* Create the name of alertmanager service account to use */}} -{{- define "kube-prometheus.alertmanager.serviceAccountName" -}} +{{- define "kube-prometheus-stack.alertmanager.serviceAccountName" -}} {{- if .Values.alertmanager.serviceAccount.create -}} - {{ default (include "kube-prometheus.alertmanager.fullname" .) .Values.alertmanager.serviceAccount.name }} + {{ default (include "kube-prometheus-stack.alertmanager.fullname" .) .Values.alertmanager.serviceAccount.name }} {{- else -}} {{ default "default" .Values.alertmanager.serviceAccount.name }} {{- end -}} @@ -84,7 +84,7 @@ heritage: {{ $.Release.Service | quote }} {{/* Allow the release namespace to be overridden for multi-namespace deployments in combined charts */}} -{{- define "kube-prometheus.namespace" -}} +{{- define "kube-prometheus-stack.namespace" -}} {{- if .Values.namespaceOverride -}} {{- .Values.namespaceOverride -}} {{- else -}} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml index 06a0d7a76a1b..58d534f6bcc1 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: Alertmanager metadata: - name: {{ template "kube-prometheus.fullname" . }}-alertmanager - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-alertmanager -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: {{- if .Values.alertmanager.alertmanagerSpec.image }} baseImage: {{ .Values.alertmanager.alertmanagerSpec.image.repository }} @@ -17,13 +17,13 @@ spec: {{- end }} replicas: {{ .Values.alertmanager.alertmanagerSpec.replicas }} listenLocal: {{ .Values.alertmanager.alertmanagerSpec.listenLocal }} - serviceAccountName: {{ template "kube-prometheus.alertmanager.serviceAccountName" . }} + serviceAccountName: {{ template "kube-prometheus-stack.alertmanager.serviceAccountName" . }} {{- if .Values.alertmanager.alertmanagerSpec.externalUrl }} externalUrl: "{{ .Values.alertmanager.alertmanagerSpec.externalUrl }}" {{- else if and .Values.alertmanager.ingress.enabled .Values.alertmanager.ingress.hosts }} externalUrl: "http://{{ index .Values.alertmanager.ingress.hosts 0 }}{{ .Values.alertmanager.alertmanagerSpec.routePrefix }}" {{- else }} - externalUrl: http://{{ template "kube-prometheus.fullname" . }}-alertmanager.{{ template "kube-prometheus.namespace" . }}:{{ .Values.alertmanager.service.port }} + externalUrl: http://{{ template "kube-prometheus-stack.fullname" . }}-alertmanager.{{ template "kube-prometheus-stack.namespace" . }}:{{ .Values.alertmanager.service.port }} {{- end }} {{- if .Values.alertmanager.alertmanagerSpec.nodeSelector }} nodeSelector: @@ -75,7 +75,7 @@ spec: labelSelector: matchLabels: app: alertmanager - alertmanager: {{ template "kube-prometheus.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager {{- else if eq .Values.alertmanager.alertmanagerSpec.podAntiAffinity "soft" }} podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -85,7 +85,7 @@ spec: labelSelector: matchLabels: app: alertmanager - alertmanager: {{ template "kube-prometheus.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager {{- end }} {{- end }} {{- if .Values.alertmanager.alertmanagerSpec.tolerations }} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml b/charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml index 8edf1820e20f..9c5f57048437 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml @@ -1,5 +1,5 @@ {{- if and .Values.alertmanager.enabled .Values.alertmanager.ingress.enabled }} -{{- $serviceName := printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager" }} +{{- $serviceName := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "alertmanager" }} {{- $servicePort := .Values.alertmanager.service.port -}} {{- $routePrefix := list .Values.alertmanager.alertmanagerSpec.routePrefix }} {{- $paths := .Values.alertmanager.ingress.paths | default $routePrefix -}} @@ -11,17 +11,17 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ $serviceName }} - namespace: {{ template "kube-prometheus.namespace" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- if .Values.alertmanager.ingress.annotations }} annotations: {{ toYaml .Values.alertmanager.ingress.annotations | indent 4 }} {{- end }} labels: - app: {{ template "kube-prometheus.name" . }}-alertmanager + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager {{- if .Values.alertmanager.ingress.labels }} {{ toYaml .Values.alertmanager.ingress.labels | indent 4 }} {{- end }} -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: rules: {{- if .Values.alertmanager.ingress.hosts }} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml b/charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml index 7ab162d14dd8..8342b2a8cad9 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml @@ -5,8 +5,8 @@ apiVersion: v1 kind: List metadata: - name: {{ include "kube-prometheus.fullname" $ }}-alertmanager-ingressperreplica - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ include "kube-prometheus-stack.fullname" $ }}-alertmanager-ingressperreplica + namespace: {{ template "kube-prometheus-stack.namespace" . }} items: {{ range $i, $e := until $count }} - kind: Ingress @@ -16,11 +16,11 @@ items: apiVersion: extensions/v1beta1 {{ end -}} metadata: - name: {{ include "kube-prometheus.fullname" $ }}-alertmanager-{{ $i }} - namespace: {{ template "kube-prometheus.namespace" $ }} + name: {{ include "kube-prometheus-stack.fullname" $ }}-alertmanager-{{ $i }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ include "kube-prometheus.name" $ }}-alertmanager -{{ include "kube-prometheus.labels" $ | indent 8 }} + app: {{ include "kube-prometheus-stack.name" $ }}-alertmanager +{{ include "kube-prometheus-stack.labels" $ | indent 8 }} {{- if $ingressValues.labels }} {{ toYaml $ingressValues.labels | indent 8 }} {{- end }} @@ -36,7 +36,7 @@ items: {{- range $p := $ingressValues.paths }} - path: {{ tpl $p $ }} backend: - serviceName: {{ include "kube-prometheus.fullname" $ }}-alertmanager-{{ $i }} + serviceName: {{ include "kube-prometheus-stack.fullname" $ }}-alertmanager-{{ $i }} servicePort: {{ $servicePort }} {{- end -}} {{- if or $ingressValues.tlsSecretName $ingressValues.tlsSecretPerReplica.enabled }} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml b/charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml index 53812193994d..1dbe809cd2d5 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml @@ -2,11 +2,11 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: {{ template "kube-prometheus.fullname" . }}-alertmanager - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-alertmanager -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: {{- if .Values.alertmanager.podDisruptionBudget.minAvailable }} minAvailable: {{ .Values.alertmanager.podDisruptionBudget.minAvailable }} @@ -17,5 +17,5 @@ spec: selector: matchLabels: app: alertmanager - alertmanager: {{ template "kube-prometheus.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager {{- end }} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml b/charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml index 88cd439790e4..d64d1f8138ab 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml @@ -2,11 +2,11 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "kube-prometheus.fullname" . }}-alertmanager - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-alertmanager -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager +{{ include "kube-prometheus-stack.labels" . | indent 4 }} rules: {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if semverCompare "> 1.15.0-0" $kubeTargetVersion }} @@ -17,5 +17,5 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "kube-prometheus.fullname" . }}-alertmanager + - {{ template "kube-prometheus-stack.fullname" . }}-alertmanager {{- end }} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml b/charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml index ade3b39e9863..9248cc8dd3ab 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml @@ -2,17 +2,17 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ template "kube-prometheus.fullname" . }}-alertmanager - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-alertmanager -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager +{{ include "kube-prometheus-stack.labels" . | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ template "kube-prometheus.fullname" . }}-alertmanager + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager subjects: - kind: ServiceAccount - name: {{ template "kube-prometheus.alertmanager.serviceAccountName" . }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.alertmanager.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/psp.yaml b/charts/kube-prometheus-stack/templates/alertmanager/psp.yaml index b0f424cbed1c..6fa4450090db 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/psp.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/psp.yaml @@ -2,14 +2,14 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "kube-prometheus.fullname" . }}-alertmanager + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager labels: - app: {{ template "kube-prometheus.name" . }}-alertmanager + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager {{- if .Values.global.rbac.pspAnnotations }} annotations: {{ toYaml .Values.global.rbac.pspAnnotations | indent 4 }} {{- end }} -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/kube-prometheus-stack/templates/alertmanager/secret.yaml b/charts/kube-prometheus-stack/templates/alertmanager/secret.yaml index 81d9d78a7d92..43c4e20b203b 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/secret.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/secret.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Secret metadata: - name: alertmanager-{{ template "kube-prometheus.fullname" . }}-alertmanager - namespace: {{ template "kube-prometheus.namespace" . }} + name: alertmanager-{{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- if .Values.alertmanager.secret.annotations }} annotations: {{ toYaml .Values.alertmanager.secret.annotations | indent 4 }} {{- end }} labels: - app: {{ template "kube-prometheus.name" . }}-alertmanager -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager +{{ include "kube-prometheus-stack.labels" . | indent 4 }} data: {{- if .Values.alertmanager.tplConfig }} alertmanager.yaml: {{ tpl (toYaml .Values.alertmanager.config) . | b64enc | quote }} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/service.yaml b/charts/kube-prometheus-stack/templates/alertmanager/service.yaml index c3c01ee476ac..f1a63c2e3c41 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/service.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/service.yaml @@ -2,12 +2,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus.fullname" . }}-alertmanager - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-alertmanager + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager self-monitor: {{ .Values.alertmanager.serviceMonitor.selfMonitor | quote }} -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.alertmanager.service.labels }} {{ toYaml .Values.alertmanager.service.labels | indent 4 }} {{- end }} @@ -42,6 +42,6 @@ spec: protocol: TCP selector: app: alertmanager - alertmanager: {{ template "kube-prometheus.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager type: "{{ .Values.alertmanager.service.type }}" {{- end }} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml index e00bd68b3e88..c5e6e92282b8 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "kube-prometheus.alertmanager.serviceAccountName" . }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.alertmanager.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-alertmanager -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.alertmanager.serviceAccount.annotations }} annotations: {{ toYaml .Values.alertmanager.serviceAccount.annotations | indent 4 }} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml index 9d517dd722f8..b9bc14fe63b8 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml @@ -2,20 +2,20 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-alertmanager - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-alertmanager -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: selector: matchLabels: - app: {{ template "kube-prometheus.name" . }}-alertmanager + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager release: {{ $.Release.Name | quote }} self-monitor: "true" namespaceSelector: matchNames: - - {{ printf "%s" (include "kube-prometheus.namespace" .) | quote }} + - {{ printf "%s" (include "kube-prometheus-stack.namespace" .) | quote }} endpoints: - port: {{ .Values.alertmanager.alertmanagerSpec.portName }} {{- if .Values.alertmanager.serviceMonitor.interval }} diff --git a/charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml b/charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml index 0beccdcb4c03..0f12ae879a0e 100644 --- a/charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml +++ b/charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml @@ -4,18 +4,18 @@ apiVersion: v1 kind: List metadata: - name: {{ include "kube-prometheus.fullname" $ }}-alertmanager-serviceperreplica - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ include "kube-prometheus-stack.fullname" $ }}-alertmanager-serviceperreplica + namespace: {{ template "kube-prometheus-stack.namespace" . }} items: {{- range $i, $e := until $count }} - apiVersion: v1 kind: Service metadata: - name: {{ include "kube-prometheus.fullname" $ }}-alertmanager-{{ $i }} - namespace: {{ template "kube-prometheus.namespace" $ }} + name: {{ include "kube-prometheus-stack.fullname" $ }}-alertmanager-{{ $i }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ include "kube-prometheus.name" $ }}-alertmanager -{{ include "kube-prometheus.labels" $ | indent 8 }} + app: {{ include "kube-prometheus-stack.name" $ }}-alertmanager +{{ include "kube-prometheus-stack.labels" $ | indent 8 }} {{- if $serviceValues.annotations }} annotations: {{ toYaml $serviceValues.annotations | indent 8 }} @@ -39,8 +39,8 @@ items: targetPort: {{ $serviceValues.targetPort }} selector: app: alertmanager - alertmanager: {{ template "kube-prometheus.fullname" $ }}-alertmanager - statefulset.kubernetes.io/pod-name: alertmanager-{{ include "kube-prometheus.fullname" $ }}-alertmanager-{{ $i }} + alertmanager: {{ template "kube-prometheus-stack.fullname" $ }}-alertmanager + statefulset.kubernetes.io/pod-name: alertmanager-{{ include "kube-prometheus-stack.fullname" $ }}-alertmanager-{{ $i }} type: "{{ $serviceValues.type }}" {{- end }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml b/charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml index bbe7db929db8..f77db41991b8 100644 --- a/charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus.fullname" . }}-coredns + name: {{ template "kube-prometheus-stack.fullname" . }}-coredns labels: - app: {{ template "kube-prometheus.name" . }}-coredns + app: {{ template "kube-prometheus-stack.name" . }}-coredns jobLabel: coredns -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus-stack/templates/exporters/core-dns/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/core-dns/servicemonitor.yaml index 81416b26c3a4..c398db612a73 100644 --- a/charts/kube-prometheus-stack/templates/exporters/core-dns/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/core-dns/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-coredns - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-coredns + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-coredns -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-coredns +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "kube-prometheus.name" . }}-coredns + app: {{ template "kube-prometheus-stack.name" . }}-coredns release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-api-server/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-api-server/servicemonitor.yaml index 7b3aa4fea112..4c0290e731e1 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-api-server/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-api-server/servicemonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-apiserver - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-apiserver + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-apiserver -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-apiserver +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/endpoints.yaml index 770ba29903ba..413193028cb4 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/endpoints.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/endpoints.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Endpoints metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-controller-manager labels: - app: {{ template "kube-prometheus.name" . }}-kube-controller-manager + app: {{ template "kube-prometheus-stack.name" . }}-kube-controller-manager k8s-app: kube-controller-manager -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml index fddc2969bd8a..8b5556a89532 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-controller-manager labels: - app: {{ template "kube-prometheus.name" . }}-kube-controller-manager + app: {{ template "kube-prometheus-stack.name" . }}-kube-controller-manager jobLabel: kube-controller-manager -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml index dfba34793480..2f30a0cc2a57 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-controller-manager - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-controller-manager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-kube-controller-manager -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-kube-controller-manager +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "kube-prometheus.name" . }}-kube-controller-manager + app: {{ template "kube-prometheus-stack.name" . }}-kube-controller-manager release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml index f95c47ef9d0b..c7bf142d520a 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-dns + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-dns labels: - app: {{ template "kube-prometheus.name" . }}-kube-dns + app: {{ template "kube-prometheus-stack.name" . }}-kube-dns jobLabel: kube-dns -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-dns/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-dns/servicemonitor.yaml index 2cd40bfbc4cc..3c1a06175897 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-dns/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-dns/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-dns - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-dns + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-kube-dns -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-kube-dns +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "kube-prometheus.name" . }}-kube-dns + app: {{ template "kube-prometheus-stack.name" . }}-kube-dns release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-etcd/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/endpoints.yaml index e28f4f159f7e..8f07a5cc2460 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-etcd/endpoints.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/endpoints.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Endpoints metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-etcd + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-etcd labels: - app: {{ template "kube-prometheus.name" . }}-kube-etcd + app: {{ template "kube-prometheus-stack.name" . }}-kube-etcd k8s-app: etcd-server -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml index c1d287f4c54c..957e8bbc1aad 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-etcd + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-etcd labels: - app: {{ template "kube-prometheus.name" . }}-kube-etcd + app: {{ template "kube-prometheus-stack.name" . }}-kube-etcd jobLabel: kube-etcd -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-etcd/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/servicemonitor.yaml index 07c0d4e608ce..17a447ad9416 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-etcd/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-etcd - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-etcd + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-kube-etcd -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-kube-etcd +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "kube-prometheus.name" . }}-kube-etcd + app: {{ template "kube-prometheus-stack.name" . }}-kube-etcd release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-proxy/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/endpoints.yaml index 882682b17922..2cb756d154cb 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-proxy/endpoints.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/endpoints.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Endpoints metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-proxy + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-proxy labels: - app: {{ template "kube-prometheus.name" . }}-kube-proxy + app: {{ template "kube-prometheus-stack.name" . }}-kube-proxy k8s-app: kube-proxy -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml index 55a6c5a41f03..abe42060069d 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-proxy + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-proxy labels: - app: {{ template "kube-prometheus.name" . }}-kube-proxy + app: {{ template "kube-prometheus-stack.name" . }}-kube-proxy jobLabel: kube-proxy -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-proxy/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/servicemonitor.yaml index 7118e7561783..0ac44182b258 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-proxy/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-proxy - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-proxy + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-kube-proxy -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-kube-proxy +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "kube-prometheus.name" . }}-kube-proxy + app: {{ template "kube-prometheus-stack.name" . }}-kube-proxy release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/endpoints.yaml index 7c13ec1e5503..f4ad60fd6731 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/endpoints.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/endpoints.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Endpoints metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-scheduler labels: - app: {{ template "kube-prometheus.name" . }}-kube-scheduler + app: {{ template "kube-prometheus-stack.name" . }}-kube-scheduler k8s-app: kube-scheduler -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml index b655f64bd19f..15559d45ae37 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-scheduler labels: - app: {{ template "kube-prometheus.name" . }}-kube-scheduler + app: {{ template "kube-prometheus-stack.name" . }}-kube-scheduler jobLabel: kube-scheduler -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/servicemonitor.yaml index 01deb019efac..b565ec2b8b70 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/servicemonitor.yaml @@ -2,16 +2,16 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-scheduler - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-scheduler + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-kube-scheduler -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-kube-scheduler +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "kube-prometheus.name" . }}-kube-scheduler + app: {{ template "kube-prometheus-stack.name" . }}-kube-scheduler release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml index 367803d419a5..f09de5d2e1e9 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-kube-state-metrics - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-state-metrics + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-kube-state-metrics -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-kube-state-metrics +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: jobLabel: app.kubernetes.io/name endpoints: diff --git a/charts/kube-prometheus-stack/templates/exporters/kubelet/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kubelet/servicemonitor.yaml index af71d69f061e..3645932743da 100644 --- a/charts/kube-prometheus-stack/templates/exporters/kubelet/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/kubelet/servicemonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-kubelet - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kubelet + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-kubelet -{{- include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-kubelet +{{- include "kube-prometheus-stack.labels" . | indent 4 }} spec: endpoints: {{- if .Values.kubelet.serviceMonitor.https }} diff --git a/charts/kube-prometheus-stack/templates/exporters/node-exporter/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/node-exporter/servicemonitor.yaml index c1e8e9301f2c..5ca5f1b75c0f 100644 --- a/charts/kube-prometheus-stack/templates/exporters/node-exporter/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/exporters/node-exporter/servicemonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-node-exporter - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-node-exporter + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-node-exporter -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-node-exporter +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: jobLabel: {{ .Values.nodeExporter.jobLabel }} selector: diff --git a/charts/kube-prometheus-stack/templates/grafana/configmap-dashboards.yaml b/charts/kube-prometheus-stack/templates/grafana/configmap-dashboards.yaml index 215355c9cd08..fdd64ce6f4f5 100644 --- a/charts/kube-prometheus-stack/templates/grafana/configmap-dashboards.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/configmap-dashboards.yaml @@ -9,14 +9,14 @@ items: - apiVersion: v1 kind: ConfigMap metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" $ }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 6 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 6 }} data: {{ $dashboardName }}.json: {{ $.Files.Get $path | toJson }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml b/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml index a1b373e15dc1..6a25ba10c3de 100644 --- a/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml @@ -2,16 +2,16 @@ apiVersion: v1 kind: ConfigMap metadata: - name: {{ template "kube-prometheus.fullname" . }}-grafana-datasource - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-grafana-datasource + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- if .Values.grafana.sidecar.datasources.annotations }} annotations: {{ toYaml .Values.grafana.sidecar.datasources.annotations | indent 4 }} {{- end }} labels: {{ $.Values.grafana.sidecar.datasources.label }}: "1" - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: datasource.yaml: |- apiVersion: 1 @@ -19,14 +19,14 @@ data: {{- if .Values.grafana.sidecar.datasources.defaultDatasourceEnabled }} - name: Prometheus type: prometheus - url: http://{{ template "kube-prometheus.fullname" . }}-prometheus:{{ .Values.prometheus.service.port }}/{{ trimPrefix "/" .Values.prometheus.prometheusSpec.routePrefix }} + url: http://{{ template "kube-prometheus-stack.fullname" . }}-prometheus:{{ .Values.prometheus.service.port }}/{{ trimPrefix "/" .Values.prometheus.prometheusSpec.routePrefix }} access: proxy isDefault: true {{- if .Values.grafana.sidecar.datasources.createPrometheusReplicasDatasources }} {{- range until (int .Values.prometheus.prometheusSpec.replicas) }} - name: Prometheus-{{ . }} type: prometheus - url: http://prometheus-{{ template "kube-prometheus.fullname" $ }}-prometheus-{{ . }}.prometheus-operated:9090/{{ trimPrefix "/" $.Values.prometheus.prometheusSpec.routePrefix }} + url: http://prometheus-{{ template "kube-prometheus-stack.fullname" $ }}-prometheus-{{ . }}.prometheus-operated:9090/{{ trimPrefix "/" $.Values.prometheus.prometheusSpec.routePrefix }} access: proxy isDefault: false {{- end }} diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/apiserver.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/apiserver.yaml index bbda34c9c430..9822113d3bef 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/apiserver.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/apiserver.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'apiserver' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeApiServer.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "apiserver" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "apiserver" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: apiserver.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/cluster-total.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/cluster-total.yaml index 9ed9bbd10057..4be6316d555e 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/cluster-total.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/cluster-total.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'cluster-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "cluster-total" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "cluster-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: cluster-total.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/controller-manager.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/controller-manager.yaml index 88ef1943a24b..86171a83835e 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/controller-manager.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/controller-manager.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'controller-manager' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeControllerManager.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "controller-manager" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "controller-manager" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: controller-manager.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/etcd.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/etcd.yaml index cf41e78bf091..16705c889382 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/etcd.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/etcd.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'etcd' from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/grafana.json Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeEtcd.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: etcd.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-coredns.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-coredns.yaml index 65bdff66b2ca..f3ca19c709a2 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-coredns.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-coredns.yaml @@ -4,16 +4,16 @@ apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-coredns" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-coredns" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-coredns.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml index e5efe15cd40a..61d8c10995eb 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-cluster.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml index 7a8fce75345e..dba206ae3bf2 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-namespace.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-node.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-node.yaml index b88a8ff3f374..ac832cb6f649 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-node.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-node.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-node' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-node" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-node.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml index 94c60f904103..f727275f1832 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-pod.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml index 10226affa5b9..958fb1e5f88e 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-workload.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml index 000b7e7f995a..d426861d7528 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-workloads-namespace.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/kubelet.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/kubelet.yaml index 279f7e2399f7..8bdf2648aeac 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/kubelet.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/kubelet.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'kubelet' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubelet.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "kubelet" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "kubelet" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: kubelet.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-pod.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-pod.yaml index 2a77e0d4e0f1..9c3ff3ef2f36 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-pod.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-pod.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'namespace-by-pod' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "namespace-by-pod" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "namespace-by-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: namespace-by-pod.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-workload.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-workload.yaml index 9dae8d01e052..40f34141c65c 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-workload.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-workload.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'namespace-by-workload' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "namespace-by-workload" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "namespace-by-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: namespace-by-workload.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml index 337493635239..82b821a7adbf 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'node-cluster-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.nodeExporter.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "node-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "node-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: node-cluster-rsrc-use.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-rsrc-use.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-rsrc-use.yaml index bf242b9a9365..9cdfa645e47e 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-rsrc-use.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-rsrc-use.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'node-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.nodeExporter.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "node-rsrc-use" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "node-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: node-rsrc-use.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/nodes.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/nodes.yaml index 65626e20fd1e..821d271d8d0a 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/nodes.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/nodes.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'nodes' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: nodes.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml index 54a948af69f8..07f478eed085 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: persistentvolumesusage.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/pod-total.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/pod-total.yaml index 89f8df08edbf..f5876a12e75a 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/pod-total.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/pod-total.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'pod-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "pod-total" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "pod-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: pod-total.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml index 7b8a45794068..716bce3b0f11 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'prometheus-remote-write' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.prometheus.prometheusSpec.remoteWriteDashboards }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "prometheus-remote-write" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "prometheus-remote-write" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: prometheus-remote-write.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml index 1df20dcd3474..dfd3f3df031a 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'prometheus' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "prometheus" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: prometheus.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/proxy.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/proxy.yaml index dbb0f9c77a47..46b272a19f1d 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/proxy.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/proxy.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'proxy' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeProxy.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "proxy" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "proxy" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: proxy.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/scheduler.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/scheduler.yaml index 11b7ce87a39d..e86dbeb1a740 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/scheduler.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/scheduler.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'scheduler' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeScheduler.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "scheduler" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "scheduler" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: scheduler.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/statefulset.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/statefulset.yaml index c284f17928ce..7f953a3a29e3 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/statefulset.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/statefulset.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'statefulset' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: statefulset.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/workload-total.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/workload-total.yaml index a3333105a19c..d8e66c5a4d73 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/workload-total.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/workload-total.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'workload-total' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "workload-total" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "workload-total" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: workload-total.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/etcd.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/etcd.yaml index 02b00d3f4c91..7c2dd6b22188 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/etcd.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/etcd.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'etcd' from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/grafana.json Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeEtcd.enabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: etcd.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml index a1634cc071b9..1ee80ce75967 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-cluster-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-cluster-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-cluster-rsrc-use.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-node-rsrc-use.yaml index 353f88157171..008d2ecad88f 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-node-rsrc-use.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-node-rsrc-use.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-node-rsrc-use' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-node-rsrc-use" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-node-rsrc-use" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-node-rsrc-use.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-cluster.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-cluster.yaml index e8ad685e8968..91799f7a5314 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-cluster.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-cluster.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-cluster" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-cluster.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-namespace.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-namespace.yaml index 2e83b9145a49..1f8d18f818b9 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-namespace.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-namespace.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-namespace.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-pod.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-pod.yaml index e8dbfb3daecd..ccbdd19545e6 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-pod.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-pod.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-pod" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-pod.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workload.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workload.yaml index b02f76d4ea64..5e42dbdd25a0 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workload.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workload.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workload" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-workload.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml index f7a784239532..d3df125b0f82 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "k8s-resources-workloads-namespace" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: k8s-resources-workloads-namespace.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/nodes.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/nodes.yaml index e8690cae9bc8..42b5f5e2d253 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/nodes.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/nodes.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'nodes' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "nodes" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: nodes.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/persistentvolumesusage.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/persistentvolumesusage.yaml index 20a86df9edec..ac6a24bbd4ee 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/persistentvolumesusage.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/persistentvolumesusage.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "persistentvolumesusage" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: persistentvolumesusage.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/pods.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/pods.yaml index 6b8b10f2d1e2..0f6159d26c6c 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/pods.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/pods.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'pods' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "pods" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "pods" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: pods.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/dashboards/statefulset.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/statefulset.yaml index 250b6c55d316..b2c267683ddc 100644 --- a/charts/kube-prometheus-stack/templates/grafana/dashboards/statefulset.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/dashboards/statefulset.yaml @@ -1,23 +1,23 @@ {{- /* Generated from 'statefulset' from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "statefulset" | trunc 63 | trimSuffix "-" }} annotations: {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }} labels: {{- if $.Values.grafana.sidecar.dashboards.label }} {{ $.Values.grafana.sidecar.dashboards.label }}: "1" {{- end }} - app: {{ template "kube-prometheus.name" $ }}-grafana -{{ include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: statefulset.json: |- { diff --git a/charts/kube-prometheus-stack/templates/grafana/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/grafana/servicemonitor.yaml index bab04bea6aa1..15ee537fb8a8 100644 --- a/charts/kube-prometheus-stack/templates/grafana/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/grafana/servicemonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-grafana - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-grafana + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-grafana -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-grafana +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: selector: matchLabels: @@ -14,7 +14,7 @@ spec: app.kubernetes.io/instance: {{ $.Release.Name | quote }} namespaceSelector: matchNames: - - {{ printf "%s" (include "kube-prometheus.namespace" .) | quote }} + - {{ printf "%s" (include "kube-prometheus-stack.namespace" .) | quote }} endpoints: - port: {{ .Values.grafana.service.portName }} {{- if .Values.grafana.serviceMonitor.interval }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml index 7afb9c8a076c..7b31ab3f1177 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml @@ -2,13 +2,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "kube-prometheus.name" $ }}-admission -{{- include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission +{{- include "kube-prometheus-stack.labels" $ | indent 4 }} rules: - apiGroups: - admissionregistration.k8s.io @@ -28,6 +28,6 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "kube-prometheus.fullname" . }}-admission + - {{ template "kube-prometheus-stack.fullname" . }}-admission {{- end }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml index 79f8b3286af9..4f1f61665250 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml @@ -2,19 +2,19 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "kube-prometheus.name" $ }}-admission -{{- include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission +{{- include "kube-prometheus-stack.labels" $ | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "kube-prometheus.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission subjects: - kind: ServiceAccount - name: {{ template "kube-prometheus.fullname" . }}-admission - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-admission + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml index 5f7b69533d51..37a19a55af1b 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml @@ -2,14 +2,14 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission-create - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-admission-create + namespace: {{ template "kube-prometheus-stack.namespace" . }} annotations: "helm.sh/hook": pre-install,pre-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "kube-prometheus.name" $ }}-admission-create -{{- include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission-create +{{- include "kube-prometheus-stack.labels" $ | indent 4 }} spec: {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }} # Alpha feature since k8s 1.12 @@ -17,14 +17,14 @@ spec: {{- end }} template: metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission-create + name: {{ template "kube-prometheus-stack.fullname" . }}-admission-create {{- with .Values.prometheusOperator.admissionWebhooks.patch.podAnnotations }} annotations: {{ toYaml . | indent 8 }} {{- end }} labels: - app: {{ template "kube-prometheus.name" $ }}-admission-create -{{- include "kube-prometheus.labels" $ | indent 8 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission-create +{{- include "kube-prometheus-stack.labels" $ | indent 8 }} spec: {{- if .Values.prometheusOperator.admissionWebhooks.patch.priorityClassName }} priorityClassName: {{ .Values.prometheusOperator.admissionWebhooks.patch.priorityClassName }} @@ -39,13 +39,13 @@ spec: imagePullPolicy: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.pullPolicy }} args: - create - - --host={{ template "kube-prometheus.operator.fullname" . }},{{ template "kube-prometheus.operator.fullname" . }}.{{ template "kube-prometheus.namespace" . }}.svc - - --namespace={{ template "kube-prometheus.namespace" . }} - - --secret-name={{ template "kube-prometheus.fullname" . }}-admission + - --host={{ template "kube-prometheus-stack.operator.fullname" . }},{{ template "kube-prometheus-stack.operator.fullname" . }}.{{ template "kube-prometheus-stack.namespace" . }}.svc + - --namespace={{ template "kube-prometheus-stack.namespace" . }} + - --secret-name={{ template "kube-prometheus-stack.fullname" . }}-admission resources: {{ toYaml .Values.prometheusOperator.admissionWebhooks.patch.resources | indent 12 }} restartPolicy: OnFailure - serviceAccountName: {{ template "kube-prometheus.fullname" . }}-admission + serviceAccountName: {{ template "kube-prometheus-stack.fullname" . }}-admission {{- with .Values.prometheusOperator.admissionWebhooks.patch.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml index 307d2ea2c564..b74c61886b11 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml @@ -2,14 +2,14 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission-patch - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-admission-patch + namespace: {{ template "kube-prometheus-stack.namespace" . }} annotations: "helm.sh/hook": post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "kube-prometheus.name" $ }}-admission-patch -{{- include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission-patch +{{- include "kube-prometheus-stack.labels" $ | indent 4 }} spec: {{- if .Capabilities.APIVersions.Has "batch/v1alpha1" }} # Alpha feature since k8s 1.12 @@ -17,14 +17,14 @@ spec: {{- end }} template: metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission-patch + name: {{ template "kube-prometheus-stack.fullname" . }}-admission-patch {{- with .Values.prometheusOperator.admissionWebhooks.patch.podAnnotations }} annotations: {{ toYaml . | indent 8 }} {{- end }} labels: - app: {{ template "kube-prometheus.name" $ }}-admission-patch -{{- include "kube-prometheus.labels" $ | indent 8 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission-patch +{{- include "kube-prometheus-stack.labels" $ | indent 8 }} spec: {{- if .Values.prometheusOperator.admissionWebhooks.patch.priorityClassName }} priorityClassName: {{ .Values.prometheusOperator.admissionWebhooks.patch.priorityClassName }} @@ -39,14 +39,14 @@ spec: imagePullPolicy: {{ .Values.prometheusOperator.admissionWebhooks.patch.image.pullPolicy }} args: - patch - - --webhook-name={{ template "kube-prometheus.fullname" . }}-admission - - --namespace={{ template "kube-prometheus.namespace" . }} - - --secret-name={{ template "kube-prometheus.fullname" . }}-admission + - --webhook-name={{ template "kube-prometheus-stack.fullname" . }}-admission + - --namespace={{ template "kube-prometheus-stack.namespace" . }} + - --secret-name={{ template "kube-prometheus-stack.fullname" . }}-admission - --patch-failure-policy={{ .Values.prometheusOperator.admissionWebhooks.failurePolicy }} resources: {{ toYaml .Values.prometheusOperator.admissionWebhooks.patch.resources | indent 12 }} restartPolicy: OnFailure - serviceAccountName: {{ template "kube-prometheus.fullname" . }}-admission + serviceAccountName: {{ template "kube-prometheus-stack.fullname" . }}-admission {{- with .Values.prometheusOperator.admissionWebhooks.patch.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml index af2ac57f78b9..98e002aff3cf 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml @@ -2,17 +2,17 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "kube-prometheus.name" . }}-admission + app: {{ template "kube-prometheus-stack.name" . }}-admission {{- if .Values.global.rbac.pspAnnotations }} annotations: {{ toYaml .Values.global.rbac.pspAnnotations | indent 4 }} {{- end }} -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml index 9e90a7e8d4d8..3609fe950d76 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml @@ -2,14 +2,14 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-admission + namespace: {{ template "kube-prometheus-stack.namespace" . }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "kube-prometheus.name" $ }}-admission -{{- include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission +{{- include "kube-prometheus-stack.labels" $ | indent 4 }} rules: - apiGroups: - "" diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml index 746b703113b3..dcb0fbcfbc5d 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml @@ -2,20 +2,20 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-admission + namespace: {{ template "kube-prometheus-stack.namespace" . }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "kube-prometheus.name" $ }}-admission -{{- include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission +{{- include "kube-prometheus-stack.labels" $ | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ template "kube-prometheus.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission subjects: - kind: ServiceAccount - name: {{ template "kube-prometheus.fullname" . }}-admission - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-admission + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml index c54bd917b2be..5296494d3fac 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml @@ -2,14 +2,14 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-admission + namespace: {{ template "kube-prometheus-stack.namespace" . }} annotations: "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: - app: {{ template "kube-prometheus.name" $ }}-admission -{{- include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission +{{- include "kube-prometheus-stack.labels" $ | indent 4 }} imagePullSecrets: {{ toYaml .Values.global.imagePullSecrets | indent 2 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml index 8f5317813034..cefee15c2c4e 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml @@ -2,10 +2,10 @@ apiVersion: admissionregistration.k8s.io/v1beta1 kind: MutatingWebhookConfiguration metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission labels: - app: {{ template "kube-prometheus.name" $ }}-admission -{{- include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission +{{- include "kube-prometheus-stack.labels" $ | indent 4 }} webhooks: - name: prometheusrulemutate.monitoring.coreos.com {{- if .Values.prometheusOperator.admissionWebhooks.patch.enabled }} @@ -25,7 +25,7 @@ webhooks: - UPDATE clientConfig: service: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ template "kube-prometheus.operator.fullname" $ }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ template "kube-prometheus-stack.operator.fullname" $ }} path: /admission-prometheusrules/mutate {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml index 78a2cb8e1bc4..a24270549e8c 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml @@ -2,10 +2,10 @@ apiVersion: admissionregistration.k8s.io/v1beta1 kind: ValidatingWebhookConfiguration metadata: - name: {{ template "kube-prometheus.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission labels: - app: {{ template "kube-prometheus.name" $ }}-admission -{{- include "kube-prometheus.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission +{{- include "kube-prometheus-stack.labels" $ | indent 4 }} webhooks: - name: prometheusrulemutate.monitoring.coreos.com {{- if .Values.prometheusOperator.admissionWebhooks.patch.enabled }} @@ -25,7 +25,7 @@ webhooks: - UPDATE clientConfig: service: - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ template "kube-prometheus.operator.fullname" $ }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ template "kube-prometheus-stack.operator.fullname" $ }} path: /admission-prometheusrules/validate {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/cleanup-crds.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/cleanup-crds.yaml index 9094ba24e466..4fd21e7730f6 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/cleanup-crds.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/cleanup-crds.yaml @@ -2,25 +2,25 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ template "kube-prometheus.fullname" . }}-operator-cleanup - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-operator-cleanup + namespace: {{ template "kube-prometheus-stack.namespace" . }} annotations: "helm.sh/hook": pre-delete "helm.sh/hook-weight": "3" "helm.sh/hook-delete-policy": hook-succeeded labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: template: metadata: - name: {{ template "kube-prometheus.fullname" . }}-operator-cleanup + name: {{ template "kube-prometheus-stack.fullname" . }}-operator-cleanup labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 8 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 8 }} spec: {{- if .Values.global.rbac.create }} - serviceAccountName: {{ template "kube-prometheus.operator.serviceAccountName" . }} + serviceAccountName: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} {{- end }} containers: - name: kubectl diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml index f180acdfee05..2e8ef24f6ed0 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml @@ -2,10 +2,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ template "kube-prometheus.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.fullname" . }}-operator labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} rules: {{- if or .Values.prometheusOperator.manageCrds .Values.prometheusOperator.cleanupCustomResource }} - apiGroups: diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml index d755d368df10..c9ab0ab8720c 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml @@ -2,16 +2,16 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "kube-prometheus.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.fullname" . }}-operator labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "kube-prometheus.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.fullname" . }}-operator subjects: - kind: ServiceAccount - name: {{ template "kube-prometheus.operator.serviceAccountName" . }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml index fd720055a3bc..4c9881d459df 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml @@ -1,24 +1,24 @@ -{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} +{{- $namespace := printf "%s" (include "kube-prometheus-stack.namespace" .) }} {{- if .Values.prometheusOperator.enabled }} apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "kube-prometheus.fullname" . }}-operator - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-operator + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: replicas: 1 selector: matchLabels: - app: {{ template "kube-prometheus.name" . }}-operator + app: {{ template "kube-prometheus-stack.name" . }}-operator release: {{ $.Release.Name | quote }} template: metadata: labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 8 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 8 }} {{- if .Values.prometheusOperator.podLabels }} {{ toYaml .Values.prometheusOperator.podLabels | indent 8 }} {{- end }} @@ -31,7 +31,7 @@ spec: priorityClassName: {{ .Values.prometheusOperator.priorityClassName }} {{- end }} containers: - - name: {{ template "kube-prometheus.name" . }} + - name: {{ template "kube-prometheus-stack.name" . }} {{- if .Values.prometheusOperator.image.sha }} image: "{{ .Values.prometheusOperator.image.repository }}:{{ .Values.prometheusOperator.image.tag }}@sha256:{{ .Values.prometheusOperator.image.sha }}" {{- else }} @@ -43,7 +43,7 @@ spec: - --manage-crds={{ .Values.prometheusOperator.manageCrds }} {{- end }} {{- if .Values.prometheusOperator.kubeletService.enabled }} - - --kubelet-service={{ .Values.prometheusOperator.kubeletService.namespace }}/{{ template "kube-prometheus.fullname" . }}-kubelet + - --kubelet-service={{ .Values.prometheusOperator.kubeletService.namespace }}/{{ template "kube-prometheus-stack.fullname" . }}-kubelet {{- end }} {{- if .Values.prometheusOperator.logFormat }} - --log-format={{ .Values.prometheusOperator.logFormat }} @@ -116,13 +116,13 @@ spec: - name: tls-proxy-secret secret: defaultMode: 420 - secretName: {{ template "kube-prometheus.fullname" . }}-admission + secretName: {{ template "kube-prometheus-stack.fullname" . }}-admission {{- end }} {{- if .Values.prometheusOperator.securityContext }} securityContext: {{ toYaml .Values.prometheusOperator.securityContext | indent 8 }} {{- end }} - serviceAccountName: {{ template "kube-prometheus.operator.serviceAccountName" . }} + serviceAccountName: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} {{- if .Values.prometheusOperator.hostNetwork }} hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml index 44fa8b815b2f..d667d6275141 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml @@ -2,10 +2,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "kube-prometheus.fullname" . }}-operator-psp + name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} rules: {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if semverCompare "> 1.15.0-0" $kubeTargetVersion }} @@ -16,5 +16,5 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "kube-prometheus.fullname" . }}-operator + - {{ template "kube-prometheus-stack.fullname" . }}-operator {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml index 111d7984dfda..c538cd17339f 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml @@ -2,16 +2,16 @@ kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "kube-prometheus.fullname" . }}-operator-psp + name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "kube-prometheus.fullname" . }}-operator-psp + name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp subjects: - kind: ServiceAccount - name: {{ template "kube-prometheus.operator.serviceAccountName" . }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml index 95a0e5fb9766..18d1d37df3e1 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml @@ -2,14 +2,14 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "kube-prometheus.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.fullname" . }}-operator labels: - app: {{ template "kube-prometheus.name" . }}-operator + app: {{ template "kube-prometheus-stack.name" . }}-operator {{- if .Values.global.rbac.pspAnnotations }} annotations: {{ toYaml .Values.global.rbac.pspAnnotations | indent 4 }} {{- end }} -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml index d06bebb07fcc..6e67b3d52db7 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus.fullname" . }}-operator - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-operator + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.prometheusOperator.service.labels }} {{ toYaml .Values.prometheusOperator.service.labels | indent 4 }} {{- end }} @@ -47,7 +47,7 @@ spec: targetPort: https {{- end }} selector: - app: {{ template "kube-prometheus.name" . }}-operator + app: {{ template "kube-prometheus-stack.name" . }}-operator release: {{ $.Release.Name | quote }} type: "{{ .Values.prometheusOperator.service.type }}" {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml index f669bb12a2d2..ab41797e3cc8 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "kube-prometheus.operator.serviceAccountName" . }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} imagePullSecrets: {{ toYaml .Values.global.imagePullSecrets | indent 2 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml index b59a2d07ecfa..52f2d572fb24 100644 --- a/charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-operator - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-operator + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-operator -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: endpoints: - port: http @@ -24,9 +24,9 @@ spec: {{- end }} selector: matchLabels: - app: {{ template "kube-prometheus.name" . }}-operator + app: {{ template "kube-prometheus-stack.name" . }}-operator release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: - - {{ printf "%s" (include "kube-prometheus.namespace" .) | quote }} + - {{ printf "%s" (include "kube-prometheus-stack.namespace" .) | quote }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/additionalAlertRelabelConfigs.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalAlertRelabelConfigs.yaml index 8760d086e39f..bff930981a6b 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/additionalAlertRelabelConfigs.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/additionalAlertRelabelConfigs.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus-am-relabel-confg - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-am-relabel-confg + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- if .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations }} annotations: {{ toYaml .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations | indent 4 }} {{- end }} labels: - app: {{ template "kube-prometheus.name" . }}-prometheus-am-relabel-confg -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus-am-relabel-confg +{{ include "kube-prometheus-stack.labels" . | indent 4 }} data: additional-alert-relabel-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalAlertRelabelConfigs | b64enc | quote }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/additionalAlertmanagerConfigs.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalAlertmanagerConfigs.yaml index 8ae8488a77c7..8aebc96c35b6 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/additionalAlertmanagerConfigs.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/additionalAlertmanagerConfigs.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus-am-confg - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-am-confg + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- if .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations }} annotations: {{ toYaml .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations | indent 4 }} {{- end }} labels: - app: {{ template "kube-prometheus.name" . }}-prometheus-am-confg -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus-am-confg +{{ include "kube-prometheus-stack.labels" . | indent 4 }} data: additional-alertmanager-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs | b64enc | quote }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml index df1fce5e2599..794e9ad274db 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml @@ -7,11 +7,11 @@ items: - apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ template "kube-prometheus.name" $ }}-{{ $prometheusRuleName }} - namespace: {{ template "kube-prometheus.namespace" $ }} + name: {{ template "kube-prometheus-stack.name" $ }}-{{ $prometheusRuleName }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ template "kube-prometheus.name" $ }} -{{ include "kube-prometheus.labels" $ | indent 8 }} + app: {{ template "kube-prometheus-stack.name" $ }} +{{ include "kube-prometheus-stack.labels" $ | indent 8 }} {{- if $prometheusRule.additionalLabels }} {{ toYaml $prometheusRule.additionalLabels | indent 8 }} {{- end }} @@ -24,11 +24,11 @@ items: - apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ template "kube-prometheus.name" $ }}-{{ .name }} - namespace: {{ template "kube-prometheus.namespace" $ }} + name: {{ template "kube-prometheus-stack.name" $ }}-{{ .name }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ template "kube-prometheus.name" $ }} -{{ include "kube-prometheus.labels" $ | indent 8 }} + app: {{ template "kube-prometheus-stack.name" $ }} +{{ include "kube-prometheus-stack.labels" $ | indent 8 }} {{- if .additionalLabels }} {{ toYaml .additionalLabels | indent 8 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/additionalScrapeConfigs.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalScrapeConfigs.yaml index b918475d747a..243124ab99a7 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/additionalScrapeConfigs.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/additionalScrapeConfigs.yaml @@ -2,15 +2,15 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus-scrape-confg - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-scrape-confg + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- if .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations }} annotations: {{ toYaml .Values.prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations | indent 4 }} {{- end }} labels: - app: {{ template "kube-prometheus.name" . }}-prometheus-scrape-confg -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus-scrape-confg +{{ include "kube-prometheus-stack.labels" . | indent 4 }} data: additional-scrape-configs.yaml: {{ toYaml .Values.prometheus.prometheusSpec.additionalScrapeConfigs | b64enc | quote }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml index 8dd98c628f09..9772fa5e5e13 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml @@ -2,10 +2,10 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus labels: - app: {{ template "kube-prometheus.name" . }}-prometheus -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} rules: - apiGroups: - "" diff --git a/charts/kube-prometheus-stack/templates/prometheus/clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus/clusterrolebinding.yaml index f486a5254e71..9fc4f65da429 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/clusterrolebinding.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/clusterrolebinding.yaml @@ -2,17 +2,17 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus labels: - app: {{ template "kube-prometheus.name" . }}-prometheus -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "kube-prometheus.fullname" . }}-prometheus + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus subjects: - kind: ServiceAccount - name: {{ template "kube-prometheus.prometheus.serviceAccountName" . }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.prometheus.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/ingress.yaml b/charts/kube-prometheus-stack/templates/prometheus/ingress.yaml index ba70bbfbe9a3..582d4c585d8f 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/ingress.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/ingress.yaml @@ -1,5 +1,5 @@ {{- if and .Values.prometheus.enabled .Values.prometheus.ingress.enabled }} -{{- $serviceName := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }} +{{- $serviceName := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus" }} {{- $servicePort := .Values.prometheus.service.port -}} {{- $routePrefix := list .Values.prometheus.prometheusSpec.routePrefix }} {{- $paths := .Values.prometheus.ingress.paths | default $routePrefix -}} @@ -15,10 +15,10 @@ metadata: {{ toYaml .Values.prometheus.ingress.annotations | indent 4 }} {{- end }} name: {{ $serviceName }} - namespace: {{ template "kube-prometheus.namespace" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-prometheus -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.prometheus.ingress.labels }} {{ toYaml .Values.prometheus.ingress.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml b/charts/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml index a66742d14dbd..24d2213dc5cc 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml @@ -1,5 +1,5 @@ {{- if and .Values.prometheus.enabled .Values.prometheus.thanosIngress.enabled }} -{{- $serviceName := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }} +{{- $serviceName := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus" }} {{- $thanosPort := .Values.prometheus.thanosIngress.servicePort -}} {{- $routePrefix := list .Values.prometheus.prometheusSpec.routePrefix }} {{- $paths := .Values.prometheus.thanosIngress.paths | default $routePrefix -}} @@ -10,10 +10,10 @@ metadata: annotations: {{ toYaml .Values.prometheus.thanosIngress.annotations | indent 4 }} {{- end }} - name: {{ template "kube-prometheus.fullname" . }}-thanos-gateway + name: {{ template "kube-prometheus-stack.fullname" . }}-thanos-gateway labels: - app: {{ template "kube-prometheus.name" . }}-prometheus -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.prometheus.thanosIngress.labels }} {{ toYaml .Values.prometheus.thanosIngress.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml b/charts/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml index 09b33449fbaf..a7feff01648b 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml @@ -5,8 +5,8 @@ apiVersion: v1 kind: List metadata: - name: {{ include "kube-prometheus.fullname" $ }}-prometheus-ingressperreplica - namespace: {{ template "kube-prometheus.namespace" $ }} + name: {{ include "kube-prometheus-stack.fullname" $ }}-prometheus-ingressperreplica + namespace: {{ template "kube-prometheus-stack.namespace" $ }} items: {{ range $i, $e := until $count }} - kind: Ingress @@ -16,11 +16,11 @@ items: apiVersion: extensions/v1beta1 {{ end -}} metadata: - name: {{ include "kube-prometheus.fullname" $ }}-prometheus-{{ $i }} - namespace: {{ template "kube-prometheus.namespace" $ }} + name: {{ include "kube-prometheus-stack.fullname" $ }}-prometheus-{{ $i }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ include "kube-prometheus.name" $ }}-prometheus -{{ include "kube-prometheus.labels" $ | indent 8 }} + app: {{ include "kube-prometheus-stack.name" $ }}-prometheus +{{ include "kube-prometheus-stack.labels" $ | indent 8 }} {{- if $ingressValues.labels }} {{ toYaml $ingressValues.labels | indent 8 }} {{- end }} @@ -36,7 +36,7 @@ items: {{- range $p := $ingressValues.paths }} - path: {{ tpl $p $ }} backend: - serviceName: {{ include "kube-prometheus.fullname" $ }}-prometheus-{{ $i }} + serviceName: {{ include "kube-prometheus-stack.fullname" $ }}-prometheus-{{ $i }} servicePort: {{ $servicePort }} {{- end -}} {{- if or $ingressValues.tlsSecretName $ingressValues.tlsSecretPerReplica.enabled }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/podDisruptionBudget.yaml b/charts/kube-prometheus-stack/templates/prometheus/podDisruptionBudget.yaml index b80e09b35cf4..573317a32f23 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/podDisruptionBudget.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/podDisruptionBudget.yaml @@ -2,11 +2,11 @@ apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-prometheus -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: {{- if .Values.prometheus.podDisruptionBudget.minAvailable }} minAvailable: {{ .Values.prometheus.podDisruptionBudget.minAvailable }} @@ -17,5 +17,5 @@ spec: selector: matchLabels: app: prometheus - prometheus: {{ template "kube-prometheus.fullname" . }}-prometheus + prometheus: {{ template "kube-prometheus-stack.fullname" . }}-prometheus {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/podmonitors.yaml b/charts/kube-prometheus-stack/templates/prometheus/podmonitors.yaml index 94c87320366a..95d568e13d12 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/podmonitors.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/podmonitors.yaml @@ -7,10 +7,10 @@ items: kind: PodMonitor metadata: name: {{ .name }} - namespace: {{ template "kube-prometheus.namespace" $ }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ template "kube-prometheus.name" $ }}-prometheus -{{ include "kube-prometheus.labels" $ | indent 8 }} + app: {{ template "kube-prometheus-stack.name" $ }}-prometheus +{{ include "kube-prometheus-stack.labels" $ | indent 8 }} {{- if .additionalLabels }} {{ toYaml .additionalLabels | indent 8 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml index c0de08d51222..f73b6a650ef6 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml @@ -2,11 +2,11 @@ apiVersion: monitoring.coreos.com/v1 kind: Prometheus metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-prometheus -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.prometheus.annotations }} annotations: {{ toYaml .Values.prometheus.annotations | indent 4 }} @@ -17,8 +17,8 @@ spec: {{- if .Values.prometheus.prometheusSpec.alertingEndpoints }} {{ toYaml .Values.prometheus.prometheusSpec.alertingEndpoints | indent 6 }} {{- else if .Values.alertmanager.enabled }} - - namespace: {{ template "kube-prometheus.namespace" . }} - name: {{ template "kube-prometheus.fullname" . }}-alertmanager + - namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager port: {{ .Values.alertmanager.alertmanagerSpec.portName }} {{- if .Values.alertmanager.alertmanagerSpec.routePrefix }} pathPrefix: "{{ .Values.alertmanager.alertmanagerSpec.routePrefix }}" @@ -57,7 +57,7 @@ spec: {{- else if and .Values.prometheus.ingress.enabled .Values.prometheus.ingress.hosts }} externalUrl: "http://{{ tpl (index .Values.prometheus.ingress.hosts 0) . }}{{ .Values.prometheus.prometheusSpec.routePrefix }}" {{- else }} - externalUrl: http://{{ template "kube-prometheus.fullname" . }}-prometheus.{{ template "kube-prometheus.namespace" . }}:{{ .Values.prometheus.service.port }} + externalUrl: http://{{ template "kube-prometheus-stack.fullname" . }}-prometheus.{{ template "kube-prometheus-stack.namespace" . }}:{{ .Values.prometheus.service.port }} {{- end }} {{- if .Values.prometheus.prometheusSpec.nodeSelector }} nodeSelector: @@ -97,7 +97,7 @@ spec: configMaps: {{ toYaml .Values.prometheus.prometheusSpec.configMaps | indent 4 }} {{- end }} - serviceAccountName: {{ template "kube-prometheus.prometheus.serviceAccountName" . }} + serviceAccountName: {{ template "kube-prometheus-stack.prometheus.serviceAccountName" . }} {{- if .Values.prometheus.prometheusSpec.serviceMonitorSelector }} serviceMonitorSelector: {{ toYaml .Values.prometheus.prometheusSpec.serviceMonitorSelector | indent 4 }} @@ -154,7 +154,7 @@ spec: {{- else if .Values.prometheus.prometheusSpec.ruleSelectorNilUsesHelmValues }} ruleSelector: matchLabels: - app: {{ template "kube-prometheus.name" . }} + app: {{ template "kube-prometheus-stack.name" . }} release: {{ $.Release.Name | quote }} {{ else }} ruleSelector: {} @@ -183,7 +183,7 @@ spec: labelSelector: matchLabels: app: prometheus - prometheus: {{ template "kube-prometheus.fullname" . }}-prometheus + prometheus: {{ template "kube-prometheus-stack.fullname" . }}-prometheus {{- else if eq .Values.prometheus.prometheusSpec.podAntiAffinity "soft" }} podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -193,7 +193,7 @@ spec: labelSelector: matchLabels: app: prometheus - prometheus: {{ template "kube-prometheus.fullname" . }}-prometheus + prometheus: {{ template "kube-prometheus-stack.fullname" . }}-prometheus {{- end }} {{- end }} {{- if .Values.prometheus.prometheusSpec.tolerations }} @@ -206,7 +206,7 @@ spec: {{- end }} {{- if .Values.prometheus.prometheusSpec.additionalScrapeConfigs }} additionalScrapeConfigs: - name: {{ template "kube-prometheus.fullname" . }}-prometheus-scrape-confg + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-scrape-confg key: additional-scrape-configs.yaml {{- end }} {{- if .Values.prometheus.prometheusSpec.additionalScrapeConfigsSecret.enabled }} @@ -216,12 +216,12 @@ spec: {{- end }} {{- if .Values.prometheus.prometheusSpec.additionalAlertManagerConfigs }} additionalAlertManagerConfigs: - name: {{ template "kube-prometheus.fullname" . }}-prometheus-am-confg + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-am-confg key: additional-alertmanager-configs.yaml {{- end }} {{- if .Values.prometheus.prometheusSpec.additionalAlertRelabelConfigs }} additionalAlertRelabelConfigs: - name: {{ template "kube-prometheus.fullname" . }}-prometheus-am-relabel-confg + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-am-relabel-confg key: additional-alert-relabel-configs.yaml {{- end }} {{- if .Values.prometheus.prometheusSpec.containers }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrole.yaml index 675faacedd15..a279fb241b37 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrole.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrole.yaml @@ -2,10 +2,10 @@ kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus-psp + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-psp labels: - app: {{ template "kube-prometheus.name" . }}-prometheus -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} rules: {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if semverCompare "> 1.15.0-0" $kubeTargetVersion }} @@ -16,5 +16,5 @@ rules: resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: - - {{ template "kube-prometheus.fullname" . }}-prometheus + - {{ template "kube-prometheus-stack.fullname" . }}-prometheus {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrolebinding.yaml index 5382feb4a7f3..27b73b74b30f 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrolebinding.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrolebinding.yaml @@ -2,17 +2,17 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus-psp + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-psp labels: - app: {{ template "kube-prometheus.name" . }}-prometheus -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "kube-prometheus.fullname" . }}-prometheus-psp + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-psp subjects: - kind: ServiceAccount - name: {{ template "kube-prometheus.prometheus.serviceAccountName" . }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.prometheus.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/psp.yaml b/charts/kube-prometheus-stack/templates/prometheus/psp.yaml index 6ad90236324e..bd2b270d5933 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/psp.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/psp.yaml @@ -2,14 +2,14 @@ apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus labels: - app: {{ template "kube-prometheus.name" . }}-prometheus + app: {{ template "kube-prometheus-stack.name" . }}-prometheus {{- if .Values.global.rbac.pspAnnotations }} annotations: {{ toYaml .Values.global.rbac.pspAnnotations | indent 4 }} {{- end }} -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/alertmanager.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/alertmanager.rules.yaml index 0f7eab8d2460..37c22e16af47 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/alertmanager.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/alertmanager.rules.yaml @@ -1,20 +1,20 @@ {{- /* Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.alertmanager }} -{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager" }} -{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} +{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "alertmanager" }} +{{- $namespace := printf "%s" (include "kube-prometheus-stack.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml index 48db02f2b051..c844ff79ed36 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'etcd' group from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/etcd3_alert.rules.yml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeEtcd.enabled .Values.defaultRules.rules.etcd }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/general.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/general.rules.yaml index f4e891a09860..e8aadc86d271 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/general.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/general.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'general.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.general }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/k8s.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/k8s.rules.yaml index 2551ead3d86e..35e4edebfc3a 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/k8s.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/k8s.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'k8s.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.k8s }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml index 593b809db776..78a09e323db3 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-apiserver-availability.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserverAvailability }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-apiserver-availability.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-apiserver-availability.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml index d2c7feb6efb9..2ac67913fa2c 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-apiserver-slos' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserverSlos }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-apiserver-slos" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-apiserver-slos" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml index 12d6ac4d192d..b4d1a0f39119 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserver }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml index 53f16aaa2dd5..e54bee5879b2 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-prometheus-general.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusGeneral }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus-general.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-prometheus-general.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml index 7f3dcf65e47a..1ff73f21275f 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeRecording }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml index c6ba3e6f34ba..594f1bb3bffe 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-state-metrics.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-state-metrics.yaml index 66e87c8ab4a2..207a61907442 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-state-metrics.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-state-metrics.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-state-metrics' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeStateMetrics.enabled .Values.defaultRules.rules.kubeStateMetrics }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-state-metrics" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-state-metrics" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubelet.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubelet.rules.yaml index 40ae07ab06b0..f9bd1ccd6451 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubelet.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubelet.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubelet.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubelet.enabled .Values.defaultRules.rules.kubelet }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubelet.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubelet.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-apps.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-apps.yaml index dd72bf496e15..42d691356db6 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-apps.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-apps.yaml @@ -1,7 +1,7 @@ {{- /* Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeStateMetrics.enabled .Values.defaultRules.rules.kubernetesApps }} @@ -9,11 +9,11 @@ https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-promet apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-resources.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-resources.yaml index 3658c40dba78..40596fef4921 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-resources.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-resources.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesResources }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-storage.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-storage.yaml index 0804c438e975..52092f0adea7 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-storage.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-storage.yaml @@ -1,7 +1,7 @@ {{- /* Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesStorage }} @@ -9,11 +9,11 @@ https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-promet apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml index d0a48003252c..dde1f7afbc53 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system-apiserver' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system-apiserver" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-system-apiserver" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml index 5cb19afaa1a7..cf0309a056d6 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system-controller-manager' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeControllerManager.enabled }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system-controller-manager" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-system-controller-manager" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml index c6abbedb3c7d..6d75c6f55d5d 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system-kubelet' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system-kubelet" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-system-kubelet" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml index 8126eab6ecae..8f455a65bb2f 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system-scheduler' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system-scheduler" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-system-scheduler" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system.yaml index a9a5f4ebb7b0..8fd0ad318ffd 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.rules.yaml index b3cdde2bbd64..845eb0c909c4 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node-exporter.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node-exporter.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node-exporter.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml index 1d046f99706e..17e112b6591a 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node-exporter' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node-exporter" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node-exporter" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-network.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-network.yaml index 7181d85b1004..b6f4eda74b44 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-network.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-network.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node-network' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.network }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node.rules.yaml index 00a2e713b511..33af72c2b975 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus-operator.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus-operator.yaml index bd5db28d40fd..c420c3ca69e9 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus-operator.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus-operator.yaml @@ -1,20 +1,20 @@ {{- /* Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheusOperator }} -{{- $operatorJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "operator" }} -{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} +{{- $operatorJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "operator" }} +{{- $namespace := printf "%s" (include "kube-prometheus-stack.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus.yaml index 5c4a9e9c2c76..66976c4b3f90 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus.yaml @@ -1,20 +1,20 @@ {{- /* Generated from 'prometheus' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/master/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheus }} -{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }} -{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} +{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus" }} +{{- $namespace := printf "%s" (include "kube-prometheus-stack.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/alertmanager.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/alertmanager.rules.yaml index eb62f0597440..cdc814d276a5 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/alertmanager.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/alertmanager.rules.yaml @@ -1,21 +1,21 @@ {{- /* Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.alertmanager }} -{{- $operatorJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "operator" }} -{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager" }} -{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} +{{- $operatorJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "operator" }} +{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "alertmanager" }} +{{- $namespace := printf "%s" (include "kube-prometheus-stack.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/etcd.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/etcd.yaml index c9a45d286495..b34b2b840ed7 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/etcd.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/etcd.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'etcd' group from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/etcd3_alert.rules.yml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeEtcd.enabled .Values.defaultRules.rules.etcd }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/general.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/general.rules.yaml index 768a5bd7f1e5..cc5f0709384d 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/general.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/general.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'general.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.general }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/k8s.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/k8s.rules.yaml index b745939b8886..08aa7fe2b3c3 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/k8s.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/k8s.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'k8s.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.k8s }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/kube-apiserver.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-apiserver.rules.yaml index 47e248071469..e3a92969239f 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/kube-apiserver.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-apiserver.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserver }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml index 0a424b34f4ae..cbd8ea39cebd 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-prometheus-node-alerting.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeAlerting }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus-node-alerting.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-prometheus-node-alerting.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml index 438bb0a1e6fd..87f072fd0256 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeRecording }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/kube-scheduler.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-scheduler.rules.yaml index 600cdaced96c..46c8d1d4a9c7 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/kube-scheduler.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-scheduler.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-absent.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-absent.yaml index 64bab360885f..7ed1c0d92753 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-absent.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-absent.yaml @@ -1,22 +1,22 @@ {{- /* Generated from 'kubernetes-absent' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesAbsent }} -{{- $operatorJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "operator" }} -{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }} -{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "alertmanager" }} -{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} +{{- $operatorJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "operator" }} +{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus" }} +{{- $alertmanagerJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "alertmanager" }} +{{- $namespace := printf "%s" (include "kube-prometheus-stack.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-absent" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-absent" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-apps.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-apps.yaml index 60a8eb28941b..41d091c588ba 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-apps.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-apps.yaml @@ -1,7 +1,7 @@ {{- /* Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeStateMetrics.enabled .Values.defaultRules.rules.kubernetesApps }} @@ -9,11 +9,11 @@ https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-promet apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-resources.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-resources.yaml index c98996d01176..885bc41388db 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-resources.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-resources.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesResources }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-storage.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-storage.yaml index 8a6e6ba121af..b2b11e3ec624 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-storage.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-storage.yaml @@ -1,7 +1,7 @@ {{- /* Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesStorage }} @@ -9,11 +9,11 @@ https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-promet apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-system.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-system.yaml index 7106a5a488e4..dac4e7c15948 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-system.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-system.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/node-network.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/node-network.yaml index 8cf11342da5b..d3c853f4a993 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/node-network.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/node-network.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node-network' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.network }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/node-time.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/node-time.yaml index 62e2df0ef852..9c30ea4f1ef7 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/node-time.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/node-time.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node-time' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.time }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node-time" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node-time" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/node.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/node.rules.yaml index 4c4453f9c726..328c6d7d8b82 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/node.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/node.rules.yaml @@ -1,18 +1,18 @@ {{- /* Generated from 'node.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus-operator.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus-operator.yaml index 956efb8d9a8f..091324459f77 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus-operator.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus-operator.yaml @@ -1,20 +1,20 @@ {{- /* Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheusOperator }} -{{- $operatorJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "operator" }} -{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} +{{- $operatorJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "operator" }} +{{- $namespace := printf "%s" (include "kube-prometheus-stack.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "kube-prometheus" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus.rules.yaml index bd2fdb1d8498..3e4b2bd60efe 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus.rules.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus.rules.yaml @@ -1,20 +1,20 @@ {{- /* Generated from 'prometheus.rules' group from https://raw.githubusercontent.com/prometheus-operator/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml Do not change in-place! In order to change this file first read following link: -https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus/hack +https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack/hack */ -}} {{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }} {{- if and (semverCompare ">=1.10.0-0" $kubeTargetVersion) (semverCompare "<1.14.0-0" $kubeTargetVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheus }} -{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus" }} -{{- $namespace := printf "%s" (include "kube-prometheus.namespace" .) }} +{{- $prometheusJob := printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus" }} +{{- $namespace := printf "%s" (include "kube-prometheus-stack.namespace" .) }} apiVersion: monitoring.coreos.com/v1 kind: PrometheusRule metadata: - name: {{ printf "%s-%s" (include "kube-prometheus.fullname" .) "prometheus.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }} -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.defaultRules.labels }} {{ toYaml .Values.defaultRules.labels | indent 4 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/service.yaml b/charts/kube-prometheus-stack/templates/prometheus/service.yaml index 1e5f9620bd99..cb831c7a2592 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/service.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/service.yaml @@ -2,12 +2,12 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-prometheus + app: {{ template "kube-prometheus-stack.name" . }}-prometheus self-monitor: {{ .Values.prometheus.serviceMonitor.selfMonitor | quote }} -{{ include "kube-prometheus.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.prometheus.service.labels }} {{ toYaml .Values.prometheus.service.labels | indent 4 }} {{- end }} @@ -44,7 +44,7 @@ spec: {{- end }} selector: app: prometheus - prometheus: {{ template "kube-prometheus.fullname" . }}-prometheus + prometheus: {{ template "kube-prometheus-stack.fullname" . }}-prometheus {{- if .Values.prometheus.service.sessionAffinity }} sessionAffinity: {{ .Values.prometheus.service.sessionAffinity }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/prometheus/serviceaccount.yaml index 3cfe9f939923..862d5f8e44fd 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/serviceaccount.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/serviceaccount.yaml @@ -2,11 +2,11 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: {{ template "kube-prometheus.prometheus.serviceAccountName" . }} - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.prometheus.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-prometheus -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} {{- if .Values.prometheus.serviceAccount.annotations }} annotations: {{ toYaml .Values.prometheus.serviceAccount.annotations | indent 4 }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/prometheus/servicemonitor.yaml index 65116d948be9..356c013ffa84 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/servicemonitor.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/servicemonitor.yaml @@ -2,20 +2,20 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "kube-prometheus.fullname" . }}-prometheus - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "kube-prometheus.name" . }}-prometheus -{{ include "kube-prometheus.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: selector: matchLabels: - app: {{ template "kube-prometheus.name" . }}-prometheus + app: {{ template "kube-prometheus-stack.name" . }}-prometheus release: {{ $.Release.Name | quote }} self-monitor: "true" namespaceSelector: matchNames: - - {{ printf "%s" (include "kube-prometheus.namespace" .) | quote }} + - {{ printf "%s" (include "kube-prometheus-stack.namespace" .) | quote }} endpoints: - port: {{ .Values.prometheus.prometheusSpec.portName }} {{- if .Values.prometheus.serviceMonitor.interval }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/servicemonitors.yaml b/charts/kube-prometheus-stack/templates/prometheus/servicemonitors.yaml index ae1e259c26d8..959df2124378 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/servicemonitors.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/servicemonitors.yaml @@ -7,10 +7,10 @@ items: kind: ServiceMonitor metadata: name: {{ .name }} - namespace: {{ template "kube-prometheus.namespace" $ }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ template "kube-prometheus.name" $ }}-prometheus -{{ include "kube-prometheus.labels" $ | indent 8 }} + app: {{ template "kube-prometheus-stack.name" $ }}-prometheus +{{ include "kube-prometheus-stack.labels" $ | indent 8 }} {{- if .additionalLabels }} {{ toYaml .additionalLabels | indent 8 }} {{- end }} diff --git a/charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml b/charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml index 704f1d0e0225..1a55433621fb 100644 --- a/charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml @@ -4,18 +4,18 @@ apiVersion: v1 kind: List metadata: - name: {{ include "kube-prometheus.fullname" $ }}-prometheus-serviceperreplica - namespace: {{ template "kube-prometheus.namespace" . }} + name: {{ include "kube-prometheus-stack.fullname" $ }}-prometheus-serviceperreplica + namespace: {{ template "kube-prometheus-stack.namespace" . }} items: {{- range $i, $e := until $count }} - apiVersion: v1 kind: Service metadata: - name: {{ include "kube-prometheus.fullname" $ }}-prometheus-{{ $i }} - namespace: {{ template "kube-prometheus.namespace" $ }} + name: {{ include "kube-prometheus-stack.fullname" $ }}-prometheus-{{ $i }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ include "kube-prometheus.name" $ }}-prometheus -{{ include "kube-prometheus.labels" $ | indent 8 }} + app: {{ include "kube-prometheus-stack.name" $ }}-prometheus +{{ include "kube-prometheus-stack.labels" $ | indent 8 }} {{- if $serviceValues.annotations }} annotations: {{ toYaml $serviceValues.annotations | indent 8 }} @@ -39,8 +39,8 @@ items: targetPort: {{ $serviceValues.targetPort }} selector: app: prometheus - prometheus: {{ include "kube-prometheus.fullname" $ }}-prometheus - statefulset.kubernetes.io/pod-name: prometheus-{{ include "kube-prometheus.fullname" $ }}-prometheus-{{ $i }} + prometheus: {{ include "kube-prometheus-stack.fullname" $ }}-prometheus + statefulset.kubernetes.io/pod-name: prometheus-{{ include "kube-prometheus-stack.fullname" $ }}-prometheus-{{ $i }} type: "{{ $serviceValues.type }}" {{- end }} {{- end }} diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index f3e0b6fe6656..7ea979ebe675 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -1,8 +1,8 @@ -# Default values for kube-prometheus. +# Default values for kube-prometheus-stack. # This is a YAML-formatted file. # Declare variables to be passed into your templates. -## Provide a name in place of kube-prometheus for `app:` labels +## Provide a name in place of kube-prometheus-stack for `app:` labels ## nameOverride: "" From aec739d9ebf144441a59e20cc6bec47287d4f625 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 5 Sep 2020 15:03:19 -0400 Subject: [PATCH 39/55] Chart testing needs this repo info to test chart dependencies in the same repo Signed-off-by: Scott Rigby --- ct.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ct.yaml b/ct.yaml index 59f6b1d56d48..599add55274b 100644 --- a/ct.yaml +++ b/ct.yaml @@ -5,6 +5,7 @@ chart-dirs: - charts chart-repos: - stable=https://kubernetes-charts.storage.googleapis.com/ + - prometheus-community=https://prometheus-community.github.io/helm-charts helm-extra-args: --timeout 600s excluded-charts: # If not running on GCE, will error: "Failed to get GCE config" From c4f61d307f587d190ab1fa3b97aa8cd9f1b5bc8b Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 5 Sep 2020 11:46:45 -0400 Subject: [PATCH 40/55] Auto-sync README from main to gh-pages (#41) * Auto-sync README from main to gh-pages Signed-off-by: Scott Rigby * Only runs on push to main even if this workflow is copied to a new branch Signed-off-by: Scott Rigby --- .github/workflows/sync-readme.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/sync-readme.yaml diff --git a/.github/workflows/sync-readme.yaml b/.github/workflows/sync-readme.yaml new file mode 100644 index 000000000000..c2297206aee5 --- /dev/null +++ b/.github/workflows/sync-readme.yaml @@ -0,0 +1,23 @@ +on: + push: + branches: + - 'main' + paths: + - 'README.md' +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: | + cp -f README.md ${{ runner.temp }}/README.md + - uses: actions/checkout@v2 + with: + ref: gh-pages + - run: | + cp -f ${{ runner.temp }}/README.md . + git config user.name "$GITHUB_ACTOR" + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + git add README.md + git commit --signoff -m "Sync README from main" + git push From 08d2dce52dc28882a241a9beffe3798c37cf9fcf Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Sat, 5 Sep 2020 14:16:36 -0400 Subject: [PATCH 41/55] Improve README for main and gh pages (#43) Signed-off-by: Scott Rigby --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d1ba6ac6d723..f317efabf81f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prometheus Community Kubernetes Helm Charts -[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Release Charts](https://github.com/prometheus-community/helm-charts/workflows/Release%20Charts/badge.svg?branch=main) This functionality is in beta and is subject to change. The code is provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features. @@ -19,8 +19,10 @@ You can then run `helm search repo prometheus-community` to see the charts. ## Contributing -We'd love to have you contribute! Please refer to our [contribution guidelines](CONTRIBUTING.md) for details. + +We'd love to have you contribute! Please refer to our [contribution guidelines](https://github.com/prometheus-community/helm-charts/blob/main/CONTRIBUTING.md) for details. ## License -[Apache 2.0 License](./LICENSE). + +[Apache 2.0 License](https://github.com/prometheus-community/helm-charts/blob/main/LICENSE). From a5c16195a4a9e277f4d40b8eb9207edc577590a8 Mon Sep 17 00:00:00 2001 From: hmlkao Date: Sat, 5 Sep 2020 22:18:32 +0200 Subject: [PATCH 42/55] [prometheus] unify labels and annotations across all deploymens and statefulsets (#45) Signed-off-by: Ondrej Homolka Signed-off-by: Scott Rigby --- charts/prometheus/Chart.yaml | 2 +- .../templates/deployments/alertmanager.yaml | 6 +++++- .../templates/deployments/pushgateway.yaml | 9 ++++++++- .../templates/deployments/server.yaml | 4 ++-- .../templates/statefulsets/alertmanager.yaml | 12 +++++++++++- .../templates/statefulsets/server.yaml | 8 ++++---- charts/prometheus/values.yaml | 18 ++++++++++++++++++ 7 files changed, 49 insertions(+), 10 deletions(-) diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml index 68227dd0b897..4c5ddb5fd2bf 100644 --- a/charts/prometheus/Chart.yaml +++ b/charts/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 11.12.1 +version: 11.13.0 appVersion: 2.20.1 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ diff --git a/charts/prometheus/templates/deployments/alertmanager.yaml b/charts/prometheus/templates/deployments/alertmanager.yaml index bb130579cc66..7a10af48409c 100644 --- a/charts/prometheus/templates/deployments/alertmanager.yaml +++ b/charts/prometheus/templates/deployments/alertmanager.yaml @@ -2,6 +2,10 @@ apiVersion: {{ template "prometheus.deployment.apiVersion" . }} kind: Deployment metadata: +{{- if .Values.alertmanager.deploymentAnnotations }} + annotations: + {{ toYaml .Values.alertmanager.deploymentAnnotations | nindent 4 }} +{{- end }} labels: {{- include "prometheus.alertmanager.labels" . | nindent 4 }} name: {{ template "prometheus.alertmanager.fullname" . }} @@ -20,7 +24,7 @@ spec: metadata: {{- if .Values.alertmanager.podAnnotations }} annotations: -{{ toYaml .Values.alertmanager.podAnnotations | indent 8 }} + {{ toYaml .Values.alertmanager.podAnnotations | nindent 8 }} {{- end }} labels: {{- include "prometheus.alertmanager.labels" . | nindent 8 }} diff --git a/charts/prometheus/templates/deployments/pushgateway.yaml b/charts/prometheus/templates/deployments/pushgateway.yaml index a9afc8ace719..114ea4ed573a 100644 --- a/charts/prometheus/templates/deployments/pushgateway.yaml +++ b/charts/prometheus/templates/deployments/pushgateway.yaml @@ -2,6 +2,10 @@ apiVersion: {{ template "prometheus.deployment.apiVersion" . }} kind: Deployment metadata: +{{- if .Values.pushgateway.deploymentAnnotations }} + annotations: + {{ toYaml .Values.pushgateway.deploymentAnnotations | nindent 4 }} +{{- end }} labels: {{- include "prometheus.pushgateway.labels" . | nindent 4 }} name: {{ template "prometheus.pushgateway.fullname" . }} @@ -23,10 +27,13 @@ spec: metadata: {{- if .Values.pushgateway.podAnnotations }} annotations: -{{ toYaml .Values.pushgateway.podAnnotations | indent 8 }} + {{ toYaml .Values.pushgateway.podAnnotations | nindent 8 }} {{- end }} labels: {{- include "prometheus.pushgateway.labels" . | nindent 8 }} + {{- if .Values.pushgateway.podLabels}} + {{ toYaml .Values.pushgateway.podLabels | nindent 8 }} + {{- end}} spec: serviceAccountName: {{ template "prometheus.serviceAccountName.pushgateway" . }} {{- if .Values.pushgateway.extraInitContainers }} diff --git a/charts/prometheus/templates/deployments/server.yaml b/charts/prometheus/templates/deployments/server.yaml index 82ef220aa5a6..bb039ee8ac0e 100644 --- a/charts/prometheus/templates/deployments/server.yaml +++ b/charts/prometheus/templates/deployments/server.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: {{- if .Values.server.deploymentAnnotations }} annotations: -{{ toYaml .Values.server.deploymentAnnotations | indent 4 }} + {{ toYaml .Values.server.deploymentAnnotations | nindent 4 }} {{- end }} labels: {{- include "prometheus.server.labels" . | nindent 4 }} @@ -25,7 +25,7 @@ spec: metadata: {{- if .Values.server.podAnnotations }} annotations: -{{ toYaml .Values.server.podAnnotations | indent 8 }} + {{ toYaml .Values.server.podAnnotations | nindent 8 }} {{- end }} labels: {{- include "prometheus.server.labels" . | nindent 8 }} diff --git a/charts/prometheus/templates/statefulsets/alertmanager.yaml b/charts/prometheus/templates/statefulsets/alertmanager.yaml index 33fbb3f03465..964cebb96756 100644 --- a/charts/prometheus/templates/statefulsets/alertmanager.yaml +++ b/charts/prometheus/templates/statefulsets/alertmanager.yaml @@ -2,8 +2,15 @@ apiVersion: apps/v1 kind: StatefulSet metadata: +{{- if .Values.alertmanager.statefulSet.annotations }} + annotations: + {{ toYaml .Values.alertmanager.statefulSet.annotations | nindent 4 }} +{{- end }} labels: {{- include "prometheus.alertmanager.labels" . | nindent 4 }} + {{- if .Values.alertmanager.statefulSet.labels}} + {{ toYaml .Values.alertmanager.statefulSet.labels | nindent 4 }} + {{- end}} name: {{ template "prometheus.alertmanager.fullname" . }} {{ include "prometheus.namespace" . | indent 2 }} spec: @@ -17,10 +24,13 @@ spec: metadata: {{- if .Values.alertmanager.podAnnotations }} annotations: -{{ toYaml .Values.alertmanager.podAnnotations | indent 8 }} + {{ toYaml .Values.alertmanager.podAnnotations | nindent 8 }} {{- end }} labels: {{- include "prometheus.alertmanager.labels" . | nindent 8 }} + {{- if .Values.alertmanager.podLabels}} + {{ toYaml .Values.alertmanager.podLabels | nindent 8 }} + {{- end}} spec: {{- if .Values.alertmanager.affinity }} affinity: diff --git a/charts/prometheus/templates/statefulsets/server.yaml b/charts/prometheus/templates/statefulsets/server.yaml index a86a67ab2809..20645c5f9eb1 100644 --- a/charts/prometheus/templates/statefulsets/server.yaml +++ b/charts/prometheus/templates/statefulsets/server.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: {{- if .Values.server.statefulSet.annotations }} annotations: -{{ toYaml .Values.server.statefulSet.annotations | indent 4 }} + {{ toYaml .Values.server.statefulSet.annotations | nindent 4 }} {{- end }} labels: {{- include "prometheus.server.labels" . | nindent 4 }} @@ -25,12 +25,12 @@ spec: metadata: {{- if .Values.server.podAnnotations }} annotations: -{{ toYaml .Values.server.podAnnotations | indent 8 }} + {{ toYaml .Values.server.podAnnotations | nindent 8 }} {{- end }} labels: {{- include "prometheus.server.labels" . | nindent 8 }} - {{- if .Values.server.statefulSet.labels}} - {{ toYaml .Values.server.statefulSet.labels | nindent 8 }} + {{- if .Values.server.podLabels}} + {{ toYaml .Values.server.podLabels | nindent 8 }} {{- end}} spec: {{- if .Values.server.priorityClassName }} diff --git a/charts/prometheus/values.yaml b/charts/prometheus/values.yaml index 1045f2712733..cd941cf091b8 100644 --- a/charts/prometheus/values.yaml +++ b/charts/prometheus/values.yaml @@ -255,12 +255,18 @@ alertmanager: ## replicaCount: 1 + ## Annotations to be added to deployment + ## + deploymentAnnotations: {} + statefulSet: ## If true, use a statefulset instead of a deployment for pod management. ## This allows to scale replicas to more than 1 pod ## enabled: false + annotations: {} + labels: {} podManagementPolicy: OrderedReady ## Alertmanager headless service to use for the statefulset @@ -848,6 +854,10 @@ server: ## replicaCount: 1 + ## Annotations to be added to deployment + ## + deploymentAnnotations: {} + statefulSet: ## If true, use a statefulset instead of a deployment for pod management. ## This allows to scale replicas to more than 1 pod @@ -1034,6 +1044,10 @@ pushgateway: ## podAnnotations: {} + ## Labels to be added to pushgateway pods + ## + podLabels: {} + ## Specify if a Pod Security Policy for node-exporter must be created ## Ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/ ## @@ -1050,6 +1064,10 @@ pushgateway: replicaCount: 1 + ## Annotations to be added to deployment + ## + deploymentAnnotations: {} + ## PodDisruptionBudget settings ## ref: https://kubernetes.io/docs/concepts/workloads/pods/disruptions/ ## From 17d071baadf7fd84942b254f6987800f91b8b422 Mon Sep 17 00:00:00 2001 From: zanhsieh Date: Sun, 6 Sep 2020 18:27:38 +0800 Subject: [PATCH 43/55] [prometheus-redis-exporter] Add zanhsieh as maintainer (#46) Signed-off-by: zanhsieh Signed-off-by: Scott Rigby --- charts/prometheus-redis-exporter/Chart.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/prometheus-redis-exporter/Chart.yaml b/charts/prometheus-redis-exporter/Chart.yaml index 3b1beef4497c..781638f0ce52 100644 --- a/charts/prometheus-redis-exporter/Chart.yaml +++ b/charts/prometheus-redis-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 1.3.4 description: Prometheus exporter for Redis metrics name: prometheus-redis-exporter -version: 3.5.1 +version: 3.5.2 home: https://github.com/oliver006/redis_exporter sources: - https://github.com/oliver006/redis_exporter @@ -12,3 +12,5 @@ keywords: maintainers: - name: acondrat email: arcadie.condrat@gmail.com + - name: zanhsieh + email: zanhsieh@gmail.com From d4eb6621be52db18082bec4f9de8fd947dcbcc4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Sun, 6 Sep 2020 14:29:09 +0200 Subject: [PATCH 44/55] added link to github to readme (#51) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Bauer Signed-off-by: Scott Rigby --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f317efabf81f..a1e3dbcf79a7 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,8 @@ You can then run `helm search repo prometheus-community` to see the charts. ## Contributing +The source code of all [Prometheus](https://prometheus.io) community [Helm](https://helm.sh) charts can be found on Github: + We'd love to have you contribute! Please refer to our [contribution guidelines](https://github.com/prometheus-community/helm-charts/blob/main/CONTRIBUTING.md) for details. From 9b6575a6fef5358631441a06b2aa45c91285b1a5 Mon Sep 17 00:00:00 2001 From: Torsten Walter Date: Sun, 6 Sep 2020 20:18:57 +0200 Subject: [PATCH 45/55] Add PROCESSES document (#44) * Add CODEOWNERS I used this syntax in CODEOWNERS: ``` /chart/ @maintainer ``` It matches any files in the chart directory at the root of the repository and any of its subdirectories. Without the leading `/` it would also match directories found somewhere else. It's unlikely that those names would be used, but it does not harm to do it this way. Part-of: #38 Signed-off-by: Torsten Walter * sort charts alphabetically Signed-off-by: Torsten Walter * adjust existing CODEOWNERS Signed-off-by: Torsten Walter * link to CODEOWNERS file and fixed spelling Signed-off-by: Torsten Walter --- .github/CODEOWNERS | 39 ++++++++++++++++++++++----------------- PROCESSES.md | 11 +++++++++++ 2 files changed, 33 insertions(+), 17 deletions(-) create mode 100644 PROCESSES.md diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index aa3c8f449f68..f6f7836303c2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,20 +1,25 @@ # See https://github.com/scottrigby/prometheus-helm-charts/issues/12 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners +# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax -charts/kube-prometheus-stack/ @vsliouniaev @bismarck @gianrubio -charts/prometheus/ @gianrubio @zanhsieh @Xtigyro -charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f -charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio -charts/prometheus-cloudwatch-exporter/ @gianrubio @torstenwalter @asherf -charts/prometheus-consul-exporter @timm088 -charts/prometheus-couchdb-exporter @gkarthiks -charts/prometheus-mongodb-exporter @steven-sheehy -charts/prometheus-mysql-exporter @juanchimienti @monotek -charts/prometheus-nats-exporter @okgolove @caarlos0 -charts/prometheus-node-exporter @gianrubio @vsliouniaev -charts/prometheus-postgres-exporter @gianrubio -charts/prometheus-pushgateway @gianrubio @cstaud -charts/prometheus-rabbitmq-exporter @juanchimienti -charts/prometheus-redis-exporter @acondrat -charts/prometheus-snmp-exporter @miouge1 -charts/prometheus-to-sd @acondrat +# The repo admins team will be the default owners for everything in the repo. +# Unless a later match takes precedence, they will be requested for review when someone opens a pull request. +* @prometheus-community/helm-charts-admins + +/charts/prometheus/ @gianrubio @zanhsieh @Xtigyro +/charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f +/charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio +/charts/prometheus-cloudwatch-exporter/ @gianrubio @torstenwalter @asherf +/charts/prometheus-consul-exporter @timm088 +/charts/prometheus-couchdb-exporter @gkarthiks +/charts/prometheus-mongodb-exporter @steven-sheehy +/charts/prometheus-mysql-exporter @juanchimienti @monotek +/charts/prometheus-nats-exporter @okgolove @caarlos0 +/charts/prometheus-node-exporter @gianrubio @vsliouniaev +/charts/prometheus-operator @vsliouniaev @bismarck @gianrubio +/charts/prometheus-postgres-exporter @gianrubio +/charts/prometheus-pushgateway @gianrubio @cstaud +/charts/prometheus-rabbitmq-exporter @juanchimienti +/charts/prometheus-redis-exporter @acondrat @zanhsieh +/charts/prometheus-snmp-exporter @miouge1 +/charts/prometheus-to-sd @acondrat diff --git a/PROCESSES.md b/PROCESSES.md new file mode 100644 index 000000000000..a4c52aa39389 --- /dev/null +++ b/PROCESSES.md @@ -0,0 +1,11 @@ +# Processes + +This document outlines processes and procedures for some common tasks in the charts repository. + +## Adding chart maintainers + +Chart maintainers are defined within the chart itself. +So the procedure for adding maintainers is to add them there. +The pull request which does that should also update [CODEOWNERS](./github/CODEOWNERS) file to that the new maintainer is able to approve pull requests. +One of the existing chart maintainers needs to approve the PR in addition one of the repository admins needs to approve it. +They are then responsible for also granting the new maintainer write permissions to this repository. From 36685a7bcf34cbfba9387199d3f509fecbc2dc93 Mon Sep 17 00:00:00 2001 From: Karthikeyan Govindaraj <30545166+gkarthiks@users.noreply.github.com> Date: Mon, 7 Sep 2020 00:54:07 +0530 Subject: [PATCH 46/55] feat: adding issue templates (#54) * feat: adding issue templates Signed-off-by: gkarthiks * feat: PR template and review comments Signed-off-by: gkarthiks Signed-off-by: Scott Rigby --- .github/ISSUE_TEMPLATE/bug_report.md | 35 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 27 +++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 34 ++++++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000000..6ca70900c442 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,35 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '[name of the chart e.g. prometheus-kube-stack] issue title' +labels: 'bug' +assignees: '' + +--- + + + +**Describe the bug** +A clear and concise description of what the bug is. + +**Version of Helm and Kubernetes**: + + +**Which chart**: + + +**What happened**: + + +**What you expected to happen**: + + +**How to reproduce it** (as minimally and precisely as possible): + + +**Anything else we need to know**: diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000000..01ae8cf6376c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,27 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '[name of the chart e.g. prometheus-couchdb-exporter] issue title' +labels: 'enhancement' +assignees: '' + +--- + + + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000000..faf686636e31 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,34 @@ + +#### Is this a new chart + +#### What this PR does / why we need it: + +#### Which issue this PR fixes +*(optional, in `fixes #(, fixes #, ...)` format, will close that issue when PR gets merged)* + - fixes # + +#### Special notes for your reviewer: + +#### Checklist +[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.] +- [ ] [DCO](https://github.com/prometheus-community/helm-charts/blob/main/CONTRIBUTING.md#sign-off-your-work) signed +- [ ] Chart Version bumped +- [ ] Title of the PR starts with chart name (e.g. `[prometheus-couchdb-exporter]`) \ No newline at end of file From a48717c7d1f27d0b6e48ad186ea4b48687e9e9ec Mon Sep 17 00:00:00 2001 From: Karthikeyan Govindaraj <30545166+gkarthiks@users.noreply.github.com> Date: Mon, 7 Sep 2020 09:38:24 +0530 Subject: [PATCH 47/55] [prometheus-consul-exporter] add gkarthiks as additional maintainers (#50) * adding gkarthiks for additional maintainers Signed-off-by: gkarthiks * fix: new line char Signed-off-by: gkarthiks * adding gkarthiks to codeowners against consul Signed-off-by: gkarthiks Signed-off-by: Scott Rigby --- .github/CODEOWNERS | 2 +- charts/prometheus-consul-exporter/Chart.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f6f7836303c2..971253954c48 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,7 +10,7 @@ /charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f /charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio /charts/prometheus-cloudwatch-exporter/ @gianrubio @torstenwalter @asherf -/charts/prometheus-consul-exporter @timm088 +/charts/prometheus-consul-exporter @timm088 @gkarthiks /charts/prometheus-couchdb-exporter @gkarthiks /charts/prometheus-mongodb-exporter @steven-sheehy /charts/prometheus-mysql-exporter @juanchimienti @monotek diff --git a/charts/prometheus-consul-exporter/Chart.yaml b/charts/prometheus-consul-exporter/Chart.yaml index 37d56a830a1a..310be51645bb 100644 --- a/charts/prometheus-consul-exporter/Chart.yaml +++ b/charts/prometheus-consul-exporter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "0.4.0" description: A Helm chart for the Prometheus Consul Exporter name: prometheus-consul-exporter -version: 0.1.6 +version: 0.1.7 keywords: - metrics - consul @@ -11,3 +11,5 @@ home: https://github.com/prometheus/consul_exporter maintainers: - name: timm088 email: 8890118+timm088@users.noreply.github.com + - name: gkarthiks + email: github.gkarthiks@gmail.com From 7cdaa41872e76f18d51898e5f707775c6ae86dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Mon, 7 Sep 2020 16:47:04 +0200 Subject: [PATCH 48/55] [prometheus] - adds monotek to prometheus maintainers (#55) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added monotek to prometheus maintainers Signed-off-by: André Bauer * rearrange the new codeowner for prometheus chart Signed-off-by: Xtigyro Co-authored-by: Miroslav Hadzhiev Signed-off-by: Scott Rigby --- .github/CODEOWNERS | 2 +- charts/prometheus/Chart.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 971253954c48..7c41e903d11b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,7 +6,7 @@ # Unless a later match takes precedence, they will be requested for review when someone opens a pull request. * @prometheus-community/helm-charts-admins -/charts/prometheus/ @gianrubio @zanhsieh @Xtigyro +/charts/prometheus/ @gianrubio @zanhsieh @Xtigyro @monotek /charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f /charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio /charts/prometheus-cloudwatch-exporter/ @gianrubio @torstenwalter @asherf diff --git a/charts/prometheus/Chart.yaml b/charts/prometheus/Chart.yaml index 4c5ddb5fd2bf..5ac3db4d7ff3 100644 --- a/charts/prometheus/Chart.yaml +++ b/charts/prometheus/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prometheus -version: 11.13.0 +version: 11.13.1 appVersion: 2.20.1 description: Prometheus is a monitoring system and time series database. home: https://prometheus.io/ @@ -18,5 +18,7 @@ maintainers: email: zanhsieh@gmail.com - name: Xtigyro email: miroslav.hadzhiev@gmail.com + - name: monotek + email: monotek23@gmail.com engine: gotpl tillerVersion: ">=2.8.0" From 7488d272bc6f697225e44468c84a66e5cb58cba5 Mon Sep 17 00:00:00 2001 From: Jorrit Salverda Date: Mon, 7 Sep 2020 17:42:11 +0200 Subject: [PATCH 49/55] [prometheus-blackbox-exporter] fix linting failure due to deprecated api version (see issue #56) (#57) * fix linting failure due to deprecated api version (see issue #56) Signed-off-by: Jorrit Salverda * use rbac.apiVersion template to set correct apiVersion for role and rolebinding Signed-off-by: Jorrit Salverda Signed-off-by: Scott Rigby --- charts/prometheus-blackbox-exporter/Chart.yaml | 2 +- .../templates/_helpers.tpl | 11 +++++++++++ .../prometheus-blackbox-exporter/templates/role.yaml | 2 +- .../templates/rolebinding.yaml | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/charts/prometheus-blackbox-exporter/Chart.yaml b/charts/prometheus-blackbox-exporter/Chart.yaml index 200035423ee1..5f5477500251 100644 --- a/charts/prometheus-blackbox-exporter/Chart.yaml +++ b/charts/prometheus-blackbox-exporter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Prometheus Blackbox Exporter name: prometheus-blackbox-exporter -version: 4.3.1 +version: 4.3.2 appVersion: 0.16.0 home: https://github.com/prometheus/blackbox_exporter sources: diff --git a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl index c95a3b40d8fb..3fef6cfa82e4 100644 --- a/charts/prometheus-blackbox-exporter/templates/_helpers.tpl +++ b/charts/prometheus-blackbox-exporter/templates/_helpers.tpl @@ -40,3 +40,14 @@ Create the name of the service account to use {{ default "default" .Values.serviceAccount.name }} {{- end -}} {{- end -}} + +{{/* +Return the appropriate apiVersion for rbac. +*/}} +{{- define "rbac.apiVersion" -}} +{{- if .Capabilities.APIVersions.Has "rbac.authorization.k8s.io/v1" }} +{{- print "rbac.authorization.k8s.io/v1" -}} +{{- else -}} +{{- print "rbac.authorization.k8s.io/v1beta1" -}} +{{- end -}} +{{- end -}} \ No newline at end of file diff --git a/charts/prometheus-blackbox-exporter/templates/role.yaml b/charts/prometheus-blackbox-exporter/templates/role.yaml index c8d84f658323..aede83a5f67c 100644 --- a/charts/prometheus-blackbox-exporter/templates/role.yaml +++ b/charts/prometheus-blackbox-exporter/templates/role.yaml @@ -1,5 +1,5 @@ {{- if .Values.pspEnabled }} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: {{ template "rbac.apiVersion" . }} kind: Role metadata: labels: diff --git a/charts/prometheus-blackbox-exporter/templates/rolebinding.yaml b/charts/prometheus-blackbox-exporter/templates/rolebinding.yaml index 608c4d97afe6..d36899be7181 100644 --- a/charts/prometheus-blackbox-exporter/templates/rolebinding.yaml +++ b/charts/prometheus-blackbox-exporter/templates/rolebinding.yaml @@ -1,5 +1,5 @@ {{- if .Values.pspEnabled }} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: {{ template "rbac.apiVersion" . }} kind: RoleBinding metadata: labels: From 317d2aa85f56afe285ce5da6f03f46aec3eba71f Mon Sep 17 00:00:00 2001 From: Torsten Walter Date: Mon, 7 Sep 2020 19:05:09 +0200 Subject: [PATCH 50/55] formatted GitHub templates and made minor adjustments (#59) * formatted GitHub templates and made minor adjustments Signed-off-by: Torsten Walter Signed-off-by: Scott Rigby --- .github/ISSUE_TEMPLATE/bug_report.md | 41 +++++++++++++++++++++-- .github/ISSUE_TEMPLATE/feature_request.md | 12 +++++-- .github/PULL_REQUEST_TEMPLATE.md | 20 +++++++---- 3 files changed, 60 insertions(+), 13 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6ca70900c442..e07be892c1cd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,11 +7,17 @@ assignees: '' --- - **Describe the bug** @@ -19,8 +25,22 @@ A clear and concise description of what the bug is. **Version of Helm and Kubernetes**: +Helm Version: + +```console +$ helm version +please put the output of it here +``` + +Kubernetes Version: + +```console +$ kubectl version +please put the output of it here +``` **Which chart**: +**Which version of the chart**: **What happened**: @@ -31,5 +51,20 @@ A clear and concise description of what the bug is. **How to reproduce it** (as minimally and precisely as possible): +<~-- +This could be something like: + +values.yaml (only put values which differ from the defaults) + +``` +key: value +``` + +``` +helm install my-release prometheus-community/name-of-chart --version version --values values.yaml +``` + +--> + **Anything else we need to know**: diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 01ae8cf6376c..86a820c7b706 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -7,11 +7,17 @@ assignees: '' --- - **Is your feature request related to a problem? Please describe.** @@ -24,4 +30,4 @@ A clear and concise description of what you want to happen. A clear and concise description of any alternative solutions or features you've considered. **Additional context** -Add any other context or screenshots about the feature request here. \ No newline at end of file +Add any other context or screenshots about the feature request here. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index faf686636e31..572496cc7a55 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,6 @@ -#### Is this a new chart - #### What this PR does / why we need it: #### Which issue this PR fixes @@ -28,7 +34,7 @@ Please make sure you test your changes before you push them. Once pushed, GitHub #### Special notes for your reviewer: #### Checklist -[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.] + - [ ] [DCO](https://github.com/prometheus-community/helm-charts/blob/main/CONTRIBUTING.md#sign-off-your-work) signed - [ ] Chart Version bumped -- [ ] Title of the PR starts with chart name (e.g. `[prometheus-couchdb-exporter]`) \ No newline at end of file +- [ ] Title of the PR starts with chart name (e.g. `[prometheus-couchdb-exporter]`) From 6146874cb4fc34a38548c67fe9ad3bdd55d06d44 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Mon, 7 Sep 2020 22:31:47 +0300 Subject: [PATCH 51/55] [kube-prometheus-stack] Fix Chart Name and Rm Whitespaces in "NOTES.txt" (#60) * fix chart name in NOTES.txt Signed-off-by: Xtigyro * rm whitespaces in NOTES.txt Signed-off-by: Xtigyro Signed-off-by: Scott Rigby --- charts/kube-prometheus-stack/templates/NOTES.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/charts/kube-prometheus-stack/templates/NOTES.txt b/charts/kube-prometheus-stack/templates/NOTES.txt index 51e94f50641e..371f3ae39882 100644 --- a/charts/kube-prometheus-stack/templates/NOTES.txt +++ b/charts/kube-prometheus-stack/templates/NOTES.txt @@ -1,5 +1,4 @@ -kube-prometheus has been installed. Check its status by running: +{{ $.Chart.Name }} has been installed. Check its status by running: kubectl --namespace {{ template "kube-prometheus-stack.namespace" . }} get pods -l "release={{ $.Release.Name }}" -Visit https://github.com/prometheus-operator/kube-prometheus for instructions on how -to create & configure Alertmanager and Prometheus instances using the Operator. \ No newline at end of file +Visit https://github.com/prometheus-operator/kube-prometheus for instructions on how to create & configure Alertmanager and Prometheus instances using the Operator. From e729fdb66b28b37300f44ab53c754e7bb56ccd67 Mon Sep 17 00:00:00 2001 From: Karthikeyan Govindaraj <30545166+gkarthiks@users.noreply.github.com> Date: Tue, 8 Sep 2020 23:04:13 +0530 Subject: [PATCH 52/55] feat: replacing grafana rom stable to its own repo + additional chart maintainer (#53) * feat: replacing grafana own repo Signed-off-by: gkarthiks * fix: trailing white spaces Signed-off-by: gkarthiks * fix: reverting the grafana values Signed-off-by: gkarthiks * adding grafana repo for actions Signed-off-by: gkarthiks * add: adding grafana repo in linter Signed-off-by: gkarthiks * doc(lint): making doc stmt as single stmt Signed-off-by: gkarthiks * revert: reverting the old README statement Signed-off-by: gkarthiks * feat: adding gkarthiks to codeowners against kube-prometheus-stack Signed-off-by: gkarthiks Signed-off-by: Karthikeyan Govindaraj <30545166+gkarthiks@users.noreply.github.com> --- .github/CODEOWNERS | 1 + .github/workflows/release.yaml | 2 +- charts/kube-prometheus-stack/Chart.yaml | 4 +++- charts/kube-prometheus-stack/README.md | 4 ++-- charts/kube-prometheus-stack/requirements.yaml | 4 ++-- charts/kube-prometheus-stack/values.yaml | 2 +- ct.yaml | 1 + 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7c41e903d11b..34c280fd3f6c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,6 +6,7 @@ # Unless a later match takes precedence, they will be requested for review when someone opens a pull request. * @prometheus-community/helm-charts-admins +/charts/kube-prometheus-stack/ @vsliouniaev @bismarck @gianrubio @gkarthiks /charts/prometheus/ @gianrubio @zanhsieh @Xtigyro @monotek /charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f /charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8b099d1d6fe1..68f2512aeaf0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -30,7 +30,7 @@ jobs: - name: Add dependency chart repos run: | helm repo add stable https://kubernetes-charts.storage.googleapis.com/ - helm repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com/ + helm repo add grafana https://grafana.github.io/helm-charts - name: Run chart-releaser uses: helm/chart-releaser-action@v1.0.0 diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index ea40d09fc2d4..f58c91f7f4a1 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -7,11 +7,13 @@ maintainers: - name: bismarck - name: gianrubio email: gianrubio@gmail.com + - name: gkarthiks + email: github.gkarthiks@gmail.com name: kube-prometheus-stack sources: - https://github.com/prometheus-operator/kube-prometheus - https://github.com/prometheus-operator/prometheus-operator -version: 9.3.2 +version: 9.3.3 appVersion: 0.38.1 tillerVersion: ">=2.12.0" home: https://github.com/prometheus-operator/kube-prometheus diff --git a/charts/kube-prometheus-stack/README.md b/charts/kube-prometheus-stack/README.md index 4819336e91db..2c4d6cca507f 100644 --- a/charts/kube-prometheus-stack/README.md +++ b/charts/kube-prometheus-stack/README.md @@ -41,7 +41,7 @@ By default this chart installs additional, dependent charts: - [stable/kube-state-metrics](https://github.com/helm/charts/tree/master/stable/kube-state-metrics) - [stable/prometheus-node-exporter](https://github.com/prometheus-community/helm-charts/tree/main/prometheus-node-exporter) -- [stable/grafana](https://github.com/helm/charts/tree/master/stable/grafana) +- [grafana/grafana](https://github.com/grafana/helm-charts/tree/main/charts/grafana) To disable dependencies during installation, see [multiple releases](#multiple-releases) below. @@ -192,7 +192,7 @@ For more in-depth documentation of configuration options meanings, please see - [Prometheus Operator](https://github.com/prometheus-operator/prometheus-operator) - [Prometheus](https://prometheus.io/docs/introduction/overview/) -- [Grafana](https://github.com/helm/charts/tree/master/stable/grafana#grafana-helm-chart) +- [Grafana](https://github.com/grafana/helm-charts/tree/main/charts/grafana#grafana-helm-chart) ## prometheus.io/scrape diff --git a/charts/kube-prometheus-stack/requirements.yaml b/charts/kube-prometheus-stack/requirements.yaml index 24c7fda60fc9..817440308cbd 100644 --- a/charts/kube-prometheus-stack/requirements.yaml +++ b/charts/kube-prometheus-stack/requirements.yaml @@ -11,6 +11,6 @@ dependencies: condition: nodeExporter.enabled - name: grafana - version: "5.3.*" - repository: https://kubernetes-charts.storage.googleapis.com/ + version: "5.6.*" + repository: https://grafana.github.io/helm-charts condition: grafana.enabled diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml index 7ea979ebe675..b67195d02335 100644 --- a/charts/kube-prometheus-stack/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -481,7 +481,7 @@ alertmanager: portName: "web" -## Using default values from https://github.com/helm/charts/blob/master/stable/grafana/values.yaml +## Using default values from https://github.com/grafana/helm-charts/blob/main/charts/grafana/values.yaml ## grafana: enabled: true diff --git a/ct.yaml b/ct.yaml index 599add55274b..7a0ea778e324 100644 --- a/ct.yaml +++ b/ct.yaml @@ -6,6 +6,7 @@ chart-dirs: chart-repos: - stable=https://kubernetes-charts.storage.googleapis.com/ - prometheus-community=https://prometheus-community.github.io/helm-charts + - grafana=https://grafana.github.io/helm-charts helm-extra-args: --timeout 600s excluded-charts: # If not running on GCE, will error: "Failed to get GCE config" From c6a2766cb645778d7a6277a126efce0c5d26fd9e Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Tue, 8 Sep 2020 22:59:47 -0400 Subject: [PATCH 53/55] Add scottrigby as co-maintainer of kube-prometheus-stack Signed-off-by: Scott Rigby --- .github/CODEOWNERS | 2 +- charts/kube-prometheus-stack/Chart.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 34c280fd3f6c..b28b969845b0 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,7 +6,7 @@ # Unless a later match takes precedence, they will be requested for review when someone opens a pull request. * @prometheus-community/helm-charts-admins -/charts/kube-prometheus-stack/ @vsliouniaev @bismarck @gianrubio @gkarthiks +/charts/kube-prometheus-stack/ @vsliouniaev @bismarck @gianrubio @gkarthiks @scottrigby /charts/prometheus/ @gianrubio @zanhsieh @Xtigyro @monotek /charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f /charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index f58c91f7f4a1..06253f5c4c73 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -9,6 +9,8 @@ maintainers: email: gianrubio@gmail.com - name: gkarthiks email: github.gkarthiks@gmail.com + - name: scottrigby + email: scott@r6by.com name: kube-prometheus-stack sources: - https://github.com/prometheus-operator/kube-prometheus From dd5a5eef6f082a90af68a8622b81b29f4be84686 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Wed, 9 Sep 2020 16:16:07 +0300 Subject: [PATCH 54/55] add xtigyro as maintainer for kube-prometheus-stack (#73) Signed-off-by: Miroslav Hadzhiev --- .github/CODEOWNERS | 2 +- charts/kube-prometheus-stack/Chart.yaml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9c3920393785..eacca1c26078 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -6,7 +6,7 @@ # Unless a later match takes precedence, they will be requested for review when someone opens a pull request. * @prometheus-community/helm-charts-admins -/charts/kube-prometheus-stack/ @vsliouniaev @bismarck @gianrubio @gkarthiks @scottrigby +/charts/kube-prometheus-stack/ @vsliouniaev @bismarck @gianrubio @gkarthiks @scottrigby @Xtigyro /charts/prometheus/ @gianrubio @zanhsieh @Xtigyro @monotek @naseemkullah /charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f /charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio @monotek @rsotnychenko diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml index 06253f5c4c73..c17336fe0dc3 100644 --- a/charts/kube-prometheus-stack/Chart.yaml +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -11,11 +11,13 @@ maintainers: email: github.gkarthiks@gmail.com - name: scottrigby email: scott@r6by.com + - name: Xtigyro + email: miroslav.hadzhiev@gmail.com name: kube-prometheus-stack sources: - https://github.com/prometheus-operator/kube-prometheus - https://github.com/prometheus-operator/prometheus-operator -version: 9.3.3 +version: 9.3.4 appVersion: 0.38.1 tillerVersion: ">=2.12.0" home: https://github.com/prometheus-operator/kube-prometheus From bdb6827e8a6a49d704c6373d93026fe2cc889685 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Wed, 9 Sep 2020 09:56:58 -0400 Subject: [PATCH 55/55] Revert header for simplicity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cédric de Saint Martin Signed-off-by: Scott Rigby --- charts/kube-prometheus-stack/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/kube-prometheus-stack/README.md b/charts/kube-prometheus-stack/README.md index 2c4d6cca507f..741339e04109 100644 --- a/charts/kube-prometheus-stack/README.md +++ b/charts/kube-prometheus-stack/README.md @@ -81,7 +81,7 @@ $ helm upgrade [RELEASE_NAME] prometheus-community/kube-prometheus-stack _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ -### Migrating from stable/prometheus-operator chart +### Upgrading an existing Release to a new major version A major chart version change (like v1.2.3 -> v2.0.0) indicates that there is an incompatible breaking change needing manual actions.