fix: handling min-max in gradient

NetApp · Jun 5, 2024 · 89d1beb · 89d1beb
1 parent ee50c0a
commit 89d1beb
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 2 deletions.
diff --git a/cmd/tools/grafana/dashboard_test.go b/cmd/tools/grafana/dashboard_test.go
@@ -458,13 +458,20 @@ func doPanel(t *testing.T, pathPrefix string, key gjson.Result, value gjson.Resu
 	// In case of gradient-gauge and percent(0.0-1.0), we must override min and max value
 	for _, properties := range propertiesMap {
 		displayMode := properties["custom.displayMode"]
-		if properties["unit"] == "percentunit" && (displayMode == "gradient-gauge" || displayMode == "lcd-gauge" || displayMode == "basic") {
+		if (properties["unit"] == "percentunit" || defaultUnit == "percentunit") && (displayMode == "gradient-gauge" || displayMode == "lcd-gauge" || displayMode == "basic") {
 			if maxVal, exist := properties["max"]; !exist || maxVal != "1" {
 				t.Errorf("dashboard=%s, title=%s should have max value 1", sPath, title)
 			}
 			if minVal, exist := properties["min"]; !exist || minVal != "0" {
 				t.Errorf("dashboard=%s, title=%s should have min value 0", sPath, title)
 			}
+		} else if (properties["unit"] == "percent" || defaultUnit == "percent") && (displayMode == "gradient-gauge" || displayMode == "lcd-gauge" || displayMode == "basic") {
+			if maxVal, exist := properties["max"]; !exist || maxVal != "100" {
+				t.Errorf("dashboard=%s, title=%s should have max value 100", sPath, title)
+			}
+			if minVal, exist := properties["min"]; !exist || minVal != "0" {
+				t.Errorf("dashboard=%s, title=%s should have min value 0", sPath, title)
+			}
 		}
 	}
 

diff --git a/grafana/dashboards/cmode-details/volumeDeepDive.json b/grafana/dashboards/cmode-details/volumeDeepDive.json
@@ -1309,6 +1309,10 @@
                   {
                     "id": "max",
                     "value": 100
+                  },
+                  {
+                    "id": "min",
+                    "value": 0
                   }
                 ]
               },

diff --git a/grafana/dashboards/cmode/aggregate.json b/grafana/dashboards/cmode/aggregate.json
@@ -701,6 +701,10 @@
                 "id": "max",
                 "value": 100
               },
+              {
+                "id": "min",
+                "value": 0
+              },
               {
                 "id": "thresholds",
                 "value": {

diff --git a/grafana/dashboards/cmode/disk.json b/grafana/dashboards/cmode/disk.json
@@ -469,7 +469,6 @@
           },
           "decimals": 2,
           "mappings": [],
-          "max": 100,
           "thresholds": {
             "mode": "absolute",
             "steps": [
@@ -519,6 +518,14 @@
               {
                 "id": "displayName",
                 "value": "capacity used"
+              },
+              {
+                "id": "max",
+                "value": 100
+              },
+              {
+                "id": "min",
+                "value": 0
               }
             ]
           },
@@ -822,6 +829,10 @@
                 "id": "max",
                 "value": 100
               },
+              {
+                "id": "min",
+                "value": 0
+              },
               {
                 "id": "decimals",
                 "value": 3

diff --git a/grafana/dashboards/cmode/flexgroup.json b/grafana/dashboards/cmode/flexgroup.json
@@ -496,6 +496,10 @@
                   {
                     "id": "max",
                     "value": 100
+                  },
+                  {
+                    "id": "min",
+                    "value": 0
                   }
                 ]
               },

diff --git a/grafana/dashboards/cmode/health.json b/grafana/dashboards/cmode/health.json
@@ -2073,6 +2073,10 @@
                   {
                     "id": "max",
                     "value": 100
+                  },
+                  {
+                    "id": "min",
+                    "value": 0
                   }
                 ]
               },
@@ -2459,6 +2463,10 @@
                   {
                     "id": "max",
                     "value": 100
+                  },
+                  {
+                    "id": "min",
+                    "value": 0
                   }
                 ]
               },

diff --git a/grafana/dashboards/cmode/volume.json b/grafana/dashboards/cmode/volume.json
@@ -675,6 +675,10 @@
                   {
                     "id": "max",
                     "value": 100
+                  },
+                  {
+                    "id": "min",
+                    "value": 0
                   }
                 ]
               },
@@ -7985,6 +7989,14 @@
                   {
                     "id": "custom.displayMode",
                     "value": "gradient-gauge"
+                  },
+                  {
+                    "id": "max",
+                    "value": 100
+                  },
+                  {
+                    "id": "min",
+                    "value": 0
                   }
                 ]
               },
@@ -8027,6 +8039,14 @@
                   {
                     "id": "custom.displayMode",
                     "value": "gradient-gauge"
+                  },
+                  {
+                    "id": "max",
+                    "value": 100
+                  },
+                  {
+                    "id": "min",
+                    "value": 0
                   }
                 ]
               },

diff --git a/grafana/dashboards/cmode/workload.json b/grafana/dashboards/cmode/workload.json
@@ -1241,6 +1241,10 @@
                     "id": "max",
                     "value": 100
                   },
+                  {
+                    "id": "min",
+                    "value": 0
+                  },
                   {
                     "id": "decimals",
                     "value": 2
@@ -1437,6 +1441,10 @@
                     "id": "max",
                     "value": 100
                   },
+                  {
+                    "id": "min",
+                    "value": 0
+                  },
                   {
                     "id": "decimals",
                     "value": 2
@@ -1855,6 +1863,10 @@
                     "id": "max",
                     "value": 100
                   },
+                  {
+                    "id": "min",
+                    "value": 0
+                  },
                   {
                     "id": "decimals",
                     "value": 2
@@ -2074,6 +2086,10 @@
                     "id": "max",
                     "value": 100
                   },
+                  {
+                    "id": "min",
+                    "value": 0
+                  },
                   {
                     "id": "decimals",
                     "value": 2

diff --git a/grafana/dashboards/storagegrid/fabricpool.json b/grafana/dashboards/storagegrid/fabricpool.json
@@ -671,6 +671,10 @@
                 "id": "max",
                 "value": 100
               },
+              {
+                "id": "min",
+                "value": 0
+              },
               {
                 "id": "thresholds",
                 "value": {