113 changed files with 2844 additions and 3444 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,26 +0,0 @@
---
-kind: pipeline
-name: default
-type: docker
-
-steps:
- name: test
-  image: eclipse-temurin:8-jdk
-  commands:
-    - ./gradlew test
- name: build
-  image: eclipse-temurin:8-jdk
-  environment:
-    AUTH_TOKEN:           # Gitea access token ENV variable
-      from_secret: auth   # Name of DroneCI secret exposed above
-  commands:
-  - ./gradlew build packages shared:publishLibraryPublicationToGiteaRepository
-  - for file in server/build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
-  - for file in server/build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
-  - for file in client/build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
-  - for file in client/build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
-  - for file in plugins/build/distributions/*.deb ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
-  - for file in plugins/build/distributions/*.rpm ; do curl --user "${DRONE_REPO_OWNER}:$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done
-  when:
-    event:
-    - tag
--- a/.editorconfig
+++ b/.editorconfig
@ -1,11 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-indent_style = space
-indent_size = 4
-
-[*.yml]
-indent_size = 2
--- a/.gitignore
+++ b/.gitignore
@ -3,7 +3,6 @@
 .classpath
 .project
 .gradle
-.vscode
 output
 build
 bin
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,41 +2,6 @@

 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
- Fixed bug when no config file were found
- Update the default [dashboards](doc/dashboards/)
-
-## [1.1.0] - 2022-12-17
- Lower influx time precision from milliseconds to seconds
-  - requires you to update server and clients to this version.
- Update *oshi* dependency (for AIX improvements).
-
-
-## [1.0.24] - 2022-11-16
- Fix incorrect use of OSHI getDiskStores()
- Update dashboards
-
-## [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
- Add IP connections
-
-## [1.0.18] - 2022-10-24
- Bump version to 1.x to indicate stable release.
- Update 3rd party dependencies.
-
-## [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).
@ -55,14 +20,6 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Updated 3rd party dependencies.

-<!--
-[1.1.0]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v1.1.0%0Dv0.1.24
-[1.0.24]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v1.0.24%0Dv0.1.23
-[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
 [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
-->
--- a/README.md
+++ b/README.md
@ -1,3 +1,53 @@
-# Repository moved
+# System Monitor

-Please visit [github.com/mnellemann/sysmon](https://github.com/mnellemann/sysmon)
+System monitoring solution with support for plugins.
+
+![Sysmon Icon](doc/sysmon.png)
+
+This software is free to use and is licensed under the [Apache 2.0 License](LICENSE).
+
+- Example dashboards are provided in the [doc/](doc) folder, which can be imported into your Grafana installation.
+- Screenshots are available in the [downloads](https://bitbucket.org/mnellemann/sysmon/downloads/) section.
+
+
+## Components 
+
+### Client / Agent
+
+Runs on your hosts and collects metrics, which are sent to the central *server*.
+
+[More information](client/README.md).
+
+### Plugins
+
+Loaded by the *client* and provides extensions for doing the actual collecting of metrics.
+
+[More information](plugins/README.md).
+
+### Server
+
+Receives aggregated metrics from *clients* and saves these into InfluxDB.
+
+[More information](server/README.md).
+
+
+
+## Known problems
+
+### Correct timezone and clock
+
+- Ensure you have **correct timezone and date/time** and NTPd (or similar) running to keep it accurate!
+
+### Naming collision
+
+You can't have hosts with the same name, as these cannot be distinguished when metrics are
+written to InfluxDB (which uses the hostname as key).
+
+### Renaming hosts
+
+If you rename a host, the metrics in InfluxDB will still be available by the old hostname, and new metrics will be written with the new hostname. There is no easy way to migrate the old data, but you can delete it easily:
+
+```text
+USE sysmon;
+DELETE WHERE hostname = 'unknown';
+```
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@ -1,4 +1,4 @@
-image: eclipse-temurin:8-jdk
+image: openjdk:8

 pipelines:
  branches:
--- a/build.gradle
+++ b/build.gradle
@ -13,13 +13,14 @@ subprojects {
    apply plugin: 'groovy'

    dependencies {
-        testImplementation "org.spockframework:spock-core:${spockVersion}"
+        testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
        testImplementation "org.slf4j:slf4j-api:${slf4jVersion}"
        testImplementation "org.slf4j:slf4j-simple:${slf4jVersion}"

        implementation "org.slf4j:slf4j-api:${slf4jVersion}"
        implementation "org.slf4j:slf4j-simple:${slf4jVersion}"
-        implementation "org.tomlj:tomlj:${tomljVersion}"
+        implementation 'org.tomlj:tomlj:1.0.0'
+
    }

    repositories {
@ -27,14 +28,11 @@ subprojects {
        mavenCentral()
    }

-    java {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 }

-tasks.register("packages") {
+tasks.create("packages") {
    group "build"

    dependsOn ":client:buildDeb"
@ -45,5 +43,4 @@ tasks.register("packages") {

    dependsOn ":plugins:buildDeb"
    dependsOn ":plugins:buildRpm"
-    dependsOn ":plugins:buildZip"
 }
--- a/client/README.md
+++ b/client/README.md
@ -1,12 +1,12 @@
 # Client / Agent

-This is the client/agent component of sysmon, which you install (together with sysmon-plugins) on your hosts.
+This is the client/agent component of SysMon, which you install (together with sysmon-plugins) on the hosts where you want to collect metrics.  

 ## Installation

 Download *.deb* or *.rpm* packages for sysmon-client *and* sysmon-plugins, and install.

-See the [doc/systemd.md](doc/systemd.md) or [doc/sysv-init.md](doc/sysv-init.md) files for further instructions on running as a system service.
+See the [doc/systemd.md](doc/systemd.md) or [doc/sysv-init.md](doc/sysv-init.md) files for further instructions.

 ## Development

--- a/client/build.gradle
+++ b/client/build.gradle
@ -3,9 +3,9 @@ import org.redline_rpm.header.Os
 plugins {
    id 'application'

-    id "net.nemerosa.versioning" version "2.15.1"
    id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "com.netflix.nebula.ospackage" version "11.3.0"
+    id "net.nemerosa.versioning" version "2.15.1"
+    id "nebula.ospackage" version "9.1.1"
 }

 dependencies {
@ -17,15 +17,12 @@ dependencies {

    annotationProcessor "info.picocli:picocli-codegen:${picocliVersion}"
    implementation "info.picocli:picocli:${picocliVersion}"
-    implementation "org.tomlj:tomlj:${tomljVersion}"
+    implementation 'org.tomlj:tomlj:1.0.0'

    runtimeOnly(group: 'com.github.oshi', name: 'oshi-core', version: oshiVersion)  {
        exclude(group: "org.slf4j")
    }

-    //implementation "org.apache.groovy:groovy-all:${groovyVersion}"    // From version 4.+
-    implementation "org.codehaus.groovy:groovy:${groovyVersion}"
-
    implementation group: 'org.apache.camel', name: 'camel-core', version: camelVersion
    implementation group: 'org.apache.camel', name: 'camel-main', version: camelVersion
    implementation group: 'org.apache.camel', name: 'camel-http', version: camelVersion
@ -41,7 +38,7 @@ def projectName = "sysmon-client"
 application {
    // Define the main class for the application.
    mainClass.set('sysmon.client.Application')
-    applicationDefaultJvmArgs = [ "-Xms64m", "-Xmx64m", "-XX:+ExitOnOutOfMemoryError", "-XX:+AlwaysPreTouch" ]
+    applicationDefaultJvmArgs = [ "-server", "-Xmx64m", "-XX:+UseG1GC" ]
 }

 run {
@ -76,6 +73,7 @@ shadowJar {
    mergeServiceFiles() // Tell plugin to merge duplicate service files
 }

+apply plugin: 'nebula.ospackage'
 ospackage {
    packageName = projectName
    release = '1'
--- a/client/doc/readme-aix.md
+++ b/client/doc/readme-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 -ivh --ignoreos sysmon-client-*.rpm sysmon-plugins-*.rpm
+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,19 +19,3 @@ 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
-/etc/rc.d/init.d/sysmon-client stop; /etc/rc.d/init.d/sysmon-client start
-# or, if running from inittab:
-kill -HUP `ps -e -o pid,comm,args | grep sysmon-client | grep java | awk '{print $1}'`
-```
--- a/client/doc/readme-redhat.md
+++ b/client/doc/readme-redhat.md
@ -1,43 +0,0 @@
-# Instruction for RedHat / CentOS / AlmaLinux Systems
-
-Please note that the software versions referenced in this document might have changed and might not be available/working unless updated.
-
-More details are available in the [README.md](../README.md) file.
-
-
-## Requirements
-
-Java 8 (or later) runtime is required.
-
-```shell
-sudo dnf install java-11-openjdk-headless
-```
-
-Use *yum* if *dnf* is not available.
-
-
-## Installation
-
-[Download](https://git.data.coop/nellemann/-/packages/generic/sysmon/) the latest client and plugins rpm files and install:
-
-```shell
-rpm -ivh sysmon-client-*.noarch.rpm sysmon-plugins-*.noarch.rpm
-cp /opt/sysmon/client/doc/sysmon-client.service /etc/systemd/system/
-systemctl daemon-reload
-```
-
-Now edit the **/etc/systemd/system/sysmon-client.service** file and change the URL so that it points to *your* sysmon-server.
-
-````
-# Modify below line in /etc/systemd/system/sysmon-client.service
-ExecStart=/opt/sysmon/client/bin/client -s http://10.20.30.40:9925/metrics
-````
-
-Now enable and start the sysmon-client service:
-
-```shell
-systemctl enable sysmon-client
-systemctl start sysmon-client
-```
-
-Check logs for errors with: ```journalctl -u sysmon-client```
--- a/client/doc/scripts/ExampleScript.groovy
+++ b/client/doc/scripts/ExampleScript.groovy
@ -1,19 +0,0 @@
-
-class ExampleScript implements MetricScript {
-
-    MetricResult getMetrics() {
-        Map<String,String> tags = new TreeMap<>();
-        Map<String,Object> fields = new TreeMap<>();
-
-        tags.put("type", "temp");
-        fields.put("sensor1", 23.2);
-        fields.put("sensor2", 25.8);
-
-        Measurement measurement = new Measurement(tags, fields);
-        return new MetricResult("script_sensors", measurement);
-    }
-
-}
-
-
-
--- a/client/doc/scripts/README.md
+++ b/client/doc/scripts/README.md
@ -1,3 +0,0 @@
-# Example Scripts
-
-TODO.
--- a/client/doc/sysmon-client.service
+++ b/client/doc/sysmon-client.service
@ -1,12 +1,11 @@
 [Unit]
-Description=Sysmon Client
+Description=Sysmon Client Service

 [Service]
 #User=nobody
 #Group=nobody
 TimeoutSec=20
 Restart=on-failure
-# BELOW: Specify sysmon-server URL, add '-n hostname' if needed
 ExecStart=/opt/sysmon/client/bin/client -s http://10.20.30.40:9925/metrics

 [Install]
--- a/client/doc/sysmon-client.sh
+++ b/client/doc/sysmon-client.sh
@ -11,28 +11,20 @@

 dir="/opt/sysmon/client"
 cmd="/opt/sysmon/client/bin/client"
-args="-s http://10.20.30.40:9925/metrics"   # <- HERE: Specify sysmon-server URL, add '-n hostname' if needed
+args="-s http://10.20.30.40:9925/metrics"
 user=""

-name="sysmon-client"
+name=`basename $0`
 pid_file="/var/run/$name.pid"
 stdout_log="/var/log/$name.log"
 stderr_log="/var/log/$name.err"

-# Java 8+ runtime required - Uncomment and export JAVA_HOME if needed
-#JAVA_HOME=/usr/java8_64
-#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() {
    cat "$pid_file"
 }

 is_running() {
-    [ -f "$pid_file" ] && ps -p $(get_pid) > /dev/null 2>&1
+    [ -f "$pid_file" ] && ps -p `get_pid` > /dev/null 2>&1
 }

 case "$1" in
@ -41,7 +33,7 @@ case "$1" in
        echo "Already started"
    else
        echo "Starting $name"
-        cd "$dir" || exit 1
+        cd "$dir"
        if [ -z "$user" ]; then
            $cmd $args >> "$stdout_log" 2>> "$stderr_log" &
        else
@ -56,14 +48,16 @@ case "$1" in
    ;;
    stop)
    if is_running; then
-        echo "Stopping $name.."
-        kill $(get_pid)
+        echo -n "Stopping $name.."
+        kill `get_pid`
        for i in 1 2 3 4 5 6 7 8 9 10
        # for i in `seq 10`
        do
            if ! is_running; then
                break
            fi
+
+            echo -n "."
            sleep 1
        done
        echo
--- a/client/doc/sysmon-client.toml
+++ b/client/doc/sysmon-client.toml
@ -1,32 +1,19 @@
 ###
 ### Sysmon Client
 ###
-### Example configuration with some default values.
+### Example configuration with default values.
 ###

-# Local path for Groovy scripts
-scripts = "/opt/sysmon/scripts"
-
-[extension.base_info]
-enabled = true
-interval = '60m'
-
 [extension.base_disk]
 enabled = true
-interval = '10s'

 [extension.base_filesystem]
 enabled = true
-interval = '10s'
 exclude_type = [ "tmpfs", "ahafs" ]
 exclude_mount = [ "/boot/efi" ]

 [extension.base_process]
 enabled = true
-interval = '5m'
-include = [
-    "java", "node", "httpd", "mongod", "mysqld",
-    "postgres", "influxd", "haproxy", "beam.smp",
-    "filebeat", "corosync", "rsyslogd", "memcached",
-    "db2sysc", "dsmserv", "mmfsd",
-]
+include = [ "java", "mysqld", "postgres", "influxd" ]
+
+
--- a/client/doc/systemd.md
+++ b/client/doc/systemd.md
@ -1,4 +1,4 @@
-# Linux systemd notes
+# SystemD Notes

 Edit the *sysmon-client.service* file and change the sysmon-server URL accordingly to your environment.

@ -9,4 +9,4 @@ cp sysmon-client.service /etc/systemd/system/
 systemctl daemon-reload
 systemctl enable sysmon-client
 systemctl restart sysmon-client
-```
+```
--- a/client/doc/sysv-init.md
+++ b/client/doc/sysv-init.md
@ -1,18 +1,6 @@
 # SysV init Notes

 - Copy the *sysmon-client.sh* into *sysmon-client* in the correct location for init scripts on your operating system.
- Edit the file and specify the sysmon-server URL in the *args* variable.
- Edit the file and uncomment *JAVA_HOME* if required
+- Edit the file to specify sysmon-server URL in the *args* variable.
 - SymLink to the required run-levels.

-
-## AIX & VIO
-
-```shell
-# Remember to edit and set JAVA_HOME to eg. /usr/java8_64
-cp sysmon-client.sh /etc/rc.d/init.d/sysmon-client
-chmod +x /etc/rc.d/init.d/sysmon-client
-ln -s /etc/rc.d/init.d/sysmon-client /etc/rc.d/rc2.d/Ssysmon-client
-ln -s /etc/rc.d/init.d/sysmon-client /etc/rc.d/rc2.d/Ksysmon-client
-```
-
--- a/client/src/main/java/sysmon/client/Application.java
+++ b/client/src/main/java/sysmon/client/Application.java
@ -4,7 +4,7 @@
 package sysmon.client;

 import org.apache.camel.main.Main;
-import org.slf4j.simple.SimpleLogger;
+import org.slf4j.impl.SimpleLogger;
 import picocli.CommandLine;

 import java.io.File;
@ -85,7 +85,7 @@ public class Application implements Callable<Integer> {
            try {
                configuration.parse(configurationFile.toPath());
            } catch (Exception e) {
-                System.err.println("Could not parse configuration file: " + e.getMessage());
+                System.err.println(e.getMessage());
                return 1;
            }
        }
--- a/client/src/main/java/sysmon/client/ClientRouteBuilder.java
+++ b/client/src/main/java/sysmon/client/ClientRouteBuilder.java
@ -14,39 +14,32 @@ import sysmon.shared.ComboResult;
 import sysmon.shared.MetricExtension;
 import sysmon.shared.MetricResult;

