From b1d70e4816e4ba0b3861da9437cd3f04e549015e Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Wed, 31 Mar 2021 15:33:50 +0200 Subject: [PATCH] Update example dashboards. --- ...i - Logical Partitions-1617197406774.json} | 1986 +++++++++++------ ...- HMCi - System Energy-1617197422138.json} | 16 +- ...MCi - System Resources-1617197455766.json} | 727 +++--- ... - Virtual I_O Servers-1617197498035.json} | 281 ++- .../java/biz/nellemann/hmci/HmcInstance.java | 4 +- .../biz/nellemann/hmci/HmcRestClient.java | 6 +- 6 files changed, 2021 insertions(+), 999 deletions(-) rename doc/{IBM Power - HMC Managed Systems - Logical Partitions-1616701467130.json => IBM Power - HMCi - Logical Partitions-1617197406774.json} (57%) rename doc/{IBM Power - HMC Managed Systems - Energy-1616701422249.json => IBM Power - HMCi - System Energy-1617197422138.json} (98%) rename doc/{IBM Power - HMC Managed Systems - Resources-1616701489526.json => IBM Power - HMCi - System Resources-1617197455766.json} (72%) rename doc/{IBM Power - HMC Managed Systems - Virtual I_O Servers-1616701514116.json => IBM Power - HMCi - Virtual I_O Servers-1617197498035.json} (76%) diff --git a/doc/IBM Power - HMC Managed Systems - Logical Partitions-1616701467130.json b/doc/IBM Power - HMCi - Logical Partitions-1617197406774.json similarity index 57% rename from doc/IBM Power - HMC Managed Systems - Logical Partitions-1616701467130.json rename to doc/IBM Power - HMCi - Logical Partitions-1617197406774.json index f08bda8..3d1f6b9 100644 --- a/doc/IBM Power - HMC Managed Systems - Logical Partitions-1616701467130.json +++ b/doc/IBM Power - HMCi - Logical Partitions-1617197406774.json @@ -7,6 +7,14 @@ "type": "datasource", "pluginId": "influxdb", "pluginName": "InfluxDB" + }, + { + "name": "DS_INFLUXDB", + "label": "InfluxDB", + "description": "", + "type": "datasource", + "pluginId": "influxdb", + "pluginName": "InfluxDB" } ], "__requires": [ @@ -33,6 +41,12 @@ "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "table", + "name": "Table", + "version": "" } ], "annotations": { @@ -54,9 +68,1324 @@ "gnetId": 1510, "graphTooltip": 0, "id": null, - "iteration": 1616701430705, + "iteration": 1617197381633, "links": [], "panels": [ + { + "collapsed": false, + "datasource": "${DS_INFLUXDB}", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 27, + "panels": [], + "repeat": null, + "title": "Details", + "type": "row" + }, + { + "datasource": "${DS_HMCI}", + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-RdYlGr" + }, + "custom": { + "align": "center", + "displayMode": "auto", + "filterable": true + }, + "mappings": [], + "thresholds": { + "mode": "percentage", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "none" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "lparname" + }, + "properties": [ + { + "id": "custom.width", + "value": 256 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "affinityScore" + }, + "properties": [ + { + "id": "color", + "value": { + "mode": "thresholds" + } + }, + { + "id": "unit", + "value": "percent" + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 1 + }, + "id": 31, + "options": { + "showHeader": true, + "sortBy": [] + }, + "pluginVersion": "7.4.2", + "targets": [ + { + "alias": "Read", + "groupBy": [ + { + "params": [ + "lparname" + ], + "type": "tag" + } + ], + "measurement": "lpar_details", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT last(\"id\") AS \"id\", \"type\", \"osType\", \"state\", \"affinityScore\" FROM \"lpar_details\" WHERE (\"lparname\" =~ /^$LPAR$/) AND $timeFilter GROUP BY \"lparname\"", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "table", + "select": [ + [ + { + "params": [ + "id" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "id" + ], + "type": "alias" + } + ], + [ + { + "params": [ + "type" + ], + "type": "field" + } + ], + [ + { + "params": [ + "affinityScore" + ], + "type": "field" + } + ], + [ + { + "params": [ + "state" + ], + "type": "field" + } + ], + [ + { + "params": [ + "osType" + ], + "type": "field" + } + ] + ], + "tags": [ + { + "key": "lparname", + "operator": "=~", + "value": "/^$LPAR$/" + } + ] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "", + "type": "table" + }, + { + "collapsed": false, + "datasource": "${DS_INFLUXDB}", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 9 + }, + "id": 18, + "panels": [], + "repeat": null, + "title": "Storage I/O", + "type": "row" + }, + { + "aliasColors": {}, + "bars": false, + "content": "", + "dashLength": 10, + "dashes": false, + "datasource": "${DS_HMCI}", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "color": {}, + "custom": {}, + "thresholds": { + "mode": "absolute", + "steps": [] + }, + "unit": "Bps" + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 1, + "grid": {}, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 10 + }, + "hiddenSeries": false, + "id": 11, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "show": false, + "sort": "avg", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "mode": "", + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.2", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "style": {}, + "targets": [ + { + "alias": "$tag_lparname read", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "lparname" + ], + "type": "tag" + } + ], + "hide": false, + "measurement": "lpar_storage_vFC", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"value\") FROM \"PartitionVirtualFiberChannelAdapters\" WHERE (\"system\" =~ /^$ManagedSystem$/ AND \"name\" != 'transmittedBytes' AND \"partition\" =~ /^$Partition$/) AND $timeFilter GROUP BY time($interval), \"wwpn\", \"partition\", \"name\" fill(null)", + "rawQuery": false, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "readBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + }, + { + "condition": "AND", + "key": "lparname", + "operator": "=~", + "value": "/^$LPAR$/" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Virtual Fiber Channel Adapters - Read Bytes", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:3776", + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:3777", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "content": "", + "dashLength": 10, + "dashes": false, + "datasource": "${DS_HMCI}", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "color": {}, + "custom": {}, + "thresholds": { + "mode": "absolute", + "steps": [] + }, + "unit": "Bps" + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 1, + "grid": {}, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 10 + }, + "hiddenSeries": false, + "id": 19, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "show": false, + "sort": "avg", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "mode": "", + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.2", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "style": {}, + "targets": [ + { + "alias": "$tag_lparname write", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "lparname" + ], + "type": "tag" + } + ], + "hide": false, + "measurement": "lpar_storage_vFC", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"writeBytes\") FROM \"lpar_storage_vFC\" WHERE (\"servername\" =~ /^$ServerName$/ AND \"lparname\" =~ /^$LparName$/) AND $timeFilter GROUP BY time(1m), \"lparname\"", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "writeBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + }, + { + "condition": "AND", + "key": "lparname", + "operator": "=~", + "value": "/^$LPAR$/" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Virtual Fiber Channel Adapters - Write Bytes", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:3776", + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:3777", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "content": "", + "dashLength": 10, + "dashes": false, + "datasource": "${DS_HMCI}", + "description": "", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "color": {}, + "custom": {}, + "thresholds": { + "mode": "absolute", + "steps": [] + }, + "unit": "Bps" + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 1, + "grid": {}, + "gridPos": { + "h": 6, + "w": 12, + "x": 0, + "y": 17 + }, + "hiddenSeries": false, + "id": 13, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "show": false, + "sort": "avg", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "mode": "", + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.2", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "style": {}, + "targets": [ + { + "alias": "$tag_lparname writeBytes", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "lparname" + ], + "type": "tag" + } + ], + "hide": false, + "measurement": "lpar_storage_virtual", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"writeBytes\") FROM \"lpar_storage_virtual\" WHERE (\"servername\" =~ /^$ServerName$/ AND \"lparname\" =~ /^$LparName$/) AND $timeFilter GROUP BY time($interval), \"lparname\"", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "writeBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + }, + { + "condition": "AND", + "key": "lparname", + "operator": "=~", + "value": "/^$LPAR$/" + } + ] + }, + { + "alias": "$tag_lparname readBytes", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "lparname" + ], + "type": "tag" + } + ], + "hide": false, + "measurement": "lpar_storage_virtual", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"value\") FROM \"PartitionVirtualFiberChannelAdapters\" WHERE (\"system\" =~ /^$ManagedSystem$/ AND \"name\" != 'transmittedBytes' AND \"partition\" =~ /^$Partition$/) AND $timeFilter GROUP BY time($interval), \"wwpn\", \"partition\", \"name\" fill(null)", + "rawQuery": false, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "readBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "*-1" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + }, + { + "condition": "AND", + "key": "lparname", + "operator": "=~", + "value": "/^$LPAR$/" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Virtual Adapters", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:3776", + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:3777", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "content": "", + "dashLength": 10, + "dashes": false, + "datasource": "${DS_HMCI}", + "description": "", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "color": {}, + "custom": {}, + "thresholds": { + "mode": "absolute", + "steps": [] + }, + "unit": "Bps" + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 1, + "grid": {}, + "gridPos": { + "h": 6, + "w": 12, + "x": 12, + "y": 17 + }, + "hiddenSeries": false, + "id": 12, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "show": false, + "sort": "avg", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "mode": "", + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.2", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "style": {}, + "targets": [ + { + "alias": "$tag_lparname writeBytes", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "lparname" + ], + "type": "tag" + } + ], + "hide": false, + "measurement": "lpar_storage_virtual", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"writeBytes\") FROM \"lpar_storage_virtual\" WHERE (\"servername\" =~ /^$ServerName$/ AND \"lparname\" =~ /^$LparName$/) AND $timeFilter GROUP BY time($interval), \"lparname\"", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "writeBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + }, + { + "condition": "AND", + "key": "lparname", + "operator": "=~", + "value": "/^$LPAR$/" + } + ] + }, + { + "alias": "$tag_lparname readBytes", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "lparname" + ], + "type": "tag" + } + ], + "hide": false, + "measurement": "lpar_storage_generic", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"value\") FROM \"PartitionVirtualFiberChannelAdapters\" WHERE (\"system\" =~ /^$ManagedSystem$/ AND \"name\" != 'transmittedBytes' AND \"partition\" =~ /^$Partition$/) AND $timeFilter GROUP BY time($interval), \"wwpn\", \"partition\", \"name\" fill(null)", + "rawQuery": false, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "readBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "*-1" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + }, + { + "condition": "AND", + "key": "lparname", + "operator": "=~", + "value": "/^$LPAR$/" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Generic Adapters", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:3776", + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:3777", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "collapsed": false, + "datasource": "${DS_INFLUXDB}", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 23 + }, + "id": 15, + "panels": [], + "repeat": null, + "title": "Network I/O", + "type": "row" + }, + { + "aliasColors": {}, + "bars": false, + "content": "", + "dashLength": 10, + "dashes": false, + "datasource": "${DS_HMCI}", + "description": "", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 3, + "grid": {}, + "gridPos": { + "h": 6, + "w": 12, + "x": 0, + "y": 24 + }, + "hiddenSeries": false, + "id": 8, + "legend": { + "alignAsTable": false, + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "show": false, + "sort": "avg", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "mode": "", + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.2", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "$$hashKey": "object:193" + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "style": {}, + "targets": [ + { + "alias": "$tag_lparname recv", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "lparname" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "lpar_net_virtual", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "receivedBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "lparname", + "operator": "=~", + "value": "/^$LPAR$/" + }, + { + "condition": "AND", + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Virtual Network Adapters - Received Bytes", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:10101", + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:10102", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": true, + "alignLevel": 0 + } + }, + { + "aliasColors": {}, + "bars": false, + "content": "", + "dashLength": 10, + "dashes": false, + "datasource": "${DS_HMCI}", + "description": "", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 0, + "fillGradient": 3, + "grid": {}, + "gridPos": { + "h": 6, + "w": 12, + "x": 12, + "y": 24 + }, + "hiddenSeries": false, + "id": 16, + "legend": { + "alignAsTable": false, + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "show": false, + "sort": "avg", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "mode": "", + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.2", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "$$hashKey": "object:193" + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "style": {}, + "targets": [ + { + "alias": "$tag_lparname sent", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "lparname" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "lpar_net_virtual", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "sentBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "lparname", + "operator": "=~", + "value": "/^$LPAR$/" + }, + { + "condition": "AND", + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Virtual Network Adapters - Sent Bytes", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:10101", + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:10102", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": true, + "alignLevel": 0 + } + }, + { + "collapsed": false, + "datasource": "${DS_INFLUXDB}", + "gridPos": { + "h": 1, + "w": 24, + "x": 0, + "y": 30 + }, + "id": 21, + "panels": [], + "repeat": null, + "title": "Processors", + "type": "row" + }, { "aliasColors": {}, "bars": false, @@ -74,14 +1403,14 @@ }, "overrides": [] }, - "fill": 2, + "fill": 1, "fillGradient": 0, "grid": {}, "gridPos": { - "h": 10, + "h": 6, "w": 24, "x": 0, - "y": 0 + "y": 31 }, "hiddenSeries": false, "id": 2, @@ -99,7 +1428,7 @@ "values": true }, "lines": true, - "linewidth": 2, + "linewidth": 1, "links": [], "mode": "", "nullPointMode": "connected", @@ -113,12 +1442,12 @@ "renderer": "flot", "seriesOverrides": [], "spaceLength": 10, - "stack": true, + "stack": false, "steppedLine": false, "style": {}, "targets": [ { - "alias": "$tag_servername $tag_lparname", + "alias": "$tag_lparname", "dsType": "influxdb", "groupBy": [ { @@ -176,7 +1505,7 @@ "condition": "AND", "key": "lparname", "operator": "=~", - "value": "/^$LparName$/" + "value": "/^$LPAR$/" } ] } @@ -189,7 +1518,7 @@ "tooltip": { "msResolution": false, "shared": true, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -217,174 +1546,6 @@ "logBase": 1, "max": null, "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "content": "", - "dashLength": 10, - "dashes": false, - "datasource": "${DS_HMCI}", - "description": "", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {}, - "links": [] - }, - "overrides": [] - }, - "fill": 0, - "fillGradient": 0, - "grid": {}, - "gridPos": { - "h": 10, - "w": 12, - "x": 0, - "y": 10 - }, - "hiddenSeries": false, - "id": 8, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": true, - "show": false, - "sort": "avg", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "mode": "", - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.4.2", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "style": {}, - "targets": [ - { - "alias": "$tag_lparname - VLAN $tag_vlanId", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "lparname" - ], - "type": "tag" - }, - { - "params": [ - "vlanId" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "lpar_network_virtual", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "transferredBytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "lparname", - "operator": "=~", - "value": "/^$LparName$/" - }, - { - "condition": "AND", - "key": "servername", - "operator": "=~", - "value": "/^$ServerName$/" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Virtual Network Adapters", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 2, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:10101", - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:10102", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, "show": false } ], @@ -394,225 +1555,19 @@ } }, { - "aliasColors": {}, - "bars": false, - "content": "", - "dashLength": 10, - "dashes": false, - "datasource": "${DS_HMCI}", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "color": {}, - "custom": {}, - "thresholds": { - "mode": "absolute", - "steps": [] - }, - "unit": "Bps" - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 1, - "grid": {}, + "collapsed": false, + "datasource": "${DS_INFLUXDB}", "gridPos": { - "h": 10, - "w": 12, - "x": 12, - "y": 10 + "h": 1, + "w": 24, + "x": 0, + "y": 37 }, - "hiddenSeries": false, - "id": 11, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": true, - "show": false, - "sort": "avg", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "mode": "", - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.4.2", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "style": {}, - "targets": [ - { - "alias": "$tag_lparname writeBytes", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "lparname" - ], - "type": "tag" - } - ], - "hide": false, - "measurement": "lpar_storage_virtual", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(\"writeBytes\") FROM \"lpar_storage_virtual\" WHERE (\"servername\" =~ /^$ServerName$/ AND \"lparname\" =~ /^$LparName$/) AND $timeFilter GROUP BY time($interval), \"lparname\"", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "writeBytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "servername", - "operator": "=~", - "value": "/^$ServerName$/" - }, - { - "condition": "AND", - "key": "lparname", - "operator": "=~", - "value": "/^$LparName$/" - } - ] - }, - { - "alias": "$tag_lparname readBytes", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "lparname" - ], - "type": "tag" - } - ], - "hide": false, - "measurement": "lpar_storage_virtual", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(\"value\") FROM \"PartitionVirtualFiberChannelAdapters\" WHERE (\"system\" =~ /^$ManagedSystem$/ AND \"name\" != 'transmittedBytes' AND \"partition\" =~ /^$Partition$/) AND $timeFilter GROUP BY time($interval), \"wwpn\", \"partition\", \"name\" fill(null)", - "rawQuery": false, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "readBytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "*-1" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "servername", - "operator": "=~", - "value": "/^$ServerName$/" - }, - { - "condition": "AND", - "key": "lparname", - "operator": "=~", - "value": "/^$LparName$/" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Virtual Fiber Channel Adapters", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:3776", - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:3777", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "id": 23, + "panels": [], + "repeat": null, + "title": "Memory", + "type": "row" }, { "datasource": "${DS_HMCI}", @@ -643,10 +1598,10 @@ "overrides": [] }, "gridPos": { - "h": 14, + "h": 12, "w": 24, "x": 0, - "y": 20 + "y": 38 }, "id": 9, "options": { @@ -670,7 +1625,7 @@ "groupBy": [ { "params": [ - "$interval" + "5m" ], "type": "time" }, @@ -717,7 +1672,7 @@ "condition": "AND", "key": "lparname", "operator": "=~", - "value": "/^$LparName$/" + "value": "/^$LPAR$/" } ] } @@ -726,231 +1681,9 @@ "timeShift": null, "title": "NUMA Affinity Score", "type": "gauge" - }, - { - "aliasColors": {}, - "bars": false, - "content": "", - "dashLength": 10, - "dashes": false, - "datasource": "${DS_HMCI}", - "description": "", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "color": {}, - "custom": {}, - "thresholds": { - "mode": "absolute", - "steps": [] - }, - "unit": "Bps" - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 1, - "grid": {}, - "gridPos": { - "h": 10, - "w": 12, - "x": 12, - "y": 34 - }, - "hiddenSeries": false, - "id": 12, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": true, - "show": false, - "sort": "avg", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "mode": "", - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.4.2", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "style": {}, - "targets": [ - { - "alias": "$tag_lparname writeBytes", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "lparname" - ], - "type": "tag" - } - ], - "hide": false, - "measurement": "lpar_storage_generic", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(\"writeBytes\") FROM \"lpar_storage_virtual\" WHERE (\"servername\" =~ /^$ServerName$/ AND \"lparname\" =~ /^$LparName$/) AND $timeFilter GROUP BY time($interval), \"lparname\"", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "writeBytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "servername", - "operator": "=~", - "value": "/^$ServerName$/" - }, - { - "condition": "AND", - "key": "lparname", - "operator": "=~", - "value": "/^$LparName$/" - } - ] - }, - { - "alias": "$tag_lparname readBytes", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "lparname" - ], - "type": "tag" - } - ], - "hide": false, - "measurement": "lpar_storage_generic", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(\"value\") FROM \"PartitionVirtualFiberChannelAdapters\" WHERE (\"system\" =~ /^$ManagedSystem$/ AND \"name\" != 'transmittedBytes' AND \"partition\" =~ /^$Partition$/) AND $timeFilter GROUP BY time($interval), \"wwpn\", \"partition\", \"name\" fill(null)", - "rawQuery": false, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "readBytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "*-1" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "servername", - "operator": "=~", - "value": "/^$ServerName$/" - }, - { - "condition": "AND", - "key": "lparname", - "operator": "=~", - "value": "/^$LparName$/" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Virtual Generic Adapters", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:3776", - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:3777", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } } ], - "refresh": "30s", + "refresh": "1m", "schemaVersion": 27, "style": "dark", "tags": [ @@ -998,14 +1731,14 @@ "label": "Logical Partition", "multi": true, "multiFormat": "regex values", - "name": "LparName", + "name": "LPAR", "options": [], "query": "SHOW TAG VALUES FROM \"lpar_processor\" WITH KEY = \"lparname\" WHERE servername =~ /$ServerName/", "refresh": 1, "refresh_on_load": false, "regex": "", "skipUrlSync": false, - "sort": 0, + "sort": 5, "tagValuesQuery": null, "tags": [], "tagsQuery": null, @@ -1015,14 +1748,13 @@ ] }, "time": { - "from": "now-3h", + "from": "now-2d", "now": false, "to": "now-1m" }, "timepicker": { "nowDelay": "1m", "refresh_intervals": [ - "10s", "30s", "1m", "5m", @@ -1045,7 +1777,7 @@ ] }, "timezone": "browser", - "title": "IBM Power - HMC Managed Systems - Logical Partitions", + "title": "IBM Power - HMCi - Logical Partitions", "uid": "Xl7oHESGz", - "version": 8 + "version": 20 } \ No newline at end of file diff --git a/doc/IBM Power - HMC Managed Systems - Energy-1616701422249.json b/doc/IBM Power - HMCi - System Energy-1617197422138.json similarity index 98% rename from doc/IBM Power - HMC Managed Systems - Energy-1616701422249.json rename to doc/IBM Power - HMCi - System Energy-1617197422138.json index 1a8c46c..70e370f 100644 --- a/doc/IBM Power - HMC Managed Systems - Energy-1616701422249.json +++ b/doc/IBM Power - HMCi - System Energy-1617197422138.json @@ -61,7 +61,7 @@ "gnetId": null, "graphTooltip": 0, "id": null, - "iteration": 1616701412999, + "iteration": 1617197417499, "links": [], "panels": [ { @@ -361,7 +361,7 @@ "overrides": [] }, "gridPos": { - "h": 10, + "h": 7, "w": 7, "x": 0, "y": 10 @@ -461,7 +461,7 @@ "fill": 1, "fillGradient": 1, "gridPos": { - "h": 10, + "h": 7, "w": 17, "x": 7, "y": 10 @@ -652,7 +652,7 @@ } } ], - "refresh": "30s", + "refresh": "1m", "schemaVersion": 27, "style": "dark", "tags": [ @@ -687,14 +687,12 @@ ] }, "time": { - "from": "now-3h", + "from": "now-2d", "to": "now-1m" }, "timepicker": { "nowDelay": "1m", "refresh_intervals": [ - "5s", - "10s", "30s", "1m", "5m", @@ -706,7 +704,7 @@ ] }, "timezone": "", - "title": "IBM Power - HMC Managed Systems - Energy", + "title": "IBM Power - HMCi - System Energy", "uid": "oHcrgD1Mk", - "version": 18 + "version": 20 } \ No newline at end of file diff --git a/doc/IBM Power - HMC Managed Systems - Resources-1616701489526.json b/doc/IBM Power - HMCi - System Resources-1617197455766.json similarity index 72% rename from doc/IBM Power - HMC Managed Systems - Resources-1616701489526.json rename to doc/IBM Power - HMCi - System Resources-1617197455766.json index e1e98a6..af54441 100644 --- a/doc/IBM Power - HMC Managed Systems - Resources-1616701489526.json +++ b/doc/IBM Power - HMCi - System Resources-1617197455766.json @@ -60,7 +60,7 @@ "gnetId": 1465, "graphTooltip": 0, "id": null, - "iteration": 1616701472507, + "iteration": 1617197428882, "links": [], "panels": [ { @@ -74,8 +74,8 @@ }, "id": 20, "panels": [], - "repeat": "ManagedSystem", - "title": "$ServerName Resource Overview", + "repeat": "ServerName", + "title": "Processors - $ServerName", "type": "row" }, { @@ -667,331 +667,405 @@ "yBucketSize": null }, { - "collapsed": true, + "collapsed": false, "datasource": "${DS_HMCI}", "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 16 + "y": 32 }, "id": 22, - "panels": [ - { - "aliasColors": {}, - "bars": false, - "content": "", - "dashLength": 10, - "dashes": false, - "datasource": "${DS_HMCI}", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {}, - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 1, - "grid": {}, - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 17 - }, - "hiddenSeries": false, - "id": 16, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": false, - "rightSide": false, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "mode": "", - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.4.2", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "style": {}, - "targets": [ - { - "alias": "$tag_location", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "location" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "vios_storage_FC", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "transmittedBytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "servername", - "operator": "=~", - "value": "/^$ServerName$/" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "$ServerName - Physical Fiber Channel Adapters", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:1448", - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:1449", - "format": "none", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "panels": [], + "repeat": "ServerName", + "title": "Network & Storage I/O - $ServerName ", + "type": "row" + }, + { + "aliasColors": {}, + "bars": false, + "content": "", + "dashLength": 10, + "dashes": false, + "datasource": "${DS_HMCI}", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 1, + "grid": {}, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 33 + }, + "hiddenSeries": false, + "id": 16, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": false, + "rightSide": false, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "mode": "", + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.2", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": true, + "steppedLine": false, + "style": {}, + "targets": [ { - "aliasColors": {}, - "bars": false, - "content": "", - "dashLength": 10, - "dashes": false, - "datasource": "${DS_HMCI}", - "description": "", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "custom": {}, - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 2, - "grid": {}, - "gridPos": { - "h": 8, - "w": 24, - "x": 0, - "y": 25 - }, - "hiddenSeries": false, - "id": 11, - "legend": { - "alignAsTable": true, - "avg": true, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": true, - "rightSide": false, - "show": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "mode": "", - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.4.2", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "style": {}, - "targets": [ + "alias": "$tag_location", + "dsType": "influxdb", + "groupBy": [ { - "alias": "$tag_location", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "location" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } + "params": [ + "$interval" ], - "hide": false, - "measurement": "vios_network_shared", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "transferredBytes" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "servername", - "operator": "=~", - "value": "/^$ServerName$/" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "$ServerName - Shared Adapters", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:1686", - "format": "Bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true + "type": "time" }, { - "$$hashKey": "object:1687", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false + "params": [ + "location" + ], + "type": "tag" + }, + { + "params": [ + "servername" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" } ], - "yaxis": { - "align": false, - "alignLevel": null - } + "hide": false, + "measurement": "vios_storage_FC", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "transmittedBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + } + ] } ], - "repeat": "ManagedSystem", - "title": "$ServerName Network", - "type": "row" + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "$ServerName - Physical Fiber Channel Adapters", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:1448", + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:1449", + "format": "none", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } + }, + { + "aliasColors": {}, + "bars": false, + "content": "", + "dashLength": 10, + "dashes": false, + "datasource": "${DS_HMCI}", + "description": "", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 2, + "grid": {}, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 33 + }, + "hiddenSeries": false, + "id": 11, + "legend": { + "alignAsTable": true, + "avg": true, + "current": false, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "rightSide": false, + "show": false, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, + "links": [], + "mode": "", + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.4.2", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "style": {}, + "targets": [ + { + "alias": "VLAN $tag_vlanId recv", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "servername" + ], + "type": "tag" + }, + { + "params": [ + "vlanId" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "lpar_net_virtual", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "receivedBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + } + ] + }, + { + "alias": "VLAN $tag_vlanId sent", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "servername" + ], + "type": "tag" + }, + { + "params": [ + "vlanId" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "lpar_net_virtual", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "sentBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "*-1" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "$ServerName - Network", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:1686", + "format": "Bps", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:1687", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { "collapsed": false, @@ -1000,12 +1074,12 @@ "h": 1, "w": 24, "x": 0, - "y": 17 + "y": 82 }, "id": 21, "panels": [], - "repeat": "ManagedSystem", - "title": "$ServerName By Partition", + "repeat": "ServerName", + "title": "Partition Usage - $ServerName", "type": "row" }, { @@ -1032,7 +1106,7 @@ "h": 7, "w": 12, "x": 0, - "y": 18 + "y": 83 }, "hiddenSeries": false, "id": 12, @@ -1085,6 +1159,12 @@ ], "type": "tag" }, + { + "params": [ + "servername" + ], + "type": "tag" + }, { "params": [ "null" @@ -1122,7 +1202,7 @@ "condition": "AND", "key": "lparname", "operator": "=~", - "value": "/^$LparName$/" + "value": "/^$LPAR$/" } ] } @@ -1199,7 +1279,7 @@ "h": 7, "w": 12, "x": 12, - "y": 18 + "y": 83 }, "id": 23, "links": [], @@ -1277,7 +1357,7 @@ "condition": "AND", "key": "lparname", "operator": "=~", - "value": "/^$LparName$/" + "value": "/^$LPAR$/" } ] } @@ -1288,7 +1368,7 @@ "type": "bargauge" } ], - "refresh": "30s", + "refresh": "1m", "schemaVersion": 27, "style": "dark", "tags": [ @@ -1336,7 +1416,7 @@ "label": "Partition", "multi": true, "multiFormat": "regex values", - "name": "LparName", + "name": "LPAR", "options": [], "query": "SHOW TAG VALUES FROM \"lpar_processor\" WITH KEY = \"lparname\" WHERE servername =~ /$ServerName/", "refresh": 1, @@ -1353,14 +1433,13 @@ ] }, "time": { - "from": "now-3h", + "from": "now-2d", "now": false, "to": "now-1m" }, "timepicker": { "nowDelay": "1m", "refresh_intervals": [ - "10s", "30s", "1m", "5m", @@ -1383,7 +1462,7 @@ ] }, "timezone": "browser", - "title": "IBM Power - HMC Managed Systems - Resources", + "title": "IBM Power - HMCi - System Resources", "uid": "ClJhHPIGz", - "version": 19 + "version": 26 } \ No newline at end of file diff --git a/doc/IBM Power - HMC Managed Systems - Virtual I_O Servers-1616701514116.json b/doc/IBM Power - HMCi - Virtual I_O Servers-1617197498035.json similarity index 76% rename from doc/IBM Power - HMC Managed Systems - Virtual I_O Servers-1616701514116.json rename to doc/IBM Power - HMCi - Virtual I_O Servers-1617197498035.json index ecc65cc..1faa315 100644 --- a/doc/IBM Power - HMC Managed Systems - Virtual I_O Servers-1616701514116.json +++ b/doc/IBM Power - HMCi - Virtual I_O Servers-1617197498035.json @@ -33,6 +33,12 @@ "id": "influxdb", "name": "InfluxDB", "version": "1.0.0" + }, + { + "type": "panel", + "id": "table", + "name": "Table", + "version": "" } ], "annotations": { @@ -54,9 +60,148 @@ "gnetId": 1465, "graphTooltip": 0, "id": null, - "iteration": 1616701495725, + "iteration": 1617197467456, "links": [], "panels": [ + { + "datasource": "${DS_HMCI}", + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-RdYlGr" + }, + "custom": { + "align": "center", + "displayMode": "auto", + "filterable": true + }, + "mappings": [], + "thresholds": { + "mode": "percentage", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "none" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "lparname" + }, + "properties": [ + { + "id": "custom.width", + "value": 256 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "affinityScore" + }, + "properties": [ + { + "id": "color", + "value": { + "mode": "thresholds" + } + }, + { + "id": "unit", + "value": "percent" + } + ] + } + ] + }, + "gridPos": { + "h": 5, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 21, + "options": { + "showHeader": true, + "sortBy": [] + }, + "pluginVersion": "7.4.2", + "targets": [ + { + "alias": "Read", + "groupBy": [ + { + "params": [ + "viosname" + ], + "type": "tag" + } + ], + "measurement": "vios_details", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT last(\"id\") AS \"id\", \"type\", \"osType\", \"state\", \"affinityScore\" FROM \"lpar_details\" WHERE (\"lparname\" =~ /^$LPAR$/) AND $timeFilter GROUP BY \"lparname\"", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "A", + "resultFormat": "table", + "select": [ + [ + { + "params": [ + "viosid" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "id" + ], + "type": "alias" + } + ], + [ + { + "params": [ + "viosstate" + ], + "type": "field" + } + ], + [ + { + "params": [ + "affinityScore" + ], + "type": "field" + } + ] + ], + "tags": [ + { + "key": "viosname", + "operator": "=~", + "value": "/^$ViosName$/" + } + ] + } + ], + "timeFrom": null, + "timeShift": null, + "title": "", + "type": "table" + }, { "datasource": "${DS_HMCI}", "description": "", @@ -83,10 +228,10 @@ "overrides": [] }, "gridPos": { - "h": 10, - "w": 11, + "h": 9, + "w": 7, "x": 0, - "y": 0 + "y": 5 }, "id": 16, "links": [], @@ -105,7 +250,7 @@ "pluginVersion": "7.4.2", "targets": [ { - "alias": "$tag_vios", + "alias": "$tag_viosname", "dsType": "influxdb", "groupBy": [ { @@ -164,7 +309,7 @@ ], "timeFrom": null, "timeShift": null, - "title": "$ServerName - $ViosName Memory", + "title": " Memory - $ServerName - $ViosName", "type": "gauge" }, { @@ -188,10 +333,10 @@ "fillGradient": 2, "grid": {}, "gridPos": { - "h": 10, - "w": 13, - "x": 11, - "y": 0 + "h": 9, + "w": 17, + "x": 7, + "y": 5 }, "hiddenSeries": false, "id": 19, @@ -241,12 +386,6 @@ ], "type": "tag" }, - { - "params": [ - "name" - ], - "type": "tag" - }, { "params": [ "null" @@ -293,7 +432,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "$ServerName - $ViosName - Processors", + "title": "Processors - $ServerName - $ViosName", "tooltip": { "msResolution": false, "shared": true, @@ -350,14 +489,14 @@ }, "overrides": [] }, - "fill": 2, - "fillGradient": 2, + "fill": 1, + "fillGradient": 1, "grid": {}, "gridPos": { - "h": 10, + "h": 9, "w": 24, "x": 0, - "y": 10 + "y": 14 }, "hiddenSeries": false, "id": 18, @@ -373,7 +512,7 @@ "values": true }, "lines": true, - "linewidth": 2, + "linewidth": 1, "links": [], "mode": "", "nullPointMode": "connected", @@ -392,7 +531,7 @@ "style": {}, "targets": [ { - "alias": "$tag_viosname: $tag_id ($tag_location)", + "alias": "$tag_viosname: $tag_id ($tag_location) read", "dsType": "influxdb", "groupBy": [ { @@ -436,7 +575,7 @@ [ { "params": [ - "transmittedBytes" + "readBytes" ], "type": "field" }, @@ -459,13 +598,88 @@ "value": "/^$ViosName$/" } ] + }, + { + "alias": "$tag_viosname: $tag_id ($tag_location) write", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$interval" + ], + "type": "time" + }, + { + "params": [ + "viosname" + ], + "type": "tag" + }, + { + "params": [ + "location" + ], + "type": "tag" + }, + { + "params": [ + "id" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "vios_storage_FC", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "writeBytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "*-1" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "servername", + "operator": "=~", + "value": "/^$ServerName$/" + }, + { + "condition": "AND", + "key": "viosname", + "operator": "=~", + "value": "/^$ViosName$/" + } + ] } ], "thresholds": [], "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "$ServerName - $ViosName - Fiber Channel Adapters", + "title": "Fiber Channel Adapters - $ServerName - $ViosName", "tooltip": { "msResolution": false, "shared": true, @@ -526,10 +740,10 @@ "fillGradient": 1, "grid": {}, "gridPos": { - "h": 11, + "h": 9, "w": 24, "x": 0, - "y": 20 + "y": 23 }, "hiddenSeries": false, "id": 17, @@ -545,7 +759,7 @@ "values": true }, "lines": true, - "linewidth": 2, + "linewidth": 1, "links": [], "mode": "", "nullPointMode": "connected", @@ -739,7 +953,7 @@ "timeFrom": null, "timeRegions": [], "timeShift": null, - "title": "$ServerName - $ViosName - Network", + "title": "Network - $ServerName - $ViosName", "tooltip": { "msResolution": false, "shared": true, @@ -780,7 +994,7 @@ } } ], - "refresh": "30s", + "refresh": "1m", "schemaVersion": 27, "style": "dark", "tags": [ @@ -847,14 +1061,13 @@ ] }, "time": { - "from": "now-3h", + "from": "now-2d", "now": false, "to": "now-1m" }, "timepicker": { "nowDelay": "1m", "refresh_intervals": [ - "10s", "30s", "1m", "5m", @@ -877,7 +1090,7 @@ ] }, "timezone": "browser", - "title": "IBM Power - HMC Managed Systems - Virtual I/O Servers", + "title": "IBM Power - HMCi - Virtual I/O Servers", "uid": "DDNEv5vGz", - "version": 11 + "version": 18 } \ No newline at end of file diff --git a/src/main/java/biz/nellemann/hmci/HmcInstance.java b/src/main/java/biz/nellemann/hmci/HmcInstance.java index 564bb29..4af15e0 100644 --- a/src/main/java/biz/nellemann/hmci/HmcInstance.java +++ b/src/main/java/biz/nellemann/hmci/HmcInstance.java @@ -70,13 +70,13 @@ class HmcInstance implements Runnable { do { Instant instantStart = Instant.now(); try { + getMetricsForEnergy(); getMetricsForSystems(); getMetricsForPartitions(); - getMetricsForEnergy(); + writeMetricsForSystemEnergy(); writeMetricsForManagedSystems(); writeMetricsForLogicalPartitions(); - writeMetricsForSystemEnergy(); influxClient.writeBatchPoints(); // Refresh diff --git a/src/main/java/biz/nellemann/hmci/HmcRestClient.java b/src/main/java/biz/nellemann/hmci/HmcRestClient.java index 1a075c7..9a4fa3a 100644 --- a/src/main/java/biz/nellemann/hmci/HmcRestClient.java +++ b/src/main/java/biz/nellemann/hmci/HmcRestClient.java @@ -214,7 +214,7 @@ public class HmcRestClient { try { Document doc = Jsoup.parse(responseBody); - Elements logicalPartitions = doc.select("LogicalPartition|LogicalPartition"); // doc.select("img[src$=.png]"); + Elements logicalPartitions = doc.select("LogicalPartition|LogicalPartition"); for(Element el : logicalPartitions) { LogicalPartition logicalPartition = new LogicalPartition( el.select("PartitionUUID").text(), @@ -409,7 +409,7 @@ public class HmcRestClient { */ private String sendGetRequest(URL url) throws Exception { - log.trace("getResponse() - " + url.toString()); + log.trace("getResponse() - URL: " + url.toString()); if(authToken == null) { return null; } @@ -451,7 +451,7 @@ public class HmcRestClient { */ public String sendPostRequest(URL url, String payload) throws Exception { - log.trace("sendPostRequest() - " + url.toString()); + log.trace("sendPostRequest() - URL: " + url.toString()); if(authToken == null) { return null; }