CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1898 from jtgreen-cse/patch-3

Browse Source 
fix for #1725, grafana queries use non_negative_ variants
This commit is contained in:
Josh Patterson
2020-11-12 08:55:12 -05:00
committed by GitHub
parent 1de862985c 4e40392c55
commit 4ce0b770a5
6 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
salt/grafana/dashboards/eval/eval.json
View File

@@ -3565,7 +3565,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -3636,7 +3636,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -3656,7 +3656,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -4036,7 +4036,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],
@@ -4084,7 +4084,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],
@@ -4143,7 +4143,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -4214,7 +4214,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -4234,7 +4234,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -4278,7 +4278,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -4298,7 +4298,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [

44
salt/grafana/dashboards/manager/manager.json
View File

@@ -1795,7 +1795,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -1860,7 +1860,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -1880,7 +1880,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -1924,7 +1924,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -1944,7 +1944,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -2459,7 +2459,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -2524,7 +2524,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2544,7 +2544,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -2588,7 +2588,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2608,7 +2608,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3168,7 +3168,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -3233,7 +3233,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -3253,7 +3253,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3297,7 +3297,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -3317,7 +3317,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3463,7 +3463,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],
@@ -3510,7 +3510,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],
@@ -3700,7 +3700,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -3765,7 +3765,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -3785,7 +3785,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3829,7 +3829,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -3849,7 +3849,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [

34
salt/grafana/dashboards/managersearch/managersearch.json
View File

@@ -1799,7 +1799,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -1864,7 +1864,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -1884,7 +1884,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -1928,7 +1928,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -1948,7 +1948,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -2546,7 +2546,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -2611,7 +2611,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2631,7 +2631,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -2675,7 +2675,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2695,7 +2695,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3299,7 +3299,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT derivative(mean(\"rx_bytes\"), 1s) *8 FROM \"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-influxdb') AND $timeFilter GROUP BY time($__interval) fill(null)", "query": "SELECT non_negative_derivative(mean(\"rx_bytes\"), 1s) *8 FROM \"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-influxdb') AND $timeFilter GROUP BY time($__interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -3319,7 +3319,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3380,7 +3380,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3785,7 +3785,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3846,7 +3846,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -4164,7 +4164,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],
@@ -4211,7 +4211,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],

24
salt/grafana/dashboards/search_nodes/searchnode.json
View File

@@ -2135,7 +2135,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],
@@ -2182,7 +2182,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],
@@ -2781,7 +2781,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -2846,7 +2846,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2866,7 +2866,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -2910,7 +2910,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2930,7 +2930,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3353,7 +3353,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -3418,7 +3418,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -3438,7 +3438,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3482,7 +3482,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -3502,7 +3502,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [

30
salt/grafana/dashboards/sensor_nodes/sensor.json
View File

@@ -2729,7 +2729,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -2800,7 +2800,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2820,7 +2820,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -2864,7 +2864,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2884,7 +2884,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3311,7 +3311,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],
@@ -3359,7 +3359,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],
@@ -3418,7 +3418,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -3489,7 +3489,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -3509,7 +3509,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -4085,7 +4085,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -4156,7 +4156,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -4176,7 +4176,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -4220,7 +4220,7 @@
"measurement": "docker_container_net", "measurement": "docker_container_net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -4240,7 +4240,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [

32
salt/grafana/dashboards/standalone/standalone.json
View File

@@ -2010,7 +2010,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -2081,7 +2081,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2101,7 +2101,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -2145,7 +2145,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "B", "refId": "B",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2165,7 +2165,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -2794,7 +2794,7 @@
"aliasColors": { "aliasColors": {
"InBound": "#629E51", "InBound": "#629E51",
"OutBound": "#5195CE", "OutBound": "#5195CE",
"net.derivative": "#1F78C1" "net.non_negative_derivative": "#1F78C1"
}, },
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
@@ -2865,7 +2865,7 @@
"measurement": "net", "measurement": "net",
"orderByTime": "ASC", "orderByTime": "ASC",
"policy": "default", "policy": "default",
"query": "SELECT 8 * derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)", "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($interval) fill(null)",
"rawQuery": false, "rawQuery": false,
"refId": "A", "refId": "A",
"resultFormat": "time_series", "resultFormat": "time_series",
@@ -2885,7 +2885,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3466,7 +3466,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -3527,7 +3527,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -4102,7 +4102,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -4163,7 +4163,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -4854,7 +4854,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -4915,7 +4915,7 @@
"params": [ "params": [
"1s" "1s"
], ],
"type": "derivative" "type": "non_negative_derivative"
}, },
{ {
"params": [ "params": [
@@ -5202,7 +5202,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],
@@ -5250,7 +5250,7 @@
}, },
{ {
"params": [], "params": [],
"type": "difference" "type": "non_negative_difference"
} }
] ]
], ],