diff --git a/CHANGELOG.md b/CHANGELOG.md index 7674cc2..72a524d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ All notable changes to this project will be documented in this file. +## [1.1.2] - 2023-02-06 +- Lowercase client hostnames + ## [1.1.1] - 2023-01-22 - Simplify plugin naming - Initial support for executing (groovy) scripts diff --git a/README.md b/README.md index 9b80863..5b94500 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # System Monitor -Open source system monitoring solution with support for plugins. +Open source system monitoring solution with support for plugins and scripts. This software is free to use and is licensed under the [Apache 2.0 License](LICENSE). @@ -15,6 +15,13 @@ Some of my other related projects are: - [svci](https://git.data.coop/nellemann/svci) for monitoring IBM Spectrum Virtualize (Flashsystems / Storwize / SVC) - [syslogd](https://git.data.coop/nellemann/syslogd) for redirecting syslog and GELF to other logging destinations +## Screenshots + + +![screenshot](doc/screenshots/sysmon1.png) + +Screenshots of other dashboards are available in the [doc/screenshots](doc/screenshots/) folder. + ## Components ### Server diff --git a/client/doc/readme-aix.md b/client/doc/readme-aix.md index 60850a8..6aae988 100644 --- a/client/doc/readme-aix.md +++ b/client/doc/readme-aix.md @@ -8,7 +8,7 @@ We require Java 8, which should already be installed on AIX, or is available to 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 +rpm -ivh --ignoreos sysmon-client-*.rpm sysmon-plugins-*.rpm ``` ### Run automatically at boot diff --git a/client/doc/sysmon-client.sh b/client/doc/sysmon-client.sh index 3cbce25..4f6d131 100644 --- a/client/doc/sysmon-client.sh +++ b/client/doc/sysmon-client.sh @@ -19,11 +19,12 @@ pid_file="/var/run/$name.pid" stdout_log="/var/log/$name.log" stderr_log="/var/log/$name.err" -# Uncomment if required +# Java 8+ runtime required - Uncomment and export JAVA_HOME if needed #JAVA_HOME=/usr/java8_64 -#JAVA_HOME=/opt/ibm-semeru-open-8-jdk -#JAVA_HOME=/opt/ibm-semeru-open-11-jdk -#JAVA_HOME=/opt/ibm-semeru-open-17-jdk +#JAVA_HOME=/opt/ibm-semeru-open-XX-jre +#JAVA_HOME=/opt/ibm-semeru-open-XX-jdk +#JAVA_HOME=/opt/ibm/ibm-semeru-certified-XX-jre +#JAVA_HOME=/opt/ibm/ibm-semeru-certified-XX-jdk #export JAVA_HOME get_pid() { diff --git a/client/src/main/java/sysmon/client/MetricEnrichProcessor.java b/client/src/main/java/sysmon/client/MetricEnrichProcessor.java index 1a46d46..a007cf6 100644 --- a/client/src/main/java/sysmon/client/MetricEnrichProcessor.java +++ b/client/src/main/java/sysmon/client/MetricEnrichProcessor.java @@ -32,4 +32,4 @@ public class MetricEnrichProcessor implements Processor { exchange.getIn().setBody(metricResult); } -} \ No newline at end of file +} diff --git a/doc/dashboards/Sysmon - Host Overview.json b/doc/dashboards/Sysmon - Host Overview.json index c6e40dc..0ca16de 100644 --- a/doc/dashboards/Sysmon - Host Overview.json +++ b/doc/dashboards/Sysmon - Host Overview.json @@ -97,7 +97,7 @@ }, "id": 28, "options": { - "content": "## Metrics are collected by an agent running inside of each LPAR / VM / Host.\n \n For more information: [git.data.coop/nellemann/sysmon](https://git.data.coop/nellemann/sysmon)\n ", + "content": "## Metrics are collected by an agent running inside of each LPAR / VM / Host.\n \n For more information visit: [git.data.coop/nellemann/sysmon](https://git.data.coop/nellemann/sysmon)\n ", "mode": "markdown" }, "pluginVersion": "9.1.6", diff --git a/doc/dashboards/Sysmon - IBM Power.json b/doc/dashboards/Sysmon - IBM Power.json index 0aeb781..356b351 100644 --- a/doc/dashboards/Sysmon - IBM Power.json +++ b/doc/dashboards/Sysmon - IBM Power.json @@ -79,7 +79,7 @@ }, "id": 28, "options": { - "content": "## Metrics are collected by an agent running inside of each LPAR / VM / Host.\n \n For more information: [git.data.coop/nellemann/sysmon](https://git.data.coop/nellemann/sysmon)\n ", + "content": "## Metrics are collected by an agent running inside of each LPAR / VM / Host.\n \n For more information visit: [git.data.coop/nellemann/sysmon](https://git.data.coop/nellemann/sysmon)\n ", "mode": "markdown" }, "pluginVersion": "9.1.6", diff --git a/doc/dashboards/Sysmon - Process Explorer.json b/doc/dashboards/Sysmon - Process Explorer.json index 8fb6997..41ea605 100644 --- a/doc/dashboards/Sysmon - Process Explorer.json +++ b/doc/dashboards/Sysmon - Process Explorer.json @@ -91,7 +91,7 @@ }, "id": 30, "options": { - "content": "## Metrics are collected by an agent running inside of each LPAR / VM / Host.\n \n For more information: [git.data.coop/nellemann/sysmon](https://git.data.coop/nellemann/sysmon)\n ", + "content": "## Metrics are collected by an agent running inside of each LPAR / VM / Host.\n \n For more information visit: [git.data.coop/nellemann/sysmon](https://git.data.coop/nellemann/sysmon)\n ", "mode": "markdown" }, "pluginVersion": "9.1.6", diff --git a/gradle.properties b/gradle.properties index 848a380..fb94756 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -version = 1.1.1 +version = 1.1.2 pf4jVersion = 3.7.0 slf4jVersion = 2.0.6 camelVersion = 3.14.7 groovyVersion = 3.0.14 -picocliVersion = 4.7.0 +picocliVersion = 4.7.1 oshiVersion = 6.4.0 spockVersion = 2.3-groovy-3.0 tomljVersion = 1.1.0 diff --git a/plugins/base/src/main/java/sysmon/plugins/base/BaseDiskExtension.java b/plugins/base/src/main/java/sysmon/plugins/base/BaseDiskExtension.java index d847f2d..1f0b484 100644 --- a/plugins/base/src/main/java/sysmon/plugins/base/BaseDiskExtension.java +++ b/plugins/base/src/main/java/sysmon/plugins/base/BaseDiskExtension.java @@ -79,7 +79,7 @@ public class BaseDiskExtension implements MetricExtension { ArrayList measurementList = new ArrayList<>(); if(diskStores == null || refreshCounter++ > 360) { - log.info("getMetrics() - refreshing list of disk stores"); + log.debug("getMetrics() - refreshing list of disk stores"); diskStores = hardwareAbstractionLayer.getDiskStores(); refreshCounter = 0; } diff --git a/plugins/base/src/main/java/sysmon/plugins/base/BaseInfoExtension.java b/plugins/base/src/main/java/sysmon/plugins/base/BaseInfoExtension.java index aa3fdd6..1c5bfad 100644 --- a/plugins/base/src/main/java/sysmon/plugins/base/BaseInfoExtension.java +++ b/plugins/base/src/main/java/sysmon/plugins/base/BaseInfoExtension.java @@ -84,7 +84,6 @@ public class BaseInfoExtension implements MetricExtension { put("boot_time", systemInfo.getOperatingSystem().getSystemBootTime()); }}; - log.info(fieldsMap.toString()); return new MetricResult(name, new Measurement(tags, fieldsMap)); } diff --git a/plugins/base/src/main/java/sysmon/plugins/base/BaseNetworkExtension.java b/plugins/base/src/main/java/sysmon/plugins/base/BaseNetworkExtension.java index e52d628..2c9d376 100644 --- a/plugins/base/src/main/java/sysmon/plugins/base/BaseNetworkExtension.java +++ b/plugins/base/src/main/java/sysmon/plugins/base/BaseNetworkExtension.java @@ -79,7 +79,7 @@ public class BaseNetworkExtension implements MetricExtension { ArrayList measurementList = new ArrayList<>(); if(interfaces == null || refreshCounter++ > 360) { - log.info("getMetrics() - refreshing list of network interfaces"); + log.debug("getMetrics() - refreshing list of network interfaces"); interfaces = hardwareAbstractionLayer.getNetworkIFs(); refreshCounter = 0; } diff --git a/shared/src/main/java/sysmon/shared/MetricResult.java b/shared/src/main/java/sysmon/shared/MetricResult.java index 8df2f6d..4f6197c 100644 --- a/shared/src/main/java/sysmon/shared/MetricResult.java +++ b/shared/src/main/java/sysmon/shared/MetricResult.java @@ -46,7 +46,7 @@ public class MetricResult implements Serializable { } public void setHostname(String hostname) { - this.hostname = hostname; + this.hostname = hostname.toLowerCase(); } public void setName(String name) {