diff --git a/salt/grafana/dashboards/standalone/standalone.json b/salt/grafana/dashboards/standalone/standalone.json index 4de98988c..4efe46009 100644 --- a/salt/grafana/dashboards/standalone/standalone.json +++ b/salt/grafana/dashboards/standalone/standalone.json @@ -130,7 +130,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage_idle\" *-1+100 FROM \"so_long_term\".\"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage_idle\" *-1+100 FROM \"so_long_term\".\"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"cpu\" = 'cpu-total') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -406,7 +406,7 @@ "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-elasticsearch') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-elasticsearch') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -588,7 +588,7 @@ "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"container_name\" = 'so-kibana' AND \"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"container_name\" = 'so-kibana' AND \"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -769,7 +769,7 @@ "measurement": "suridrop", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_drop\" * 100 FROM \"so_long_term\".\"suridrop\" WHERE (\"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_drop\" * 100 FROM \"so_long_term\".\"suridrop\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -937,7 +937,7 @@ "measurement": "stenodrop", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_drop\" FROM \"so_long_term\".\"stenodrop\" WHERE (\"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_drop\" FROM \"so_long_term\".\"stenodrop\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1101,7 +1101,7 @@ "measurement": "disk", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_used_percent\" FROM \"so_long_term\".\"disk\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"path\" = '/') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_used_percent\" FROM \"so_long_term\".\"disk\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"path\" = '/') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1270,7 +1270,7 @@ "measurement": "disk", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_used_percent\" FROM \"so_long_term\".\"disk\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"path\" = '/nsm') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_used_percent\" FROM \"so_long_term\".\"disk\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"path\" = '/nsm') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1446,7 +1446,7 @@ "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-influxdb') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-influxdb') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1629,7 +1629,7 @@ "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-logstash') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-logstash') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -1815,7 +1815,7 @@ "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-suricata') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-suricata') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -2000,7 +2000,7 @@ "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-steno') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-steno') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -2669,7 +2669,7 @@ "measurement": "net", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT non_negative_derivative(\"mean_bytes_recv\", 1s) *8 FROM \"so_long_term\".\"net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"interface\" = 'eth0') AND time <= (now()-24h) and time <= now()", + "query": "SELECT non_negative_derivative(\"mean_bytes_recv\", 1s) *8 FROM \"so_long_term\".\"net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"interface\" = 'eth0') AND $timeFilter", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -2714,7 +2714,7 @@ "measurement": "net", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT non_negative_derivative(\"mean_bytes_sent\", 1s) *8 FROM \"so_long_term\".\"net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"interface\" = 'eth0') AND time <= (now()-24h) and time <= now()", + "query": "SELECT non_negative_derivative(\"mean_bytes_sent\", 1s) *8 FROM \"so_long_term\".\"net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"interface\" = 'eth0') AND $timeFilter", "rawQuery": true, "refId": "D", "resultFormat": "time_series", @@ -2900,7 +2900,7 @@ "measurement": "docker_container_mem", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage\" FROM \"so_long_term\".\"docker_container_mem\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-suricata') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage\" FROM \"so_long_term\".\"docker_container_mem\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-suricata') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -3073,7 +3073,7 @@ "measurement": "docker_container_mem", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage\" FROM \"so_long_term\".\"docker_container_mem\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-steno') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage\" FROM \"so_long_term\".\"docker_container_mem\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-steno') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -3549,7 +3549,7 @@ "measurement": "net", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT non_negative_derivative(\"mean_bytes_recv\", 1s) *8 FROM \"so_long_term\".\"net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"interface\" = '/{{ MONINT }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT non_negative_derivative(\"mean_bytes_recv\", 1s) *8 FROM \"so_long_term\".\"net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"interface\" = '/{{ MONINT }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -3823,7 +3823,7 @@ "measurement": "pcapage", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_seconds\" FROM \"so_long_term\".\"pcapage\" WHERE (\"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_seconds\" FROM \"so_long_term\".\"pcapage\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -4293,7 +4293,7 @@ "measurement": "docker_container_net", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT non_negative_derivative(\"mean_rx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-logstash') AND time <= (now()-24h) and time <= now()", + "query": "SELECT non_negative_derivative(\"mean_rx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-logstash') AND $timeFilter", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -4340,7 +4340,7 @@ "measurement": "docker_container_net", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT non_negative_derivative(\"mean_tx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-logstash') AND time <= (now()-24h) and time <= now()", + "query": "SELECT non_negative_derivative(\"mean_tx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-logstash') AND $timeFilter", "rawQuery": true, "refId": "D", "resultFormat": "time_series", @@ -4531,7 +4531,7 @@ "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-zeek') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-zeek') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -4710,7 +4710,7 @@ "measurement": "docker_container_mem", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage\" FROM \"so_long_term\".\"docker_container_mem\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-zeek') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage\" FROM \"so_long_term\".\"docker_container_mem\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-zeek') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -4882,7 +4882,7 @@ "measurement": "processes", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_total_threads\" FROM \"so_long_term\".\"processes\" WHERE (\"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_total_threads\" FROM \"so_long_term\".\"processes\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -5125,7 +5125,7 @@ "measurement": "docker_container_net", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT non_negative_derivative(\"mean_rx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-influxdb') AND time <= (now()-24h) and time <= now()", + "query": "SELECT non_negative_derivative(\"mean_rx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-influxdb') AND $timeFilter", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -5172,7 +5172,7 @@ "measurement": "docker_container_net", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT non_negative_derivative(\"mean_tx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-influxdb') AND time <= (now()-24h) and time <= now()", + "query": "SELECT non_negative_derivative(\"mean_tx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-influxdb') AND $timeFilter", "rawQuery": true, "refId": "D", "resultFormat": "time_series", @@ -5349,7 +5349,7 @@ "measurement": "zeekcaptureloss", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_loss\" FROM \"so_long_term\".\"zeekcaptureloss\" WHERE (\"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_loss\" FROM \"so_long_term\".\"zeekcaptureloss\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -5518,7 +5518,7 @@ "measurement": "zeekdrop", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_drop\" * 100 FROM \"so_long_term\".\"zeekdrop\" WHERE (\"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_drop\" * 100 FROM \"so_long_term\".\"zeekdrop\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -5684,7 +5684,7 @@ "measurement": "cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage_iowait\" FROM \"so_long_term\".\"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage_iowait\" FROM \"so_long_term\".\"cpu\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -5926,7 +5926,7 @@ "measurement": "docker_container_net", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT non_negative_derivative(\"mean_rx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-aptcacherng') AND time <= (now()-24h) and time <= now()", + "query": "SELECT non_negative_derivative(\"mean_rx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-aptcacherng') AND $timeFilter", "rawQuery": true, "refId": "C", "resultFormat": "time_series", @@ -5973,7 +5973,7 @@ "measurement": "docker_container_net", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT non_negative_derivative(\"mean_tx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-aptcacherng') AND time <= (now()-24h) and time <= now()", + "query": "SELECT non_negative_derivative(\"mean_tx_bytes\", 1s) *8 FROM \"so_long_term\".\"docker_container_net\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-aptcacherng') AND $timeFilter", "rawQuery": true, "refId": "D", "resultFormat": "time_series", @@ -6149,7 +6149,7 @@ "measurement": "influxsize", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_kbytes\" FROM \"so_long_term\".\"influxsize\" WHERE (\"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_kbytes\" FROM \"so_long_term\".\"influxsize\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -6308,7 +6308,7 @@ "measurement": "redisqueue", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_unparsed\" FROM \"so_long_term\".\"redisqueue\" WHERE (\"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_unparsed\" FROM \"so_long_term\".\"redisqueue\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -6657,7 +6657,7 @@ "measurement": "consumptioneps", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_eps\" FROM \"so_long_term\".\"consumptioneps\" WHERE (\"host\" = '{{ SERVERNAME }}') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_eps\" FROM \"so_long_term\".\"consumptioneps\" WHERE (\"host\" = '{{ SERVERNAME }}') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -6821,7 +6821,7 @@ "measurement": "docker_container_mem", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage\" FROM \"so_long_term\".\"docker_container_mem\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-redis') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage\" FROM \"so_long_term\".\"docker_container_mem\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-redis') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -7000,7 +7000,7 @@ "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "so_long_term", - "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-redis') AND time <= (now()-24h) and time <= now()", + "query": "SELECT \"mean_usage_percent\" /{{ CPUS }} FROM \"so_long_term\".\"docker_container_cpu\" WHERE (\"host\" = '{{ SERVERNAME }}' AND \"container_name\" = 'so-redis') AND $timeFilter", "rawQuery": true, "refId": "B", "resultFormat": "time_series",