Various small changes.

CHANGELOG.md

@@ -2,10 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.0.22] - 2022-11-07
+## [1.0.23] - 2022-11-07
 - Update dashboards.
 - Lower default interval for most plugins.
 - Simplify metrics-results to influx points code.
+- Remove logging of skipped disk devices (eg. cd0).
 
 ## [1.0.21] - 2022-10-30
 - Update dashboard
@@ -35,7 +36,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Updated 3rd party dependencies.
 
-[1.0.22]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v1.0.22%0Dv0.1.21
+[1.0.23]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v1.0.23%0Dv0.1.21
 [1.0.21]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v1.0.21%0Dv0.1.18
 [1.0.18]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v1.0.18%0Dv0.1.13
 [0.1.13]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v0.1.13%0Dv0.1.11

client/doc/sysmon-client.sh

@@ -11,10 +11,10 @@
 
 dir="/opt/sysmon/client"
 cmd="/opt/sysmon/client/bin/client"
-args="-s http://10.20.30.40:9925/metrics"   # Specify sysmon-server URL here
+args="-s http://10.20.30.40:9925/metrics"   # Specify sysmon-server URL here, add '-n hostname' if needed
 user=""
 
-name=`basename $0`
+name="sysmon-client"
 pid_file="/var/run/$name.pid"
 stdout_log="/var/log/$name.log"
 stderr_log="/var/log/$name.err"

doc/dashboards/Sysmon - IBM Power.json

@@ -155,7 +155,7 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 14,
+        "h": 13,
         "w": 12,
         "x": 0,
         "y": 3
@@ -299,7 +299,7 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 14,
+        "h": 13,
         "w": 12,
         "x": 12,
         "y": 3
@@ -437,10 +437,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 15,
+        "h": 14,
         "w": 12,
         "x": 0,
-        "y": 17
+        "y": 16
       },
       "id": 30,
       "options": {
@@ -576,10 +576,10 @@
         "overrides": []
       },
       "gridPos": {
-        "h": 15,
+        "h": 14,
         "w": 12,
         "x": 12,
-        "y": 17
+        "y": 16
       },
       "id": 31,
       "options": {
@@ -669,14 +669,14 @@
           "type": "influxdb",
           "uid": "${DS_SYSMON}"
         },
-        "definition": "SHOW TAG VALUES FROM \"base_memory\" WITH KEY = \"hostname\" WHERE time > now() - 60m",
+        "definition": "SHOW TAG VALUES FROM \"aix_processor\" WITH KEY = \"hostname\" WHERE time > now() - 60m",
         "hide": 0,
         "includeAll": true,
         "label": "Host",
         "multi": true,
         "name": "hostname",
         "options": [],
-        "query": "SHOW TAG VALUES FROM \"base_memory\" WITH KEY = \"hostname\" WHERE time > now() - 60m",
+        "query": "SHOW TAG VALUES FROM \"aix_processor\" WITH KEY = \"hostname\" WHERE time > now() - 60m",
         "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
@@ -709,6 +709,6 @@
   "timezone": "",
   "title": "Sysmon - IBM Power",
   "uid": "3zPCIbN4z",
-  "version": 5,
+  "version": 6,
   "weekStart": ""
 }

gradle.properties

@@ -1,9 +1,9 @@
-version         = 1.0.22
+version         = 1.0.23
 pf4jVersion     = 3.7.0
 slf4jVersion    = 2.0.3
 camelVersion    = 3.14.5
 groovyVersion   = 3.0.13
-picocliVersion  = 4.6.3
+picocliVersion  = 4.7.0
 oshiVersion     = 6.3.1
 spockVersion    = 2.3-groovy-3.0
 tomljVersion    = 1.1.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseDiskExtension.java

@@ -108,7 +108,7 @@ public class BaseDiskExtension implements MetricExtension {
                 log.debug("getMetrics() - tags: {}, fields: {}", tagsMap, fieldsMap);
                 measurementList.add(new Measurement(tagsMap, fieldsMap));
             } else {
-                log.warn("getMetrics() - skipping device: {}", name);
+                log.debug("getMetrics() - skipping device: {}", name);
             }
 
         }

server/doc/sysmon-server.sh

@@ -11,10 +11,10 @@
 
 dir="/opt/sysmon/server"
 cmd="/opt/sysmon/server/bin/server"
-args="-d"
+args=""     # Add '-d' for debug output
 user=""
 
-name=`basename $0`
+name="sysmon-server"
 pid_file="/var/run/$name.pid"
 stdout_log="/var/log/$name.log"
 stderr_log="/var/log/$name.err"

server/src/main/java/sysmon/server/ServerRouteBuilder.java

@@ -40,7 +40,7 @@ public class ServerRouteBuilder extends RouteBuilder {
                     .setHeader(Exchange.HTTP_RESPONSE_CODE, constant(202))
                     .setHeader("Content-Type", constant("application/x-www-form-urlencoded"))
                     .to("seda:inbound?discardWhenFull=true")
-                    .setBody(simple("OK, received by server."))
+                    .setBody(simple("OK, received."))
                 .doCatch(Exception.class)
                     .log(LoggingLevel.WARN, "Error: ${exception.message}.")
                 .end()