Merge pull request #52 from rajaSahil/Add-ServiceMonitor-DeviceLocalPV

Add ServiceMonitor for device-LocalPV and fixes localpv workload dashboard
openebs · Jul 29, 2021 · 44a8857 · 44a8857
2 parents 94061a1 + 0a8feb3
commit 44a8857
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 15 deletions.
diff --git a/deploy/charts/openebs-monitoring/Chart.yaml b/deploy/charts/openebs-monitoring/Chart.yaml
@@ -34,7 +34,7 @@ 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.3.1
+version: 0.3.2
 
 # 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

diff --git a/deploy/charts/openebs-monitoring/README.md b/deploy/charts/openebs-monitoring/README.md
@@ -141,6 +141,11 @@ helm install openebs-monitoring openebs-monitoring/monitoring --namespace openeb
 | `serviceMonitors.lvm-LocalPV.endpoints.path`                                              | HTTP path to scrape for metrics from lvm localPV node                               | `"/metrics"`                                              |
 | `serviceMonitors.lvm-LocalPV.selector`                                                    | Selector to select endpoints objects                                                | `{matchLabels: {name: openebs-lvm-node}}`                 |
 | `serviceMonitors.lvm-LocalPV.namespaceSelector`                                           | Selector to select which namespaces the endpoints objects are discovered from       | `[any: true]`                                             |
+| `serviceMonitors.device-LocalPV.enabled`                                                     | Enables monitoring of device localPV                                                   | `true`                                                    |
+| `serviceMonitors.device-LocalPV.endpoints.ports`                                             | Name of the service port device localPV node endpoint refers to                        | `"metrics"`                                               |
+| `serviceMonitors.device-LocalPV.endpoints.path`                                              | HTTP path to scrape for metrics from device localPV node                               | `"/metrics"`                                              |
+| `serviceMonitors.device-LocalPV.selector`                                                    | Selector to select endpoints objects                                                | `{matchLabels: {name: openebs-device-node}}`                 |
+| `serviceMonitors.device-LocalPV.namespaceSelector`                                           | Selector to select which namespaces the endpoints objects are discovered from       | `[any: true]`                                             |
 | `podMonitors.cstor.enabled`                                                               | Enables monitoring of cStor pools                                                   | `true`                                                    |
 | `podMonitors.cstor.podMetricsEndpoints.targetPort`                                        | Name or number of the cstor pool endpoint's target port                             | `9500`                                                    |
 | `podMonitors.cstor.podMetricsEndpoints.path`                                              | HTTP path to scrape for metrics from cstor pool pod                                 | `"/metrics"`                                              |

