Skip to content

Commit cb4ad71

Browse files
m-bullm-bull
committed
Re-tweak Redfish dashboard for Lenovo
1 parent d4b2607 commit cb4ad71

File tree

1 file changed

+39
-39
lines changed
  • etc/kayobe/kolla/config/grafana/dashboards/openstack

1 file changed

+39
-39
lines changed

‎etc/kayobe/kolla/config/grafana/dashboards/openstack/redfish.json‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"refId": "B"
103103
}
104104
],
105-
"title": "iDRAC Up",
105+
"title": "Redfish Up",
106106
"type": "stat"
107107
},
108108
{
@@ -163,7 +163,7 @@
163163
"uid": "${datasource}"
164164
},
165165
"editorMode": "code",
166-
"expr": "count(redfish_system_power_state{group=\"$group\"} == 1)",
166+
"expr": "count(redfish_system_power_state{group=\"$group\", job=\"redfish-exporter\"} == 1)",
167167
"format": "table",
168168
"hide": false,
169169
"instant": true,
@@ -232,7 +232,7 @@
232232
"uid": "${datasource}"
233233
},
234234
"editorMode": "code",
235-
"expr": "count(redfish_system_power_state{group=\"$group\"} != 1)",
235+
"expr": "count(redfish_system_power_state{group=\"$group\", job=\"redfish-exporter\"} != 1)",
236236
"format": "table",
237237
"hide": false,
238238
"instant": true,
@@ -301,7 +301,7 @@
301301
"uid": "${datasource}"
302302
},
303303
"editorMode": "code",
304-
"expr": "count(redfish_chassis_health{group=\"$group\"} != 1)",
304+
"expr": "count(redfish_chassis_health{group=\"$group\", job=\"redfish-exporter\" } != 1)",
305305
"format": "table",
306306
"hide": false,
307307
"instant": true,
@@ -730,7 +730,7 @@
730730
"uid": "${datasource}"
731731
},
732732
"editorMode": "code",
733-
"expr": "sort_desc(redfish_system_power_state{group=\"$group\"})",
733+
"expr": "sort_desc(redfish_system_power_state{group=\"$group\", job=\"redfish-exporter\"})",
734734
"format": "table",
735735
"instant": true,
736736
"interval": "",
@@ -926,7 +926,7 @@
926926
"uid": "${datasource}"
927927
},
928928
"editorMode": "code",
929-
"expr": "sort(redfish_chassis_health{group=\"$group\"})",
929+
"expr": "sort(redfish_chassis_health{group=\"$group\", job=\"redfish-exporter\"})",
930930
"format": "table",
931931
"hide": false,
932932
"instant": true,
@@ -1065,8 +1065,8 @@
10651065
"uid": "${datasource}"
10661066
},
10671067
"editorMode": "code",
1068-
"expr": "sum(redfish_chassis_power_average_consumed_watts{group=\"$group\"})",
1069-
"legendFormat": "Rack power consumption",
1068+
"expr": "sum(redfish_chassis_power_average_consumed_watts{group=\"$group\", job=\"redfish-exporter\"})",
1069+
"legendFormat": "Total power consumption",
10701070
"range": true,
10711071
"refId": "A"
10721072
}
@@ -1168,7 +1168,7 @@
11681168
"uid": "${datasource}"
11691169
},
11701170
"editorMode": "code",
1171-
"expr": "sum(redfish_chassis_power_average_consumed_watts{group=\"$group\"}) by (env)",
1171+
"expr": "sum(redfish_chassis_power_average_consumed_watts{group=\"$group\", job=\"redfish-exporter\"}) by (env)",
11721172
"interval": "",
11731173
"legendFormat": "{{ env }}",
11741174
"range": true,
@@ -1271,7 +1271,7 @@
12711271
"uid": "${datasource}"
12721272
},
12731273
"editorMode": "code",
1274-
"expr": "count(redfish_system_power_state{group=\"$group\"} == 1) by (env)",
1274+
"expr": "count(redfish_system_power_state{group=\"$group\", job=\"redfish-exporter\"} == 1) by (env)",
12751275
"hide": false,
12761276
"interval": "",
12771277
"legendFormat": "Powered up {{ env }}",
@@ -1284,15 +1284,15 @@
12841284
"uid": "${datasource}"
12851285
},
12861286
"editorMode": "code",
1287-
"expr": "count(redfish_system_power_state{group=\"$group\"} == 2) by (env) * -1",
1287+
"expr": "count(redfish_system_power_state{group=\"$group\", job=\"redfish-exporter\"} == 2) by (env) * -1",
12881288
"hide": true,
12891289
"interval": "",
12901290
"legendFormat": "Powered down {{ env }}",
12911291
"range": true,
12921292
"refId": "B"
12931293
}
12941294
],
1295-
"title": "Powered ON by Rack",
1295+
"title": "Powered ON",
12961296
"type": "timeseries"
12971297
},
12981298
{
@@ -1388,7 +1388,7 @@
13881388
"uid": "${datasource}"
13891389
},
13901390
"editorMode": "code",
1391-
"expr": "count(redfish_system_power_state{group=\"$group\"} == 1) by (env)",
1391+
"expr": "count(redfish_system_power_state{group=\"$group\", job=\"redfish-exporter\"} == 1) by (env)",
13921392
"hide": true,
13931393
"interval": "",
13941394
"legendFormat": "Powered up {{ env }}",
@@ -1401,15 +1401,15 @@
14011401
"uid": "${datasource}"
14021402
},
14031403
"editorMode": "code",
1404-
"expr": "count(redfish_system_power_state{group=\"$group\"} == 2) by (env)",
1404+
"expr": "count(redfish_system_power_state{group=\"$group\", job=\"redfish-exporter\"} == 2) by (env)",
14051405
"hide": false,
14061406
"interval": "",
14071407
"legendFormat": "Powered down {{ env }}",
14081408
"range": true,
14091409
"refId": "B"
14101410
}
14111411
],
1412-
"title": "Powered OFF by Rack",
1412+
"title": "Powered OFF",
14131413
"type": "timeseries"
14141414
},
14151415
{
@@ -1508,7 +1508,7 @@
15081508
"uid": "${datasource}"
15091509
},
15101510
"editorMode": "code",
1511-
"expr": "max(redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp|.*Inlet.*\", group=\"$group\"}) by (env)",
1511+
"expr": "max(redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp|.*Inlet.*\", group=\"$group\", job=\"redfish-exporter\"}) by (env)",
15121512
"hide": false,
15131513
"interval": "",
15141514
"legendFormat": "max inlet {{ env }}",
@@ -1657,7 +1657,7 @@
16571657
"uid": "${datasource}"
16581658
},
16591659
"editorMode": "code",
1660-
"expr": "max(redfish_chassis_temperature_celsius{sensor=~\".*CPU.*1.*Temp\", group=\"$group\"}) by (env)",
1660+
"expr": "max(redfish_chassis_temperature_celsius{sensor=~\".*CPU.*1.*Temp\", group=\"$group\", job=\"redfish-exporter\"}) by (env)",
16611661
"hide": false,
16621662
"interval": "",
16631663
"legendFormat": "{{ env }}",
@@ -1805,7 +1805,7 @@
18051805
"uid": "${datasource}"
18061806
},
18071807
"editorMode": "code",
1808-
"expr": "max(redfish_chassis_temperature_celsius{sensor=~\"CPU2 Temp|.*CPU.2.*Temp\", group=\"$group\"}) by (env)",
1808+
"expr": "max(redfish_chassis_temperature_celsius{sensor=~\"CPU2 Temp|.*CPU.2.*Temp\", group=\"$group\", job=\"redfish-exporter\"}) by (env)",
18091809
"hide": false,
18101810
"interval": "",
18111811
"legendFormat": "{{ env }}",
@@ -1907,7 +1907,7 @@
19071907
"uid": "${datasource}"
19081908
},
19091909
"editorMode": "code",
1910-
"expr": "redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp|.*Inlet.*\", group=\"$group\"}",
1910+
"expr": "redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp|.*Inlet.*\", group=\"$group\", job=\"redfish-exporter\"}",
19111911
"hide": false,
19121912
"interval": "",
19131913
"intervalFactor": 1,
@@ -2026,7 +2026,7 @@
20262026
"uid": "${datasource}"
20272027
},
20282028
"editorMode": "code",
2029-
"expr": "redfish_chassis_temperature_celsius{sensor=~\".*CPU.*1.*Temp\", group=\"$group\"} != 0",
2029+
"expr": "redfish_chassis_temperature_celsius{sensor=~\".*CPU.*1.*Temp\", group=\"$group\", job=\"redfish-exporter\"} != 0",
20302030
"hide": false,
20312031
"interval": "",
20322032
"intervalFactor": 1,
@@ -2147,7 +2147,7 @@
21472147
"uid": "${datasource}"
21482148
},
21492149
"editorMode": "code",
2150-
"expr": "redfish_chassis_temperature_celsius{sensor=~\".*CPU.*2.*Temp\", group=\"$group\"} != 0",
2150+
"expr": "redfish_chassis_temperature_celsius{sensor=~\".*CPU.*2.*Temp\", group=\"$group\", job=\"redfish-exporter\"} != 0",
21512151
"hide": false,
21522152
"interval": "",
21532153
"intervalFactor": 1,
@@ -2266,7 +2266,7 @@
22662266
"uid": "${datasource}"
22672267
},
22682268
"editorMode": "code",
2269-
"expr": "max(redfish_chassis_fan_rpm_percentage{group=\"$group\"}) by (server) > 0",
2269+
"expr": "max(redfish_chassis_fan_rpm_percentage{group=\"$group\", job=\"redfish-exporter\"}) by (server) > 0",
22702270
"hide": false,
22712271
"interval": "",
22722272
"intervalFactor": 1,
@@ -2386,7 +2386,7 @@
23862386
"uid": "${datasource}"
23872387
},
23882388
"editorMode": "code",
2389-
"expr": "redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp\"} or redfish_chassis_temperature_celsius{sensor_id=~\".*InletTemp\"} or redfish_chassis_temperature_celsius{sensor=~\".*Inlet.*\"}",
2389+
"expr": "redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp\", job=\"redfish-exporter\"} or redfish_chassis_temperature_celsius{sensor_id=~\".*InletTemp\", job=\"redfish-exporter\"} or redfish_chassis_temperature_celsius{sensor=~\".*Inlet.*\", job=\"redfish-exporter\"}",
23902390
"hide": false,
23912391
"interval": "",
23922392
"legendFormat": "{{ env }} {{ server }}",
@@ -2492,7 +2492,7 @@
24922492
"uid": "${datasource}"
24932493
},
24942494
"editorMode": "code",
2495-
"expr": "redfish_chassis_temperature_celsius{sensor=~\".*CPU.*1.*Temp\", group=\"$group\"} != 0",
2495+
"expr": "redfish_chassis_temperature_celsius{sensor=~\".*CPU.*1.*Temp\", group=\"$group\", job=\"redfish-exporter\"} != 0",
24962496
"hide": false,
24972497
"interval": "",
24982498
"legendFormat": "{{ env }} {{ server }}",
@@ -2584,7 +2584,7 @@
25842584
"uid": "${datasource}"
25852585
},
25862586
"editorMode": "code",
2587-
"expr": "redfish_chassis_power_average_consumed_watts{server=\"$server\"}",
2587+
"expr": "redfish_chassis_power_average_consumed_watts{server=\"$server\", job=\"redfish-exporter\"}",
25882588
"hide": false,
25892589
"interval": "",
25902590
"legendFormat": "{{power_voltage}}",
@@ -2614,7 +2614,7 @@
26142614
},
26152615
{
26162616
"color": "red",
2617-
"value": 80
2617+
"value": 1
26182618
}
26192619
]
26202620
}
@@ -2650,15 +2650,15 @@
26502650
"type": "prometheus",
26512651
"uid": "${datasource}"
26522652
},
2653-
"expr": "count(redfish_system_storage_drive_state{server=~\"$server\"} != 1) or vector(0)",
2653+
"expr": "count(redfish_system_storage_drive_state{server=~\"$server\", job=\"redfish-exporter\"} != 1) or vector(0)",
26542654
"format": "table",
26552655
"instant": true,
26562656
"interval": "",
26572657
"legendFormat": "",
26582658
"refId": "A"
26592659
}
26602660
],
2661-
"title": "Disk with errors",
2661+
"title": "Disks with errors",
26622662
"type": "gauge"
26632663
},
26642664
{
@@ -2680,7 +2680,7 @@
26802680
},
26812681
{
26822682
"color": "red",
2683-
"value": 80
2683+
"value": 1
26842684
}
26852685
]
26862686
}
@@ -2716,7 +2716,7 @@
27162716
"type": "prometheus",
27172717
"uid": "${datasource}"
27182718
},
2719-
"expr": "count(redfish_system_pcie_device_health_state{server=~\"$server\"} != 1) or vector(0)",
2719+
"expr": "count(redfish_system_pcie_device_health_state{server=~\"$server\", job=\"redfish-exporter\"} != 1) or vector(0)",
27202720
"format": "table",
27212721
"instant": true,
27222722
"interval": "",
@@ -2747,7 +2747,7 @@
27472747
},
27482748
{
27492749
"color": "red",
2750-
"value": 80
2750+
"value": 1
27512751
}
27522752
]
27532753
}
@@ -2784,7 +2784,7 @@
27842784
"uid": "${datasource}"
27852785
},
27862786
"editorMode": "code",
2787-
"expr": "count(redfish_chassis_temperature_sensor_state{server=~\"$server\"} > 2) or vector(0)",
2787+
"expr": "count(redfish_chassis_temperature_sensor_state{server=~\"$server\", job=\"redfish-exporter\"} > 2) or vector(0)",
27882788
"format": "table",
27892789
"instant": true,
27902790
"interval": "",
@@ -2814,7 +2814,7 @@
28142814
},
28152815
{
28162816
"color": "red",
2817-
"value": 80
2817+
"value": 1
28182818
}
28192819
]
28202820
}
@@ -2850,7 +2850,7 @@
28502850
"type": "prometheus",
28512851
"uid": "${datasource}"
28522852
},
2853-
"expr": "count(redfish_chassis_power_powersupply_health{server=~\"$server\"} > 1) or vector(0)",
2853+
"expr": "count(redfish_chassis_power_powersupply_health{server=~\"$server\", job=\"redfish-exporter\"} > 1) or vector(0)",
28542854
"format": "table",
28552855
"instant": true,
28562856
"interval": "",
@@ -2927,7 +2927,7 @@
29272927
},
29282928
"editorMode": "code",
29292929
"exemplar": false,
2930-
"expr": "sum by (sensor) (sum_over_time(redfish_chassis_temperature_celsius{server=\"$server\"}[15m])) / sum by (sensor) (count_over_time(redfish_chassis_temperature_celsius{server=\"$server\"}[15m])) > 0",
2930+
"expr": "sum by (sensor) (sum_over_time(redfish_chassis_temperature_celsius{server=\"$server\", job=\"redfish-exporter\"}[15m])) / sum by (sensor) (count_over_time(redfish_chassis_temperature_celsius{server=\"$server\", job=\"redfish-exporter\"}[15m])) > 0",
29312931
"format": "table",
29322932
"instant": true,
29332933
"interval": "",
@@ -3038,7 +3038,7 @@
30383038
"uid": "${datasource}"
30393039
},
30403040
"editorMode": "code",
3041-
"expr": "redfish_system_power_state{server=\"$server\"}",
3041+
"expr": "redfish_system_power_state{server=\"$server\", job=\"redfish-exporter\"}",
30423042
"format": "time_series",
30433043
"instant": true,
30443044
"interval": "",
@@ -3137,7 +3137,7 @@
31373137
"uid": "${datasource}"
31383138
},
31393139
"editorMode": "code",
3140-
"expr": "redfish_chassis_health{server=\"$server\"}",
3140+
"expr": "redfish_chassis_health{server=\"$server\", job=\"redfish-exporter\"}",
31413141
"format": "time_series",
31423142
"instant": true,
31433143
"interval": "30m",
@@ -3245,7 +3245,7 @@
32453245
"type": "prometheus",
32463246
"uid": "${datasource}"
32473247
},
3248-
"expr": "redfish_chassis_temperature_celsius{server=~\"$server\"}",
3248+
"expr": "redfish_chassis_temperature_celsius{server=~\"$server\", job=\"redfish-exporter\"}",
32493249
"interval": "",
32503250
"legendFormat": "{{sensor}}",
32513251
"refId": "A"
@@ -3349,7 +3349,7 @@
33493349
"uid": "${datasource}"
33503350
},
33513351
"editorMode": "code",
3352-
"expr": "redfish_chassis_power_average_consumed_watts{server=~\"$server\"}",
3352+
"expr": "redfish_chassis_power_average_consumed_watts{server=~\"$server\", job=\"redfish-exporter\"}",
33533353
"interval": "",
33543354
"legendFormat": "{{power_voltage}}",
33553355
"range": true,

0 commit comments

Comments
 (0)