diff --git a/etc/kayobe/kolla/config/grafana/dashboards/openstack/redfish.json b/etc/kayobe/kolla/config/grafana/dashboards/openstack/redfish.json index 92001f842..e4d959a14 100644 --- a/etc/kayobe/kolla/config/grafana/dashboards/openstack/redfish.json +++ b/etc/kayobe/kolla/config/grafana/dashboards/openstack/redfish.json @@ -20,9 +20,8 @@ "fiscalYearStartMonth": 0, "gnetId": 12403, "graphTooltip": 0, - "id": 28, + "id": 30, "links": [], - "liveNow": false, "panels": [ { "datasource": { @@ -60,6 +59,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -71,15 +71,14 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "editorMode": "code", - "expr": "count(up{job=~\"redfish-exporter.*\"} == 1)", + "expr": "count(up{job=\"redfish-exporter\"} == 1)", "format": "table", "hide": false, "instant": true, @@ -140,6 +139,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -151,7 +151,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { @@ -175,11 +175,9 @@ "type": "prometheus", "uid": "${datasource}" }, - "description": "", "fieldConfig": { "defaults": { "mappings": [], - "noValue": "0", "thresholds": { "mode": "absolute", "steps": [ @@ -208,6 +206,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -219,7 +218,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { @@ -228,14 +227,11 @@ }, "expr": "count(redfish_system_power_state != 1)", "format": "table", - "fullMetaSearch": false, "hide": false, - "includeNullMetadata": true, "instant": true, "interval": "", - "legendFormat": "__auto", - "refId": "A", - "useBackend": false + "legendFormat": "", + "refId": "A" } ], "title": "Powered Off", @@ -249,7 +245,6 @@ "fieldConfig": { "defaults": { "mappings": [], - "noValue": "0", "thresholds": { "mode": "absolute", "steps": [ @@ -278,6 +273,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -289,7 +285,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { @@ -313,11 +309,9 @@ "type": "prometheus", "uid": "${datasource}" }, - "description": "", "fieldConfig": { "defaults": { "mappings": [], - "noValue": "0", "thresholds": { "mode": "absolute", "steps": [ @@ -346,6 +340,7 @@ "graphMode": "area", "justifyMode": "auto", "orientation": "auto", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ "mean" @@ -357,7 +352,7 @@ "textMode": "auto", "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { @@ -419,8 +414,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -434,7 +430,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -464,26 +460,28 @@ "overrides": [] }, "gridPos": { - "h": 15, - "w": 5, + "h": 11, + "w": 7, "x": 0, "y": 4 }, "id": 36, "options": { "legend": { - "calcs": [], + "calcs": [ + "mean", + "max" + ], "displayMode": "list", "placement": "bottom", "showLegend": true }, "tooltip": { - "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { @@ -515,8 +513,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -530,7 +529,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -560,26 +559,29 @@ "overrides": [] }, "gridPos": { - "h": 15, + "h": 11, "w": 6, - "x": 5, + "x": 7, "y": 4 }, "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": { @@ -602,13 +604,43 @@ }, "fieldConfig": { "defaults": { + "color": { + "mode": "palette-classic" + }, "custom": { - "align": "auto", - "cellOptions": { - "type": "auto" + "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 }, - "inspect": 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": [], "thresholds": { "mode": "absolute", @@ -622,504 +654,60 @@ "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" - }, - "properties": [ - { - "id": "displayName", - "value": "BMC" - }, - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "links", - "value": [ - { - "targetBlank": true, - "title": "", - "url": "https://${__cell}" - } - ] - }, - { - "id": "custom.align", - "value": "left" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Value" - }, - "properties": [ - { - "id": "displayName", - "value": "Power state" - }, - { - "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": "#73BF69", - "value": null - }, - { - "color": "#73BF69", - "value": 0 - }, - { - "color": "#C4162A", - "value": 1 - } - ] - } - } - ] - }, - { - "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": "env" - }, - "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": "resource" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "system_id" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "server" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "links", - "value": [ - { - "targetBlank": true, - "title": "", - "url": "https://${__cell_3}" - } - ] - }, - { - "id": "custom.align" - } - ] }, - { - "matcher": { - "id": "byName", - "options": "hostname" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - } - ] + "unit": "short" + }, + "overrides": [] }, "gridPos": { - "h": 15, - "w": 5, - "x": 11, + "h": 11, + "w": 6, + "x": 13, "y": 4 }, - "id": 38, + "id": 42, "options": { - "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" + "legend": { + "calcs": [ + "lastNotNull", + "max" ], - "show": false + "displayMode": "table", + "placement": "bottom", + "showLegend": true }, - "showHeader": true + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "pluginVersion": "11.0.0", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort_desc(redfish_system_power_state)", - "format": "table", - "instant": true, + "expr": "count(redfish_system_power_state == 1) by (env)", + "hide": false, "interval": "", - "legendFormat": "", + "legendFormat": "Powered up {{ env }}", "refId": "A" - } - ], - "title": "Power states", - "transformations": [ - { - "id": "merge", - "options": { - "reducers": [] - } - } - ], - "type": "table" - }, - { - "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": "byRegexp", - "options": "/__name__|chassis_id|Time|env|job|resource|instance/" - }, - "properties": [ - { - "id": "displayName", - "value": "Time" - }, - { - "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(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 1 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 2 - } - ] - } - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "server" - }, - "properties": [ - { - "id": "unit", - "value": "short" - }, - { - "id": "decimals", - "value": 2 - }, - { - "id": "links", - "value": [ - { - "targetBlank": true, - "title": "", - "url": "https://$__cell_4" - } - ] - }, - { - "id": "custom.align" - } - ] - } - ] - }, - "gridPos": { - "h": 15, - "w": 8, - "x": 16, - "y": 4 - }, - "id": 33, - "interval": "", - "options": { - "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false }, - "showHeader": true - }, - "pluginVersion": "11.0.0", - "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "sort(redfish_chassis_health)", - "format": "table", - "hide": false, - "instant": true, + "expr": "count(redfish_system_power_state == 2) by (env) * -1", + "hide": true, "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "title": "Chassis status", - "transformations": [ - { - "id": "merge", - "options": { - "reducers": [] - } + "legendFormat": "Powered down {{ env }}", + "refId": "B" } ], - "type": "table" + "title": "Powered ON by Rack", + "type": "timeseries" }, { "datasource": { @@ -1138,8 +726,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -1153,7 +742,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -1165,7 +754,6 @@ }, "links": [], "mappings": [], - "min": 16, "thresholds": { "mode": "absolute", "steps": [ @@ -1179,56 +767,66 @@ } ] }, - "unit": "celsius" + "unit": "short" }, "overrides": [] }, "gridPos": { "h": 11, "w": 5, - "x": 0, - "y": 19 + "x": 19, + "y": 4 }, - "id": 39, - "interval": "5m", + "id": 43, "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": { "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, + "expr": "count(redfish_system_power_state == 1) by (env)", + "hide": true, "interval": "", - "legendFormat": "max inlet {{ env }}", - "range": true, + "legendFormat": "Powered up {{ env }}", "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "expr": "count(redfish_system_power_state == 2) by (env)", + "hide": false, + "interval": "", + "legendFormat": "Powered down {{ env }}", + "refId": "B" } ], - "title": "Max Inlet Temp", + "title": "Powered OFF by Rack", "type": "timeseries" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, - "description": "", "fieldConfig": { "defaults": { "color": { @@ -1241,8 +839,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -1256,7 +855,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -1268,7 +867,7 @@ }, "links": [], "mappings": [], - "min": 40, + "min": 16, "thresholds": { "mode": "absolute", "steps": [ @@ -1288,26 +887,29 @@ }, "gridPos": { "h": 11, - "w": 6, - "x": 5, - "y": 19 + "w": 7, + "x": 0, + "y": 15 }, - "id": 40, + "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": { @@ -1315,22 +917,24 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "max(redfish_chassis_temperature_celsius{sensor_id=~\".*CPU1Temp\"} or redfish_chassis_temperature_celsius{sensor=~\".*CPU1.*\"}) by (env)", + "expr": "max(redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp\"}) by (env)", "hide": false, "interval": "", - "legendFormat": "{{ env }}", + "legendFormat": "max inlet {{ env }}", "range": true, "refId": "A" } ], - "title": "Max CPU1 Temp", + "title": "Max Inlet Temp", "type": "timeseries" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, + "description": "", "fieldConfig": { "defaults": { "color": { @@ -1343,8 +947,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -1358,7 +963,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -1370,7 +975,7 @@ }, "links": [], "mappings": [], - "min": 40, + "min": 20, "thresholds": { "mode": "absolute", "steps": [ @@ -1386,30 +991,74 @@ }, "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": 5, - "x": 11, - "y": 19 + "w": 8, + "x": 7, + "y": 15 }, - "id": 41, + "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": { @@ -1417,7 +1066,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "max(redfish_chassis_temperature_celsius{sensor_id=~\".*CPU2Temp\"} or redfish_chassis_temperature_celsius{sensor=~\"CPU2.*\"}) by (env)", + "expr": "max(redfish_chassis_temperature_celsius{sensor=~\".*CPU.*1.*Temp\"}) by (env)", "hide": false, "interval": "", "legendFormat": "{{ env }}", @@ -1425,11 +1074,12 @@ "refId": "A" } ], - "title": "Max CPU2 Temp", + "title": "Max CPU1 Temp", "type": "timeseries" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -1445,8 +1095,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -1460,7 +1111,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -1472,6 +1123,7 @@ }, "links": [], "mappings": [], + "min": 20, "thresholds": { "mode": "absolute", "steps": [ @@ -1485,140 +1137,76 @@ } ] }, - "unit": "short" + "unit": "celsius" }, - "overrides": [] - }, - "gridPos": { - "h": 11, - "w": 4, - "x": 16, - "y": 19 - }, - "id": 42, - "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": "count(redfish_system_power_state == 1) by (env)", - "hide": false, - "interval": "", - "legendFormat": "Powered up {{ env }}", - "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", - "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" + "overrides": [ + { + "matcher": { + "id": "byValue", + "options": { + "op": "gte", + "reducer": "allIsZero", + "value": 0 + } }, - "thresholdsStyle": { - "mode": "off" - } - }, - "links": [], - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, + "properties": [ { - "color": "red", - "value": 80 + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } } ] }, - "unit": "short" - }, - "overrides": [] + { + "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 + "w": 9, + "x": 15, + "y": 15 }, - "id": 43, + "id": 41, + "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 +1214,15 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "count(redfish_system_power_state == 1) by (env)", - "hide": true, + "expr": "max(redfish_chassis_temperature_celsius{sensor=~\".*CPU.2.*Temp\"}) by (env)", + "hide": false, "interval": "", - "legendFormat": "Powered up {{ env }}", + "legendFormat": "{{ env }}", "range": true, "refId": "A" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "expr": "count(redfish_system_power_state == 2) by (env)", - "hide": false, - "interval": "", - "legendFormat": "Powered down {{ env }}", - "refId": "B" } ], - "title": "Powered OFF by Rack", + "title": "Max CPU2 Temp", "type": "timeseries" }, { @@ -1659,6 +1236,7 @@ }, "dataFormat": "timeseries", "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -1679,9 +1257,9 @@ }, "gridPos": { "h": 10, - "w": 7, + "w": 5, "x": 0, - "y": 30 + "y": 26 }, "heatmap": {}, "hideZeroBuckets": false, @@ -1719,7 +1297,6 @@ }, "showValue": "never", "tooltip": { - "maxHeight": 600, "mode": "single", "showColorScale": false, "yHistogram": true @@ -1730,7 +1307,7 @@ "unit": "short" } }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "reverseYBuckets": false, "targets": [ { @@ -1739,7 +1316,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\"}", "hide": false, "interval": "", "intervalFactor": 1, @@ -1775,6 +1352,7 @@ }, "dataFormat": "timeseries", "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -1796,14 +1374,14 @@ }, "gridPos": { "h": 10, - "w": 5, - "x": 7, - "y": 30 + "w": 6, + "x": 5, + "y": 26 }, "heatmap": {}, "hideZeroBuckets": false, "highlightCards": true, - "id": 51, + "id": 48, "interval": "1m", "legend": { "show": false @@ -1836,18 +1414,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 +1434,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\"} != 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 +1456,8 @@ "yAxis": { "format": "short", "logBase": 1, + "max": "95", + "min": "25", "show": true }, "yBucketBound": "auto" @@ -1891,6 +1473,7 @@ }, "dataFormat": "timeseries", "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -1913,13 +1496,13 @@ "gridPos": { "h": 10, "w": 6, - "x": 12, - "y": 30 + "x": 11, + "y": 26 }, "heatmap": {}, "hideZeroBuckets": false, "highlightCards": true, - "id": 48, + "id": 50, "interval": "1m", "legend": { "show": false @@ -1952,7 +1535,6 @@ }, "showValue": "never", "tooltip": { - "maxHeight": 600, "mode": "single", "showColorScale": false, "yHistogram": true @@ -1965,7 +1547,7 @@ "unit": "short" } }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "reverseYBuckets": false, "targets": [ { @@ -1974,7 +1556,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\"} != 0", "hide": false, "interval": "", "intervalFactor": 1, @@ -1983,7 +1565,7 @@ "refId": "A" } ], - "title": "CPU1 Temp", + "title": "CPU2 Temp", "tooltip": { "show": true, "showHistogram": true @@ -2033,14 +1615,14 @@ }, "gridPos": { "h": 10, - "w": 6, + "w": 5, "x": 18, - "y": 30 + "y": 26 }, "heatmap": {}, "hideZeroBuckets": false, "highlightCards": true, - "id": 50, + "id": 51, "interval": "1m", "legend": { "show": false @@ -2073,20 +1655,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": [ { @@ -2094,17 +1673,15 @@ "type": "prometheus", "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) by (server) > 0", "hide": false, "interval": "", "intervalFactor": 1, - "legendFormat": "{{ env }}", - "range": true, + "legendFormat": "", "refId": "A" } ], - "title": "CPU2 Temp", + "title": "Max server fan speed", "tooltip": { "show": true, "showHistogram": true @@ -2116,14 +1693,13 @@ "yAxis": { "format": "short", "logBase": 1, - "max": "95", - "min": "25", "show": true }, "yBucketBound": "auto" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -2139,6 +1715,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -2185,9 +1762,9 @@ }, "gridPos": { "h": 10, - "w": 13, + "w": 12, "x": 0, - "y": 40 + "y": 36 }, "id": 47, "interval": "5m", @@ -2203,12 +1780,11 @@ "showLegend": true }, "tooltip": { - "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { @@ -2216,7 +1792,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "redfish_chassis_temperature_celsius{sensor_id=~\".*InletTemp\"} or redfish_chassis_temperature_celsius{sensor=~\"CPU2.*\"}", + "expr": "redfish_chassis_temperature_celsius{sensor=~\".*Ambient.*Temp\"}", "hide": false, "interval": "", "legendFormat": "{{ env }} {{ server }}", @@ -2229,6 +1805,7 @@ }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -2245,6 +1822,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -2291,9 +1869,9 @@ }, "gridPos": { "h": 10, - "w": 11, - "x": 13, - "y": 40 + "w": 12, + "x": 12, + "y": 36 }, "id": 49, "interval": "1m", @@ -2308,12 +1886,11 @@ "showLegend": true }, "tooltip": { - "maxHeight": 600, "mode": "multi", "sort": "none" } }, - "pluginVersion": "10.2.2", + "pluginVersion": "7.1.5", "targets": [ { "datasource": { @@ -2321,7 +1898,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\"} != 0", "hide": false, "interval": "", "legendFormat": "{{ env }} {{ server }}", @@ -2332,252 +1909,97 @@ "title": "Max CPU1 Temp", "type": "timeseries" }, + { + "collapsed": false, + "datasource": { + "type": "prometheus", + "uid": "${datasource}" + }, + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 46 + }, + "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 } ] - } + }, + "unit": "watt" }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "Time" - }, - "properties": [ - { - "id": "displayName", - "value": "Time" - }, - { - "id": "custom.hidden", - "value": true - }, - { - "id": "custom.align" - } - ] - }, - { - "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" - } - ] - } - ] + "overrides": [] }, "gridPos": { - "h": 7, - "w": 24, + "h": 4, + "w": 8, "x": 0, - "y": 50 + "y": 47 }, - "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\"}", + "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,8 +2008,8 @@ }, "fieldConfig": { "defaults": { + "displayName": "Disks", "mappings": [], - "max": 500, "min": 0, "thresholds": { "mode": "absolute", @@ -2601,18 +2023,17 @@ "value": 80 } ] - }, - "unit": "watt" + } }, "overrides": [] }, "gridPos": { "h": 4, - "w": 8, - "x": 0, - "y": 58 + "w": 2, + "x": 8, + "y": 47 }, - "id": 19, + "id": 24, "options": { "minVizHeight": 75, "minVizWidth": 75, @@ -2628,446 +2049,23 @@ "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\"} != 1) or vector(0)", + "format": "table", + "instant": true, "interval": "", - "legendFormat": "{{type}}", + "legendFormat": "", "refId": "A" } ], - "title": "Power consumption", - "type": "gauge" - }, - { - "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": 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": [], - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "red", - "value": null - }, - { - "color": "transparent", - "value": 10000 - } - ] - }, - "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, - "w": 2, - "x": 0, - "y": 62 - }, - "id": 6, - "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_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" + "title": "Disk with errors", + "type": "gauge" }, { "datasource": { @@ -3076,103 +2074,76 @@ }, "fieldConfig": { "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [ - { - "options": { - "1": { - "text": "Healthy" - }, - "2": { - "text": "Warning" - }, - "3": { - "text": "Critical" - } - }, - "type": "value" - } - ], + "displayName": "Controllers", + "mappings": [], + "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "#d44a3a", + "color": "green", "value": null }, { - "color": "#299c46", - "value": 1 - }, - { - "color": "#299c46", - "value": 2 + "color": "red", + "value": 80 } ] - }, - "unit": "none" + } }, "overrides": [] }, "gridPos": { - "h": 2, + "h": 4, "w": 2, - "x": 6, - "y": 62 + "x": 10, + "y": 47 }, - "id": 8, - "maxDataPoints": 100, + "id": 25, "options": { - "colorMode": "background", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "horizontal", + "minVizHeight": 75, + "minVizWidth": 75, + "orientation": "auto", "reduceOptions": { "calcs": [ - "lastNotNull" + "mean" ], "fields": "", "values": false }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true + "showThresholdLabels": false, + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "redfish_manager_health_state{server=~\"$server\"}", - "format": "time_series", + "expr": "count(redfish_system_pcie_device_health_state{server=~\"$server\"} != 1) or vector(0)", + "format": "table", "instant": true, "interval": "", "legendFormat": "", "refId": "A" } ], - "title": "BMC Health", - "type": "stat" + "title": "PCI-E with errors", + "type": "gauge" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, "fieldConfig": { "defaults": { - "custom": { - "align": "auto", - "cellOptions": { - "type": "auto" - }, - "inspect": false - }, + "displayName": "Sensor", "mappings": [], + "min": 0, "thresholds": { "mode": "absolute", "steps": [ @@ -3187,224 +2158,39 @@ ] } }, - "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" - } - ] - } - ] + "overrides": [] }, "gridPos": { - "h": 12, - "w": 8, - "x": 0, - "y": 64 + "h": 4, + "w": 2, + "x": 12, + "y": 47 }, - "id": 2, - "interval": "", + "id": 26, "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\"}", + "editorMode": "code", + "expr": "count(redfish_chassis_temperature_sensor_state{server=~\"$server\"} > 2) or vector(0)", "format": "table", "instant": true, "interval": "", @@ -3412,16 +2198,8 @@ "refId": "A" } ], - "title": "Disk states / health", - "transformations": [ - { - "id": "merge", - "options": { - "reducers": [] - } - } - ], - "type": "table" + "title": "Sensors with errors", + "type": "gauge" }, { "datasource": { @@ -3430,7 +2208,7 @@ }, "fieldConfig": { "defaults": { - "displayName": "Disks", + "displayName": "Power Supply", "mappings": [], "min": 0, "thresholds": { @@ -3452,10 +2230,10 @@ "gridPos": { "h": 4, "w": 2, - "x": 8, - "y": 72 + "x": 14, + "y": 47 }, - "id": 24, + "id": 27, "options": { "minVizHeight": 75, "minVizWidth": 75, @@ -3471,14 +2249,14 @@ "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)", + "expr": "count(redfish_chassis_power_powersupply_health{server=~\"$server\"} > 1) or vector(0)", "format": "table", "instant": true, "interval": "", @@ -3486,18 +2264,29 @@ "refId": "A" } ], - "title": "Disk with errors", + "title": "PS with errors", "type": "gauge" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, "fieldConfig": { "defaults": { - "displayName": "Controllers", + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "auto", + "cellOptions": { + "type": "color-text" + }, + "inspect": false + }, "mappings": [], + "max": 80, "min": 0, "thresholds": { "mode": "absolute", @@ -3508,52 +2297,69 @@ }, { "color": "red", - "value": 80 + "value": 70 } ] - } + }, + "unit": "degree" }, "overrides": [] }, "gridPos": { - "h": 4, - "w": 2, - "x": 10, - "y": 72 + "h": 18, + "w": 8, + "x": 16, + "y": 47 }, - "id": 25, + "id": 17, "options": { - "minVizHeight": 75, - "minVizWidth": 75, - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "mean" - ], + "cellHeight": "sm", + "footer": { + "countRows": false, "fields": "", - "values": false + "reducer": [ + "sum" + ], + "show": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true, - "sizing": "auto" + "showHeader": true }, - "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)", + "editorMode": "code", + "exemplar": false, + "expr": "sum by (sensor) (sum_over_time(redfish_chassis_temperature_celsius{server=~\"oscephpor01\"}[15m])) / sum by (sensor) (count_over_time(redfish_chassis_temperature_celsius{server=~\"oscephpor01\"}[15m])) > 0", "format": "table", "instant": true, "interval": "", - "legendFormat": "", + "legendFormat": "{{sensor}}", + "range": false, "refId": "A" } ], - "title": "PCI-E with errors", - "type": "gauge" + "title": "Temperatures", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true + }, + "includeByName": {}, + "indexByName": {}, + "renameByName": { + "Value": "Temperature", + "sensor": "Sensor" + } + } + } + ], + "type": "table" }, { "datasource": { @@ -3562,130 +2368,186 @@ }, "fieldConfig": { "defaults": { - "displayName": "Fans", - "mappings": [], - "min": 0, + "mappings": [ + { + "options": { + "1": { + "text": "Up" + } + }, + "type": "value" + }, + { + "options": { + "2": { + "text": "Down" + } + }, + "type": "value" + } + ], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", + "color": "#d44a3a", "value": null }, { - "color": "red", - "value": 80 + "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": 51 }, - "id": 26, + "id": 6, + "maxDataPoints": 100, "options": { - "minVizHeight": 75, - "minVizWidth": 75, - "orientation": "auto", + "colorMode": "background", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ - "mean" + "lastNotNull" ], "fields": "", "values": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true, - "sizing": "auto" + "showPercentChange": false, + "textMode": "auto", + "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)", - "format": "table", + "expr": "redfish_system_power_state{server=~\"$server\"}", + "format": "time_series", "instant": true, "interval": "", "legendFormat": "", "refId": "A" } ], - "title": "Sensors with errors", - "type": "gauge" + "title": "Power Status", + "type": "stat" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, "fieldConfig": { "defaults": { - "displayName": "Power Supply", - "mappings": [], - "min": 0, + "mappings": [ + { + "options": { + "1": { + "text": "OK" + } + }, + "type": "value" + }, + { + "options": { + "2": { + "text": "WARNING" + } + }, + "type": "value" + }, + { + "options": { + "3": { + "text": "CRITICAL" + } + }, + "type": "value" + } + ], "thresholds": { "mode": "absolute", "steps": [ { - "color": "green", + "color": "#299c46", "value": null }, { - "color": "red", - "value": 80 + "color": "#299c46", + "value": 1 + }, + { + "color": "#d44a3a", + "value": 2 } ] - } + }, + "unit": "none" }, "overrides": [] }, "gridPos": { "h": 4, - "w": 2, - "x": 14, - "y": 72 + "w": 5, + "x": 3, + "y": 51 }, - "id": 27, + "id": 7, + "maxDataPoints": 100, "options": { - "minVizHeight": 75, - "minVizWidth": 75, - "orientation": "auto", + "colorMode": "background", + "graphMode": "none", + "justifyMode": "auto", + "orientation": "horizontal", + "percentChangeColorMode": "standard", "reduceOptions": { "calcs": [ - "mean" + "lastNotNull" ], "fields": "", "values": false }, - "showThresholdLabels": false, - "showThresholdMarkers": true, - "sizing": "auto" + "showPercentChange": false, + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "11.0.0", + "pluginVersion": "11.2.0", "targets": [ { "datasource": { "type": "prometheus", "uid": "${datasource}" }, - "expr": "count(redfish_chassis_power_powersupply_health{server=~\"$server\"} > 1) or vector(0)", - "format": "table", + "editorMode": "code", + "expr": "redfish_chassis_health{server=~\"$server\", job=\"redfish-exporter\"}", + "format": "time_series", "instant": true, "interval": "", - "legendFormat": "", + "legendFormat": "Chassis {{chassis_id}}", "refId": "A" } ], - "title": "PS with errors", - "type": "gauge" + "title": "General Health", + "type": "stat" }, { "datasource": { @@ -3694,6 +2556,42 @@ }, "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" + } + }, "mappings": [], "max": 80, "min": 0, @@ -3704,9 +2602,13 @@ "color": "green", "value": null }, + { + "color": "orange", + "value": 50 + }, { "color": "red", - "value": 80 + "value": 70 } ] }, @@ -3715,28 +2617,29 @@ "overrides": [] }, "gridPos": { - "h": 4, - "w": 24, - "x": 0, - "y": 76 + "h": 7, + "w": 8, + "x": 8, + "y": 51 }, - "id": 17, + "id": 45, "options": { - "minVizHeight": 75, - "minVizWidth": 75, - "orientation": "vertical", - "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": { @@ -3750,10 +2653,11 @@ } ], "title": "Temperatures", - "type": "gauge" + "type": "timeseries" }, { "datasource": { + "default": false, "type": "prometheus", "uid": "${datasource}" }, @@ -3769,8 +2673,9 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, - "drawStyle": "points", - "fillOpacity": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 10, "gradientMode": "none", "hideFrom": { "legend": false, @@ -3784,7 +2689,7 @@ "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": false, "stacking": { "group": "A", @@ -3794,6 +2699,7 @@ "mode": "off" } }, + "decimals": 0, "links": [], "mappings": [], "thresholds": { @@ -3809,48 +2715,53 @@ } ] }, - "unit": "degree" + "unit": "short" }, "overrides": [] }, "gridPos": { - "h": 10, - "w": 24, - "x": 0, - "y": 80 + "h": 7, + "w": 8, + "x": 8, + "y": 58 }, - "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\"}", "interval": "", - "legendFormat": "{{sensor}}", + "legendFormat": "{{power_voltage}}", + "range": true, "refId": "A" } ], - "title": "Temperatures", + "title": "Power consumption", "type": "timeseries" } ], - "refresh": "", + "refresh": false, "schemaVersion": 39, "tags": [], "templating": { @@ -3877,10 +2788,9 @@ }, { "current": { - "isNone": true, - "selected": false, - "text": "None", - "value": "" + "selected": true, + "text": "oscomppor04", + "value": "oscomppor04" }, "datasource": { "type": "prometheus", @@ -3906,10 +2816,9 @@ ] }, "time": { - "from": "now-30m", - "to": "now-5m" + "from": "now-15m", + "to": "now-1m" }, - "timeRangeUpdatedDuringEditOrView": false, "timepicker": { "nowDelay": "1m", "refresh_intervals": [ @@ -3928,7 +2837,7 @@ "timezone": "", "title": "Redfish exporter", "uid": "b02mElQGX", - "version": 1, + "version": 2, "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..7f929c450 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,34 @@ --- {% 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: {{ [8 * groups['redfish_exporter_targets'] | length, 300] | max }}s + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - source_labels: [__param_target] + target_label: instance + - target_label: __address__ + replacement: "{{ lookup('vars', admin_oc_net_name ~ '_ips')[groups.seed.0] }}:9610" + static_configs: +{% for host in groups.get('redfish_exporter_targets', []) %} + - targets: + - '{{ hostvars[host]["redfish_exporter_target_address"] }}' + labels: + server: '{{ host }}' + env: "{{ kayobe_environment | default('openstack') }}" + group: "{{ hostvars[host]['redfish_exporter_scrape_group'] | default('overcloud') }}" +{% endfor %} + - job_name: redfish-exporter-collectlog + params: + collectlogs: ['true'] + metrics_path: /redfish + scrape_timeout: 1200s + scrape_interval: 3600s relabel_configs: - source_labels: [__address__] target_label: __param_target diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index c76b82f8a..fd8fd298e 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.0.0-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