rancher · lucasmlp · Aug 14, 2023
@@ -9,7 +9,7 @@
    catalog.cattle.io/os: linux,windows
    catalog.cattle.io/permits-os: linux,windows
    catalog.cattle.io/provides-gvr: helm.cattle.io.projecthelmchart/v1alpha1
-+  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
++  catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
    catalog.cattle.io/release-name: prometheus-federator
  apiVersion: v2
  appVersion: 0.3.2
@@ -1,4 +1,5 @@
 url: https://github.com/rancher/prometheus-federator.git
 subdirectory: charts/prometheus-federator/0.3.3
 commit: 002944bfa164dc325613e2acd9a00e9014799297
-version: 3.0.0
+version: 103.0.0
+doNotRelease: true
@@ -1,5 +1,5 @@
 url: https://github.com/grafana/helm-charts.git
 subdirectory: charts/grafana
 commit: 74c1f4c96e174ca140cfc24e1327393c82478214
-version: 102.0.1
+version: 103.0.0
 doNotRelease: true
@@ -1,5 +1,5 @@
 url: https://github.com/prometheus-community/helm-charts.git
 subdirectory: charts/kube-state-metrics
 commit: 09118d526a5ca562fde11502621c16a8960a2ee0
-version: 102.0.1
+version: 103.0.0
 doNotRelease: true
@@ -12,7 +12,7 @@
 +  catalog.cattle.io/namespace: cattle-monitoring-system
 +  catalog.cattle.io/permits-os: linux,windows
 +  catalog.cattle.io/provides-gvr: monitoring.coreos.com.prometheus/v1
-+  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.8.0-0'
++  catalog.cattle.io/rancher-version: '>= 2.8.0-0 < 2.9.0-0'
 +  catalog.cattle.io/release-name: rancher-monitoring
 +  catalog.cattle.io/requests-cpu: 4500m
 +  catalog.cattle.io/requests-memory: 4000Mi

@@ -1,6 +1,6 @@
 --- charts-original/README.md
 +++ charts/README.md
-@@ -457,7 +457,39 @@
+@@ -457,8 +457,40 @@
  helm show values prometheus-community/kube-prometheus-stack
  ```
 
@@ -23,7 +23,7 @@
 +| `prometheus.prometheusSpec.ignoreNamespaceSelectors` | Ignore NamespaceSelector settings from the PodMonitor and ServiceMonitor configs. If true, PodMonitors and ServiceMonitors can only discover Pods and Services within the namespace they are deployed into | `false` |
 +
 +The following values are enabled for different distributions via [rancher-pushprox](https://github.com/rancher/dev-charts/tree/master/packages/rancher-pushprox). See the rancher-pushprox `README.md` for more information on what all values can be configured for the PushProxy chart.
-+
+ 
 +| Parameter | Description | Default |
 +| ----- | ----------- | ------ |
 +| `rkeControllerManager.enabled` | Create a PushProx installation for monitoring kube-controller-manager metrics in RKE clusters | `false` |
@@ -38,6 +38,7 @@
 +| `kubeAdmProxy.enabled` | Create a PushProx installation for monitoring kube-proxy metrics in kubeAdm clusters | `false` |
 +| `kubeAdmEtcd.enabled` | Create a PushProx installation for monitoring etcd metrics in kubeAdm clusters | `false` |
 +
- 
++
  ### 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`.
