feat: update time field

NetApp · Nov 22, 2024 · fb33b24 · fb33b24
1 parent 238ce66
commit fb33b24
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/cmd/collectors/rest/plugins/clustersoftware/clustersoftware.go b/cmd/collectors/rest/plugins/clustersoftware/clustersoftware.go
@@ -82,6 +82,7 @@ func (c *ClusterSoftware) createUpdateMetrics() error {
 	instanceKeys.NewChildS("", "phase")
 	instanceKeys.NewChildS("", "state")
 	instanceKeys.NewChildS("", "node")
+	instanceKeys.NewChildS("", "elapsed_duration")
 
 	mat.SetExportOptions(exportOptions)
 
@@ -147,6 +148,7 @@ func (c *ClusterSoftware) handleUpdateDetails(updateDetailsJSON gjson.Result, gl
 	for _, updateDetail := range updateDetailsJSON.Array() {
 		phase := updateDetail.Get("phase").ClonedString()
 		state := updateDetail.Get("state").ClonedString()
+		elapsedDuration := updateDetail.Get("elapsed_duration").ClonedString()
 		nodeName := updateDetail.Get("node.name").ClonedString()
 		key = phase + state + nodeName
 
@@ -157,6 +159,7 @@ func (c *ClusterSoftware) handleUpdateDetails(updateDetailsJSON gjson.Result, gl
 		clusterUpdateInstance.SetLabel("node", nodeName)
 		clusterUpdateInstance.SetLabel("state", state)
 		clusterUpdateInstance.SetLabel("phase", phase)
+		clusterUpdateInstance.SetLabel("elapsed_duration", elapsedDuration)
 
 		// populate numeric data
 		value := 0.0
@@ -240,12 +243,13 @@ func (c *ClusterSoftware) handleValidationDetails(validationDetailsJSON gjson.Re
 		clusterValidationInstance.SetLabel("update_check", updateCheck)
 		clusterValidationInstance.SetLabel("status", status)
 
-		// populate numeric data
-		value := 0.0
-		if status == "warning" {
-			value = 1.0
+		// ignore all the validation result which are not in warning status
+		if status != "warning" {
+			continue
 		}
 
+		// populate numeric data
+		value := 1.0
 		met := c.data[validationMatrix].GetMetric(validationMatrix)
 		if err := met.SetValueFloat64(clusterValidationInstance, value); err != nil {
 			c.SLogger.Error("Failed to parse value", slogx.Err(err), slog.Float64("value", value))

diff --git a/grafana/dashboards/cmode/cluster.json b/grafana/dashboards/cmode/cluster.json
@@ -4506,6 +4506,18 @@
                     ]
                   }
                 ]
+              },
+              {
+                "matcher": {
+                  "id": "byName",
+                  "options": "Approximate time elapsed"
+                },
+                "properties": [
+                  {
+                    "id": "unit",
+                    "value": "s"
+                  }
+                ]
               }
             ]
           },
@@ -4552,7 +4564,8 @@
                     "cluster",
                     "phase",
                     "node",
-                    "datacenter"
+                    "datacenter",
+                    "elapsed_duration"
                   ]
                 }
               }
@@ -4564,13 +4577,15 @@
                 "indexByName": {
                   "cluster": 1,
                   "datacenter": 0,
+                  "elapsed_duration": 5,
                   "node": 2,
                   "phase": 3,
                   "state": 4
                 },
                 "renameByName": {
-                  "phase": "Update Phase",
-                  "state": "State"
+                  "elapsed_duration": "Approximate time elapsed",
+                  "phase": "Phase",
+                  "state": "Status"
                 }
               }
             }
@@ -4734,7 +4749,7 @@
                 },
                 "renameByName": {
                   "name": "Job Name",
-                  "state": "State"
+                  "state": "Status"
                 }
               }
             }
@@ -4874,7 +4889,7 @@
                 },
                 "renameByName": {
                   "status": "Status",
-                  "update_check": "Validation Check Name"
+                  "update_check": "Pre-update Check"
                 }
               }
             }