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

Version 1.0.19 - updated dashboards.

Browse source
This commit is contained in:
Mark Nellemann 2022-10-28 10:17:51 +02:00
parent 7b90b20f3f
commit 997158f17b
6 changed files with 888 additions and 905 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -2,6 +2,10 @@
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
- Update dashboard
- Add IP connections
## [1.0.18] - 2022-10-24 ## [1.0.18] - 2022-10-24
- Bump version to 1.x to indicate stable release. - Bump version to 1.x to indicate stable release.
- Update 3rd party dependencies. - Update 3rd party dependencies.
@ -26,6 +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.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

1659
doc/Sysmon Agent - Host Overview.json → doc/Sysmon - Host Overview.json
View file

File diff suppressed because it is too large Load diff

123
doc/Sysmon Agent - Process Explorer.json → doc/Sysmon - Process Explorer.json
View file

@ -1,53 +1,4 @@
{ {
"__inputs": [
{
"name": "DS_INFLUXDB-SYSMON",
"label": "InfluxDB-sysmon",
"description": "",
"type": "datasource",
"pluginId": "influxdb",
"pluginName": "InfluxDB"
}
],
"__elements": {},
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "9.0.7"
},
{
"type": "datasource",
"id": "influxdb",
"name": "InfluxDB",
"version": "1.0.0"
},
{
"type": "panel",
"id": "stat",
"name": "Stat",
"version": ""
},
{
"type": "panel",
"id": "table",
"name": "Table",
"version": ""
},
{
"type": "panel",
"id": "text",
"name": "Text",
"version": ""
},
{
"type": "panel",
"id": "timeseries",
"name": "Time series",
"version": ""
}
],
"annotations": { "annotations": {
"list": [ "list": [
{ {
@ -74,14 +25,14 @@
"editable": true, "editable": true,
"fiscalYearStartMonth": 0, "fiscalYearStartMonth": 0,
"graphTooltip": 0, "graphTooltip": 0,
"id": null, "id": 1,
"links": [], "links": [],
"liveNow": false, "liveNow": false,
"panels": [ "panels": [
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"gridPos": { "gridPos": {
"h": 3, "h": 3,
@ -94,12 +45,12 @@
"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 ", "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" "mode": "markdown"
}, },
"pluginVersion": "9.0.7", "pluginVersion": "9.1.6",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"refId": "A" "refId": "A"
} }
@ -137,7 +88,7 @@
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"description": "", "description": "",
"fieldConfig": { "fieldConfig": {
@ -182,12 +133,12 @@
"showHeader": true, "showHeader": true,
"sortBy": [] "sortBy": []
}, },
"pluginVersion": "9.0.7", "pluginVersion": "9.1.6",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"groupBy": [ "groupBy": [
{ {
@ -285,7 +236,7 @@
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
@ -353,12 +304,12 @@
"text": {}, "text": {},
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "9.0.7", "pluginVersion": "9.1.6",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"groupBy": [ "groupBy": [
{ {
@ -444,7 +395,7 @@
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
@ -512,12 +463,12 @@
"text": {}, "text": {},
"textMode": "auto" "textMode": "auto"
}, },
"pluginVersion": "9.0.7", "pluginVersion": "9.1.6",
"targets": [ "targets": [
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"groupBy": [ "groupBy": [
{ {
@ -603,7 +554,7 @@
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"description": "", "description": "",
"fieldConfig": { "fieldConfig": {
@ -612,6 +563,8 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
@ -664,7 +617,8 @@
"legend": { "legend": {
"calcs": [], "calcs": [],
"displayMode": "list", "displayMode": "list",
"placement": "bottom" "placement": "bottom",
"showLegend": true
}, },
"tooltip": { "tooltip": {
"mode": "multi", "mode": "multi",
@ -677,7 +631,7 @@
"alias": "$col", "alias": "$col",
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"groupBy": [ "groupBy": [
{ {
@ -779,7 +733,7 @@
{ {
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"description": "", "description": "",
"fieldConfig": { "fieldConfig": {
@ -788,6 +742,8 @@
"mode": "palette-classic" "mode": "palette-classic"
}, },
"custom": { "custom": {
"axisCenteredZero": false,
"axisColorMode": "text",
"axisLabel": "", "axisLabel": "",
"axisPlacement": "auto", "axisPlacement": "auto",
"barAlignment": 0, "barAlignment": 0,
@ -847,7 +803,8 @@
"legend": { "legend": {
"calcs": [], "calcs": [],
"displayMode": "list", "displayMode": "list",
"placement": "bottom" "placement": "bottom",
"showLegend": true
}, },
"tooltip": { "tooltip": {
"mode": "multi", "mode": "multi",
@ -860,7 +817,7 @@
"alias": "$col", "alias": "$col",
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"groupBy": [ "groupBy": [
{ {
@ -953,16 +910,20 @@
} }
], ],
"refresh": "1m", "refresh": "1m",
"schemaVersion": 36, "schemaVersion": 37,
"style": "dark", "style": "dark",
"tags": [], "tags": [],
"templating": { "templating": {
"list": [ "list": [
{ {
"current": {}, "current": {
"selected": true,
"text": "mini",
"value": "mini"
},
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"definition": "SHOW TAG VALUES FROM \"base_memory\" WITH KEY = \"hostname\" WHERE time > now() - 60m", "definition": "SHOW TAG VALUES FROM \"base_memory\" WITH KEY = \"hostname\" WHERE time > now() - 60m",
"hide": 0, "hide": 0,
@ -982,10 +943,14 @@
"useTags": false "useTags": false
}, },
{ {
"current": {}, "current": {
"selected": false,
"text": "java",
"value": "java"
},
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"definition": "SHOW TAG VALUES FROM \"base_process\" WITH KEY = \"name\" WHERE hostname =~ /$hostname/AND time > now() - 60m", "definition": "SHOW TAG VALUES FROM \"base_process\" WITH KEY = \"name\" WHERE hostname =~ /$hostname/AND time > now() - 60m",
"hide": 0, "hide": 0,
@ -1002,10 +967,14 @@
"type": "query" "type": "query"
}, },
{ {
"current": {}, "current": {
"selected": false,
"text": "All",
"value": "$__all"
},
"datasource": { "datasource": {
"type": "influxdb", "type": "influxdb",
"uid": "${DS_INFLUXDB-SYSMON}" "uid": "jzYL6mnVk"
}, },
"definition": "SELECT DISTINCT(\"pid\") FROM (SELECT * FROM \"base_process\" WHERE time > now() - 60m AND \"hostname\" =~ /$hostname/ AND \"name\" =~ /$process/)", "definition": "SELECT DISTINCT(\"pid\") FROM (SELECT * FROM \"base_process\" WHERE time > now() - 60m AND \"hostname\" =~ /$hostname/ AND \"name\" =~ /$process/)",
"hide": 0, "hide": 0,
@ -1041,8 +1010,8 @@
] ]
}, },
"timezone": "", "timezone": "",
"title": "Sysmon Agent - Process Explorer", "title": "Sysmon - Process Explorer",
"uid": "Vjut5mS7k", "uid": "Vjut5mS7k",
"version": 4, "version": 2,
"weekStart": "" "weekStart": ""
} }

2
gradle.properties
View file

@ -1,4 +1,4 @@
version = 1.0.18 version = 1.0.19
pf4jVersion = 3.7.0 pf4jVersion = 3.7.0
slf4jVersion = 2.0.3 slf4jVersion = 2.0.3
camelVersion = 3.14.5 camelVersion = 3.14.5

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

@ -79,6 +79,8 @@ public class BaseNetstatExtension implements MetricExtension {
HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{ HashMap<String, Object> fieldsMap = new HashMap<String, Object>() {{
put("ip_conn_total", systemInfo.getOperatingSystem().getInternetProtocolStats().getConnections().size());
put("tcp4_conn_active", systemInfo.getOperatingSystem().getInternetProtocolStats().getTCPv4Stats().getConnectionsActive()); put("tcp4_conn_active", systemInfo.getOperatingSystem().getInternetProtocolStats().getTCPv4Stats().getConnectionsActive());
put("tcp4_conn_passive", systemInfo.getOperatingSystem().getInternetProtocolStats().getTCPv4Stats().getConnectionsPassive()); put("tcp4_conn_passive", systemInfo.getOperatingSystem().getInternetProtocolStats().getTCPv4Stats().getConnectionsPassive());
put("tcp4_conn_established", systemInfo.getOperatingSystem().getInternetProtocolStats().getTCPv4Stats().getConnectionsEstablished()); put("tcp4_conn_established", systemInfo.getOperatingSystem().getInternetProtocolStats().getTCPv4Stats().getConnectionsEstablished());

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

@ -43,7 +43,7 @@ public class BaseProcessExtension implements MetricExtension {
add("mmfsd"); add("mmfsd");
}}; }};
private final long minUptimeInSeconds = 300; private final long minUptimeInSeconds = 600;
private SystemInfo systemInfo; private SystemInfo systemInfo;