diff --git a/deploy/charts/openebs-monitoring/dashboards/LocalPV/localpv-workload.json b/deploy/charts/openebs-monitoring/dashboards/LocalPV/localpv-workload.json
@@ -1842,7 +1842,7 @@
 			"targets": [
 			  {
 				"exemplar": true,
-				"expr": "node_filesystem_size_bytes {fstype=~\"ext4|xfs\",mountpoint=~\"(.*$pvName.*/mount)\"}",
+				"expr": "node_filesystem_size_bytes {fstype=~\"ext4|xfs\",mountpoint=~\"(.+/($pvName/mount))\"}",
 				"instant": true,
 				"interval": "",
 				"intervalFactor": 2,
@@ -1934,7 +1934,7 @@
 			"targets": [
 			  {
 				"exemplar": true,
-				"expr": "100 - ((node_filesystem_avail_bytes{mountpoint=~\"(.*$pvName.*/mount)\",fstype=~\"ext4|xfs\"} * 100) / node_filesystem_size_bytes {mountpoint=~\"(.*$pvName.*/mount)\",fstype=~\"ext4|xfs\"})",
+				"expr": "100 - ((node_filesystem_avail_bytes{mountpoint=~\"(.+/($pvName/mount))\",fstype=~\"ext4|xfs\"} * 100) / node_filesystem_size_bytes {mountpoint=~\"(.+/($pvName/mount))\",fstype=~\"ext4|xfs\"})",
 				"interval": "10s",
 				"intervalFactor": 2,
 				"legendFormat": "",
@@ -2007,7 +2007,7 @@
 			"targets": [
 			  {
 				"exemplar": true,
-				"expr": "100 - ((node_filesystem_avail_bytes{mountpoint=~\"(.*$pvName.*/mount)\"} * 100) / node_filesystem_size_bytes {mountpoint=~\"(.*$pvName.*/mount)\"})",
+				"expr": "100 - ((node_filesystem_avail_bytes{mountpoint=~\"(.+/($pvName/mount))\"} * 100) / node_filesystem_size_bytes {mountpoint=~\"(.+/($pvName/mount))\"})",
 				"interval": "10s",
 				"intervalFactor": 2,
 				"legendFormat": "Pvc: $pvcName, Mount Point: {{mountpoint}}",
@@ -2110,7 +2110,7 @@
 			"targets": [
 			  {
 				"exemplar": true,
-				"expr": "node_filesystem_avail_bytes{mountpoint=~\"(.*$pvName.*/mount)\"}",
+				"expr": "node_filesystem_avail_bytes{mountpoint=~\"(.+/($pvName/mount))\"}",
 				"format": "time_series",
 				"hide": false,
 				"interval": "",
@@ -2216,7 +2216,7 @@
 			"targets": [
 			  {
 				"exemplar": true,
-				"expr": "node_filesystem_files_free{mountpoint=~\"(.*$pvName.*/mount)\"}",
+				"expr": "node_filesystem_files_free{mountpoint=~\"(.+/($pvName/mount))\"}",
 				"format": "time_series",
 				"hide": false,
 				"interval": "",
@@ -2321,7 +2321,7 @@
 			"targets": [
 			  {
 				"exemplar": true,
-				"expr": "node_filesystem_files{mountpoint=~\"(.*$pvName.*/mount)\"}",
+				"expr": "node_filesystem_files{mountpoint=~\"(.+/($pvName/mount))\"}",
 				"format": "time_series",
 				"hide": false,
 				"interval": "",
@@ -2431,7 +2431,7 @@
 			"targets": [
 			  {
 				"exemplar": true,
-				"expr": "node_filesystem_readonly{mountpoint=~\"(.*$pvName.*/mount)\"}",
+				"expr": "node_filesystem_readonly{mountpoint=~\"(.+/($pvName/mount))\"}",
 				"format": "time_series",
 				"interval": "",
 				"intervalFactor": 2,
@@ -2541,7 +2541,7 @@
 			"targets": [
 			  {
 				"exemplar": true,
-				"expr": "node_filesystem_device_error{mountpoint=~\"(.*$pvName.*/mount)\"} ",
+				"expr": "node_filesystem_device_error{mountpoint=~\"(.+/($pvName/mount))\"} ",
 				"format": "time_series",
 				"hide": false,
 				"interval": "",
@@ -2676,7 +2676,7 @@
 			"targets": [
 			  {
 				"exemplar": true,
-				"expr": "100 - ((node_filesystem_avail_bytes{mountpoint=~\"(.*$pvName.*/mount)\"} * 100) / node_filesystem_size_bytes{mountpoint=~\"(.*$pvName.*/mount)\"})",
+				"expr": "100 - ((node_filesystem_avail_bytes{mountpoint=~\"(.+/($pvName/mount))\"} * 100) / node_filesystem_size_bytes{mountpoint=~\"(.+/($pvName/mount))\"})",
 				"format": "time_series",
 				"interval": "",
 				"intervalFactor": 2,
@@ -4048,7 +4048,7 @@
 		  "name": "workload",
 		  "options": [],
 		  "query": "label_values(namespace_workload_pod:kube_pod_owner:relabel{cluster=\"$cluster\", namespace=\"$namespace\"}, workload)",
-		  "refresh": 1,
+		  "refresh": 2,
 		  "regex": "",
 		  "skipUrlSync": false,
 		  "sort": 1,
@@ -4072,7 +4072,7 @@
 			"name": "type",
 			"options": [],
 			"query": "label_values(namespace_workload_pod:kube_pod_owner:relabel{workload=\"$workload\"}, workload_type)",
-			"refresh": 1,
+			"refresh": 2,
 			"regex": "",
 			"skipUrlSync": false,
 			"sort": 1,

diff --git a/deploy/charts/openebs-monitoring/values.yaml b/deploy/charts/openebs-monitoring/values.yaml
@@ -44,6 +44,7 @@ kube-prometheus-stack:
     extraArgs:
       - --collector.filesystem.ignored-mount-points=^/(dev|proc|sys|var/lib/docker/.+)($|/)
       - --collector.filesystem.ignored-fs-types=^(tmpfs|autofs|binfmt_misc|cgroup|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|mqueue|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|sysfs|tracefs)$
+      - --collector.diskstats.ignored-devices=^(ram|loop|fd|(h|s|v|xv)d[a-z]+|nvme\\d+n\\d+p)\\d+$
 
   prometheus:
     service:
@@ -179,9 +180,9 @@ node-problem-detector:
 
   ## Volume for storing logs
   extraVolumes:
-  - name: kmsg
-    hostPath:
-      path: /dev/kmsg
+    - name: kmsg
+      hostPath:
+        path: /dev/kmsg
 
   extraVolumeMounts:
     - name: kmsg
@@ -435,6 +436,57 @@ serviceMonitors:
     namespaceSelector:
       any: true
 
+  device-LocalPV:
+    enabled: true
+
+    ## Endpoints of the selected service to be monitored
+    endpoints:
+      ## Name of the endpoint's service port
+      ## Mutually exclusive with targetPort
+      #  port: ""
+      port: metrics
+
+      ## HTTP path to scrape for metrics
+      #  path: /metrics
+      path: /metrics
+
+    ## Label selector for services to which this ServiceMonitor applies
+    # selector: {}
+    #   matchLabels: {}
+
+    ## Example
+
+    # selector:
+    #   matchLabels:
+    #     name: openebs-device-node
+
+    selector:
+      matchLabels:
+        name: openebs-device-node
+
+    ## Namespaces from which services are selected
+    # namespaceSelector: []
+    ## Match any namespace
+    #   any: true
+
+    ## Example
+
+    # namespaceSelector:
+    #   any: true
+
+    ## Explicit list of namespace names to select
+    #   matchNames: []
+
+    ## Example
+
+    # namespaceSelector:
+    #   matchNames:
+    #   - openebs
+    #   - default
+
+    namespaceSelector:
+      any: true
+
 podMonitors:
   cstor:
     enabled: true