@@ -9,6 +9,7 @@
    name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "apiserver" | trunc 63 | trimSuffix "-" }}
    annotations:
  {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
+\ No newline at end of file
 @@ -608,7 +608,7 @@
                          "steppedLine": false,
                          "targets": [
@@ -18,6 +19,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "{{`{{`}} resource {{`}}`}}",
+\ No newline at end of file
 @@ -1011,7 +1011,7 @@
                          "steppedLine": false,
                          "targets": [
@@ -27,6 +29,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "{{`{{`}} resource {{`}}`}}",
+\ No newline at end of file
 @@ -1667,8 +1667,8 @@
              "list": [
                  {
@@ -38,3 +41,4 @@
                      },
                      "hide": 0,
                      "label": "Data Source",
+\ No newline at end of file
@@ -9,6 +9,7 @@
    name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "cluster-total" | trunc 63 | trimSuffix "-" }}
    annotations:
  {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
+\ No newline at end of file
 @@ -1803,8 +1803,8 @@
                  },
                  {
@@ -20,6 +21,7 @@
                      },
                      "hide": 0,
                      "label": "Data Source",
+\ No newline at end of file
 @@ -1831,7 +1831,7 @@
                      "options": [
 
@@ -29,3 +31,4 @@
                      "refresh": 2,
                      "regex": "",
                      "sort": 0,
+\ No newline at end of file
@@ -15,6 +15,7 @@
    name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "controller-manager" | trunc 63 | trimSuffix "-" }}
    annotations:
  {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
+\ No newline at end of file
 @@ -111,7 +112,11 @@
                          "tableColumn": "",
                          "targets": [
@@ -28,6 +29,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "",
+\ No newline at end of file
 @@ -181,7 +186,7 @@
                          "steppedLine": false,
                          "targets": [
@@ -37,6 +39,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}",
+\ No newline at end of file
 @@ -288,7 +293,7 @@
                          "steppedLine": false,
                          "targets": [
@@ -46,6 +49,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}",
+\ No newline at end of file
 @@ -395,7 +400,7 @@
                          "steppedLine": false,
                          "targets": [
@@ -55,6 +59,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "{{`{{`}}cluster{{`}}`}} {{`{{`}}instance{{`}}`}} {{`{{`}}name{{`}}`}}",
+\ No newline at end of file
 @@ -502,28 +507,28 @@
                          "steppedLine": false,
                          "targets": [
@@ -88,6 +93,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "5xx",
+\ No newline at end of file
 @@ -617,7 +622,7 @@
                          "steppedLine": false,
                          "targets": [
@@ -97,6 +103,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "{{`{{`}}verb{{`}}`}} {{`{{`}}url{{`}}`}}",
+\ No newline at end of file
 @@ -724,7 +729,7 @@
                          "steppedLine": false,
                          "targets": [
@@ -106,6 +113,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "{{`{{`}}verb{{`}}`}} {{`{{`}}url{{`}}`}}",
+\ No newline at end of file
 @@ -831,7 +836,7 @@
                          "steppedLine": false,
                          "targets": [
@@ -115,6 +123,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "{{`{{`}}instance{{`}}`}}",
+\ No newline at end of file
 @@ -925,7 +930,7 @@
                          "steppedLine": false,
                          "targets": [
@@ -124,6 +133,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "{{`{{`}}instance{{`}}`}}",
+\ No newline at end of file
 @@ -1019,7 +1024,7 @@
                          "steppedLine": false,
                          "targets": [
@@ -133,6 +143,7 @@
                                  "format": "time_series",
                                  "intervalFactor": 2,
                                  "legendFormat": "{{`{{`}}instance{{`}}`}}",
+\ No newline at end of file
 @@ -1085,8 +1090,8 @@
              "list": [
                  {
@@ -144,6 +155,7 @@
                      },
                      "hide": 0,
                      "label": "Data Source",
+\ No newline at end of file
 @@ -1113,7 +1118,7 @@
                      "options": [
 
@@ -153,6 +165,7 @@
                      "refresh": 2,
                      "regex": "",
                      "sort": 1,
+\ No newline at end of file
 @@ -1139,7 +1144,7 @@
                      "options": [
 
@@ -162,6 +175,7 @@
                      "refresh": 2,
                      "regex": "",
                      "sort": 1,
+\ No newline at end of file
 @@ -1187,4 +1192,5 @@
          "uid": "72e0e05bef5099e5f049b05fdc429ed4",
          "version": 0

@@ -15,6 +15,7 @@
    name: {{ printf "%s-%s" (include "kube-prometheus-stack.fullname" $) "etcd" | trunc 63 | trimSuffix "-" }}
    annotations:
  {{ toYaml .Values.grafana.sidecar.dashboards.annotations | indent 4 }}
+\ No newline at end of file
 @@ -1224,4 +1225,5 @@
          "uid": "c2f4e12cdf69feb95caa41a5a1b423d9",
          "version": 215

@@ -19,3 +19,4 @@
                      "multi": false,
                      "name": "datasource",
                      "options": [
+\ No newline at end of file