nellemann/sysmon
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 3 Wiki Activity

Merged in development (pull request #3)

Browse source 
Development
This commit is contained in:
Mark Nellemann 2021-06-11 11:02:31 +00:00
parent 84a1848eb2 0d8924c753
commit 12dc59f6f9
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/build.gradle
View file

@ -19,7 +19,7 @@ dependencies {
implementation "info.picocli:picocli:${picocliVersion}" implementation "info.picocli:picocli:${picocliVersion}"
implementation 'org.tomlj:tomlj:1.0.0' 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") exclude(group: "org.slf4j")
} }

5
gradle.properties
View file

@ -1,5 +1,6 @@
version=0.0.3 version=0.0.4
pf4jVersion=3.6.0 pf4jVersion=3.6.0
slf4jVersion=1.7.30 slf4jVersion=1.7.30
camelVersion=3.7.4 camelVersion=3.10.0
picocliVersion=4.6.1 picocliVersion=4.6.1
oshiVersion=5.7.3

2
plugins/build.gradle
View file

@ -22,7 +22,7 @@ subprojects {
} }
annotationProcessor(group: 'org.pf4j', name: 'pf4j', version: "${pf4jVersion}") 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") exclude(group: "org.slf4j")
} }

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

@ -58,7 +58,7 @@ public class BaseDiskExtension implements MetricExtension {
List<HWDiskStore> diskStores = hardwareAbstractionLayer.getDiskStores(); List<HWDiskStore> diskStores = hardwareAbstractionLayer.getDiskStores();
for(HWDiskStore store : diskStores) { for(HWDiskStore store : diskStores) {
String name = store.getName(); 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); log.debug("Using device: " + name);
writeBytes += store.getWriteBytes(); writeBytes += store.getWriteBytes();
readBytes += store.getReadBytes(); readBytes += store.getReadBytes();