-import javax.script.*;
-import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;

 public class ClientRouteBuilder extends RouteBuilder {

    private static final Logger log = LoggerFactory.getLogger(ClientRouteBuilder.class);

-    private final Set<String> scriptFiles = new HashSet<>();
-
-
    @Override
    public void configure() {

        Registry registry = getContext().getRegistry();
        Configuration configuration = (Configuration) registry.lookupByName("configuration");

-        Path[] pluginPaths = { Paths.get(registry.lookupByNameAndType("pluginPath", String.class)) };
-        PluginManager pluginManager = new JarPluginManager(pluginPaths);
+        Path[] pluginpaths = { Paths.get(registry.lookupByNameAndType("pluginPath", String.class)) };
+        PluginManager pluginManager = new JarPluginManager(pluginpaths);
        pluginManager.loadPlugins();
        pluginManager.startPlugins();

+        List<String> providers = new ArrayList<>();
        List<MetricExtension> metricExtensions = pluginManager.getExtensions(MetricExtension.class);
        for (MetricExtension ext : metricExtensions) {
+
            final String name = ext.getName();
+            final String provides = ext.getProvides();

            // Load configuration if available
            if(configuration.isForExtension(name)) {
@ -55,14 +48,36 @@ public class ClientRouteBuilder extends RouteBuilder {
            }

            if(ext.isSupported() && ext.isEnabled()) {
-                addExtensionRoute(ext);
+
+                // Check that another extension has not already been loaded - TODO: Is this required ?
+                if(providers.contains(provides)) {
+                    log.warn("Skipping extension (already provided): " + ext.getName());
+                    continue;
+                }
+
+                log.info("Enabling extension: " + ext.getDescription());
+                providers.add(provides);
+
+                // Setup Camel route for this extension
+                // a unique timer name gives the timer it's own thread, otherwise it's a shared thread for other timers with same name.
+                String timerName = ext.isThreaded() ? ext.getProvides() : "default";
+                from("timer:"+timerName+"?fixedRate=true&period=30s")
+                        .bean(ext, "getMetrics")
+                        .outputType(MetricResult.class)
+                        .process(new MetricEnrichProcessor(registry))
+                        .choice().when(exchangeProperty("skip").isEqualTo(true))
+                            .log(LoggingLevel.WARN,"Skipping empty measurement.")
+                            .stop()
+                        .otherwise()
+                            .log("${body}")
+                            .to("seda:metrics?discardWhenFull=true");
            } else {
                log.info("Skipping extension (not supported or disabled): " + ext.getDescription());
            }
+
        }

        from("seda:metrics?purgeWhenStopping=true")
-                .routeId("aggregation")
                .aggregate(constant(true), AggregationStrategies.beanAllowNull(ComboAppender.class, "append"))
                .completionTimeout(5000L)
                .doTry()
@ -73,7 +88,6 @@ public class ClientRouteBuilder extends RouteBuilder {
                .end();

        from("seda:outbound?purgeWhenStopping=true")
-                .routeId("outbound")
                .setHeader(Exchange.HTTP_METHOD, constant("POST"))
                .doTry()
                    .marshal(new JacksonDataFormat(ComboResult.class))
@ -83,99 +97,7 @@ public class ClientRouteBuilder extends RouteBuilder {
                    .log(LoggingLevel.WARN,"Error: ${exception.message}.")
                .end();

-        // Find all local scripts
-        String scriptsPath = configuration.getScriptPath();
-        if(scriptsPath != null && Files.isDirectory(Paths.get(scriptsPath))) {
-            try {
-                scriptFiles.addAll(listFilesByExtension(scriptsPath, "groovy"));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        // Enable the local scripts
-        for (String scriptFile : scriptFiles) {
-            try {
-                ScriptWrapper scriptWrapper = new ScriptWrapper(scriptsPath, scriptFile);
-                addScriptRoute(scriptWrapper);
-            } catch(Exception e) {
-                log.error("configure() - script error: {}", e.getMessage());
-            }
-        }
-
    }


-    void addScriptRoute(ScriptWrapper script) {
-        Registry registry = getContext().getRegistry();
-
-        from("timer:scripts?fixedRate=true&period=30s")
-            .routeId(script.toString())
-            .bean(script, "run")
-            .outputType(MetricResult.class)
-            .process(new MetricEnrichProcessor(registry))
-            .choice().when(exchangeProperty("skip").isEqualTo(true))
-            .log(LoggingLevel.WARN, "Skipping empty measurement.")
-            .stop()
-            .otherwise()
-            .log("${body}")
-            .to("seda:metrics?discardWhenFull=true");
-    }
-
-
-    void addExtensionRoute(MetricExtension ext) {
-
-        Registry registry = getContext().getRegistry();
-
-        // Setup Camel route for this extension
-        // a unique timer name gives the timer it's own thread, otherwise it's a shared thread for other timers with same name.
-        String timerName = ext.isThreaded() ? ext.getName() : "default";
-        String timerInterval = (ext.getInterval() != null) ? ext.getInterval() : "30s";
-        from("timer:" + timerName + "?fixedRate=true&period=" + timerInterval)
-            .routeId(ext.getName())
-            .bean(ext, "getMetrics")
-            .outputType(MetricResult.class)
-            .process(new MetricEnrichProcessor(registry))
-            .choice().when(exchangeProperty("skip").isEqualTo(true))
-            .log(LoggingLevel.WARN, "Skipping empty measurement.")
-            .stop()
-            .otherwise()
-            .log("${body}")
-            .to("seda:metrics?discardWhenFull=true");
-    }
-
-
-    List<String> findScripts(String location) {
-        log.info("Looking for scripts in: {}", location);
-        List<String> scripts = new ArrayList<>();
-        ScriptEngineManager manager = new ScriptEngineManager();
-        List<ScriptEngineFactory> factoryList = manager.getEngineFactories();
-        for (ScriptEngineFactory factory : factoryList) {
-            log.info("findScripts() - Supporting: {}", factory.getLanguageName());
-            for(String ex : factory.getExtensions()) {
-                log.info("findScripts() - Extension: {}", ex);
-                try {
-                    scripts.addAll(listFilesByExtension(location, ex));
-                    log.warn(scripts.toString());
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-
-            }
-        }
-        return scripts;
-    }
-
-
-    Set<String> listFilesByExtension(String dir, String ext) throws IOException {
-        try (Stream<Path> stream = Files.list(Paths.get(dir))) {
-            return stream
-                .filter(file -> !Files.isDirectory(file))
-                .map(Path::getFileName)
-                .map(Path::toString)
-                .filter(s -> s.endsWith(ext))
-                .collect(Collectors.toSet());
-        }
-    }
-
 }
--- a/client/src/main/java/sysmon/client/Configuration.java
+++ b/client/src/main/java/sysmon/client/Configuration.java
@ -56,8 +56,6 @@ public final class Configuration {
                map.put(k, table.getDouble(k));
            } else if(table.isArray(k)) {
                map.put(k, Objects.requireNonNull(table.getArray(k)).toList());
-            } else if(table.isTable(k)) {
-                map.put(k, table.getTable(k));
            }

        });
@ -65,14 +63,4 @@ public final class Configuration {
        return map;
    }

-
-    String getScriptPath() {
-        if(result == null) {
-            log.debug("No configuration file loaded ...");
-            return null;
-        }
-        return result.getString("scripts");
-    }
-
-
-}
+}
--- a/client/src/main/java/sysmon/client/ListOfResultsStrategy.java
+++ b/client/src/main/java/sysmon/client/ListOfResultsStrategy.java
@ -10,5 +10,4 @@ public class ListOfResultsStrategy extends AbstractListAggregationStrategy<Metri
    public MetricResult getValue(Exchange exchange) {
        return exchange.getIn().getBody(MetricResult.class);
    }
-
-}
+}
--- 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);
    }

