From 638aab4b5deaf1e1b650fc11fbc63cdc041040b4 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Fri, 11 Jun 2021 10:37:50 +0200 Subject: [PATCH 1/2] Disable netstat extension. Update example dashboard. --- .../src/main/java/sysmon/plugins/os_base/BaseDiskExtension.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git 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 index 8fe5353..3f5fa2d 100644 --- 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 @@ -58,7 +58,7 @@ public class BaseDiskExtension implements MetricExtension { List diskStores = hardwareAbstractionLayer.getDiskStores(); for(HWDiskStore store : diskStores) { String name = store.getName(); - if (name.matches("hdisk[0-9]+") || name.matches("/dev/[sv]d[a-z]{1}") || name.matches("/dev/nvme[0-9]n[0-9]")) { + if (name.matches("hdisk[0-9]+") || name.matches("/dev/x?[sv]d[a-z]{1}") || name.matches("/dev/nvme[0-9]n[0-9]")) { log.debug("Using device: " + name); writeBytes += store.getWriteBytes(); readBytes += store.getReadBytes(); From 0d8924c753521858bc2698ac00f85c1374ab5554 Mon Sep 17 00:00:00 2001 From: Mark Nellemann Date: Fri, 11 Jun 2021 12:57:37 +0200 Subject: [PATCH 2/2] Update camel dependency. Improve handling of oshi dependency. --- client/build.gradle | 2 +- gradle.properties | 5 +++-- plugins/build.gradle | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/client/build.gradle b/client/build.gradle index 131cc96..5b6a03e 100644 --- a/client/build.gradle +++ b/client/build.gradle @@ -19,7 +19,7 @@ dependencies { implementation "info.picocli:picocli:${picocliVersion}" implementation 'org.tomlj:tomlj:1.0.0' - implementation(group: 'com.github.oshi', name: 'oshi-core', version: "5.7.3") { + runtimeOnly(group: 'com.github.oshi', name: 'oshi-core', version: oshiVersion) { exclude(group: "org.slf4j") } diff --git a/gradle.properties b/gradle.properties index 970fc1b..5794fb7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,6 @@ -version=0.0.3 +version=0.0.4 pf4jVersion=3.6.0 slf4jVersion=1.7.30 -camelVersion=3.7.4 +camelVersion=3.10.0 picocliVersion=4.6.1 +oshiVersion=5.7.3 \ No newline at end of file diff --git a/plugins/build.gradle b/plugins/build.gradle index eef612d..c2ed79c 100644 --- a/plugins/build.gradle +++ b/plugins/build.gradle @@ -22,7 +22,7 @@ subprojects { } annotationProcessor(group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}") - implementation(group: 'com.github.oshi', name: 'oshi-core', version: "5.7.3") { + compileOnly(group: 'com.github.oshi', name: 'oshi-core', version: oshiVersion) { exclude(group: "org.slf4j") }