From 36aadbd5cca7a169f3df0885ea2f16543f3d0791 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Sat, 20 Aug 2022 10:02:05 +0200 Subject: [PATCH] Dashboard updates --- CHANGELOG.md | 3 + client/build.gradle | 2 +- client/doc/AIX.md | 18 +- ... Agent - Host Overview-1657627310544.json} | 1446 ++++++++++------- ...ent - Process Explorer-1657627430400.json} | 107 +- gradle.properties | 2 +- .../sysmon/plugins/os_ibmi/TestExtension.java | 23 + server/build.gradle | 2 +- 8 files changed, 976 insertions(+), 627 deletions(-) rename doc/{Sysmon - Host Overview-1634225578630.json => Sysmon Agent - Host Overview-1657627310544.json} (73%) rename doc/{Sysmon - Process Explorer-1632317613366.json => Sysmon Agent - Process Explorer-1657627430400.json} (92%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c76a4f..9dbdbac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. +## [0.1.13] - 2022-06-27 + ## [0.1.11] - 2022-03-02 ### Changed - (plugins) Removed groovy dependency from build.gradle (it increased size and was not needed). @@ -20,6 +22,7 @@ All notable changes to this project will be documented in this file. ### Changed - Updated 3rd party dependencies. +[0.1.13]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v0.1.13%0Dv0.1.11 [0.1.11]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v0.1.11%0Dv0.1.10 [0.1.10]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v0.1.10%0Dv0.1.9 [0.1.9]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v0.1.9%0Dv0.1.8 diff --git a/client/build.gradle b/client/build.gradle index 24983e8..4883667 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -38,7 +38,7 @@ def projectName = "sysmon-client" application { // Define the main class for the application. mainClass.set('sysmon.client.Application') - applicationDefaultJvmArgs = [ "-server", "-Xmx64m", "-XX:+UseG1GC" ] + applicationDefaultJvmArgs = [ "-server", "-Xmx64m" ] } run { diff --git a/client/doc/AIX.md b/client/doc/AIX.md index 7af0d8b..280b145 100644 --- a/client/doc/AIX.md +++ b/client/doc/AIX.md @@ -4,14 +4,14 @@ Works on IBM Power VIO (Virtual IO) servers, as well as regular IBM Power AIX in ## Installation -We require Java 8, which should already be installed on AIX, or is available to install. +We require Java 8, which should already be installed on AIX, or is available to install. The RPM packages are *"noarch"* Java bytecode, so we can use the **--ignoreos** option to install: ```shell rpm -i --ignoreos sysmon-client.rpm sysmon-plugins.rpm ``` -## Run automatically at boot +### Run automatically at boot See the [sysv-init.md](sysv-init.md) file for instructions, or run from inittab: @@ -19,3 +19,17 @@ See the [sysv-init.md](sysv-init.md) file for instructions, or run from inittab: mkitab "sysmon:2:respawn:env JAVA_HOME=/usr/java8_64 /opt/sysmon/client/bin/client -s http://10.x.y.z:9925/metrics" init q ``` + +## Upgrades + +To upgrade the packages: + +```shell +rpm -Uvh --ignoreos sysmon-*.noarch.rpm +``` + +To restart sysmon-client process after upgrade: + +```shell +kill -HUP `ps -e -o pid,comm,args | grep sysmon-client | grep java | awk '{print $1}'` +``` diff --git a/doc/Sysmon - Host Overview-1634225578630.json b/doc/Sysmon Agent - Host Overview-1657627310544.json similarity index 73% rename from doc/Sysmon - Host Overview-1634225578630.json rename to doc/Sysmon Agent - Host Overview-1657627310544.json index 5fab82c..74fc613 100644 --- a/doc/Sysmon - Host Overview-1634225578630.json +++ b/doc/Sysmon Agent - Host Overview-1657627310544.json @@ -9,6 +9,7 @@ "pluginName": "InfluxDB" } ], + "__elements": [], "__requires": [ { "type": "panel", @@ -20,7 +21,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.1.4" + "version": "8.4.7" }, { "type": "panel", @@ -72,16 +73,16 @@ } ] }, - "description": "Metrics from within host / guest / partition.", + "description": "https://bitbucket.org/mnellemann/sysmon/ - Metrics from within host / guest / partition.", "editable": true, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": null, - "iteration": 1634215058842, + "iteration": 1657611401289, "links": [], + "liveNow": false, "panels": [ { - "datasource": null, "gridPos": { "h": 3, "w": 24, @@ -93,13 +94,12 @@ "content": "## Metrics are collected by an agent running inside of each LPAR / VM / Host.\n \n For more information: [bitbucket.org/mnellemann/sysmon](https://bitbucket.org/mnellemann/sysmon)\n ", "mode": "markdown" }, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "transparent": true, "type": "text" }, { "collapsed": false, - "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -117,7 +117,10 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "description": "", "fill": 1, "fillGradient": 0, @@ -146,7 +149,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -157,6 +160,10 @@ "targets": [ { "alias": "$col", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -166,7 +173,7 @@ }, { "params": [ - "linear" + "null" ], "type": "fill" } @@ -242,9 +249,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "System Load Average", "tooltip": { "shared": true, @@ -253,9 +258,7 @@ }, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, @@ -263,29 +266,25 @@ { "$$hashKey": "object:42", "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": true }, { "$$hashKey": "object:43", "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": true } ], "yaxis": { - "align": false, - "alignLevel": null + "align": false } }, { - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "description": "", "fieldConfig": { "defaults": { @@ -417,7 +416,7 @@ "text": {}, "textMode": "value_and_name" }, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "targets": [ { "groupBy": [ @@ -541,9 +540,7 @@ ] } ], - "timeFrom": null, - "timeShift": null, - "title": "LPAR Details (IBM Power)", + "title": "Processor Details (IBM Power)", "transformations": [ { "id": "filterFieldsByName", @@ -567,7 +564,10 @@ "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "description": "", "fill": 1, "fillGradient": 0, @@ -595,7 +595,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -606,6 +606,10 @@ "targets": [ { "alias": "$col", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -615,7 +619,7 @@ }, { "params": [ - "linear" + "null" ], "type": "fill" } @@ -637,6 +641,12 @@ "params": [], "type": "mean" }, + { + "params": [ + 10 + ], + "type": "moving_average" + }, { "params": [ "user" @@ -655,6 +665,12 @@ "params": [], "type": "mean" }, + { + "params": [ + 10 + ], + "type": "moving_average" + }, { "params": [ "system" @@ -673,6 +689,12 @@ "params": [], "type": "mean" }, + { + "params": [ + 10 + ], + "type": "moving_average" + }, { "params": [ "steal" @@ -691,6 +713,12 @@ "params": [], "type": "mean" }, + { + "params": [ + 10 + ], + "type": "moving_average" + }, { "params": [ "softirq" @@ -709,6 +737,12 @@ "params": [], "type": "mean" }, + { + "params": [ + 10 + ], + "type": "moving_average" + }, { "params": [ "irq" @@ -727,6 +761,12 @@ "params": [], "type": "mean" }, + { + "params": [ + 10 + ], + "type": "moving_average" + }, { "params": [ "iowait" @@ -745,9 +785,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Processor Utilization", "tooltip": { "shared": true, @@ -756,9 +794,7 @@ }, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, @@ -766,29 +802,25 @@ { "$$hashKey": "object:42", "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": true }, { "$$hashKey": "object:43", "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": true } ], "yaxis": { - "align": false, - "alignLevel": null + "align": false } }, { - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "fieldConfig": { "defaults": { "color": { @@ -849,6 +881,7 @@ }, "id": 19, "options": { + "orientation": "auto", "reduceOptions": { "calcs": [ "lastNotNull" @@ -860,9 +893,13 @@ "showThresholdMarkers": true, "text": {} }, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "targets": [ { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -872,7 +909,7 @@ }, { "params": [ - "linear" + "null" ], "type": "fill" } @@ -935,13 +972,14 @@ ] } ], - "timeFrom": null, - "timeShift": null, "title": "Disk Metrics", "type": "gauge" }, { - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "description": "", "fieldConfig": { "defaults": { @@ -960,7 +998,7 @@ } ] }, - "unit": "short" + "unit": "none" }, "overrides": [ { @@ -971,7 +1009,7 @@ "properties": [ { "id": "displayName", - "value": "Consumed Entitlements" + "value": "Consumed Ent." }, { "id": "unit", @@ -987,7 +1025,7 @@ "properties": [ { "id": "displayName", - "value": "Consumed Phys. Cores" + "value": "Consumed Cores" } ] }, @@ -1003,7 +1041,7 @@ }, { "id": "unit", - "value": "percent" + "value": "none" } ] } @@ -1031,9 +1069,13 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "targets": [ { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -1043,7 +1085,7 @@ }, { "params": [ - "linear" + "null" ], "type": "fill" } @@ -1063,7 +1105,7 @@ }, { "params": [], - "type": "mean" + "type": "last" }, { "params": [ @@ -1081,7 +1123,7 @@ }, { "params": [], - "type": "mean" + "type": "last" }, { "params": [ @@ -1099,7 +1141,7 @@ }, { "params": [], - "type": "mean" + "type": "last" }, { "params": [ @@ -1118,61 +1160,407 @@ ] } ], - "timeFrom": null, - "timeShift": null, - "title": "LPAR Processor Usage (IBM Power)", + "title": "Shared Processor Usage (IBM Power)", "type": "stat" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "description": "", "fieldConfig": { "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "normal" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, "unit": "binBps" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "h": 9, "w": 12, "x": 0, "y": 15 }, - "hiddenSeries": false, - "id": 18, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", + "id": 10, "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "8.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "8.3.4", + "targets": [ + { + "alias": "$tag_name", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "hostname" + ], + "type": "tag" + }, + { + "params": [ + "name" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "base_disk", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "read" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "1s" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + 10 + ], + "type": "moving_average" + }, + { + "params": [ + "read" + ], + "type": "alias" + } + ] + ], + "tags": [ + { + "key": "hostname", + "operator": "=~", + "value": "/^$hostname$/" + } + ] + } + ], + "title": "Disk Device I/O - Reads", + "type": "timeseries" + }, + { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "normal" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "binBps" + }, + "overrides": [] + }, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 15 + }, + "id": 30, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "8.3.4", + "targets": [ + { + "alias": "$tag_name", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "hostname" + ], + "type": "tag" + }, + { + "params": [ + "name" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "base_disk", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "write" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "1s" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + 10 + ], + "type": "moving_average" + }, + { + "params": [ + "write" + ], + "type": "alias" + } + ] + ], + "tags": [ + { + "key": "hostname", + "operator": "=~", + "value": "/^$hostname$/" + } + ] + } + ], + "title": "Disk Device I/O - Writes", + "type": "timeseries" + }, + { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "smooth", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "binBps" + }, + "overrides": [] + }, + "gridPos": { + "h": 9, + "w": 12, + "x": 0, + "y": 24 + }, + "id": 31, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "8.3.4", "targets": [ { "alias": "$tag_name ($col)", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -1188,7 +1576,7 @@ }, { "params": [ - "linear" + "null" ], "type": "fill" } @@ -1222,7 +1610,129 @@ ], "type": "alias" } - ], + ] + ], + "tags": [ + { + "key": "hostname", + "operator": "=~", + "value": "/^$hostname$/" + } + ] + } + ], + "title": "Network I/O - Transmit", + "type": "timeseries" + }, + { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, + "description": "", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "smooth", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "binBps" + }, + "overrides": [] + }, + "gridPos": { + "h": 9, + "w": 12, + "x": 12, + "y": 24 + }, + "id": 18, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } + }, + "pluginVersion": "8.3.4", + "targets": [ + { + "alias": "$tag_name ($col)", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "name" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "base_network", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ [ { "params": [ @@ -1242,9 +1752,9 @@ }, { "params": [ - "*-1" + 10 ], - "type": "math" + "type": "moving_average" }, { "params": [ @@ -1263,239 +1773,18 @@ ] } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Network I/O", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:248", - "format": "binBps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:249", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "title": "Network I/O - Recieve", + "type": "timeseries" }, { "aliasColors": {}, "bars": false, "dashLength": 10, "dashes": false, - "datasource": "${DS_INFLUXDB-SYSMON}", - "fieldConfig": { - "defaults": { - "unit": "binBps" - }, - "overrides": [] + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 9, - "w": 12, - "x": 12, - "y": 15 - }, - "hiddenSeries": false, - "id": 10, - "legend": { - "avg": false, - "current": false, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "8.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "alias": "$tag_name ($col)", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "name" - ], - "type": "tag" - }, - { - "params": [ - "linear" - ], - "type": "fill" - } - ], - "measurement": "base_disk", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "read" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*-1" - ], - "type": "math" - }, - { - "params": [ - "read" - ], - "type": "alias" - } - ], - [ - { - "params": [ - "write" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "write" - ], - "type": "alias" - } - ] - ], - "tags": [ - { - "key": "hostname", - "operator": "=~", - "value": "/^$hostname$/" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Disk Device I/O", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:196", - "format": "binBps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:197", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_INFLUXDB-SYSMON}", "fieldConfig": { "defaults": { "unit": "dtdurationms" @@ -1508,7 +1797,7 @@ "h": 10, "w": 12, "x": 0, - "y": 24 + "y": 33 }, "hiddenSeries": false, "id": 24, @@ -1530,7 +1819,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "pointradius": 2, "points": false, "renderer": "flot", @@ -1541,6 +1830,10 @@ "targets": [ { "alias": "$tag_name($tag_pid)", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -1589,6 +1882,12 @@ { "params": [], "type": "non_negative_difference" + }, + { + "params": [ + 10 + ], + "type": "moving_average" } ] ], @@ -1602,9 +1901,7 @@ } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Running Processes - User Time", "tooltip": { "shared": true, @@ -1613,79 +1910,107 @@ }, "type": "graph", "xaxis": { - "buckets": null, "mode": "time", - "name": null, "show": true, "values": [] }, "yaxes": [ { "format": "dtdurationms", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": true }, { "format": "short", - "label": null, "logBase": 1, - "max": null, - "min": null, "show": true } ], "yaxis": { - "align": false, - "alignLevel": null + "align": false } }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_INFLUXDB-SYSMON}", - "description": "", - "fill": 0, - "fillGradient": 0, + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineStyle": { + "fill": "solid" + }, + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "bytes" + }, + "overrides": [] + }, "gridPos": { "h": 10, "w": 12, "x": 12, - "y": 24 + "y": 33 }, - "hiddenSeries": false, - "id": 26, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", + "id": 25, "options": { - "alertThreshold": true + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "multi", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "8.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "8.0.6", "targets": [ { - "alias": "$tag_mount", + "alias": "$tag_name($tag_pid)", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -1695,59 +2020,41 @@ }, { "params": [ - "mount" + "pid" ], "type": "tag" }, { "params": [ - "linear" + "name" + ], + "type": "tag" + }, + { + "params": [ + "null" ], "type": "fill" } ], - "measurement": "base_filesystem", + "measurement": "base_process", "orderByTime": "ASC", "policy": "default", - "query": "SELECT ( ( ( last(\"total_bytes\") - last(\"free_bytes\") ) / last(\"total_bytes\")) * 100) AS \"used\" FROM \"base_filesystem\" WHERE (\"hostname\" =~ /^$hostname$/) AND $timeFilter GROUP BY time($__interval), \"mount\" fill(linear)", - "rawQuery": true, + "query": "SELECT sum(non_negative_derivative(mean(\"user_time\"), 30s), non_negative_derivative(mean(\"user_time\"), 30s)) FROM \"base_process\" WHERE (\"hostname\" =~ /^$hostname$/) AND $timeFilter GROUP BY time($__interval), \"pid\", \"name\" fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "free_bytes" + "mem_rss" ], "type": "field" }, { "params": [], "type": "last" - }, - { - "params": [ - "free" - ], - "type": "alias" - } - ], - [ - { - "params": [ - "total_bytes" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - "total" - ], - "type": "alias" } ] ], @@ -1760,118 +2067,94 @@ ] } ], - "thresholds": [ - { - "$$hashKey": "object:221", - "colorMode": "warning", - "fill": true, - "line": false, - "op": "gt", - "value": 80, - "yaxis": "left" - }, - { - "$$hashKey": "object:227", - "colorMode": "critical", - "fill": true, - "line": false, - "op": "gt", - "value": 90, - "yaxis": "left" - } - ], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Filesystem Usage", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:196", - "decimals": null, - "format": "percent", - "label": "Percentage Used", - "logBase": 1, - "max": "100", - "min": null, - "show": true - }, - { - "$$hashKey": "object:197", - "format": "short", - "label": "Inodes Free", - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "title": "Running Processes - Resident Memory", + "transformations": [], + "type": "timeseries" }, { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "fieldConfig": { "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "opacity", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "smooth", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": true, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, "unit": "bytes" }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { - "h": 8, + "h": 9, "w": 12, "x": 0, - "y": 34 + "y": 43 }, - "hiddenSeries": false, "id": 8, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", "options": { - "alertThreshold": true + "legend": { + "calcs": [ + "lastNotNull" + ], + "displayMode": "list", + "placement": "bottom" + }, + "tooltip": { + "mode": "single", + "sort": "none" + } }, - "percentage": false, - "pluginVersion": "8.1.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + "pluginVersion": "8.3.4", "targets": [ { "alias": "$col", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -1881,7 +2164,7 @@ }, { "params": [ - "linear" + "null" ], "type": "fill" } @@ -1974,58 +2257,22 @@ ] } ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, "title": "Memory Usage", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:144", - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:145", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "type": "timeseries" }, { - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, + "description": "", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { - "axisLabel": "", + "axisLabel": "Percentage Used", "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", @@ -2036,23 +2283,20 @@ "tooltip": false, "viz": false }, - "lineInterpolation": "linear", - "lineStyle": { - "fill": "solid" - }, + "lineInterpolation": "smooth", "lineWidth": 1, "pointSize": 5, "scaleDistribution": { "type": "linear" }, - "showPoints": "auto", + "showPoints": "never", "spanNulls": true, "stacking": { "group": "A", "mode": "none" }, "thresholdsStyle": { - "mode": "off" + "mode": "area" } }, "mappings": [], @@ -2060,36 +2304,51 @@ "mode": "absolute", "steps": [ { - "color": "green", + "color": "transparent", "value": null + }, + { + "color": "orange", + "value": 80 + }, + { + "color": "red", + "value": 90 } ] }, - "unit": "bytes" + "unit": "percent" }, "overrides": [] }, "gridPos": { - "h": 8, + "h": 9, "w": 12, "x": 12, - "y": 34 + "y": 43 }, - "id": 25, + "id": 26, "options": { "legend": { - "calcs": [], + "calcs": [ + "lastNotNull" + ], "displayMode": "list", "placement": "bottom" }, "tooltip": { - "mode": "multi" + "mode": "multi", + "sort": "none" } }, - "pluginVersion": "8.0.6", + "pluginVersion": "8.3.4", "targets": [ { - "alias": "$tag_name($tag_pid)", + "alias": "$tag_mount", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -2099,41 +2358,59 @@ }, { "params": [ - "pid" + "mount" ], "type": "tag" }, { "params": [ - "name" - ], - "type": "tag" - }, - { - "params": [ - "null" + "linear" ], "type": "fill" } ], - "measurement": "base_process", + "measurement": "base_filesystem", "orderByTime": "ASC", "policy": "default", - "query": "SELECT sum(non_negative_derivative(mean(\"user_time\"), 30s), non_negative_derivative(mean(\"user_time\"), 30s)) FROM \"base_process\" WHERE (\"hostname\" =~ /^$hostname$/) AND $timeFilter GROUP BY time($__interval), \"pid\", \"name\" fill(null)", - "rawQuery": false, + "query": "SELECT ( ( ( last(\"total_bytes\") - last(\"free_bytes\") ) / last(\"total_bytes\")) * 100) AS \"used\" FROM \"base_filesystem\" WHERE (\"hostname\" =~ /^$hostname$/) AND $timeFilter GROUP BY time($__interval), \"mount\" fill(null)", + "rawQuery": true, "refId": "A", "resultFormat": "time_series", "select": [ [ { "params": [ - "mem_rss" + "free_bytes" ], "type": "field" }, { "params": [], "type": "last" + }, + { + "params": [ + "free" + ], + "type": "alias" + } + ], + [ + { + "params": [ + "total_bytes" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "total" + ], + "type": "alias" } ] ], @@ -2146,12 +2423,14 @@ ] } ], - "title": "Running Processes - Resident Memory", - "transformations": [], + "title": "Filesystem Usage", "type": "timeseries" }, { - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "description": "", "fieldConfig": { "defaults": { @@ -2274,7 +2553,7 @@ "h": 6, "w": 24, "x": 0, - "y": 42 + "y": 52 }, "id": 22, "options": { @@ -2292,9 +2571,13 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "targets": [ { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -2304,7 +2587,7 @@ }, { "params": [ - "linear" + "null" ], "type": "fill" } @@ -2469,14 +2752,12 @@ ] } ], - "timeFrom": null, - "timeShift": null, - "title": "Network Sockets (Linux)", + "title": "Network Sockets (Linux Only)", "type": "stat" } ], "refresh": "30s", - "schemaVersion": 30, + "schemaVersion": 35, "style": "dark", "tags": [ "sysmon" @@ -2484,12 +2765,12 @@ "templating": { "list": [ { - "allValue": null, "current": {}, - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "definition": "SHOW TAG VALUES FROM \"base_memory\" WITH KEY = \"hostname\" WHERE time > now() - 60m", - "description": null, - "error": null, "hide": 0, "includeAll": false, "label": "Host", @@ -2500,7 +2781,7 @@ "refresh": 2, "regex": "", "skipUrlSync": false, - "sort": 0, + "sort": 5, "tagValuesQuery": "", "tagsQuery": "", "type": "query", @@ -2509,7 +2790,7 @@ ] }, "time": { - "from": "now-15m", + "from": "now-1h", "to": "now-30s" }, "timepicker": { @@ -2526,7 +2807,8 @@ ] }, "timezone": "", - "title": "Sysmon - Host Overview", + "title": "Sysmon Agent - Host Overview", "uid": "QkVPjseMk", - "version": 67 + "version": 24, + "weekStart": "" } \ No newline at end of file diff --git a/doc/Sysmon - Process Explorer-1632317613366.json b/doc/Sysmon Agent - Process Explorer-1657627430400.json similarity index 92% rename from doc/Sysmon - Process Explorer-1632317613366.json rename to doc/Sysmon Agent - Process Explorer-1657627430400.json index 394ef52..f0776c2 100644 --- a/doc/Sysmon - Process Explorer-1632317613366.json +++ b/doc/Sysmon Agent - Process Explorer-1657627430400.json @@ -9,12 +9,13 @@ "pluginName": "InfluxDB" } ], + "__elements": [], "__requires": [ { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.1.4" + "version": "8.4.7" }, { "type": "datasource", @@ -66,16 +67,16 @@ } ] }, - "description": "Metrics from within host / guest / partition.", + "description": "https://bitbucket.org/mnellemann/sysmon/ - Metrics from within host / guest / partition.", "editable": true, - "gnetId": null, + "fiscalYearStartMonth": 0, "graphTooltip": 0, "id": null, - "iteration": 1632317604857, + "iteration": 1657627348578, "links": [], + "liveNow": false, "panels": [ { - "datasource": null, "gridPos": { "h": 3, "w": 24, @@ -87,13 +88,12 @@ "content": "## Metrics are collected by an agent running inside of each LPAR / VM / Host.\n \n For more information: [bitbucket.org/mnellemann/sysmon](https://bitbucket.org/mnellemann/sysmon)\n ", "mode": "markdown" }, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "transparent": true, "type": "text" }, { "collapsed": false, - "datasource": null, "gridPos": { "h": 1, "w": 24, @@ -107,7 +107,10 @@ "type": "row" }, { - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "description": "", "fieldConfig": { "defaults": { @@ -140,10 +143,17 @@ }, "id": 16, "options": { + "footer": { + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, "showHeader": true, "sortBy": [] }, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "targets": [ { "groupBy": [ @@ -236,13 +246,14 @@ ] } ], - "timeFrom": null, - "timeShift": null, "title": "Details", "type": "table" }, { - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "fieldConfig": { "defaults": { "color": { @@ -309,9 +320,13 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "targets": [ { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -321,7 +336,7 @@ }, { "params": [ - "linear" + "null" ], "type": "fill" } @@ -390,13 +405,14 @@ ] } ], - "timeFrom": null, - "timeShift": null, "title": "Memory Metrics", "type": "stat" }, { - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "fieldConfig": { "defaults": { "color": { @@ -463,9 +479,13 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.1.4", + "pluginVersion": "8.4.7", "targets": [ { + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "groupBy": [ { "params": [ @@ -475,7 +495,7 @@ }, { "params": [ - "previous" + "null" ], "type": "fill" } @@ -544,13 +564,14 @@ ] } ], - "timeFrom": null, - "timeShift": null, "title": "Disk Metrics", "type": "stat" }, { - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "description": "", "fieldConfig": { "defaults": { @@ -613,7 +634,8 @@ "placement": "bottom" }, "tooltip": { - "mode": "multi" + "mode": "multi", + "sort": "none" } }, "pluginVersion": "8.0.6", @@ -718,7 +740,10 @@ "type": "timeseries" }, { - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "description": "", "fieldConfig": { "defaults": { @@ -788,7 +813,8 @@ "placement": "bottom" }, "tooltip": { - "mode": "multi" + "mode": "multi", + "sort": "none" } }, "pluginVersion": "8.0.6", @@ -886,18 +912,18 @@ } ], "refresh": "1m", - "schemaVersion": 30, + "schemaVersion": 35, "style": "dark", "tags": [], "templating": { "list": [ { - "allValue": null, "current": {}, - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "definition": "SHOW TAG VALUES FROM \"base_memory\" WITH KEY = \"hostname\" WHERE time > now() - 60m", - "description": null, - "error": null, "hide": 0, "includeAll": false, "label": "Host", @@ -915,12 +941,12 @@ "useTags": false }, { - "allValue": null, "current": {}, - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "definition": "SHOW TAG VALUES FROM \"base_process\" WITH KEY = \"name\" WHERE hostname =~ /$hostname/AND time > now() - 60m", - "description": null, - "error": null, "hide": 0, "includeAll": false, "label": "Process", @@ -935,12 +961,12 @@ "type": "query" }, { - "allValue": null, "current": {}, - "datasource": "${DS_INFLUXDB-SYSMON}", + "datasource": { + "type": "influxdb", + "uid": "${DS_INFLUXDB-SYSMON}" + }, "definition": "SELECT DISTINCT(\"pid\") FROM (SELECT * FROM \"base_process\" WHERE time > now() - 60m AND \"hostname\" =~ /$hostname/ AND \"name\" =~ /$process/)", - "description": null, - "error": null, "hide": 0, "includeAll": true, "label": "PID", @@ -974,7 +1000,8 @@ ] }, "timezone": "", - "title": "Sysmon - Process Explorer", + "title": "Sysmon Agent - Process Explorer", "uid": "Vjut5mS7k", - "version": 18 + "version": 4, + "weekStart": "" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 0d39fa8..b5a44e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version = 0.1.14 +version = 0.1.15 pf4jVersion = 3.7.0 slf4jVersion = 1.7.36 camelVersion = 3.14.4 diff --git a/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/TestExtension.java b/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/TestExtension.java index 74080dd..c5f41b1 100644 --- a/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/TestExtension.java +++ b/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/TestExtension.java @@ -78,6 +78,20 @@ public class TestExtension implements MetricExtension { return null; } + /* const hSql = "select + SERVER_NAME, + HTTP_FUNCTION, + SERVER_NORMAL_CONNECTIONS, + SERVER_ACTIVE_THREADS, + SERVER_IDLE_THREADS, + BYTES_RECEIVED, + BYTES_SENT, + NONCACHE_PROCESSING_TIME, + CACHE_PROCESSING_TIME + from + QSYS2.HTTP_SERVER_INFO"; + */ + try { int jobsInSystem = systemStatus.getJobsInSystem(); log.info("Jobs In System: {}", jobsInSystem); @@ -94,6 +108,15 @@ public class TestExtension implements MetricExtension { int onlineUsers = systemStatus.getUsersCurrentSignedOn(); log.info("Online Users: {}", onlineUsers); + // The storage capacity of the system auxiliary storage pool (ASP1) in MBytes. + long systemAsp = systemStatus.getSystemASP(); + + System.out.println("Current Processing Capacity :" + systemStatus.getCurrentProcessingCapacity()); + System.out.println("ASPUsed:" + systemStatus.getPercentSystemASPUsed()); + System.out.println("Temp Addresses Used:" + systemStatus.getPercentTemporaryAddresses()); + + + HashMap fieldsMap = new HashMap() {{ put("jobs_total", jobsInSystem); put("jobs_running", batchJobsRunning); diff --git a/server/build.gradle b/server/build.gradle index f9317b4..9fa672b 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -28,7 +28,7 @@ def projectName = "sysmon-server" application { // Define the main class for the application. mainClass.set('sysmon.server.Application') - applicationDefaultJvmArgs = [ "-server", "-Xmx128m", "-XX:+UseG1GC" ] + applicationDefaultJvmArgs = [ "-server", "-Xmx128m" ] } run {