Update generated dashboards

Signed-off-by: Jordà Polo <[email protected]>
AMDResearch · Jan 9, 2025 · 11c5490 · 11c5490
1 parent 9561520
commit 11c5490
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 50 deletions.
diff --git a/grafana/json-models/rms-global.json b/grafana/json-models/rms-global.json
@@ -1598,7 +1598,7 @@
                   "vbios": 7
                 },
                 "renameByName": {
-                  "card": "Card",
+                  "card": "GPU ID",
                   "driver_ver": "Driver Version",
                   "instance": "Node",
                   "instance (count)": "Number of GPUs",
@@ -3713,7 +3713,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],
@@ -4061,7 +4061,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],
@@ -4183,7 +4183,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],
@@ -4291,7 +4291,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],
@@ -4629,7 +4629,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],
@@ -4737,7 +4737,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],

diff --git a/grafana/json-models/rms-job.json b/grafana/json-models/rms-job.json
@@ -2483,7 +2483,7 @@
               "exemplar": false,
               "expr": "avg by (card) (rocm_utilization_percentage * on (instance) group_left() rmsjob_info{jobid=\"$jobid\"})",
               "instant": false,
-              "legendFormat": "Card {{card}}",
+              "legendFormat": "GPU ID {{card}}",
               "range": true,
               "refId": "A"
             }
@@ -2566,7 +2566,7 @@
               "yHistogram": false
             },
             "yAxis": {
-              "axisLabel": "Card",
+              "axisLabel": "GPU ID",
               "axisPlacement": "left",
               "reverse": false
             }
@@ -2659,7 +2659,7 @@
               "exemplar": false,
               "expr": "max by (card) (rocm_vram_used_percentage * on (instance) group_left() rmsjob_info{jobid=\"$jobid\"})",
               "instant": false,
-              "legendFormat": "Card {{card}}",
+              "legendFormat": "GPU ID {{card}}",
               "range": true,
               "refId": "A"
             }
@@ -2742,7 +2742,7 @@
               "yHistogram": false
             },
             "yAxis": {
-              "axisLabel": "Card",
+              "axisLabel": "GPU ID",
               "axisPlacement": "left",
               "reverse": false
             }
@@ -2860,7 +2860,7 @@
               "editorMode": "code",
               "expr": "avg by (card) (rocm_utilization_percentage * on (instance) group_left() rmsjob_info{jobid=\"$jobid\"})",
               "instant": false,
-              "legendFormat": "Card {{card}}",
+              "legendFormat": "GPU ID {{card}}",
               "range": true,
               "refId": "A"
             }
@@ -2869,7 +2869,7 @@
           "type": "timeseries"
         }
       ],
-      "title": "GPU Usage - Card IDs",
+      "title": "GPU Usage - GPU IDs",
       "type": "row"
     },
     {
@@ -3183,7 +3183,7 @@
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "GPU Card ID"
+                  "options": "GPU ID"
                 },
                 "properties": [
                   {
@@ -3367,7 +3367,7 @@
                 "renameByName": {
                   "Field": "",
                   "Mean": "GPU Utilization (%)",
-                  "card": "GPU Card ID",
+                  "card": "GPU ID",
                   "instance": "Node"
                 }
               }
@@ -3429,7 +3429,7 @@
               {
                 "matcher": {
                   "id": "byName",
-                  "options": "GPU Card ID"
+                  "options": "GPU ID"
                 },
                 "properties": [
                   {
@@ -3590,7 +3590,7 @@
                 "renameByName": {
                   "Field": "",
                   "Mean": "GPU Utilization (%)",
-                  "card": "GPU Card ID",
+                  "card": "GPU ID",
                   "instance": "Node"
                 }
               }
@@ -3752,7 +3752,7 @@
                 "renameByName": {
                   "Field": "",
                   "Mean": "Utilization",
-                  "card": "Card ID",
+                  "card": "GPU ID",
                   "instance": "Node"
                 }
               }
@@ -4346,7 +4346,7 @@
                 "renameByName": {
                   "Field": "Node",
                   "Mean": "Utilization",
-                  "card": "Card ID",
+                  "card": "GPU ID",
                   "instance": "Node"
                 }
               }
@@ -4472,7 +4472,7 @@
               "editorMode": "code",
               "expr": "avg by (card, location) (rocm_temperature_celsius * on (instance) group_left() rmsjob_info{jobid=\"$jobid\"})",
               "instant": false,
-              "legendFormat": "Card {{card}} ({{location}})",
+              "legendFormat": "GPU ID {{card}} ({{location}})",
               "range": true,
               "refId": "A"
             }
@@ -4572,7 +4572,7 @@
               "editorMode": "code",
               "expr": "avg by (card, location) (rocm_temperature_memory_celsius * on (instance) group_left() rmsjob_info{jobid=\"$jobid\"})",
               "instant": false,
-              "legendFormat": "Card {{card}} ({{location}})",
+              "legendFormat": "GPU ID {{card}} ({{location}})",
               "range": true,
               "refId": "A"
             }
@@ -4672,7 +4672,7 @@
               "editorMode": "code",
               "expr": "avg by (card) (rocm_average_socket_power_watts * on (instance) group_left() rmsjob_info{jobid=\"$jobid\"})",
               "instant": false,
