From 0ae8053f8ba695e2176565b1521d0f6f45e0b2bb Mon Sep 17 00:00:00 2001 From: Abhilash Shetty Date: Tue, 26 Aug 2025 19:13:50 +0530 Subject: [PATCH 1/4] fix: remove hardcoding of datasource and filter Signed-off-by: Abhilash Shetty --- deploy/charts/Chart.yaml | 4 ++-- deploy/charts/dashboards/mayastor/mayastor-diskpool.json | 8 ++------ deploy/charts/dashboards/mayastor/mayastor-volume.json | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/deploy/charts/Chart.yaml b/deploy/charts/Chart.yaml index 77e57fa..6a2e1f6 100644 --- a/deploy/charts/Chart.yaml +++ b/deploy/charts/Chart.yaml @@ -22,12 +22,12 @@ keywords: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 4.1.0 +version: 4.1.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 4.1.0 +appVersion: 4.1.1 dependencies: - name: kube-prometheus-stack diff --git a/deploy/charts/dashboards/mayastor/mayastor-diskpool.json b/deploy/charts/dashboards/mayastor/mayastor-diskpool.json index 4c679ef..0c8e0b0 100644 --- a/deploy/charts/dashboards/mayastor/mayastor-diskpool.json +++ b/deploy/charts/dashboards/mayastor/mayastor-diskpool.json @@ -793,12 +793,8 @@ { "current": { "selected": true, - "text": [ - "pool-on-node-1" - ], - "value": [ - "pool-on-node-1" - ] + "text": "All", + "value": "*" }, "datasource": { "type": "prometheus", diff --git a/deploy/charts/dashboards/mayastor/mayastor-volume.json b/deploy/charts/dashboards/mayastor/mayastor-volume.json index 44537e8..0b02e5c 100644 --- a/deploy/charts/dashboards/mayastor/mayastor-volume.json +++ b/deploy/charts/dashboards/mayastor/mayastor-volume.json @@ -380,10 +380,10 @@ "current": { "selected": true, "text": [ - "pvc-d070ac1c-6bb7-4ece-9893-5471c0c636a8" + "All" ], "value": [ - "pvc-d070ac1c-6bb7-4ece-9893-5471c0c636a8" + "*" ] }, "datasource": { From 357c2228f6e881b1f5e92b37740f89573316c525 Mon Sep 17 00:00:00 2001 From: Dimitris Zervas Date: Thu, 17 Jul 2025 04:25:51 +0300 Subject: [PATCH 2/4] Update mayastor-diskpool.json Signed-off-by: Dimitris Zervas Signed-off-by: Abhilash Shetty --- deploy/charts/dashboards/mayastor/mayastor-diskpool.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/charts/dashboards/mayastor/mayastor-diskpool.json b/deploy/charts/dashboards/mayastor/mayastor-diskpool.json index 0c8e0b0..bb87070 100644 --- a/deploy/charts/dashboards/mayastor/mayastor-diskpool.json +++ b/deploy/charts/dashboards/mayastor/mayastor-diskpool.json @@ -798,7 +798,7 @@ }, "datasource": { "type": "prometheus", - "uid": "prometheus" + "uid": "${datasource}" }, "definition": "label_values(diskpool_status,name)", "hide": 0, From 2c45aefbb3931ce4df0e06efc886a393af3dcded Mon Sep 17 00:00:00 2001 From: krishnaGajabi Date: Wed, 3 Sep 2025 06:36:48 +0000 Subject: [PATCH 3/4] chore(deps): update kube_prometheus_stack to 70.10.0 Signed-off-by: krishnaGajabi Signed-off-by: Abhilash Shetty --- deploy/charts/Chart.yaml | 2 +- deploy/charts/README.md | 9 +++++---- deploy/charts/values.yaml | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/deploy/charts/Chart.yaml b/deploy/charts/Chart.yaml index 6a2e1f6..55997fc 100644 --- a/deploy/charts/Chart.yaml +++ b/deploy/charts/Chart.yaml @@ -31,7 +31,7 @@ appVersion: 4.1.1 dependencies: - name: kube-prometheus-stack - version: "61.0.*" + version: "70.10.0" repository: https://prometheus-community.github.io/helm-charts condition: kube-prometheus-stack.install - name: node-problem-detector diff --git a/deploy/charts/README.md b/deploy/charts/README.md index 59fbc88..1e99990 100644 --- a/deploy/charts/README.md +++ b/deploy/charts/README.md @@ -1,6 +1,6 @@ # monitoring -![Version: 4.0.1](https://img.shields.io/badge/Version-4.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.0.1](https://img.shields.io/badge/AppVersion-4.0.1-informational?style=flat-square) +![Version: 4.1.0](https://img.shields.io/badge/Version-4.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.1.0](https://img.shields.io/badge/AppVersion-4.1.0-informational?style=flat-square) A Helm chart for monitoring OpenEBS @@ -13,8 +13,8 @@ A Helm chart for monitoring OpenEBS | Repository | Name | Version | |------------|------|---------| | https://charts.deliveryhero.io/ | node-problem-detector | 2.0.* | -| https://openebs.github.io/dynamic-localpv-provisioner | localpv-provisioner | 4.1.0 | -| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 61.0.* | +| https://openebs.github.io/dynamic-localpv-provisioner | localpv-provisioner | 4.3.0 | +| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 70.10.0 | ## Values @@ -64,6 +64,7 @@ A Helm chart for monitoring OpenEBS | kube-prometheus-stack.prometheus-node-exporter.securityContext.runAsGroup | int | `0` | | | kube-prometheus-stack.prometheus-node-exporter.securityContext.runAsNonRoot | bool | `false` | | | kube-prometheus-stack.prometheus-node-exporter.securityContext.runAsUser | int | `0` | | +| kube-prometheus-stack.prometheus-node-exporter.service.port | int | `49201` | | | kube-prometheus-stack.prometheus.prometheusSpec.podMonitorSelectorNilUsesHelmValues | bool | `false` | | | kube-prometheus-stack.prometheus.prometheusSpec.replicas | int | `1` | | | kube-prometheus-stack.prometheus.prometheusSpec.ruleSelectorNilUsesHelmValues | bool | `false` | | @@ -112,4 +113,4 @@ A Helm chart for monitoring OpenEBS | openebsMonitoringAddon.zfsLocalPV.enabled | bool | `true` | | ---------------------------------------------- -Autogenerated from chart metadata using [helm-docs vv1.11.0](https://github.com/norwoodj/helm-docs/releases/vv1.11.0) +Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2) diff --git a/deploy/charts/values.yaml b/deploy/charts/values.yaml index f41d196..1ee47ab 100644 --- a/deploy/charts/values.yaml +++ b/deploy/charts/values.yaml @@ -29,6 +29,8 @@ kube-prometheus-stack: prometheus-node-exporter: rbac: pspEnabled: false + service: + port: 49201 ## privilege and access control settings for node-exporter securityContext: From 1ded2854f54e1b915e0e8c9a4f1e12b7dece8c15 Mon Sep 17 00:00:00 2001 From: krishnaGajabi Date: Wed, 3 Sep 2025 07:05:03 +0000 Subject: [PATCH 4/4] fix(node_exporter): set custom port to prometheus node exporter Signed-off-by: krishnaGajabi Signed-off-by: Abhilash Shetty --- deploy/charts/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/charts/values.yaml b/deploy/charts/values.yaml index 1ee47ab..b67b2c9 100644 --- a/deploy/charts/values.yaml +++ b/deploy/charts/values.yaml @@ -29,7 +29,7 @@ kube-prometheus-stack: prometheus-node-exporter: rbac: pspEnabled: false - service: + service: port: 49201 ## privilege and access control settings for node-exporter