Cleanup legacy dashboards (#113)

* cleanup legacy dashboards

Signed-off-by: w3aman <[email protected]>

* ci: bump ci workflows

Signed-off-by: w3aman <[email protected]>

* add persistence in prometheus and grafana

Signed-off-by: w3aman <[email protected]>

* add openebs provisioner dependency to helm chart

Signed-off-by: w3aman <[email protected]>

* chore: add chart.lock to gitignore

Signed-off-by: w3aman <[email protected]>

* fix: remove dependency lock on helm chart

Signed-off-by: w3aman <[email protected]>

* feat(chart): bump localpv-provisioner version to 4.1.0

Signed-off-by: w3aman <[email protected]>

---------

Signed-off-by: w3aman <[email protected]>

Author: w3aman

.github/workflows/chart-lint-test.yml

@@ -17,35 +17,36 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v4
         with:
-          version: v3.5.0
+          version: v3.14.3
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v5
         with:
-          python-version: 3.7
+          python-version: '3.10'
+          check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.0.1
+        uses: helm/chart-testing-action@v2.6.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |
           changed=$(ct list-changed --config ct.yml)
           if [[ -n "$changed" ]]; then
-            echo "::set-output name=changed::true"
+            echo "changed=true" >> $GITHUB_OUTPUT
           fi
 
       - name: Run chart-testing (lint)
         run: ct lint --config ct.yml
 
       - name: Create kind cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.9.0
         if: steps.list-changed.outputs.changed == 'true'
 
       - name: Run chart-testing (install)

.github/workflows/jsonnet-lint.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/release-charts.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -22,17 +22,18 @@ jobs:
           git config user.email "[email protected]"
 
       - name: Install Helm
-        uses: azure/setup-helm@v1
+        uses: azure/setup-helm@v4
         with:
-          version: v3.5.0
+          version: v3.14.3
 
       - name: Add dependency chart repos
         run: |
           helm repo add kube-prometheus-stack https://prometheus-community.github.io/helm-charts
           helm repo add node-problem-detector https://charts.deliveryhero.io/
+          helm repo add localpv-provisioner https://openebs.github.io/dynamic-localpv-provisioner
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.2.1
+        uses: helm/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.CR_TOKEN }}"
         with:

.gitignore

@@ -1,7 +1,11 @@
 # Chart dependencies
 /deploy/charts/charts
-.idea
+/deploy/charts/Chart.lock
+
+# ide
+**/.idea
+
 jsonnet/vendor/
 jsonnet/tmp/
 jsonnet/buildscripts/vendor/
-jsonnet/manifests
+jsonnet/manifests

README.md

@@ -6,7 +6,7 @@ A set of Grafana dashboards and Prometheus alerts for OpenEBS that can be instal
 
 ## Status
 
