diff --git a/gradle.properties b/gradle.properties index 2e47951..b297296 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,7 @@ -version = 0.1.11 +version = 0.1.12 pf4jVersion = 3.6.0 slf4jVersion = 1.7.36 -camelVersion = 3.14.1 +camelVersion = 3.14.2 +groovyVersion = 3.0.10 picocliVersion = 4.6.3 -oshiVersion = 6.1.4 \ No newline at end of file +oshiVersion = 6.1.5 \ No newline at end of file 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 0980272..773efbe 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 @@ -81,7 +81,7 @@ public class BaseDiskExtension implements MetricExtension { for(HWDiskStore store : diskStores) { String name = store.getName(); - if (name.matches("h?disk[0-9]+") || name.matches("/dev/x?[sv]d[a-z]") || name.matches("/dev/nvme[0-9]n[0-9]")) { + 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")) { HashMap tagsMap = new HashMap() {{ put("name", name); @@ -96,6 +96,8 @@ public class BaseDiskExtension implements MetricExtension { log.debug("getMetrics() - tags: {}, fields: {}", tagsMap, fieldsMap); measurementList.add(new Measurement(tagsMap, fieldsMap)); + } else { + log.debug("getMetrics() - skipping device: {}", name); } } diff --git a/shared/build.gradle b/shared/build.gradle index af10177..307e9f0 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -17,9 +17,9 @@ repositories { } dependencies { - testImplementation 'org.codehaus.groovy:groovy:3.0.9' - testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0' - testImplementation 'junit:junit:4.13.2' + testImplementation "org.codehaus.groovy:groovy:${groovyVersion}" + testImplementation "org.spockframework:spock-core:2.0-groovy-3.0" + testImplementation "junit:junit:4.13.2" testImplementation "org.slf4j:slf4j-api:${slf4jVersion}" implementation "org.slf4j:slf4j-api:${slf4jVersion}"