Merged development into master

This commit is contained in:
Mark Nellemann 2021-10-26 14:12:27 +02:00
commit 617cb5a7f4
3 changed files with 1135 additions and 711 deletions

View File

@ -78,7 +78,7 @@
"gnetId": 1510, "gnetId": 1510,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": null,
"iteration": 1634297424099, "iteration": 1635179885847,
"links": [], "links": [],
"panels": [ "panels": [
{ {
@ -563,7 +563,7 @@
"measurement": "/^$ServerName$/", "measurement": "/^$ServerName$/",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT (last(\"utilizedProcUnits\") / last(\"maxProcUnits\")) * 100 AS \"usage\" FROM \"lpar_processor\" WHERE (\"servername\" =~ /^$ServerName$/ AND \"lparname\" =~ /^$LPAR$/) AND $timeFilter GROUP BY time($interval), \"lparname\", \"servername\" fill(null)", "query": "SELECT (last(\"utilizedProcUnits\") / last(\"maxProcUnits\")) * 100 AS \"usage\" FROM \"lpar_processor\" WHERE (\"servername\" =~ /^$ServerName$/ AND \"lparname\" =~ /^$LPAR$/) AND $timeFilter GROUP BY time($interval), \"lparname\", \"servername\" fill(previous)",
"rawQuery": true, "rawQuery": true,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@ -1957,5 +1957,5 @@
"timezone": "browser", "timezone": "browser",
"title": "IBM Power - HMCi - Logical Partitions", "title": "IBM Power - HMCi - Logical Partitions",
"uid": "Xl7oHESGz", "uid": "Xl7oHESGz",
"version": 47 "version": 48
} }

View File

@ -20,7 +20,7 @@
"type": "grafana", "type": "grafana",
"id": "grafana", "id": "grafana",
"name": "Grafana", "name": "Grafana",
"version": "8.0.6" "version": "8.1.4"
}, },
{ {
"type": "panel", "type": "panel",
@ -51,6 +51,12 @@
"hide": true, "hide": true,
"iconColor": "rgba(0, 211, 255, 1)", "iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts", "name": "Annotations & Alerts",
"target": {
"limit": 100,
"matchAny": false,
"tags": [],
"type": "dashboard"
},
"type": "dashboard" "type": "dashboard"
} }
] ]
@ -60,7 +66,7 @@
"gnetId": 1465, "gnetId": 1465,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": null,
"iteration": 1628746731767, "iteration": 1635180054460,
"links": [], "links": [],
"panels": [ "panels": [
{ {
@ -125,7 +131,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "8.0.6", "pluginVersion": "8.1.4",
"pointradius": 5, "pointradius": 5,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -309,7 +315,7 @@
"text": {}, "text": {},
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "8.0.6", "pluginVersion": "8.1.4",
"targets": [ "targets": [
{ {
"alias": "$tag_poolname", "alias": "$tag_poolname",
@ -422,7 +428,7 @@
"showThresholdMarkers": true, "showThresholdMarkers": true,
"text": {} "text": {}
}, },
"pluginVersion": "8.0.6", "pluginVersion": "8.1.4",
"targets": [ "targets": [
{ {
"alias": "", "alias": "",
@ -526,7 +532,7 @@
"alertThreshold": false "alertThreshold": false
}, },
"percentage": false, "percentage": false,
"pluginVersion": "8.0.6", "pluginVersion": "8.1.4",
"pointradius": 5, "pointradius": 5,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -700,6 +706,7 @@
"dashes": false, "dashes": false,
"datasource": "${DS_INFLUXDB-HMCI}", "datasource": "${DS_INFLUXDB-HMCI}",
"decimals": 2, "decimals": 2,
"description": "",
"editable": true, "editable": true,
"error": false, "error": false,
"fieldConfig": { "fieldConfig": {
@ -738,7 +745,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "8.0.6", "pluginVersion": "8.1.4",
"pointradius": 5, "pointradius": 5,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -772,7 +779,7 @@
} }
], ],
"hide": false, "hide": false,
"measurement": "server_processor", "measurement": "server_memory",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"refId": "A", "refId": "A",
@ -781,7 +788,7 @@
[ [
{ {
"params": [ "params": [
"utilizedProcUnits" "assignedMemToLpars"
], ],
"type": "field" "type": "field"
}, },
@ -791,7 +798,7 @@
}, },
{ {
"params": [ "params": [
"utilized" "assigned"
], ],
"type": "alias" "type": "alias"
} }
@ -799,7 +806,7 @@
[ [
{ {
"params": [ "params": [
"availableProcUnits" "availableMem"
], ],
"type": "field" "type": "field"
}, },
@ -813,24 +820,6 @@
], ],
"type": "alias" "type": "alias"
} }
],
[
{
"params": [
"configurableProcUnits"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"configurable"
],
"type": "alias"
}
] ]
], ],
"tags": [ "tags": [
@ -846,7 +835,7 @@
"timeFrom": null, "timeFrom": null,
"timeRegions": [], "timeRegions": [],
"timeShift": null, "timeShift": null,
"title": "Processor Units - Core Utilization", "title": "Memory Utilization",
"tooltip": { "tooltip": {
"msResolution": false, "msResolution": false,
"shared": true, "shared": true,
@ -864,8 +853,8 @@
"yaxes": [ "yaxes": [
{ {
"$$hashKey": "object:915", "$$hashKey": "object:915",
"format": "short", "format": "decmbytes",
"label": "Processor Units", "label": "Memory",
"logBase": 1, "logBase": 1,
"max": null, "max": null,
"min": null, "min": null,
@ -935,18 +924,27 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "8.0.6", "pluginVersion": "8.1.4",
"pointradius": 5, "pointradius": 5,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
"seriesOverrides": [], "seriesOverrides": [
{
"alias": "vlan 1 - sent pkts",
"yaxis": 2
},
{
"alias": "vlan 1 - recv pkts",
"yaxis": 2
}
],
"spaceLength": 10, "spaceLength": 10,
"stack": false, "stack": false,
"steppedLine": false, "steppedLine": false,
"style": {}, "style": {},
"targets": [ "targets": [
{ {
"alias": "$tag_vlanId - $col", "alias": "vlan $tag_vlanId - $col bytes",
"dsType": "influxdb", "dsType": "influxdb",
"groupBy": [ "groupBy": [
{ {
@ -990,7 +988,7 @@
}, },
{ {
"params": [], "params": [],
"type": "mean" "type": "last"
}, },
{ {
"params": [ "params": [
@ -1008,7 +1006,96 @@
}, },
{ {
"params": [], "params": [],
"type": "mean" "type": "last"
},
{
"params": [
" *-1"
],
"type": "math"
},
{
"params": [
"sent"
],
"type": "alias"
}
]
],
"tags": [
{
"key": "servername",
"operator": "=~",
"value": "/^$ServerName$/"
}
]
},
{
"alias": "vlan $tag_vlanId - $col pkts",
"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",
"query": "SELECT last(\"receivedPackets\") AS \"recv\", last(\"sentPackets\") *-1 AS \"sent\" FROM \"lpar_net_virtual\" WHERE (\"servername\" =~ /^$ServerName$/) AND $timeFilter GROUP BY time($interval), \"servername\", \"vlanId\" fill(null)",
"rawQuery": false,
"refId": "B",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"receivedPackets"
],
"type": "field"
},
{
"params": [],
"type": "last"
},
{
"params": [
"recv"
],
"type": "alias"
}
],
[
{
"params": [
"sentPackets"
],
"type": "field"
},
{
"params": [],
"type": "last"
}, },
{ {
"params": [ "params": [
@ -1037,7 +1124,7 @@
"timeFrom": null, "timeFrom": null,
"timeRegions": [], "timeRegions": [],
"timeShift": null, "timeShift": null,
"title": "Network Throughput - VLAN", "title": "Network Throughput - By VLAN",
"tooltip": { "tooltip": {
"msResolution": false, "msResolution": false,
"shared": true, "shared": true,
@ -1056,7 +1143,7 @@
{ {
"$$hashKey": "object:1686", "$$hashKey": "object:1686",
"format": "binBps", "format": "binBps",
"label": null, "label": "bytes",
"logBase": 1, "logBase": 1,
"max": null, "max": null,
"min": null, "min": null,
@ -1064,12 +1151,12 @@
}, },
{ {
"$$hashKey": "object:1687", "$$hashKey": "object:1687",
"format": "short", "format": "none",
"label": null, "label": "pkts",
"logBase": 1, "logBase": 1,
"max": null, "max": null,
"min": null, "min": null,
"show": false "show": true
} }
], ],
"yaxis": { "yaxis": {
@ -1126,7 +1213,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "8.0.6", "pluginVersion": "8.1.4",
"pointradius": 5, "pointradius": 5,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -1181,7 +1268,7 @@
}, },
{ {
"params": [], "params": [],
"type": "mean" "type": "last"
} }
] ]
], ],
@ -1280,7 +1367,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "8.0.6", "pluginVersion": "8.1.4",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -1483,7 +1570,7 @@
"alertThreshold": true "alertThreshold": true
}, },
"percentage": false, "percentage": false,
"pluginVersion": "8.0.6", "pluginVersion": "8.1.4",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
@ -1584,7 +1671,7 @@
} }
} }
], ],
"refresh": "30s", "refresh": false,
"schemaVersion": 30, "schemaVersion": 30,
"style": "dark", "style": "dark",
"tags": [ "tags": [
@ -1652,5 +1739,5 @@
"timezone": "browser", "timezone": "browser",
"title": "IBM Power - HMCi - System Resources", "title": "IBM Power - HMCi - System Resources",
"uid": "ClJhHPIGz", "uid": "ClJhHPIGz",
"version": 20 "version": 24
} }