-**Beta**. This repository currently supports dashboards and alerts for `cStor`, `Jiva`, `LVM LocalPV` OpenEBS storage engines.
+**Beta**. This repository currently supports dashboards and alerts for `Mayastor`, `LocalPV LVM`, `LocalPV ZFS` OpenEBS storage engines.
 This project is under active development and seeking [contributions from the community](#contributing).
 
 
@@ -17,15 +17,15 @@ This project is under active development and seeking [contributions from the com
 Setup the monitoring helm repository.
 
 ```console
-helm repo add openebs-monitoring https://openebs.github.io/monitoring/
+helm repo add monitoring https://openebs.github.io/monitoring/
 helm repo update
 ```
 
-You can then run `helm search repo openebs-monitoring` to see the charts.
+You can then run `helm search repo monitoring` to see the charts.
 
 Install the helm chart. 
 ```
-helm install openebs-monitoring openebs-monitoring/openebs-monitoring --namespace openebs --create-namespace
+helm install monitoring monitoring/monitoring --namespace openebs --create-namespace
 ```
 
 The detailed chart documentation is available in [charts directory](/deploy/charts/README.md).

contribute/design.md

@@ -1,6 +1,6 @@
 # openEBS Monitoring   
 
-![openebs-monitoring](images/openebs-monitoring.png)
+![monitoring](images/monitoring.png)
 
 OpenEBS monitoring written in jsonnet has two components:
 1. [**kube-prometheus stack**](https://github.com/prometheus-operator/kube-prometheus/tree/main/jsonnet/kube-prometheus)  
@@ -14,7 +14,7 @@ OpenEBS monitoring written in jsonnet has two components:
 
 	```
 	jsonnet
-	├── addons # openebs-monitoring addon
+	├── addons # monitoring addon
 	│   ├── podMonitors.libsonnet # podMonitor to be created for different cas types
 	│   ├── prometheusRules.libsonnet # create prometheusRule object which includes alert rules defined in openebs-mixin
 	│   └── serviceMonitors.libsonnet # serviceMonitor to be created for different cas types
@@ -25,7 +25,7 @@ OpenEBS monitoring written in jsonnet has two components:
 	├── jsonnetfile.lock.json # all dependencies with exact version
 	|
 	├── lib # contains code that is used in different places
-	│   └── utils.libsonnet # code which is used to create openebs-monitoring addons
+	│   └── utils.libsonnet # code which is used to create monitoring addons
 	|
 	├── main.jsonnet # entrypoint of code(openEBS Monitoring)
 	├── Makefile

contribute/release.md

@@ -7,17 +7,17 @@ To generate dashboards and alert rules for monitoring helm chart and release a n
 
 2. Update the dashboards and rules folder in [build.sh](../jsonnet/openebs-mixin/build.sh). The auto generated json files will be inside this folder.  
 
-   For example: If you add dashboards and alert rules for mayastor in openebs-mixin, then add mayastor as a folder name in build.sh file. 
+   For example: If you add dashboards and alert rules for Mayastor in openebs-mixin, then add mayastor as a folder name in build.sh file. 
    ```
 	generateDashboards(){
 		. . . 
-		dashboardsFolder=(cStor jiva localPV npd lvmLocalPV ndm mayastor)
+		dashboardsFolder=(npd lvmLocalPV zfsLocalPV mayastor)
 	    . . . 
 	}
 
 	generateRules(){
 		. . . 
-		rulesFolder=(cStor jiva volume npd lvmLocalPV mayastor)
+		rulesFolder=(npd lvmLocalPV zfsLocalPV mayastor)
 	    . . . 
 	}
 	```

ct.yml

@@ -6,4 +6,6 @@ chart-dirs:
 chart-repos:
   - kube-prometheus-stack=https://prometheus-community.github.io/helm-charts
   - node-problem-detector=https://charts.deliveryhero.io/
+  - localpv-provisioner=https://openebs.github.io/dynamic-localpv-provisioner
 helm-extra-args: --timeout=500s
+validate-maintainers: false

deploy/charts/Chart.lock

@@ -1,5 +1,5 @@
 apiVersion: v2
-name: openebs-monitoring
+name: monitoring
 description: A Helm chart for monitoring OpenEBS
 
 # A chart can be either an 'application' or a 'library' chart.
@@ -12,18 +12,6 @@ description: A Helm chart for monitoring OpenEBS
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
 
-maintainers:
-  - name: kiranmova
-    email: [email protected]
-  - name: avishnu
-    email: [email protected]
-  - name: Ab-hishek
-    email: [email protected]
-  - name: rajaSahil
-    email: [email protected]
-  - name: Sanjay1611
-    email: [email protected]
-
 sources:
   - https://github.com/openebs/monitoring
 
@@ -34,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: 0.4.13
+version: 3.0.0
 
 # 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: 2.12.0
+appVersion: 3.0.0
 
 dependencies:
   - name: kube-prometheus-stack
@@ -50,3 +38,7 @@ dependencies:
     version: "2.0.*"
     repository: https://charts.deliveryhero.io/
     condition: node-problem-detector.install
+  - name: localpv-provisioner
+    version: 4.1.0
+    repository: https://openebs.github.io/dynamic-localpv-provisioner
+    condition: localpv-provisioner.enabled