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

Update oshi to fixed version.

Browse source
This commit is contained in:
Mark Nellemann 2022-10-30 13:03:53 +01:00
parent 63d2fbd780
commit 56c47fa1fb
6 changed files with 383 additions and 395 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -2,7 +2,7 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
## [1.0.19] - 2022-10-28 ## [1.0.21] - 2022-10-30
- Update dashboard - Update dashboard
- Add IP connections - Add IP connections
@ -30,7 +30,7 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
- Updated 3rd party dependencies. - Updated 3rd party dependencies.
[1.0.19]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v1.0.19%0Dv0.1.18 [1.0.19]: 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 [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.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.11]: https://bitbucket.org/mnellemann/sysmon/branches/compare/v0.1.11%0Dv0.1.10

2
bitbucket-pipelines.yml
View file

@ -1,4 +1,4 @@
image: openjdk:8 image: eclipse-temurin:8-jdk
pipelines: pipelines:
branches: branches:

2
client/build.gradle
View file

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

764
doc/dashboards/Sysmon - Host Overview.json
View file

@ -352,376 +352,6 @@
], ],
"type": "stat" "type": "stat"
}, },
{
"datasource": {
"type": "influxdb",
"uid": "${DS_SYSMON}"
},
"description": "",
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
"decimals": 0,
"mappings": [],
"min": 0,
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
}
]
},
"unit": "short"
},
"overrides": [
{
"matcher": {
"id": "byName",
"options": "base_netstat.ip_conn"
},
"properties": [
{
"id": "displayName",
"value": "IP Connections"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.tcp4_active"
},
"properties": [
{
"id": "displayName",
"value": "TCP4 Active"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.tcp4_passive"
},
"properties": [
{
"id": "displayName",
"value": "TCP4 Passive"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.tcp4_reset"
},
"properties": [
{
"id": "displayName",
"value": "TCP4 Reset"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.tcp4_failures"
},
"properties": [
{
"id": "displayName",
"value": "TCP4 Failures"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.udp4_recv"
},
"properties": [
{
"id": "displayName",
"value": "UDP4 Data Recv"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.udp4_sent"
},
"properties": [
{
"id": "displayName",
"value": "UDP4 Data Sent"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.udp4_recv_err"
},
"properties": [
{
"id": "displayName",
"value": "UDP4 Recv Errors"
}
]
}
]
},
"gridPos": {
"h": 5,
"w": 24,
"x": 0,
"y": 9
},
"id": 22,
"options": {
"colorMode": "value",
"graphMode": "area",
"justifyMode": "center",
"orientation": "auto",
"reduceOptions": {
"calcs": [
"lastNotNull"
],
"fields": "",
"values": false
},
"text": {},
"textMode": "auto"
},
"pluginVersion": "9.1.6",
"targets": [
{
"datasource": {
"type": "influxdb",
"uid": "${DS_SYSMON}"
},
"groupBy": [
{
"params": [
"$__interval"
],
"type": "time"
},
{
"params": [
"none"
],
"type": "fill"
}
],
"measurement": "base_netstat",
"orderByTime": "ASC",
"policy": "default",
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"ip_conn_total"
],
"type": "field"
},
{
"params": [],
"type": "last"
},
{
"params": [
"ip_conn"
],
"type": "alias"
}
],
[
{
"params": [
"tcp4_conn_active"
],
"type": "field"
},
{
"params": [],
"type": "last"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"tcp4_active"
],
"type": "alias"
}
],
[
{
"params": [
"tcp4_conn_passive"
],
"type": "field"
},
{
"params": [],
"type": "last"
},
{
"params": [
"10s"
],
"type": "non_negative_derivative"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"tcp4_passive"
],
"type": "alias"
}
],
[
{
"params": [
"tcp4_conn_established"
],
"type": "field"
},
{
"params": [],
"type": "last"
},
{
"params": [
"10s"
],
"type": "non_negative_derivative"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"tcp4_reset"
],
"type": "alias"
}
],
[
{
"params": [
"tcp4_conn_failures"
],
"type": "field"
},
{
"params": [],
"type": "last"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"tcp4_failures"
],
"type": "alias"
}
],
[
{
"params": [
"udp4_data_recv"
],
"type": "field"
},
{
"params": [],
"type": "last"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"udp4_recv"
],
"type": "alias"
}
],
[
{
"params": [
"udp4_data_sent"
],
"type": "field"
},
{
"params": [],
"type": "last"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"udp4_sent"
],
"type": "alias"
}
],
[
{
"params": [
"udp4_data_recv_error"
],
"type": "field"
},
{
"params": [],
"type": "last"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"udp4_recv_err"
],
"type": "alias"
}
]
],
"tags": [
{
"key": "hostname",
"operator": "=~",
"value": "/^$hostname$/"
}
]
}
],
"title": "Network Statistics",
"type": "stat"
},
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
@ -785,7 +415,7 @@
"h": 5, "h": 5,
"w": 12, "w": 12,
"x": 0, "x": 0,
"y": 14 "y": 9
}, },
"id": 2, "id": 2,
"options": { "options": {
@ -1017,7 +647,7 @@
"h": 5, "h": 5,
"w": 12, "w": 12,
"x": 12, "x": 12,
"y": 14 "y": 9
}, },
"id": 16, "id": 16,
"options": { "options": {
@ -1246,7 +876,7 @@
"h": 6, "h": 6,
"w": 12, "w": 12,
"x": 0, "x": 0,
"y": 19 "y": 14
}, },
"id": 29, "id": 29,
"options": { "options": {
@ -1507,7 +1137,7 @@
"h": 6, "h": 6,
"w": 4, "w": 4,
"x": 12, "x": 12,
"y": 19 "y": 14
}, },
"id": 19, "id": 19,
"options": { "options": {
@ -1645,7 +1275,7 @@
"properties": [ "properties": [
{ {
"id": "displayName", "id": "displayName",
"value": "Entitlements" "value": "Entitled Capacity"
}, },
{ {
"id": "unit", "id": "unit",
@ -1661,7 +1291,7 @@
"properties": [ "properties": [
{ {
"id": "displayName", "id": "displayName",
"value": "Phys. Cores" "value": "Power Cores"
} }
] ]
}, },
@ -1677,7 +1307,7 @@
}, },
{ {
"id": "unit", "id": "unit",
"value": "none" "value": "percent"
} }
] ]
} }
@ -1687,7 +1317,7 @@
"h": 6, "h": 6,
"w": 8, "w": 8,
"x": 16, "x": 16,
"y": 19 "y": 14
}, },
"id": 17, "id": 17,
"options": { "options": {
@ -1741,7 +1371,7 @@
}, },
{ {
"params": [], "params": [],
"type": "last" "type": "mean"
}, },
{ {
"params": [ "params": [
@ -1759,7 +1389,7 @@
}, },
{ {
"params": [], "params": [],
"type": "last" "type": "mean"
}, },
{ {
"params": [ "params": [
@ -1777,7 +1407,7 @@
}, },
{ {
"params": [], "params": [],
"type": "last" "type": "mean"
}, },
{ {
"params": [ "params": [
@ -1796,7 +1426,7 @@
] ]
} }
], ],
"title": "Shared Processor Usage (IBM Power)", "title": "Shared Processor Consumption (IBM Power)",
"type": "stat" "type": "stat"
}, },
{ {
@ -1862,7 +1492,7 @@
"h": 9, "h": 9,
"w": 12, "w": 12,
"x": 0, "x": 0,
"y": 25 "y": 20
}, },
"id": 10, "id": 10,
"options": { "options": {
@ -2022,7 +1652,7 @@
"h": 9, "h": 9,
"w": 12, "w": 12,
"x": 12, "x": 12,
"y": 25 "y": 20
}, },
"id": 30, "id": 30,
"options": { "options": {
@ -2183,7 +1813,7 @@
"h": 9, "h": 9,
"w": 12, "w": 12,
"x": 0, "x": 0,
"y": 34 "y": 29
}, },
"id": 18, "id": 18,
"options": { "options": {
@ -2338,7 +1968,7 @@
"h": 9, "h": 9,
"w": 12, "w": 12,
"x": 12, "x": 12,
"y": 34 "y": 29
}, },
"id": 31, "id": 31,
"options": { "options": {
@ -2424,6 +2054,364 @@
"title": "Network I/O - Transmit", "title": "Network I/O - Transmit",
"type": "timeseries" "type": "timeseries"
}, },
{
"datasource": {
"type": "influxdb",
"uid": "${DS_SYSMON}"
},
"description": "",
"fieldConfig": {
"defaults": {
"color": {
"mode": "thresholds"
},
"decimals": 0,
"mappings": [],
"min": 0,
"thresholds": {
"mode": "absolute",
"steps": [
{
"color": "green",
"value": null
}
]
},
"unit": "short"
},
"overrides": [
{
"matcher": {
"id": "byName",
"options": "base_netstat.ip_conn"
},
"properties": [
{
"id": "displayName",
"value": "IP Connections"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.tcp4_active"
},
"properties": [
{
"id": "displayName",
"value": "TCP4 Active"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.tcp4_passive"
},
"properties": [
{
"id": "displayName",
"value": "TCP4 Passive"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.tcp4_reset"
},
"properties": [
{
"id": "displayName",
"value": "TCP4 Reset"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.tcp4_failures"
},
"properties": [
{
"id": "displayName",
"value": "TCP4 Failures"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.udp4_recv"
},
"properties": [
{
"id": "displayName",
"value": "UDP4 Data Recv"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.udp4_sent"
},
"properties": [
{
"id": "displayName",
"value": "UDP4 Data Sent"
}
]
},
{
"matcher": {
"id": "byName",
"options": "base_netstat.udp4_recv_err"
},
"properties": [
{
"id": "displayName",
"value": "UDP4 Recv Errors"
}
]
}
]
},
"gridPos": {
"h": 5,
"w": 24,
"x": 0,
"y": 38
},
"id": 22,
"options": {
"colorMode": "value",
"graphMode": "area",
"justifyMode": "center",
"orientation": "auto",
"reduceOptions": {
"calcs": [
"lastNotNull"
],
"fields": "",
"values": false
},
"text": {},
"textMode": "auto"
},
"pluginVersion": "9.1.6",
"targets": [
{
"datasource": {
"type": "influxdb",
"uid": "${DS_SYSMON}"
},
"groupBy": [
{
"params": [
"$__interval"
],
"type": "time"
},
{
"params": [
"none"
],
"type": "fill"
}
],
"measurement": "base_netstat",
"orderByTime": "ASC",
"policy": "default",
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"ip_conn_total"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [
"ip_conn"
],
"type": "alias"
}
],
[
{
"params": [
"tcp4_conn_active"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"tcp4_active"
],
"type": "alias"
}
],
[
{
"params": [
"tcp4_conn_passive"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"tcp4_passive"
],
"type": "alias"
}
],
[
{
"params": [
"tcp4_conn_established"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"tcp4_reset"
],
"type": "alias"
}
],
[
{
"params": [
"tcp4_conn_failures"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"tcp4_failures"
],
"type": "alias"
}
],
[
{
"params": [
"udp4_data_recv"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"udp4_recv"
],
"type": "alias"
}
],
[
{
"params": [
"udp4_data_sent"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"udp4_sent"
],
"type": "alias"
}
],
[
{
"params": [
"udp4_data_recv_error"
],
"type": "field"
},
{
"params": [],
"type": "mean"
},
{
"params": [],
"type": "non_negative_difference"
},
{
"params": [
"udp4_recv_err"
],
"type": "alias"
}
]
],
"tags": [
{
"key": "hostname",
"operator": "=~",
"value": "/^$hostname$/"
}
]
}
],
"title": "Network Statistics",
"type": "stat"
},
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
@ -3119,7 +3107,7 @@
] ]
}, },
"time": { "time": {
"from": "now-6h", "from": "now-2d",
"to": "now-30s" "to": "now-30s"
}, },
"timepicker": { "timepicker": {
@ -3138,6 +3126,6 @@
"timezone": "", "timezone": "",
"title": "Sysmon - Host Overview", "title": "Sysmon - Host Overview",
"uid": "QkVPjseMt", "uid": "QkVPjseMt",
"version": 5, "version": 9,
"weekStart": "" "weekStart": ""
} }

4
gradle.properties
View file

@ -1,9 +1,9 @@
version = 1.0.20 version = 1.0.21
pf4jVersion = 3.7.0 pf4jVersion = 3.7.0
slf4jVersion = 2.0.3 slf4jVersion = 2.0.3
camelVersion = 3.14.5 camelVersion = 3.14.5
groovyVersion = 3.0.13 groovyVersion = 3.0.13
picocliVersion = 4.6.3 picocliVersion = 4.6.3
oshiVersion = 6.2.2 oshiVersion = 6.3.1
spockVersion = 2.3-groovy-3.0 spockVersion = 2.3-groovy-3.0
tomljVersion = 1.1.0 tomljVersion = 1.1.0

2
server/build.gradle
View file

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