diff --git a/core/prometheus/1.0.1/Chart.lock b/core/prometheus/1.0.1/Chart.lock
deleted file mode 100644
index 50229fc7c76..00000000000
--- a/core/prometheus/1.0.1/Chart.lock
+++ /dev/null
@@ -1,6 +0,0 @@
-dependencies:
-- name: common
- repository: https://truecharts.org
- version: 8.9.3
-digest: sha256:8e3b075bc94570b49db18d1ea9431f95ed06504fb372ee04f43c667c784d7b14
-generated: "2021-11-24T23:15:01.447826185Z"
diff --git a/core/prometheus/1.0.1/CHANGELOG.md b/core/prometheus/1.1.0/CHANGELOG.md
similarity index 88%
rename from core/prometheus/1.0.1/CHANGELOG.md
rename to core/prometheus/1.1.0/CHANGELOG.md
index e14f8e7e45a..51865e4d573 100644
--- a/core/prometheus/1.0.1/CHANGELOG.md
+++ b/core/prometheus/1.1.0/CHANGELOG.md
@@ -1,6 +1,15 @@
# Changelog
+
+### [prometheus-1.1.0](https://github.com/truecharts/apps/compare/uptimerobot-prometheus-1.0.0...prometheus-1.1.0) (2021-11-25)
+
+#### Feat
+
+* add more default exporters to prometheus ([#1406](https://github.com/truecharts/apps/issues/1406))
+
+
+
### [prometheus-1.0.1](https://github.com/truecharts/apps/compare/prometheus-1.0.0...prometheus-1.0.1) (2021-11-24)
@@ -88,12 +97,3 @@
#### Fix
* more thoroughly show services on SCALE
-
-
-
-
-### prometheus-0.0.1 (2021-11-22)
-
-#### Add
-
-* add prometheus prototype ([#1379](https://github.com/truecharts/apps/issues/1379))
diff --git a/core/prometheus/1.0.1/CONFIG.md b/core/prometheus/1.1.0/CONFIG.md
similarity index 100%
rename from core/prometheus/1.0.1/CONFIG.md
rename to core/prometheus/1.1.0/CONFIG.md
diff --git a/core/prometheus/1.1.0/Chart.lock b/core/prometheus/1.1.0/Chart.lock
new file mode 100644
index 00000000000..58c4c8e5741
--- /dev/null
+++ b/core/prometheus/1.1.0/Chart.lock
@@ -0,0 +1,12 @@
+dependencies:
+- name: common
+ repository: https://truecharts.org
+ version: 8.9.3
+- name: node-exporter
+ repository: https://charts.bitnami.com/bitnami
+ version: 2.3.15
+- name: kube-state-metrics
+ repository: https://charts.bitnami.com/bitnami
+ version: 2.1.17
+digest: sha256:314bf8fc31efc004583e2cc36dfd4844c5a34515c600c5fb7e15a470255dd058
+generated: "2021-11-25T20:02:24.030571271Z"
diff --git a/core/prometheus/1.0.1/Chart.yaml b/core/prometheus/1.1.0/Chart.yaml
similarity index 75%
rename from core/prometheus/1.0.1/Chart.yaml
rename to core/prometheus/1.1.0/Chart.yaml
index e55896aedff..efd8a489735 100644
--- a/core/prometheus/1.0.1/Chart.yaml
+++ b/core/prometheus/1.1.0/Chart.yaml
@@ -4,6 +4,14 @@ dependencies:
- name: common
repository: https://truecharts.org
version: 8.9.3
+- condition: exporters.enabled,exporters.node-exporter.enabled
+ name: node-exporter
+ repository: https://charts.bitnami.com/bitnami
+ version: 2.3.15
+- condition: exporters.enabled,exporters.kube-state-metrics.enabled
+ name: kube-state-metrics
+ repository: https://charts.bitnami.com/bitnami
+ version: 2.1.17
deprecated: false
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
@@ -20,7 +28,7 @@ sources:
- https://github.com/prometheus-community/helm-charts
- https://github.com/prometheus-operator/kube-prometheus
type: application
-version: 1.0.1
+version: 1.1.0
annotations:
truecharts.org/catagories: |
- metrics
diff --git a/core/prometheus/1.0.1/README.md b/core/prometheus/1.1.0/README.md
similarity index 92%
rename from core/prometheus/1.0.1/README.md
rename to core/prometheus/1.1.0/README.md
index 559451db26f..49f9c3327a2 100644
--- a/core/prometheus/1.0.1/README.md
+++ b/core/prometheus/1.1.0/README.md
@@ -18,6 +18,8 @@ Kubernetes: `>=1.16.0-0`
| Repository | Name | Version |
|------------|------|---------|
+| https://charts.bitnami.com/bitnami | kube-state-metrics | 2.1.17 |
+| https://charts.bitnami.com/bitnami | node-exporter | 2.3.15 |
| https://truecharts.org | common | 8.9.3 |
## Installing the Chart
diff --git a/core/prometheus/1.0.1/app-readme.md b/core/prometheus/1.1.0/app-readme.md
similarity index 100%
rename from core/prometheus/1.0.1/app-readme.md
rename to core/prometheus/1.1.0/app-readme.md
diff --git a/core/prometheus/1.0.1/charts/common-8.9.3.tgz b/core/prometheus/1.1.0/charts/common-8.9.3.tgz
similarity index 100%
rename from core/prometheus/1.0.1/charts/common-8.9.3.tgz
rename to core/prometheus/1.1.0/charts/common-8.9.3.tgz
diff --git a/core/prometheus/1.1.0/charts/kube-state-metrics-2.1.17.tgz b/core/prometheus/1.1.0/charts/kube-state-metrics-2.1.17.tgz
new file mode 100644
index 00000000000..4c149851b8e
Binary files /dev/null and b/core/prometheus/1.1.0/charts/kube-state-metrics-2.1.17.tgz differ
diff --git a/core/prometheus/1.1.0/charts/node-exporter-2.3.15.tgz b/core/prometheus/1.1.0/charts/node-exporter-2.3.15.tgz
new file mode 100644
index 00000000000..36345695b1d
Binary files /dev/null and b/core/prometheus/1.1.0/charts/node-exporter-2.3.15.tgz differ
diff --git a/core/prometheus/1.0.1/crds/crd-alertmanager-config.yaml b/core/prometheus/1.1.0/crds/crd-alertmanager-config.yaml
similarity index 100%
rename from core/prometheus/1.0.1/crds/crd-alertmanager-config.yaml
rename to core/prometheus/1.1.0/crds/crd-alertmanager-config.yaml
diff --git a/core/prometheus/1.0.1/crds/crd-alertmanager.yaml b/core/prometheus/1.1.0/crds/crd-alertmanager.yaml
similarity index 100%
rename from core/prometheus/1.0.1/crds/crd-alertmanager.yaml
rename to core/prometheus/1.1.0/crds/crd-alertmanager.yaml
diff --git a/core/prometheus/1.0.1/crds/crd-podmonitor.yaml b/core/prometheus/1.1.0/crds/crd-podmonitor.yaml
similarity index 100%
rename from core/prometheus/1.0.1/crds/crd-podmonitor.yaml
rename to core/prometheus/1.1.0/crds/crd-podmonitor.yaml
diff --git a/core/prometheus/1.0.1/crds/crd-probes.yaml b/core/prometheus/1.1.0/crds/crd-probes.yaml
similarity index 100%
rename from core/prometheus/1.0.1/crds/crd-probes.yaml
rename to core/prometheus/1.1.0/crds/crd-probes.yaml
diff --git a/core/prometheus/1.0.1/crds/crd-prometheus.yaml b/core/prometheus/1.1.0/crds/crd-prometheus.yaml
similarity index 100%
rename from core/prometheus/1.0.1/crds/crd-prometheus.yaml
rename to core/prometheus/1.1.0/crds/crd-prometheus.yaml
diff --git a/core/prometheus/1.0.1/crds/crd-prometheusrules.yaml b/core/prometheus/1.1.0/crds/crd-prometheusrules.yaml
similarity index 100%
rename from core/prometheus/1.0.1/crds/crd-prometheusrules.yaml
rename to core/prometheus/1.1.0/crds/crd-prometheusrules.yaml
diff --git a/core/prometheus/1.0.1/crds/crd-servicemonitor.yaml b/core/prometheus/1.1.0/crds/crd-servicemonitor.yaml
similarity index 100%
rename from core/prometheus/1.0.1/crds/crd-servicemonitor.yaml
rename to core/prometheus/1.1.0/crds/crd-servicemonitor.yaml
diff --git a/core/prometheus/1.0.1/crds/crd-thanosrulers.yaml b/core/prometheus/1.1.0/crds/crd-thanosrulers.yaml
similarity index 100%
rename from core/prometheus/1.0.1/crds/crd-thanosrulers.yaml
rename to core/prometheus/1.1.0/crds/crd-thanosrulers.yaml
diff --git a/core/prometheus/1.0.1/helm-values.md b/core/prometheus/1.1.0/helm-values.md
similarity index 100%
rename from core/prometheus/1.0.1/helm-values.md
rename to core/prometheus/1.1.0/helm-values.md
diff --git a/core/prometheus/1.0.1/ix_values.yaml b/core/prometheus/1.1.0/ix_values.yaml
similarity index 100%
rename from core/prometheus/1.0.1/ix_values.yaml
rename to core/prometheus/1.1.0/ix_values.yaml
diff --git a/core/prometheus/1.0.1/questions.yaml b/core/prometheus/1.1.0/questions.yaml
similarity index 100%
rename from core/prometheus/1.0.1/questions.yaml
rename to core/prometheus/1.1.0/questions.yaml
diff --git a/core/prometheus/1.0.1/templates/_helpers.tpl b/core/prometheus/1.1.0/templates/_helpers.tpl
similarity index 100%
rename from core/prometheus/1.0.1/templates/_helpers.tpl
rename to core/prometheus/1.1.0/templates/_helpers.tpl
diff --git a/core/prometheus/1.0.1/templates/alertmanager/_alertmanager.tpl b/core/prometheus/1.1.0/templates/alertmanager/_alertmanager.tpl
similarity index 100%
rename from core/prometheus/1.0.1/templates/alertmanager/_alertmanager.tpl
rename to core/prometheus/1.1.0/templates/alertmanager/_alertmanager.tpl
diff --git a/core/prometheus/1.0.1/templates/alertmanager/secrets.yaml b/core/prometheus/1.1.0/templates/alertmanager/secrets.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/alertmanager/secrets.yaml
rename to core/prometheus/1.1.0/templates/alertmanager/secrets.yaml
diff --git a/core/prometheus/1.0.1/templates/alertmanager/serviceaccount.yaml b/core/prometheus/1.1.0/templates/alertmanager/serviceaccount.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/alertmanager/serviceaccount.yaml
rename to core/prometheus/1.1.0/templates/alertmanager/serviceaccount.yaml
diff --git a/core/prometheus/1.0.1/templates/alertmanager/servicemonitor.yaml b/core/prometheus/1.1.0/templates/alertmanager/servicemonitor.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/alertmanager/servicemonitor.yaml
rename to core/prometheus/1.1.0/templates/alertmanager/servicemonitor.yaml
diff --git a/core/prometheus/1.0.1/templates/common.yaml b/core/prometheus/1.1.0/templates/common.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/common.yaml
rename to core/prometheus/1.1.0/templates/common.yaml
diff --git a/core/prometheus/1.0.1/templates/exporters/core-dns/service.yaml b/core/prometheus/1.1.0/templates/exporters/core-dns/service.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/exporters/core-dns/service.yaml
rename to core/prometheus/1.1.0/templates/exporters/core-dns/service.yaml
diff --git a/core/prometheus/1.0.1/templates/exporters/core-dns/servicemonitor.yaml b/core/prometheus/1.1.0/templates/exporters/core-dns/servicemonitor.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/exporters/core-dns/servicemonitor.yaml
rename to core/prometheus/1.1.0/templates/exporters/core-dns/servicemonitor.yaml
diff --git a/core/prometheus/1.0.1/templates/exporters/kube-apiserver/servicemonitor.yaml b/core/prometheus/1.1.0/templates/exporters/kube-apiserver/servicemonitor.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/exporters/kube-apiserver/servicemonitor.yaml
rename to core/prometheus/1.1.0/templates/exporters/kube-apiserver/servicemonitor.yaml
diff --git a/core/prometheus/1.0.1/templates/exporters/kube-controller-manager/endpoints.yaml b/core/prometheus/1.1.0/templates/exporters/kube-controller-manager/endpoints.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/exporters/kube-controller-manager/endpoints.yaml
rename to core/prometheus/1.1.0/templates/exporters/kube-controller-manager/endpoints.yaml
diff --git a/core/prometheus/1.0.1/templates/exporters/kube-controller-manager/service.yaml b/core/prometheus/1.1.0/templates/exporters/kube-controller-manager/service.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/exporters/kube-controller-manager/service.yaml
rename to core/prometheus/1.1.0/templates/exporters/kube-controller-manager/service.yaml
diff --git a/core/prometheus/1.0.1/templates/exporters/kube-controller-manager/servicemonitor.yaml b/core/prometheus/1.1.0/templates/exporters/kube-controller-manager/servicemonitor.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/exporters/kube-controller-manager/servicemonitor.yaml
rename to core/prometheus/1.1.0/templates/exporters/kube-controller-manager/servicemonitor.yaml
diff --git a/core/prometheus/1.0.1/templates/exporters/kube-scheduler/endpoints.yaml b/core/prometheus/1.1.0/templates/exporters/kube-scheduler/endpoints.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/exporters/kube-scheduler/endpoints.yaml
rename to core/prometheus/1.1.0/templates/exporters/kube-scheduler/endpoints.yaml
diff --git a/core/prometheus/1.0.1/templates/exporters/kube-scheduler/service.yaml b/core/prometheus/1.1.0/templates/exporters/kube-scheduler/service.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/exporters/kube-scheduler/service.yaml
rename to core/prometheus/1.1.0/templates/exporters/kube-scheduler/service.yaml
diff --git a/core/prometheus/1.0.1/templates/exporters/kube-scheduler/servicemonitor.yaml b/core/prometheus/1.1.0/templates/exporters/kube-scheduler/servicemonitor.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/exporters/kube-scheduler/servicemonitor.yaml
rename to core/prometheus/1.1.0/templates/exporters/kube-scheduler/servicemonitor.yaml
diff --git a/core/prometheus/1.0.1/templates/exporters/kubelet/servicemonitor.yaml b/core/prometheus/1.1.0/templates/exporters/kubelet/servicemonitor.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/exporters/kubelet/servicemonitor.yaml
rename to core/prometheus/1.1.0/templates/exporters/kubelet/servicemonitor.yaml
diff --git a/core/prometheus/1.0.1/templates/operator/_args.tpl b/core/prometheus/1.1.0/templates/operator/_args.tpl
similarity index 100%
rename from core/prometheus/1.0.1/templates/operator/_args.tpl
rename to core/prometheus/1.1.0/templates/operator/_args.tpl
diff --git a/core/prometheus/1.0.1/templates/operator/configmap.yaml b/core/prometheus/1.1.0/templates/operator/configmap.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/operator/configmap.yaml
rename to core/prometheus/1.1.0/templates/operator/configmap.yaml
diff --git a/core/prometheus/1.0.1/templates/operator/servicemonitor.yaml b/core/prometheus/1.1.0/templates/operator/servicemonitor.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/operator/servicemonitor.yaml
rename to core/prometheus/1.1.0/templates/operator/servicemonitor.yaml
diff --git a/core/prometheus/1.0.1/templates/prometheus/_additionalPrometheusRules.tpl b/core/prometheus/1.1.0/templates/prometheus/_additionalPrometheusRules.tpl
similarity index 100%
rename from core/prometheus/1.0.1/templates/prometheus/_additionalPrometheusRules.tpl
rename to core/prometheus/1.1.0/templates/prometheus/_additionalPrometheusRules.tpl
diff --git a/core/prometheus/1.0.1/templates/prometheus/_additionalScrapeJobs.tpl b/core/prometheus/1.1.0/templates/prometheus/_additionalScrapeJobs.tpl
similarity index 100%
rename from core/prometheus/1.0.1/templates/prometheus/_additionalScrapeJobs.tpl
rename to core/prometheus/1.1.0/templates/prometheus/_additionalScrapeJobs.tpl
diff --git a/core/prometheus/1.0.1/templates/prometheus/_prometheus.tpl b/core/prometheus/1.1.0/templates/prometheus/_prometheus.tpl
similarity index 100%
rename from core/prometheus/1.0.1/templates/prometheus/_prometheus.tpl
rename to core/prometheus/1.1.0/templates/prometheus/_prometheus.tpl
diff --git a/core/prometheus/1.0.1/templates/prometheus/_servicemonitor.tpl b/core/prometheus/1.1.0/templates/prometheus/_servicemonitor.tpl
similarity index 100%
rename from core/prometheus/1.0.1/templates/prometheus/_servicemonitor.tpl
rename to core/prometheus/1.1.0/templates/prometheus/_servicemonitor.tpl
diff --git a/core/prometheus/1.0.1/templates/prometheus/clusterrole.yaml b/core/prometheus/1.1.0/templates/prometheus/clusterrole.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/prometheus/clusterrole.yaml
rename to core/prometheus/1.1.0/templates/prometheus/clusterrole.yaml
diff --git a/core/prometheus/1.0.1/templates/prometheus/clusterrolebinding.yaml b/core/prometheus/1.1.0/templates/prometheus/clusterrolebinding.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/prometheus/clusterrolebinding.yaml
rename to core/prometheus/1.1.0/templates/prometheus/clusterrolebinding.yaml
diff --git a/core/prometheus/1.0.1/templates/prometheus/serviceaccount.yaml b/core/prometheus/1.1.0/templates/prometheus/serviceaccount.yaml
similarity index 100%
rename from core/prometheus/1.0.1/templates/prometheus/serviceaccount.yaml
rename to core/prometheus/1.1.0/templates/prometheus/serviceaccount.yaml
diff --git a/core/prometheus/1.0.1/values.yaml b/core/prometheus/1.1.0/values.yaml
similarity index 100%
rename from core/prometheus/1.0.1/values.yaml
rename to core/prometheus/1.1.0/values.yaml