-              "legendFormat": "Card {{card}}",
+              "legendFormat": "GPU ID {{card}}",
               "range": true,
               "refId": "A"
             }
@@ -4772,7 +4772,7 @@
               "editorMode": "code",
               "expr": "avg by (card) (rocm_sclk_clock_mhz * on (instance) group_left() rmsjob_info{jobid=\"$jobid\"})",
               "instant": false,
-              "legendFormat": "Card {{card}}",
+              "legendFormat": "GPU ID {{card}}",
               "range": true,
               "refId": "A"
             }
@@ -4872,7 +4872,7 @@
               "editorMode": "code",
               "expr": "avg by (card) (rocm_mclk_clock_mhz * on (instance) group_left() rmsjob_info{jobid=\"$jobid\"})",
               "instant": false,
-              "legendFormat": "Card {{card}}",
+              "legendFormat": "GPU ID {{card}}",
               "range": true,
               "refId": "A"
             }
@@ -4881,7 +4881,7 @@
           "type": "timeseries"
         }
       ],
-      "title": "GPU Telemetry: Card IDs",
+      "title": "GPU Telemetry: GPU IDs",
       "type": "row"
     },
     {

diff --git a/grafana/json-models/rms-node.json b/grafana/json-models/rms-node.json
@@ -794,7 +794,7 @@
           "editorMode": "code",
           "expr": "rocm_utilization_percentage{instance=\"$instance\"}",
           "instant": false,
-          "legendFormat": "Card {{card}}",
+          "legendFormat": "GPU ID {{card}}",
           "range": true,
           "refId": "A"
         }
@@ -894,7 +894,7 @@
           "editorMode": "code",
           "expr": "(rocm_utilization_percentage{instance=\"$instance\"})",
           "instant": false,
-          "legendFormat": "Card {{card}}",
+          "legendFormat": "GPU ID {{card}}",
           "range": true,
           "refId": "A"
         }
@@ -994,7 +994,7 @@
           "editorMode": "code",
           "expr": "rocm_vram_used_percentage{instance=\"$instance\"}",
           "instant": false,
-          "legendFormat": "Card {{card}}",
+          "legendFormat": "GPU ID {{card}}",
           "range": true,
           "refId": "A"
         }
@@ -1111,7 +1111,7 @@
               "editorMode": "code",
               "expr": "avg by (card, location) (rocm_temperature_celsius{instance=\"$instance\"}) ",
               "instant": false,
-              "legendFormat": "Card {{card}} ({{location}})",
+              "legendFormat": "GPU ID {{card}} ({{location}})",
               "range": true,
               "refId": "A"
             }
@@ -1218,7 +1218,7 @@
               "editorMode": "code",
               "expr": "avg by (card, location) (rocm_temperature_memory_celsius{instance=\"$instance\"})",
               "instant": false,
-              "legendFormat": "Card {{card}} ({{location}})",
+              "legendFormat": "GPU ID {{card}} ({{location}})",
               "range": true,
               "refId": "A"
             }
@@ -1317,7 +1317,7 @@
               "editorMode": "code",
               "expr": "(rocm_average_socket_power_watts{instance=\"$instance\"}) ",
               "instant": false,
-              "legendFormat": "Card {{card}}",
+              "legendFormat": "GPU ID {{card}}",
               "range": true,
               "refId": "A"
             }
@@ -1416,7 +1416,7 @@
               "editorMode": "code",
               "expr": "rocm_sclk_clock_mhz{instance=\"$instance\"}",
               "instant": false,
-              "legendFormat": "Card {{card}}",
+              "legendFormat": "GPU ID {{card}}",
               "range": true,
               "refId": "A"
             }
@@ -1515,7 +1515,7 @@
               "editorMode": "code",
               "expr": "rocm_mclk_clock_mhz{instance=\"$instance\"}",
               "instant": false,
-              "legendFormat": "Card {{card}}",
+              "legendFormat": "GPU ID {{card}}",
               "range": true,
               "refId": "A"
             }
@@ -2270,7 +2270,7 @@
                   "vbios": 9
                 },
                 "renameByName": {
-                  "card": "GPU Card ID",
+                  "card": "GPU ID",
                   "driver_ver": "Driver Version",
                   "instance (count)": "Number of GPUs",
                   "type": "Type",

diff --git a/grafana/json-models/standalone-global.json b/grafana/json-models/standalone-global.json
@@ -1300,7 +1300,7 @@
                   "vbios": 7
                 },
                 "renameByName": {
-                  "card": "Card",
+                  "card": "GPU ID",
                   "driver_ver": "Driver Version",
                   "instance": "Node",
                   "instance (count)": "Number of GPUs",
@@ -1672,7 +1672,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],
@@ -1788,7 +1788,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],
@@ -1910,7 +1910,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],
@@ -2018,7 +2018,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],
@@ -2140,7 +2140,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],
@@ -2248,7 +2248,7 @@
               "id": "renameByRegex",
               "options": {
                 "regex": "(.*):(.*), (.*)",
-                "renamePattern": "Node: $1 (card $3)"
+                "renamePattern": "GPU: $1/$3"
               }
             }
           ],