diff --git a/etc/kayobe/kolla/config/grafana/dashboards/openstack/redfish.json b/etc/kayobe/kolla/config/grafana/dashboards/openstack/redfish.json index c4f4bb941..6ba67ad27 100644 --- a/etc/kayobe/kolla/config/grafana/dashboards/openstack/redfish.json +++ b/etc/kayobe/kolla/config/grafana/dashboards/openstack/redfish.json @@ -20,12 +20,38 @@ "fiscalYearStartMonth": 0, "gnetId": 12403, "graphTooltip": 0, - "id": 28, + "id": 91, "links": [], - "liveNow": false, "panels": [ + { + "collapsed": false, + "datasource": { + "type": "datasource", + "uid": "grafana" + }, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 31, + "panels": [], + "targets": [ + { + "datasource": { + "type": "datasource", + "uid": "grafana" + }, + "refId": "A" + } + ], + "title": "Overview", + "type": "row" + }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -52,7 +78,7 @@ "h": 3, "w": 4, "x": 0, - "y": 0 + "y": 1 }, "id": 53, "options": { @@ -60,6 +86,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -71,7 +98,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { @@ -79,7 +106,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "count(up{job=~\"redfish-exporter.*\"} == 1)", + "expr": "count(redfish_system_power_state{group=\"$group\", job!=\"redfish-exporter-collectlog\"})", "format": "table", "hide": false, "instant": true, @@ -101,11 +128,12 @@ "refId": "B" } ], - "title": "iDRAC Up", + "title": "Redfish Up", "type": "stat" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -132,14 +160,16 @@ "h": 3, "w": 4, "x": 4, - "y": 0 + "y": 1 }, "id": 54, + "interval": "30m", "options": { "colorMode": "value", "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -151,14 +181,15 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "count(redfish_system_power_state == 1)", + "editorMode": "code", + "expr": "count(redfish_system_power_state{group=\"$group\", job!=\"redfish-exporter-collectlog\"} == 1)", "format": "table", "hide": false, "instant": true, @@ -172,14 +203,13 @@ }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, - "description": "", "fieldConfig": { "defaults": { "mappings": [], - "noValue": "0", "thresholds": { "mode": "absolute", "steps": [ @@ -200,7 +230,7 @@ "h": 3, "w": 4, "x": 8, - "y": 0 + "y": 1 }, "id": 55, "options": { @@ -208,6 +238,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -219,23 +250,21 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "count(redfish_system_power_state != 1)", + "editorMode": "code", + "expr": "count(redfish_system_power_state{group=\"$group\", job!=\"redfish-exporter-collectlog\"} != 1)", "format": "table", - "fullMetaSearch": false, "hide": false, - "includeNullMetadata": true, "instant": true, "interval": "", - "legendFormat": "__auto", - "refId": "A", - "useBackend": false + "legendFormat": "", + "refId": "A" } ], "title": "Powered Off", @@ -243,13 +272,13 @@ }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, "fieldConfig": { "defaults": { "mappings": [], - "noValue": "0", "thresholds": { "mode": "absolute", "steps": [ @@ -259,7 +288,7 @@ }, { "color": "red", - "value": 80 + "value": 1 } ] } @@ -270,7 +299,7 @@ "h": 3, "w": 4, "x": 12, - "y": 0 + "y": 1 }, "id": 56, "options": { @@ -278,6 +307,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -289,14 +319,15 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "count(redfish_chassis_health != 1)", + "editorMode": "code", + "expr": "count(redfish_chassis_health{group=\"$group\", job!=\"redfish-exporter-collectlog\" } != 1)", "format": "table", "hide": false, "instant": true, @@ -310,14 +341,37 @@ }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, "description": "", "fieldConfig": { "defaults": { - "mappings": [], - "noValue": "0", + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "mappings": [ + { + "options": { + "1": { + "color": "dark-green", + "index": 1, + "text": "On" + }, + "2": { + "color": "dark-red", + "index": 0, + "text": "Off" + } + }, + "type": "value" + } + ], "thresholds": { "mode": "absolute", "steps": [ @@ -326,328 +380,36 @@ "value": null }, { - "color": "red", - "value": 80 + "color": "#EAB839", + "value": 2 } ] } }, - "overrides": [] - }, - "gridPos": { - "h": 3, - "w": 4, - "x": 16, - "y": 0 - }, - "id": 57, - "options": { - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "mean" - ], - "fields": "", - "values": true - }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "11.0.0", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "count(redfish_logservices_entry_count{name=\"SEL Log Service\", severity!=\"OK\"} != 0)", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "title": "Nodes with SEL Logs", - "type": "stat" - }, - { - "collapsed": false, - "datasource": { - "type": "datasource", - "uid": "grafana" - }, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 3 - }, - "id": 31, - "panels": [], - "targets": [ - { - "datasource": { - "type": "datasource", - "uid": "grafana" - }, - "refId": "A" - } - ], - "title": "Overview", - "type": "row" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Time" }, - "thresholdsStyle": { - "mode": "off" - } - }, - "links": [], - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ + "properties": [ { - "color": "green", - "value": null + "id": "displayName", + "value": "Time" }, { - "color": "red", - "value": 80 + "id": "custom.hidden", + "value": true + }, + { + "id": "custom.align" } ] }, - "unit": "watt" - }, - "overrides": [] - }, - "gridPos": { - "h": 15, - "w": 5, - "x": 0, - "y": 4 - }, - "id": 36, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "maxHeight": 600, - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "10.2.2", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "sum(redfish_chassis_power_average_consumed_watts)", - "legendFormat": "Rack power consumption", - "refId": "A" - } - ], - "title": "Power Consumption", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "links": [], - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "watt" - }, - "overrides": [] - }, - "gridPos": { - "h": 15, - "w": 6, - "x": 5, - "y": 4 - }, - "id": 44, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "maxHeight": 600, - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "10.2.2", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "sum(redfish_chassis_power_average_consumed_watts) by (env)", - "interval": "", - "legendFormat": "{{ env }}", - "refId": "A" - } - ], - "title": "Power Consumption", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "fieldConfig": { - "defaults": { - "custom": { - "align": "auto", - "cellOptions": { - "type": "auto" - }, - "inspect": false - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Time" - }, - "properties": [ - { - "id": "displayName", - "value": "Time" - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "instance" + { + "matcher": { + "id": "byName", + "options": "instance" }, "properties": [ { @@ -672,7 +434,7 @@ { "targetBlank": true, "title": "", - "url": "https://${__cell}" + "url": "https://${__data.fields.instance}" } ] }, @@ -717,14 +479,6 @@ { "color": "#73BF69", "value": null - }, - { - "color": "#73BF69", - "value": 0 - }, - { - "color": "#C4162A", - "value": 1 } ] } @@ -866,7 +620,7 @@ { "targetBlank": true, "title": "", - "url": "https://${__cell_3}" + "url": "https://${__data.fields.instance}" } ] }, @@ -897,16 +651,28 @@ "id": "custom.align" } ] + }, + { + "matcher": { + "id": "byName", + "options": "Power state" + }, + "properties": [ + { + "id": "custom.width", + "value": 197 + } + ] } ] }, "gridPos": { - "h": 15, - "w": 5, - "x": 11, + "h": 8, + "w": 12, + "x": 0, "y": 4 }, - "id": 38, + "id": 59, "options": { "cellHeight": "sm", "footer": { @@ -917,16 +683,23 @@ ], "show": false }, - "showHeader": true + "showHeader": true, + "sortBy": [ + { + "desc": true, + "displayName": "Power state" + } + ] }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(redfish_system_power_state)", + "editorMode": "code", + "expr": "sort_desc(redfish_system_power_state{group=\"$group\", job!=\"redfish-exporter-collectlog\"})", "format": "table", "instant": true, "interval": "", @@ -947,9 +720,11 @@ }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, + "description": "", "fieldConfig": { "defaults": { "custom": { @@ -959,7 +734,25 @@ }, "inspect": false }, - "mappings": [], + "mappings": [ + { + "options": { + "1": { + "index": 1, + "text": "Healthy" + }, + "2": { + "index": 2, + "text": "Unknown" + }, + "3": { + "index": 0, + "text": "Unhealthy" + } + }, + "type": "value" + } + ], "thresholds": { "mode": "absolute", "steps": [ @@ -1006,11 +799,7 @@ }, { "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 + "value": "" }, { "id": "custom.cellOptions", @@ -1031,12 +820,12 @@ "value": null }, { - "color": "rgba(237, 129, 40, 0.89)", - "value": 1 + "color": "#EAB839", + "value": 2 }, { "color": "rgba(245, 54, 54, 0.9)", - "value": 2 + "value": 3 } ] } @@ -1063,7 +852,7 @@ { "targetBlank": true, "title": "", - "url": "https://$__cell_4" + "url": "https://${__data.fields.instance}" } ] }, @@ -1075,12 +864,12 @@ ] }, "gridPos": { - "h": 15, - "w": 8, - "x": 16, + "h": 8, + "w": 12, + "x": 12, "y": 4 }, - "id": 33, + "id": 61, "interval": "", "options": { "cellHeight": "sm", @@ -1092,16 +881,23 @@ ], "show": false }, - "showHeader": true + "showHeader": true, + "sortBy": [ + { + "desc": true, + "displayName": "Status" + } + ] }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort(redfish_chassis_health)", + "editorMode": "code", + "expr": "sort(redfish_chassis_health{group=\"$group\", job!=\"redfish-exporter-collectlog\"})", "format": "table", "hide": false, "instant": true, @@ -1123,112 +919,225 @@ }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, + "description": "", "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" + "align": "auto", + "cellOptions": { + "type": "auto" }, - "thresholdsStyle": { - "mode": "off" - } + "inspect": false }, - "links": [], - "mappings": [], - "min": 16, + "mappings": [ + { + "options": { + "1": { + "index": 1, + "text": "Healthy" + }, + "2": { + "index": 2, + "text": "Warning" + }, + "3": { + "index": 0, + "text": "Critical" + } + }, + "type": "value" + } + ], "thresholds": { "mode": "absolute", "steps": [ { "color": "green", "value": null + } + ] + } + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/__name__|chassis_id|Time|env|job|resource|instance/" + }, + "properties": [ + { + "id": "displayName", + "value": "Time" }, { - "color": "red", - "value": 80 + "id": "custom.hidden", + "value": true + }, + { + "id": "custom.align" } ] }, - "unit": "celsius" - }, - "overrides": [] - }, - "gridPos": { - "h": 11, - "w": 5, - "x": 0, - "y": 19 - }, - "id": 39, - "interval": "5m", - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "maxHeight": 600, - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "10.2.2", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "editorMode": "code", - "expr": "max(redfish_chassis_temperature_celsius{sensor_id=~\".*InletTemp\"} or redfish_chassis_temperature_celsius{sensor=~\".*Inlet.*\"}) by (env)", - "hide": false, - "interval": "", - "legendFormat": "max inlet {{ env }}", - "range": true, + { + "matcher": { + "id": "byName", + "options": "Value" + }, + "properties": [ + { + "id": "displayName", + "value": "Status" + }, + { + "id": "unit", + "value": "" + }, + { + "id": "custom.cellOptions", + "value": { + "type": "color-background" + } + }, + { + "id": "custom.align" + }, + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "#EAB839", + "value": 2 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 3 + } + ] + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "server" + }, + "properties": [ + { + "id": "unit", + "value": "short" + }, + { + "id": "decimals", + "value": 2 + }, + { + "id": "links", + "value": [ + { + "targetBlank": true, + "title": "", + "url": "https://${__data.fields.instance}" + } + ] + }, + { + "id": "custom.align" + } + ] + } + ] + }, + "gridPos": { + "h": 11, + "w": 12, + "x": 0, + "y": 12 + }, + "id": 62, + "interval": "", + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true, + "sortBy": [ + { + "desc": true, + "displayName": "Status" + } + ] + }, + "pluginVersion": "11.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "max(last_over_time({__name__=~\"redfish_chassis_log_entry_severity_state|redfish_manager_log_entry_severity_state\", group=\"$group\"}[1h])) by (group, server, log_service_id, instance)", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", "refId": "A" } ], - "title": "Max Inlet Temp", - "type": "timeseries" + "title": "Log severity summary", + "transformations": [ + { + "id": "merge", + "options": { + "reducers": [] + } + }, + { + "id": "organize", + "options": { + "excludeByName": {}, + "includeByName": {}, + "indexByName": { + "Time": 0, + "Value": 4, + "group": 1, + "instance": 5, + "log_service_id": 3, + "server": 2 + }, + "renameByName": { + "Value": "Status", + "log_service_id": "Log Service", + "server": "Server" + } + } + } + ], + "type": "table" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -1241,8 +1150,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -1256,7 +1166,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -1268,7 +1178,6 @@ }, "links": [], "mappings": [], - "min": 40, "thresholds": { "mode": "absolute", "steps": [ @@ -1282,32 +1191,34 @@ } ] }, - "unit": "celsius" + "unit": "watt" }, "overrides": [] }, "gridPos": { "h": 11, "w": 6, - "x": 5, - "y": 19 + "x": 12, + "y": 12 }, - "id": 40, - "interval": "5m", + "id": 44, "options": { "legend": { - "calcs": [], - "displayMode": "list", + "calcs": [ + "mean", + "lastNotNull", + "max" + ], + "displayMode": "table", "placement": "bottom", "showLegend": true }, "tooltip": { - "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { @@ -1315,19 +1226,19 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "max(redfish_chassis_temperature_celsius{sensor_id=~\".*CPU1Temp\"} or redfish_chassis_temperature_celsius{sensor=~\".*CPU1.*\"}) by (env)", - "hide": false, + "expr": "sum(redfish_chassis_power_average_consumed_watts{group=\"$group\", job!=\"redfish-exporter-collectlog\"}) by (env)", "interval": "", "legendFormat": "{{ env }}", "range": true, "refId": "A" } ], - "title": "Max CPU1 Temp", + "title": "Power consumption", "type": "timeseries" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -1343,8 +1254,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -1358,7 +1270,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -1370,7 +1282,6 @@ }, "links": [], "mappings": [], - "min": 40, "thresholds": { "mode": "absolute", "steps": [ @@ -1384,32 +1295,33 @@ } ] }, - "unit": "celsius" + "unit": "short" }, "overrides": [] }, "gridPos": { "h": 11, - "w": 5, - "x": 11, - "y": 19 + "w": 6, + "x": 18, + "y": 12 }, - "id": 41, - "interval": "5m", + "id": 42, "options": { "legend": { - "calcs": [], - "displayMode": "list", + "calcs": [ + "lastNotNull", + "max" + ], + "displayMode": "table", "placement": "bottom", "showLegend": true }, "tooltip": { - "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { @@ -1417,19 +1329,33 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "max(redfish_chassis_temperature_celsius{sensor_id=~\".*CPU2Temp\"} or redfish_chassis_temperature_celsius{sensor=~\"CPU2.*\"}) by (env)", + "expr": "count(redfish_system_power_state{group=\"$group\", job!=\"redfish-exporter-collectlog\"} == 1) by (env)", "hide": false, "interval": "", - "legendFormat": "{{ env }}", + "legendFormat": "Powered up {{ env }}", "range": true, "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "count(redfish_system_power_state{group=\"$group\", job!=\"redfish-exporter-collectlog\"} == 2) by (env) * -1", + "hide": true, + "interval": "", + "legendFormat": "Powered down {{ env }}", + "range": true, + "refId": "B" } ], - "title": "Max CPU2 Temp", + "title": "Powered status", "type": "timeseries" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -1445,8 +1371,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -1460,7 +1387,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -1472,6 +1399,7 @@ }, "links": [], "mappings": [], + "min": 16, "thresholds": { "mode": "absolute", "steps": [ @@ -1485,63 +1413,60 @@ } ] }, - "unit": "short" + "unit": "celsius" }, "overrides": [] }, "gridPos": { "h": 11, - "w": 4, - "x": 16, - "y": 19 + "w": 7, + "x": 0, + "y": 23 }, - "id": 42, + "id": 39, + "interval": "5m", "options": { "legend": { - "calcs": [], - "displayMode": "list", + "calcs": [ + "mean", + "lastNotNull", + "max" + ], + "displayMode": "table", "placement": "bottom", "showLegend": true }, "tooltip": { - "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "count(redfish_system_power_state == 1) by (env)", + "editorMode": "code", + "expr": "max(redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp|.*Inlet.*\", group=\"$group\", job!=\"redfish-exporter-collectlog\"}) by (env)", "hide": false, "interval": "", - "legendFormat": "Powered up {{ env }}", + "legendFormat": "max inlet {{ env }}", + "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "count(redfish_system_power_state == 2) by (env) * -1", - "hide": true, - "interval": "", - "legendFormat": "Powered down {{ env }}", - "refId": "B" } ], - "title": "Powered ON by Rack", + "title": "Max Inlet Temp", "type": "timeseries" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -1554,8 +1479,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -1569,7 +1495,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -1581,6 +1507,7 @@ }, "links": [], "mappings": [], + "min": 20, "thresholds": { "mode": "absolute", "steps": [ @@ -1594,31 +1521,76 @@ } ] }, - "unit": "short" + "unit": "celsius" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byValue", + "options": { + "op": "gte", + "reducer": "allIsZero", + "value": 0 + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + }, + { + "matcher": { + "id": "byValue", + "options": { + "op": "gte", + "reducer": "allIsNull", + "value": 0 + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + } + ] }, "gridPos": { "h": 11, - "w": 4, - "x": 20, - "y": 19 - }, - "id": 43, + "w": 8, + "x": 7, + "y": 23 + }, + "id": 40, + "interval": "5m", "options": { "legend": { - "calcs": [], - "displayMode": "list", + "calcs": [ + "mean", + "lastNotNull", + "max" + ], + "displayMode": "table", "placement": "bottom", "showLegend": true }, "tooltip": { - "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { @@ -1626,26 +1598,163 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "count(redfish_system_power_state == 1) by (env)", - "hide": true, + "expr": "max(redfish_chassis_temperature_celsius{sensor=~\".*CPU.*1.*Temp\", group=\"$group\", job!=\"redfish-exporter-collectlog\"}) by (env)", + "hide": false, "interval": "", - "legendFormat": "Powered up {{ env }}", + "legendFormat": "{{ env }}", "range": true, "refId": "A" + } + ], + "title": "Max CPU1 Temp", + "type": "timeseries" + }, + { + "datasource": { + "default": false, + "type": "prometheus", + "uid": "${datasource}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "links": [], + "mappings": [], + "min": 20, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "celsius" + }, + "overrides": [ + { + "matcher": { + "id": "byValue", + "options": { + "op": "gte", + "reducer": "allIsZero", + "value": 0 + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + }, + { + "matcher": { + "id": "byValue", + "options": { + "op": "gte", + "reducer": "allIsNull", + "value": 0 + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + } + ] + }, + "gridPos": { + "h": 11, + "w": 9, + "x": 15, + "y": 23 + }, + "id": 41, + "interval": "5m", + "options": { + "legend": { + "calcs": [ + "mean", + "lastNotNull", + "max" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "7.1.5", + "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "count(redfish_system_power_state == 2) by (env)", + "editorMode": "code", + "expr": "max(redfish_chassis_temperature_celsius{sensor=~\"CPU2 Temp|.*CPU.2.*Temp\", group=\"$group\", job!=\"redfish-exporter-collectlog\"}) by (env)", "hide": false, "interval": "", - "legendFormat": "Powered down {{ env }}", - "refId": "B" + "legendFormat": "{{ env }}", + "range": true, + "refId": "A" } ], - "title": "Powered OFF by Rack", + "title": "Max CPU2 Temp", "type": "timeseries" }, { @@ -1659,6 +1768,7 @@ }, "dataFormat": "timeseries", "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -1679,9 +1789,9 @@ }, "gridPos": { "h": 10, - "w": 7, + "w": 6, "x": 0, - "y": 30 + "y": 34 }, "heatmap": {}, "hideZeroBuckets": false, @@ -1719,7 +1829,6 @@ }, "showValue": "never", "tooltip": { - "maxHeight": 600, "mode": "single", "showColorScale": false, "yHistogram": true @@ -1730,7 +1839,7 @@ "unit": "short" } }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "reverseYBuckets": false, "targets": [ { @@ -1739,7 +1848,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "redfish_chassis_temperature_celsius{sensor_id=~\".*InletTemp\"} or redfish_chassis_temperature_celsius{sensor=~\".*Inlet.*\"}", + "expr": "redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp|.*Inlet.*\", group=\"$group\", job!=\"redfish-exporter-collectlog\"}", "hide": false, "interval": "", "intervalFactor": 1, @@ -1775,6 +1884,7 @@ }, "dataFormat": "timeseries", "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -1796,14 +1906,14 @@ }, "gridPos": { "h": 10, - "w": 5, - "x": 7, - "y": 30 + "w": 6, + "x": 6, + "y": 34 }, "heatmap": {}, "hideZeroBuckets": false, "highlightCards": true, - "id": 51, + "id": 48, "interval": "1m", "legend": { "show": false @@ -1836,18 +1946,19 @@ }, "showValue": "never", "tooltip": { - "maxHeight": 600, "mode": "single", "showColorScale": false, "yHistogram": true }, "yAxis": { "axisPlacement": "left", + "max": "95", + "min": "25", "reverse": false, "unit": "short" } }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "reverseYBuckets": false, "targets": [ { @@ -1855,16 +1966,17 @@ "type": "prometheus", "uid": "${datasource}" }, - "expr": "max(redfish_chassis_fan_rpm_percentage) by (server) > 0", + "editorMode": "code", + "expr": "redfish_chassis_temperature_celsius{sensor=~\".*CPU.*1.*Temp\", group=\"$group\", job!=\"redfish-exporter-collectlog\"} != 0", "hide": false, "interval": "", "intervalFactor": 1, - "legendFormat": "", + "legendFormat": "{{ env }}", "range": true, "refId": "A" } ], - "title": "Max server fan speed", + "title": "CPU1 Temp", "tooltip": { "show": true, "showHistogram": true @@ -1876,6 +1988,8 @@ "yAxis": { "format": "short", "logBase": 1, + "max": "95", + "min": "25", "show": true }, "yBucketBound": "auto" @@ -1891,6 +2005,7 @@ }, "dataFormat": "timeseries", "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -1914,12 +2029,12 @@ "h": 10, "w": 6, "x": 12, - "y": 30 + "y": 34 }, "heatmap": {}, "hideZeroBuckets": false, "highlightCards": true, - "id": 48, + "id": 50, "interval": "1m", "legend": { "show": false @@ -1952,7 +2067,6 @@ }, "showValue": "never", "tooltip": { - "maxHeight": 600, "mode": "single", "showColorScale": false, "yHistogram": true @@ -1965,7 +2079,7 @@ "unit": "short" } }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "reverseYBuckets": false, "targets": [ { @@ -1974,7 +2088,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "(redfish_chassis_temperature_celsius{sensor_id=~\".*CPU1Temp\"} or redfish_chassis_temperature_celsius{sensor=~\"CPU1.*\"}) != 0", + "expr": "redfish_chassis_temperature_celsius{sensor=~\".*CPU.*2.*Temp\", group=\"$group\", job!=\"redfish-exporter-collectlog\"} != 0", "hide": false, "interval": "", "intervalFactor": 1, @@ -1983,7 +2097,7 @@ "refId": "A" } ], - "title": "CPU1 Temp", + "title": "CPU2 Temp", "tooltip": { "show": true, "showHistogram": true @@ -2012,6 +2126,7 @@ }, "dataFormat": "timeseries", "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -2035,12 +2150,12 @@ "h": 10, "w": 6, "x": 18, - "y": 30 + "y": 34 }, "heatmap": {}, "hideZeroBuckets": false, "highlightCards": true, - "id": 50, + "id": 51, "interval": "1m", "legend": { "show": false @@ -2073,20 +2188,17 @@ }, "showValue": "never", "tooltip": { - "maxHeight": 600, "mode": "single", "showColorScale": false, "yHistogram": true }, "yAxis": { "axisPlacement": "left", - "max": "95", - "min": "25", "reverse": false, "unit": "short" } }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "reverseYBuckets": false, "targets": [ { @@ -2095,16 +2207,16 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "(redfish_chassis_temperature_celsius{sensor_id=~\".*CPU2Temp\"} or redfish_chassis_temperature_celsius{sensor=~\"CPU2.*\"}) != 0", + "expr": "max(redfish_chassis_fan_rpm_percentage{group=\"$group\", job!=\"redfish-exporter-collectlog\"}) by (server) > 0", "hide": false, "interval": "", "intervalFactor": 1, - "legendFormat": "{{ env }}", + "legendFormat": "", "range": true, "refId": "A" } ], - "title": "CPU2 Temp", + "title": "Max server fan speed", "tooltip": { "show": true, "showHistogram": true @@ -2116,14 +2228,13 @@ "yAxis": { "format": "short", "logBase": 1, - "max": "95", - "min": "25", "show": true }, "yBucketBound": "auto" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -2139,6 +2250,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -2170,8 +2282,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2185,9 +2296,9 @@ }, "gridPos": { "h": 10, - "w": 13, + "w": 12, "x": 0, - "y": 40 + "y": 44 }, "id": 47, "interval": "5m", @@ -2203,12 +2314,11 @@ "showLegend": true }, "tooltip": { - "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { @@ -2216,7 +2326,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "redfish_chassis_temperature_celsius{sensor_id=~\".*InletTemp\"} or redfish_chassis_temperature_celsius{sensor=~\".*Inlet.*\"}", + "expr": "redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp\", job!=\"redfish-exporter-collectlog\"} or redfish_chassis_temperature_celsius{sensor_id=~\".*InletTemp\", job!=\"redfish-exporter-collectlog\"} or redfish_chassis_temperature_celsius{sensor=~\".*Inlet.*\", job!=\"redfish-exporter-collectlog\"}", "hide": false, "interval": "", "legendFormat": "{{ env }} {{ server }}", @@ -2229,6 +2339,7 @@ }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -2245,6 +2356,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -2276,8 +2388,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2291,9 +2402,9 @@ }, "gridPos": { "h": 10, - "w": 11, - "x": 13, - "y": 40 + "w": 12, + "x": 12, + "y": 44 }, "id": 49, "interval": "1m", @@ -2308,12 +2419,11 @@ "showLegend": true }, "tooltip": { - "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { @@ -2321,7 +2431,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "(redfish_chassis_temperature_celsius{sensor_id=~\".*CPU1Temp\"} or redfish_chassis_temperature_celsius{sensor=~\"CPU1.*\"}) != 0", + "expr": "redfish_chassis_temperature_celsius{sensor=~\".*CPU.*1.*Temp\", group=\"$group\", job!=\"redfish-exporter-collectlog\"} != 0", "hide": false, "interval": "", "legendFormat": "{{ env }} {{ server }}", @@ -2332,252 +2442,96 @@ "title": "Max CPU1 Temp", "type": "timeseries" }, + { + "collapsed": false, + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 54 + }, + "id": 29, + "panels": [], + "repeat": "server", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "refId": "A" + } + ], + "title": "$server", + "type": "row" + }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, "fieldConfig": { "defaults": { - "custom": { - "align": "auto", - "cellOptions": { - "type": "auto" - }, - "inspect": false - }, "mappings": [], + "max": 500, + "min": 0, "thresholds": { - "mode": "absolute", + "mode": "percentage", "steps": [ { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Time" - }, - "properties": [ - { - "id": "displayName", - "value": "Time" - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" + "color": "green" } ] }, - { - "matcher": { - "id": "byName", - "options": "Value" - }, - "properties": [ - { - "id": "displayName", - "value": "Count" - }, - { - "id": "unit", - "value": "short" - }, - { - "id": "custom.cellOptions", - "value": { - "type": "color-background" - } - }, - { - "id": "custom.align" - }, - { - "id": "thresholds", - "value": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 0 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 1 - } - ] - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "instance" - }, - "properties": [ - { - "id": "displayName", - "value": "BMC" - }, - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "links", - "value": [ - { - "targetBlank": true, - "title": "", - "url": "https://${__cell:raw}" - } - ] - }, - { - "id": "custom.align" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "__name__" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "job" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - } - ] + "unit": "watt" + }, + "overrides": [] }, "gridPos": { - "h": 7, - "w": 24, + "h": 4, + "w": 8, "x": 0, - "y": 50 + "y": 55 }, - "id": 34, + "id": 19, "options": { - "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" + "minVizHeight": 75, + "minVizWidth": 75, + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" ], - "show": false + "fields": "", + "values": false }, - "showHeader": true + "showThresholdLabels": false, + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort(redfish_logservices_entry_count{name=\"SEL Log Service\", severity!=\"OK\"})", - "format": "table", - "instant": true, + "editorMode": "code", + "expr": "redfish_chassis_power_average_consumed_watts{server=\"$server\", job!=\"redfish-exporter-collectlog\"}", + "hide": false, "interval": "", - "legendFormat": "{{instance}}", - "refId": "A" - } - ], - "title": "Errors in event log", - "transformations": [ - { - "id": "merge", - "options": { - "reducers": [] - } - } - ], - "type": "table" - }, - { - "collapsed": false, - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 57 - }, - "id": 29, - "panels": [], - "repeat": "server", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, + "legendFormat": "{{power_voltage}}", + "range": true, "refId": "A" } ], - "title": "$server", - "type": "row" + "title": "Power consumption", + "type": "gauge" }, { "datasource": { @@ -2586,33 +2540,31 @@ }, "fieldConfig": { "defaults": { + "displayName": "Disks", "mappings": [], - "max": 500, "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", - "value": 80 + "value": 1 } ] - }, - "unit": "watt" + } }, "overrides": [] }, "gridPos": { "h": 4, - "w": 8, - "x": 0, - "y": 58 + "w": 2, + "x": 8, + "y": 55 }, - "id": 19, + "id": 24, "options": { "minVizHeight": 75, "minVizWidth": 75, @@ -2628,21 +2580,22 @@ "showThresholdMarkers": true, "sizing": "auto" }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "redfish_chassis_power_average_consumed_watts{server=~\"$server\"}", - "hide": false, + "expr": "count(redfish_system_storage_drive_state{server=~\"$server\", job!=\"redfish-exporter-collectlog\"} != 1) or vector(0)", + "format": "table", + "instant": true, "interval": "", - "legendFormat": "{{type}}", + "legendFormat": "", "refId": "A" } ], - "title": "Power consumption", + "title": "Disks with errors", "type": "gauge" }, { @@ -2652,759 +2605,54 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 3, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": true, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "line+area" - } - }, - "decimals": 1, - "links": [], + "displayName": "Controllers", "mappings": [], + "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "red", - "value": null + "color": "green" }, { - "color": "transparent", - "value": 10000 + "color": "red", + "value": 1 } ] - }, - "unit": "rpm" - }, - "overrides": [ - { - "matcher": { - "id": "byValue", - "options": { - "op": "gte", - "reducer": "allIsZero", - "value": 0 - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": true, - "tooltip": true, - "viz": false - } - } - ] - }, - { - "matcher": { - "id": "byValue", - "options": { - "op": "gte", - "reducer": "allIsNull", - "value": 0 - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": true, - "tooltip": true, - "viz": false - } - } - ] - } - ] - }, - "gridPos": { - "h": 14, - "w": 8, - "x": 8, - "y": 58 - }, - "id": 4, - "interval": "", - "options": { - "legend": { - "calcs": [ - "max" - ], - "displayMode": "table", - "placement": "right", - "showLegend": true - }, - "tooltip": { - "maxHeight": 600, - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "10.2.2", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "redfish_chassis_fan_rpm_percentage{server=~\"$server\"}", - "format": "time_series", - "instant": false, - "interval": "", - "legendFormat": "{{fan}}", - "refId": "A" - } - ], - "title": "Fans", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "decimals": 0, - "links": [], - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 8, - "x": 16, - "y": 58 - }, - "id": 13, - "options": { - "legend": { - "calcs": [ - "mean", - "lastNotNull", - "max" - ], - "displayMode": "table", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "maxHeight": 600, - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "10.2.2", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "redfish_chassis_power_average_consumed_watts{server=~\"$server\"}", - "interval": "", - "legendFormat": "{{resource}}", - "refId": "A" - } - ], - "title": "Power consumption", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [ - { - "options": { - "1": { - "text": "Up" - }, - "2": { - "text": "Down" - } - }, - "type": "value" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#d44a3a", - "value": null - }, - { - "color": "#299c46", - "value": 0 - }, - { - "color": "#299c46", - "value": 2 - } - ] - }, - "unit": "none" + } }, "overrides": [] }, "gridPos": { - "h": 2, + "h": 4, "w": 2, - "x": 0, - "y": 62 + "x": 10, + "y": 55 }, - "id": 6, - "maxDataPoints": 100, + "id": 25, "options": { - "colorMode": "background", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "11.0.0", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "redfish_system_power_state{server=~\"$server\"}", - "format": "time_series", - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "title": "Power Status", - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [ - { - "options": { - "1": { - "text": "OK" - }, - "2": { - "text": "WARNING" - }, - "3": { - "text": "CRITICAL" - } - }, - "type": "value" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#299c46", - "value": null - }, - { - "color": "#299c46", - "value": 1 - }, - { - "color": "#d44a3a", - "value": 2 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 2, - "w": 4, - "x": 2, - "y": 62 - }, - "id": 7, - "maxDataPoints": 100, - "options": { - "colorMode": "background", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "vertical", - "reduceOptions": { - "calcs": [ - "max" - ], - "fields": "/^Value$/", - "values": false - }, - "showPercentChange": false, - "textMode": "value", - "wideLayout": true - }, - "pluginVersion": "11.0.0", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "editorMode": "code", - "exemplar": false, - "expr": "redfish_chassis_health{server=~\"$server\"}", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "{{chassis_id}}", - "range": false, - "refId": "A" - } - ], - "title": "General Health", - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [ - { - "options": { - "1": { - "text": "Healthy" - }, - "2": { - "text": "Warning" - }, - "3": { - "text": "Critical" - } - }, - "type": "value" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#d44a3a", - "value": null - }, - { - "color": "#299c46", - "value": 1 - }, - { - "color": "#299c46", - "value": 2 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 2, - "w": 2, - "x": 6, - "y": 62 - }, - "id": 8, - "maxDataPoints": 100, - "options": { - "colorMode": "background", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "11.0.0", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "redfish_manager_health_state{server=~\"$server\"}", - "format": "time_series", - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "title": "BMC Health", - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "fieldConfig": { - "defaults": { - "custom": { - "align": "auto", - "cellOptions": { - "type": "auto" - }, - "inspect": false - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Time" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "__name__" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "instance" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "job" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "env" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Value" - }, - "properties": [ - { - "id": "displayName", - "value": "Status" - }, - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.cellOptions", - "value": { - "type": "color-background" - } - }, - { - "id": "custom.align" - }, - { - "id": "thresholds", - "value": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(245, 54, 54, 0.9)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 0 - }, - { - "color": "rgba(50, 172, 45, 0.97)", - "value": 1 - } - ] - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "resource" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - } - ] - }, - "gridPos": { - "h": 12, - "w": 8, - "x": 0, - "y": 64 - }, - "id": 2, - "interval": "", - "options": { - "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" + "minVizHeight": 75, + "minVizWidth": 75, + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "mean" ], - "show": false + "fields": "", + "values": false }, - "showHeader": true + "showThresholdLabels": false, + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "redfish_system_storage_drive_state{server=~\"$server\"}", + "expr": "count(redfish_system_pcie_device_health_state{server=~\"$server\", job!=\"redfish-exporter-collectlog\"} != 1) or vector(0)", "format": "table", "instant": true, "interval": "", @@ -3412,37 +2660,29 @@ "refId": "A" } ], - "title": "Disk states / health", - "transformations": [ - { - "id": "merge", - "options": { - "reducers": [] - } - } - ], - "type": "table" + "title": "PCI-E with errors", + "type": "gauge" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, "fieldConfig": { "defaults": { - "displayName": "Disks", + "displayName": "Sensor", "mappings": [], "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", - "value": 80 + "value": 1 } ] } @@ -3452,10 +2692,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 8, - "y": 72 + "x": 12, + "y": 55 }, - "id": 24, + "id": 26, "options": { "minVizHeight": 75, "minVizWidth": 75, @@ -3471,14 +2711,15 @@ "showThresholdMarkers": true, "sizing": "auto" }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "count(redfish_system_storage_drive_state{server=~\"$server\"} != 1) or vector(0)", + "editorMode": "code", + "expr": "count(redfish_chassis_temperature_sensor_state{server=~\"$server\", job!=\"redfish-exporter-collectlog\"} > 2) or vector(0)", "format": "table", "instant": true, "interval": "", @@ -3486,7 +2727,7 @@ "refId": "A" } ], - "title": "Disk with errors", + "title": "Sensors with errors", "type": "gauge" }, { @@ -3496,19 +2737,18 @@ }, "fieldConfig": { "defaults": { - "displayName": "Controllers", + "displayName": "Power Supply", "mappings": [], "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", - "value": 80 + "value": 1 } ] } @@ -3518,10 +2758,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 10, - "y": 72 + "x": 14, + "y": 55 }, - "id": 25, + "id": 27, "options": { "minVizHeight": 75, "minVizWidth": 75, @@ -3537,14 +2777,14 @@ "showThresholdMarkers": true, "sizing": "auto" }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "count(redfish_system_pcie_device_health_state{server=~\"$server\"} != 1) or vector(0)", + "expr": "count(redfish_chassis_power_powersupply_health{server=~\"$server\", job!=\"redfish-exporter-collectlog\"} > 1) or vector(0)", "format": "table", "instant": true, "interval": "", @@ -3552,74 +2792,308 @@ "refId": "A" } ], - "title": "PCI-E with errors", + "title": "PS with errors", "type": "gauge" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, "fieldConfig": { "defaults": { - "displayName": "Fans", + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, "mappings": [], + "max": 80, "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", "value": 80 } ] + }, + "unit": "degree" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Temperature" + }, + "properties": [ + { + "id": "custom.cellOptions", + "value": { + "type": "color-background" + } + } + ] + } + ] + }, + "gridPos": { + "h": 18, + "w": 8, + "x": 16, + "y": 55 + }, + "id": 17, + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": true, + "sortBy": [ + { + "desc": true, + "displayName": "Temperature" + } + ] + }, + "pluginVersion": "11.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "exemplar": false, + "expr": "sum by (sensor) (sum_over_time(redfish_chassis_temperature_celsius{server=\"$server\", job!=\"redfish-exporter-collectlog\"}[15m])) / sum by (sensor) (count_over_time(redfish_chassis_temperature_celsius{server=\"$server\", job!=\"redfish-exporter-collectlog\"}[15m])) > 0", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "{{sensor}}", + "range": false, + "refId": "A" + } + ], + "title": "Temperatures", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true + }, + "includeByName": {}, + "indexByName": {}, + "renameByName": { + "Value": "Temperature", + "sensor": "Sensor" + } } + } + ], + "type": "table" + }, + { + "datasource": { + "default": false, + "type": "prometheus", + "uid": "${datasource}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "1": { + "text": "Up" + } + }, + "type": "value" + }, + { + "options": { + "2": { + "text": "Down" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#d44a3a" + }, + { + "color": "#299c46", + "value": 0 + }, + { + "color": "#299c46", + "value": 2 + } + ] + }, + "unit": "none" }, "overrides": [] }, "gridPos": { "h": 4, - "w": 2, - "x": 12, - "y": 72 + "w": 3, + "x": 0, + "y": 59 }, - "id": 26, + "id": 6, + "maxDataPoints": 100, "options": { - "minVizHeight": 75, - "minVizWidth": 75, + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "", + "values": false + }, + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true + }, + "pluginVersion": "11.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "editorMode": "code", + "expr": "redfish_system_power_state{server=\"$server\", job!=\"redfish-exporter-collectlog\"}", + "format": "time_series", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Power Status", + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "1": { + "text": "OK" + }, + "2": { + "text": "WARNING" + }, + "3": { + "text": "CRITICAL" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "#299c46" + }, + { + "color": "#299c46", + "value": 1 + }, + { + "color": "#d44a3a", + "value": 2 + } + ] + }, + "unit": "none" + }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 5, + "x": 3, + "y": 59 + }, + "id": 66, + "maxDataPoints": 100, + "options": { + "colorMode": "background", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "vertical", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ - "mean" + "max" ], - "fields": "", + "fields": "/^Value$/", "values": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true, - "sizing": "auto" + "showPercentChange": false, + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "count(redfish_chassis_temperature_sensor_state{server=~\"$server\"} != 1) or vector(0)", + "editorMode": "code", + "exemplar": false, + "expr": "redfish_chassis_health{server=~\"$server\"}", "format": "table", "instant": true, "interval": "", - "legendFormat": "", + "legendFormat": "{{chassis_id}}", + "range": false, "refId": "A" } ], - "title": "Sensors with errors", - "type": "gauge" + "title": "General Health", + "type": "stat" }, { "datasource": { @@ -3628,132 +3102,242 @@ }, "fieldConfig": { "defaults": { - "displayName": "Power Supply", + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, "mappings": [], + "max": 80, "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" + }, + { + "color": "orange", + "value": 50 }, { "color": "red", - "value": 80 + "value": 70 } ] - } + }, + "unit": "degree" }, "overrides": [] }, "gridPos": { - "h": 4, - "w": 2, - "x": 14, - "y": 72 + "h": 7, + "w": 8, + "x": 8, + "y": 59 }, - "id": 27, + "id": 45, "options": { - "minVizHeight": 75, - "minVizWidth": 75, - "orientation": "auto", - "reduceOptions": { + "legend": { "calcs": [ - "mean" + "lastNotNull", + "max", + "min" ], - "fields": "", - "values": false + "displayMode": "table", + "placement": "bottom", + "showLegend": true }, - "showThresholdLabels": false, - "showThresholdMarkers": true, - "sizing": "auto" + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "pluginVersion": "11.0.0", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "count(redfish_chassis_power_powersupply_health{server=~\"$server\"} > 1) or vector(0)", - "format": "table", - "instant": true, + "expr": "redfish_chassis_temperature_celsius{server=~\"$server\", job!=\"redfish-exporter-collectlog\"}", "interval": "", - "legendFormat": "", + "legendFormat": "{{sensor}}", "refId": "A" } ], - "title": "PS with errors", - "type": "gauge" + "title": "Temperatures", + "type": "timeseries" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, "fieldConfig": { "defaults": { + "color": { + "mode": "fixed" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "color-background" + }, + "filterable": false, + "inspect": false + }, "mappings": [], - "max": 80, - "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "#299c46" }, { - "color": "red", - "value": 80 + "color": "#299c46", + "value": 1 + }, + { + "color": "#d44a3a", + "value": 2 } ] }, - "unit": "degree" + "unit": "none" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Value" + }, + "properties": [ + { + "id": "mappings", + "value": [ + { + "options": { + "1": { + "color": "dark-green", + "index": 0, + "text": "OK" + }, + "2": { + "color": "dark-yellow", + "index": 1, + "text": "WARNING" + }, + "3": { + "color": "dark-red", + "index": 2, + "text": "CRITICAL" + } + }, + "type": "value" + } + ] + } + ] + } + ] }, "gridPos": { - "h": 4, - "w": 24, + "h": 10, + "w": 8, "x": 0, - "y": 76 + "y": 63 }, - "id": 17, + "id": 7, + "maxDataPoints": 100, "options": { - "minVizHeight": 75, - "minVizWidth": 75, - "orientation": "vertical", - "reduceOptions": { - "calcs": [ - "mean" - ], + "cellHeight": "sm", + "footer": { + "countRows": false, + "enablePagination": true, "fields": "", - "values": false + "reducer": [ + "sum" + ], + "show": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true, - "sizing": "auto" + "showHeader": true, + "sortBy": [] }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "redfish_chassis_temperature_celsius{server=~\"$server\"}", - "interval": "", - "legendFormat": "{{sensor}}", + "editorMode": "code", + "expr": "redfish_chassis_health{server=\"$server\", job!=\"redfish-exporter-collectlog\"}", + "format": "table", + "instant": true, + "interval": "30m", + "legendFormat": "Chassis {{chassis_id}}", "refId": "A" } ], - "title": "Temperatures", - "type": "gauge" + "title": "Health by Chassis", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true, + "__name__": true, + "env": true, + "group": true, + "instance": true, + "job": true, + "resource": true, + "server": true + }, + "includeByName": {}, + "indexByName": {}, + "renameByName": {} + } + } + ], + "type": "table" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -3769,8 +3353,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -3784,7 +3369,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -3794,14 +3379,14 @@ "mode": "off" } }, + "decimals": 0, "links": [], "mappings": [], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3809,44 +3394,49 @@ } ] }, - "unit": "degree" + "unit": "short" }, "overrides": [] }, "gridPos": { - "h": 10, - "w": 24, - "x": 0, - "y": 80 + "h": 7, + "w": 8, + "x": 8, + "y": 66 }, - "id": 45, + "id": 13, "options": { "legend": { - "calcs": [], - "displayMode": "list", + "calcs": [ + "mean", + "lastNotNull", + "max" + ], + "displayMode": "table", "placement": "bottom", "showLegend": true }, "tooltip": { - "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "redfish_chassis_temperature_celsius{server=~\"$server\"}", + "editorMode": "code", + "expr": "redfish_chassis_power_average_consumed_watts{server=~\"$server\", job!=\"redfish-exporter-collectlog\"}", "interval": "", - "legendFormat": "{{sensor}}", + "legendFormat": "{{power_voltage}}", + "range": true, "refId": "A" } ], - "title": "Temperatures", + "title": "Power consumption", "type": "timeseries" } ], @@ -3877,24 +3467,89 @@ }, { "current": { - "isNone": true, "selected": false, - "text": "None", - "value": "" + "text": "production", + "value": "production" + }, + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "definition": "label_values(redfish_exporter_collector_duration_seconds,env)", + "hide": 0, + "includeAll": false, + "label": "env", + "multi": false, + "name": "env", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(redfish_exporter_collector_duration_seconds,env)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "current": { + "selected": false, + "text": "compute", + "value": "compute" + }, + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "definition": "label_values(redfish_exporter_collector_duration_seconds{env=\"$env\"},group)", + "hide": 0, + "includeAll": false, + "label": "group", + "multi": false, + "name": "group", + "options": [], + "query": { + "qryType": 1, + "query": "label_values(redfish_exporter_collector_duration_seconds{env=\"$env\"},group)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tagsQuery": "", + "type": "query", + "useTags": false + }, + { + "current": { + "selected": false, + "text": "svn1-dr07-u10", + "value": "svn1-dr07-u10" }, "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "definition": "label_values(redfish_exporter_collector_duration_seconds, server)", + "definition": "label_values(redfish_exporter_collector_duration_seconds{group=\"$group\", env=\"$env\"},server)", "hide": 0, "includeAll": false, "label": "server", "multi": false, "name": "server", "options": [], - "query": "label_values(redfish_exporter_collector_duration_seconds, server)", - "refresh": 1, + "query": { + "qryType": 1, + "query": "label_values(redfish_exporter_collector_duration_seconds{group=\"$group\", env=\"$env\"},server)", + "refId": "PrometheusVariableQueryEditor-VariableQuery" + }, + "refresh": 2, "regex": "", "skipUrlSync": false, "sort": 0, @@ -3909,7 +3564,6 @@ "from": "now-30m", "to": "now-5m" }, - "timeRangeUpdatedDuringEditOrView": false, "timepicker": { "nowDelay": "1m", "refresh_intervals": [ @@ -3927,8 +3581,8 @@ }, "timezone": "", "title": "Redfish exporter", - "uid": "b02mElQGX", - "version": 1, + "uid": "redfish", + "version": 3, "weekStart": "" } {% endraw %} diff --git a/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/60-redfish.yml b/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/60-redfish.yml index 6f234e5a0..54a8ae2e5 100644 --- a/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/60-redfish.yml +++ b/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/60-redfish.yml @@ -2,10 +2,12 @@ --- {% if seed_redfish_exporter_container_enabled | bool %} scrape_configs: - - job_name: redfish-exporter-seed + - job_name: redfish-exporter + params: + collectlogs: ['false'] metrics_path: /redfish - scrape_timeout: 120s - scrape_interval: {{ [8 * groups['redfish_exporter_targets'] | length, 120] | max }}s + scrape_timeout: 300s + scrape_interval: {{ stackhpc_redfish_exporter_scrape_interval }}s relabel_configs: - source_labels: [__address__] target_label: __param_target diff --git a/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml b/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml index f886734a4..77e224bbc 100644 --- a/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml +++ b/etc/kayobe/kolla/config/prometheus/prometheus.yml.d/70-oscapacity.yml @@ -7,8 +7,10 @@ scrape_configs: static_configs: - targets: - '{{ kolla_internal_fqdn | put_address_in_context('url') }}:9090' - scrape_interval: 15m +{% endraw %} + scrape_interval: "{{ stackhpc_os_capacity_scrape_interval }}s" scrape_timeout: 10m +{% raw %} {% if kolla_enable_tls_internal | bool %} scheme: https {% endif %} diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 68521bab1..67827907a 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -64,3 +64,5 @@ prometheus_blackbox_exporter_endpoints_kayobe: - endpoints: - "pulp:http_2xx:{{ pulp_url }}/pulp/api/v3/status/" enabled: "{{ seed_pulp_container_enabled | bool }}" + +prometheus_openstack_exporter_interval: "{{ stackhpc_prometheus_openstack_exporter_interval }}s" diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index c76b82f8a..4542c9bbc 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -145,9 +145,9 @@ seed_redfish_exporter_container: image: ghcr.io/stackhpc/redfish-exporter pre: "{{ kayobe_config_path }}/containers/redfish_exporter/pre.yml" post: "{{ kayobe_config_path }}/containers/redfish_exporter/post.yml" - tag: "v1.0.2" + tag: "v2.1.1-stackhpc" network_mode: host - command: ./main --config.file /redfish_exporter.yml + command: redfish_exporter --config.file /redfish_exporter.yml volumes: "/opt/kayobe/containers/redfish_exporter/redfish_exporter.yml:/redfish_exporter.yml:ro" restart_policy: unless-stopped diff --git a/etc/kayobe/stackhpc-monitoring.yml b/etc/kayobe/stackhpc-monitoring.yml index 5eee4b19c..831486d10 100644 --- a/etc/kayobe/stackhpc-monitoring.yml +++ b/etc/kayobe/stackhpc-monitoring.yml @@ -45,9 +45,15 @@ stackhpc_os_capacity_openstack_cacert: "" stackhpc_os_capacity_openstack_verify: true # Redfish exporter +# How often to scrape the os capacity exporter in seconds. +stackhpc_os_capacity_scrape_interval: 900 + # Whether the redfish exporter is enabled. stackhpc_enable_redfish_exporter: false +# How often to scrape the BMCs in seconds. +stackhpc_redfish_exporter_scrape_interval: "{{ [8 * groups['redfish_exporter_targets'] | length, 300] | max }}" + # Credentials redfish_exporter_default_username: "{{ ipmi_username }}" redfish_exporter_default_password: "{{ ipmi_password }}" @@ -55,6 +61,9 @@ redfish_exporter_default_password: "{{ ipmi_password }}" # The address of the BMC that is used to query redfish metrics. redfish_exporter_target_address: "{{ ipmi_address }}" +# How often to scrape OpenStack Exporter in seconds. +stackhpc_prometheus_openstack_exporter_interval: 300 + ############################################################################### # Whether the RADOS gateway usage exporter is enabled. diff --git a/releasenotes/notes/bumps-redfish-exporter-to-v2-11032fb9dde36283.yaml b/releasenotes/notes/bumps-redfish-exporter-to-v2-11032fb9dde36283.yaml new file mode 100644 index 000000000..ddf1d58eb --- /dev/null +++ b/releasenotes/notes/bumps-redfish-exporter-to-v2-11032fb9dde36283.yaml @@ -0,0 +1,15 @@ +--- +features: + - Upgrades the redfish exporter container image to the v2.x series. + - Adds support for lenovo hardware to the redfish exporter dashboard. + - | + Adds the ``stackhpcredfish_exporter_scrape_interval``, + ``stackhpc_os_capacity_scrape_interval``, and + ``stackhpc_prometheus_openstack_exporter_interval`` + configuration variables. +fixes: + - Fixes various issues with the redfish exporter dashboard. +upgrade: + - | + Increases default ``os_capacity_scrape_interval`` to ``5m``. If you already customise + this please move to the new ``stackhpc_os_capacity_scrape_interval`` variable.