From d925ce6fbf00432478ecbf905981e7cb1039eee4 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Wed, 24 Nov 2021 23:10:02 +0100 Subject: [PATCH] feat(prometheus): add more config options to GUI (#1398) * feat(prometheus): add more config options to GUI * move to core --- .../prometheus/.helmignore | 0 .../prometheus/CHANGELOG.md | 0 .../{incubator => core}/prometheus/CONFIG.md | 0 .../{incubator => core}/prometheus/Chart.yaml | 2 +- .../{incubator => core}/prometheus/README.md | 0 .../crds/crd-alertmanager-config.yaml | 0 .../prometheus/crds/crd-alertmanager.yaml | 0 .../prometheus/crds/crd-podmonitor.yaml | 0 .../prometheus/crds/crd-probes.yaml | 0 .../prometheus/crds/crd-prometheus.yaml | 0 .../prometheus/crds/crd-prometheusrules.yaml | 0 .../prometheus/crds/crd-servicemonitor.yaml | 0 .../prometheus/crds/crd-thanosrulers.yaml | 0 .../prometheus/helm-values.md | 0 .../prometheus/questions.yaml | 92 +++++++++++++++++++ .../prometheus/templates/_helpers.tpl | 0 .../templates/alertmanager/_alertmanager.tpl | 0 .../templates/alertmanager/secrets.yaml | 0 .../alertmanager/serviceaccount.yaml | 0 .../alertmanager/servicemonitor.yaml | 0 .../prometheus/templates/common.yaml | 0 .../templates/exporters/core-dns/service.yaml | 0 .../exporters/core-dns/servicemonitor.yaml | 0 .../kube-apiserver/servicemonitor.yaml | 0 .../kube-controller-manager/endpoints.yaml | 0 .../kube-controller-manager/service.yaml | 0 .../servicemonitor.yaml | 0 .../exporters/kube-scheduler/endpoints.yaml | 0 .../exporters/kube-scheduler/service.yaml | 0 .../kube-scheduler/servicemonitor.yaml | 0 .../exporters/kubelet/servicemonitor.yaml | 0 .../prometheus/templates/operator/_args.tpl | 0 .../templates/operator/configmap.yaml | 0 .../templates/operator/servicemonitor.yaml | 0 .../prometheus/_additionalPrometheusRules.tpl | 0 .../prometheus/_additionalScrapeJobs.tpl | 0 .../templates/prometheus/_prometheus.tpl | 0 .../templates/prometheus/_servicemonitor.tpl | 0 .../templates/prometheus/clusterrole.yaml | 0 .../prometheus/clusterrolebinding.yaml | 0 .../templates/prometheus/serviceaccount.yaml | 0 .../prometheus/values.yaml | 4 +- 42 files changed, 95 insertions(+), 3 deletions(-) rename charts/{incubator => core}/prometheus/.helmignore (100%) rename charts/{incubator => core}/prometheus/CHANGELOG.md (100%) rename charts/{incubator => core}/prometheus/CONFIG.md (100%) rename charts/{incubator => core}/prometheus/Chart.yaml (98%) rename charts/{incubator => core}/prometheus/README.md (100%) rename charts/{incubator => core}/prometheus/crds/crd-alertmanager-config.yaml (100%) rename charts/{incubator => core}/prometheus/crds/crd-alertmanager.yaml (100%) rename charts/{incubator => core}/prometheus/crds/crd-podmonitor.yaml (100%) rename charts/{incubator => core}/prometheus/crds/crd-probes.yaml (100%) rename charts/{incubator => core}/prometheus/crds/crd-prometheus.yaml (100%) rename charts/{incubator => core}/prometheus/crds/crd-prometheusrules.yaml (100%) rename charts/{incubator => core}/prometheus/crds/crd-servicemonitor.yaml (100%) rename charts/{incubator => core}/prometheus/crds/crd-thanosrulers.yaml (100%) rename charts/{incubator => core}/prometheus/helm-values.md (100%) rename charts/{incubator => core}/prometheus/questions.yaml (72%) rename charts/{incubator => core}/prometheus/templates/_helpers.tpl (100%) rename charts/{incubator => core}/prometheus/templates/alertmanager/_alertmanager.tpl (100%) rename charts/{incubator => core}/prometheus/templates/alertmanager/secrets.yaml (100%) rename charts/{incubator => core}/prometheus/templates/alertmanager/serviceaccount.yaml (100%) rename charts/{incubator => core}/prometheus/templates/alertmanager/servicemonitor.yaml (100%) rename charts/{incubator => core}/prometheus/templates/common.yaml (100%) rename charts/{incubator => core}/prometheus/templates/exporters/core-dns/service.yaml (100%) rename charts/{incubator => core}/prometheus/templates/exporters/core-dns/servicemonitor.yaml (100%) rename charts/{incubator => core}/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml (100%) rename charts/{incubator => core}/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml (100%) rename charts/{incubator => core}/prometheus/templates/exporters/kube-controller-manager/service.yaml (100%) rename charts/{incubator => core}/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml (100%) rename charts/{incubator => core}/prometheus/templates/exporters/kube-scheduler/endpoints.yaml (100%) rename charts/{incubator => core}/prometheus/templates/exporters/kube-scheduler/service.yaml (100%) rename charts/{incubator => core}/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml (100%) rename charts/{incubator => core}/prometheus/templates/exporters/kubelet/servicemonitor.yaml (100%) rename charts/{incubator => core}/prometheus/templates/operator/_args.tpl (100%) rename charts/{incubator => core}/prometheus/templates/operator/configmap.yaml (100%) rename charts/{incubator => core}/prometheus/templates/operator/servicemonitor.yaml (100%) rename charts/{incubator => core}/prometheus/templates/prometheus/_additionalPrometheusRules.tpl (100%) rename charts/{incubator => core}/prometheus/templates/prometheus/_additionalScrapeJobs.tpl (100%) rename charts/{incubator => core}/prometheus/templates/prometheus/_prometheus.tpl (100%) rename charts/{incubator => core}/prometheus/templates/prometheus/_servicemonitor.tpl (100%) rename charts/{incubator => core}/prometheus/templates/prometheus/clusterrole.yaml (100%) rename charts/{incubator => core}/prometheus/templates/prometheus/clusterrolebinding.yaml (100%) rename charts/{incubator => core}/prometheus/templates/prometheus/serviceaccount.yaml (100%) rename charts/{incubator => core}/prometheus/values.yaml (99%) diff --git a/charts/incubator/prometheus/.helmignore b/charts/core/prometheus/.helmignore similarity index 100% rename from charts/incubator/prometheus/.helmignore rename to charts/core/prometheus/.helmignore diff --git a/charts/incubator/prometheus/CHANGELOG.md b/charts/core/prometheus/CHANGELOG.md similarity index 100% rename from charts/incubator/prometheus/CHANGELOG.md rename to charts/core/prometheus/CHANGELOG.md diff --git a/charts/incubator/prometheus/CONFIG.md b/charts/core/prometheus/CONFIG.md similarity index 100% rename from charts/incubator/prometheus/CONFIG.md rename to charts/core/prometheus/CONFIG.md diff --git a/charts/incubator/prometheus/Chart.yaml b/charts/core/prometheus/Chart.yaml similarity index 98% rename from charts/incubator/prometheus/Chart.yaml rename to charts/core/prometheus/Chart.yaml index 5943d994ee8..9bd6e87deca 100644 --- a/charts/incubator/prometheus/Chart.yaml +++ b/charts/core/prometheus/Chart.yaml @@ -20,7 +20,7 @@ sources: - https://github.com/prometheus-community/helm-charts - https://github.com/prometheus-operator/kube-prometheus type: application -version: 0.0.10 +version: 1.0.0 annotations: truecharts.org/catagories: | - metrics diff --git a/charts/incubator/prometheus/README.md b/charts/core/prometheus/README.md similarity index 100% rename from charts/incubator/prometheus/README.md rename to charts/core/prometheus/README.md diff --git a/charts/incubator/prometheus/crds/crd-alertmanager-config.yaml b/charts/core/prometheus/crds/crd-alertmanager-config.yaml similarity index 100% rename from charts/incubator/prometheus/crds/crd-alertmanager-config.yaml rename to charts/core/prometheus/crds/crd-alertmanager-config.yaml diff --git a/charts/incubator/prometheus/crds/crd-alertmanager.yaml b/charts/core/prometheus/crds/crd-alertmanager.yaml similarity index 100% rename from charts/incubator/prometheus/crds/crd-alertmanager.yaml rename to charts/core/prometheus/crds/crd-alertmanager.yaml diff --git a/charts/incubator/prometheus/crds/crd-podmonitor.yaml b/charts/core/prometheus/crds/crd-podmonitor.yaml similarity index 100% rename from charts/incubator/prometheus/crds/crd-podmonitor.yaml rename to charts/core/prometheus/crds/crd-podmonitor.yaml diff --git a/charts/incubator/prometheus/crds/crd-probes.yaml b/charts/core/prometheus/crds/crd-probes.yaml similarity index 100% rename from charts/incubator/prometheus/crds/crd-probes.yaml rename to charts/core/prometheus/crds/crd-probes.yaml diff --git a/charts/incubator/prometheus/crds/crd-prometheus.yaml b/charts/core/prometheus/crds/crd-prometheus.yaml similarity index 100% rename from charts/incubator/prometheus/crds/crd-prometheus.yaml rename to charts/core/prometheus/crds/crd-prometheus.yaml diff --git a/charts/incubator/prometheus/crds/crd-prometheusrules.yaml b/charts/core/prometheus/crds/crd-prometheusrules.yaml similarity index 100% rename from charts/incubator/prometheus/crds/crd-prometheusrules.yaml rename to charts/core/prometheus/crds/crd-prometheusrules.yaml diff --git a/charts/incubator/prometheus/crds/crd-servicemonitor.yaml b/charts/core/prometheus/crds/crd-servicemonitor.yaml similarity index 100% rename from charts/incubator/prometheus/crds/crd-servicemonitor.yaml rename to charts/core/prometheus/crds/crd-servicemonitor.yaml diff --git a/charts/incubator/prometheus/crds/crd-thanosrulers.yaml b/charts/core/prometheus/crds/crd-thanosrulers.yaml similarity index 100% rename from charts/incubator/prometheus/crds/crd-thanosrulers.yaml rename to charts/core/prometheus/crds/crd-thanosrulers.yaml diff --git a/charts/incubator/prometheus/helm-values.md b/charts/core/prometheus/helm-values.md similarity index 100% rename from charts/incubator/prometheus/helm-values.md rename to charts/core/prometheus/helm-values.md diff --git a/charts/incubator/prometheus/questions.yaml b/charts/core/prometheus/questions.yaml similarity index 72% rename from charts/incubator/prometheus/questions.yaml rename to charts/core/prometheus/questions.yaml index d0780544f43..66a7454b7c5 100644 --- a/charts/incubator/prometheus/questions.yaml +++ b/charts/core/prometheus/questions.yaml @@ -24,6 +24,98 @@ questions: type: boolean default: true + - variable: operator + group: "App Configuration" + label: "Operator Settings" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable" + schema: + type: boolean + default: true + show_subquestions_if: true + subquestions: + - variable: logLevel + label: "Log Level" + description: "Log level for Operator" + schema: + type: string + default: "info" + + + - variable: prometheus + group: "App Configuration" + label: "Prometheus Settings" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable" + schema: + type: boolean + default: true + show_subquestions_if: true + subquestions: + - variable: logLevel + label: "Log Level" + description: "Log level for Prometheus" + schema: + type: string + default: "info" + - variable: retention + label: "Retention" + description: "Metrics retention days" + schema: + type: string + default: "31d" + - variable: retentionSize + label: "Max Retention Size" + description: "Maximum size of metrics" + schema: + type: string + default: "" + - variable: disableCompaction + label: "Disable Compaction" + description: "Disable the compaction of the Prometheus TSDB" + schema: + type: boolean + default: false + - variable: walCompression + label: "WAL Compression" + description: "Enable compression of the write-ahead log using Snappy" + schema: + type: boolean + default: false + + + - variable: alertmanager + group: "App Configuration" + label: "Alertmanager Settings" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable" + schema: + type: boolean + default: true + show_subquestions_if: true + subquestions: + - variable: logLevel + label: "Log Level" + description: "Log level for Alertmanager" + schema: + type: string + default: "info" + - variable: retention + label: "Retention" + description: "Metrics retention days" + schema: + type: string + default: "240h" + - variable: service group: "Networking and Services" diff --git a/charts/incubator/prometheus/templates/_helpers.tpl b/charts/core/prometheus/templates/_helpers.tpl similarity index 100% rename from charts/incubator/prometheus/templates/_helpers.tpl rename to charts/core/prometheus/templates/_helpers.tpl diff --git a/charts/incubator/prometheus/templates/alertmanager/_alertmanager.tpl b/charts/core/prometheus/templates/alertmanager/_alertmanager.tpl similarity index 100% rename from charts/incubator/prometheus/templates/alertmanager/_alertmanager.tpl rename to charts/core/prometheus/templates/alertmanager/_alertmanager.tpl diff --git a/charts/incubator/prometheus/templates/alertmanager/secrets.yaml b/charts/core/prometheus/templates/alertmanager/secrets.yaml similarity index 100% rename from charts/incubator/prometheus/templates/alertmanager/secrets.yaml rename to charts/core/prometheus/templates/alertmanager/secrets.yaml diff --git a/charts/incubator/prometheus/templates/alertmanager/serviceaccount.yaml b/charts/core/prometheus/templates/alertmanager/serviceaccount.yaml similarity index 100% rename from charts/incubator/prometheus/templates/alertmanager/serviceaccount.yaml rename to charts/core/prometheus/templates/alertmanager/serviceaccount.yaml diff --git a/charts/incubator/prometheus/templates/alertmanager/servicemonitor.yaml b/charts/core/prometheus/templates/alertmanager/servicemonitor.yaml similarity index 100% rename from charts/incubator/prometheus/templates/alertmanager/servicemonitor.yaml rename to charts/core/prometheus/templates/alertmanager/servicemonitor.yaml diff --git a/charts/incubator/prometheus/templates/common.yaml b/charts/core/prometheus/templates/common.yaml similarity index 100% rename from charts/incubator/prometheus/templates/common.yaml rename to charts/core/prometheus/templates/common.yaml diff --git a/charts/incubator/prometheus/templates/exporters/core-dns/service.yaml b/charts/core/prometheus/templates/exporters/core-dns/service.yaml similarity index 100% rename from charts/incubator/prometheus/templates/exporters/core-dns/service.yaml rename to charts/core/prometheus/templates/exporters/core-dns/service.yaml diff --git a/charts/incubator/prometheus/templates/exporters/core-dns/servicemonitor.yaml b/charts/core/prometheus/templates/exporters/core-dns/servicemonitor.yaml similarity index 100% rename from charts/incubator/prometheus/templates/exporters/core-dns/servicemonitor.yaml rename to charts/core/prometheus/templates/exporters/core-dns/servicemonitor.yaml diff --git a/charts/incubator/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml b/charts/core/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml similarity index 100% rename from charts/incubator/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml rename to charts/core/prometheus/templates/exporters/kube-apiserver/servicemonitor.yaml diff --git a/charts/incubator/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml b/charts/core/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml similarity index 100% rename from charts/incubator/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml rename to charts/core/prometheus/templates/exporters/kube-controller-manager/endpoints.yaml diff --git a/charts/incubator/prometheus/templates/exporters/kube-controller-manager/service.yaml b/charts/core/prometheus/templates/exporters/kube-controller-manager/service.yaml similarity index 100% rename from charts/incubator/prometheus/templates/exporters/kube-controller-manager/service.yaml rename to charts/core/prometheus/templates/exporters/kube-controller-manager/service.yaml diff --git a/charts/incubator/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml b/charts/core/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml similarity index 100% rename from charts/incubator/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml rename to charts/core/prometheus/templates/exporters/kube-controller-manager/servicemonitor.yaml diff --git a/charts/incubator/prometheus/templates/exporters/kube-scheduler/endpoints.yaml b/charts/core/prometheus/templates/exporters/kube-scheduler/endpoints.yaml similarity index 100% rename from charts/incubator/prometheus/templates/exporters/kube-scheduler/endpoints.yaml rename to charts/core/prometheus/templates/exporters/kube-scheduler/endpoints.yaml diff --git a/charts/incubator/prometheus/templates/exporters/kube-scheduler/service.yaml b/charts/core/prometheus/templates/exporters/kube-scheduler/service.yaml similarity index 100% rename from charts/incubator/prometheus/templates/exporters/kube-scheduler/service.yaml rename to charts/core/prometheus/templates/exporters/kube-scheduler/service.yaml diff --git a/charts/incubator/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml b/charts/core/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml similarity index 100% rename from charts/incubator/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml rename to charts/core/prometheus/templates/exporters/kube-scheduler/servicemonitor.yaml diff --git a/charts/incubator/prometheus/templates/exporters/kubelet/servicemonitor.yaml b/charts/core/prometheus/templates/exporters/kubelet/servicemonitor.yaml similarity index 100% rename from charts/incubator/prometheus/templates/exporters/kubelet/servicemonitor.yaml rename to charts/core/prometheus/templates/exporters/kubelet/servicemonitor.yaml diff --git a/charts/incubator/prometheus/templates/operator/_args.tpl b/charts/core/prometheus/templates/operator/_args.tpl similarity index 100% rename from charts/incubator/prometheus/templates/operator/_args.tpl rename to charts/core/prometheus/templates/operator/_args.tpl diff --git a/charts/incubator/prometheus/templates/operator/configmap.yaml b/charts/core/prometheus/templates/operator/configmap.yaml similarity index 100% rename from charts/incubator/prometheus/templates/operator/configmap.yaml rename to charts/core/prometheus/templates/operator/configmap.yaml diff --git a/charts/incubator/prometheus/templates/operator/servicemonitor.yaml b/charts/core/prometheus/templates/operator/servicemonitor.yaml similarity index 100% rename from charts/incubator/prometheus/templates/operator/servicemonitor.yaml rename to charts/core/prometheus/templates/operator/servicemonitor.yaml diff --git a/charts/incubator/prometheus/templates/prometheus/_additionalPrometheusRules.tpl b/charts/core/prometheus/templates/prometheus/_additionalPrometheusRules.tpl similarity index 100% rename from charts/incubator/prometheus/templates/prometheus/_additionalPrometheusRules.tpl rename to charts/core/prometheus/templates/prometheus/_additionalPrometheusRules.tpl diff --git a/charts/incubator/prometheus/templates/prometheus/_additionalScrapeJobs.tpl b/charts/core/prometheus/templates/prometheus/_additionalScrapeJobs.tpl similarity index 100% rename from charts/incubator/prometheus/templates/prometheus/_additionalScrapeJobs.tpl rename to charts/core/prometheus/templates/prometheus/_additionalScrapeJobs.tpl diff --git a/charts/incubator/prometheus/templates/prometheus/_prometheus.tpl b/charts/core/prometheus/templates/prometheus/_prometheus.tpl similarity index 100% rename from charts/incubator/prometheus/templates/prometheus/_prometheus.tpl rename to charts/core/prometheus/templates/prometheus/_prometheus.tpl diff --git a/charts/incubator/prometheus/templates/prometheus/_servicemonitor.tpl b/charts/core/prometheus/templates/prometheus/_servicemonitor.tpl similarity index 100% rename from charts/incubator/prometheus/templates/prometheus/_servicemonitor.tpl rename to charts/core/prometheus/templates/prometheus/_servicemonitor.tpl diff --git a/charts/incubator/prometheus/templates/prometheus/clusterrole.yaml b/charts/core/prometheus/templates/prometheus/clusterrole.yaml similarity index 100% rename from charts/incubator/prometheus/templates/prometheus/clusterrole.yaml rename to charts/core/prometheus/templates/prometheus/clusterrole.yaml diff --git a/charts/incubator/prometheus/templates/prometheus/clusterrolebinding.yaml b/charts/core/prometheus/templates/prometheus/clusterrolebinding.yaml similarity index 100% rename from charts/incubator/prometheus/templates/prometheus/clusterrolebinding.yaml rename to charts/core/prometheus/templates/prometheus/clusterrolebinding.yaml diff --git a/charts/incubator/prometheus/templates/prometheus/serviceaccount.yaml b/charts/core/prometheus/templates/prometheus/serviceaccount.yaml similarity index 100% rename from charts/incubator/prometheus/templates/prometheus/serviceaccount.yaml rename to charts/core/prometheus/templates/prometheus/serviceaccount.yaml diff --git a/charts/incubator/prometheus/values.yaml b/charts/core/prometheus/values.yaml similarity index 99% rename from charts/incubator/prometheus/values.yaml rename to charts/core/prometheus/values.yaml index 636c213d44a..7aae2ff1a97 100644 --- a/charts/incubator/prometheus/values.yaml +++ b/charts/core/prometheus/values.yaml @@ -528,7 +528,7 @@ prometheus: probeNamespaceSelector: {} ## @param prometheus.retention Metrics retention days ## - retention: 10d + retention: 31d ## @param prometheus.retentionSize Maximum size of metrics ## retentionSize: "" @@ -1062,7 +1062,7 @@ alertmanager: configMaps: [] ## @param alertmanager.retention Metrics retention days ## - retention: 120h + retention: 240h ## @param alertmanager.storageSpec Alertmanager StorageSpec for persistent data ## ref: https://github.com/prometheus-operator/prometheus-operator/blob/master/Documentation/user-guides/storage.md ##