-}
+}
--- a/client/src/main/java/sysmon/client/ScriptWrapper.java
+++ b/client/src/main/java/sysmon/client/ScriptWrapper.java
@ -1,47 +0,0 @@
-package sysmon.client;
-
-import groovy.lang.GroovyClassLoader;
-import groovy.lang.GroovyObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sysmon.shared.MetricResult;
-import sysmon.shared.MetricScript;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-
-public class ScriptWrapper {
-
-    private static final Logger log = LoggerFactory.getLogger(ScriptWrapper.class);
-
-    private final static GroovyClassLoader loader = new GroovyClassLoader();
-
-    private GroovyObject script;
-    private final String name;
-
-    public ScriptWrapper(String scriptPath, String scriptFile) {
-        name = scriptFile;
-        try {
-            Class<?> scriptClass = loader.parseClass(new File(scriptPath, scriptFile));
-            script = (GroovyObject) scriptClass.getDeclaredConstructor().newInstance();
-        } catch (IOException |InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) {
-            log.error("ScriptWrapper() - error: {}", e.getMessage());
-        }
-    }
-
-
-    MetricResult run() {
-        MetricResult result = null;
-        if (script != null && script instanceof MetricScript) {
-            result = (MetricResult) script.invokeMethod("getMetrics", null);
-        }
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-
-}
--- a/client/src/main/resources/application.properties
+++ b/client/src/main/resources/application.properties
@ -15,7 +15,21 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------

+# to configure camel main
+# here you can configure options on camel main (see MainConfigurationProperties class)
 camel.main.name = sysmon-client
-camel.main.jmxEnabled = false
+
+# enable tracing
+#camel.main.tracing = true
+
+# bean introspection to log reflection based configuration
+#camel.main.beanIntrospectionExtendedStatistics=true
+#camel.main.beanIntrospectionLoggingLevel=INFO
+
+# run in lightweight mode to be tiny as possible
 camel.main.lightweight = true
-camel.component.seda.queue-size = 100
+# and eager load classes
+#camel.main.eager-classloading = true
+
+# limit the seda queue size
+camel.component.seda.queue-size=10
--- a/Overview-1634225578630.json
+++ b/Overview-1634225578630.json
--- a/Explorer-1632317613366.json
+++ b/Explorer-1632317613366.json
@ -1,21 +1,20 @@
 {
  "__inputs": [
    {
-      "name": "DS_SYSMON",
-      "label": "Database",
+      "name": "DS_INFLUXDB-SYSMON",
+      "label": "InfluxDB-sysmon",
      "description": "",
      "type": "datasource",
      "pluginId": "influxdb",
      "pluginName": "InfluxDB"
    }
  ],
-  "__elements": {},
  "__requires": [
    {
      "type": "grafana",
      "id": "grafana",
      "name": "Grafana",
-      "version": "9.1.6"
+      "version": "8.1.4"
    },
    {
      "type": "datasource",
@ -52,10 +51,7 @@
    "list": [
      {
        "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "uid": "grafana"
-        },
+        "datasource": "-- Grafana --",
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
@ -70,19 +66,16 @@
      }
    ]
  },
-  "description": "https://git.data.coop/nellemann/sysmon/ - Metrics from within host / guest / partition.",
+  "description": "Metrics from within host / guest / partition.",
  "editable": true,
-  "fiscalYearStartMonth": 0,
+  "gnetId": null,
  "graphTooltip": 0,
  "id": null,
+  "iteration": 1632317604857,
  "links": [],
-  "liveNow": false,
  "panels": [
    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
+      "datasource": null,
      "gridPos": {
        "h": 3,
        "w": 24,
@ -91,28 +84,16 @@
      },
      "id": 30,
      "options": {
-        "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           ",
+        "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": "9.1.6",
-      "targets": [
-        {
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
-          "refId": "A"
-        }
-      ],
+      "pluginVersion": "8.1.4",
      "transparent": true,
      "type": "text"
    },
    {
      "collapsed": false,
-      "datasource": {
-        "type": "influxdb",
-        "uid": "5KYZifB7z"
-      },
+      "datasource": null,
      "gridPos": {
        "h": 1,
        "w": 24,
@ -122,23 +103,11 @@
      "id": 4,
      "panels": [],
      "repeat": "hostname",
-      "targets": [
-        {
-          "datasource": {
-            "type": "influxdb",
-            "uid": "5KYZifB7z"
-          },
-          "refId": "A"
-        }
-      ],
      "title": "${hostname}",
      "type": "row"
    },
    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
+      "datasource": "${DS_INFLUXDB-SYSMON}",
      "description": "",
      "fieldConfig": {
        "defaults": {
@ -147,8 +116,7 @@
          },
          "custom": {
            "align": "left",
-            "displayMode": "auto",
-            "inspect": false
+            "displayMode": "auto"
          },
          "mappings": [],
          "thresholds": {
@ -172,23 +140,12 @@
      },
      "id": 16,
      "options": {
-        "footer": {
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
        "showHeader": true,
        "sortBy": []
      },
-      "pluginVersion": "9.1.6",
+      "pluginVersion": "8.1.4",
      "targets": [
        {
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
          "groupBy": [
            {
              "params": [
@ -279,14 +236,13 @@
          ]
        }
      ],
+      "timeFrom": null,
+      "timeShift": null,
      "title": "Details",
      "type": "table"
    },
    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
+      "datasource": "${DS_INFLUXDB-SYSMON}",
      "fieldConfig": {
        "defaults": {
          "color": {
@ -353,13 +309,9 @@
        "text": {},
        "textMode": "auto"
      },
-      "pluginVersion": "9.1.6",
+      "pluginVersion": "8.1.4",
      "targets": [
        {
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
          "groupBy": [
            {
              "params": [
@ -369,7 +321,7 @@
            },
            {
              "params": [
-                "null"
+                "linear"
              ],
              "type": "fill"
            }
@ -438,14 +390,13 @@
          ]
        }
      ],
+      "timeFrom": null,
+      "timeShift": null,
      "title": "Memory Metrics",
      "type": "stat"
    },
    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
+      "datasource": "${DS_INFLUXDB-SYSMON}",
      "fieldConfig": {
        "defaults": {
          "color": {
@ -512,13 +463,9 @@
        "text": {},
        "textMode": "auto"
      },
-      "pluginVersion": "9.1.6",
+      "pluginVersion": "8.1.4",
      "targets": [
        {
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
          "groupBy": [
            {
              "params": [
@ -528,7 +475,7 @@
            },
            {
              "params": [
-                "null"
+                "previous"
              ],
              "type": "fill"
            }
@ -597,14 +544,13 @@
          ]
        }
      ],
+      "timeFrom": null,
+      "timeShift": null,
      "title": "Disk Metrics",
      "type": "stat"
    },
    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
+      "datasource": "${DS_INFLUXDB-SYSMON}",
      "description": "",
      "fieldConfig": {
        "defaults": {
@ -612,8 +558,6 @@
            "mode": "palette-classic"
          },
          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@ -666,22 +610,16 @@
        "legend": {
          "calcs": [],
          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
        },
        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
+          "mode": "multi"
        }
      },
      "pluginVersion": "8.0.6",
      "targets": [
        {
          "alias": "$col",
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
          "groupBy": [
            {
              "params": [
@ -697,7 +635,7 @@
            },
            {
              "params": [
-                "none"
+                "null"
              ],
              "type": "fill"
            }
@ -722,10 +660,8 @@
                "type": "sum"
              },
              {
-                "params": [
-                  "$__interval"
-                ],
-                "type": "non_negative_derivative"
+                "params": [],
+                "type": "non_negative_difference"
              },
              {
                "params": [
@ -746,10 +682,8 @@
                "type": "sum"
              },
              {
-                "params": [
-                  "$__interval"
-                ],
-                "type": "non_negative_derivative"
+                "params": [],
+                "type": "non_negative_difference"
              },
              {
                "params": [
@ -784,10 +718,7 @@
      "type": "timeseries"
    },
    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
+      "datasource": "${DS_INFLUXDB-SYSMON}",
      "description": "",
      "fieldConfig": {
        "defaults": {
@ -795,8 +726,6 @@
            "mode": "palette-classic"
          },
          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@ -856,22 +785,16 @@
        "legend": {
          "calcs": [],
          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
+          "placement": "bottom"
        },
        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
+          "mode": "multi"
        }
      },
      "pluginVersion": "8.0.6",
      "targets": [
        {
          "alias": "$col",
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
          "groupBy": [
            {
              "params": [
@ -963,20 +886,18 @@
    }
  ],
  "refresh": "1m",
-  "schemaVersion": 37,
+  "schemaVersion": 30,
  "style": "dark",
-  "tags": [
-    "sysmon"
-  ],
+  "tags": [],
  "templating": {
    "list": [
      {
+        "allValue": null,
        "current": {},
-        "datasource": {
-          "type": "influxdb",
-          "uid": "${DS_SYSMON}"
-        },
+        "datasource": "${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",
@ -994,12 +915,12 @@
        "useTags": false
      },
      {
+        "allValue": null,
        "current": {},
-        "datasource": {
-          "type": "influxdb",
-          "uid": "${DS_SYSMON}"
-        },
+        "datasource": "${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",
@ -1014,12 +935,12 @@
        "type": "query"
      },
      {
+        "allValue": null,
        "current": {},
-        "datasource": {
-          "type": "influxdb",
-          "uid": "${DS_SYSMON}"
-        },
+        "datasource": "${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",
@ -1055,6 +976,5 @@
  "timezone": "",
  "title": "Sysmon - Process Explorer",
  "uid": "Vjut5mS7k",
-  "version": 5,
-  "weekStart": ""
-}
+  "version": 18
+}
--- a/doc/dashboards/Sysmon
+++ b/doc/dashboards/Sysmon
@ -1,738 +0,0 @@
-{
-  "__inputs": [
-    {
-      "name": "DS_SYSMON",
-      "label": "Database",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "influxdb",
-      "pluginName": "InfluxDB"
-    }
-  ],
-  "__elements": {},
-  "__requires": [
-    {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "9.1.6"
-    },
-    {
-      "type": "datasource",
-      "id": "influxdb",
-      "name": "InfluxDB",
-      "version": "1.0.0"
-    },
-    {
-      "type": "panel",
-      "id": "text",
-      "name": "Text",
-      "version": ""
-    },
-    {
-      "type": "panel",
-      "id": "timeseries",
-      "name": "Time series",
-      "version": ""
-    }
-  ],
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "uid": "grafana"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "https://git.data.coop/nellemann/sysmon/ - Metrics from sysmon agent.",
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "id": null,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 28,
-      "options": {
-        "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",
-      "targets": [
-        {
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
-          "refId": "A"
-        }
-      ],
-      "transparent": true,
-      "type": "text"
-    },
-    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
-      "description": "Load average as reported by OS.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "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": "auto",
-            "spanNulls": 3600000,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 13,
-        "w": 12,
-        "x": 0,
-        "y": 3
-      },
-      "id": 2,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "desc"
-        }
-      },
-      "pluginVersion": "9.1.3",
-      "targets": [
-        {
-          "alias": "$tag_hostname - $col",
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
-          "groupBy": [
-            {
-              "params": [
-                "$__interval"
-              ],
-              "type": "time"
-            },
-            {
-              "params": [
-                "hostname"
-              ],
-              "type": "tag"
-            },
-            {
-              "params": [
-                "none"
-              ],
-              "type": "fill"
-            }
-          ],
-          "measurement": "base_load",
-          "orderByTime": "ASC",
-          "policy": "default",
-          "refId": "A",
-          "resultFormat": "time_series",
-          "select": [
-            [
-              {
-                "params": [
-                  "5min"
-                ],
-                "type": "field"
-              },
-              {
-                "params": [],
-                "type": "mean"
-              },
-              {
-                "params": [
-                  10
-                ],
-                "type": "moving_average"
-              },
-              {
-                "params": [
-                  "5min"
-                ],
-                "type": "alias"
-              }
-            ]
-          ],
-          "tags": [
-            {
-              "key": "hostname",
-              "operator": "=~",
-              "value": "/^$hostname$/"
-            }
-          ]
-        }
-      ],
-      "title": "System Load Average",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
-      "description": "Shows the number of physical processors consumed.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": 3600000,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "short"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 13,
-        "w": 12,
-        "x": 12,
-        "y": 3
-      },
-      "id": 17,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "desc"
-        }
-      },
-      "pluginVersion": "9.1.3",
-      "targets": [
-        {
-          "alias": "$tag_hostname",
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
-          "groupBy": [
-            {
-              "params": [
-                "$__interval"
-              ],
-              "type": "time"
-            },
-            {
-              "params": [
-                "hostname"
-              ],
-              "type": "tag"
-            },
-            {
-              "params": [
-                "none"
-              ],
-              "type": "fill"
-            }
-          ],
-          "measurement": "power_processor",
-          "orderByTime": "ASC",
-          "policy": "default",
-          "refId": "A",
-          "resultFormat": "time_series",
-          "select": [
-            [
-              {
-                "params": [
-                  "physc"
-                ],
-                "type": "field"
-              },
-              {
-                "params": [],
-                "type": "mean"
-              },
-              {
-                "params": [
-                  10
-                ],
-                "type": "moving_average"
-              }
-            ]
-          ],
-          "tags": [
-            {
-              "key": "hostname",
-              "operator": "=~",
-              "value": "/^$hostname$/"
-            }
-          ]
-        }
-      ],
-      "title": "Power - Shared Processors - Physical Cores Consumed",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
-      "description": "Percentage of the entitled capacity consumed.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": 3600000,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 14,
-        "w": 12,
-        "x": 0,
-        "y": 16
-      },
-      "id": 30,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "desc"
-        }
-      },
-      "pluginVersion": "9.1.3",
-      "targets": [
-        {
-          "alias": "$tag_hostname",
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
-          "groupBy": [
-            {
-              "params": [
-                "$__interval"
-              ],
-              "type": "time"
-            },
-            {
-              "params": [
-                "hostname"
-              ],
-              "type": "tag"
-            },
-            {
-              "params": [
-                "none"
-              ],
-              "type": "fill"
-            }
-          ],
-          "measurement": "power_processor",
-          "orderByTime": "ASC",
-          "policy": "default",
-          "refId": "A",
-          "resultFormat": "time_series",
-          "select": [
-            [
-              {
-                "params": [
-                  "entc"
-                ],
-                "type": "field"
-              },
-              {
-                "params": [],
-                "type": "mean"
-              },
-              {
-                "params": [
-                  10
-                ],
-                "type": "moving_average"
-              }
-            ]
-          ],
-          "tags": [
-            {
-              "key": "hostname",
-              "operator": "=~",
-              "value": "/^$hostname$/"
-            }
-          ]
-        }
-      ],
-      "title": "Power - Shared Processors - Entitled Capacity Consumed",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "influxdb",
-        "uid": "${DS_SYSMON}"
-      },
-      "description": "Percentage of logical  processor(s)  utilization",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "axisSoftMin": 0,
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": 3600000,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 14,
-        "w": 12,
-        "x": 12,
-        "y": 16
-      },
-      "id": 31,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "desc"
-        }
-      },
-      "pluginVersion": "9.1.3",
-      "targets": [
-        {
-          "alias": "$tag_hostname",
-          "datasource": {
-            "type": "influxdb",
-            "uid": "${DS_SYSMON}"
-          },
-          "groupBy": [
-            {
-              "params": [
-                "$__interval"
-              ],
-              "type": "time"
-            },
-            {
-              "params": [
-                "hostname"
-              ],
-              "type": "tag"
-            },
-            {
-              "params": [
-                "none"
-              ],
-              "type": "fill"
-            }
-          ],
-          "measurement": "power_processor",
-          "orderByTime": "ASC",
-          "policy": "default",
-          "refId": "A",
-          "resultFormat": "time_series",
-          "select": [
-            [
-              {
-                "params": [
-                  "lbusy"
-                ],
-                "type": "field"
-              },
-              {
-                "params": [],
-                "type": "mean"
-              },
-              {
-                "params": [
-                  10
-                ],
-                "type": "moving_average"
-              }
-            ]
-          ],
-          "tags": [
-            {
-              "key": "hostname",
-              "operator": "=~",
-              "value": "/^$hostname$/"
-            }
-          ]
-        }
-      ],
-      "title": "Power - Shared Processors - Logical Processor Utilization",
-      "type": "timeseries"
-    }
-  ],
-  "refresh": "30s",
-  "schemaVersion": 37,
-  "style": "dark",
-  "tags": [
-    "sysmon",
-    "Power"
-  ],
-  "templating": {
-    "list": [
-      {
-        "current": {},
-        "datasource": {
-          "type": "influxdb",
-          "uid": "${DS_SYSMON}"
-        },
-        "definition": "SHOW TAG VALUES FROM \"power_processor\" WITH KEY = \"hostname\" WHERE time > now() - 60m",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Host",
-        "multi": true,
-        "name": "hostname",
-        "options": [],
-        "query": "SHOW TAG VALUES FROM \"power_processor\" WITH KEY = \"hostname\" WHERE time > now() - 60m",
-        "refresh": 2,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 5,
-        "tagValuesQuery": "",
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
-  },
-  "time": {
-    "from": "now-7d",
-    "to": "now-10s"
-  },
-  "timepicker": {
-    "nowDelay": "10s",
-    "refresh_intervals": [
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ]
-  },
-  "timezone": "",
-  "title": "Sysmon - IBM Power",
-  "uid": "3zPCIbN4z",
-  "version": 7,
-  "weekStart": ""
-}
--- a/doc/screenshots/sysmon1.png
+++ b/doc/screenshots/sysmon1.png
--- a/doc/screenshots/sysmon2.png
+++ b/doc/screenshots/sysmon2.png
--- a/doc/sysmon.drawio
+++ b/doc/sysmon.drawio
@ -1,52 +1 @@
-<mxfile host="65bd71144e" scale="1" border="15">
-    <diagram id="JBJC25AnoTCSJF4dnfuA" name="Page-1">
-        <mxGraphModel dx="1761" dy="1167" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
-            <root>
-                <mxCell id="0"/>
-                <mxCell id="1" parent="0"/>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-1" value="Linux" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
-                    <mxGeometry x="250" y="50" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-2" value="AIX" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
-                    <mxGeometry x="180" y="140" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-6" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;sketch=1;" parent="1" source="n2YpyNFSe_BwzrgFeqL7-3" target="n2YpyNFSe_BwzrgFeqL7-4" edge="1">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-3" value="Sysmon Server" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1">
-                    <mxGeometry x="510" y="120" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-7" style="edgeStyle=orthogonalEdgeStyle;rounded=1;orthogonalLoop=1;jettySize=auto;html=1;sketch=1;" parent="1" source="n2YpyNFSe_BwzrgFeqL7-4" target="n2YpyNFSe_BwzrgFeqL7-5" edge="1">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-4" value="InfluxDB&lt;br&gt;ver 1.x" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;sketch=1;fillColor=#ffe6cc;strokeColor=#d79b00;" parent="1" vertex="1">
-                    <mxGeometry x="690" y="110" width="60" height="80" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-5" value="Grafana&lt;br&gt;Dashboards &amp;amp; Alerting" style="shape=document;whiteSpace=wrap;html=1;boundedLbl=1;sketch=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1">
-                    <mxGeometry x="800" y="110" width="120" height="80" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-8" value="Other OS'es" style="rounded=1;whiteSpace=wrap;html=1;sketch=1;fillColor=#f5f5f5;fontColor=#333333;strokeColor=#666666;" parent="1" vertex="1">
-                    <mxGeometry x="310" y="210" width="120" height="60" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-17" style="edgeStyle=orthogonalEdgeStyle;rounded=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="n2YpyNFSe_BwzrgFeqL7-9" target="n2YpyNFSe_BwzrgFeqL7-3" edge="1">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-9" value="Agent" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;sketch=1;" parent="1" vertex="1">
-                    <mxGeometry x="320" y="90" width="50" height="20" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-15" style="edgeStyle=orthogonalEdgeStyle;rounded=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="n2YpyNFSe_BwzrgFeqL7-10" target="n2YpyNFSe_BwzrgFeqL7-3" edge="1">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-10" value="Agent" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;sketch=1;" parent="1" vertex="1">
-                    <mxGeometry x="250" y="180" width="50" height="20" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-16" style="edgeStyle=orthogonalEdgeStyle;rounded=1;sketch=1;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="n2YpyNFSe_BwzrgFeqL7-11" target="n2YpyNFSe_BwzrgFeqL7-3" edge="1">
-                    <mxGeometry relative="1" as="geometry"/>
-                </mxCell>
-                <mxCell id="n2YpyNFSe_BwzrgFeqL7-11" value="Agent" style="rounded=1;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;sketch=1;" parent="1" vertex="1">
-                    <mxGeometry x="380" y="250" width="50" height="20" as="geometry"/>
-                </mxCell>
-            </root>
-        </mxGraphModel>
-    </diagram>
-</mxfile>
+<mxfile host="Electron" modified="2022-02-16T10:59:18.347Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/16.5.1 Chrome/96.0.4664.110 Electron/16.0.7 Safari/537.36" etag="7br3EGAmvduaKIlR3_Vo" version="16.5.1" type="device"><diagram id="JBJC25AnoTCSJF4dnfuA" name="Page-1">3VjLctowFP0aLzuDJfxaBpK0maHNgkXbVUdY149GtlxZDtCvr4RlwNgQUmDIAAwjnSvJ8jlHurYsPM4WnwUpkq+cArPQgC4sfG8hZA8RsvRvQJc14nu4BmKRUtNoA0zTv2DAgUGrlELZaig5ZzIt2mDI8xxC2cKIEHzebhZx1r5qQWLoANOQsC76PaUyMajtBpvAF0jjxFzaR14dyEjT2NxJmRDK51sQfrDwWHAu61K2GAPT5DW81P0e90TXExOQy2M65Ohnsfz2OIVfo/lfET/Cn4n3yYzySlhlbniS5tXCzFguGxoEr3IKeiTbwqN5kkqYFiTU0bkSXmGJzJgJly8gw8RUopSxMWdcrAbCkaO/Gue53MLrj+4sBX+BrYi7+qiImSoICYu9HNhrZpUlgWcgxVI1MR2QY8Qwbmyq8y1pG72SLVVdgxHjpng98oZwVTCcv4N/1OH/7unHrbJv+2327eG16Xc7VANVy99UuZAJj3lO2MMGHbXF2LSZcF4Y8DdIuTR7GakkPyBQPQF91cOkqknySoRw4GbMxiqJiEEeaDfsF0kAIzJ9bc/j7IzjjuGnyzLjucKmIJS9Lmd+sKkDXp/JA9fD5Ewmd+wdk6Nrm9y7JZMPjzS5c02TDzsmf8ojVi3uRx0p1FNBoYvhkqWKcYHf9vis1mYyWwMkfIlXij1XUg0DjQa1OLbzVlaIwA3DvoVBvWA2GJxnYbjBzsKwuwvD7VkX/qXWhdNRST3DRiQnFnKZ1LyqzciNdemelMmME0FLSy9dl2Rak/pfIXdMEZPm8V51KQ+rbMXTu8U9LFyE9gjnzlznTDuaP3hbuN4d7WLK+R3lnmUCorzVBye8k1PQsQpcLKfYpyeVFt3/kWHOmFSCI5MKvmZSCTqmv4v1nZ7k+R2bUwJ+1LuhuKEPs6g/sZ/mbdT2dtC1ttPjbHQxZzu35Oxmo/jY1m5meWve3j1uWL8AX83cp7/wfiRzNweCH9vc3TO2mzA33jnN6TtMO5O5VXVzTrqKbZ0244d/</diagram></mxfile>
--- a/doc/sysmon.png
+++ b/doc/sysmon.png
--- a/gradle.properties
+++ b/gradle.properties
@ -1,9 +1,7 @@
-version         = 1.1.4
-pf4jVersion     = 3.9.0
-slf4jVersion    = 2.0.9
-camelVersion    = 3.14.9
-groovyVersion   = 3.0.18
-picocliVersion  = 4.7.5
-oshiVersion     = 6.4.7
-spockVersion    = 2.3-groovy-3.0
-tomljVersion    = 1.1.0
+version         = 0.1.12
+pf4jVersion     = 3.6.0
+slf4jVersion    = 1.7.36
+camelVersion    = 3.14.2
+groovyVersion   = 3.0.10
+picocliVersion  = 4.6.3
+oshiVersion     = 6.1.5
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/18
+++ b/18
@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@ -80,11 +80,11 @@ do
    esac
 done

-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

@ -143,16 +143,12 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
    case $MAX_FD in  #(
      '' | soft) :;; #(
      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@ -209,12 +205,6 @@ set -- \
        org.gradle.wrapper.GradleWrapperMain \
        "$@"

-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
--- a/gradlew.bat
+++ b/gradlew.bat
@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/plugins/README.md
+++ b/plugins/README.md
@ -2,5 +2,6 @@

 Collection of standard sysmon plugins for use with the client.

- [base](base/README.md) - Base OS metrics (uses [oshi](https://github.com/oshi/oshi))
- [power](power/README.md) - IBM Power specific metrics
+- [base](os-base/) - Base OS metrics (through [oshi](https://github.com/oshi/oshi))
+- [aix](os-aix/) - AIX (and Power) specific metrics
+- [linux](os-linux/) - Linux specific metrics 
--- a/plugins/build.gradle
+++ b/plugins/build.gradle
@ -1,7 +1,7 @@
 import org.redline_rpm.header.Os

 plugins {
-    id "com.netflix.nebula.ospackage" version "11.3.0"
+    id "nebula.ospackage" version "9.1.1"
 }


@ -10,7 +10,7 @@ subprojects {
    apply plugin: 'groovy'

    dependencies {
-        testImplementation "org.spockframework:spock-core:${spockVersion}"
+        testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
        testImplementation "org.slf4j:slf4j-api:${slf4jVersion}"
        testImplementation "org.slf4j:slf4j-simple:${slf4jVersion}"
        testImplementation project(':shared')
@ -82,6 +82,7 @@ tasks.clean.dependsOn(tasks.customCleanUp)
 def projectName = "sysmon-plugins"


+apply plugin: 'nebula.ospackage'
 ospackage {
    packageName = projectName
    release = '1'
@ -110,12 +111,3 @@ task buildRpmAix(type: Rpm) {
    packageName = "${projectName}-AIX"
    os = Os.AIX
 }
-
-task buildZip(type: Zip) {
-    subprojects.each {
-        dependsOn("${it.name}:copyJar")
-    }
-    from "output"
-    setArchivesBaseName(projectName as String)
-    setArchiveVersion(project.property("version") as String)
-}
--- a/plugins/linux/src/test/resources/sensors-1.json
+++ b/plugins/linux/src/test/resources/sensors-1.json
@ -1,39 +0,0 @@
-{
-    "k10temp-pci-00c3":{
-        "Adapter": "PCI adapter",
-        "Tctl":{
-            "temp1_input": 56.250
-        }
-    },
-    "nvme-pci-0400":{
-        "Adapter": "PCI adapter",
-        "Composite":{
-            "temp1_input": 35.850,
-            "temp1_max": 74.850,
-            "temp1_min": -20.150,
-            "temp1_crit": 79.850,
-            "temp1_alarm": 0.000
-        }
-    },
-    "iwlwifi_1-virtual-0":{
-        "Adapter": "Virtual device",
-        "temp1":{
-            "temp1_input": 37.000
-        }
-    },
-    "amdgpu-pci-0500":{
-        "Adapter": "PCI adapter",
-        "vddgfx":{
-            "in0_input": 0.681
-        },
-        "vddnb":{
-            "in1_input": 0.712
-        },
-        "edge":{
-            "temp1_input": 37.000
-        },
-        "PPT":{
-            "power1_average": 0.000
-        }
-    }
-}
--- a/plugins/linux/src/test/resources/sensors-2.json
+++ b/plugins/linux/src/test/resources/sensors-2.json
@ -1,39 +0,0 @@
-{
-    "k10temp-pci-00c3":{
-        "Adapter": "PCI adapter",
-        "Tctl":{
-            "temp1_input": 53.875
-        }
-    },
-    "nvme-pci-0400":{
-        "Adapter": "PCI adapter",
-        "Composite":{
-            "temp1_input": 36.850,
-            "temp1_max": 74.850,
-            "temp1_min": -20.150,
-            "temp1_crit": 79.850,
-            "temp1_alarm": 0.000
-        }
-    },
-    "iwlwifi_1-virtual-0":{
-        "Adapter": "Virtual device",
-        "temp1":{
-            "temp1_input": 41.000
-        }
-    },
-    "amdgpu-pci-0500":{
-        "Adapter": "PCI adapter",
-        "vddgfx":{
-            "in0_input": 1.281
-        },
-        "vddnb":{
-            "in1_input": 0.712
-        },
-        "edge":{
-            "temp1_input": 42.000
-        },
-        "PPT":{
-            "power1_average": 0.000
-        }
-    }
-}
--- a/plugins/os-aix/README.md
+++ b/plugins/os-aix/README.md
@ -1,15 +1,15 @@
-# IBM Power Plugin
+# AIX Plugin

-## Power LPAR Processor Extension
+## LPAR Processor Extension

 The processor extension works for both AIX and Linux on the Power ppc64/ppc64le architecture.

 Metrics reported are:

- **mode** - Processor mode, Capped or Uncapped
+- **mode** - Processor mode, Capped or Uncapped 
 - **type** - Processor type, Shared or Dedicated
 - **lcpu** - Number of logical CPU's available for this partition
 - **ent** - Processor entitlements available for this partition
 - **physc** - Indicates the number of physical processors consumed.
 - **entc** - Indicates the percentage of the entitled capacity consumed.
- **lbusy** - Indicates the percentage of logical processor(s) utilization that occurred while executing at the user and system level.
+- **lbusy** - Indicates the percentage of logical processor(s) utilization that occurred while executing at the user and system level. 
--- a/plugins/os-aix/build.gradle
+++ b/plugins/os-aix/build.gradle
--- a/plugins/os-aix/gradle.properties
+++ b/plugins/os-aix/gradle.properties
@ -0,0 +1,6 @@
+pluginId=sysmon-aix
+pluginClass=sysmon.plugins.os_aix.AixPlugin
+pluginVersion=0.0.1
+pluginProvider=System Monitor
+pluginDependencies=
+pluginDescription=Collects AIX OS metrics.
--- a/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixNetstatExtension.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixNetstatExtension.java
@ -0,0 +1,104 @@
+package sysmon.plugins.os_aix;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
+import sysmon.shared.PluginHelper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+// Disabled
+//@Extension
+public class AixNetstatExtension implements MetricExtension  {
+
+    private static final Logger log = LoggerFactory.getLogger(AixNetstatExtension.class);
+
+    // Extension details
+    private final String name = "aix_network_netstat";
+    private final String provides = "network_netstat";
+    private final String description = "AIX Netstat Metrics";
+
+    // Configuration / Options
+    private boolean enabled = true;
+    private boolean threaded = false;
+
+
+    @Override
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public boolean isThreaded() {
+        return threaded;
+    }
+
+    @Override
+    public boolean isSupported() {
+
+        if(!System.getProperty("os.name").toLowerCase().contains("aix")) {
+            log.warn("Requires AIX.");
+            return false;
+        }
+
+        if(PluginHelper.notExecutable("netstat")) {
+            log.warn("Requires the 'netstat' command.");
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getProvides() {
+        return provides;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public void setConfiguration(Map<String, Object> map) {
+        if (map.containsKey("enabled")) {
+            enabled = (boolean) map.get("enabled");
+        }
+        if(map.containsKey("threaded")) {
+            threaded = (boolean) map.get("threaded");
+        }
+    }
+
+    @Override
+    public MetricResult getMetrics() throws Exception {
+
+        HashMap<String, String> tagsMap;
+        HashMap<String, Object> fieldsMap;
+
+        try (InputStream buf = PluginHelper.executeCommand("netstat -s -f inet")) {
+            AixNetstatParser parser = processCommandOutput(buf);
+            tagsMap = parser.getTags();
+            fieldsMap = parser.getFields();
+        }
+
+        log.debug(fieldsMap.toString());
+        return new MetricResult(name, new Measurement(tagsMap, fieldsMap));
+    }
+
+
+    protected AixNetstatParser processCommandOutput(InputStream input) throws IOException {
+        return new AixNetstatParser(input);
+    }
+
+}
+
--- a/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixNetstatParser.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixNetstatParser.java
@ -0,0 +1,155 @@
+package sysmon.plugins.os_aix;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+
+public class AixNetstatParser {
+
+    private static final Logger log = LoggerFactory.getLogger(AixNetstatParser.class);
+
+    private long ipTotalPacketsReceived;
+    private long ipForwarded;
+
+    private long tcpConnectionsEstablished;
+    private long tcpPacketsReceved;
+    private long tcpPacketsSent;
+
+    private long udpPacketsReceived;
+    private long udpPacketsSent;
+
+
+    public AixNetstatParser(InputStream inputStream) throws IOException {
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+        while (reader.ready()) {
+            String line = reader.readLine();
+            log.debug("AixNetstatParser() - Line: " + line);
+
+            if(line.startsWith("tcp:")) {
+                parseTcp(reader);
+            }
+
+            if(line.startsWith("udp:")) {
+                parseUdp(reader);
+            }
+
+            if(line.startsWith("ip:")) {
+                parseIp(reader);
+            }
+
+        }
+
+        inputStream.close();
+    }
+
+
+    protected void parseIp(BufferedReader reader) throws IOException {
+
+        while (reader.ready()) {
+            reader.mark(64);
+            String line = reader.readLine();
+
+            if(!line.startsWith(" ")) {
+                reader.reset();
+                return;
+            }
+
+            line = line.trim();
+
+            if(line.matches("(\\d+) total packets received")) {
+                ipTotalPacketsReceived = getFirstLong(line);
+            }
+
+            if(line.matches("(\\d+) packets forwarded")) {
+                ipForwarded = getFirstLong(line);
+            }
+
+        }
+
+    }
+
+
+    protected void parseTcp(BufferedReader reader) throws IOException {
+
+        while (reader.ready()) {
+            reader.mark(64);
+            String line = reader.readLine();
+
+            if(!line.startsWith(" ")) {
+                reader.reset();
+                return;
+            }
+
+            line = line.trim();
+
+            if(line.matches("(\\d+) connections established \\(including accepts\\)")) {
+                tcpConnectionsEstablished = getFirstLong(line);
+            }
+
+            if(line.matches("(\\d+) packets received")) {
+                tcpPacketsReceved = getFirstLong(line);
+            }
+
+            if(line.matches("(\\d+) packets sent")) {
+                tcpPacketsSent = getFirstLong(line);
+            }
+
+        }
+
+    }
+
+    protected void parseUdp(BufferedReader reader) throws IOException {
+
+        while (reader.ready()) {
+            reader.mark(64);
+            String line = reader.readLine();
+
+            if(!line.startsWith(" ")) {
+                reader.reset();
+                return;
+            }
+
+            line = line.trim();
+
+            if(line.matches("(\\d+) datagrams received")) {
+                udpPacketsReceived = getFirstLong(line);
+            }
+
+            if(line.matches("(\\d+) datagrams output")) {
+                udpPacketsSent = getFirstLong(line);
+            }
+        }
+
+    }
+
+
+    public HashMap<String, String> getTags() {
+        return new HashMap<>();
+    }
+
+    public HashMap<String, Object> getFields() {
+        HashMap<String, Object> fields = new HashMap<>();
+        fields.put("ip_forwarded", ipForwarded);
+        fields.put("ip_received", ipTotalPacketsReceived);
+
+        fields.put("tcp_connections", tcpConnectionsEstablished);
+        fields.put("tcp_pkts_recv", tcpPacketsReceved);
+        fields.put("tcp_pkts_sent", tcpPacketsSent);
+
+        fields.put("udp_pkts_recv", udpPacketsReceived);
+        fields.put("udp_pkts_sent", udpPacketsSent);
+
+        return fields;
+    }
+
+    private Long getFirstLong(String line) {
+        return Long.parseLong(line.substring(0, line.indexOf(" ")));
+    }
+
+}
--- a/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixPlugin.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixPlugin.java
@ -0,0 +1,18 @@
+package sysmon.plugins.os_aix;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.pf4j.Plugin;
+import org.pf4j.PluginWrapper;
+
+public class AixPlugin extends Plugin {
+
+    private static final Logger log = LoggerFactory.getLogger(AixPlugin.class);
+
+    public AixPlugin(PluginWrapper wrapper) {
+        super(wrapper);
+    }
+
+}
+
+
--- a/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorExtension.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorExtension.java
@ -1,4 +1,4 @@
-package sysmon.plugins.power;
+package sysmon.plugins.os_aix;

 import org.pf4j.Extension;
 import org.slf4j.Logger;
@ -10,22 +10,23 @@ import sysmon.shared.PluginHelper;

 import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.TreeMap;

@Extension
-public class PowerProcessorExtension implements MetricExtension {
+public class AixProcessorExtension implements MetricExtension {

-    private static final Logger log = LoggerFactory.getLogger(PowerProcessorExtension.class);
+    private static final Logger log = LoggerFactory.getLogger(AixProcessorExtension.class);

    // Extension details
-    private final String name = "power_processor";
-    private final String description = "IBM Power Processor Metrics";
+    private final String name = "aix_processor";
+    private final String provides = "lpar_processor";
+    private final String description = "AIX Processor Metrics";

    // Configuration / Options
    private boolean enabled = true;
    private boolean threaded = true;
-    private String interval = "10s";
+

    @Override
    public boolean isEnabled() {
@ -60,8 +61,8 @@ public class PowerProcessorExtension implements MetricExtension {
    }

    @Override
-    public String getInterval() {
-        return interval;
+    public String getProvides() {
+        return provides;
    }

    @Override
@ -77,19 +78,16 @@ public class PowerProcessorExtension implements MetricExtension {
        if(map.containsKey("threaded")) {
            threaded = (boolean) map.get("threaded");
        }
-        if(map.containsKey("interval")) {
-            interval = (String) map.get("interval");
-        }
    }

    @Override
    public MetricResult getMetrics() throws Exception {

-        TreeMap<String, String> tagsMap = null;
-        TreeMap<String, Object> fieldsMap = null;
+        HashMap<String, String> tagsMap = null;
+        HashMap<String, Object> fieldsMap = null;

        try (InputStream buf = PluginHelper.executeCommand("lparstat 3 1")) {
-            PowerProcessorStat processorStat = processCommandOutput(buf);
+            AixProcessorStat processorStat = processCommandOutput(buf);
            tagsMap = processorStat.getTags();
            fieldsMap = processorStat.getFields();
        } catch (IOException e) {
@ -101,8 +99,8 @@ public class PowerProcessorExtension implements MetricExtension {
    }


-    protected PowerProcessorStat processCommandOutput(InputStream input) throws IOException {
-        return new PowerProcessorStat(input);
+    protected AixProcessorStat processCommandOutput(InputStream input) throws IOException {
+        return new AixProcessorStat(input);
    }

 }
--- a/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorStat.java
+++ b/plugins/os-aix/src/main/java/sysmon/plugins/os_aix/AixProcessorStat.java
@ -1,4 +1,4 @@
-package sysmon.plugins.power;
+package sysmon.plugins.os_aix;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@ -8,14 +8,14 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Objects;
-import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-public class PowerProcessorStat {
+public class AixProcessorStat {

-    private static final Logger log = LoggerFactory.getLogger(PowerProcessorStat.class);
+    private static final Logger log = LoggerFactory.getLogger(AixProcessorStat.class);

    // System configuration: type=Shared mode=Uncapped smt=8 lcpu=8 mem=4096MB psize=19 ent=0.50
    private static final Pattern patternAixShared = Pattern.compile("^System configuration: type=(\\S+) mode=(\\S+) smt=(\\d+) lcpu=(\\d+) mem=(\\d+)MB psize=(\\d+) ent=(\\d+\\.?\\d*)");
@ -46,7 +46,7 @@ public class PowerProcessorStat {
    private final float lbusy;  // Indicates the percentage of logical processor(s) utilization that occurred while executing at the user and system level.


-    public PowerProcessorStat(InputStream inputStream) throws IOException {
+    public AixProcessorStat(InputStream inputStream) throws IOException {

        String lastLine = null;
        BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
@ -154,12 +154,12 @@ public class PowerProcessorStat {
        return 100 - idle;
    }

-    public TreeMap<String, String> getTags() {
-        return new TreeMap<>();
+    public HashMap<String, String> getTags() {
+        return new HashMap<>();
    }

-    public TreeMap<String, Object> getFields() {
-        return new TreeMap<String, Object>() {{
+    public HashMap<String, Object> getFields() {
+        return new HashMap<String, Object>() {{
            put("lcpu", lcpu);
            put("ent", ent);
            put("user", user);
--- a/plugins/os-aix/src/test/groovy/AixNetstatTest.groovy
+++ b/plugins/os-aix/src/test/groovy/AixNetstatTest.groovy
@ -0,0 +1,25 @@
+import spock.lang.Specification
+import sysmon.plugins.os_aix.AixNetstatParser
+
+class AixNetstatTest extends Specification {
+
+    void "test netstat parsing"() {
+
+        setup:
+        InputStream inputStream = getClass().getResourceAsStream('/netstat-aix.txt')
+
+        when:
+        AixNetstatParser parser = new AixNetstatParser(inputStream)
+
+        then:
+        parser.getFields().size() > 0
+        parser.getFields().get('ip_received') == 76229L
+        parser.getFields().get('ip_forwarded') == 24L
+        parser.getFields().get('tcp_connections') == 85L
+        parser.getFields().get('tcp_pkts_sent') == 31274L
+        parser.getFields().get('tcp_pkts_recv') == 39830L
+        parser.getFields().get('udp_pkts_sent') == 26332L
+        parser.getFields().get('udp_pkts_recv') == 34559L
+    }
+
+}
--- a/plugins/power/src/test/groovy/PowerProcessorTest.groovy
+++ b/plugins/power/src/test/groovy/PowerProcessorTest.groovy
@ -1,8 +1,8 @@
-import sysmon.plugins.power.PowerProcessorExtension
-import sysmon.plugins.power.PowerProcessorStat
+import sysmon.plugins.os_aix.AixProcessorExtension
+import sysmon.plugins.os_aix.AixProcessorStat
 import spock.lang.Specification

-class PowerProcessorTest extends Specification {
+class AixProcessorTest extends Specification {

    void "test AIX lparstat shared output processing"() {

@ -10,8 +10,8 @@ class PowerProcessorTest extends Specification {
        InputStream inputStream = getClass().getResourceAsStream('/lparstat-aix-shared.txt')

        when:
-        PowerProcessorExtension extension = new PowerProcessorExtension()
-        PowerProcessorStat stats = extension.processCommandOutput(inputStream)
+        AixProcessorExtension extension = new AixProcessorExtension()
+        AixProcessorStat stats = extension.processCommandOutput(inputStream)

        then:
        stats.getUser() == 83.7f
@ -30,8 +30,8 @@ class PowerProcessorTest extends Specification {
        InputStream inputStream = getClass().getResourceAsStream('/lparstat-aix-dedicated-donating.txt')

        when:
-        PowerProcessorExtension extension = new PowerProcessorExtension()
-        PowerProcessorStat stats = extension.processCommandOutput(inputStream)
+        AixProcessorExtension extension = new AixProcessorExtension()
+        AixProcessorStat stats = extension.processCommandOutput(inputStream)

        then:
        stats.getUser() == 0.1f
@ -51,8 +51,8 @@ class PowerProcessorTest extends Specification {
        InputStream inputStream = getClass().getResourceAsStream('/lparstat-aix-dedicated-capped.txt')

        when:
-        PowerProcessorExtension extension = new PowerProcessorExtension()
-        PowerProcessorStat stats = extension.processCommandOutput(inputStream)
+        AixProcessorExtension extension = new AixProcessorExtension()
+        AixProcessorStat stats = extension.processCommandOutput(inputStream)

        then:
        stats.getUser() == 0.0f
@ -71,8 +71,8 @@ class PowerProcessorTest extends Specification {
        InputStream inputStream = getClass().getResourceAsStream('/lparstat-linux.txt')

        when:
-        PowerProcessorExtension extension = new PowerProcessorExtension()
-        PowerProcessorStat stats = extension.processCommandOutput(inputStream)
+        AixProcessorExtension extension = new AixProcessorExtension()
+        AixProcessorStat stats = extension.processCommandOutput(inputStream)

        then:
        stats.getUser() == 0.03f
--- a/plugins/os-aix/src/test/resources/lparstat-aix-dedicated-capped.txt
+++ b/plugins/os-aix/src/test/resources/lparstat-aix-dedicated-capped.txt
--- a/plugins/os-aix/src/test/resources/lparstat-aix-dedicated-donating.txt
+++ b/plugins/os-aix/src/test/resources/lparstat-aix-dedicated-donating.txt
--- a/plugins/os-aix/src/test/resources/lparstat-aix-shared.txt
+++ b/plugins/os-aix/src/test/resources/lparstat-aix-shared.txt
--- a/plugins/os-aix/src/test/resources/lparstat-linux.txt
+++ b/plugins/os-aix/src/test/resources/lparstat-linux.txt
--- a/plugins/os-aix/src/test/resources/netstat-aix.txt
+++ b/plugins/os-aix/src/test/resources/netstat-aix.txt
@ -0,0 +1,157 @@
+icmp:
+        12 calls to icmp_error
+        0 errors not generated because old message was icmp
+        Output histogram:
+                destination unreachable: 12
+        0 messages with bad code fields
+        0 messages < minimum length
+        0 bad checksums
+        0 messages with bad length
+        Input histogram:
+                destination unreachable: 3
+        0 message responses generated
+igmp:
+        0 messages received
+        0 messages received with too few bytes
+        0 messages received with bad checksum
+        0 membership queries received
+        0 membership queries received with invalid field(s)
+        0 membership reports received
+        0 membership reports received with invalid field(s)
+        0 membership reports received for groups to which we belong
+        2 membership reports sent
+tcp:
+        31274 packets sent
+                27328 data packets (82928168 bytes)
+                86 data packets (108992 bytes) retransmitted
+                2938 ack-only packets (2698 delayed)
+                0 URG only packets
+                0 window probe packets
+                784 window update packets
+                138 control packets
+                3812 large sends
+                74913716 bytes sent using largesend
+                64069 bytes is the biggest largesend
+        39830 packets received
+                22701 acks (for 82928732 bytes)
+                112 duplicate acks
+                0 acks for unsent data
+                15579 packets (5876585 bytes) received in-sequence
+                62 completely duplicate packets (320 bytes)
+                57 old duplicate packets
+                0 packets with some dup. data (0 bytes duped)
+                75 out-of-order packets (6408 bytes)
+                0 packets (0 bytes) of data after window
+                0 window probes
+                1723 window update packets
+                0 packets received after close
+                0 packets with bad hardware assisted checksum
+                0 discarded for bad checksums
+                0 discarded for bad header offset fields
+                0 discarded because packet too short
+                1 discarded by listeners
+                0 discarded due to listener's queue full
+                3207 ack packet headers correctly predicted
+                15050 data packet headers correctly predicted
+        63 connection requests
+        23 connection accepts
+        85 connections established (including accepts)
+        114 connections closed (including 0 drops)
+        0 connections with ECN capability
+        0 times responded to ECN
+        0 embryonic connections dropped
+        20314 segments updated rtt (of 16791 attempts)
+        0 segments with congestion window reduced bit set
+        0 segments with congestion experienced bit set
+        0 resends due to path MTU discovery
+        2 path MTU discovery terminations due to retransmits
+        25 retransmit timeouts
+                0 connections dropped by rexmit timeout
+        4 fast retransmits
+                1 when congestion window less than 4 segments
+        28 newreno retransmits
+        4 times avoided false fast retransmits
+        0 persist timeouts
+                0 connections dropped due to persist timeout
+        0 keepalive timeouts
+                0 keepalive probes sent
+                0 connections dropped by keepalive
+        0 times SACK blocks array is extended
+        0 times SACK holes array is extended
+        0 packets dropped due to memory allocation failure
+        0 connections in timewait reused
+        0 delayed ACKs for SYN
+        0 delayed ACKs for FIN
+        0 send_and_disconnects
+        0 spliced connections
+        0 spliced connections closed
+        0 spliced connections reset
+        0 spliced connections timeout
+        0 spliced connections persist timeout
+        0 spliced connections keepalive timeout
+        0 TCP checksum offload disabled during retransmit
+        0 Connections dropped due to bad ACKs
+        0 Connections dropped due to duplicate SYN packets
+        0 fastpath loopback connections
+        0 fastpath loopback sent packets (0 bytes)
+        0 fastpath loopback received packets (0 bytes)
+        0 fake SYN segments dropped
+        0 fake RST segments dropped
+        0 data injection segments dropped
+        0 TCPTR maximum connections dropped
+        0 TCPTR connections dropped for no memory
+        0 TCPTR maximum per host connections dropped
+        0 connections dropped due to max assembly queue depth
+udp:
+        34559 datagrams received
+        0 incomplete headers
+        0 bad data length fields
+        0 bad checksums
+        1849 dropped due to no socket
+        8218 broadcast/multicast datagrams dropped due to no socket
+        0 socket buffer overflows
+        24492 delivered
+        26332 datagrams output
+ip:
+        76229 total packets received
+        0 bad header checksums
+        0 with size smaller than minimum
+        0 with data size < data length
+        0 with header length < data size
+        0 with data length < header length
+        0 with bad options
+        0 with incorrect version number
+        0 fragments received
+        0 fragments dropped (dup or out of space)
+        0 fragments dropped after timeout
+        0 packets reassembled ok
+        72552 packets for this host
+        3 packets for unknown/unsupported protocol
+        24 packets forwarded
+        0 packets not forwardable
+        0 redirects sent
+        55784 packets sent from this host
+        0 packets sent with fabricated ip header
+        0 output packets dropped due to no bufs, etc.
+        0 output packets discarded due to no route
+        0 output datagrams fragmented
+        0 fragments created
+        0 datagrams that can't be fragmented
+        0 IP Multicast packets dropped due to no receiver
+        0 successful path MTU discovery cycles
+        0 path MTU rediscovery cycles attempted
+        0 path MTU discovery no-response estimates
+        0 path MTU discovery response timeouts
+        0 path MTU discovery decreases detected
+        0 path MTU discovery packets sent
+        0 path MTU discovery memory allocation failures
+        0 ipintrq overflows
+        0 with illegal source
+        0 packets processed by threads
+        0 packets dropped by threads
+        0 packets dropped due to the full socket receive buffer
+        0 dead gateway detection packets sent
+        0 dead gateway detection packet allocation failures
+        0 dead gateway detection gateway allocation failures
+        0 incoming packets dropped due to MLS filters
+        0 packets not sent due to MLS filters
--- a/plugins/os-base/README.md
+++ b/plugins/os-base/README.md
@ -1,20 +1,20 @@
 # Base Plugin

-The base plugins uses the [oshi](https://github.com/oshi/oshi) library to get it's metrics.
+The base plugin uses the [oshi](https://github.com/oshi/oshi) library to get it's metrics.

 ## Processor Extension

 Reports the following metrics seen:

- **system** -CPU time (in ms) spend on system processes.
- **user** - CPU time (in ms) spend on user processes.
- **nice** - CPU time (in ms) spend on user processes running at lower priority.
- **iowait** - CPU time (in ms) spend waiting (for i/o).
- **steal** - CPU time (in ms) stolen by hypervisor and given to other virtual systems.
- **irq** - CPU time (in ms) spend by kernel on interrupt requests.
- **softirq** - CPU (in ms) time spend by kernel on soft interrupt requests.
- **idle** - CPU time (in ms) spend idling (doing nothing).
- **busy** - CPU time (in ms) spend working.
+- **system** -CPU time spend on system processes.
+- **user** - CPU time spend on user processes.
+- **nice** - CPU time spend on user processes running at lower priority.
+- **iowait** - CPU time spend waiting (for i/o).
+- **steal** - CPU time stolen by hypervisor and given to other virtual systems.
+- **irq** - CPU time spend by kernel on interrupt requests.
+- **softirq** - CPU time spend by kernel on soft interrupt requests.
+- **idle** - CPU time spend idling (doing nothing).
+- **busy** - CPU time spend working.


 ## Memory Extension
@ -35,7 +35,7 @@ Metrics reported are:
 - **reads** - The total number of bytes read.
 - **writes** - The total number of bytes written.
 - **iotime** - Time spent on IO in milliseconds.
- **queue** - Length of disk IO queue.
+- **queue** - Lenght of IO queue.

 ## Filesystem Extension

@ -43,7 +43,7 @@ Metrics reported are:

 - **free_bytes** - Free bytes for filesystem.
 - **total_bytes** - Total bytes for filesystem.
- **free_inodes** - Free inodes for filesystem.
+- **free_inoed** - Free inodes for filesystem.
 - **total_inodes** - Total inodes for filesystem.

 ### Configuration
@ -51,7 +51,6 @@ Metrics reported are:
 ```toml
 [extension.base_filesystem]
 enabled = true
-interval = "10s"
 exclude_type = [ "tmpfs", "ahafs" ]
 exclude_mount = [ "/boot/efi" ]
 ```
@ -80,6 +79,5 @@ The **include** option let's you specify what processes to report for.
 ```toml
 [extension.base_process]
 enabled = true # true or false
-interval = "10s"
 include = [ "java", "influxd", "grafana-server" ]
-```
+```
--- a/plugins/os-base/build.gradle
+++ b/plugins/os-base/build.gradle
--- a/plugins/os-base/gradle.properties
+++ b/plugins/os-base/gradle.properties
@ -1,5 +1,5 @@
 pluginId=sysmon-base
-pluginClass=sysmon.plugins.base.BasePlugin
+pluginClass=sysmon.plugins.os_base.BasePlugin
 pluginDependencies=
 pluginDescription=Base OS metrics where supported.

--- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseDetailsExtension.java
+++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseDetailsExtension.java
@ -1,4 +1,4 @@
-package sysmon.plugins.base;
+package sysmon.plugins.os_base;

 import org.pf4j.Extension;
 import org.slf4j.Logger;
@ -10,22 +10,20 @@ import sysmon.shared.MetricResult;

 import java.util.HashMap;
 import java.util.Map;
-import java.util.TreeMap;

@Extension
-public class BaseInfoExtension implements MetricExtension {
+public class BaseDetailsExtension implements MetricExtension {

-    private static final Logger log = LoggerFactory.getLogger(BaseInfoExtension.class);
+    private static final Logger log = LoggerFactory.getLogger(BaseDetailsExtension.class);

    // Extension details
-    private final String name = "base_info";
-    private final String description = "Base System Information";
+    private final String name = "base_details";
+    private final String provides = "details";
+    private final String description = "Base Details Metrics";

    // Configuration / Options
    private boolean enabled = true;
    private boolean threaded = false;
-    private String interval = "60m";
-    private HashMap<String, String> tags = new HashMap<>();

    private SystemInfo systemInfo;

@ -52,7 +50,9 @@ public class BaseInfoExtension implements MetricExtension {
    }

    @Override
-    public String getInterval() { return interval; }
+    public String getProvides() {
+        return provides;
+    }

    @Override
    public String getDescription() {
@ -67,24 +67,22 @@ public class BaseInfoExtension implements MetricExtension {
        if (map.containsKey("threaded")) {
            threaded = (boolean) map.get("threaded");
        }
-        if (map.containsKey("interval")) {
-            interval = (String) map.get("interval");
-        }
    }

    @Override
    public MetricResult getMetrics() {

-        TreeMap<String, Object> fieldsMap = new TreeMap<String, Object>() {{
-            put("os_manufacturer", systemInfo.getOperatingSystem().getManufacturer());             // GNU/Linux            / IBM
-            put("os_family", systemInfo.getOperatingSystem().getFamily());                         // Freedesktop.org      / AIX
+        HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{
+            put("family", systemInfo.getOperatingSystem().getFamily());                         // Freedesktop.org      / AIX
+            put("manufacturer", systemInfo.getOperatingSystem().getManufacturer());             // GNU/Linux            / IBM
            put("os_codename", systemInfo.getOperatingSystem().getVersionInfo().getCodeName()); // Flatpak runtime      / ppc64
            put("os_version", systemInfo.getOperatingSystem().getVersionInfo().getVersion());   // 21.08.4              / 7.2
            put("os_build", systemInfo.getOperatingSystem().getVersionInfo().getBuildNumber()); // 5.13.0-7620-generic  / 2045B_72V
-            put("boot_time", systemInfo.getOperatingSystem().getSystemBootTime());
+            put("uptime", systemInfo.getOperatingSystem().getSystemUptime());
+            put("threads", systemInfo.getOperatingSystem().getThreadCount());
        }};

-        return new MetricResult(name, new Measurement(tags, fieldsMap));
+        return new MetricResult(name, new Measurement(new HashMap<>(), fieldsMap));
    }

-}
+}
--- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseDiskExtension.java
+++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseDiskExtension.java
@ -1,4 +1,4 @@
-package sysmon.plugins.base;
+package sysmon.plugins.os_base;

 import org.pf4j.Extension;
 import org.slf4j.Logger;
@ -9,7 +9,10 @@ import sysmon.shared.Measurement;
 import sysmon.shared.MetricExtension;
 import sysmon.shared.MetricResult;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

@Extension
 public class BaseDiskExtension implements MetricExtension {
@ -18,16 +21,14 @@ public class BaseDiskExtension implements MetricExtension {

    // Extension details
    private final String name = "base_disk";
+    private final String provides = "disk";
    private final String description = "Base Disk Metrics";

    // Configuration / Options
    private boolean enabled = true;
    private boolean threaded = false;
-    private String interval = "10s";

    private HardwareAbstractionLayer hardwareAbstractionLayer;
-    private List<HWDiskStore> diskStores;
-    private int refreshCounter = 0;


    @Override
@ -52,8 +53,8 @@ public class BaseDiskExtension implements MetricExtension {
    }

    @Override
-    public String getInterval() {
-        return interval;
+    public String getProvides() {
+        return provides;
    }

    @Override
@ -69,37 +70,24 @@ public class BaseDiskExtension implements MetricExtension {
        if(map.containsKey("threaded")) {
            threaded = (boolean) map.get("threaded");
        }
-        if(map.containsKey("interval")) {
-            interval = (String) map.get("interval");
-        }
    }

    @Override
    public MetricResult getMetrics() {

        ArrayList<Measurement> measurementList = new ArrayList<>();
-        if(diskStores == null || refreshCounter++ > 360) {
-            log.debug("getMetrics() - refreshing list of disk stores");
-            diskStores = hardwareAbstractionLayer.getDiskStores();
-            refreshCounter = 0;
-        }
+        List<HWDiskStore> diskStores = hardwareAbstractionLayer.getDiskStores();

        for(HWDiskStore store : diskStores) {

-            store.updateAttributes();
            String name = store.getName();
-            if (name.matches("h?disk[0-9]+") ||
-                //name.matches("/dev/dm-[0-9]+") ||
-                name.matches("/dev/x?[sv]d[a-z]") ||
-                name.matches("/dev/nvme[0-9]n[0-9]") ||
-                name.startsWith("\\\\.\\PHYSICALDRIVE")
-            ) {
+            if (name.matches("h?disk[0-9]+") || name.matches("/dev/x?[sv]d[a-z]") || name.matches("/dev/nvme[0-9]n[0-9]") || name.startsWith("\\\\.\\PHYSICALDRIVE")) {

-                TreeMap<String, String> tagsMap = new TreeMap<String, String>() {{
+                HashMap<String, String> tagsMap = new HashMap<String, String>() {{
                    put("name", name);
                }};

-                TreeMap<String, Object> fieldsMap = new TreeMap<String, Object>() {{
+                HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{
                    put("read", store.getReadBytes());
                    put("write", store.getWriteBytes());
                    put("iotime", store.getTransferTime());
@ -117,4 +105,4 @@ public class BaseDiskExtension implements MetricExtension {
        return new MetricResult(name, measurementList);
    }

-}
+}
--- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseFilesystemExtension.java
+++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseFilesystemExtension.java
@ -1,15 +1,19 @@
-package sysmon.plugins.base;
+package sysmon.plugins.os_base;

 import org.pf4j.Extension;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import oshi.SystemInfo;
+import oshi.hardware.HardwareAbstractionLayer;
 import oshi.software.os.OSFileStore;
 import sysmon.shared.Measurement;
 import sysmon.shared.MetricExtension;
 import sysmon.shared.MetricResult;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

@Extension
 public class BaseFilesystemExtension implements MetricExtension {
@ -18,12 +22,12 @@ public class BaseFilesystemExtension implements MetricExtension {

    // Extension details
    private final String name = "base_filesystem";
+    private final String provides = "filesystem";
    private final String description = "Base Filesystem Metrics";

    // Configuration / Options
    private boolean enabled = true;
    private boolean threaded = false;
-    private String interval = "10s";
    private List<?> excludeType = new ArrayList<String>() {{
      add("tmpfs");
      add("ahafs");
@ -32,9 +36,8 @@ public class BaseFilesystemExtension implements MetricExtension {
        add("/boot/efi");
    }};

+    private HardwareAbstractionLayer hardwareAbstractionLayer;
    private SystemInfo systemInfo;
-    private List<OSFileStore> fileStores;
-    private int refreshCounter = 0;


    @Override
@ -60,8 +63,8 @@ public class BaseFilesystemExtension implements MetricExtension {
    }

    @Override
-    public String getInterval() {
-        return interval;
+    public String getProvides() {
+        return provides;
    }

    @Override
@ -79,10 +82,6 @@ public class BaseFilesystemExtension implements MetricExtension {
            threaded = (boolean) map.get("threaded");
        }

-        if(map.containsKey("interval")) {
-            interval = (String) map.get("interval");
-        }
-
        if(map.containsKey("exclude_type")) {
            excludeType = (List<?>) map.get("exclude_type");
        }
@ -97,10 +96,7 @@ public class BaseFilesystemExtension implements MetricExtension {

        ArrayList<String> alreadyProcessed = new ArrayList<>();
        ArrayList<Measurement> measurementList = new ArrayList<>();
-
-        if(fileStores == null || refreshCounter++ > 360) {
-            fileStores = systemInfo.getOperatingSystem().getFileSystem().getFileStores(true);
-        }
+        List<OSFileStore> fileStores = systemInfo.getOperatingSystem().getFileSystem().getFileStores(true);

        for(OSFileStore store : fileStores) {

@ -122,17 +118,15 @@ public class BaseFilesystemExtension implements MetricExtension {
                log.debug("Skipping name: " + name);
                continue;
            }
-
            alreadyProcessed.add(name);
-            store.updateAttributes();

-            TreeMap<String, String> tagsMap = new TreeMap<String, String>() {{
+            HashMap<String, String> tagsMap = new HashMap<String, String>() {{
                put("name", name);
                put("type", type);
                put("mount", mount);
            }};

-            TreeMap<String, Object> fieldsMap = new TreeMap<String, Object>() {{
+            HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{
                put("free_bytes", store.getFreeSpace());
                put("total_bytes", store.getTotalSpace());
                put("free_inodes", store.getFreeInodes());
@ -145,4 +139,4 @@ public class BaseFilesystemExtension implements MetricExtension {
        return new MetricResult(name, measurementList);
    }

-}
+}
--- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseLoadExtension.java
+++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseLoadExtension.java
@ -1,4 +1,4 @@
-package sysmon.plugins.base;
+package sysmon.plugins.os_base;

 import org.pf4j.Extension;
 import org.slf4j.Logger;
@ -8,8 +8,8 @@ import sysmon.shared.Measurement;
 import sysmon.shared.MetricExtension;
 import sysmon.shared.MetricResult;

+import java.util.HashMap;
 import java.util.Map;
-import java.util.TreeMap;

@Extension
 public class BaseLoadExtension implements MetricExtension {
@ -18,12 +18,12 @@ public class BaseLoadExtension implements MetricExtension {

    // Extension details
    private final String name = "base_load";
+    private final String provides = "load";
    private final String description = "Base Load Average Metrics";

    // Configuration / Options
    private boolean enabled = true;
    private boolean threaded = false;
-    private String interval = "10s";

    private HardwareAbstractionLayer hardwareAbstractionLayer;

@ -49,8 +49,8 @@ public class BaseLoadExtension implements MetricExtension {
    }

    @Override
-    public String getInterval() {
-        return interval;
+    public String getProvides() {
+        return provides;
    }

    @Override
@ -66,23 +66,20 @@ public class BaseLoadExtension implements MetricExtension {
        if(map.containsKey("threaded")) {
            threaded = (boolean) map.get("threaded");
        }
-        if(map.containsKey("interval")) {
-            interval = (String) map.get("interval");
-        }
    }

    @Override
    public MetricResult getMetrics() {

        double[] loadAvg = hardwareAbstractionLayer.getProcessor().getSystemLoadAverage(3);
-        TreeMap<String, Object> fieldsMap = new TreeMap<String, Object>() {{
+        HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{
            put("1min", loadAvg[0]);
            put("5min", loadAvg[1]);
            put("15min", loadAvg[2]);
        }};

        log.debug(fieldsMap.toString());
-        return new MetricResult(name, new Measurement(new TreeMap<>(), fieldsMap));
+        return new MetricResult(name, new Measurement(new HashMap<String, String>(), fieldsMap));
    }

 }
--- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseMemoryExtension.java
+++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseMemoryExtension.java
@ -1,4 +1,4 @@
-package sysmon.plugins.base;
+package sysmon.plugins.os_base;

 import org.pf4j.Extension;
 import org.slf4j.Logger;
@ -8,8 +8,8 @@ import sysmon.shared.Measurement;
 import sysmon.shared.MetricExtension;
 import sysmon.shared.MetricResult;

+import java.util.HashMap;
 import java.util.Map;
-import java.util.TreeMap;

@Extension
 public class BaseMemoryExtension implements MetricExtension {
@ -18,12 +18,12 @@ public class BaseMemoryExtension implements MetricExtension {

    // Extension details
    private final String name = "base_memory";
+    private final String provides = "memory";
    private final String description = "Base Memory Metrics";

    // Configuration / Options
    private boolean enabled = true;
    private boolean threaded = false;
-    private String interval = "10s";

    private HardwareAbstractionLayer hardwareAbstractionLayer;

@ -50,8 +50,8 @@ public class BaseMemoryExtension implements MetricExtension {
    }

    @Override
-    public String getInterval() {
-        return interval;
+    public String getProvides() {
+        return provides;
    }

    @Override
@ -67,16 +67,13 @@ public class BaseMemoryExtension implements MetricExtension {
        if(map.containsKey("threaded")) {
            threaded = (boolean) map.get("threaded");
        }
-        if(map.containsKey("interval")) {
-            interval = (String) map.get("interval");
-        }
    }

    @Override
    public MetricResult getMetrics() {

-        TreeMap<String, String> tagsMap = new TreeMap<>();
-        TreeMap<String, Object> fieldsMap = new TreeMap<>();
+        HashMap<String, String> tagsMap = new HashMap<>();
+        HashMap<String, Object> fieldsMap = new HashMap<>();

        long total = hardwareAbstractionLayer.getMemory().getTotal();
        long available = hardwareAbstractionLayer.getMemory().getAvailable();
--- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetstatExtension.java
+++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetstatExtension.java
@ -1,4 +1,4 @@
-package sysmon.plugins.base;
+package sysmon.plugins.os_base;

 import org.pf4j.Extension;
 import org.slf4j.Logger;
@ -8,8 +8,8 @@ import sysmon.shared.Measurement;
 import sysmon.shared.MetricExtension;
 import sysmon.shared.MetricResult;

+import java.util.HashMap;
 import java.util.Map;
-import java.util.TreeMap;

@Extension
 public class BaseNetstatExtension implements MetricExtension {
@ -18,12 +18,12 @@ public class BaseNetstatExtension implements MetricExtension {

    // Extension details
    private final String name = "base_netstat";
+    private final String provides = "netstat";
    private final String description = "Base Netstat Metrics";

    // Configuration / Options
    private boolean enabled = true;
    private boolean threaded = false;
-    private String interval = "10s";

    private SystemInfo systemInfo;

@ -50,8 +50,8 @@ public class BaseNetstatExtension implements MetricExtension {
    }

    @Override
-    public String getInterval() {
-        return interval;
+    public String getProvides() {
+        return provides;
    }

    @Override
@ -67,17 +67,12 @@ public class BaseNetstatExtension implements MetricExtension {
        if (map.containsKey("threaded")) {
            threaded = (boolean) map.get("threaded");
        }
-        if(map.containsKey("interval")) {
-            interval = (String) map.get("interval");
-        }
    }

    @Override
    public MetricResult getMetrics() {

-        TreeMap<String, Object> fieldsMap = new TreeMap<String, Object>() {{
-
-            put("ip_conn_total", systemInfo.getOperatingSystem().getInternetProtocolStats().getConnections().size());
+        HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{

            put("tcp4_conn_active", systemInfo.getOperatingSystem().getInternetProtocolStats().getTCPv4Stats().getConnectionsActive());
            put("tcp4_conn_passive", systemInfo.getOperatingSystem().getInternetProtocolStats().getTCPv4Stats().getConnectionsPassive());
@ -101,7 +96,7 @@ public class BaseNetstatExtension implements MetricExtension {

        }};

-        return new MetricResult(name, new Measurement(new TreeMap<>(), fieldsMap));
+        return new MetricResult(name, new Measurement(new HashMap<>(), fieldsMap));
    }

-}
+}
--- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetworkExtension.java
+++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseNetworkExtension.java
@ -1,4 +1,4 @@
-package sysmon.plugins.base;
+package sysmon.plugins.os_base;

 import org.pf4j.Extension;
 import org.slf4j.Logger;
@ -9,7 +9,10 @@ import sysmon.shared.Measurement;
 import sysmon.shared.MetricExtension;
 import sysmon.shared.MetricResult;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;

@Extension
 public class BaseNetworkExtension implements MetricExtension {
@ -18,16 +21,14 @@ public class BaseNetworkExtension implements MetricExtension {

    // Extension details
    private final String name = "base_network";
+    private final String provides = "network";
    private final String description = "Base Network Metrics";

    // Configuration / Options
    private boolean enabled = true;
    private boolean threaded = false;
-    private String interval = "10s";

    private HardwareAbstractionLayer hardwareAbstractionLayer;
-    private List<NetworkIF> interfaces;
-    private int refreshCounter = 0;


    @Override
@ -52,8 +53,8 @@ public class BaseNetworkExtension implements MetricExtension {
    }

    @Override
-    public String getInterval() {
-        return interval;
+    public String getProvides() {
+        return provides;
    }

    @Override
@ -69,28 +70,21 @@ public class BaseNetworkExtension implements MetricExtension {
        if(map.containsKey("threaded")) {
            threaded = (boolean) map.get("threaded");
        }
-        if(map.containsKey("interval")) {
-            interval = (String) map.get("interval");
-        }
    }

    @Override
    public MetricResult getMetrics() {

        ArrayList<Measurement> measurementList = new ArrayList<>();
-        if(interfaces == null || refreshCounter++ > 360) {
-            log.debug("getMetrics() - refreshing list of network interfaces");
-            interfaces = hardwareAbstractionLayer.getNetworkIFs();
-            refreshCounter = 0;
-        }

+        List<NetworkIF> interfaces = hardwareAbstractionLayer.getNetworkIFs();
        for(NetworkIF netif : interfaces) {

-            TreeMap<String, String> tagsMap = new TreeMap<String, String>() {{
+            HashMap<String, String> tagsMap = new HashMap<String, String>() {{
                put("name", netif.getName());
            }};

-            TreeMap<String, Object> fieldsMap = new TreeMap<String, Object>() {{
+            HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{
                put("rx_pkts", netif.getPacketsRecv());
                put("tx_pkts", netif.getPacketsSent());
                put("rx_bytes", netif.getBytesRecv());
--- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BasePlugin.java
+++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BasePlugin.java
@ -1,8 +1,9 @@
-package sysmon.plugins.base;
+package sysmon.plugins.os_base;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.pf4j.Plugin;
+import org.pf4j.PluginWrapper;
 import oshi.SystemInfo;
 import oshi.hardware.HardwareAbstractionLayer;

@ -14,6 +15,9 @@ public class BasePlugin extends Plugin {
    private static SystemInfo systemInfo;
    private static HardwareAbstractionLayer hardwareAbstractionLayer;

+    public BasePlugin(PluginWrapper wrapper) {
+        super(wrapper);
+    }

    public static HardwareAbstractionLayer getHardwareAbstractionLayer() {

--- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseProcessExtension.java
+++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseProcessExtension.java
@ -1,4 +1,4 @@
-package sysmon.plugins.base;
+package sysmon.plugins.os_base;

 import org.pf4j.Extension;
 import org.slf4j.Logger;
@ -18,13 +18,12 @@ public class BaseProcessExtension implements MetricExtension {

    // Extension details
    private final String name = "base_process";
+    private final String provides = "process";
    private final String description = "Base Process Metrics";

    // Configuration / Options
    private boolean enabled = true;
    private boolean threaded = false;
-    private String interval = "60s";
-
    private List<?> includeList = new ArrayList<Object>() {{
        add("java");
        add("node");
@ -38,16 +37,10 @@ public class BaseProcessExtension implements MetricExtension {
        add("corosync");
        add("rsyslogd");
        add("postgres");
-        add("mariadbd");
        add("memcached");
-        add("db2sysc");
-        add("dsmserv");
-        add("mmfsd");
-        add("systemd");
-        add("nginx");
    }};

-    private final long minUptimeInSeconds = 600;
+    private final long minUptimeInSeconds = 300;
    private SystemInfo systemInfo;


@ -73,8 +66,8 @@ public class BaseProcessExtension implements MetricExtension {
    }

    @Override
-    public String getInterval() {
-        return interval;
+    public String getProvides() {
+        return provides;
    }

    @Override
@ -90,9 +83,6 @@ public class BaseProcessExtension implements MetricExtension {
        if(map.containsKey("threaded")) {
            threaded = (boolean) map.get("threaded");
        }
-        if(map.containsKey("interval")) {
-            interval = (String) map.get("interval");
-        }
        if(map.containsKey("include")) {
            includeList = (List<?>) map.get("include");
        }
@ -123,12 +113,12 @@ public class BaseProcessExtension implements MetricExtension {
            }
            log.debug("pid: " + p.getProcessID() + ", name: " + p.getName() + ", virt: " + p.getVirtualSize() + " rss: " + p.getResidentSetSize());

-            TreeMap<String, String> tagsMap = new TreeMap<String, String>() {{
+            HashMap<String, String> tagsMap = new HashMap<String, String>() {{
                put("pid", String.valueOf(p.getProcessID()));
                put("name", p.getName());
            }};

-            TreeMap<String, Object> fieldsMap = new TreeMap<String, Object>() {{
+            HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{
                put("mem_rss", p.getResidentSetSize());
                put("mem_vsz", p.getVirtualSize());
                put("kernel_time", p.getKernelTime());
--- a/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseProcessorExtension.java
+++ b/plugins/os-base/src/main/java/sysmon/plugins/os_base/BaseProcessorExtension.java
@ -1,4 +1,4 @@
-package sysmon.plugins.base;
+package sysmon.plugins.os_base;

 import org.pf4j.Extension;
 import org.slf4j.Logger;
@ -8,10 +8,9 @@ import oshi.hardware.HardwareAbstractionLayer;
 import sysmon.shared.Measurement;
 import sysmon.shared.MetricExtension;
 import sysmon.shared.MetricResult;
-import sysmon.shared.PluginHelper;

+import java.util.HashMap;
 import java.util.Map;
-import java.util.TreeMap;

@Extension
 public class BaseProcessorExtension implements MetricExtension {
@ -20,12 +19,12 @@ public class BaseProcessorExtension implements MetricExtension {

    // Extension details
    private final String name = "base_processor";
+    private final String provides = "processor";
    private final String description = "Base Processor Metrics";

    // Configuration / Options
    private boolean enabled = true;
    private boolean threaded = false;
-    private String interval = "10s";

    private HardwareAbstractionLayer hardwareAbstractionLayer;
    private long[] oldTicks;
@ -52,8 +51,8 @@ public class BaseProcessorExtension implements MetricExtension {
    }

    @Override
-    public String getInterval() {
-        return interval;
+    public String getProvides() {
+        return provides;
    }

    @Override
@ -69,16 +68,13 @@ public class BaseProcessorExtension implements MetricExtension {
        if(map.containsKey("threaded")) {
            threaded = (boolean) map.get("threaded");
        }
-        if(map.containsKey("interval")) {
-            interval = (String) map.get("interval");
-        }
    }

    @Override
    public MetricResult getMetrics() {

-        TreeMap<String, String> tagsMap = new TreeMap<>();
-        TreeMap<String, Object> fieldsMap = new TreeMap<>();
+        HashMap<String, String> tagsMap = new HashMap<>();
+        HashMap<String, Object> fieldsMap = new HashMap<>();

        long[] ticks = hardwareAbstractionLayer.getProcessor().getSystemCpuLoadTicks();
        if(oldTicks == null || oldTicks.length != ticks.length) {
@ -99,15 +95,15 @@ public class BaseProcessorExtension implements MetricExtension {
        long nonBusy = idle + iowait;
        long total = busy + nonBusy;

-        fieldsMap.put("system", PluginHelper.round(((double) system / (double) total) * 100, 2));
-        fieldsMap.put("user", PluginHelper.round(((double) user / (double) total) * 100, 2));
-        fieldsMap.put("nice", PluginHelper.round(((double) nice / (double) total) * 100, 2));
-        fieldsMap.put("iowait", PluginHelper.round(((double) iowait / (double) total) * 100, 2));
-        fieldsMap.put("steal", PluginHelper.round(((double) steal / (double) total) * 100, 2));
-        fieldsMap.put("irq", PluginHelper.round(((double) irq / (double) total) * 100, 2));
-        fieldsMap.put("softirq", PluginHelper.round(((double) softirq / (double) total) * 100, 2));
-        fieldsMap.put("idle", PluginHelper.round(((double) idle / (double) total) * 100, 2));
-        fieldsMap.put("busy", PluginHelper.round(((double) busy / (double) total) * 100, 2));
+        fieldsMap.put("system", ((float) system / (float) total) * 100);
+        fieldsMap.put("user", ((float) user / (float) total) * 100);
+        fieldsMap.put("nice", ((float) nice / (float) total) * 100);
+        fieldsMap.put("iowait", ((float) iowait / (float) total) * 100);
+        fieldsMap.put("steal", ((float) steal / (float) total) * 100);
+        fieldsMap.put("irq", ((float) irq / (float) total) * 100);
+        fieldsMap.put("softirq", ((float) softirq / (float) total) * 100);
+        fieldsMap.put("idle", ((float) idle / (float) total) * 100);
+        fieldsMap.put("busy", ((float) busy / (float) total) * 100);

        oldTicks = ticks;
        log.debug(fieldsMap.toString());
--- a/plugins/os-base/src/test/resources/free.txt
+++ b/plugins/os-base/src/test/resources/free.txt
--- a/plugins/os-base/src/test/resources/meminfo.txt
+++ b/plugins/os-base/src/test/resources/meminfo.txt
--- a/plugins/os-base/src/test/resources/proc_diskstats1.txt
+++ b/plugins/os-base/src/test/resources/proc_diskstats1.txt
--- a/plugins/os-base/src/test/resources/proc_diskstats2.txt
+++ b/plugins/os-base/src/test/resources/proc_diskstats2.txt
--- a/plugins/os-base/src/test/resources/proc_net_dev1.txt
+++ b/plugins/os-base/src/test/resources/proc_net_dev1.txt
--- a/plugins/os-base/src/test/resources/proc_net_dev2.txt
+++ b/plugins/os-base/src/test/resources/proc_net_dev2.txt
--- a/plugins/os-base/src/test/resources/proc_net_sockstat.txt
+++ b/plugins/os-base/src/test/resources/proc_net_sockstat.txt
--- a/plugins/os-base/src/test/resources/proc_stats1.txt
+++ b/plugins/os-base/src/test/resources/proc_stats1.txt
--- a/plugins/os-base/src/test/resources/proc_stats2.txt
+++ b/plugins/os-base/src/test/resources/proc_stats2.txt
--- a/plugins/os-ibmi/README.md
+++ b/plugins/os-ibmi/README.md
@ -0,0 +1,4 @@
+# IBM i Plugin
+
+This is just for testing purposes.
+
--- a/plugins/os-ibmi/build.gradle
+++ b/plugins/os-ibmi/build.gradle
@ -0,0 +1,7 @@
+plugins {
+}
+
+dependencies {
+    // https://mvnrepository.com/artifact/net.sf.jt400/jt400
+    implementation group: 'net.sf.jt400', name: 'jt400', version: '10.7'
+}
--- a/plugins/os-ibmi/gradle.properties
+++ b/plugins/os-ibmi/gradle.properties
@ -0,0 +1,4 @@
+pluginId=sysmon-ibmi
+pluginClass=sysmon.plugins.os_ibmi.IbmIPlugin
+pluginDependencies=
+pluginDescription=Collects IBM-i OS metrics.
--- a/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/IbmIPlugin.java
+++ b/plugins/os-ibmi/src/main/java/sysmon/plugins/os_ibmi/IbmIPlugin.java
@ -0,0 +1,66 @@
+package sysmon.plugins.os_ibmi;
+
+import com.ibm.as400.access.AS400;
+import com.ibm.as400.access.SystemStatus;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.pf4j.Plugin;
+import org.pf4j.PluginWrapper;
+import oshi.SystemInfo;
+import oshi.hardware.HardwareAbstractionLayer;
+
+public class IbmIPlugin extends Plugin {
+
+    private static final Logger log = LoggerFactory.getLogger(IbmIPlugin.class);
+
+    private static SystemStatus systemStatus;
+    private static AS400 as400;
+
+    public IbmIPlugin(PluginWrapper wrapper) {
+        super(wrapper);
+    }
+
+
+    public static SystemStatus getSystemStatus() {
+
+        try {
+            if (as400 == null) {
+                as400 = IbmIPlugin.getAS400();
+            }
+            if(systemStatus == null) {
+                systemStatus = new SystemStatus(as400);
+            }
+        } catch (Exception exception) {
+            log.error("getSystemStatus() - {}", exception.getMessage());
+            return null;
+        }
+
+        return systemStatus;
+    }
+
+
+    public static AS400 getAS400() {
+
+        String osArch = System.getProperty("os.arch").toLowerCase();
+        String osName = System.getProperty("os.name").toLowerCase();
+
+        if(!osArch.equals("ppc64") && !osName.equals("os/400")) {
+            log.info("getAS400() - OS Arch: {}", osArch);
+            log.info("getAS400() - OS Name: {}", osName);
+            return null;
+        }
+
+        try {
+            as400 = new AS400("localhost", "*CURRENT");
+            //as400 = new AS400("10.32.64.142");
+        } catch (Exception exception) {
+            log.error("getAS400() - {}", exception.getMessage());
+            return null;
+        }
+
+        return as400;
+    }
+
+}
+
+
--- 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
@ -0,0 +1,114 @@
+package sysmon.plugins.os_ibmi;
+
+import com.ibm.as400.access.*;
+import org.pf4j.Extension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+//@Extension
+public class TestExtension implements MetricExtension {
+
+    private static final Logger log = LoggerFactory.getLogger(TestExtension.class);
+
+    // Extension details
+    private final String name = "ibmi_test";
+    private final String provides = "ibmi_test";
+    private final String description = "IBM i Test Metrics";
+
+    // Configuration / Options
+    private boolean enabled = true;
+    private boolean threaded = false;
+
+    private SystemStatus systemStatus;
+
+
+    @Override
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public boolean isThreaded() {
+        return threaded;
+    }
+
+    @Override
+    public boolean isSupported() {
+        systemStatus = IbmIPlugin.getSystemStatus();
+        return systemStatus != null;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getProvides() {
+        return provides;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public void setConfiguration(Map<String, Object> map) {
+        if (map.containsKey("enabled")) {
+            enabled = (boolean) map.get("enabled");
+        }
+        if(map.containsKey("threaded")) {
+            threaded = (boolean) map.get("threaded");
+        }
+    }
+
+    @Override
+    public MetricResult getMetrics() {
+
+        if(systemStatus == null) {
+            log.warn("getMetrics() - no system or status");
+            return null;
+        }
+
+        try {
+            int jobsInSystem = systemStatus.getJobsInSystem();
+            log.info("Jobs In System: {}", jobsInSystem);
+
+            int batchJobsRunning = systemStatus.getBatchJobsRunning();
+            log.info("Batch Jobs Running: {}", batchJobsRunning);
+
+            int activeThreads = systemStatus.getActiveThreadsInSystem();
+            log.info("Active Threads: {}", activeThreads);
+
+            int activeJobs = systemStatus.getActiveJobsInSystem();
+            log.info("Active Jobs: {}", activeJobs);
+
+            int onlineUsers = systemStatus.getUsersCurrentSignedOn();
+            log.info("Online Users: {}", onlineUsers);
+
+            HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{
+                put("jobs_total", jobsInSystem);
+                put("jobs_running", batchJobsRunning);
+                put("jobs_active", activeJobs);
+                put("threads", activeThreads);
+                put("users", onlineUsers);
+
+            }};
+            return new MetricResult(name, new Measurement(new HashMap<>(), fieldsMap));
+
+        } catch (AS400SecurityException | ErrorCompletingRequestException | InterruptedException | IOException | ObjectDoesNotExistException e) {
+            log.error("getMetrics() {}", e.getMessage());
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+}
--- a/plugins/os-linux/README.md
+++ b/plugins/os-linux/README.md
@ -0,0 +1,7 @@
+# Linux Plugins
+
+## Components
+
+### Network Sockets
+
+Collects statistics from */proc/net/sockstats*.
--- a/plugins/os-linux/build.gradle
+++ b/plugins/os-linux/build.gradle
@ -0,0 +1,2 @@
+plugins {
+}
--- a/plugins/os-linux/gradle.properties
+++ b/plugins/os-linux/gradle.properties
@ -0,0 +1,5 @@
+pluginId=sysmon-linux
+pluginClass=sysmon.plugins.os_linux.LinuxPlugin
+pluginDependencies=
+pluginDescription=Linux OS Metrics.
+
--- a/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxNetstatExtension.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxNetstatExtension.java
@ -0,0 +1,103 @@
+package sysmon.plugins.os_linux;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
+import sysmon.shared.PluginHelper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+// Disabled
+//@Extension
+public class LinuxNetstatExtension implements MetricExtension  {
+
+    private static final Logger log = LoggerFactory.getLogger(LinuxNetstatExtension.class);
+
+    // Extension details
+    private final String name = "linux_network_netstat";
+    private final String provides = "network_netstat";
+    private final String description = "Linux Netstat Metrics";
+
+    // Configuration / Options
+    private boolean enabled = true;
+    private boolean threaded = false;
+
+
+    @Override
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public boolean isThreaded() {
+        return threaded;
+    }
+
+    @Override
+    public boolean isSupported() {
+
+        if(!System.getProperty("os.name").toLowerCase().contains("linux")) {
+            log.warn("Requires Linux.");
+            return false;
+        }
+
+        if(PluginHelper.notExecutable("netstat")) {
+            log.warn("Requires the 'netstat' command.");
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getProvides() {
+        return provides;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public void setConfiguration(Map<String, Object> map) {
+        if (map.containsKey("enabled")) {
+            enabled = (boolean) map.get("enabled");
+        }
+        if(map.containsKey("threaded")) {
+            threaded = (boolean) map.get("threaded");
+        }
+    }
+
+    @Override
+    public MetricResult getMetrics() throws Exception {
+
+        HashMap<String, String> tagsMap;
+        HashMap<String, Object> fieldsMap;
+
+        try (InputStream inputStream = PluginHelper.executeCommand("netstat -s")) {
+            LinuxNetstatParser parser = processCommandOutput(inputStream);
+            tagsMap = parser.getTags();
+            fieldsMap = parser.getFields();
+        }
+
+        return new MetricResult(name, new Measurement(tagsMap, fieldsMap));
+    }
+
+
+    protected LinuxNetstatParser processCommandOutput(InputStream input) throws IOException {
+        return new LinuxNetstatParser(input);
+    }
+
+}
+
--- a/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxNetstatParser.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxNetstatParser.java
@ -0,0 +1,164 @@
+package sysmon.plugins.os_linux;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashMap;
+
+public class LinuxNetstatParser {
+
+    private static final Logger log = LoggerFactory.getLogger(LinuxNetstatParser.class);
+
+    private long ipTotalPacketsReceived;
+    private long ipForwarded;
+    private long ipIncomingPacketsDiscarded;
+    private long ipOutgoingPacketsDropped;
+
+    private long tcpConnectionsEstablished;
+    private long tcpSegmentsReceived;
+    private long tcpSegmentsSent;
+
+    private long udpPacketsReceived;
+    private long udpPacketsSent;
+
+
+    public LinuxNetstatParser(InputStream inputStream) throws IOException {
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+        while (reader.ready()) {
+            String line = reader.readLine();
+            log.debug("LinuxNetstatParser() - Line: " + line);
+
+            if(line.startsWith("Ip:")) {
+                parseIp(reader);
+            }
+
+            if(line.startsWith("Tcp:")) {
+                parseTcp(reader);
+            }
+
+            if(line.startsWith("Udp:")) {
+                parseUdp(reader);
+            }
+
+        }
+
+        inputStream.close();
+    }
+
+
+    protected void parseIp(BufferedReader reader) throws IOException {
+
+        while (reader.ready()) {
+            reader.mark(64);
+            String line = reader.readLine();
+
+            if(!line.startsWith(" ")) {
+                reader.reset();
+                return;
+            }
+
+            line = line.trim();
+
+            if(line.matches("(\\d+) total packets received")) {
+                ipTotalPacketsReceived = getFirstLong(line);
+            }
+
+            if(line.matches("(\\d+) forwarded")) {
+                ipForwarded = getFirstLong(line);
+            }
+
+            if(line.matches("(\\d+) incoming packets discarded")) {
+                ipIncomingPacketsDiscarded = getFirstLong(line);
+            }
+
+            if(line.matches("(\\d+) outgoing packets dropped")) {
+                ipOutgoingPacketsDropped = getFirstLong(line);
+            }
+
+        }
+
+    }
+
+
+    protected void parseTcp(BufferedReader reader) throws IOException {
+
+        while (reader.ready()) {
+            reader.mark(64);
+            String line = reader.readLine();
+
+            if(!line.startsWith(" ")) {
+                reader.reset();
+                return;
+            }
+
+            line = line.trim();
+
+            if(line.matches("(\\d+) connections established")) {
+                tcpConnectionsEstablished = getFirstLong(line);
+            }
+
+            if(line.matches("(\\d+) segments received")) {
+                tcpSegmentsReceived = getFirstLong(line);
+            }
+
+            if(line.matches("(\\d+) segments sent out")) {
+                tcpSegmentsSent = getFirstLong(line);
+            }
+
+        }
+
+    }
+
+    protected void parseUdp(BufferedReader reader) throws IOException {
+
+        while (reader.ready()) {
+            reader.mark(64);
+            String line = reader.readLine();
+
+            if(!line.startsWith(" ")) {
+                reader.reset();
+                return;
+            }
+
+            line = line.trim();
+
+            if(line.matches("(\\d+) packets received")) {
+                udpPacketsReceived = getFirstLong(line);
+            }
+
+            if(line.matches("(\\d+) packets sent")) {
+                udpPacketsSent = getFirstLong(line);
+            }
+        }
+
+    }
+
+
+    public HashMap<String, String> getTags() {
+        return new HashMap<>();
+    }
+
+    public HashMap<String, Object> getFields() {
+        return new HashMap<String, Object>() {{
+            put("ip_forwarded", ipForwarded);
+            put("ip_received", ipTotalPacketsReceived);
+            put("ip_dropped", ipOutgoingPacketsDropped);
+            put("ip_discarded", ipIncomingPacketsDiscarded);
+            put("tcp_connections", tcpConnectionsEstablished);
+            put("tcp_pkts_recv", tcpSegmentsReceived);
+            put("tcp_pkts_sent", tcpSegmentsSent);
+            put("udp_pkts_recv", udpPacketsReceived);
+            put("udp_pkts_sent", udpPacketsSent);
+        }};
+    }
+
+    private Long getFirstLong(String line) {
+        return Long.parseLong(line.substring(0, line.indexOf(" ")));
+    }
+
+}
--- a/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxPlugin.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxPlugin.java
@ -0,0 +1,17 @@
+package sysmon.plugins.os_linux;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.pf4j.Plugin;
+import org.pf4j.PluginWrapper;
+
+
+public class LinuxPlugin extends Plugin {
+
+    private static final Logger log = LoggerFactory.getLogger(LinuxPlugin.class);
+
+    public LinuxPlugin(PluginWrapper wrapper) {
+        super(wrapper);
+    }
+
+}
--- a/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxSocketExtension.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxSocketExtension.java
@ -0,0 +1,92 @@
+package sysmon.plugins.os_linux;
+
+import org.pf4j.Extension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sysmon.shared.Measurement;
+import sysmon.shared.MetricExtension;
+import sysmon.shared.MetricResult;
+import sysmon.shared.PluginHelper;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Extension
+public class LinuxSocketExtension implements MetricExtension {
+
+    private static final Logger log = LoggerFactory.getLogger(LinuxSocketExtension.class);
+
+    // Extension details
+    private final String name = "linux_network_sockets";
+    private final String provides = "network_sockets";
+    private final String description = "Linux Network Socket Metrics";
+
+    // Configuration / Options
+    private boolean enabled = true;
+    private boolean threaded = false;
+
+
+    @Override
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    @Override
+    public boolean isThreaded() {
+        return threaded;
+    }
+
+    @Override
+    public boolean isSupported() {
+
+        if(!System.getProperty("os.name").toLowerCase().contains("linux")) {
+            log.debug("Requires Linux.");
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getProvides() {
+        return provides;
+    }
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public void setConfiguration(Map<String, Object> map) {
+        if (map.containsKey("enabled")) {
+            enabled = (boolean) map.get("enabled");
+        }
+        if(map.containsKey("threaded")) {
+            threaded = (boolean) map.get("threaded");
+        }
+    }
+
+    @Override
+    public MetricResult getMetrics() {
+
+        LinuxSocketStat sockStat = processSockOutput(PluginHelper.readFile("/proc/net/sockstat"));
+
+        HashMap<String, String> tagsMap = sockStat.getTags();
+        HashMap<String, Object> fieldsMap = sockStat.getFields();
+
+        log.debug("getMetrics() - tags: {}, fields: {}", tagsMap, fieldsMap);
+        return new MetricResult(name, new Measurement(tagsMap, fieldsMap));
+    }
+
+    protected LinuxSocketStat processSockOutput(List<String> inputLines) {
+        return new LinuxSocketStat(inputLines);
+    }
+
+}
--- a/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxSocketStat.java
+++ b/plugins/os-linux/src/main/java/sysmon/plugins/os_linux/LinuxSocketStat.java
@ -0,0 +1,96 @@
+package sysmon.plugins.os_linux;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class LinuxSocketStat {
+
+    private static final Logger log = LoggerFactory.getLogger(LinuxSocketStat.class);
+
+    private static final Pattern pattern1 = Pattern.compile("^sockets: used (\\d+)");
+    private static final Pattern pattern2 = Pattern.compile("^TCP: inuse (\\d+) orphan (\\d+) tw (\\d+) alloc (\\d+) mem (\\d+)");
+    private static final Pattern pattern3 = Pattern.compile("^UDP: inuse (\\d+) mem (\\d+)");
+
+    private long sockets;
+    private long tcp_inuse;
+    private long tcp_orphan;
+    private long tcp_tw;
+    private long tcp_alloc;
+    private long tcp_mem;
+    private long udp_inuse;
+    private long udp_mem;
+
+    /*
+    sockets: used 1238
+    TCP: inuse 52 orphan 0 tw 18 alloc 55 mem 7
+    UDP: inuse 11 mem 10
+    UDPLITE: inuse 0
+    RAW: inuse 0
+    FRAG: inuse 0 memory 0
+    */
+
+
+    LinuxSocketStat(List<String> lines) {
+
+        Matcher matcher;
+        for(String line : lines) {
+            String proto = line.substring(0, line.indexOf(':'));
+
+            switch (proto) {
+                case "sockets":
+                    matcher = pattern1.matcher(line);
+                    if (matcher.matches() && matcher.groupCount() == 1) {
+                        sockets = Long.parseLong(matcher.group(1));
+                    }
+                    break;
+
+                case "TCP":
+                    matcher = pattern2.matcher(line);
+                    if (matcher.matches() && matcher.groupCount() == 5) {
+                        tcp_inuse = Long.parseLong(matcher.group(1));
+                        tcp_orphan = Long.parseLong(matcher.group(2));
+                        tcp_tw = Long.parseLong(matcher.group(3));
+                        tcp_alloc = Long.parseLong(matcher.group(4));
+                        tcp_mem = Long.parseLong(matcher.group(5));
+                    }
+                    break;
+
+                case "UDP":
+                    matcher = pattern3.matcher(line);
+                    if (matcher.matches() && matcher.groupCount() == 2) {
+                        udp_inuse = Long.parseLong(matcher.group(1));
+                        udp_mem = Long.parseLong(matcher.group(2));
+                    }
+                    break;
+
+            }
+
+        }
+
+    }
+
+
+    public HashMap<String, String> getTags() {
+        return new HashMap<>();
+    }
+
+
+    public HashMap<String, Object> getFields() {
+        return new HashMap<String, Object>() {{
+            put("sockets", sockets);
+            put("tcp_inuse", tcp_inuse);
+            put("tcp_alloc", tcp_alloc);
+            put("tcp_orphan", tcp_orphan);
+            put("tcp_mem", tcp_mem);
+            put("tcp_tw", tcp_tw);
+            put("udp_inuse", udp_inuse);
+            put("udp_mem", udp_mem);
+        }};
+    }
+
+}
--- a/plugins/os-linux/src/test/groovy/LinuxNetstatTest.groovy
+++ b/plugins/os-linux/src/test/groovy/LinuxNetstatTest.groovy
@ -0,0 +1,26 @@
+import spock.lang.Specification
+import sysmon.plugins.os_linux.LinuxNetstatParser
+
+class LinuxNetstatTest extends Specification {
+
+    void "test netstat parsing"() {
+
+        setup:
+        InputStream inputStream = getClass().getResourceAsStream('/netstat-linux.txt')
+
+        when:
+        LinuxNetstatParser parser = new LinuxNetstatParser(inputStream)
+
+        then:
+        parser.getFields().size() > 0
+        parser.getFields().get('ip_received') == 109772L
+        parser.getFields().get('ip_dropped') == 70L
+        parser.getFields().get('ip_discarded') == 0L
+        parser.getFields().get('tcp_pkts_sent') == 89891L
+        parser.getFields().get('tcp_pkts_recv') == 86167L
+        parser.getFields().get('udp_pkts_sent') == 10682L
+        parser.getFields().get('udp_pkts_recv') == 31928L
+
+    }
+
+}
--- a/plugins/os-linux/src/test/groovy/LinuxNetworkTest.groovy
+++ b/plugins/os-linux/src/test/groovy/LinuxNetworkTest.groovy
@ -0,0 +1,29 @@
+import spock.lang.Specification
+import sysmon.plugins.os_linux.LinuxSocketExtension
+import sysmon.plugins.os_linux.LinuxSocketStat
+
+class LinuxNetworkTest extends Specification {
+
+    void "test /proc/net/sockstat parsing"() {
+
+        setup:
+        def testFile = new File(getClass().getResource('/proc_net_sockstat.txt').toURI())
+        List<String> lines = testFile.readLines("UTF-8")
+
+        when:
+        LinuxSocketExtension extension = new LinuxSocketExtension()
+        LinuxSocketStat stats = extension.processSockOutput(lines)
+
+        then:
+        stats.getFields().get("sockets") == 1238L
+        stats.getFields().get("tcp_inuse") == 52L
+        stats.getFields().get("tcp_orphan") == 0L
+        stats.getFields().get("tcp_alloc") == 55L
+        stats.getFields().get("tcp_mem") == 7l
+        stats.getFields().get("tcp_tw") == 18L
+        stats.getFields().get("udp_inuse") == 11L
+        stats.getFields().get("udp_mem") == 10L
+
+    }
+
+}
--- a/plugins/os-linux/src/test/resources/netstat-linux.txt
+++ b/plugins/os-linux/src/test/resources/netstat-linux.txt
@ -0,0 +1,112 @@
+Ip:
+    Forwarding: 1
+    109772 total packets received
+    1 with invalid addresses
+    0 forwarded
+    0 incoming packets discarded
+    109769 incoming packets delivered
+    103916 requests sent out
+    70 outgoing packets dropped
+    1 dropped because of missing route
+Icmp:
+    52 ICMP messages received
+    0 input ICMP message failed
+    ICMP input histogram:
+        destination unreachable: 40
+        echo requests: 12
+    108 ICMP messages sent
+    0 ICMP messages failed
+    ICMP output histogram:
+        destination unreachable: 96
+        echo replies: 12
+IcmpMsg:
+        InType3: 40
+        InType8: 12
+        OutType0: 12
+        OutType3: 96
+Tcp:
+    3142 active connection openings
+    5 passive connection openings
+    2105 failed connection attempts
+    193 connection resets received
+    70 connections established
+    86167 segments received
+    89891 segments sent out
+    184 segments retransmitted
+    3 bad segments received
+    2735 resets sent
+Udp:
+    31928 packets received
+    96 packets to unknown port received
+    0 packet receive errors
+    10682 packets sent
+    0 receive buffer errors
+    0 send buffer errors
+    IgnoredMulti: 22
+UdpLite:
+TcpExt:
+    30 packets pruned from receive queue because of socket buffer overrun
+    178 TCP sockets finished time wait in fast timer
+    426 delayed acks sent
+    1 delayed acks further delayed because of locked socket
+    Quick ack mode was activated 1059 times
+    45809 packet headers predicted
+    7293 acknowledgments not containing data payload received
+    7659 predicted acknowledgments
+    TCPSackRecovery: 3
+    Detected reordering 4 times using SACK
+    TCPDSACKUndo: 1
+    1 congestion windows recovered without slow start after partial ack
+    TCPLostRetransmit: 82
+    3 timeouts after reno fast retransmit
+    1 timeouts in loss state
+    3 fast retransmits
+    3 retransmits in slow start
+    TCPTimeouts: 129
+    TCPLossProbes: 69
+    TCPLossProbeRecovery: 10
+    TCPBacklogCoalesce: 450
+    TCPDSACKOldSent: 991
+    TCPDSACKOfoSent: 6
+    TCPDSACKRecv: 45
+    202 connections reset due to unexpected data
+    147 connections reset due to early user close
+    13 connections aborted due to timeout
+    TCPDSACKIgnoredNoUndo: 10
+    TCPSackShifted: 1
+    TCPSackMerged: 1
+    TCPSackShiftFallback: 9
+    TCPRcvCoalesce: 5338
+    TCPOFOQueue: 793
+    TCPOFOMerge: 6
+    TCPChallengeACK: 3
+    TCPSYNChallenge: 3
+    TCPSpuriousRtxHostQueues: 6
+    TCPAutoCorking: 710
+    TCPFromZeroWindowAdv: 1
+    TCPToZeroWindowAdv: 1
+    TCPWantZeroWindowAdv: 4
+    TCPSynRetrans: 98
+    TCPOrigDataSent: 19048
+    TCPHystartTrainDetect: 3
+    TCPHystartTrainCwnd: 54
+    TCPHystartDelayDetect: 1
+    TCPHystartDelayCwnd: 24
+    TCPACKSkippedSeq: 1
+    TCPKeepAlive: 2595
+    TCPDelivered: 20025
+    TCPAckCompressed: 260
+    TcpTimeoutRehash: 116
+IpExt:
+    InMcastPkts: 2257
+    OutMcastPkts: 480
+    InBcastPkts: 98
+    OutBcastPkts: 78
+    InOctets: 147193028
+    OutOctets: 14723163
+    InMcastOctets: 478599
+    OutMcastOctets: 73462
+    InBcastOctets: 10094
+    OutBcastOctets: 5580
+    InNoECTPkts: 177661
+MPTcpExt:
--- a/plugins/os-linux/src/test/resources/proc_net_sockstat.txt
+++ b/plugins/os-linux/src/test/resources/proc_net_sockstat.txt
@ -0,0 +1,6 @@
+sockets: used 1238
+TCP: inuse 52 orphan 0 tw 18 alloc 55 mem 7
+UDP: inuse 11 mem 10
+UDPLITE: inuse 0
+RAW: inuse 0
+FRAG: inuse 0 memory 0
--- a/plugins/power/gradle.properties
+++ b/plugins/power/gradle.properties
@ -1,6 +0,0 @@
-pluginId=sysmon-power
-pluginClass=sysmon.plugins.power.PowerPlugin
-pluginVersion=0.0.1
-pluginProvider=System Monitor
-pluginDependencies=
-pluginDescription=Collects IBM Power specific metrics.
--- a/plugins/power/src/main/java/sysmon/plugins/power/PowerPlugin.java
+++ b/plugins/power/src/main/java/sysmon/plugins/power/PowerPlugin.java
@ -1,7 +0,0 @@
-package sysmon.plugins.power;
-
-import org.pf4j.Plugin;
-
-public class PowerPlugin extends Plugin {
-
-}
--- a/server/README.md
+++ b/server/README.md
@ -1,16 +1,16 @@
 # Server

-This is the server component of sysmon.
+This is the server component of SysMon.

 ## Installation

 Download *.deb* or *.rpm* package and install.

-See the [doc/systemd.md](doc/systemd.md) or [doc/sysv-init.md](doc/sysv-init.md) files for further instructions on running as a system service.
+See the [doc/systemd.md](doc/systemd.md) or [doc/sysv-init.md](doc/sysv-init.md) files for further instructions.

 ### Influx Database

-Create a database for the metrics and adjust duration as you prefer:
+Create a database for the metrics:

 ```text
 CREATE DATABASE "sysmon" WITH DURATION 90d REPLICATION 1;
--- a/server/build.gradle
+++ b/server/build.gradle
@ -3,9 +3,9 @@ import org.redline_rpm.header.Os
 plugins {
    id 'application'

-    id "net.nemerosa.versioning" version "2.15.1"
    id "com.github.johnrengelman.shadow" version "7.1.2"
-    id "com.netflix.nebula.ospackage" version "11.3.0"
+    id "net.nemerosa.versioning" version "2.15.1"
+    id "nebula.ospackage" version "9.1.1"
 }

 dependencies {
@ -28,7 +28,7 @@ def projectName = "sysmon-server"
 application {
    // Define the main class for the application.
    mainClass.set('sysmon.server.Application')
-    applicationDefaultJvmArgs = [ "-Xms64m", "-Xmx64m", "-XX:+ExitOnOutOfMemoryError", "-XX:+AlwaysPreTouch" ]
+    applicationDefaultJvmArgs = [ "-server", "-Xmx128m", "-XX:+UseG1GC" ]
 }

 run {
@ -40,6 +40,7 @@ tasks.named('test') {
    useJUnitPlatform()
 }

+apply plugin: 'nebula.ospackage'
 ospackage {
    packageName = projectName
    release = '1'
--- a/server/doc/sysmon-server.sh
+++ b/server/doc/sysmon-server.sh
@ -11,25 +11,20 @@

 dir="/opt/sysmon/server"
 cmd="/opt/sysmon/server/bin/server"
-args=""     # Add '-d' for debug output
+args="-d"
 user=""

-name="sysmon-server"
+name=`basename $0`
 pid_file="/var/run/$name.pid"
 stdout_log="/var/log/$name.log"
 stderr_log="/var/log/$name.err"

-# Uncomment if required
-#JAVA_HOME=/usr/java8_64
-#JAVA_HOME=/opt/ibm/ibm-semeru-certified-11-jre
-#export JAVA_HOME
-
 get_pid() {
    cat "$pid_file"
 }

 is_running() {
-    [ -f "$pid_file" ] && ps -p $(get_pid) > /dev/null 2>&1
+    [ -f "$pid_file" ] && ps -p `get_pid` > /dev/null 2>&1
 }

 case "$1" in
@ -38,7 +33,7 @@ case "$1" in
        echo "Already started"
    else
        echo "Starting $name"
-        cd "$dir" || exit 1
+        cd "$dir"
        if [ -z "$user" ]; then
            $cmd $args >> "$stdout_log" 2>> "$stderr_log" &
        else
@ -53,14 +48,16 @@ case "$1" in
    ;;
    stop)
    if is_running; then
-        echo "Stopping $name.."
-        kill $(get_pid)
+        echo -n "Stopping $name.."
+        kill `get_pid`
        for i in 1 2 3 4 5 6 7 8 9 10
        # for i in `seq 10`
        do
            if ! is_running; then
                break
            fi
+
+            echo -n "."
            sleep 1
        done
        echo
--- a/Show more
+++ b/Show more