(dev-v2.6-archive) [rancher-monitoring] update chart information

(partially cherry picked from commit 8a7dbb7a7b)
pull/1680/head
Jiaqi Luo 2021-11-04 17:36:56 -07:00 committed by Arvind Iyengar
parent c81930bacf
commit 5d26f4e0b8
No known key found for this signature in database
GPG Key ID: A8DD9BFD6C811498
2 changed files with 21 additions and 3 deletions

View File

@ -13,3 +13,17 @@ The chart installs the following components:
- [Prometheus Adapter](https://github.com/helm/charts/tree/master/stable/prometheus-adapter) - The adapter allows a user to expose custom metrics, resource metrics, and external metrics on the default [Prometheus](https://prometheus.io/) instance to the Kubernetes API Server.
For more information, review the Helm README of this chart.
## Upgrading from 100.0.0+up16.6.0 to 100.1.0+up19.0.3
### Noticeable changes:
Grafana:
- `sidecar.dashboards.searchNamespace`, `sidecar.datasources.searchNamespace` and `sidecar.notifiers.searchNamespace` support a list of namespaces now.
Kube-state-metrics
- the type of `collectors` is changed from Dictionary to List.
- `kubeStateMetrics.serviceMonitor.namespaceOverride` was replaced by `kube-state-metrics.namespaceOverride`.
### Known issues:
- Occasionally, the upgrade fails with errors related to the webhook `prometheusrulemutate.monitoring.coreos.com`. This is a known issue in the upstream, and the workaround is to trigger the upgrade one more time. [32416](https://github.com/rancher/rancher/issues/32416#issuecomment-828881726)

View File

@ -1,6 +1,6 @@
--- charts-original/Chart.yaml
+++ charts/Chart.yaml
@@ -1,3 +1,35 @@
@@ -1,3 +1,38 @@
+apiVersion: v2
+description: Collects several related Helm charts, 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,6 +20,9 @@
+ - name: Arvind
+ email: arvind.iyengar@suse.com
+ url: ""
+ - name: Jack
+ email: jiaqi.luo@suse.com
+ url: "https://github.com/jiaqiluo"
+name: rancher-monitoring
+sources:
+ - https://github.com/prometheus-community/helm-charts
@ -36,7 +39,7 @@
annotations:
artifacthub.io/links: |
- name: Chart Source
@@ -5,8 +37,16 @@
@@ -5,8 +40,17 @@
- name: Upstream Project
url: https://github.com/prometheus-operator/kube-prometheus
artifacthub.io/operator: "true"
@ -52,10 +55,11 @@
+ catalog.cattle.io/auto-install: rancher-monitoring-crd=match
+ catalog.cattle.io/requests-cpu: "4500m"
+ catalog.cattle.io/requests-memory: "4000Mi"
+ catalog.cattle.io/rancher-version: ">= 2.6.0-0 <=2.6.99-0"
dependencies:
- condition: grafana.enabled
name: grafana
@@ -71,34 +111,6 @@
@@ -71,34 +115,6 @@
- condition: rkeScheduler.enabled
name: rkeScheduler
repository: file://./charts/rkeScheduler