From 0af6ff779d50a787d494e78c1f773e48bbbb7fb9 Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Wed, 9 Sep 2020 11:51:50 -0400 Subject: [PATCH] [prometheus-operator] Rename to kube-prometheus-stack (#1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 * First attempt at data change of prometheus-operator to kube-prometheus Signed-off-by: Scott Rigby * Helm GH Action files as-is from https://github.com/helm/charts-repo-actions-demo Signed-off-by: Scott Rigby * Bump chart-testing action to v1.0.0. See https://github.com/helm/charts-repo-actions-demo/pull/20 Signed-off-by: Scott Rigby * Changes to chart testing config file for this repo Signed-off-by: Scott Rigby * 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 * Test actions with version bump to prometheus chart Signed-off-by: Scott Rigby * Bump chart-releaser-action and kind-action to v1.0.0 Signed-off-by: Scott Rigby * Release from main not master branch Signed-off-by: Scott Rigby * Revert "Test actions with version bump to prometheus chart" This reverts commit 81c50e5a7ab6322d6755ec853de0d9babc36ae67. Signed-off-by: Scott Rigby * Allow requirements lock files Signed-off-by: Scott Rigby * Initial CODEOWNERS file (#18) Signed-off-by: Scott Rigby * Prep initial charts indexing (#14) * [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 * Add kube-prometheus chart maintainers to CODEOWNERS after merging main Signed-off-by: Scott Rigby * Un-deprecate chart within renaming to kube-prometheus PR Signed-off-by: Scott Rigby * 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 * Remove stray CODEOWNERS rule for charts/prometheus-operator/ Signed-off-by: Scott Rigby * Fix typo Signed-off-by: Scott Rigby * Update charts/kube-prometheus/hack/README.md Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby * Update charts/kube-prometheus/hack/README.md Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby * Update charts/kube-prometheus/hack/README.md Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby * Update charts/kube-prometheus/templates/prometheus/rules/prometheus-operator.yaml Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby * Update charts/kube-prometheus/templates/prometheus/rules/node.rules.yaml Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby * Update charts/kube-prometheus/templates/prometheus/rules/node-network.yaml Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby * Update charts/kube-prometheus/templates/prometheus/rules/node-time.yaml Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby * Update charts/kube-prometheus/templates/prometheus/rules/kubernetes-system.yaml Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby * Update charts/kube-prometheus/README.md Signed-off-by: Scott Rigby Co-authored-by: Manuel Rüger Signed-off-by: Scott Rigby * 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 * Fix markdownlint Signed-off-by: Scott Rigby * Update kube-prometheus per new README template. See #14 Signed-off-by: Scott Rigby * 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 * Non-functional: update commented links to CRD sources Co-authored-by: Quentin Bisson Signed-off-by: Scott Rigby * 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 * Add configuration for Stale GitHub app (#27) Signed-off-by: Scott Rigby * 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 * Rename chart dir Signed-off-by: Scott Rigby * Update CODEOWNERS for new chart dir name Signed-off-by: Scott Rigby * 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 * Chart testing needs this repo info to test chart dependencies in the same repo Signed-off-by: Scott Rigby * 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 * Improve README for main and gh pages (#43) Signed-off-by: Scott Rigby * [prometheus] unify labels and annotations across all deploymens and statefulsets (#45) Signed-off-by: Ondrej Homolka Signed-off-by: Scott Rigby * [prometheus-redis-exporter] Add zanhsieh as maintainer (#46) Signed-off-by: zanhsieh Signed-off-by: Scott Rigby * added link to github to readme (#51) Signed-off-by: André Bauer Signed-off-by: Scott Rigby * 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 * 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 * [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 * [prometheus] - adds monotek to prometheus maintainers (#55) * 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 * [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 * 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 * [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 * 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> * Add scottrigby as co-maintainer of kube-prometheus-stack Signed-off-by: Scott Rigby * add xtigyro as maintainer for kube-prometheus-stack (#73) Signed-off-by: Miroslav Hadzhiev * Revert header for simplicity Co-authored-by: Cédric de Saint Martin Signed-off-by: Scott Rigby Co-authored-by: André Bauer Co-authored-by: Manuel Rüger Co-authored-by: Torsten Walter Co-authored-by: hmlkao Co-authored-by: zanhsieh Co-authored-by: Karthikeyan Govindaraj <30545166+gkarthiks@users.noreply.github.com> Co-authored-by: Miroslav Hadzhiev Co-authored-by: Jorrit Salverda Signed-off-by: Scott Rigby Signed-off-by: André Bauer --- .github/CODEOWNERS | 2 +- .github/workflows/release.yaml | 2 +- .../.helmignore | 2 +- .../CONTRIBUTING.md | 6 +- charts/kube-prometheus-stack/Chart.yaml | 26 + charts/kube-prometheus-stack/README.md | 312 +++++++ .../ci/01-provision-crds-values.yaml | 0 .../ci/02-test-without-crds-values.yaml | 0 .../crds/crd-alertmanager.yaml | 2 +- .../crds/crd-podmonitor.yaml | 2 +- .../crds/crd-prometheus.yaml | 2 +- .../crds/crd-prometheusrules.yaml | 2 +- .../crds/crd-servicemonitor.yaml | 2 +- .../crds/crd-thanosrulers.yaml | 2 +- .../hack/README.md | 16 +- .../hack/minikube/README.md | 4 +- .../hack/minikube/cmd.sh | 6 +- .../hack/minikube/values.yaml | 0 .../hack/requirements.txt | 0 .../hack/sync_grafana_dashboards.py | 14 +- .../hack/sync_prometheus_rules.py | 22 +- .../requirements.yaml | 8 +- .../kube-prometheus-stack/templates/NOTES.txt | 4 + .../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 | 18 + .../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 | 12 +- .../dashboards-1.14/cluster-total.yaml | 12 +- .../dashboards-1.14/controller-manager.yaml | 12 +- .../grafana/dashboards-1.14/etcd.yaml | 10 +- .../grafana/dashboards-1.14/k8s-coredns.yaml | 8 +- .../k8s-resources-cluster.yaml | 12 +- .../k8s-resources-namespace.yaml | 12 +- .../dashboards-1.14/k8s-resources-node.yaml | 12 +- .../dashboards-1.14/k8s-resources-pod.yaml | 12 +- .../k8s-resources-workload.yaml | 12 +- .../k8s-resources-workloads-namespace.yaml | 12 +- .../grafana/dashboards-1.14/kubelet.yaml | 12 +- .../dashboards-1.14/namespace-by-pod.yaml | 12 +- .../namespace-by-workload.yaml | 12 +- .../node-cluster-rsrc-use.yaml | 12 +- .../dashboards-1.14/node-rsrc-use.yaml | 12 +- .../grafana/dashboards-1.14/nodes.yaml | 12 +- .../persistentvolumesusage.yaml | 12 +- .../grafana/dashboards-1.14/pod-total.yaml | 12 +- .../prometheus-remote-write.yaml | 12 +- .../grafana/dashboards-1.14/prometheus.yaml | 12 +- .../grafana/dashboards-1.14/proxy.yaml | 12 +- .../grafana/dashboards-1.14/scheduler.yaml | 12 +- .../grafana/dashboards-1.14/statefulset.yaml | 12 +- .../dashboards-1.14/workload-total.yaml | 12 +- .../templates/grafana/dashboards/etcd.yaml | 10 +- .../dashboards/k8s-cluster-rsrc-use.yaml | 12 +- .../grafana/dashboards/k8s-node-rsrc-use.yaml | 12 +- .../dashboards/k8s-resources-cluster.yaml | 12 +- .../dashboards/k8s-resources-namespace.yaml | 12 +- .../grafana/dashboards/k8s-resources-pod.yaml | 12 +- .../dashboards/k8s-resources-workload.yaml | 12 +- .../k8s-resources-workloads-namespace.yaml | 12 +- .../templates/grafana/dashboards/nodes.yaml | 12 +- .../dashboards/persistentvolumesusage.yaml | 12 +- .../templates/grafana/dashboards/pods.yaml | 12 +- .../grafana/dashboards/statefulset.yaml | 12 +- .../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 | 17 + .../templates/prometheus-operator/crds.yaml | 0 .../prometheus-operator/deployment.yaml | 24 +- .../prometheus-operator/psp-clusterrole.yaml | 8 +- .../psp-clusterrolebinding.yaml | 17 + .../templates/prometheus-operator/psp.yaml | 6 +- .../prometheus-operator/service.yaml | 10 +- .../prometheus-operator/serviceaccount.yaml | 12 + .../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 | 18 + .../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 | 18 + .../templates/prometheus/psp.yaml | 6 +- .../rules-1.14/alertmanager.rules.yaml | 16 +- .../templates/prometheus/rules-1.14/etcd.yaml | 10 +- .../prometheus/rules-1.14/general.rules.yaml | 12 +- .../prometheus/rules-1.14/k8s.rules.yaml | 12 +- .../kube-apiserver-availability.rules.yaml | 12 +- .../rules-1.14/kube-apiserver-slos.yaml | 12 +- .../rules-1.14/kube-apiserver.rules.yaml | 12 +- .../kube-prometheus-general.rules.yaml | 12 +- .../kube-prometheus-node-recording.rules.yaml | 12 +- .../rules-1.14/kube-scheduler.rules.yaml | 12 +- .../rules-1.14/kube-state-metrics.yaml | 12 +- .../prometheus/rules-1.14/kubelet.rules.yaml | 12 +- .../rules-1.14/kubernetes-apps.yaml | 12 +- .../rules-1.14/kubernetes-resources.yaml | 12 +- .../rules-1.14/kubernetes-storage.yaml | 12 +- .../kubernetes-system-apiserver.yaml | 12 +- .../kubernetes-system-controller-manager.yaml | 12 +- .../rules-1.14/kubernetes-system-kubelet.yaml | 12 +- .../kubernetes-system-scheduler.yaml | 12 +- .../rules-1.14/kubernetes-system.yaml | 12 +- .../rules-1.14/node-exporter.rules.yaml | 12 +- .../prometheus/rules-1.14/node-exporter.yaml | 12 +- .../prometheus/rules-1.14/node-network.yaml | 12 +- .../prometheus/rules-1.14/node.rules.yaml | 12 +- .../rules-1.14/prometheus-operator.yaml | 16 +- .../prometheus/rules-1.14/prometheus.yaml | 16 +- .../prometheus/rules/alertmanager.rules.yaml | 18 +- .../templates/prometheus/rules/etcd.yaml | 10 +- .../prometheus/rules/general.rules.yaml | 12 +- .../templates/prometheus/rules/k8s.rules.yaml | 12 +- .../rules/kube-apiserver.rules.yaml | 12 +- .../kube-prometheus-node-alerting.rules.yaml | 12 +- .../kube-prometheus-node-recording.rules.yaml | 12 +- .../rules/kube-scheduler.rules.yaml | 12 +- .../prometheus/rules/kubernetes-absent.yaml | 20 +- .../prometheus/rules/kubernetes-apps.yaml | 12 +- .../rules/kubernetes-resources.yaml | 12 +- .../prometheus/rules/kubernetes-storage.yaml | 12 +- .../prometheus/rules/kubernetes-system.yaml | 14 +- .../prometheus/rules/node-network.yaml | 14 +- .../templates/prometheus/rules/node-time.yaml | 14 +- .../prometheus/rules/node.rules.yaml | 14 +- .../prometheus/rules/prometheus-operator.yaml | 18 +- .../prometheus/rules/prometheus.rules.yaml | 16 +- .../templates/prometheus/service.yaml | 10 +- .../templates/prometheus/serviceaccount.yaml | 8 +- .../templates/prometheus/servicemonitor.yaml | 12 +- .../templates/prometheus/servicemonitors.yaml | 6 +- .../prometheus/serviceperreplica.yaml | 16 +- .../values.yaml | 42 +- charts/prometheus-operator/Chart.yaml | 18 - charts/prometheus-operator/OWNERS | 8 - charts/prometheus-operator/README.md | 763 ------------------ charts/prometheus-operator/requirements.lock | 12 - .../prometheus-operator/templates/NOTES.txt | 9 - .../alertmanager/psp-rolebinding.yaml | 18 - .../clusterrolebinding.yaml | 17 - .../psp-clusterrolebinding.yaml | 17 - .../prometheus-operator/serviceaccount.yaml | 12 - .../prometheus/clusterrolebinding.yaml | 18 - .../prometheus/psp-clusterrolebinding.yaml | 18 - ct.yaml | 2 + 194 files changed, 1380 insertions(+), 1842 deletions(-) rename charts/{prometheus-operator => kube-prometheus-stack}/.helmignore (93%) rename charts/{prometheus-operator => kube-prometheus-stack}/CONTRIBUTING.md (84%) create mode 100644 charts/kube-prometheus-stack/Chart.yaml create mode 100644 charts/kube-prometheus-stack/README.md rename charts/{prometheus-operator => kube-prometheus-stack}/ci/01-provision-crds-values.yaml (100%) rename charts/{prometheus-operator => kube-prometheus-stack}/ci/02-test-without-crds-values.yaml (100%) rename charts/{prometheus-operator => kube-prometheus-stack}/crds/crd-alertmanager.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/crds/crd-podmonitor.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/crds/crd-prometheus.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/crds/crd-prometheusrules.yaml (95%) rename charts/{prometheus-operator => kube-prometheus-stack}/crds/crd-servicemonitor.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/crds/crd-thanosrulers.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/hack/README.md (64%) rename charts/{prometheus-operator => kube-prometheus-stack}/hack/minikube/README.md (83%) rename charts/{prometheus-operator => kube-prometheus-stack}/hack/minikube/cmd.sh (93%) rename charts/{prometheus-operator => kube-prometheus-stack}/hack/minikube/values.yaml (100%) rename charts/{prometheus-operator => kube-prometheus-stack}/hack/requirements.txt (100%) rename charts/{prometheus-operator => kube-prometheus-stack}/hack/sync_grafana_dashboards.py (89%) rename charts/{prometheus-operator => kube-prometheus-stack}/hack/sync_prometheus_rules.py (92%) rename charts/{prometheus-operator => kube-prometheus-stack}/requirements.yaml (62%) create mode 100644 charts/kube-prometheus-stack/templates/NOTES.txt rename charts/{prometheus-operator => kube-prometheus-stack}/templates/_helpers.tpl (65%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/alertmanager.yaml (87%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/ingress.yaml (84%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/ingressperreplica.yaml (75%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/podDisruptionBudget.yaml (61%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/psp-role.yaml (60%) create mode 100644 charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/psp.yaml (86%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/secret.yaml (70%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/service.yaml (81%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/serviceaccount.yaml (58%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/servicemonitor.yaml (70%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/alertmanager/serviceperreplica.yaml (69%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/core-dns/service.yaml (72%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/core-dns/servicemonitor.yaml (72%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-api-server/servicemonitor.yaml (81%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-controller-manager/endpoints.yaml (67%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-controller-manager/service.yaml (75%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-controller-manager/servicemonitor.yaml (81%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-dns/service.yaml (78%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-dns/servicemonitor.yaml (81%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-etcd/endpoints.yaml (67%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-etcd/service.yaml (75%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-etcd/servicemonitor.yaml (83%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-proxy/endpoints.yaml (67%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-proxy/service.yaml (75%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-proxy/servicemonitor.yaml (75%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-scheduler/endpoints.yaml (67%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-scheduler/service.yaml (75%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-scheduler/servicemonitor.yaml (80%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kube-state-metrics/serviceMonitor.yaml (75%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/kubelet/servicemonitor.yaml (95%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/exporters/node-exporter/servicemonitor.yaml (78%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/configmap-dashboards.yaml (66%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/configmaps-datasources.yaml (60%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/apiserver.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/cluster-total.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/controller-manager.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/etcd.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-coredns.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-node.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/kubelet.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/namespace-by-pod.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/namespace-by-workload.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/node-cluster-rsrc-use.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/node-rsrc-use.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/nodes.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml (97%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/pod-total.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/prometheus.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/proxy.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/scheduler.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/statefulset.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards-1.14/workload-total.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/etcd.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/k8s-node-rsrc-use.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/k8s-resources-cluster.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/k8s-resources-namespace.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/k8s-resources-pod.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/k8s-resources-workload.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/nodes.yaml (99%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/persistentvolumesusage.yaml (97%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/pods.yaml (97%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/dashboards/statefulset.yaml (98%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/grafana/servicemonitor.yaml (72%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml (78%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml (56%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml (70%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml (74%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml (88%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml (65%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml (52%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml (63%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml (68%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml (69%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/cleanup-crds.yaml (75%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/clusterrole.yaml (86%) create mode 100644 charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/crds.yaml (100%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/deployment.yaml (87%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/psp-clusterrole.yaml (66%) create mode 100644 charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/psp.yaml (87%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/service.yaml (83%) create mode 100644 charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus-operator/servicemonitor.yaml (68%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/additionalAlertRelabelConfigs.yaml (63%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/additionalAlertmanagerConfigs.yaml (64%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/additionalPrometheusRules.yaml (62%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/additionalScrapeConfigs.yaml (63%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/clusterrole.yaml (72%) create mode 100644 charts/kube-prometheus-stack/templates/prometheus/clusterrolebinding.yaml rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/ingress.yaml (84%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/ingressThanosSidecar.yaml (82%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/ingressperreplica.yaml (76%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/podDisruptionBudget.yaml (61%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/podmonitors.yaml (82%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/prometheus.yaml (90%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/psp-clusterrole.yaml (66%) create mode 100644 charts/kube-prometheus-stack/templates/prometheus/psp-clusterrolebinding.yaml rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/psp.yaml (88%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/alertmanager.rules.yaml (78%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/etcd.yaml (95%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/general.rules.yaml (78%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/k8s.rules.yaml (91%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-apiserver-availability.rules.yaml (94%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml (84%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml (96%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-prometheus-general.rules.yaml (66%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml (76%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml (87%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kube-state-metrics.yaml (81%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubelet.rules.yaml (79%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-apps.yaml (95%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-resources.yaml (89%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-storage.yaml (86%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml (86%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml (70%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml (89%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml (70%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/kubernetes-system.yaml (79%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/node-exporter.rules.yaml (86%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/node-exporter.yaml (95%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/node-network.yaml (71%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/node.rules.yaml (79%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/prometheus-operator.yaml (80%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules-1.14/prometheus.yaml (94%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/alertmanager.rules.yaml (74%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/etcd.yaml (95%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/general.rules.yaml (77%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/k8s.rules.yaml (87%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/kube-apiserver.rules.yaml (76%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml (75%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml (78%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/kube-scheduler.rules.yaml (87%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/kubernetes-absent.yaml (84%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/kubernetes-apps.yaml (94%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/kubernetes-resources.yaml (89%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/kubernetes-storage.yaml (85%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/kubernetes-system.yaml (93%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/node-network.yaml (79%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/node-time.yaml (69%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/node.rules.yaml (94%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/prometheus-operator.yaml (69%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/rules/prometheus.rules.yaml (89%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/service.yaml (83%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/serviceaccount.yaml (58%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/servicemonitor.yaml (77%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/servicemonitors.yaml (80%) rename charts/{prometheus-operator => kube-prometheus-stack}/templates/prometheus/serviceperreplica.yaml (69%) rename charts/{prometheus-operator => kube-prometheus-stack}/values.yaml (96%) delete mode 100644 charts/prometheus-operator/Chart.yaml delete mode 100644 charts/prometheus-operator/OWNERS delete mode 100644 charts/prometheus-operator/README.md delete mode 100644 charts/prometheus-operator/requirements.lock delete mode 100644 charts/prometheus-operator/templates/NOTES.txt delete mode 100644 charts/prometheus-operator/templates/alertmanager/psp-rolebinding.yaml delete mode 100644 charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml delete mode 100644 charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml delete mode 100644 charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml delete mode 100644 charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml delete mode 100644 charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c7030e619f83..eacca1c26078 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 @scottrigby @Xtigyro /charts/prometheus/ @gianrubio @zanhsieh @Xtigyro @monotek @naseemkullah /charts/prometheus-adapter/ @mattiasgees @steven-sheehy @hectorj2f /charts/prometheus-blackbox-exporter/ @desaintmartin @gianrubio @monotek @rsotnychenko @@ -16,7 +17,6 @@ /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 @zanhsieh /charts/prometheus-pushgateway @gianrubio @cstaud /charts/prometheus-rabbitmq-exporter @juanchimienti 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/prometheus-operator/.helmignore b/charts/kube-prometheus-stack/.helmignore similarity index 93% rename from charts/prometheus-operator/.helmignore rename to charts/kube-prometheus-stack/.helmignore index aba2fa8ce401..93bf1ec02c38 100644 --- a/charts/prometheus-operator/.helmignore +++ b/charts/kube-prometheus-stack/.helmignore @@ -23,4 +23,4 @@ OWNERS hack/ ci/ -prometheus-operator-*.tgz +kube-prometheus-*.tgz diff --git a/charts/prometheus-operator/CONTRIBUTING.md b/charts/kube-prometheus-stack/CONTRIBUTING.md similarity index 84% rename from charts/prometheus-operator/CONTRIBUTING.md rename to charts/kube-prometheus-stack/CONTRIBUTING.md index 44533af6e599..f6ce2a323528 100644 --- a/charts/prometheus-operator/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 `[stable/prometheus-operator]` +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 new file mode 100644 index 000000000000..c17336fe0dc3 --- /dev/null +++ b/charts/kube-prometheus-stack/Chart.yaml @@ -0,0 +1,26 @@ +apiVersion: v1 +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: + - name: vsliouniaev + - name: bismarck + - name: gianrubio + email: gianrubio@gmail.com + - name: gkarthiks + 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.4 +appVersion: 0.38.1 +tillerVersion: ">=2.12.0" +home: https://github.com/prometheus-operator/kube-prometheus +keywords: +- operator +- prometheus diff --git a/charts/kube-prometheus-stack/README.md b/charts/kube-prometheus-stack/README.md new file mode 100644 index 000000000000..741339e04109 --- /dev/null +++ b/charts/kube-prometheus-stack/README.md @@ -0,0 +1,312 @@ +# kube-prometheus-stack + +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 stack, 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)) + +## 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 +``` + +_See [helm repo](https://helm.sh/docs/helm/helm_repo/) for command documentation._ + +## Install Chart + +```console +# Helm 3 +$ helm install [RELEASE_NAME] prometheus-community/kube-prometheus-stack + +# Helm 2 +$ helm install --name [RELEASE_NAME] prometheus-community/kube-prometheus-stack +``` + +_See [configuration](#configuration) below._ + +_See [helm install](https://helm.sh/docs/helm/helm_install/) for command documentation._ + +## 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) +- [grafana/grafana](https://github.com/grafana/helm-charts/tree/main/charts/grafana) + +To disable dependencies during installation, see [multiple releases](#multiple-releases) below. + +_See [helm dependency](https://helm.sh/docs/helm/helm_dependency/) for command documentation._ + +## Uninstall Chart + +```console +# Helm 3 +$ helm uninstall [RELEASE_NAME] + +# Helm 2 +# helm delete --purge [RELEASE_NAME] +``` + +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: + +```console +kubectl delete crd prometheuses.monitoring.coreos.com +kubectl delete crd prometheusrules.monitoring.coreos.com +kubectl delete crd servicemonitors.monitoring.coreos.com +kubectl delete crd podmonitors.monitoring.coreos.com +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-stack +``` + +_See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) for command documentation._ + +### 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. + +### 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-stack --version 7.5.0 +``` + +Then upgrade to 8.x.x + +```sh +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` + +### 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-stack +``` + +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 + +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) + +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 +3. [Install](#install-chart) the chart, but disable the CRD provisioning by setting `prometheusOperator.createCustomResource` to `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 + +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/prometheus-operator/prometheus-operator) +- [Prometheus](https://prometheus.io/docs/introduction/overview/) +- [Grafana](https://github.com/grafana/helm-charts/tree/main/charts/grafana#grafana-helm-chart) + +## 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`. + +## 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. + +There is no simple and direct migration path between the charts as the changes are extensive and intended to make the chart easier to support. + +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/prometheus-operator/prometheus-operator/issues/592) and [here](https://github.com/helm/charts/pull/6765). + +### High-level overview of Changes + +#### Added dependencies + +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 +- 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 setting `prometheusOperator.createCustomResource` to `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: + name: pvc-prometheus-migration-prometheus-0 +spec: + accessModes: + - ReadWriteOnce + azureDisk: + cachingMode: None + diskName: pvc-prometheus-migration-prometheus-0 + diskURI: /subscriptions/f5125d82-2622-4c50-8d25-3f7ba3e9ac4b/resourceGroups/sample-migration-resource-group/providers/Microsoft.Compute/disks/pvc-prometheus-migration-prometheus-0 + fsType: "" + kind: Managed + readOnly: false + capacity: + storage: 1Gi + persistentVolumeReclaimPolicy: Delete + storageClassName: prometheus + volumeMode: Filesystem +``` + +```yaml +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + labels: + app: prometheus + prometheus: prometheus-migration-prometheus + name: prometheus-prometheus-migration-prometheus-db-prometheus-prometheus-migration-prometheus-0 + namespace: monitoring +spec: + accessModes: + - ReadWriteOnce + dataSource: null + resources: + requests: + storage: 1Gi + storageClassName: prometheus + volumeMode: Filesystem + volumeName: pvc-prometheus-migration-prometheus-0 +status: + accessModes: + - ReadWriteOnce + capacity: + storage: 1Gi +``` + +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 + +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. + +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: |- + apiVersion: kubeproxy.config.k8s.io/v1alpha1 + kind: KubeProxyConfiguration + # ... + # metricsBindAddress: 127.0.0.1:10249 + metricsBindAddress: 0.0.0.0:10249 + # ... + kubeconfig.conf: |- + # ... +kind: ConfigMap +metadata: + labels: + app: kube-proxy + name: kube-proxy + namespace: kube-system +``` diff --git a/charts/prometheus-operator/ci/01-provision-crds-values.yaml b/charts/kube-prometheus-stack/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-stack/ci/01-provision-crds-values.yaml diff --git a/charts/prometheus-operator/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/prometheus-operator/ci/02-test-without-crds-values.yaml rename to charts/kube-prometheus-stack/ci/02-test-without-crds-values.yaml diff --git a/charts/prometheus-operator/crds/crd-alertmanager.yaml b/charts/kube-prometheus-stack/crds/crd-alertmanager.yaml similarity index 99% rename from charts/prometheus-operator/crds/crd-alertmanager.yaml rename to charts/kube-prometheus-stack/crds/crd-alertmanager.yaml index cbf9fc27f9b2..0f79b366a28a 100644 --- a/charts/prometheus-operator/crds/crd-alertmanager.yaml +++ b/charts/kube-prometheus-stack/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/prometheus-operator/crds/crd-podmonitor.yaml b/charts/kube-prometheus-stack/crds/crd-podmonitor.yaml similarity index 98% rename from charts/prometheus-operator/crds/crd-podmonitor.yaml rename to charts/kube-prometheus-stack/crds/crd-podmonitor.yaml index ab2af4e7cb3a..4f2bc5791af6 100644 --- a/charts/prometheus-operator/crds/crd-podmonitor.yaml +++ b/charts/kube-prometheus-stack/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/prometheus-operator/crds/crd-prometheus.yaml b/charts/kube-prometheus-stack/crds/crd-prometheus.yaml similarity index 99% rename from charts/prometheus-operator/crds/crd-prometheus.yaml rename to charts/kube-prometheus-stack/crds/crd-prometheus.yaml index 3699396f1c85..858efa5af983 100644 --- a/charts/prometheus-operator/crds/crd-prometheus.yaml +++ b/charts/kube-prometheus-stack/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/prometheus-operator/crds/crd-prometheusrules.yaml b/charts/kube-prometheus-stack/crds/crd-prometheusrules.yaml similarity index 95% rename from charts/prometheus-operator/crds/crd-prometheusrules.yaml rename to charts/kube-prometheus-stack/crds/crd-prometheusrules.yaml index 3f5cb492399e..1383c098d270 100644 --- a/charts/prometheus-operator/crds/crd-prometheusrules.yaml +++ b/charts/kube-prometheus-stack/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/prometheus-operator/crds/crd-servicemonitor.yaml b/charts/kube-prometheus-stack/crds/crd-servicemonitor.yaml similarity index 99% rename from charts/prometheus-operator/crds/crd-servicemonitor.yaml rename to charts/kube-prometheus-stack/crds/crd-servicemonitor.yaml index e631c2c0901c..0af32cb5dd06 100644 --- a/charts/prometheus-operator/crds/crd-servicemonitor.yaml +++ b/charts/kube-prometheus-stack/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/prometheus-operator/crds/crd-thanosrulers.yaml b/charts/kube-prometheus-stack/crds/crd-thanosrulers.yaml similarity index 99% rename from charts/prometheus-operator/crds/crd-thanosrulers.yaml rename to charts/kube-prometheus-stack/crds/crd-thanosrulers.yaml index e7b935a99860..2e8f26a4c741 100644 --- a/charts/prometheus-operator/crds/crd-thanosrulers.yaml +++ b/charts/kube-prometheus-stack/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/prometheus-operator/hack/README.md b/charts/kube-prometheus-stack/hack/README.md similarity index 64% rename from charts/prometheus-operator/hack/README.md rename to charts/kube-prometheus-stack/hack/README.md index d383726d9bd3..53c3d6ea1e06 100644 --- a/charts/prometheus-operator/hack/README.md +++ b/charts/kube-prometheus-stack/hack/README.md @@ -1,4 +1,4 @@ -# prometheus-operator hacks +# kube-prometheus-stack hacks ## [sync_prometheus_rules.py](sync_prometheus_rules.py) @@ -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/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 [coreos/kube-prometheus](https://github.com/coreos/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 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/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 [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) @@ -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-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/prometheus-operator/hack/minikube/README.md b/charts/kube-prometheus-stack/hack/minikube/README.md similarity index 83% rename from charts/prometheus-operator/hack/minikube/README.md rename to charts/kube-prometheus-stack/hack/minikube/README.md index a5db53be6417..353967ede518 100644 --- a/charts/prometheus-operator/hack/minikube/README.md +++ b/charts/kube-prometheus-stack/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. diff --git a/charts/prometheus-operator/hack/minikube/cmd.sh b/charts/kube-prometheus-stack/hack/minikube/cmd.sh similarity index 93% rename from charts/prometheus-operator/hack/minikube/cmd.sh rename to charts/kube-prometheus-stack/hack/minikube/cmd.sh index e0dfe2cc0d74..2df3402a73e8 100755 --- a/charts/prometheus-operator/hack/minikube/cmd.sh +++ b/charts/kube-prometheus-stack/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-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 - prometheus-operator - install or upgrade the prometheus operator 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/prometheus-operator/hack/minikube/values.yaml b/charts/kube-prometheus-stack/hack/minikube/values.yaml similarity index 100% rename from charts/prometheus-operator/hack/minikube/values.yaml rename to charts/kube-prometheus-stack/hack/minikube/values.yaml diff --git a/charts/prometheus-operator/hack/requirements.txt b/charts/kube-prometheus-stack/hack/requirements.txt similarity index 100% rename from charts/prometheus-operator/hack/requirements.txt rename to charts/kube-prometheus-stack/hack/requirements.txt diff --git a/charts/prometheus-operator/hack/sync_grafana_dashboards.py b/charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py similarity index 89% rename from charts/prometheus-operator/hack/sync_grafana_dashboards.py rename to charts/kube-prometheus-stack/hack/sync_grafana_dashboards.py index d899963591dd..e88dbb070603 100755 --- a/charts/prometheus-operator/hack/sync_grafana_dashboards.py +++ b/charts/kube-prometheus-stack/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/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/coreos/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', @@ -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-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 "prometheus-operator.namespace" . }} - name: {{ printf "%%s-%%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: ''' diff --git a/charts/prometheus-operator/hack/sync_prometheus_rules.py b/charts/kube-prometheus-stack/hack/sync_prometheus_rules.py similarity index 92% rename from charts/prometheus-operator/hack/sync_prometheus_rules.py rename to charts/kube-prometheus-stack/hack/sync_prometheus_rules.py index b7c40df8bcbc..b7879d32e4cf 100755 --- a/charts/prometheus-operator/hack/sync_prometheus_rules.py +++ b/charts/kube-prometheus-stack/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/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/coreos/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' @@ -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-stack.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-stack.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-stack.fullname" .) "alertmanager" }}'}, 'namespace="monitoring"': { 'replacement': 'namespace="{{ $namespace }}"', - 'init': '{{- $namespace := printf "%s" (include "prometheus-operator.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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "%(name)s" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%%s-%%s" (include "kube-prometheus-stack.fullname" .) "%(name)s" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/requirements.yaml b/charts/kube-prometheus-stack/requirements.yaml similarity index 62% rename from charts/prometheus-operator/requirements.yaml rename to charts/kube-prometheus-stack/requirements.yaml index 7562db7b5c0a..817440308cbd 100644 --- a/charts/prometheus-operator/requirements.yaml +++ b/charts/kube-prometheus-stack/requirements.yaml @@ -6,11 +6,11 @@ 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 - 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/templates/NOTES.txt b/charts/kube-prometheus-stack/templates/NOTES.txt new file mode 100644 index 000000000000..371f3ae39882 --- /dev/null +++ b/charts/kube-prometheus-stack/templates/NOTES.txt @@ -0,0 +1,4 @@ +{{ $.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. diff --git a/charts/prometheus-operator/templates/_helpers.tpl b/charts/kube-prometheus-stack/templates/_helpers.tpl similarity index 65% rename from charts/prometheus-operator/templates/_helpers.tpl rename to charts/kube-prometheus-stack/templates/_helpers.tpl index a7c481de5842..8a3d1b76fca0 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.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 "prometheus-operator.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 "prometheus-operator.operator.fullname" -}} -{{- printf "%s-operator" (include "prometheus-operator.fullname" .) -}} +{{- define "kube-prometheus-stack.operator.fullname" -}} +{{- printf "%s-operator" (include "kube-prometheus-stack.fullname" .) -}} {{- end }} {{/* Fullname suffixed with prometheus */}} -{{- define "prometheus-operator.prometheus.fullname" -}} -{{- printf "%s-prometheus" (include "prometheus-operator.fullname" .) -}} +{{- define "kube-prometheus-stack.prometheus.fullname" -}} +{{- printf "%s-prometheus" (include "kube-prometheus-stack.fullname" .) -}} {{- end }} {{/* Fullname suffixed with alertmanager */}} -{{- define "prometheus-operator.alertmanager.fullname" -}} -{{- printf "%s-alertmanager" (include "prometheus-operator.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 "prometheus-operator.chartref" -}} +{{- define "kube-prometheus-stack.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-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 prometheus-operator service account to use */}} -{{- define "prometheus-operator.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 "prometheus-operator.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 "prometheus-operator.prometheus.serviceAccountName" -}} +{{- define "kube-prometheus-stack.prometheus.serviceAccountName" -}} {{- if .Values.prometheus.serviceAccount.create -}} - {{ default (include "prometheus-operator.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 "prometheus-operator.alertmanager.serviceAccountName" -}} +{{- define "kube-prometheus-stack.alertmanager.serviceAccountName" -}} {{- if .Values.alertmanager.serviceAccount.create -}} - {{ default (include "prometheus-operator.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 "prometheus-operator.namespace" -}} +{{- define "kube-prometheus-stack.namespace" -}} {{- if .Values.namespaceOverride -}} {{- .Values.namespaceOverride -}} {{- else -}} diff --git a/charts/prometheus-operator/templates/alertmanager/alertmanager.yaml b/charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml similarity index 87% rename from charts/prometheus-operator/templates/alertmanager/alertmanager.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/alertmanager.yaml index 7bc2465ce193..58d534f6bcc1 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.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 "prometheus-operator.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 "prometheus-operator.fullname" . }}-alertmanager.{{ template "prometheus-operator.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 "prometheus-operator.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 "prometheus-operator.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager {{- end }} {{- end }} {{- if .Values.alertmanager.alertmanagerSpec.tolerations }} diff --git a/charts/prometheus-operator/templates/alertmanager/ingress.yaml b/charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml similarity index 84% rename from charts/prometheus-operator/templates/alertmanager/ingress.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/ingress.yaml index 41bdcd03a5ea..9c5f57048437 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.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 "prometheus-operator.namespace" . }} + namespace: {{ template "kube-prometheus-stack.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-stack.name" . }}-alertmanager {{- if .Values.alertmanager.ingress.labels }} {{ toYaml .Values.alertmanager.ingress.labels | indent 4 }} {{- end }} -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: rules: {{- if .Values.alertmanager.ingress.hosts }} diff --git a/charts/prometheus-operator/templates/alertmanager/ingressperreplica.yaml b/charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml similarity index 75% rename from charts/prometheus-operator/templates/alertmanager/ingressperreplica.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/ingressperreplica.yaml index 7e08c42504cd..8342b2a8cad9 100644 --- a/charts/prometheus-operator/templates/alertmanager/ingressperreplica.yaml +++ b/charts/kube-prometheus-stack/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-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 "prometheus-operator.fullname" $ }}-alertmanager-{{ $i }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ include "kube-prometheus-stack.fullname" $ }}-alertmanager-{{ $i }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ include "prometheus-operator.name" $ }}-alertmanager -{{ include "prometheus-operator.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 "prometheus-operator.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/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml b/charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml similarity index 61% rename from charts/prometheus-operator/templates/alertmanager/podDisruptionBudget.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/podDisruptionBudget.yaml index 963b7c6ac28a..1dbe809cd2d5 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.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 "prometheus-operator.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager {{- end }} diff --git a/charts/prometheus-operator/templates/alertmanager/psp-role.yaml b/charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml similarity index 60% rename from charts/prometheus-operator/templates/alertmanager/psp-role.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/psp-role.yaml index c3f8b4b42f09..d64d1f8138ab 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.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 "prometheus-operator.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 new file mode 100644 index 000000000000..9248cc8dd3ab --- /dev/null +++ b/charts/kube-prometheus-stack/templates/alertmanager/psp-rolebinding.yaml @@ -0,0 +1,18 @@ +{{- if and .Values.alertmanager.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} + labels: + 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-stack.fullname" . }}-alertmanager +subjects: + - kind: ServiceAccount + name: {{ template "kube-prometheus-stack.alertmanager.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} +{{- end }} diff --git a/charts/prometheus-operator/templates/alertmanager/psp.yaml b/charts/kube-prometheus-stack/templates/alertmanager/psp.yaml similarity index 86% rename from charts/prometheus-operator/templates/alertmanager/psp.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/psp.yaml index 9726175abefa..6fa4450090db 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-alertmanager + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager + app: {{ template "kube-prometheus-stack.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-stack.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/prometheus-operator/templates/alertmanager/secret.yaml b/charts/kube-prometheus-stack/templates/alertmanager/secret.yaml similarity index 70% rename from charts/prometheus-operator/templates/alertmanager/secret.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/secret.yaml index a543bbf60d0e..43c4e20b203b 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.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/prometheus-operator/templates/alertmanager/service.yaml b/charts/kube-prometheus-stack/templates/alertmanager/service.yaml similarity index 81% rename from charts/prometheus-operator/templates/alertmanager/service.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/service.yaml index 8324e3b662cb..f1a63c2e3c41 100644 --- a/charts/prometheus-operator/templates/alertmanager/service.yaml +++ b/charts/kube-prometheus-stack/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-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager self-monitor: {{ .Values.alertmanager.serviceMonitor.selfMonitor | quote }} -{{ include "prometheus-operator.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 "prometheus-operator.fullname" . }}-alertmanager + alertmanager: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager type: "{{ .Values.alertmanager.service.type }}" {{- end }} diff --git a/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml similarity index 58% rename from charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/serviceaccount.yaml index 378e0351c079..c5e6e92282b8 100644 --- a/charts/prometheus-operator/templates/alertmanager/serviceaccount.yaml +++ b/charts/kube-prometheus-stack/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-stack.alertmanager.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.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/prometheus-operator/templates/alertmanager/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml similarity index 70% rename from charts/prometheus-operator/templates/alertmanager/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/servicemonitor.yaml index 6e90d327d7bd..b9bc14fe63b8 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-alertmanager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-alertmanager + app: {{ template "kube-prometheus-stack.name" . }}-alertmanager release: {{ $.Release.Name | quote }} self-monitor: "true" namespaceSelector: matchNames: - - {{ printf "%s" (include "prometheus-operator.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/prometheus-operator/templates/alertmanager/serviceperreplica.yaml b/charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml similarity index 69% rename from charts/prometheus-operator/templates/alertmanager/serviceperreplica.yaml rename to charts/kube-prometheus-stack/templates/alertmanager/serviceperreplica.yaml index 8bb061218431..0f12ae879a0e 100644 --- a/charts/prometheus-operator/templates/alertmanager/serviceperreplica.yaml +++ b/charts/kube-prometheus-stack/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-stack.fullname" $ }}-alertmanager-serviceperreplica + namespace: {{ template "kube-prometheus-stack.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-stack.fullname" $ }}-alertmanager-{{ $i }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ include "prometheus-operator.name" $ }}-alertmanager -{{ include "prometheus-operator.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 "prometheus-operator.fullname" $ }}-alertmanager - statefulset.kubernetes.io/pod-name: alertmanager-{{ include "prometheus-operator.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/prometheus-operator/templates/exporters/core-dns/service.yaml b/charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml similarity index 72% rename from charts/prometheus-operator/templates/exporters/core-dns/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/core-dns/service.yaml index 707e5ca328a4..f77db41991b8 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-coredns + name: {{ template "kube-prometheus-stack.fullname" . }}-coredns labels: - app: {{ template "prometheus-operator.name" . }}-coredns + app: {{ template "kube-prometheus-stack.name" . }}-coredns jobLabel: coredns -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/core-dns/servicemonitor.yaml similarity index 72% rename from charts/prometheus-operator/templates/exporters/core-dns/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/core-dns/servicemonitor.yaml index fa3ad9cd7114..c398db612a73 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-coredns - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-coredns + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-coredns -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-coredns +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: jobLabel: jobLabel selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-coredns + app: {{ template "kube-prometheus-stack.name" . }}-coredns release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-api-server/servicemonitor.yaml similarity index 81% rename from charts/prometheus-operator/templates/exporters/kube-api-server/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-api-server/servicemonitor.yaml index f4945771e0eb..4c0290e731e1 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-apiserver - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-apiserver + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-apiserver -{{ include "prometheus-operator.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/prometheus-operator/templates/exporters/kube-controller-manager/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/endpoints.yaml similarity index 67% rename from charts/prometheus-operator/templates/exporters/kube-controller-manager/endpoints.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/endpoints.yaml index 205364fc3e4e..413193028cb4 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-controller-manager + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-controller-manager labels: - app: {{ template "prometheus-operator.name" . }}-kube-controller-manager + app: {{ template "kube-prometheus-stack.name" . }}-kube-controller-manager k8s-app: kube-controller-manager -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/prometheus-operator/templates/exporters/kube-controller-manager/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml similarity index 75% rename from charts/prometheus-operator/templates/exporters/kube-controller-manager/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/service.yaml index 70458fdae443..8b5556a89532 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-controller-manager + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-controller-manager labels: - app: {{ template "prometheus-operator.name" . }}-kube-controller-manager + app: {{ template "kube-prometheus-stack.name" . }}-kube-controller-manager jobLabel: kube-controller-manager -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml similarity index 81% rename from charts/prometheus-operator/templates/exporters/kube-controller-manager/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-controller-manager/servicemonitor.yaml index 7edc60bada7a..2f30a0cc2a57 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-controller-manager - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-controller-manager + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-controller-manager -{{ include "prometheus-operator.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 "prometheus-operator.name" . }}-kube-controller-manager + app: {{ template "kube-prometheus-stack.name" . }}-kube-controller-manager release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/prometheus-operator/templates/exporters/kube-dns/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml similarity index 78% rename from charts/prometheus-operator/templates/exporters/kube-dns/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-dns/service.yaml index 84ffb9685b74..c7bf142d520a 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-dns + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-dns labels: - app: {{ template "prometheus-operator.name" . }}-kube-dns + app: {{ template "kube-prometheus-stack.name" . }}-kube-dns jobLabel: kube-dns -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-dns/servicemonitor.yaml similarity index 81% rename from charts/prometheus-operator/templates/exporters/kube-dns/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-dns/servicemonitor.yaml index 19ce523deb44..3c1a06175897 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-dns - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-dns + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-dns -{{ include "prometheus-operator.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 "prometheus-operator.name" . }}-kube-dns + app: {{ template "kube-prometheus-stack.name" . }}-kube-dns release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/endpoints.yaml similarity index 67% rename from charts/prometheus-operator/templates/exporters/kube-etcd/endpoints.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-etcd/endpoints.yaml index ee603de76f70..8f07a5cc2460 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-etcd + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-etcd labels: - app: {{ template "prometheus-operator.name" . }}-kube-etcd + app: {{ template "kube-prometheus-stack.name" . }}-kube-etcd k8s-app: etcd-server -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/prometheus-operator/templates/exporters/kube-etcd/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml similarity index 75% rename from charts/prometheus-operator/templates/exporters/kube-etcd/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-etcd/service.yaml index af9e8cae40b4..957e8bbc1aad 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-etcd + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-etcd labels: - app: {{ template "prometheus-operator.name" . }}-kube-etcd + app: {{ template "kube-prometheus-stack.name" . }}-kube-etcd jobLabel: kube-etcd -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-etcd/servicemonitor.yaml similarity index 83% rename from charts/prometheus-operator/templates/exporters/kube-etcd/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-etcd/servicemonitor.yaml index 4c716606a441..17a447ad9416 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-etcd - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-etcd + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-etcd -{{ include "prometheus-operator.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 "prometheus-operator.name" . }}-kube-etcd + app: {{ template "kube-prometheus-stack.name" . }}-kube-etcd release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/prometheus-operator/templates/exporters/kube-proxy/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/endpoints.yaml similarity index 67% rename from charts/prometheus-operator/templates/exporters/kube-proxy/endpoints.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-proxy/endpoints.yaml index 3a71c397e623..2cb756d154cb 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-proxy + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-proxy labels: - app: {{ template "prometheus-operator.name" . }}-kube-proxy + app: {{ template "kube-prometheus-stack.name" . }}-kube-proxy k8s-app: kube-proxy -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/prometheus-operator/templates/exporters/kube-proxy/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml similarity index 75% rename from charts/prometheus-operator/templates/exporters/kube-proxy/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-proxy/service.yaml index b1117523787a..abe42060069d 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-proxy + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-proxy labels: - app: {{ template "prometheus-operator.name" . }}-kube-proxy + app: {{ template "kube-prometheus-stack.name" . }}-kube-proxy jobLabel: kube-proxy -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-proxy/servicemonitor.yaml similarity index 75% rename from charts/prometheus-operator/templates/exporters/kube-proxy/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-proxy/servicemonitor.yaml index 16bc28bb64a8..0ac44182b258 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-proxy - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-proxy + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-proxy -{{ include "prometheus-operator.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 "prometheus-operator.name" . }}-kube-proxy + app: {{ template "kube-prometheus-stack.name" . }}-kube-proxy release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/endpoints.yaml similarity index 67% rename from charts/prometheus-operator/templates/exporters/kube-scheduler/endpoints.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-scheduler/endpoints.yaml index 2c0c327f60cc..f4ad60fd6731 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-scheduler + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-scheduler labels: - app: {{ template "prometheus-operator.name" . }}-kube-scheduler + app: {{ template "kube-prometheus-stack.name" . }}-kube-scheduler k8s-app: kube-scheduler -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system subsets: - addresses: diff --git a/charts/prometheus-operator/templates/exporters/kube-scheduler/service.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml similarity index 75% rename from charts/prometheus-operator/templates/exporters/kube-scheduler/service.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-scheduler/service.yaml index d74409658dff..15559d45ae37 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-scheduler + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-scheduler labels: - app: {{ template "prometheus-operator.name" . }}-kube-scheduler + app: {{ template "kube-prometheus-stack.name" . }}-kube-scheduler jobLabel: kube-scheduler -{{ include "prometheus-operator.labels" . | indent 4 }} +{{ include "kube-prometheus-stack.labels" . | indent 4 }} namespace: kube-system spec: clusterIP: None diff --git a/charts/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-scheduler/servicemonitor.yaml similarity index 80% rename from charts/prometheus-operator/templates/exporters/kube-scheduler/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-scheduler/servicemonitor.yaml index 08795f41207f..b565ec2b8b70 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-scheduler - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-scheduler + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-scheduler -{{ include "prometheus-operator.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 "prometheus-operator.name" . }}-kube-scheduler + app: {{ template "kube-prometheus-stack.name" . }}-kube-scheduler release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: diff --git a/charts/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml similarity index 75% rename from charts/prometheus-operator/templates/exporters/kube-state-metrics/serviceMonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kube-state-metrics/serviceMonitor.yaml index 3630361b8008..f09de5d2e1e9 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kube-state-metrics - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kube-state-metrics + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kube-state-metrics -{{ include "prometheus-operator.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/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/kubelet/servicemonitor.yaml similarity index 95% rename from charts/prometheus-operator/templates/exporters/kubelet/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/kubelet/servicemonitor.yaml index e0d6b856ea2d..3645932743da 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-kubelet - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-kubelet + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-kubelet -{{- include "prometheus-operator.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/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/exporters/node-exporter/servicemonitor.yaml similarity index 78% rename from charts/prometheus-operator/templates/exporters/node-exporter/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/exporters/node-exporter/servicemonitor.yaml index 82efdbf749f1..5ca5f1b75c0f 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-node-exporter - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-node-exporter + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-node-exporter -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/configmap-dashboards.yaml b/charts/kube-prometheus-stack/templates/grafana/configmap-dashboards.yaml similarity index 66% rename from charts/prometheus-operator/templates/grafana/configmap-dashboards.yaml rename to charts/kube-prometheus-stack/templates/grafana/configmap-dashboards.yaml index c4d4cb93d933..fdd64ce6f4f5 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" $) $dashboardName | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/configmaps-datasources.yaml b/charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml similarity index 60% rename from charts/prometheus-operator/templates/grafana/configmaps-datasources.yaml rename to charts/kube-prometheus-stack/templates/grafana/configmaps-datasources.yaml index 40198b56d829..6a25ba10c3de 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-grafana-datasource - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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 "prometheus-operator.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 "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/apiserver.yaml similarity index 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/apiserver.yaml index 33a26d80be1d..9822113d3bef 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: apiserver.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/cluster-total.yaml similarity index 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/cluster-total.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/cluster-total.yaml index 27ea3ba5741f..4be6316d555e 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/controller-manager.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/controller-manager.yaml index 005b01ce24d6..86171a83835e 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/etcd.yaml similarity index 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/etcd.yaml index ba49364422a8..16705c889382 100644 --- a/charts/prometheus-operator/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: etcd.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-coredns.yaml similarity index 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-coredns.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-coredns.yaml index 9b78d24747f0..f3ca19c709a2 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/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 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml index 88358545e12f..61d8c10995eb 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/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 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml index 56f6d21d797b..dba206ae3bf2 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/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 98% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-node.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-node.yaml index 8c26ddacb7f3..ac832cb6f649 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/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 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml index 78768bac17b5..f727275f1832 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/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 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml index 2e668dddd3c3..958fb1e5f88e 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/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 99% rename from charts/prometheus-operator/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 index 619862628ec7..d426861d7528 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/kubelet.yaml similarity index 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/kubelet.yaml index 5396d5e174b6..8bdf2648aeac 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: kubelet.json: |- { diff --git a/charts/prometheus-operator/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 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-pod.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-pod.yaml index 707e633d5f1b..9c3ff3ef2f36 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/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 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/namespace-by-workload.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/namespace-by-workload.yaml index 6af9c532e957..40f34141c65c 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/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 98% rename from charts/prometheus-operator/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 index 175bf9078ea1..82b821a7adbf 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/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 98% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/node-rsrc-use.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/node-rsrc-use.yaml index 03ad9f7cca67..9cdfa645e47e 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/nodes.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/nodes.yaml index c70474488fcf..821d271d8d0a 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: nodes.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml similarity index 97% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml index d61d5b776bc1..07f478eed085 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: persistentvolumesusage.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/pod-total.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/pod-total.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/pod-total.yaml index 9e46de174354..f5876a12e75a 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/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 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml index a0b64fdbc046..716bce3b0f11 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/prometheus.yaml index 88d1098e0315..dfd3f3df031a 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: prometheus.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/proxy.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/proxy.yaml index c5ef1efbe506..46b272a19f1d 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: proxy.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/scheduler.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/scheduler.yaml index 8ef20780987e..e86dbeb1a740 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: scheduler.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/statefulset.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/statefulset.yaml index 694bd1f77c8b..7f953a3a29e3 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: statefulset.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/workload-total.yaml similarity index 99% rename from charts/prometheus-operator/templates/grafana/dashboards-1.14/workload-total.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards-1.14/workload-total.yaml index 6674cdcf84a6..d8e66c5a4d73 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards/etcd.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/etcd.yaml similarity index 99% rename from charts/prometheus-operator/templates/grafana/dashboards/etcd.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/etcd.yaml index b634fb58403e..7c2dd6b22188 100644 --- a/charts/prometheus-operator/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: etcd.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml index 1aebf9c6616a..1ee80ce75967 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-node-rsrc-use.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-node-rsrc-use.yaml index 4dd0e8546566..008d2ecad88f 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-cluster.yaml similarity index 99% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-cluster.yaml index 9ad60b43982b..91799f7a5314 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-namespace.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-namespace.yaml index 8a6701360f35..1f8d18f818b9 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-pod.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-pod.yaml index 32c8bbc77dea..ccbdd19545e6 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workload.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workload.yaml index 3c1c5910e296..5e42dbdd25a0 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml index 362140e3e863..d3df125b0f82 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.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/prometheus-operator/templates/grafana/dashboards/nodes.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/nodes.yaml similarity index 99% rename from charts/prometheus-operator/templates/grafana/dashboards/nodes.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/nodes.yaml index cc1ae90d277d..42b5f5e2d253 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: nodes.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/persistentvolumesusage.yaml similarity index 97% rename from charts/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/persistentvolumesusage.yaml index 66e8c9951022..ac6a24bbd4ee 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: persistentvolumesusage.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards/pods.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/pods.yaml similarity index 97% rename from charts/prometheus-operator/templates/grafana/dashboards/pods.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/pods.yaml index 9f7f5ac75fe8..0f6159d26c6c 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: pods.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml b/charts/kube-prometheus-stack/templates/grafana/dashboards/statefulset.yaml similarity index 98% rename from charts/prometheus-operator/templates/grafana/dashboards/statefulset.yaml rename to charts/kube-prometheus-stack/templates/grafana/dashboards/statefulset.yaml index c6d943fff311..b2c267683ddc 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.namespace" . }} - name: {{ printf "%s-%s" (include "prometheus-operator.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 "prometheus-operator.name" $ }}-grafana -{{ include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-grafana +{{ include "kube-prometheus-stack.labels" $ | indent 4 }} data: statefulset.json: |- { diff --git a/charts/prometheus-operator/templates/grafana/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/grafana/servicemonitor.yaml similarity index 72% rename from charts/prometheus-operator/templates/grafana/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/grafana/servicemonitor.yaml index daf72b335f57..15ee537fb8a8 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-grafana - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-grafana + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-grafana -{{ include "prometheus-operator.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 "prometheus-operator.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/prometheus-operator/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 78% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrole.yaml index 03e161839b0c..7b31ab3f1177 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.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 "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.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 "prometheus-operator.fullname" . }}-admission + - {{ template "kube-prometheus-stack.fullname" . }}-admission {{- end }} {{- end }} diff --git a/charts/prometheus-operator/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 56% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/clusterrolebinding.yaml index 8da76caaa02a..4f1f61665250 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.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 "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.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 "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission subjects: - kind: ServiceAccount - name: {{ template "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-admission + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- end }} diff --git a/charts/prometheus-operator/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 70% rename from charts/prometheus-operator/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 index 093cdbea2af0..37a19a55af1b 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-admission-create - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" $ }}-admission-create -{{- include "prometheus-operator.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 "prometheus-operator.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 "prometheus-operator.name" $ }}-admission-create -{{- include "prometheus-operator.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 "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-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 "prometheus-operator.fullname" . }}-admission + serviceAccountName: {{ template "kube-prometheus-stack.fullname" . }}-admission {{- with .Values.prometheusOperator.admissionWebhooks.patch.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} diff --git a/charts/prometheus-operator/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 74% rename from charts/prometheus-operator/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 index ca1788a9e75e..b74c61886b11 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-admission-patch - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" $ }}-admission-patch -{{- include "prometheus-operator.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 "prometheus-operator.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 "prometheus-operator.name" $ }}-admission-patch -{{- include "prometheus-operator.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 "prometheus-operator.fullname" . }}-admission - - --namespace={{ template "prometheus-operator.namespace" . }} - - --secret-name={{ template "prometheus-operator.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 "prometheus-operator.fullname" . }}-admission + serviceAccountName: {{ template "kube-prometheus-stack.fullname" . }}-admission {{- with .Values.prometheusOperator.admissionWebhooks.patch.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} diff --git a/charts/prometheus-operator/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 88% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/psp.yaml index 42ad8828e9bf..98e002aff3cf 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.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 "prometheus-operator.name" . }}-admission + app: {{ template "kube-prometheus-stack.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-stack.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/prometheus-operator/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 65% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/role.yaml index 5ead639f574f..3609fe950d76 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.labels" $ | indent 4 }} + app: {{ template "kube-prometheus-stack.name" $ }}-admission +{{- include "kube-prometheus-stack.labels" $ | indent 4 }} rules: - apiGroups: - "" diff --git a/charts/prometheus-operator/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 52% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/rolebinding.yaml index aa6a4fc017b8..dcb0fbcfbc5d 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.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 "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission subjects: - kind: ServiceAccount - name: {{ template "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-admission + namespace: {{ template "kube-prometheus-stack.namespace" . }} {{- end }} diff --git a/charts/prometheus-operator/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 63% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/job-patch/serviceaccount.yaml index b3052e0daa35..5296494d3fac 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-admission - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.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/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml similarity index 68% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/mutatingWebhookConfiguration.yaml index 30319453f49c..cefee15c2c4e 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission labels: - app: {{ template "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.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 "prometheus-operator.namespace" . }} - name: {{ template "prometheus-operator.operator.fullname" $ }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ template "kube-prometheus-stack.operator.fullname" $ }} path: /admission-prometheusrules/mutate {{- end }} diff --git a/charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml similarity index 69% rename from charts/prometheus-operator/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/admission-webhooks/validatingWebhookConfiguration.yaml index 3d26f46798d8..a24270549e8c 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-admission + name: {{ template "kube-prometheus-stack.fullname" . }}-admission labels: - app: {{ template "prometheus-operator.name" $ }}-admission -{{- include "prometheus-operator.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 "prometheus-operator.namespace" . }} - name: {{ template "prometheus-operator.operator.fullname" $ }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + name: {{ template "kube-prometheus-stack.operator.fullname" $ }} path: /admission-prometheusrules/validate {{- end }} diff --git a/charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/cleanup-crds.yaml similarity index 75% rename from charts/prometheus-operator/templates/prometheus-operator/cleanup-crds.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/cleanup-crds.yaml index f104020f30ca..4fd21e7730f6 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-operator-cleanup - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: template: metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator-cleanup + name: {{ template "kube-prometheus-stack.fullname" . }}-operator-cleanup labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.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 "prometheus-operator.operator.serviceAccountName" . }} + serviceAccountName: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} {{- end }} containers: - name: kubectl diff --git a/charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml similarity index 86% rename from charts/prometheus-operator/templates/prometheus-operator/clusterrole.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/clusterrole.yaml index 64fac28c8358..2e8ef24f6ed0 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.fullname" . }}-operator labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.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 new file mode 100644 index 000000000000..c9ab0ab8720c --- /dev/null +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/clusterrolebinding.yaml @@ -0,0 +1,17 @@ +{{- if and .Values.prometheusOperator.enabled .Values.global.rbac.create }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ template "kube-prometheus-stack.fullname" . }}-operator + labels: + 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-stack.fullname" . }}-operator +subjects: +- kind: ServiceAccount + name: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} +{{- end }} diff --git a/charts/prometheus-operator/templates/prometheus-operator/crds.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/crds.yaml similarity index 100% rename from charts/prometheus-operator/templates/prometheus-operator/crds.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/crds.yaml diff --git a/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml similarity index 87% rename from charts/prometheus-operator/templates/prometheus-operator/deployment.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml index 0f81b6c25490..4c9881d459df 100644 --- a/charts/prometheus-operator/templates/prometheus-operator/deployment.yaml +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/deployment.yaml @@ -1,24 +1,24 @@ -{{- $namespace := printf "%s" (include "prometheus-operator.namespace" .) }} +{{- $namespace := printf "%s" (include "kube-prometheus-stack.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-stack.fullname" . }}-operator + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-operator +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: replicas: 1 selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-operator + app: {{ template "kube-prometheus-stack.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-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 "prometheus-operator.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 "prometheus-operator.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 "prometheus-operator.fullname" . }}-admission + secretName: {{ template "kube-prometheus-stack.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-stack.operator.serviceAccountName" . }} {{- if .Values.prometheusOperator.hostNetwork }} hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml similarity index 66% rename from charts/prometheus-operator/templates/prometheus-operator/psp-clusterrole.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrole.yaml index a5c5ce7e6f52..d667d6275141 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-operator-psp + name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.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 "prometheus-operator.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 new file mode 100644 index 000000000000..c538cd17339f --- /dev/null +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/psp-clusterrolebinding.yaml @@ -0,0 +1,17 @@ +{{- if and .Values.prometheusOperator.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled }} +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: {{ template "kube-prometheus-stack.fullname" . }}-operator-psp + labels: + 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-stack.fullname" . }}-operator-psp +subjects: + - kind: ServiceAccount + name: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} +{{- end }} diff --git a/charts/prometheus-operator/templates/prometheus-operator/psp.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml similarity index 87% rename from charts/prometheus-operator/templates/prometheus-operator/psp.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/psp.yaml index 307bc312d9b8..18d1d37df3e1 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-operator + name: {{ template "kube-prometheus-stack.fullname" . }}-operator labels: - app: {{ template "prometheus-operator.name" . }}-operator + app: {{ template "kube-prometheus-stack.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-stack.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/prometheus-operator/templates/prometheus-operator/service.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml similarity index 83% rename from charts/prometheus-operator/templates/prometheus-operator/service.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/service.yaml index b5d75b0fc7ba..6e67b3d52db7 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-operator - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-operator + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.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 "prometheus-operator.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 new file mode 100644 index 000000000000..ab41797e3cc8 --- /dev/null +++ b/charts/kube-prometheus-stack/templates/prometheus-operator/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.serviceAccount.create }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ template "kube-prometheus-stack.operator.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} + labels: + 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/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml similarity index 68% rename from charts/prometheus-operator/templates/prometheus-operator/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/prometheus-operator/servicemonitor.yaml index dfda03ab7c46..52f2d572fb24 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-operator - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-operator + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.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 "prometheus-operator.name" . }}-operator + app: {{ template "kube-prometheus-stack.name" . }}-operator release: {{ $.Release.Name | quote }} namespaceSelector: matchNames: - - {{ printf "%s" (include "prometheus-operator.namespace" .) | quote }} + - {{ printf "%s" (include "kube-prometheus-stack.namespace" .) | quote }} {{- end }} diff --git a/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalAlertRelabelConfigs.yaml similarity index 63% rename from charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml rename to charts/kube-prometheus-stack/templates/prometheus/additionalAlertRelabelConfigs.yaml index 33227dc56721..bff930981a6b 100644 --- a/charts/prometheus-operator/templates/prometheus/additionalAlertRelabelConfigs.yaml +++ b/charts/kube-prometheus-stack/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-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 "prometheus-operator.name" . }}-prometheus-am-relabel-confg -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalAlertmanagerConfigs.yaml similarity index 64% rename from charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml rename to charts/kube-prometheus-stack/templates/prometheus/additionalAlertmanagerConfigs.yaml index 61ba8c00763b..8aebc96c35b6 100644 --- a/charts/prometheus-operator/templates/prometheus/additionalAlertmanagerConfigs.yaml +++ b/charts/kube-prometheus-stack/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-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 "prometheus-operator.name" . }}-prometheus-am-confg -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml similarity index 62% rename from charts/prometheus-operator/templates/prometheus/additionalPrometheusRules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/additionalPrometheusRules.yaml index 4fa471e7480c..794e9ad274db 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.name" $ }}-{{ $prometheusRuleName }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ template "kube-prometheus-stack.name" $ }}-{{ $prometheusRuleName }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ template "prometheus-operator.name" $ }} -{{ include "prometheus-operator.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 "prometheus-operator.name" $ }}-{{ .name }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ template "kube-prometheus-stack.name" $ }}-{{ .name }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ template "prometheus-operator.name" $ }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml b/charts/kube-prometheus-stack/templates/prometheus/additionalScrapeConfigs.yaml similarity index 63% rename from charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml rename to charts/kube-prometheus-stack/templates/prometheus/additionalScrapeConfigs.yaml index 1158b3467c64..243124ab99a7 100644 --- a/charts/prometheus-operator/templates/prometheus/additionalScrapeConfigs.yaml +++ b/charts/kube-prometheus-stack/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-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 "prometheus-operator.name" . }}-prometheus-scrape-confg -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml similarity index 72% rename from charts/prometheus-operator/templates/prometheus/clusterrole.yaml rename to charts/kube-prometheus-stack/templates/prometheus/clusterrole.yaml index 4dc3dc183afe..9772fa5e5e13 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-prometheus + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.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-stack/templates/prometheus/clusterrolebinding.yaml b/charts/kube-prometheus-stack/templates/prometheus/clusterrolebinding.yaml new file mode 100644 index 000000000000..9fc4f65da429 --- /dev/null +++ b/charts/kube-prometheus-stack/templates/prometheus/clusterrolebinding.yaml @@ -0,0 +1,18 @@ +{{- if and .Values.prometheus.enabled .Values.global.rbac.create }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus + labels: + 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-stack.fullname" . }}-prometheus +subjects: + - kind: ServiceAccount + name: {{ template "kube-prometheus-stack.prometheus.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} +{{- end }} + diff --git a/charts/prometheus-operator/templates/prometheus/ingress.yaml b/charts/kube-prometheus-stack/templates/prometheus/ingress.yaml similarity index 84% rename from charts/prometheus-operator/templates/prometheus/ingress.yaml rename to charts/kube-prometheus-stack/templates/prometheus/ingress.yaml index 2a9c4e6080f4..582d4c585d8f 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.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 "prometheus-operator.namespace" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/ingressThanosSidecar.yaml b/charts/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml similarity index 82% rename from charts/prometheus-operator/templates/prometheus/ingressThanosSidecar.yaml rename to charts/kube-prometheus-stack/templates/prometheus/ingressThanosSidecar.yaml index 6bf8ef8c0efe..24d2213dc5cc 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.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 "prometheus-operator.fullname" . }}-thanos-gateway + name: {{ template "kube-prometheus-stack.fullname" . }}-thanos-gateway labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/ingressperreplica.yaml b/charts/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml similarity index 76% rename from charts/prometheus-operator/templates/prometheus/ingressperreplica.yaml rename to charts/kube-prometheus-stack/templates/prometheus/ingressperreplica.yaml index 1eb49a6c60ab..a7feff01648b 100644 --- a/charts/prometheus-operator/templates/prometheus/ingressperreplica.yaml +++ b/charts/kube-prometheus-stack/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-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 "prometheus-operator.fullname" $ }}-prometheus-{{ $i }} - namespace: {{ template "prometheus-operator.namespace" $ }} + name: {{ include "kube-prometheus-stack.fullname" $ }}-prometheus-{{ $i }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ include "prometheus-operator.name" $ }}-prometheus -{{ include "prometheus-operator.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 "prometheus-operator.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/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/charts/kube-prometheus-stack/templates/prometheus/podDisruptionBudget.yaml similarity index 61% rename from charts/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml rename to charts/kube-prometheus-stack/templates/prometheus/podDisruptionBudget.yaml index 2853ac73b42e..573317a32f23 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-prometheus - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.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 "prometheus-operator.fullname" . }}-prometheus + prometheus: {{ template "kube-prometheus-stack.fullname" . }}-prometheus {{- end }} diff --git a/charts/prometheus-operator/templates/prometheus/podmonitors.yaml b/charts/kube-prometheus-stack/templates/prometheus/podmonitors.yaml similarity index 82% rename from charts/prometheus-operator/templates/prometheus/podmonitors.yaml rename to charts/kube-prometheus-stack/templates/prometheus/podmonitors.yaml index 7cbf76985f9a..95d568e13d12 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.namespace" $ }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ template "prometheus-operator.name" $ }}-prometheus -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml similarity index 90% rename from charts/prometheus-operator/templates/prometheus/prometheus.yaml rename to charts/kube-prometheus-stack/templates/prometheus/prometheus.yaml index 210fd50fe901..f73b6a650ef6 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-prometheus - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.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 "prometheus-operator.namespace" . }} - name: {{ template "prometheus-operator.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 "prometheus-operator.fullname" . }}-prometheus.{{ template "prometheus-operator.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 "prometheus-operator.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 "prometheus-operator.name" . }} + app: {{ template "kube-prometheus-stack.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-stack.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-stack.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-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 "prometheus-operator.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 "prometheus-operator.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/prometheus-operator/templates/prometheus/psp-clusterrole.yaml b/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrole.yaml similarity index 66% rename from charts/prometheus-operator/templates/prometheus/psp-clusterrole.yaml rename to charts/kube-prometheus-stack/templates/prometheus/psp-clusterrole.yaml index d5523d662cfd..a279fb241b37 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-prometheus-psp + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-psp labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.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 "prometheus-operator.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 new file mode 100644 index 000000000000..27b73b74b30f --- /dev/null +++ b/charts/kube-prometheus-stack/templates/prometheus/psp-clusterrolebinding.yaml @@ -0,0 +1,18 @@ +{{- if and .Values.prometheus.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled }} +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus-psp + labels: + 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-stack.fullname" . }}-prometheus-psp +subjects: + - kind: ServiceAccount + name: {{ template "kube-prometheus-stack.prometheus.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} +{{- end }} + diff --git a/charts/prometheus-operator/templates/prometheus/psp.yaml b/charts/kube-prometheus-stack/templates/prometheus/psp.yaml similarity index 88% rename from charts/prometheus-operator/templates/prometheus/psp.yaml rename to charts/kube-prometheus-stack/templates/prometheus/psp.yaml index 4ba198155db7..bd2b270d5933 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-prometheus + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus labels: - app: {{ template "prometheus-operator.name" . }}-prometheus + app: {{ template "kube-prometheus-stack.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-stack.labels" . | indent 4 }} spec: privileged: false # Required to prevent escalations to root. diff --git a/charts/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/alertmanager.rules.yaml similarity index 78% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/alertmanager.rules.yaml index dc84fdf23750..37c22e16af47 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "alertmanager" }} -{{- $namespace := printf "%s" (include "prometheus-operator.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 "prometheus-operator.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml similarity index 95% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/etcd.yaml index 97a9825d8ddb..c844ff79ed36 100644 --- a/charts/prometheus-operator/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/general.rules.yaml similarity index 78% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/general.rules.yaml index 4ccd9441cf38..e8aadc86d271 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/k8s.rules.yaml similarity index 91% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/k8s.rules.yaml index 8131f05e9ec0..35e4edebfc3a 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 94% rename from charts/prometheus-operator/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 index 76bcd1ab7af9..78a09e323db3 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-apiserver-availability.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 84% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver-slos.yaml index 5549bfb19158..2ac67913fa2c 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-apiserver-slos" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 96% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml index 804c68c638f0..b4d1a0f39119 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 66% rename from charts/prometheus-operator/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 index 85c541841caf..e54bee5879b2 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-prometheus-general.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 76% rename from charts/prometheus-operator/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 index f8bafd91e5f2..1ff73f21275f 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 87% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml index ec718ceffa5c..594f1bb3bffe 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 81% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kube-state-metrics.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kube-state-metrics.yaml index b67b1bc10b9a..207a61907442 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-state-metrics" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/kubelet.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubelet.rules.yaml similarity index 79% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubelet.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubelet.rules.yaml index d8ae0b3d22e6..f9bd1ccd6451 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kubelet.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubelet.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-apps.yaml similarity index 95% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-apps.yaml index e13c9c463afe..42d691356db6 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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/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-stack.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-resources.yaml similarity index 89% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-resources.yaml index b9e473730e5d..40596fef4921 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-storage.yaml similarity index 86% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-storage.yaml index f2573966a134..52092f0adea7 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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/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-stack.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 86% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-apiserver.yaml index 39200b774cb6..dde1f7afbc53 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kubernetes-system-apiserver" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 70% rename from charts/prometheus-operator/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 index 6214d7751043..cf0309a056d6 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kubernetes-system-controller-manager" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 89% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-kubelet.yaml index ab10d6270524..6d75c6f55d5d 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kubernetes-system-kubelet" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 70% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml index 84e3b1abd85f..8f455a65bb2f 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kubernetes-system-scheduler" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system.yaml similarity index 79% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/kubernetes-system.yaml index 05d9b67d5ea8..8fd0ad318ffd 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 86% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.rules.yaml index 7adf85db3679..845eb0c909c4 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "node-exporter.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml similarity index 95% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/node-exporter.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-exporter.yaml index 9e10a5771222..17e112b6591a 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "node-exporter" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node-exporter" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-network.yaml similarity index 71% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node-network.yaml index b4b206d860c8..b6f4eda74b44 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node.rules.yaml similarity index 79% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/node.rules.yaml index 1e754b2001de..33af72c2b975 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus-operator.yaml similarity index 80% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus-operator.yaml index 939bc749f5a0..c420c3ca69e9 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "operator" }} -{{- $namespace := printf "%s" (include "prometheus-operator.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 "prometheus-operator.fullname" .) "prometheus-operator" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus.yaml similarity index 94% rename from charts/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules-1.14/prometheus.yaml index 71883f7efa26..66976c4b3f90 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "prometheus" }} -{{- $namespace := printf "%s" (include "prometheus-operator.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 "prometheus-operator.fullname" .) "prometheus" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/alertmanager.rules.yaml similarity index 74% rename from charts/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/alertmanager.rules.yaml index 5444023970eb..cdc814d276a5 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "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-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 "prometheus-operator.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "alertmanager.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/etcd.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/etcd.yaml similarity index 95% rename from charts/prometheus-operator/templates/prometheus/rules/etcd.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/etcd.yaml index 6abda2d31bae..b34b2b840ed7 100644 --- a/charts/prometheus-operator/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "etcd" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/general.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/general.rules.yaml similarity index 77% rename from charts/prometheus-operator/templates/prometheus/rules/general.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/general.rules.yaml index d220cb3898f9..cc5f0709384d 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "general.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/k8s.rules.yaml similarity index 87% rename from charts/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/k8s.rules.yaml index 71c75fcc4f62..08aa7fe2b3c3 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "k8s.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-apiserver.rules.yaml similarity index 76% rename from charts/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kube-apiserver.rules.yaml index 5e565317b973..e3a92969239f 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-apiserver.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 75% rename from charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml index 09a7c754ae29..cbd8ea39cebd 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-prometheus-node-alerting.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/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 78% rename from charts/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml index fc0f48305f82..87f072fd0256 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-prometheus-node-recording.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kube-scheduler.rules.yaml similarity index 87% rename from charts/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kube-scheduler.rules.yaml index 3861fa639871..46c8d1d4a9c7 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kube-scheduler.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.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 "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-absent.yaml similarity index 84% rename from charts/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-absent.yaml index 7391f16ba361..7ed1c0d92753 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "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-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 "prometheus-operator.fullname" .) "kubernetes-absent" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-absent" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-apps.yaml similarity index 94% rename from charts/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-apps.yaml index fa82f0811f06..41d091c588ba 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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/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-stack.fullname" .) "kubernetes-apps" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-resources.yaml similarity index 89% rename from charts/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-resources.yaml index ee51ebd0721c..885bc41388db 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-resources" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-storage.yaml similarity index 85% rename from charts/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-storage.yaml index 715924b863c1..b2b11e3ec624 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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/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-stack.fullname" .) "kubernetes-storage" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-system.yaml similarity index 93% rename from charts/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/kubernetes-system.yaml index 36a119314521..dac4e7c15948 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kubernetes-system" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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 }} @@ -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 }} diff --git a/charts/prometheus-operator/templates/prometheus/rules/node-network.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/node-network.yaml similarity index 79% rename from charts/prometheus-operator/templates/prometheus/rules/node-network.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/node-network.yaml index 1de2a621c19a..d3c853f4a993 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node-network" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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 }} @@ -45,4 +45,4 @@ spec: for: 2m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/prometheus-operator/templates/prometheus/rules/node-time.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/node-time.yaml similarity index 69% rename from charts/prometheus-operator/templates/prometheus/rules/node-time.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/node-time.yaml index b53a6af2c659..9c30ea4f1ef7 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "node-time" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node-time" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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 }} @@ -31,4 +31,4 @@ spec: for: 2m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/node.rules.yaml similarity index 94% rename from charts/prometheus-operator/templates/prometheus/rules/node.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/node.rules.yaml index bd2c50fe5ac3..328c6d7d8b82 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "node.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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 }} @@ -199,4 +199,4 @@ spec: ) ) by (node) record: 'node:node_inodes_free:' -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus-operator.yaml similarity index 69% rename from charts/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/prometheus-operator.yaml index 9975be3691ea..091324459f77 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "operator" }} -{{- $namespace := printf "%s" (include "prometheus-operator.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 "prometheus-operator.fullname" .) "prometheus-operator" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "kube-prometheus" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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 }} @@ -40,4 +40,4 @@ spec: for: 10m labels: severity: warning -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml b/charts/kube-prometheus-stack/templates/prometheus/rules/prometheus.rules.yaml similarity index 89% rename from charts/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml rename to charts/kube-prometheus-stack/templates/prometheus/rules/prometheus.rules.yaml index 9cd2eea08ce3..3e4b2bd60efe 100644 --- a/charts/prometheus-operator/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/coreos/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/helm/charts/tree/master/stable/prometheus-operator/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 "prometheus-operator.fullname" .) "prometheus" }} -{{- $namespace := printf "%s" (include "prometheus-operator.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 "prometheus-operator.fullname" .) "prometheus.rules" | trunc 63 | trimSuffix "-" }} - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" .) "prometheus.rules" | trunc 63 | trimSuffix "-" }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }} -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/service.yaml b/charts/kube-prometheus-stack/templates/prometheus/service.yaml similarity index 83% rename from charts/prometheus-operator/templates/prometheus/service.yaml rename to charts/kube-prometheus-stack/templates/prometheus/service.yaml index e38b4813a712..cb831c7a2592 100644 --- a/charts/prometheus-operator/templates/prometheus/service.yaml +++ b/charts/kube-prometheus-stack/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-stack.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus + app: {{ template "kube-prometheus-stack.name" . }}-prometheus self-monitor: {{ .Values.prometheus.serviceMonitor.selfMonitor | quote }} -{{ include "prometheus-operator.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 "prometheus-operator.fullname" . }}-prometheus + prometheus: {{ template "kube-prometheus-stack.fullname" . }}-prometheus {{- if .Values.prometheus.service.sessionAffinity }} sessionAffinity: {{ .Values.prometheus.service.sessionAffinity }} {{- end }} diff --git a/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml b/charts/kube-prometheus-stack/templates/prometheus/serviceaccount.yaml similarity index 58% rename from charts/prometheus-operator/templates/prometheus/serviceaccount.yaml rename to charts/kube-prometheus-stack/templates/prometheus/serviceaccount.yaml index 273e79f6e337..862d5f8e44fd 100644 --- a/charts/prometheus-operator/templates/prometheus/serviceaccount.yaml +++ b/charts/kube-prometheus-stack/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-stack.prometheus.serviceAccountName" . }} + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/prometheus/servicemonitor.yaml similarity index 77% rename from charts/prometheus-operator/templates/prometheus/servicemonitor.yaml rename to charts/kube-prometheus-stack/templates/prometheus/servicemonitor.yaml index 26addda30a54..356c013ffa84 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.fullname" . }}-prometheus - namespace: {{ template "prometheus-operator.namespace" . }} + name: {{ template "kube-prometheus-stack.fullname" . }}-prometheus + namespace: {{ template "kube-prometheus-stack.namespace" . }} labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} + app: {{ template "kube-prometheus-stack.name" . }}-prometheus +{{ include "kube-prometheus-stack.labels" . | indent 4 }} spec: selector: matchLabels: - app: {{ template "prometheus-operator.name" . }}-prometheus + app: {{ template "kube-prometheus-stack.name" . }}-prometheus release: {{ $.Release.Name | quote }} self-monitor: "true" namespaceSelector: matchNames: - - {{ printf "%s" (include "prometheus-operator.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/prometheus-operator/templates/prometheus/servicemonitors.yaml b/charts/kube-prometheus-stack/templates/prometheus/servicemonitors.yaml similarity index 80% rename from charts/prometheus-operator/templates/prometheus/servicemonitors.yaml rename to charts/kube-prometheus-stack/templates/prometheus/servicemonitors.yaml index 183da7bdf6b5..959df2124378 100644 --- a/charts/prometheus-operator/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 "prometheus-operator.namespace" $ }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ template "prometheus-operator.name" $ }}-prometheus -{{ include "prometheus-operator.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/prometheus-operator/templates/prometheus/serviceperreplica.yaml b/charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml similarity index 69% rename from charts/prometheus-operator/templates/prometheus/serviceperreplica.yaml rename to charts/kube-prometheus-stack/templates/prometheus/serviceperreplica.yaml index 802e0e3a3173..1a55433621fb 100644 --- a/charts/prometheus-operator/templates/prometheus/serviceperreplica.yaml +++ b/charts/kube-prometheus-stack/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-stack.fullname" $ }}-prometheus-serviceperreplica + namespace: {{ template "kube-prometheus-stack.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-stack.fullname" $ }}-prometheus-{{ $i }} + namespace: {{ template "kube-prometheus-stack.namespace" $ }} labels: - app: {{ include "prometheus-operator.name" $ }}-prometheus -{{ include "prometheus-operator.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 "prometheus-operator.fullname" $ }}-prometheus - statefulset.kubernetes.io/pod-name: prometheus-{{ include "prometheus-operator.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/prometheus-operator/values.yaml b/charts/kube-prometheus-stack/values.yaml similarity index 96% rename from charts/prometheus-operator/values.yaml rename to charts/kube-prometheus-stack/values.yaml index bcbccb6f5f61..b67195d02335 100644 --- a/charts/prometheus-operator/values.yaml +++ b/charts/kube-prometheus-stack/values.yaml @@ -1,8 +1,8 @@ -# Default values for prometheus-operator. +# 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 prometheus-operator for `app:` labels +## Provide a name in place of kube-prometheus-stack for `app:` labels ## nameOverride: "" @@ -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: @@ -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 @@ -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: [] diff --git a/charts/prometheus-operator/Chart.yaml b/charts/prometheus-operator/Chart.yaml deleted file mode 100644 index 7c9ed635c009..000000000000 --- a/charts/prometheus-operator/Chart.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -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: prometheus-operator -sources: - - https://github.com/coreos/kube-prometheus - - https://github.com/coreos/prometheus-operator - - https://coreos.com/operators/prometheus -version: 9.3.2 -appVersion: 0.38.1 -tillerVersion: ">=2.12.0" -home: https://github.com/coreos/prometheus-operator -keywords: -- operator -- prometheus diff --git a/charts/prometheus-operator/OWNERS b/charts/prometheus-operator/OWNERS deleted file mode 100644 index 9231f2531dc4..000000000000 --- a/charts/prometheus-operator/OWNERS +++ /dev/null @@ -1,8 +0,0 @@ -approvers: -- vsliouniaev -- bismarck -- gianrubio -reviewers: -- vsliouniaev -- bismarck -- gianrubio diff --git a/charts/prometheus-operator/README.md b/charts/prometheus-operator/README.md deleted file mode 100644 index d29c90941ac4..000000000000 --- a/charts/prometheus-operator/README.md +++ /dev/null @@ -1,763 +0,0 @@ -# ⚠️ DEPRECATED - -This chart will be renamed, but first must be deprecated before the prometheus-community/helm-charts repo is indexed, so that it won't be listed in the hubs. See [this prometheus-community issue](https://github.com/prometheus-community/community/issues/28#issuecomment-670406329) for reasoning and next steps. - -# prometheus-operator - -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. - -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 - -With the installation, the chart also includes dashboards and alerts. - -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. - -## TL;DR; - -```console -$ helm install stable/prometheus-operator -``` - -## Introduction - -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. - -## 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)) - -## Installing the Chart - -To install the chart with the release name `my-release`: - -```console -$ helm install --name my-release stable/prometheus-operator -``` - -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 default installation includes Prometheus Operator, Alertmanager, Grafana, and configuration for scraping Kubernetes infrastructure. - -## 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. - -CRDs created by this chart are not removed by default and should be manually cleaned up: - -```console -kubectl delete crd prometheuses.monitoring.coreos.com -kubectl delete crd prometheusrules.monitoring.coreos.com -kubectl delete crd servicemonitors.monitoring.coreos.com -kubectl delete crd podmonitors.monitoring.coreos.com -kubectl delete crd alertmanagers.monitoring.coreos.com -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) - -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/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 - -``` - -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 --name my-release stable/prometheus-operator --set prometheusOperator.createCustomResource=false -``` - -## 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. - -### 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 stable/prometheus-operator --version 7.4.0 -``` -Then upgrade to 8.x.x -```sh -helm upgrade stable/prometheus-operator -``` -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: - -``` -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 coreos/prometheus-operator documentation here: [Running Exporters](https://github.com/coreos/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`. - -## 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 - -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. - -There is no simple and direct migration path between the charts as the changes are extensive and intended to make the chart easier to support. - -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). - -## 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 - -### 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 -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: -``` -apiVersion: v1 -kind: PersistentVolume -metadata: - name: pvc-prometheus-migration-prometheus-0 -spec: - accessModes: - - ReadWriteOnce - azureDisk: - cachingMode: None - diskName: pvc-prometheus-migration-prometheus-0 - diskURI: /subscriptions/f5125d82-2622-4c50-8d25-3f7ba3e9ac4b/resourceGroups/sample-migration-resource-group/providers/Microsoft.Compute/disks/pvc-prometheus-migration-prometheus-0 - fsType: "" - kind: Managed - readOnly: false - capacity: - storage: 1Gi - persistentVolumeReclaimPolicy: Delete - storageClassName: prometheus - volumeMode: Filesystem -``` -``` -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - labels: - app: prometheus - prometheus: prometheus-migration-prometheus - name: prometheus-prometheus-migration-prometheus-db-prometheus-prometheus-migration-prometheus-0 - namespace: monitoring -spec: - accessModes: - - ReadWriteOnce - dataSource: null - resources: - requests: - storage: 1Gi - storageClassName: prometheus - volumeMode: Filesystem - volumeName: pvc-prometheus-migration-prometheus-0 -status: - accessModes: - - ReadWriteOnce - capacity: - storage: 1Gi -``` - -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 - -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. - -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: - -``` -kubectl -n kube-system edit cm kube-proxy -``` - -``` -apiVersion: v1 -data: - config.conf: |- - apiVersion: kubeproxy.config.k8s.io/v1alpha1 - kind: KubeProxyConfiguration - # ... - # metricsBindAddress: 127.0.0.1:10249 - metricsBindAddress: 0.0.0.0:10249 - # ... - kubeconfig.conf: |- - # ... -kind: ConfigMap -metadata: - labels: - app: kube-proxy - name: kube-proxy - namespace: kube-system -``` diff --git a/charts/prometheus-operator/requirements.lock b/charts/prometheus-operator/requirements.lock deleted file mode 100644 index a1de41d27426..000000000000 --- a/charts/prometheus-operator/requirements.lock +++ /dev/null @@ -1,12 +0,0 @@ -dependencies: -- name: kube-state-metrics - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 2.8.10 -- name: prometheus-node-exporter - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 1.10.0 -- name: grafana - repository: https://kubernetes-charts.storage.googleapis.com/ - version: 5.3.0 -digest: sha256:4cafebfa80daacbd651defea2a7cad3074e8022114d27d76a3baa1861998981b -generated: "2020-06-22T12:36:10.4861206Z" diff --git a/charts/prometheus-operator/templates/NOTES.txt b/charts/prometheus-operator/templates/NOTES.txt deleted file mode 100644 index aa591171d2cf..000000000000 --- a/charts/prometheus-operator/templates/NOTES.txt +++ /dev/null @@ -1,9 +0,0 @@ -DEPRECATED - This chart will be renamed. See https://github.com/prometheus-community/community/issues/28#issuecomment-670406329 - ---- - -The Prometheus Operator has been installed. Check its status by running: - kubectl --namespace {{ template "prometheus-operator.namespace" . }} get pods -l "release={{ $.Release.Name }}" - -Visit https://github.com/coreos/prometheus-operator for instructions on how -to create & configure Alertmanager and Prometheus instances using the Operator. \ No newline at end of file diff --git a/charts/prometheus-operator/templates/alertmanager/psp-rolebinding.yaml b/charts/prometheus-operator/templates/alertmanager/psp-rolebinding.yaml deleted file mode 100644 index 797150336ad2..000000000000 --- a/charts/prometheus-operator/templates/alertmanager/psp-rolebinding.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if and .Values.alertmanager.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: {{ template "prometheus-operator.fullname" . }}-alertmanager - namespace: {{ template "prometheus-operator.namespace" . }} - labels: - app: {{ template "prometheus-operator.name" . }}-alertmanager -{{ include "prometheus-operator.labels" . | indent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: {{ template "prometheus-operator.fullname" . }}-alertmanager -subjects: - - kind: ServiceAccount - name: {{ template "prometheus-operator.alertmanager.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} -{{- end }} diff --git a/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml b/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml deleted file mode 100644 index f2ac0d9961ea..000000000000 --- a/charts/prometheus-operator/templates/prometheus-operator/clusterrolebinding.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if and .Values.prometheusOperator.enabled .Values.global.rbac.create }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator - labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ template "prometheus-operator.fullname" . }}-operator -subjects: -- kind: ServiceAccount - name: {{ template "prometheus-operator.operator.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} -{{- end }} diff --git a/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml b/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml deleted file mode 100644 index 07404127533a..000000000000 --- a/charts/prometheus-operator/templates/prometheus-operator/psp-clusterrolebinding.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if and .Values.prometheusOperator.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled }} -kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: {{ template "prometheus-operator.fullname" . }}-operator-psp - labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ template "prometheus-operator.fullname" . }}-operator-psp -subjects: - - kind: ServiceAccount - name: {{ template "prometheus-operator.operator.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} -{{- end }} diff --git a/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml b/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml deleted file mode 100644 index 637ed3fe091d..000000000000 --- a/charts/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.serviceAccount.create }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ template "prometheus-operator.operator.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} - labels: - app: {{ template "prometheus-operator.name" . }}-operator -{{ include "prometheus-operator.labels" . | indent 4 }} -imagePullSecrets: -{{ toYaml .Values.global.imagePullSecrets | indent 2 }} -{{- end }} diff --git a/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml b/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml deleted file mode 100644 index c31952330845..000000000000 --- a/charts/prometheus-operator/templates/prometheus/clusterrolebinding.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if and .Values.prometheus.enabled .Values.global.rbac.create }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus - labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ template "prometheus-operator.fullname" . }}-prometheus -subjects: - - kind: ServiceAccount - name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} -{{- end }} - diff --git a/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml b/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml deleted file mode 100644 index cf26f49d1121..000000000000 --- a/charts/prometheus-operator/templates/prometheus/psp-clusterrolebinding.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{- if and .Values.prometheus.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled }} -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ template "prometheus-operator.fullname" . }}-prometheus-psp - labels: - app: {{ template "prometheus-operator.name" . }}-prometheus -{{ include "prometheus-operator.labels" . | indent 4 }} -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ template "prometheus-operator.fullname" . }}-prometheus-psp -subjects: - - kind: ServiceAccount - name: {{ template "prometheus-operator.prometheus.serviceAccountName" . }} - namespace: {{ template "prometheus-operator.namespace" . }} -{{- end }} - diff --git a/ct.yaml b/ct.yaml index 59f6b1d56d48..7a0ea778e324 100644 --- a/ct.yaml +++ b/ct.yaml @@ -5,6 +5,8 @@ chart-dirs: - charts 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"