From 2ba548fcfc512fd584d99d47e8fa36ca6329a397 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 29 Oct 2021 17:11:51 -0400 Subject: [PATCH 01/47] grafana bug fixes and improvements - https://github.com/Security-Onion-Solutions/securityonion/issues/6007 --- salt/grafana/defaults.yaml | 103 +----- ...u_docker_combined_current_graph.json.jinja | 247 ++++++++------ ...cpu_docker_combined_trend_graph.json.jinja | 239 ++++++++----- .../panels/load_averages_graph.json.jinja | 6 +- .../logstash_estimated_eps_graph.json.jinja | 8 +- ...nt_interface_traffic_both_graph.json.jinja | 275 ++++++++------- ...d_docker_combined_current_graph.json.jinja | 230 ++++++------- ...sed_docker_combined_trend_graph.json.jinja | 204 ++++++------ ...or_interface_traffic_both_graph.json.jinja | 231 +++++++------ .../monitor_interface_traffic_stat.json.jinja | 198 ++++++----- ...e_docker_combined_current_graph.json.jinja | 315 +++++++++--------- ...age_docker_combined_trend_graph.json.jinja | 200 ++++++----- ...enographer_pcap_retention_graph.json.jinja | 204 ++++++------ ...ime_docker_combined_trend_graph.json.jinja | 220 ++++++------ .../panels/zeek_capture_loss_graph.json.jinja | 204 ++++++------ 15 files changed, 1519 insertions(+), 1365 deletions(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 00589a8b2..9f8b8821e 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -598,19 +598,13 @@ grafana: x: 0 y: 188 h: 8 - w: 10 + w: 12 zeek_capture_loss_graph: gridPos: - x: 10 + x: 12 y: 188 h: 8 - w: 10 - zeek_restarts_healthcheck_stat: - gridPos: - x: 20 - y: 188 - h: 8 - w: 4 + w: 12 row_suricata: gridPos: @@ -726,15 +720,9 @@ grafana: y: 1 h: 4 w: 4 - logstash_estimated_eps_stat: - gridPos: - x: 0 - y: 5 - h: 4 - w: 4 redis_queue_stat: gridPos: - x: 4 + x: 0 y: 5 h: 4 w: 4 @@ -1633,19 +1621,13 @@ grafana: x: 0 y: 153 h: 8 - w: 10 + w: 12 zeek_capture_loss_graph: gridPos: - x: 10 + x: 12 y: 153 h: 8 - w: 10 - zeek_restarts_healthcheck_stat: - gridPos: - x: 20 - y: 153 - h: 8 - w: 4 + w: 12 row_suricata: gridPos: @@ -1679,6 +1661,7 @@ grafana: h: 8 w: 8 + searchnode: templating: list: @@ -1753,12 +1736,6 @@ grafana: y: 5 h: 4 w: 4 - redis_queue_stat: - gridPos: - x: 4 - y: 5 - h: 4 - w: 4 row_cpu: gridPos: @@ -1954,19 +1931,6 @@ grafana: h: 8 w: 24 - row_redis: - gridPos: - x: 0 - y: 161 - h: 1 - w: 24 - redis_queue_graph: - gridPos: - x: 0 - y: 162 - h: 8 - w: 24 - heavynode: templating: @@ -2048,33 +2012,27 @@ grafana: y: 5 h: 4 w: 4 - redis_queue_stat: + monitor_interface_traffic_stat: gridPos: x: 4 y: 5 h: 4 w: 4 - monitor_interface_traffic_stat: + zeek_packet_loss_stat: gridPos: x: 8 y: 5 h: 4 w: 4 - zeek_packet_loss_stat: + suricata_packet_loss_stat: gridPos: x: 12 y: 5 h: 4 w: 4 - suricata_packet_loss_stat: - gridPos: - x: 16 - y: 5 - h: 4 - w: 4 stenographer_packet_loss_stat: gridPos: - x: 20 + x: 16 y: 5 h: 4 w: 4 @@ -2291,19 +2249,6 @@ grafana: h: 8 w: 24 - row_redis: - gridPos: - x: 0 - y: 161 - h: 1 - w: 24 - redis_queue_graph: - gridPos: - x: 0 - y: 162 - h: 8 - w: 24 - row_zeek: gridPos: x: 0 @@ -2315,19 +2260,13 @@ grafana: x: 0 y: 171 h: 8 - w: 10 + w: 12 zeek_capture_loss_graph: gridPos: - x: 10 + x: 12 y: 171 h: 8 - w: 10 - zeek_restarts_healthcheck_stat: - gridPos: - x: 20 - y: 171 - h: 8 - w: 4 + w: 12 row_suricata: gridPos: @@ -2721,19 +2660,13 @@ grafana: x: 0 y: 188 h: 8 - w: 10 + w: 12 zeek_capture_loss_graph: gridPos: - x: 10 + x: 12 y: 188 h: 8 - w: 10 - zeek_restarts_healthcheck_stat: - gridPos: - x: 20 - y: 188 - h: 8 - w: 4 + w: 12 row_suricata: gridPos: diff --git a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja index 61d2d3edc..54f18ee6c 100644 --- a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja @@ -1,20 +1,142 @@ { - "type": "graph", - "title": "Container CPU Usage Current", + "id": 100, "gridPos": { "x": {{ PANELS.cpu_docker_combined_current_graph.gridPos.x }}, "y": {{ PANELS.cpu_docker_combined_current_graph.gridPos.y }}, "w": {{ PANELS.cpu_docker_combined_current_graph.gridPos.w }}, "h": {{ PANELS.cpu_docker_combined_current_graph.gridPos.h }} }, - "id": 100, + "type": "timeseries", + "title": "Container CPU Usage Current", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "decimals": 1, + "unit": "percent" + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/n_cpus/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + } + ] + } + ] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", + "alias": "$tag_host: $tag_container_name", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "container_name" + ], + "type": "tag" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "docker_container_cpu", "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(\"usage_percent\") FROM \"docker_container_cpu\" WHERE (\"host\" =~ /^$servername$/ AND \"container_name\" =~ /^$containers$/) AND $timeFilter GROUP BY time($__interval), \"container_name\", \"host\" fill(null)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "usage_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", @@ -28,6 +150,21 @@ "value": "/^$containers$/" } ], + "hide": false + }, + { + "refId": "B", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], "groupBy": [ { "type": "time", @@ -38,7 +175,7 @@ { "type": "tag", "params": [ - "container_name" + "host" ] }, { @@ -53,105 +190,27 @@ { "type": "field", "params": [ - "usage_percent" + "n_cpus" ] }, { - "type": "mean", + "type": "last", "params": [] }, { "type": "math", "params": [ - " / $cpucount" + " * 100" ] } ] ], - "measurement": "docker_container_cpu", - "alias": "$tag_container_name" + "measurement": "system", + "alias": "$tag_host: n_cpus*100" } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "percent", - "$$hashKey": "object:315" - }, - { - "label": null, - "show": false, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:316" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": false, - "min": false, - "max": false, - "current": false, - "total": false, - "avg": false, - "alignAsTable": false, - "rightSide": false, - "hideZero": false - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "decimals": null, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, + "transformations": [], + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja index f8ddce1c1..d587a0529 100644 --- a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja @@ -1,20 +1,79 @@ { - "type": "graph", - "title": "Container CPU Usage Trend", + "id": 101, "gridPos": { "x": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.x }}, "y": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.y }}, "w": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.w }}, "h": {{ PANELS.cpu_docker_combined_trend_graph.gridPos.h }} }, - "id": 101, + "type": "timeseries", + "title": "Container CPU Usage Trend", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "so_long_term", - "resultFormat": "time_series", + "alias": "$tag_host: $tag_container_name", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "container_name" + ], + "type": "tag" + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "docker_container_cpu", "orderByTime": "ASC", + "policy": "so_long_term", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "mean_usage_percent" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], "tags": [ { "key": "host", @@ -27,6 +86,20 @@ "operator": "=~", "value": "/^$containers$/" } + ] + }, + { + "refId": "B", + "hide": false, + "policy": "so_long_term", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } ], "groupBy": [ { @@ -38,7 +111,7 @@ { "type": "tag", "params": [ - "container_name" + "host" ] }, { @@ -53,106 +126,88 @@ { "type": "field", "params": [ - "mean_usage_percent" + "mean_n_cpus" ] }, { - "type": "mean", + "type": "last", "params": [] }, { "type": "math", "params": [ - " / $cpucount" + " * 100" ] } ] ], - "measurement": "docker_container_cpu", - "alias": "$tag_container_name" + "measurement": "system", + "alias": "$tag_host: n_cpus*100" } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "percent", - "$$hashKey": "object:315" + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": true, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "percent", + "decimals": 1 }, - { - "label": null, - "show": false, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:316" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/n_cpus/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": false, - "current": false, - "total": false, - "avg": true, - "alignAsTable": false, - "rightSide": false, - "hideZero": false - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "decimals": 1, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "timeFrom": null, - "timeShift": null, + "maxDataPoints": null, "description": "", - "maxDataPoints": 750, - "interval": "30s" + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/load_averages_graph.json.jinja b/salt/grafana/panels/load_averages_graph.json.jinja index bb5e49748..2f3706528 100644 --- a/salt/grafana/panels/load_averages_graph.json.jinja +++ b/salt/grafana/panels/load_averages_graph.json.jinja @@ -62,7 +62,7 @@ ], "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(load1) as \"1 minute\", mean(load5) as \"5 minutes\", mean(load15) as \"15 minutes\" FROM \"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc", + "query": "SELECT mean(load1) as \"1 minute\", last(n_cpus) as \"Total Cores\" FROM \"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc", "queryType": "randomWalk", "rawQuery": true, "refId": "A", @@ -101,7 +101,7 @@ ], "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_load1) as \"trend_1 minute\", mean(mean_load5) as \"trend_5 minutes\", mean(mean_load15) as \"trend_15 minutes\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc", + "query": "SELECT mean(mean_load1) as \"trend_1 minute\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc", "queryType": "randomWalk", "rawQuery": true, "refId": "B", @@ -126,7 +126,7 @@ ], "thresholds": [], "timeRegions": [], - "title": "Load Averages - $cpucount Cores", + "title": "1 Minute Load Average", "tooltip": { "shared": true, "sort": 0, diff --git a/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja index 452687683..c40f6c927 100644 --- a/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja +++ b/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja @@ -98,8 +98,8 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } ] }, @@ -143,8 +143,8 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } ] } diff --git a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja index 94e067d53..e6a10cd42 100644 --- a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja +++ b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja @@ -1,70 +1,107 @@ { - "aliasColors": { - "InBound": "#629E51", - "OutBound": "#5195CE", - "net.non_negative_derivative": "super-light-blue" + "id": 18, + "gridPos": { + }, - "maxDataPoints": 750, - "interval": "30s", - "bars": false, - "dashLength": 10, - "dashes": false, + "type": "timeseries", + "title": "Management Interface Traffic ", "datasource": "InfluxDB", - "editable": true, - "error": false, + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], "fieldConfig": { "defaults": { - "links": [] + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 2, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "bps" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "x": {{ PANELS.management_interface_traffic_both_graph.gridPos.x }}, - "y": {{ PANELS.management_interface_traffic_both_graph.gridPos.y }}, - "w": {{ PANELS.management_interface_traffic_both_graph.gridPos.w }}, - "h": {{ PANELS.management_interface_traffic_both_graph.gridPos.h }} - }, - "hiddenSeries": false, - "id": 18, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "mean", + "lastNotNull", + "max", + "min" + ] } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + }, "targets": [ { - "alias": "Inbound Current", + "alias": "$tag_host: $tag_interface: Inbound Current", "dsType": "influxdb", "groupBy": [ { @@ -73,6 +110,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "interface" + ] + }, { "params": [ "null" @@ -114,19 +163,19 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" }, { "condition": "AND", "key": "interface", - "operator": "=", - "value": "$manint" + "operator": "=~", + "value": "/^$manint$/" } ] }, { - "alias": "Outbound Current", + "alias": "$tag_host: $tag_interface: Outbound Current", "dsType": "influxdb", "groupBy": [ { @@ -135,6 +184,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "interface" + ] + }, { "params": [ "null" @@ -176,19 +237,19 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" }, { "condition": "AND", "key": "interface", - "operator": "=", - "value": "$manint" + "operator": "=~", + "value": "/^$manint$/" } ] }, { - "alias": "Inbound Trend", + "alias": "$tag_host: $tag_interface: Inbound Trend", "dsType": "influxdb", "groupBy": [ { @@ -197,6 +258,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "interface" + ] + }, { "params": [ "null" @@ -239,19 +312,19 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" }, { "condition": "AND", "key": "interface", - "operator": "=", - "value": "$manint" + "operator": "=~", + "value": "/^$manint$/" } ] }, { - "alias": "Outbound Trend", + "alias": "$tag_host: $tag_interface: Outbound Trend", "dsType": "influxdb", "groupBy": [ { @@ -260,6 +333,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "interface" + ] + }, { "params": [ "null" @@ -302,56 +387,20 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" }, { "condition": "AND", "key": "interface", - "operator": "=", - "value": "$manint" + "operator": "=~", + "value": "/^$manint$/" } ] } ], - "thresholds": [], + "maxDataPoints": null, "timeFrom": null, - "timeRegions": [], "timeShift": null, - "title": "Management Interface Traffic - $manint", - "tooltip": { - "msResolution": true, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bps", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "description": "" } diff --git a/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja b/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja index ada18f612..8a5ee72ce 100644 --- a/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja +++ b/salt/grafana/panels/memory_used_docker_combined_current_graph.json.jinja @@ -1,20 +1,79 @@ { - "type": "graph", - "title": "Container Memory Usage Current", + "id": 102, "gridPos": { "x": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.x }}, "y": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.y }}, "w": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.w }}, "h": {{ PANELS.memory_used_docker_combined_current_graph.gridPos.h }} }, - "id": 102, + "type": "timeseries", + "title": "Container Memory Usage Current", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", + "alias": "$tag_host: $tag_container_name", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "container_name" + ], + "type": "tag" + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "docker_container_mem", "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "usage_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", @@ -27,125 +86,58 @@ "operator": "=~", "value": "/^$containers$/" } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] + ] + } + ], + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" }, - { - "type": "tag", - "params": [ - "container_name" - ] + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" }, - { - "type": "fill", - "params": [ - "null" - ] + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" } - ], - "select": [ - [ + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ { - "type": "field", - "params": [ - "usage_percent" - ] - }, - { - "type": "mean", - "params": [] + "color": "green", + "value": null } ] - ], - "measurement": "docker_container_mem", - "alias": "$tag_container_name" - } - ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, + }, + "mappings": [], + "unit": "percent", + "decimals": 1 + }, "overrides": [] }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "percent", - "$$hashKey": "object:315" - }, - { - "label": null, - "show": false, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:316" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": false, - "min": false, - "max": false, - "current": false, - "total": false, - "avg": false, - "alignAsTable": false, - "rightSide": false, - "hideZero": false - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "decimals": null, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja index f97eb8450..fb3aa402c 100644 --- a/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja +++ b/salt/grafana/panels/memory_used_docker_combined_trend_graph.json.jinja @@ -1,53 +1,66 @@ { - "type": "graph", - "title": "Container Memory Usage Trend", + "id": 103, "gridPos": { "x": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.x }}, "y": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.y }}, "w": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.w }}, "h": {{ PANELS.memory_used_docker_combined_trend_graph.gridPos.h }} }, - "id": 103, + "type": "timeseries", + "title": "Container Memory Usage Trend", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "maxDataPoints": 750, + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "so_long_term", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ], + "alias": "$tag_host: $tag_container_name", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" + }, + { + "params": [ + "container_name" + ], + "type": "tag" }, { "type": "tag", "params": [ - "container_name" + "host" ] }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "measurement": "docker_container_mem", + "orderByTime": "ASC", + "policy": "so_long_term", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", "select": [ [ { @@ -62,90 +75,69 @@ } ] ], - "measurement": "docker_container_mem", - "alias": "$tag_container_name" + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=~", + "value": "/^$containers$/" + } + ] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": true, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "percent", + "decimals": 1 + }, "overrides": [] }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "percent", - "$$hashKey": "object:315" - }, - { - "label": null, - "show": false, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:316" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": false, - "current": false, - "total": false, - "avg": true, - "alignAsTable": false, - "rightSide": false, - "hideZero": false - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "decimals": 1, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja index 0c7fd3a0c..fe09d269f 100644 --- a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja @@ -1,70 +1,107 @@ { - "aliasColors": { - "InBound": "#629E51", - "OutBound": "#5195CE", - "net.non_negative_derivative": "light-orange" + "id": 10, + "gridPos": { + }, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "dashLength": 10, - "dashes": false, + "type": "timeseries", + "title": "Monitor Interface Traffic", "datasource": "InfluxDB", - "editable": true, - "error": false, + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], "fieldConfig": { "defaults": { - "links": [] + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 2, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "bps" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "x": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.x }}, - "y": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.y }}, - "w": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.w }}, - "h": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.h }} - }, - "hiddenSeries": false, - "id": 10, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "mean", + "lastNotNull", + "max", + "min" + ] } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + }, "targets": [ { - "alias": "Inbound Current", + "alias": "$tag_host: $tag_interface: Inbound Current", "dsType": "influxdb", "groupBy": [ { @@ -73,6 +110,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "interface" + ] + }, { "params": [ "null" @@ -114,19 +163,19 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" }, { "condition": "AND", "key": "interface", - "operator": "=", - "value": "$monint" + "operator": "=~", + "value": "/^$monint$/" } ] }, { - "alias": "Inbound Trend", + "alias": "$tag_host: $tag_interface: Inbound Trend", "dsType": "influxdb", "groupBy": [ { @@ -135,6 +184,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "interface" + ] + }, { "params": [ "null" @@ -177,56 +238,20 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" }, { "condition": "AND", "key": "interface", - "operator": "=", - "value": "$monint" + "operator": "=~", + "value": "/^$monint$/" } ] } ], - "thresholds": [], + "maxDataPoints": null, "timeFrom": null, - "timeRegions": [], "timeShift": null, - "title": "Monitor Interface Traffic - $monint", - "tooltip": { - "msResolution": true, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bps", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "description": "" } diff --git a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja index 4d1c9dcc8..9061c323e 100644 --- a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja @@ -1,5 +1,17 @@ { + "id": 24, + "gridPos": { + "x": {{ PANELS.monitor_interface_traffic_stat.gridPos.x }}, + "y": {{ PANELS.monitor_interface_traffic_stat.gridPos.y }}, + "w": {{ PANELS.monitor_interface_traffic_stat.gridPos.w }}, + "h": {{ PANELS.monitor_interface_traffic_stat.gridPos.h }} + }, + "type": "stat", + "title": "Monitor Traffic", "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], "fieldConfig": { "defaults": { "thresholds": { @@ -9,108 +21,31 @@ "color": "rgba(245, 54, 54, 0.9)", "value": null }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 0.5 - }, { "color": "rgba(50, 172, 45, 0.97)", - "value": 3 + "value": 1 } ] }, "mappings": [ { - "op": "=", - "text": "N/A", - "value": "null", - "$$hashKey": "object:645", - "id": 0, - "type": 1 + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" } ], - "unit": "bps", - "decimals": 2, "color": { "mode": "thresholds" - } + }, + "decimals": 2, + "unit": "bps" }, "overrides": [] }, - "gridPos": { - "x": {{ PANELS.monitor_interface_traffic_stat.gridPos.x }}, - "y": {{ PANELS.monitor_interface_traffic_stat.gridPos.y }}, - "w": {{ PANELS.monitor_interface_traffic_stat.gridPos.w }}, - "h": {{ PANELS.monitor_interface_traffic_stat.gridPos.h }} - }, - "id": 24, - "links": [], - "maxDataPoints": 100, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "net", - "orderByTime": "ASC", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "bytes_recv" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - }, - { - "params": [ - "*8" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - }, - { - "condition": "AND", - "key": "interface", - "operator": "=", - "value": "$monint" - } - ] - } - ], - "title": "Monitor Traffic - $monint", - "type": "stat", "options": { "reduceOptions": { "values": false, @@ -126,7 +61,92 @@ "graphMode": "area", "justifyMode": "auto" }, + "targets": [ + { + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "params": [ + "none" + ], + "type": "fill" + } + ], + "measurement": "net", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "bytes_recv" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + }, + { + "type": "math", + "params": [ + "*8" + ] + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "interface", + "operator": "=~", + "value": "/^$monint$/" + } + ], + "query": "SELECT non_negative_derivative(mean(\"bytes_recv\"), 1s) *8 FROM \"net\" WHERE (\"host\" =~ /^$servername$/ AND \"interface\" = '$monint') AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false + } + ], + "maxDataPoints": null, "cacheTimeout": null, "interval": null, - "pluginVersion": "7.5.4" + "transformations": [ + { + "id": "calculateField", + "options": { + "mode": "reduceRow", + "reduce": { + "reducer": "sum" + }, + "alias": "Monitor Traffic", + "replaceFields": true + } + } + ], + "description": "" } diff --git a/salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja b/salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja index 97055b54b..9a9d81504 100644 --- a/salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja +++ b/salt/grafana/panels/network_usage_docker_combined_current_graph.json.jinja @@ -1,45 +1,33 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "gridPos": { + "id": 61868, + "gridPos": { "x": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.x }}, "y": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.y }}, "w": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.w }}, "h": {{ PANELS.network_usage_docker_combined_current_graph.gridPos.h }} }, - "id": 61868, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", + "type": "timeseries", + "title": "Container Network Usage Current", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", "options": { - "alertThreshold": true + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, "targets": [ { - "alias": "$tag_container_name RX", + "alias": "$tag_host: $tag_container_name RX", "groupBy": [ { "params": [ @@ -53,6 +41,12 @@ ], "type": "tag" }, + { + "type": "tag", + "params": [ + "host" + ] + }, { "params": [ "null" @@ -69,94 +63,26 @@ "select": [ [ { - "type": "field", "params": [ "rx_bytes" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" }, { - "type": "non_negative_derivative", "params": [ "1s" - ] + ], + "type": "non_negative_derivative" }, { - "type": "math", "params": [ "*8" - ] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - }, - { - "alias": "$tag_container_name TX", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_net", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "tx_bytes" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - }, - { - "type": "math", - "params": [ - "*8" - ] + ], + "type": "math" } ] ], @@ -174,60 +100,133 @@ } ], "hide": false - } - ], - "thresholds": [], - "timeRegions": [], - "title": "Container Network Usage Current", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:315", - "format": "bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true }, { - "$$hashKey": "object:316", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false + "alias": "$tag_host: $tag_container_name TX", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "container_name" + ], + "type": "tag" + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "docker_container_net", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "tx_bytes" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "1s" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + "*8" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=~", + "value": "/^$containers$/" + } + ] } ], - "yaxis": { - "align": false, - "alignLevel": null + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 5, + "gradientMode": "none", + "spanNulls": true, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "bps", + "decimals": 1 + }, + "overrides": [] }, - "bars": false, - "dashes": false, - "decimals": null, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, - "timeFrom": null, - "timeShift": null, + "maxDataPoints": null, "description": "", - "maxDataPoints": 750, - "interval": "30s" + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja index 2a3860d9f..b8dc975d8 100644 --- a/salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja +++ b/salt/grafana/panels/network_usage_docker_combined_trend_graph.json.jinja @@ -1,45 +1,33 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, + "id": 61461, "gridPos": { "x": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.x }}, "y": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.y }}, "w": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.w }}, "h": {{ PANELS.network_usage_docker_combined_trend_graph.gridPos.h }} }, - "id": 61461, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", + "type": "timeseries", + "title": "Container Network Usage Trend", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "5m", "options": { - "alertThreshold": true + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, "targets": [ { - "alias": "$tag_container_name RX", + "alias": "$tag_host: $tag_container_name RX", "groupBy": [ { "params": [ @@ -53,6 +41,12 @@ ], "type": "tag" }, + { + "type": "tag", + "params": [ + "host" + ] + }, { "params": [ "null" @@ -69,26 +63,26 @@ "select": [ [ { - "type": "field", "params": [ "mean_rx_bytes" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" }, { - "type": "non_negative_derivative", "params": [ "1s" - ] + ], + "type": "non_negative_derivative" }, { - "type": "math", "params": [ "*8" - ] + ], + "type": "math" } ] ], @@ -107,7 +101,7 @@ ] }, { - "alias": "$tag_container_name TX", + "alias": "$tag_host: $tag_container_name TX", "groupBy": [ { "params": [ @@ -121,6 +115,12 @@ ], "type": "tag" }, + { + "type": "tag", + "params": [ + "host" + ] + }, { "params": [ "null" @@ -128,6 +128,7 @@ "type": "fill" } ], + "hide": false, "measurement": "docker_container_net", "orderByTime": "ASC", "policy": "so_long_term", @@ -137,26 +138,26 @@ "select": [ [ { - "type": "field", "params": [ "mean_tx_bytes" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" }, { - "type": "non_negative_derivative", "params": [ "1s" - ] + ], + "type": "non_negative_derivative" }, { - "type": "math", "params": [ "*8" - ] + ], + "type": "math" } ] ], @@ -172,62 +173,59 @@ "operator": "=~", "value": "/^$containers$/" } - ], - "hide": false + ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Container Network Usage Trend", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:315", - "format": "bps", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 5, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "bps", + "decimals": 1 }, - { - "$$hashKey": "object:316", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null + "overrides": [] }, - "bars": false, - "dashes": false, - "decimals": null, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, - "timeFrom": null, - "timeShift": null, + "maxDataPoints": null, "description": "", - "maxDataPoints": 750, - "interval": "30s" + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/stenographer_pcap_retention_graph.json.jinja b/salt/grafana/panels/stenographer_pcap_retention_graph.json.jinja index aa3e22146..83c51a73d 100644 --- a/salt/grafana/panels/stenographer_pcap_retention_graph.json.jinja +++ b/salt/grafana/panels/stenographer_pcap_retention_graph.json.jinja @@ -1,64 +1,106 @@ { - "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "unit": "s" - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, + "id": 2239, "gridPos": { "x": {{ PANELS.stenographer_pcap_retention_graph.gridPos.x }}, "y": {{ PANELS.stenographer_pcap_retention_graph.gridPos.y }}, "w": {{ PANELS.stenographer_pcap_retention_graph.gridPos.w }}, "h": {{ PANELS.stenographer_pcap_retention_graph.gridPos.h }} }, - "hiddenSeries": false, - "id": 2239, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, + "type": "timeseries", + "title": "Stenographer PCAP Retention", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "maxDataPoints": 750, + "interval": "30s", "links": [], - "nullPointMode": "connected", - "options": { - "alertThreshold": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": true, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "s", + "decimals": 2 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "hidden", + "placement": "bottom", + "calcs": [] } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + }, "targets": [ { - "alias": "Oldest Pcap Current", + "alias": "$tag_host: Oldest Pcap Current", "dsType": "influxdb", "groupBy": [ { @@ -67,6 +109,12 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, { "params": [ "null" @@ -96,13 +144,13 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } ] }, { - "alias": "Oldest Pcap Trend", + "alias": "$tag_host: Oldest Pcap Trend", "dsType": "influxdb", "groupBy": [ { @@ -111,6 +159,12 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, { "params": [ "null" @@ -141,51 +195,13 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } ] } ], - "thresholds": [], + "cacheTimeout": null, "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Stenographer PCAP Retention", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 2, - "format": "s", - "label": "", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "timeShift": null } diff --git a/salt/grafana/panels/uptime_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/uptime_docker_combined_trend_graph.json.jinja index 25303038c..a4be68137 100644 --- a/salt/grafana/panels/uptime_docker_combined_trend_graph.json.jinja +++ b/salt/grafana/panels/uptime_docker_combined_trend_graph.json.jinja @@ -1,53 +1,87 @@ { - "type": "graph", - "title": "Container Uptime Trend", + "id": 68999, "gridPos": { "x": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.x }}, "y": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.y }}, "w": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.w }}, "h": {{ PANELS.uptime_docker_combined_trend_graph.gridPos.h }} }, - "id": 68999, + "type": "graph", + "title": "Container Uptime Trend", + "datasource": "InfluxDB", + "thresholds": [ + { + "$$hashKey": "object:1299", + "colorMode": "critical", + "fill": false, + "line": true, + "op": "lt", + "value": 4500000000000, + "yaxis": "left" + } + ], + "pluginVersion": "8.2.1", + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "max": false, + "min": false, + "rightSide": true, + "show": true, + "sort": "current", + "sortDesc": false, + "total": false, + "values": true + }, + "aliasColors": {}, + "dashLength": 10, + "decimals": 1, + "lines": true, + "linewidth": 1, + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "pointradius": 2, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "so_long_term", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ], + "alias": "$tag_host: $tag_container_name", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" + }, + { + "params": [ + "container_name" + ], + "type": "tag" }, { "type": "tag", "params": [ - "container_name" + "host" ] }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "measurement": "docker_container_status", + "orderByTime": "ASC", + "policy": "so_long_term", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", "select": [ [ { @@ -62,98 +96,70 @@ } ] ], - "measurement": "docker_container_status", - "alias": "$tag_container_name" + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=~", + "value": "/^$containers$/" + } + ] } ], - "options": { - "alertThreshold": true + "timeRegions": [], + "tooltip": { + "shared": true, + "sort": 1, + "value_type": "individual" }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "ns", - "$$hashKey": "object:192" - }, - { - "label": "", - "show": true, - "logBase": 1, - "min": "0", - "max": null, - "format": "short", - "$$hashKey": "object:193", - "decimals": 2 - } - ], "xaxis": { - "show": true, + "buckets": null, "mode": "time", "name": null, - "values": [], - "buckets": null + "show": true, + "values": [] }, + "yaxes": [ + { + "$$hashKey": "object:192", + "format": "ns", + "label": null, + "logBase": 1, + "max": "604800000000000", + "min": null, + "show": true, + "decimals": 1 + }, + { + "$$hashKey": "object:193", + "decimals": 2, + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": "0", + "show": false + } + ], "yaxis": { "align": false, "alignLevel": null }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": false, - "values": true, - "min": false, - "max": false, - "current": true, - "total": false, - "avg": false, - "alignAsTable": true, - "rightSide": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 1 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [ - { - "value": 4500000000000, - "colorMode": "critical", - "op": "lt", - "fill": false, - "line": true, - "yaxis": "left", - "$$hashKey": "object:1299" - } - ], - "timeRegions": [], - "decimals": 2, - "fill": 0, - "timeFrom": null, - "timeShift": null, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, + "interval": "30s", "bars": false, - "stack": false, + "dashes": false, + "fill": 0, + "fillGradient": 0, + "hiddenSeries": false, "percentage": false, - "steppedLine": false + "points": false, + "stack": false, + "steppedLine": false, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/zeek_capture_loss_graph.json.jinja b/salt/grafana/panels/zeek_capture_loss_graph.json.jinja index 7b791f4f6..f432142c8 100644 --- a/salt/grafana/panels/zeek_capture_loss_graph.json.jinja +++ b/salt/grafana/panels/zeek_capture_loss_graph.json.jinja @@ -1,67 +1,109 @@ { - "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, + "id": 71, "gridPos": { "x": {{ PANELS.zeek_capture_loss_graph.gridPos.x }}, "y": {{ PANELS.zeek_capture_loss_graph.gridPos.y }}, "w": {{ PANELS.zeek_capture_loss_graph.gridPos.w }}, "h": {{ PANELS.zeek_capture_loss_graph.gridPos.h }} }, - "hiddenSeries": false, - "id": 71, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true + "type": "timeseries", + "title": "Capture Loss", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": true, + "showPoints": "auto", + "pointSize": 6, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "percent", + "decimals": 1, + "min": 0 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 2, - "points": true, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + }, "targets": [ { - "alias": "Loss Current", + "alias": "$tag_host: Loss Current", "groupBy": [ { "params": [ @@ -69,6 +111,12 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, { "params": [ "null" @@ -98,13 +146,13 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } ] }, { - "alias": "Loss Trend", + "alias": "$tag_host: Loss Trend", "groupBy": [ { "params": [ @@ -142,51 +190,13 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } ] } ], - "thresholds": [], + "maxDataPoints": null, "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Capture Loss", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": 1, - "format": "percent", - "label": "", - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "timeShift": null } From c4b9244f9ab452fb9bae27dfd4ba80abd87ce8d6 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 29 Oct 2021 17:24:50 -0400 Subject: [PATCH 02/47] add gridPos --- .../management_interface_traffic_both_graph.json.jinja | 5 ++++- .../panels/monitor_interface_traffic_both_graph.json.jinja | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja index e6a10cd42..2fa5e0bfa 100644 --- a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja +++ b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja @@ -1,7 +1,10 @@ { "id": 18, "gridPos": { - + "x": {{ PANELS.management_interface_traffic_both_graph.gridPos.x }}, + "y": {{ PANELS.management_interface_traffic_both_graph.gridPos.y }}, + "w": {{ PANELS.management_interface_traffic_both_graph.gridPos.w }}, + "h": {{ PANELS.management_interface_traffic_both_graph.gridPos.h }} }, "type": "timeseries", "title": "Management Interface Traffic ", diff --git a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja index fe09d269f..677279f72 100644 --- a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja @@ -1,7 +1,10 @@ { "id": 10, "gridPos": { - + "x": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.x }}, + "y": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.y }}, + "w": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.w }}, + "h": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.h }} }, "type": "timeseries", "title": "Monitor Interface Traffic", From b63b50d98ce33384e2de7aa083324672201bea0d Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 1 Nov 2021 14:06:01 -0400 Subject: [PATCH 03/47] update many panels --- ...u_docker_combined_current_graph.json.jinja | 65 +-- ...cpu_docker_combined_trend_graph.json.jinja | 281 +++++------ .../grafana/panels/cpu_usage_guage.json.jinja | 147 +++--- .../cpu_usage_tasks_all_graph.json.jinja | 196 ++++---- .../panels/disk_io_bytes_graph.json.jinja | 361 +++++++------- .../panels/disk_io_requests_graph.json.jinja | 351 +++++++------ .../panels/disk_io_time_graph.json.jinja | 350 +++++++------ .../panels/disk_usage_nsm_graph.json.jinja | 365 +++++++------- .../panels/disk_usage_root_graph.json.jinja | 365 +++++++------- salt/grafana/panels/io_wait_stat.json.jinja | 85 ++-- .../load_average_5_minute_stat.json.jinja | 81 +-- .../panels/load_averages_graph.json.jinja | 185 +++---- ...anagement_interface_drops_graph.json.jinja | 377 +++++++------- ...agement_interface_packets_graph.json.jinja | 461 +++++++++--------- ...nt_interface_traffic_both_graph.json.jinja | 62 +-- .../panels/memory_usage_graph.json.jinja | 209 ++++---- .../monitor_interface_drops_graph.json.jinja | 377 +++++++------- ...monitor_interface_packets_graph.json.jinja | 376 +++++++------- ...or_interface_traffic_both_graph.json.jinja | 54 +- salt/grafana/panels/nsm_used_guage.json.jinja | 136 +++--- .../panels/pcap_retention_stat.json.jinja | 75 +-- .../panels/process_status_graph.json.jinja | 205 ++++---- .../grafana/panels/ram_usage_guage.json.jinja | 147 +++--- .../panels/rootfs_used_guage.json.jinja | 136 +++--- .../panels/swap_io_bytes_graph.json.jinja | 333 ++++++------- .../panels/swap_usage_guage.json.jinja | 149 +++--- 26 files changed, 3041 insertions(+), 2888 deletions(-) diff --git a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja index 54f18ee6c..7d0f67135 100644 --- a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja @@ -8,6 +8,7 @@ }, "type": "timeseries", "title": "Container CPU Usage Current", + "transformations": [], "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s", @@ -67,6 +68,13 @@ { "id": "custom.fillOpacity", "value": 0 + }, + { + "id": "color", + "value": { + "mode": "fixed", + "fixedColor": "dark-red" + } } ] } @@ -115,6 +123,7 @@ "type": "fill" } ], + "hide": false, "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "default", @@ -149,67 +158,65 @@ "operator": "=~", "value": "/^$containers$/" } - ], - "hide": false + ] }, { - "refId": "B", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], + "alias": "$tag_host: n_cpus*100", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "measurement": "system", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "n_cpus" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "math", "params": [ " * 100" - ] + ], + "type": "math" } ] ], - "measurement": "system", - "alias": "$tag_host: n_cpus*100" + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + } + ] } ], - "transformations": [], "maxDataPoints": null, "timeFrom": null, "timeShift": null diff --git a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja index d587a0529..2e2dbe797 100644 --- a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja @@ -11,140 +11,6 @@ "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_container_name", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_cpu", - "orderByTime": "ASC", - "policy": "so_long_term", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "mean_usage_percent" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - }, - { - "refId": "B", - "hide": false, - "policy": "so_long_term", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "mean_n_cpus" - ] - }, - { - "type": "last", - "params": [] - }, - { - "type": "math", - "params": [ - " * 100" - ] - } - ] - ], - "measurement": "system", - "alias": "$tag_host: n_cpus*100" - } - ], "fieldConfig": { "defaults": { "custom": { @@ -188,8 +54,8 @@ ] }, "mappings": [], - "unit": "percent", - "decimals": 1 + "decimals": 1, + "unit": "percent" }, "overrides": [ { @@ -201,13 +67,154 @@ { "id": "custom.fillOpacity", "value": 0 + }, + { + "id": "color", + "value": { + "mode": "fixed", + "fixedColor": "dark-red" + } } ] } ] }, - "maxDataPoints": null, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "alias": "$tag_host: $tag_container_name", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "container_name" + ], + "type": "tag" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "docker_container_cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=~", + "value": "/^$containers$/" + } + ] + }, + { + "alias": "$tag_host: n_cpus*100", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "system", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_n_cpus" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + " * 100" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + } + ] + } + ], "description": "", + "maxDataPoints": null, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/cpu_usage_guage.json.jinja b/salt/grafana/panels/cpu_usage_guage.json.jinja index 4a28c315c..d5cd949d8 100644 --- a/salt/grafana/panels/cpu_usage_guage.json.jinja +++ b/salt/grafana/panels/cpu_usage_guage.json.jinja @@ -1,65 +1,69 @@ { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "editable": true, - "error": false, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "x": {{ PANELS.cpu_usage_guage.gridPos.x }}, - "y": {{ PANELS.cpu_usage_guage.gridPos.y }}, - "w": {{ PANELS.cpu_usage_guage.gridPos.w }}, - "h": {{ PANELS.cpu_usage_guage.gridPos.h }} - }, - "height": "150", "id": 9, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "gridPos": { + "x": {{ PANELS.cpu_usage_guage.gridPos.x }}, + "y": {{ PANELS.cpu_usage_guage.gridPos.y }}, + "w": {{ PANELS.cpu_usage_guage.gridPos.w }}, + "h": {{ PANELS.cpu_usage_guage.gridPos.h }} + }, + "type": "gauge", + "title": "CPU usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 70 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 80 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "color": { + "mode": "thresholds" + }, + "max": 100, + "min": 0, + "unit": "percent" + }, + "overrides": [] + }, + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, - "tableColumn": "", "targets": [ { "dsType": "influxdb", @@ -104,8 +108,8 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" }, { "condition": "AND", @@ -113,23 +117,10 @@ "operator": "=", "value": "cpu-total" } - ] + ], + "orderByTime": "ASC" } ], - "thresholds": "70,80,90", - "title": "CPU usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current", - "fieldConfig": { - "defaults": {}, - "overrides": [] - } + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja index e865f446f..dea4c3d8c 100644 --- a/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja @@ -1,51 +1,30 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, + "id": 61871, "gridPos": { "x": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.h }} }, - "id": 61871, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", + "type": "timeseries", + "title": "CPU Usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", "options": { - "alertThreshold": true - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:266", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $col", @@ -84,7 +63,8 @@ } ] ], - "tags": [] + "tags": [], + "hide": false }, { "alias": "$tag_host: $col", @@ -102,9 +82,10 @@ "type": "fill" } ], + "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\" FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), *", + "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\" FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), * fill(linear)", "queryType": "randomWalk", "rawQuery": true, "refId": "B", @@ -123,61 +104,90 @@ } ] ], - "tags": [], - "hide": false + "tags": [] } ], - "thresholds": [], - "timeRegions": [], - "title": "CPU Usage", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:202", - "decimals": null, - "format": "percent", - "label": null, - "logBase": 1, - "max": "100", - "min": "0", - "show": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "percent", + "min": 0, + "decimals": 1 }, - { - "$$hashKey": "object:203", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "bars": false, - "dashes": false, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/disk_io_bytes_graph.json.jinja b/salt/grafana/panels/disk_io_bytes_graph.json.jinja index 8fce4e386..4b9c4c7ff 100644 --- a/salt/grafana/panels/disk_io_bytes_graph.json.jinja +++ b/salt/grafana/panels/disk_io_bytes_graph.json.jinja @@ -1,194 +1,189 @@ { - "aliasColors": {}, - "maxDataPoints": 750, - "interval": "30s", - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "links": [] + "id": 60200, + "gridPos": { + "x": {{ PANELS.disk_io_bytes_graph.gridPos.x }}, + "y": {{ PANELS.disk_io_bytes_graph.gridPos.y }}, + "w": {{ PANELS.disk_io_bytes_graph.gridPos.w }}, + "h": {{ PANELS.disk_io_bytes_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Disk I/O bytes for /dev/$disk", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": {}, - "gridPos": { - "x": {{ PANELS.disk_io_bytes_graph.gridPos.x }}, - "y": {{ PANELS.disk_io_bytes_graph.gridPos.y }}, - "w": {{ PANELS.disk_io_bytes_graph.gridPos.w }}, - "h": {{ PANELS.disk_io_bytes_graph.gridPos.h }} - }, - "hiddenSeries": false, - "id": 60200, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "maxPerRow": 6, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [{ - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Disk I/O bytes for /dev/$disk", + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "bytes", + "decimals": 1 + }, + "overrides": [] + }, + "options": { "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" + "mode": "single" }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [{ - "format": "bytes", - "logBase": 1, - "max": null, - "min": null, - "show": true + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" }, { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" } - ], - "yaxis": { - "align": false, - "alignLevel": null + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } + ], + "scopedVars": { + "disk": { + "text": "sda", + "value": "sda", + "selected": false + } + }, + "maxDataPoints": null, + "repeat": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/disk_io_requests_graph.json.jinja b/salt/grafana/panels/disk_io_requests_graph.json.jinja index 1c2227fbd..a3f95772c 100644 --- a/salt/grafana/panels/disk_io_requests_graph.json.jinja +++ b/salt/grafana/panels/disk_io_requests_graph.json.jinja @@ -1,193 +1,190 @@ { - "aliasColors": {}, - "maxDataPoints": 750, - "interval": "30s", - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": {}, + "id": 13782, "gridPos": { "x": {{ PANELS.disk_io_requests_graph.gridPos.x }}, "y": {{ PANELS.disk_io_requests_graph.gridPos.y }}, "w": {{ PANELS.disk_io_requests_graph.gridPos.w }}, "h": {{ PANELS.disk_io_requests_graph.gridPos.h }} }, - "hiddenSeries": false, - "id": 13782, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "maxPerRow": 6, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [{ - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "type": "timeseries", + "title": "Disk I/O requests for /dev/$disk", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Disk I/O requests for /dev/$disk", + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "iops", + "decimals": 1 + }, + "overrides": [] + }, + "options": { "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" + "mode": "single" }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [{ - "format": "iops", - "logBase": 1, - "max": null, - "min": null, - "show": true + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" }, { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" } - ], - "yaxis": { - "align": false, - "alignLevel": null + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [], + "hide": false + }, + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } + ], + "scopedVars": { + "disk": { + "text": "sda", + "value": "sda", + "selected": false + } + }, + "maxDataPoints": null, + "repeat": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/disk_io_time_graph.json.jinja b/salt/grafana/panels/disk_io_time_graph.json.jinja index 0b0e00e42..fa7c7b51e 100644 --- a/salt/grafana/panels/disk_io_time_graph.json.jinja +++ b/salt/grafana/panels/disk_io_time_graph.json.jinja @@ -1,193 +1,189 @@ { - "aliasColors": {}, - "maxDataPoints": 750, - "interval": "30s", - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": {}, + "id": 56720, "gridPos": { "x": {{ PANELS.disk_io_time_graph.gridPos.x }}, "y": {{ PANELS.disk_io_time_graph.gridPos.y }}, "w": {{ PANELS.disk_io_time_graph.gridPos.w }}, "h": {{ PANELS.disk_io_time_graph.gridPos.h }} }, - "hiddenSeries": false, - "id": 56720, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "maxPerRow": 6, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [{ - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "type": "timeseries", + "title": "Disk I/O time for /dev/$disk", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Disk I/O time for /dev/$disk", + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "ms", + "decimals": 1 + }, + "overrides": [] + }, + "options": { "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" + "mode": "single" }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [{ - "format": "ms", - "logBase": 1, - "max": null, - "min": null, - "show": true + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" }, { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" } - ], - "yaxis": { - "align": false, - "alignLevel": null + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } + ], + "scopedVars": { + "disk": { + "text": "sda", + "value": "sda", + "selected": false + } + }, + "maxDataPoints": null, + "repeat": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja index 223e2c041..90212b681 100644 --- a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja +++ b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja @@ -1,186 +1,211 @@ { - "type": "graph", - "title": "Disk Usage /nsm", + "id": 68888, "gridPos": { "x": {{ PANELS.disk_usage_nsm_graph.gridPos.x }}, "y": {{ PANELS.disk_usage_nsm_graph.gridPos.y }}, "w": {{ PANELS.disk_usage_nsm_graph.gridPos.w }}, "h": {{ PANELS.disk_usage_nsm_graph.gridPos.h }} }, - "id": 68888, + "type": "timeseries", + "title": "Disk Usage /nsm", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "rawQuery": true, - "alias": "$tag_host: mountpoint $tag_path - $col" - }, - { - "refId": "B", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "rawQuery": true, "alias": "$tag_host: mountpoint $tag_path - $col", - "hide": false + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: mountpoint $tag_path - $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\" fill(linear)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": "0", - "max": null, - "format": "bytes", - "$$hashKey": "object:235" + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "bytes", + "min": 0, + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:236" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/total/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#C4162A", + "mode": "fixed" + } + }, + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 2 + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:486", - "alias": "/total/", - "fill": 0, - "linewidth": 2, - "color": "#C4162A", - "zindex": 3 - }, - { - "$$hashKey": "object:829", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "steppedLine": true, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "maxDataPoints": 750, - "interval": "30s" + "maxDataPoints": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/disk_usage_root_graph.json.jinja b/salt/grafana/panels/disk_usage_root_graph.json.jinja index ee20e5d04..07ac20bbe 100644 --- a/salt/grafana/panels/disk_usage_root_graph.json.jinja +++ b/salt/grafana/panels/disk_usage_root_graph.json.jinja @@ -1,186 +1,211 @@ { - "type": "graph", - "title": "Disk Usage /", + "id": 61880, "gridPos": { "x": {{ PANELS.disk_usage_root_graph.gridPos.x }}, "y": {{ PANELS.disk_usage_root_graph.gridPos.y }}, "w": {{ PANELS.disk_usage_root_graph.gridPos.w }}, "h": {{ PANELS.disk_usage_root_graph.gridPos.h }} }, - "id": 61880, + "type": "timeseries", + "title": "Disk Usage /", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "rawQuery": true, - "alias": "$tag_host: mountpoint $tag_path - $col" - }, - { - "refId": "B", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "rawQuery": true, "alias": "$tag_host: mountpoint $tag_path - $col", - "hide": false + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: mountpoint $tag_path - $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\" fill(linear)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": "0", - "max": null, - "format": "bytes", - "$$hashKey": "object:235" + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "stepAfter", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "bytes", + "min": 0, + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:236" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/total/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#C4162A", + "mode": "fixed" + } + }, + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 2 + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:486", - "alias": "/total/", - "fill": 0, - "linewidth": 2, - "color": "#C4162A", - "zindex": 3 - }, - { - "$$hashKey": "object:829", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "steppedLine": true, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "maxDataPoints": 750, - "interval": "30s" + "maxDataPoints": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/io_wait_stat.json.jinja b/salt/grafana/panels/io_wait_stat.json.jinja index 470d0008f..4fe4a3d8e 100644 --- a/salt/grafana/panels/io_wait_stat.json.jinja +++ b/salt/grafana/panels/io_wait_stat.json.jinja @@ -1,5 +1,16 @@ { + "id": 61867, + "gridPos": { + "x": {{ PANELS.io_wait_stat.gridPos.x }}, + "y": {{ PANELS.io_wait_stat.gridPos.y }}, + "w": {{ PANELS.io_wait_stat.gridPos.w }}, + "h": {{ PANELS.io_wait_stat.gridPos.h }} + }, + "type": "stat", + "title": "IOWait", "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], "fieldConfig": { "defaults": { "thresholds": { @@ -21,31 +32,41 @@ }, "mappings": [ { - "op": "=", - "text": "N/A", - "value": "null", - "$$hashKey": "object:1217", - "id": 0, - "type": 1 + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" } ], - "unit": "percent", - "decimals": 2, "color": { "mode": "thresholds" - } + }, + "decimals": 2, + "max": 100, + "min": 0, + "unit": "percent" }, "overrides": [] }, - "gridPos": { - "x": {{ PANELS.io_wait_stat.gridPos.x }}, - "y": {{ PANELS.io_wait_stat.gridPos.y }}, - "w": {{ PANELS.io_wait_stat.gridPos.w }}, - "h": {{ PANELS.io_wait_stat.gridPos.h }} + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "auto", + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto" }, - "id": 61867, - "links": [], - "maxDataPoints": 100, "targets": [ { "dsType": "influxdb", @@ -64,6 +85,7 @@ } ], "measurement": "cpu", + "orderByTime": "ASC", "policy": "default", "query": "SELECT non_negative_derivative(mean(\"usage_iowait\"), 1s) FROM \"cpu\" WHERE (host =~ /$servername$/ AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, @@ -86,8 +108,8 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" }, { "condition": "AND", @@ -95,28 +117,9 @@ "operator": "=", "value": "cpu-total" } - ], - "orderByTime": "ASC" + ] } ], - "title": "IOWait", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "cacheTimeout": null, - "interval": null, - "pluginVersion": "7.5.4" + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/load_average_5_minute_stat.json.jinja b/salt/grafana/panels/load_average_5_minute_stat.json.jinja index c4a75c35b..8198a8d19 100644 --- a/salt/grafana/panels/load_average_5_minute_stat.json.jinja +++ b/salt/grafana/panels/load_average_5_minute_stat.json.jinja @@ -1,5 +1,17 @@ { + "id": 61859, + "gridPos": { + "x": {{ PANELS.load_average_5_minute_stat.gridPos.x }}, + "y": {{ PANELS.load_average_5_minute_stat.gridPos.y }}, + "w": {{ PANELS.load_average_5_minute_stat.gridPos.w }}, + "h": {{ PANELS.load_average_5_minute_stat.gridPos.h }} + }, + "type": "stat", + "title": "5 Minute Load Average - $cpucount Cores", "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30", + "links": [], "fieldConfig": { "defaults": { "thresholds": { @@ -7,7 +19,7 @@ "steps": [ { "color": "rgba(50, 172, 45, 0.97)", - "value": "$cpucount / 2" + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -21,30 +33,39 @@ }, "mappings": [ { - "op": "=", - "text": "N/A", - "value": "null", - "id": 0, - "type": 2 + "options": { + "from": null, + "result": { + "text": "N/A" + }, + "to": null + }, + "type": "range" } ], - "unit": "none", - "decimals": 1, "color": { "mode": "thresholds" - } + }, + "decimals": 1, + "unit": "none" }, "overrides": [] }, - "gridPos": { - "x": {{ PANELS.load_average_5_minute_stat.gridPos.x }}, - "y": {{ PANELS.load_average_5_minute_stat.gridPos.y }}, - "w": {{ PANELS.load_average_5_minute_stat.gridPos.w }}, - "h": {{ PANELS.load_average_5_minute_stat.gridPos.h }} + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "auto", + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto" }, - "id": 61859, - "links": [], - "maxDataPoints": 100, "targets": [ { "dsType": "influxdb", @@ -65,6 +86,8 @@ "measurement": "system", "orderByTime": "ASC", "policy": "default", + "query": "SELECT last(\"load5\") FROM \"system\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -84,30 +107,12 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" } ] } ], - "title": "5 Minute Load Average - $cpucount Cores", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "pluginVersion": "7.5.4", "cacheTimeout": null, - "interval": null + "maxDataPoints": null } diff --git a/salt/grafana/panels/load_averages_graph.json.jinja b/salt/grafana/panels/load_averages_graph.json.jinja index 2f3706528..b92a5ba6c 100644 --- a/salt/grafana/panels/load_averages_graph.json.jinja +++ b/salt/grafana/panels/load_averages_graph.json.jinja @@ -1,48 +1,30 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, + "id": 61869, "gridPos": { "x": {{ PANELS.load_averages_graph.gridPos.x }}, "y": {{ PANELS.load_averages_graph.gridPos.y }}, "w": {{ PANELS.load_averages_graph.gridPos.w }}, "h": {{ PANELS.load_averages_graph.gridPos.h }} }, - "id": 61869, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", + "type": "timeseries", + "title": "1 Minute Load Average", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", "options": { - "alertThreshold": true - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:364", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $col", @@ -99,9 +81,10 @@ "type": "fill" } ], + "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_load1) as \"trend_1 minute\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc", + "query": "SELECT mean(mean_load1) as \"trend_1 minute\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * fill(linear) ORDER BY asc", "queryType": "randomWalk", "rawQuery": true, "refId": "B", @@ -120,61 +103,85 @@ } ] ], - "tags": [], - "hide": false + "tags": [] } ], - "thresholds": [], - "timeRegions": [], - "title": "1 Minute Load Average", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:287", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "short", + "decimals": 1 }, - { - "$$hashKey": "object:288", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "bars": false, - "dashes": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/management_interface_drops_graph.json.jinja b/salt/grafana/panels/management_interface_drops_graph.json.jinja index 831c6c45a..9de6c8f19 100644 --- a/salt/grafana/panels/management_interface_drops_graph.json.jinja +++ b/salt/grafana/panels/management_interface_drops_graph.json.jinja @@ -1,263 +1,282 @@ { - "type": "graph", - "title": "Management Interface Drops", + "id": 61877, "gridPos": { "x": {{ PANELS.management_interface_drops_graph.gridPos.x }}, "y": {{ PANELS.management_interface_drops_graph.gridPos.y }}, "w": {{ PANELS.management_interface_drops_graph.gridPos.w }}, "h": {{ PANELS.management_interface_drops_graph.gridPos.h }} }, - "id": 61877, + "type": "timeseries", + "title": "Management Interface Drops", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "maxDataPoints": 750, + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "tags": [] }, { - "refId": "B", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" - }, - { - "refId": "C", - "queryType": "randomWalk", - "policy": "default", + "refId": "B", "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, + "tags": [] + }, + { "alias": "$tag_host: $tag_interface: $col", - "hide": false - }, - { - "refId": "D", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": "Drops per second", - "show": true, - "logBase": 1, + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Drops per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "pps", "min": 0, - "max": null, - "format": "pps", - "$$hashKey": "object:500" + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:501" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:592", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false - }, - { - "$$hashKey": "object:621", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "decimals": 0, - "maxDataPoints": 750, - "interval": "30s" + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/management_interface_packets_graph.json.jinja b/salt/grafana/panels/management_interface_packets_graph.json.jinja index b113e8fc2..b3e429f2f 100644 --- a/salt/grafana/panels/management_interface_packets_graph.json.jinja +++ b/salt/grafana/panels/management_interface_packets_graph.json.jinja @@ -1,262 +1,283 @@ { - "type": "graph", - "title": "Management Interface Packets", + "id": 61875, "gridPos": { "x": {{ PANELS.management_interface_packets_graph.gridPos.x }}, "y": {{ PANELS.management_interface_packets_graph.gridPos.y }}, "w": {{ PANELS.management_interface_packets_graph.gridPos.w }}, "h": {{ PANELS.management_interface_packets_graph.gridPos.h }} }, - "id": 61875, + "type": "timeseries", + "title": "Management Interface Packets", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" - }, - { - "refId": "B", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" - }, - { - "refId": "C", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [], "hide": false }, { - "refId": "D", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": "Packets per second", - "show": true, - "logBase": 1, + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Packets per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "pps", "min": 0, - "max": null, - "format": "pps", - "$$hashKey": "object:241" + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:242" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:413", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false - }, - { - "$$hashKey": "object:442", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "maxDataPoints": 750, - "interval": "30s" + "maxDataPoints": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja index 2fa5e0bfa..e15bef885 100644 --- a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja +++ b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja @@ -56,7 +56,8 @@ }, "mappings": [], "links": [], - "unit": "bps" + "unit": "bps", + "decimals": 1 }, "overrides": [ { @@ -76,11 +77,11 @@ { "id": "custom.lineStyle", "value": { - "fill": "dash", "dash": [ 4, 10 - ] + ], + "fill": "dash" } } ] @@ -93,18 +94,17 @@ }, "legend": { "displayMode": "table", - "placement": "bottom", + "placement": "right", "calcs": [ - "mean", - "lastNotNull", "max", - "min" + "mean", + "lastNotNull" ] } }, "targets": [ { - "alias": "$tag_host: $tag_interface: Inbound Current", + "alias": "$tag_host: $tag_interface: RX Current", "dsType": "influxdb", "groupBy": [ { @@ -114,16 +114,16 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ @@ -178,7 +178,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: Outbound Current", + "alias": "$tag_host: $tag_interface: TX Current", "dsType": "influxdb", "groupBy": [ { @@ -188,16 +188,16 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ @@ -252,7 +252,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: Inbound Trend", + "alias": "$tag_host: $tag_interface: RX Trend", "dsType": "influxdb", "groupBy": [ { @@ -262,20 +262,20 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ - "null" + "linear" ], "type": "fill" } @@ -327,7 +327,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: Outbound Trend", + "alias": "$tag_host: $tag_interface: TX Trend", "dsType": "influxdb", "groupBy": [ { @@ -337,20 +337,20 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ - "null" + "linear" ], "type": "fill" } @@ -402,8 +402,8 @@ ] } ], + "description": "", "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "description": "" + "timeShift": null } diff --git a/salt/grafana/panels/memory_usage_graph.json.jinja b/salt/grafana/panels/memory_usage_graph.json.jinja index bac85a16f..662eb18c1 100644 --- a/salt/grafana/panels/memory_usage_graph.json.jinja +++ b/salt/grafana/panels/memory_usage_graph.json.jinja @@ -1,55 +1,30 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, + "id": 61873, "gridPos": { "x": {{ PANELS.memory_usage_graph.gridPos.x }}, "y": {{ PANELS.memory_usage_graph.gridPos.y }}, "w": {{ PANELS.memory_usage_graph.gridPos.w }}, "h": {{ PANELS.memory_usage_graph.gridPos.h }} }, - "id": 61873, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", + "type": "timeseries", + "title": "Memory Usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", "options": { - "alertThreshold": true - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:295", - "alias": "/total/", - "color": "#C4162A", - "fill": 0 + "tooltip": { + "mode": "single" }, - { - "$$hashKey": "object:164", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $col", @@ -106,9 +81,10 @@ "type": "fill" } ], + "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trend_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", + "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trend_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", "queryType": "randomWalk", "rawQuery": true, "refId": "B", @@ -127,61 +103,106 @@ } ] ], - "tags": [], - "hide": false + "tags": [] } ], - "thresholds": [], - "timeRegions": [], - "title": "Memory Usage", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:235", - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": "0", - "show": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "bytes", + "min": 0, + "decimals": 1 }, - { - "$$hashKey": "object:236", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/total/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#C4162A", + "mode": "fixed" + } + }, + { + "id": "custom.fillOpacity", + "value": 0 + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "bars": false, - "dashes": false, + "maxDataPoints": null, "description": "", - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja index 4423b8ef9..993926156 100644 --- a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja @@ -1,263 +1,282 @@ { - "type": "graph", - "title": "Monitor Interface Drops", + "id": 61387, "gridPos": { "x": {{ PANELS.monitor_interface_drops_graph.gridPos.x }}, "y": {{ PANELS.monitor_interface_drops_graph.gridPos.y }}, "w": {{ PANELS.monitor_interface_drops_graph.gridPos.w }}, "h": {{ PANELS.monitor_interface_drops_graph.gridPos.h }} }, - "id": 61387, + "type": "timeseries", + "title": "Monitor Interface Drops", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "maxDataPoints": 750, + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "tags": [] }, { - "refId": "B", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" - }, - { - "refId": "C", - "queryType": "randomWalk", - "policy": "default", + "refId": "B", "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, + "tags": [] + }, + { "alias": "$tag_host: $tag_interface: $col", - "hide": false - }, - { - "refId": "D", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": "Drops per second", - "show": true, - "logBase": 1, + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Drops per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "pps", "min": 0, - "max": null, - "format": "pps", - "$$hashKey": "object:500" + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:501" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:592", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false - }, - { - "$$hashKey": "object:621", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "decimals": 0, - "maxDataPoints": 750, - "interval": "30s" + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja index 0a9b526b7..4c44fdb87 100644 --- a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja @@ -1,262 +1,282 @@ { - "type": "graph", - "title": "Monitor Interface Packets", + "id": 61878, "gridPos": { "x": {{ PANELS.monitor_interface_packets_graph.gridPos.x }}, "y": {{ PANELS.monitor_interface_packets_graph.gridPos.y }}, "w": {{ PANELS.monitor_interface_packets_graph.gridPos.w }}, "h": {{ PANELS.monitor_interface_packets_graph.gridPos.h }} }, - "id": 61878, + "type": "timeseries", + "title": "Monitor Interface Packets", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "maxDataPoints": 750, + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "last" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "tags": [] }, { - "refId": "B", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" - }, - { - "refId": "C", - "queryType": "randomWalk", - "policy": "default", + "refId": "B", "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, + "tags": [] + }, + { "alias": "$tag_host: $tag_interface: $col", - "hide": false - }, - { - "refId": "D", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": "Packets per second", - "show": true, - "logBase": 1, + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Packets per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "pps", "min": 0, - "max": null, - "format": "pps", - "$$hashKey": "object:241" + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:242" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:413", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false - }, - { - "$$hashKey": "object:442", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "maxDataPoints": 750, - "interval": "30s" + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja index 677279f72..3c1a6fc74 100644 --- a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja @@ -56,7 +56,8 @@ }, "mappings": [], "links": [], - "unit": "bps" + "unit": "bps", + "decimals": 1 }, "overrides": [ { @@ -76,11 +77,27 @@ { "id": "custom.lineStyle", "value": { - "fill": "dash", "dash": [ 4, 10 - ] + ], + "fill": "dash" + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true } } ] @@ -93,18 +110,17 @@ }, "legend": { "displayMode": "table", - "placement": "bottom", + "placement": "right", "calcs": [ - "mean", - "lastNotNull", "max", - "min" + "mean", + "last" ] } }, "targets": [ { - "alias": "$tag_host: $tag_interface: Inbound Current", + "alias": "$tag_host: $tag_interface: RX Current", "dsType": "influxdb", "groupBy": [ { @@ -114,16 +130,16 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ @@ -178,7 +194,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: Inbound Trend", + "alias": "$tag_host: $tag_interface: RX Trend", "dsType": "influxdb", "groupBy": [ { @@ -188,16 +204,16 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ @@ -253,8 +269,8 @@ ] } ], + "description": "", "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "description": "" + "timeShift": null } diff --git a/salt/grafana/panels/nsm_used_guage.json.jinja b/salt/grafana/panels/nsm_used_guage.json.jinja index d22a1b962..3175d3bfd 100644 --- a/salt/grafana/panels/nsm_used_guage.json.jinja +++ b/salt/grafana/panels/nsm_used_guage.json.jinja @@ -1,56 +1,69 @@ { - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "editable": true, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, + "id": 12, "gridPos": { "x": {{ PANELS.nsm_used_guage.gridPos.x }}, "y": {{ PANELS.nsm_used_guage.gridPos.y }}, "w": {{ PANELS.nsm_used_guage.gridPos.w }}, "h": {{ PANELS.nsm_used_guage.gridPos.h }} }, - "height": "150", - "id": 12, + "type": "gauge", + "title": "NSM used", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 85 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 95 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "color": { + "mode": "thresholds" + }, + "decimals": 0, + "max": 100, + "min": 0, + "unit": "percent" }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "postfixFontSize": "50%", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "overrides": [] + }, + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, "targets": [ { @@ -70,6 +83,7 @@ } ], "measurement": "disk", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -90,8 +104,8 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" }, { "condition": "AND", @@ -99,33 +113,9 @@ "operator": "=", "value": "/nsm" } - ], - "orderByTime": "ASC" + ] } ], - "thresholds": "85,95,100", - "title": "NSM used", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "cacheTimeout": null, - "colorBackground": false, - "decimals": 0, - "error": false, - "interval": null, - "nullText": null, - "postfix": "", - "prefix": "", - "tableColumn": "" + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/pcap_retention_stat.json.jinja b/salt/grafana/panels/pcap_retention_stat.json.jinja index 29b81902d..138b18e6b 100644 --- a/salt/grafana/panels/pcap_retention_stat.json.jinja +++ b/salt/grafana/panels/pcap_retention_stat.json.jinja @@ -1,5 +1,16 @@ { + "id": 26, + "gridPos": { + "x": {{ PANELS.pcap_retention_stat.gridPos.x }}, + "y": {{ PANELS.pcap_retention_stat.gridPos.y }}, + "w": {{ PANELS.pcap_retention_stat.gridPos.w }}, + "h": {{ PANELS.pcap_retention_stat.gridPos.h }} + }, + "type": "stat", + "title": "PCAP Retention", "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], "fieldConfig": { "defaults": { "thresholds": { @@ -13,31 +24,39 @@ }, "mappings": [ { - "op": "=", - "text": "N/A", - "value": "null", - "$$hashKey": "object:1382", - "id": 0, - "type": 1 + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" } ], - "unit": "d", - "decimals": 2, "color": { "mode": "thresholds" - } + }, + "decimals": 2, + "unit": "d" }, "overrides": [] }, - "gridPos": { - "x": {{ PANELS.pcap_retention_stat.gridPos.x }}, - "y": {{ PANELS.pcap_retention_stat.gridPos.y }}, - "w": {{ PANELS.pcap_retention_stat.gridPos.w }}, - "h": {{ PANELS.pcap_retention_stat.gridPos.h }} + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "value", + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto" }, - "id": 26, - "links": [], - "maxDataPoints": 100, "targets": [ { "dsType": "influxdb", @@ -89,24 +108,6 @@ ] } ], - "title": "PCAP Retention", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "value", - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto" - }, - "cacheTimeout": null, - "interval": null, - "pluginVersion": "7.5.4" + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/process_status_graph.json.jinja b/salt/grafana/panels/process_status_graph.json.jinja index 3480c08b9..302175c36 100644 --- a/salt/grafana/panels/process_status_graph.json.jinja +++ b/salt/grafana/panels/process_status_graph.json.jinja @@ -1,57 +1,107 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "editable": true, - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, + "id": 61852, "gridPos": { "x": {{ PANELS.process_status_graph.gridPos.x }}, "y": {{ PANELS.process_status_graph.gridPos.y }}, "w": {{ PANELS.process_status_graph.gridPos.w }}, "h": {{ PANELS.process_status_graph.gridPos.h }} }, - "height": "350", - "id": 61852, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, + "type": "timeseries", + "title": "Process Status", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", "links": [], - "nullPointMode": "connected", - "options": { - "alertThreshold": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "short", + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "pluginVersion": "7.5.4", - "pointradius": 5, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:549", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $col", @@ -71,6 +121,7 @@ } ], "measurement": "processes", + "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(running) as running, mean(blocked) as blocked, mean(sleeping) as sleeping, mean(stopped) as stopped, mean(zombies) as zombies, mean(paging) as paging, mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", "rawQuery": true, @@ -96,8 +147,7 @@ "operator": "=~", "value": "/^$server$/" } - ], - "orderByTime": "ASC" + ] }, { "alias": "$tag_host: $col", @@ -116,9 +166,11 @@ "type": "fill" } ], + "hide": false, "measurement": "processes", + "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", + "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -142,63 +194,10 @@ "operator": "=~", "value": "/^$server$/" } - ], - "orderByTime": "ASC", - "hide": false + ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Process Status", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true, - "$$hashKey": "object:512" - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true, - "$$hashKey": "object:513" - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "bars": false, - "dashes": false, - "error": false, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/ram_usage_guage.json.jinja b/salt/grafana/panels/ram_usage_guage.json.jinja index 1a1bf04a1..813b9cba8 100644 --- a/salt/grafana/panels/ram_usage_guage.json.jinja +++ b/salt/grafana/panels/ram_usage_guage.json.jinja @@ -1,65 +1,69 @@ { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "editable": true, - "error": false, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "x": {{ PANELS.ram_usage_guage.gridPos.x }}, - "y": {{ PANELS.ram_usage_guage.gridPos.y }}, - "w": {{ PANELS.ram_usage_guage.gridPos.w }}, - "h": {{ PANELS.ram_usage_guage.gridPos.h }} - }, - "height": "150", "id": 61860, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "gridPos": { + "x": {{ PANELS.ram_usage_guage.gridPos.x }}, + "y": {{ PANELS.ram_usage_guage.gridPos.y }}, + "w": {{ PANELS.ram_usage_guage.gridPos.w }}, + "h": {{ PANELS.ram_usage_guage.gridPos.h }} + }, + "type": "gauge", + "title": "RAM usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 70 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 80 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "color": { + "mode": "thresholds" + }, + "max": 100, + "min": 0, + "unit": "percent" + }, + "overrides": [] + }, + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, - "tableColumn": "", "targets": [ { "dsType": "influxdb", @@ -98,26 +102,13 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" } - ] + ], + "orderByTime": "ASC" } ], - "thresholds": "70,80,90", - "title": "RAM usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current", - "fieldConfig": { - "defaults": {}, - "overrides": [] - } + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/rootfs_used_guage.json.jinja b/salt/grafana/panels/rootfs_used_guage.json.jinja index d67e80e4a..b628d247c 100644 --- a/salt/grafana/panels/rootfs_used_guage.json.jinja +++ b/salt/grafana/panels/rootfs_used_guage.json.jinja @@ -1,56 +1,69 @@ { - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "editable": true, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, + "id": 61866, "gridPos": { "x": {{ PANELS.rootfs_used_guage.gridPos.x }}, "y": {{ PANELS.rootfs_used_guage.gridPos.y }}, "w": {{ PANELS.rootfs_used_guage.gridPos.w }}, "h": {{ PANELS.rootfs_used_guage.gridPos.h }} }, - "height": "150", - "id": 61866, + "type": "gauge", + "title": "RootFS used", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 70 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 80 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "color": { + "mode": "thresholds" + }, + "decimals": 0, + "max": 100, + "min": 0, + "unit": "percent" }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "postfixFontSize": "50%", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "overrides": [] + }, + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, "targets": [ { @@ -70,6 +83,7 @@ } ], "measurement": "disk", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -90,8 +104,8 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" }, { "condition": "AND", @@ -99,33 +113,9 @@ "operator": "=", "value": "/" } - ], - "orderByTime": "ASC" + ] } ], - "thresholds": "70,80,90", - "title": "RootFS used", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "cacheTimeout": null, - "colorBackground": false, - "decimals": 0, - "error": false, - "interval": null, - "nullText": null, - "postfix": "", - "prefix": "", - "tableColumn": "" + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/swap_io_bytes_graph.json.jinja b/salt/grafana/panels/swap_io_bytes_graph.json.jinja index 6d65f5039..fe7989870 100644 --- a/salt/grafana/panels/swap_io_bytes_graph.json.jinja +++ b/salt/grafana/panels/swap_io_bytes_graph.json.jinja @@ -1,180 +1,187 @@ { - "type": "graph", - "title": "Swap I/O Bytes", + "id": 68890, "gridPos": { "x": {{ PANELS.swap_io_bytes_graph.gridPos.x }}, "y": {{ PANELS.swap_io_bytes_graph.gridPos.y }}, "w": {{ PANELS.swap_io_bytes_graph.gridPos.w }}, "h": {{ PANELS.swap_io_bytes_graph.gridPos.h }} }, - "id": 68890, + "type": "timeseries", + "title": "Swap I/O Bytes", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host: $col" - }, - { - "refId": "B", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT non_negative_derivative(mean(\"mean_in\")) as \"trend_in\", non_negative_derivative(mean(\"mean_out\")) as \"trend_out\" FROM \"so_long_term\".\"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", - "rawQuery": true, "alias": "$tag_host: $col", - "hide": false - } - ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "bytes", - "$$hashKey": "object:156" + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] }, { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:157" + "alias": "$tag_host: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"mean_in\")) as \"trend_in\", non_negative_derivative(mean(\"mean_out\")) as \"trend_out\" FROM \"so_long_term\".\"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "bytes", + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:322", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/swap_usage_guage.json.jinja b/salt/grafana/panels/swap_usage_guage.json.jinja index 895dd03f4..f7e3d4f34 100644 --- a/salt/grafana/panels/swap_usage_guage.json.jinja +++ b/salt/grafana/panels/swap_usage_guage.json.jinja @@ -1,66 +1,70 @@ { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "decimals": 0, - "editable": true, - "error": false, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "x": {{ PANELS.swap_usage_guage.gridPos.x }}, - "y": {{ PANELS.swap_usage_guage.gridPos.y }}, - "w": {{ PANELS.swap_usage_guage.gridPos.w }}, - "h": {{ PANELS.swap_usage_guage.gridPos.h }} - }, - "height": "150", "id": 61863, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "gridPos": { + "x": {{ PANELS.swap_usage_guage.gridPos.x }}, + "y": {{ PANELS.swap_usage_guage.gridPos.y }}, + "w": {{ PANELS.swap_usage_guage.gridPos.w }}, + "h": {{ PANELS.swap_usage_guage.gridPos.h }} + }, + "type": "gauge", + "title": "Swap usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 50 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 70 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "color": { + "mode": "thresholds" + }, + "decimals": 0, + "max": 100, + "min": 0, + "unit": "percent" + }, + "overrides": [] + }, + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, - "tableColumn": "", "targets": [ { "dsType": "influxdb", @@ -99,26 +103,13 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" } - ] + ], + "orderByTime": "ASC" } ], - "thresholds": "50,70,90", - "title": "Swap usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current", - "fieldConfig": { - "defaults": {}, - "overrides": [] - } + "maxDataPoints": null, + "cacheTimeout": null } From 8857fca797d3546097f38baa9d4686b17a3490fb Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 1 Nov 2021 14:36:41 -0400 Subject: [PATCH 04/47] graph changes --- salt/grafana/defaults.yaml | 4 +- ...u_docker_combined_current_graph.json.jinja | 2 + .../panels/system_uptime_graph.json.jinja | 153 ++++++++++++++++ ...e_docker_combined_current_graph.json.jinja | 168 ++++++++---------- 4 files changed, 234 insertions(+), 93 deletions(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 9f8b8821e..ee5f3a380 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -1388,10 +1388,10 @@ grafana: w: 4 monitor_interface_traffic_stat: gridPos: - x: 8 + x: 0 y: 5 h: 4 - w: 4 + w: 12 zeek_packet_loss_stat: gridPos: x: 12 diff --git a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja index 7d0f67135..ecfe537e1 100644 --- a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja @@ -87,6 +87,8 @@ "legend": { "displayMode": "table", "placement": "right", + "sort": "lastNotNull", + "sortDesc": false, "calcs": [ "max", "mean", diff --git a/salt/grafana/panels/system_uptime_graph.json.jinja b/salt/grafana/panels/system_uptime_graph.json.jinja index bf26b520f..2f2550216 100644 --- a/salt/grafana/panels/system_uptime_graph.json.jinja +++ b/salt/grafana/panels/system_uptime_graph.json.jinja @@ -146,3 +146,156 @@ "decimals": 1, "description": "" } + + + + + + + + + + + + + + +{ + "id": 69016, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 1 + }, + "type": "timeseries", + "title": "System Uptime", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "s", + "decimals": 1, + "min": 0, + "max": 604800 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "sort": "lastNotNull", + "sortDesc": false, + "calcs": [ + "lastNotNull" + ] + } + }, + "targets": [ + { + "alias": "$tag_host $tag_role", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "role" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "system", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "uptime" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + } + ] + } + ], + "description": "", + "timeFrom": null, + "timeShift": null, + "interval": "30" +} diff --git a/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja b/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja index ad4ff2805..a656f6522 100644 --- a/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja +++ b/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja @@ -1,43 +1,29 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "decimals": 1, - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, + "id": 68896, "gridPos": { "x": {{ PANELS.uptime_docker_combined_current_graph.gridPos.x }}, "y": {{ PANELS.uptime_docker_combined_current_graph.gridPos.y }}, "w": {{ PANELS.uptime_docker_combined_current_graph.gridPos.w }}, "h": {{ PANELS.uptime_docker_combined_current_graph.gridPos.h }} }, - "id": 68896, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": false, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", + "type": "timeseries", + "title": "Container Uptime Current", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "options": { - "alertThreshold": true + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "sort": "lastNotNull", + "sortDesc": false, + "calcs": [ + "lastNotNull" + ] + } }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, "targets": [ { "alias": "$tag_host $tag_role $tag_container_name", @@ -55,16 +41,16 @@ "type": "tag" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "role" - ] + ], + "type": "tag" }, { "params": [ @@ -73,6 +59,7 @@ "type": "fill" } ], + "limit": "", "measurement": "docker_container_status", "orderByTime": "ASC", "policy": "default", @@ -84,17 +71,18 @@ "select": [ [ { - "type": "field", "params": [ "uptime_ns" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" } ] ], + "slimit": "", "tags": [ { "key": "host", @@ -107,62 +95,60 @@ "operator": "=~", "value": "/^$containers$/" } - ], - "slimit": "", - "limit": "" + ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Container Uptime Current", - "tooltip": { - "shared": true, - "sort": 1, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:192", - "format": "ns", - "label": null, - "logBase": 1, - "max": "604800000000000", - "min": "0", - "show": true, - "decimals": 1 + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "ns", + "decimals": 1, + "min": 0, + "max": 604800000000000 }, - { - "$$hashKey": "object:193", - "decimals": 2, - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": "0", - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null + "overrides": [] }, - "bars": false, - "dashes": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "interval": "30s", "timeFrom": null, "timeShift": null } From c4a1fbd82a6acc697ccda207001fe8a1b34fa936 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 1 Nov 2021 14:39:03 -0400 Subject: [PATCH 05/47] remove old json --- .../panels/system_uptime_graph.json.jinja | 162 ------------------ 1 file changed, 162 deletions(-) diff --git a/salt/grafana/panels/system_uptime_graph.json.jinja b/salt/grafana/panels/system_uptime_graph.json.jinja index 2f2550216..a797a7600 100644 --- a/salt/grafana/panels/system_uptime_graph.json.jinja +++ b/salt/grafana/panels/system_uptime_graph.json.jinja @@ -1,165 +1,3 @@ -{ - "type": "graph", - "title": "System Uptime", - "gridPos": { - "x": {{ PANELS.system_uptime_graph.gridPos.x }}, - "y": {{ PANELS.system_uptime_graph.gridPos.y }}, - "w": {{ PANELS.system_uptime_graph.gridPos.w }}, - "h": {{ PANELS.system_uptime_graph.gridPos.h }} - }, - "id": 69016, - "targets": [ - { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "tag", - "params": [ - "role" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "uptime" - ] - }, - { - "type": "last", - "params": [] - } - ] - ], - "measurement": "system", - "alias": "$tag_host $tag_role" - } - ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": "", - "show": true, - "logBase": 1, - "min": "0", - "max": "604800", - "format": "s", - "$$hashKey": "object:213", - "decimals": 1 - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:214" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": false, - "current": true, - "total": false, - "avg": false, - "alignAsTable": true, - "rightSide": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 1 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "decimals": 1, - "description": "" -} - - - - - - - - - - - - - - { "id": 69016, "gridPos": { From 8ff122262c18834f5e8c7333b6b82e24c29fcd75 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 1 Nov 2021 14:50:57 -0400 Subject: [PATCH 06/47] Revert "update many panels" This reverts commit b63b50d98ce33384e2de7aa083324672201bea0d. --- ...u_docker_combined_current_graph.json.jinja | 109 +++-- ...cpu_docker_combined_trend_graph.json.jinja | 281 ++++++------ .../grafana/panels/cpu_usage_guage.json.jinja | 143 +++--- .../cpu_usage_tasks_all_graph.json.jinja | 200 ++++---- .../panels/disk_io_bytes_graph.json.jinja | 365 +++++++-------- .../panels/disk_io_requests_graph.json.jinja | 359 +++++++-------- .../panels/disk_io_time_graph.json.jinja | 358 +++++++-------- .../panels/disk_usage_nsm_graph.json.jinja | 287 ++++++------ .../panels/disk_usage_root_graph.json.jinja | 287 ++++++------ salt/grafana/panels/io_wait_stat.json.jinja | 85 ++-- .../load_average_5_minute_stat.json.jinja | 81 ++-- .../panels/load_averages_graph.json.jinja | 189 ++++---- ...anagement_interface_drops_graph.json.jinja | 395 ++++++++-------- ...agement_interface_packets_graph.json.jinja | 427 +++++++++--------- ...nt_interface_traffic_both_graph.json.jinja | 62 +-- .../panels/memory_usage_graph.json.jinja | 215 ++++----- .../monitor_interface_drops_graph.json.jinja | 395 ++++++++-------- ...monitor_interface_packets_graph.json.jinja | 394 ++++++++-------- ...or_interface_traffic_both_graph.json.jinja | 54 +-- salt/grafana/panels/nsm_used_guage.json.jinja | 136 +++--- .../panels/pcap_retention_stat.json.jinja | 75 ++- .../panels/process_status_graph.json.jinja | 205 ++++----- .../grafana/panels/ram_usage_guage.json.jinja | 143 +++--- .../panels/rootfs_used_guage.json.jinja | 136 +++--- .../panels/swap_io_bytes_graph.json.jinja | 255 +++++------ .../panels/swap_usage_guage.json.jinja | 145 +++--- 26 files changed, 2814 insertions(+), 2967 deletions(-) diff --git a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja index ecfe537e1..3e873292f 100644 --- a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja @@ -8,7 +8,6 @@ }, "type": "timeseries", "title": "Container CPU Usage Current", - "transformations": [], "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s", @@ -68,13 +67,6 @@ { "id": "custom.fillOpacity", "value": 0 - }, - { - "id": "color", - "value": { - "mode": "fixed", - "fixedColor": "dark-red" - } } ] } @@ -125,7 +117,6 @@ "type": "fill" } ], - "hide": false, "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "default", @@ -160,65 +151,67 @@ "operator": "=~", "value": "/^$containers$/" } - ] + ], + "hide": false }, { - "alias": "$tag_host: n_cpus*100", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "system", - "orderByTime": "ASC", - "policy": "default", "refId": "B", + "hide": false, + "policy": "default", "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "n_cpus" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - " * 100" - ], - "type": "math" - } - ] - ], + "orderByTime": "ASC", "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "value": "/^$servername$/", + "operator": "=~" } - ] + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "n_cpus" + ] + }, + { + "type": "last", + "params": [] + }, + { + "type": "math", + "params": [ + " * 100" + ] + } + ] + ], + "measurement": "system", + "alias": "$tag_host: n_cpus*100" } ], + "transformations": [], "maxDataPoints": null, "timeFrom": null, "timeShift": null diff --git a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja index 2e2dbe797..d587a0529 100644 --- a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja @@ -11,6 +11,140 @@ "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "alias": "$tag_host: $tag_container_name", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "container_name" + ], + "type": "tag" + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "docker_container_cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "mean_usage_percent" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=~", + "value": "/^$containers$/" + } + ] + }, + { + "refId": "B", + "hide": false, + "policy": "so_long_term", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "mean_n_cpus" + ] + }, + { + "type": "last", + "params": [] + }, + { + "type": "math", + "params": [ + " * 100" + ] + } + ] + ], + "measurement": "system", + "alias": "$tag_host: n_cpus*100" + } + ], "fieldConfig": { "defaults": { "custom": { @@ -54,8 +188,8 @@ ] }, "mappings": [], - "decimals": 1, - "unit": "percent" + "unit": "percent", + "decimals": 1 }, "overrides": [ { @@ -67,154 +201,13 @@ { "id": "custom.fillOpacity", "value": 0 - }, - { - "id": "color", - "value": { - "mode": "fixed", - "fixedColor": "dark-red" - } } ] } ] }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_container_name", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_cpu", - "orderByTime": "ASC", - "policy": "so_long_term", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_usage_percent" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - }, - { - "alias": "$tag_host: n_cpus*100", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "system", - "orderByTime": "ASC", - "policy": "so_long_term", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_n_cpus" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - " * 100" - ], - "type": "math" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "description": "", "maxDataPoints": null, + "description": "", "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/cpu_usage_guage.json.jinja b/salt/grafana/panels/cpu_usage_guage.json.jinja index d5cd949d8..4a28c315c 100644 --- a/salt/grafana/panels/cpu_usage_guage.json.jinja +++ b/salt/grafana/panels/cpu_usage_guage.json.jinja @@ -1,69 +1,65 @@ { - "id": 9, - "gridPos": { - "x": {{ PANELS.cpu_usage_guage.gridPos.x }}, - "y": {{ PANELS.cpu_usage_guage.gridPos.y }}, - "w": {{ PANELS.cpu_usage_guage.gridPos.w }}, - "h": {{ PANELS.cpu_usage_guage.gridPos.h }} - }, - "type": "gauge", - "title": "CPU usage", + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", - "pluginVersion": "8.2.1", + "editable": true, + "error": false, + "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": true, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "x": {{ PANELS.cpu_usage_guage.gridPos.x }}, + "y": {{ PANELS.cpu_usage_guage.gridPos.y }}, + "w": {{ PANELS.cpu_usage_guage.gridPos.w }}, + "h": {{ PANELS.cpu_usage_guage.gridPos.h }} + }, + "height": "150", + "id": 9, + "interval": null, "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 70 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 80 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "max": 100, - "min": 0, - "unit": "percent" + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true, - "text": {} + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": false }, + "tableColumn": "", "targets": [ { "dsType": "influxdb", @@ -108,8 +104,8 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" }, { "condition": "AND", @@ -117,10 +113,23 @@ "operator": "=", "value": "cpu-total" } - ], - "orderByTime": "ASC" + ] } ], - "maxDataPoints": null, - "cacheTimeout": null + "thresholds": "70,80,90", + "title": "CPU usage", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current", + "fieldConfig": { + "defaults": {}, + "overrides": [] + } } diff --git a/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja index dea4c3d8c..e865f446f 100644 --- a/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja @@ -1,30 +1,51 @@ { - "id": 61871, + "aliasColors": {}, + "dashLength": 10, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "fill": 1, "gridPos": { "x": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.h }} }, - "type": "timeseries", - "title": "CPU Usage", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } + "id": 61871, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true }, + "lines": true, + "linewidth": 1, + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "pluginVersion": "7.5.4", + "pointradius": 2, + "renderer": "flot", + "seriesOverrides": [ + { + "$$hashKey": "object:266", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "spaceLength": 10, "targets": [ { "alias": "$tag_host: $col", @@ -63,8 +84,7 @@ } ] ], - "tags": [], - "hide": false + "tags": [] }, { "alias": "$tag_host: $col", @@ -82,10 +102,9 @@ "type": "fill" } ], - "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\" FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), * fill(linear)", + "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\" FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), *", "queryType": "randomWalk", "rawQuery": true, "refId": "B", @@ -104,90 +123,61 @@ } ] ], - "tags": [] + "tags": [], + "hide": false } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "percent", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] + "thresholds": [], + "timeRegions": [], + "title": "CPU Usage", + "tooltip": { + "shared": true, + "sort": 2, + "value_type": "individual" }, - "maxDataPoints": null, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:202", + "decimals": null, + "format": "percent", + "label": null, + "logBase": 1, + "max": "100", + "min": "0", + "show": true + }, + { + "$$hashKey": "object:203", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + }, + "bars": false, + "dashes": false, + "fillGradient": 0, + "hiddenSeries": false, + "percentage": false, + "points": false, + "stack": false, + "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/disk_io_bytes_graph.json.jinja b/salt/grafana/panels/disk_io_bytes_graph.json.jinja index 4b9c4c7ff..8fce4e386 100644 --- a/salt/grafana/panels/disk_io_bytes_graph.json.jinja +++ b/salt/grafana/panels/disk_io_bytes_graph.json.jinja @@ -1,189 +1,194 @@ { - "id": 60200, - "gridPos": { - "x": {{ PANELS.disk_io_bytes_graph.gridPos.x }}, - "y": {{ PANELS.disk_io_bytes_graph.gridPos.y }}, - "w": {{ PANELS.disk_io_bytes_graph.gridPos.w }}, - "h": {{ PANELS.disk_io_bytes_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Disk I/O bytes for /dev/$disk", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" + "aliasColors": {}, + "maxDataPoints": 750, + "interval": "30s", + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "links": [] }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "bytes", - "decimals": 1 + "overrides": [] }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" + "fill": 1, + "fillGradient": 0, + "grid": {}, + "gridPos": { + "x": {{ PANELS.disk_io_bytes_graph.gridPos.x }}, + "y": {{ PANELS.disk_io_bytes_graph.gridPos.y }}, + "w": {{ PANELS.disk_io_bytes_graph.gridPos.w }}, + "h": {{ PANELS.disk_io_bytes_graph.gridPos.h }} }, + "hiddenSeries": false, + "id": 60200, "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "alignAsTable": true, + "avg": true, + "current": true, + "hideEmpty": true, + "max": true, + "min": false, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" + "lines": true, + "linewidth": 1, + "links": [], + "maxPerRow": 6, + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.5.4", + "pointradius": 5, + "points": false, + "renderer": "flot", + "repeat": null, + + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [{ + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [{ + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [{ + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [{ + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [{ + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Disk I/O bytes for /dev/$disk", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [{ + "format": "bytes", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null } - ], - "scopedVars": { - "disk": { - "text": "sda", - "value": "sda", - "selected": false - } - }, - "maxDataPoints": null, - "repeat": null, - "timeFrom": null, - "timeShift": null } diff --git a/salt/grafana/panels/disk_io_requests_graph.json.jinja b/salt/grafana/panels/disk_io_requests_graph.json.jinja index a3f95772c..1c2227fbd 100644 --- a/salt/grafana/panels/disk_io_requests_graph.json.jinja +++ b/salt/grafana/panels/disk_io_requests_graph.json.jinja @@ -1,190 +1,193 @@ { - "id": 13782, + "aliasColors": {}, + "maxDataPoints": 750, + "interval": "30s", + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "grid": {}, "gridPos": { "x": {{ PANELS.disk_io_requests_graph.gridPos.x }}, "y": {{ PANELS.disk_io_requests_graph.gridPos.y }}, "w": {{ PANELS.disk_io_requests_graph.gridPos.w }}, "h": {{ PANELS.disk_io_requests_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Disk I/O requests for /dev/$disk", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "iops", - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, + "hiddenSeries": false, + "id": 13782, "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [], - "hide": false + "alignAsTable": true, + "avg": true, + "current": true, + "hideEmpty": true, + "max": true, + "min": false, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" + "lines": true, + "linewidth": 1, + "links": [], + "maxPerRow": 6, + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.5.4", + "pointradius": 5, + "points": false, + "renderer": "flot", + "repeat": null, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [{ + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [{ + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [{ + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [{ + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [{ + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Disk I/O requests for /dev/$disk", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [{ + "format": "iops", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null } - ], - "scopedVars": { - "disk": { - "text": "sda", - "value": "sda", - "selected": false - } - }, - "maxDataPoints": null, - "repeat": null, - "timeFrom": null, - "timeShift": null } diff --git a/salt/grafana/panels/disk_io_time_graph.json.jinja b/salt/grafana/panels/disk_io_time_graph.json.jinja index fa7c7b51e..0b0e00e42 100644 --- a/salt/grafana/panels/disk_io_time_graph.json.jinja +++ b/salt/grafana/panels/disk_io_time_graph.json.jinja @@ -1,189 +1,193 @@ { - "id": 56720, + "aliasColors": {}, + "maxDataPoints": 750, + "interval": "30s", + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "grid": {}, "gridPos": { "x": {{ PANELS.disk_io_time_graph.gridPos.x }}, "y": {{ PANELS.disk_io_time_graph.gridPos.y }}, "w": {{ PANELS.disk_io_time_graph.gridPos.w }}, "h": {{ PANELS.disk_io_time_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Disk I/O time for /dev/$disk", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "ms", - "decimals": 1 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, + "hiddenSeries": false, + "id": 56720, "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "alignAsTable": true, + "avg": true, + "current": true, + "hideEmpty": true, + "max": true, + "min": false, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [ - { - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" + "lines": true, + "linewidth": 1, + "links": [], + "maxPerRow": 6, + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.5.4", + "pointradius": 5, + "points": false, + "renderer": "flot", + "repeat": null, + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [{ + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [{ + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [{ + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [{ + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [{ + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Disk I/O time for /dev/$disk", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [{ + "format": "ms", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null } - ], - "scopedVars": { - "disk": { - "text": "sda", - "value": "sda", - "selected": false - } - }, - "maxDataPoints": null, - "repeat": null, - "timeFrom": null, - "timeShift": null } diff --git a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja index 90212b681..223e2c041 100644 --- a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja +++ b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja @@ -1,211 +1,186 @@ { - "id": 68888, + "type": "graph", + "title": "Disk Usage /nsm", "gridPos": { "x": {{ PANELS.disk_usage_nsm_graph.gridPos.x }}, "y": {{ PANELS.disk_usage_nsm_graph.gridPos.y }}, "w": {{ PANELS.disk_usage_nsm_graph.gridPos.w }}, "h": {{ PANELS.disk_usage_nsm_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Disk Usage /nsm", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, + "id": 68888, "targets": [ { - "alias": "$tag_host: mountpoint $tag_path - $col", + "refId": "A", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", + "rawQuery": true, + "alias": "$tag_host: mountpoint $tag_path - $col" }, { - "alias": "$tag_host: mountpoint $tag_path - $col", + "refId": "B", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\" fill(linear)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", + "rawQuery": true, + "alias": "$tag_host: mountpoint $tag_path - $col", + "hide": false } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "bytes", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/total/" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "#C4162A", - "mode": "fixed" - } - }, - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 2 - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] + "options": { + "alertThreshold": true }, - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "pluginVersion": "7.5.4", + "renderer": "flot", + "yaxes": [ + { + "label": null, + "show": true, + "logBase": 1, + "min": "0", + "max": null, + "format": "bytes", + "$$hashKey": "object:235" + }, + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short", + "$$hashKey": "object:236" + } + ], + "xaxis": { + "show": true, + "mode": "time", + "name": null, + "values": [], + "buckets": null + }, + "yaxis": { + "align": false, + "alignLevel": null + }, + "lines": true, + "fill": 1, + "linewidth": 1, + "dashLength": 10, + "spaceLength": 10, + "pointradius": 2, + "legend": { + "show": true, + "values": true, + "min": false, + "max": true, + "current": true, + "total": false, + "avg": true, + "alignAsTable": true + }, + "nullPointMode": "connected", + "tooltip": { + "value_type": "individual", + "shared": true, + "sort": 0 + }, + "aliasColors": {}, + "seriesOverrides": [ + { + "$$hashKey": "object:486", + "alias": "/total/", + "fill": 0, + "linewidth": 2, + "color": "#C4162A", + "zindex": 3 + }, + { + "$$hashKey": "object:829", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "thresholds": [], + "timeRegions": [], + "steppedLine": true, + "fillGradient": 0, + "dashes": false, + "hiddenSeries": false, + "points": false, + "bars": false, + "stack": false, + "percentage": false, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/disk_usage_root_graph.json.jinja b/salt/grafana/panels/disk_usage_root_graph.json.jinja index 07ac20bbe..ee20e5d04 100644 --- a/salt/grafana/panels/disk_usage_root_graph.json.jinja +++ b/salt/grafana/panels/disk_usage_root_graph.json.jinja @@ -1,211 +1,186 @@ { - "id": 61880, + "type": "graph", + "title": "Disk Usage /", "gridPos": { "x": {{ PANELS.disk_usage_root_graph.gridPos.x }}, "y": {{ PANELS.disk_usage_root_graph.gridPos.y }}, "w": {{ PANELS.disk_usage_root_graph.gridPos.w }}, "h": {{ PANELS.disk_usage_root_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Disk Usage /", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, + "id": 61880, "targets": [ { - "alias": "$tag_host: mountpoint $tag_path - $col", + "refId": "A", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", + "rawQuery": true, + "alias": "$tag_host: mountpoint $tag_path - $col" }, { - "alias": "$tag_host: mountpoint $tag_path - $col", + "refId": "B", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\" fill(linear)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", + "rawQuery": true, + "alias": "$tag_host: mountpoint $tag_path - $col", + "hide": false } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "stepAfter", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "bytes", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/total/" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "#C4162A", - "mode": "fixed" - } - }, - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 2 - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] + "options": { + "alertThreshold": true }, - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "pluginVersion": "7.5.4", + "renderer": "flot", + "yaxes": [ + { + "label": null, + "show": true, + "logBase": 1, + "min": "0", + "max": null, + "format": "bytes", + "$$hashKey": "object:235" + }, + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short", + "$$hashKey": "object:236" + } + ], + "xaxis": { + "show": true, + "mode": "time", + "name": null, + "values": [], + "buckets": null + }, + "yaxis": { + "align": false, + "alignLevel": null + }, + "lines": true, + "fill": 1, + "linewidth": 1, + "dashLength": 10, + "spaceLength": 10, + "pointradius": 2, + "legend": { + "show": true, + "values": true, + "min": false, + "max": true, + "current": true, + "total": false, + "avg": true, + "alignAsTable": true + }, + "nullPointMode": "connected", + "tooltip": { + "value_type": "individual", + "shared": true, + "sort": 0 + }, + "aliasColors": {}, + "seriesOverrides": [ + { + "$$hashKey": "object:486", + "alias": "/total/", + "fill": 0, + "linewidth": 2, + "color": "#C4162A", + "zindex": 3 + }, + { + "$$hashKey": "object:829", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "thresholds": [], + "timeRegions": [], + "steppedLine": true, + "fillGradient": 0, + "dashes": false, + "hiddenSeries": false, + "points": false, + "bars": false, + "stack": false, + "percentage": false, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/io_wait_stat.json.jinja b/salt/grafana/panels/io_wait_stat.json.jinja index 4fe4a3d8e..470d0008f 100644 --- a/salt/grafana/panels/io_wait_stat.json.jinja +++ b/salt/grafana/panels/io_wait_stat.json.jinja @@ -1,16 +1,5 @@ { - "id": 61867, - "gridPos": { - "x": {{ PANELS.io_wait_stat.gridPos.x }}, - "y": {{ PANELS.io_wait_stat.gridPos.y }}, - "w": {{ PANELS.io_wait_stat.gridPos.w }}, - "h": {{ PANELS.io_wait_stat.gridPos.h }} - }, - "type": "stat", - "title": "IOWait", "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "links": [], "fieldConfig": { "defaults": { "thresholds": { @@ -32,41 +21,31 @@ }, "mappings": [ { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" + "op": "=", + "text": "N/A", + "value": "null", + "$$hashKey": "object:1217", + "id": 0, + "type": 1 } ], + "unit": "percent", + "decimals": 2, "color": { "mode": "thresholds" - }, - "decimals": 2, - "max": 100, - "min": 0, - "unit": "percent" + } }, "overrides": [] }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" + "gridPos": { + "x": {{ PANELS.io_wait_stat.gridPos.x }}, + "y": {{ PANELS.io_wait_stat.gridPos.y }}, + "w": {{ PANELS.io_wait_stat.gridPos.w }}, + "h": {{ PANELS.io_wait_stat.gridPos.h }} }, + "id": 61867, + "links": [], + "maxDataPoints": 100, "targets": [ { "dsType": "influxdb", @@ -85,7 +64,6 @@ } ], "measurement": "cpu", - "orderByTime": "ASC", "policy": "default", "query": "SELECT non_negative_derivative(mean(\"usage_iowait\"), 1s) FROM \"cpu\" WHERE (host =~ /$servername$/ AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, @@ -108,8 +86,8 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" }, { "condition": "AND", @@ -117,9 +95,28 @@ "operator": "=", "value": "cpu-total" } - ] + ], + "orderByTime": "ASC" } ], - "maxDataPoints": null, - "cacheTimeout": null + "title": "IOWait", + "type": "stat", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "auto", + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto" + }, + "cacheTimeout": null, + "interval": null, + "pluginVersion": "7.5.4" } diff --git a/salt/grafana/panels/load_average_5_minute_stat.json.jinja b/salt/grafana/panels/load_average_5_minute_stat.json.jinja index 8198a8d19..c4a75c35b 100644 --- a/salt/grafana/panels/load_average_5_minute_stat.json.jinja +++ b/salt/grafana/panels/load_average_5_minute_stat.json.jinja @@ -1,17 +1,5 @@ { - "id": 61859, - "gridPos": { - "x": {{ PANELS.load_average_5_minute_stat.gridPos.x }}, - "y": {{ PANELS.load_average_5_minute_stat.gridPos.y }}, - "w": {{ PANELS.load_average_5_minute_stat.gridPos.w }}, - "h": {{ PANELS.load_average_5_minute_stat.gridPos.h }} - }, - "type": "stat", - "title": "5 Minute Load Average - $cpucount Cores", "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30", - "links": [], "fieldConfig": { "defaults": { "thresholds": { @@ -19,7 +7,7 @@ "steps": [ { "color": "rgba(50, 172, 45, 0.97)", - "value": null + "value": "$cpucount / 2" }, { "color": "rgba(237, 129, 40, 0.89)", @@ -33,39 +21,30 @@ }, "mappings": [ { - "options": { - "from": null, - "result": { - "text": "N/A" - }, - "to": null - }, - "type": "range" + "op": "=", + "text": "N/A", + "value": "null", + "id": 0, + "type": 2 } ], + "unit": "none", + "decimals": 1, "color": { "mode": "thresholds" - }, - "decimals": 1, - "unit": "none" + } }, "overrides": [] }, - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" + "gridPos": { + "x": {{ PANELS.load_average_5_minute_stat.gridPos.x }}, + "y": {{ PANELS.load_average_5_minute_stat.gridPos.y }}, + "w": {{ PANELS.load_average_5_minute_stat.gridPos.w }}, + "h": {{ PANELS.load_average_5_minute_stat.gridPos.h }} }, + "id": 61859, + "links": [], + "maxDataPoints": 100, "targets": [ { "dsType": "influxdb", @@ -86,8 +65,6 @@ "measurement": "system", "orderByTime": "ASC", "policy": "default", - "query": "SELECT last(\"load5\") FROM \"system\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", - "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -107,12 +84,30 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } ] } ], + "title": "5 Minute Load Average - $cpucount Cores", + "type": "stat", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "auto", + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto" + }, + "pluginVersion": "7.5.4", "cacheTimeout": null, - "maxDataPoints": null + "interval": null } diff --git a/salt/grafana/panels/load_averages_graph.json.jinja b/salt/grafana/panels/load_averages_graph.json.jinja index b92a5ba6c..2f3706528 100644 --- a/salt/grafana/panels/load_averages_graph.json.jinja +++ b/salt/grafana/panels/load_averages_graph.json.jinja @@ -1,30 +1,48 @@ { - "id": 61869, + "aliasColors": {}, + "dashLength": 10, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, "gridPos": { "x": {{ PANELS.load_averages_graph.gridPos.x }}, "y": {{ PANELS.load_averages_graph.gridPos.y }}, "w": {{ PANELS.load_averages_graph.gridPos.w }}, "h": {{ PANELS.load_averages_graph.gridPos.h }} }, - "type": "timeseries", - "title": "1 Minute Load Average", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } + "id": 61869, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true }, + "lines": true, + "linewidth": 1, + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "pluginVersion": "7.5.4", + "pointradius": 2, + "renderer": "flot", + "seriesOverrides": [ + { + "$$hashKey": "object:364", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "spaceLength": 10, "targets": [ { "alias": "$tag_host: $col", @@ -81,10 +99,9 @@ "type": "fill" } ], - "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_load1) as \"trend_1 minute\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * fill(linear) ORDER BY asc", + "query": "SELECT mean(mean_load1) as \"trend_1 minute\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc", "queryType": "randomWalk", "rawQuery": true, "refId": "B", @@ -103,85 +120,61 @@ } ] ], - "tags": [] + "tags": [], + "hide": false } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "short", - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] + "thresholds": [], + "timeRegions": [], + "title": "1 Minute Load Average", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" }, - "maxDataPoints": null, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:287", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:288", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + }, + "bars": false, + "dashes": false, + "fill": 0, + "fillGradient": 0, + "hiddenSeries": false, + "percentage": false, + "points": false, + "stack": false, + "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/management_interface_drops_graph.json.jinja b/salt/grafana/panels/management_interface_drops_graph.json.jinja index 9de6c8f19..831c6c45a 100644 --- a/salt/grafana/panels/management_interface_drops_graph.json.jinja +++ b/salt/grafana/panels/management_interface_drops_graph.json.jinja @@ -1,282 +1,263 @@ { - "id": 61877, + "type": "graph", + "title": "Management Interface Drops", "gridPos": { "x": {{ PANELS.management_interface_drops_graph.gridPos.x }}, "y": {{ PANELS.management_interface_drops_graph.gridPos.y }}, "w": {{ PANELS.management_interface_drops_graph.gridPos.w }}, "h": {{ PANELS.management_interface_drops_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Management Interface Drops", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "maxDataPoints": 750, - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, + "id": 61877, "targets": [ { - "alias": "$tag_host: $tag_interface: $col", + "refId": "A", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "rawQuery": true, + "alias": "$tag_host: $tag_interface: $col" }, { - "alias": "$tag_host: $tag_interface: $col", + "refId": "B", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "alias": "$tag_host: $tag_interface: $col" }, { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "queryType": "randomWalk", - "rawQuery": true, "refId": "C", + "queryType": "randomWalk", + "policy": "default", "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "rawQuery": true, + "alias": "$tag_host: $tag_interface: $col", + "hide": false }, { - "alias": "$tag_host: $tag_interface: $col", + "refId": "D", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "alias": "$tag_host: $tag_interface: $col" } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Drops per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] + "options": { + "alertThreshold": true }, - "timeFrom": null, - "timeShift": null + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "pluginVersion": "7.5.4", + "renderer": "flot", + "yaxes": [ + { + "label": "Drops per second", + "show": true, + "logBase": 1, + "min": 0, + "max": null, + "format": "pps", + "$$hashKey": "object:500" + }, + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short", + "$$hashKey": "object:501" + } + ], + "xaxis": { + "show": true, + "mode": "time", + "name": null, + "values": [], + "buckets": null + }, + "yaxis": { + "align": false, + "alignLevel": null + }, + "lines": true, + "fill": 1, + "linewidth": 1, + "dashLength": 10, + "spaceLength": 10, + "pointradius": 2, + "legend": { + "show": true, + "values": true, + "min": false, + "max": true, + "current": true, + "total": false, + "avg": true, + "alignAsTable": true + }, + "nullPointMode": "connected", + "tooltip": { + "value_type": "individual", + "shared": true, + "sort": 0 + }, + "aliasColors": {}, + "seriesOverrides": [ + { + "$$hashKey": "object:592", + "alias": "/veth/", + "hiddenSeries": true, + "legend": false + }, + { + "$$hashKey": "object:621", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "thresholds": [], + "timeRegions": [], + "fillGradient": 0, + "dashes": false, + "hiddenSeries": false, + "points": false, + "bars": false, + "stack": false, + "percentage": false, + "steppedLine": false, + "decimals": 0, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/management_interface_packets_graph.json.jinja b/salt/grafana/panels/management_interface_packets_graph.json.jinja index b3e429f2f..b113e8fc2 100644 --- a/salt/grafana/panels/management_interface_packets_graph.json.jinja +++ b/salt/grafana/panels/management_interface_packets_graph.json.jinja @@ -1,283 +1,262 @@ { - "id": 61875, + "type": "graph", + "title": "Management Interface Packets", "gridPos": { "x": {{ PANELS.management_interface_packets_graph.gridPos.x }}, "y": {{ PANELS.management_interface_packets_graph.gridPos.y }}, "w": {{ PANELS.management_interface_packets_graph.gridPos.w }}, "h": {{ PANELS.management_interface_packets_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Management Interface Packets", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, + "id": 61875, "targets": [ { - "alias": "$tag_host: $tag_interface: $col", + "refId": "A", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], + "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "rawQuery": true, + "alias": "$tag_host: $tag_interface: $col" + }, + { + "refId": "B", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", "tags": [], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], + "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "rawQuery": true, + "alias": "$tag_host: $tag_interface: $col" + }, + { + "refId": "C", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], + "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "rawQuery": true, + "alias": "$tag_host: $tag_interface: $col", "hide": false }, { - "alias": "$tag_host: $tag_interface: $col", + "refId": "D", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] - }, - { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", "rawQuery": true, - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "alias": "$tag_host: $tag_interface: $col" } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Packets per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] + "options": { + "alertThreshold": true }, - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "pluginVersion": "7.5.4", + "renderer": "flot", + "yaxes": [ + { + "label": "Packets per second", + "show": true, + "logBase": 1, + "min": 0, + "max": null, + "format": "pps", + "$$hashKey": "object:241" + }, + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short", + "$$hashKey": "object:242" + } + ], + "xaxis": { + "show": true, + "mode": "time", + "name": null, + "values": [], + "buckets": null + }, + "yaxis": { + "align": false, + "alignLevel": null + }, + "lines": true, + "fill": 1, + "linewidth": 1, + "dashLength": 10, + "spaceLength": 10, + "pointradius": 2, + "legend": { + "show": true, + "values": true, + "min": false, + "max": true, + "current": true, + "total": false, + "avg": true, + "alignAsTable": true + }, + "nullPointMode": "connected", + "tooltip": { + "value_type": "individual", + "shared": true, + "sort": 0 + }, + "aliasColors": {}, + "seriesOverrides": [ + { + "$$hashKey": "object:413", + "alias": "/veth/", + "hiddenSeries": true, + "legend": false + }, + { + "$$hashKey": "object:442", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "thresholds": [], + "timeRegions": [], + "fillGradient": 0, + "dashes": false, + "hiddenSeries": false, + "points": false, + "bars": false, + "stack": false, + "percentage": false, + "steppedLine": false, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja index e15bef885..2fa5e0bfa 100644 --- a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja +++ b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja @@ -56,8 +56,7 @@ }, "mappings": [], "links": [], - "unit": "bps", - "decimals": 1 + "unit": "bps" }, "overrides": [ { @@ -77,11 +76,11 @@ { "id": "custom.lineStyle", "value": { + "fill": "dash", "dash": [ 4, 10 - ], - "fill": "dash" + ] } } ] @@ -94,17 +93,18 @@ }, "legend": { "displayMode": "table", - "placement": "right", + "placement": "bottom", "calcs": [ - "max", "mean", - "lastNotNull" + "lastNotNull", + "max", + "min" ] } }, "targets": [ { - "alias": "$tag_host: $tag_interface: RX Current", + "alias": "$tag_host: $tag_interface: Inbound Current", "dsType": "influxdb", "groupBy": [ { @@ -114,16 +114,16 @@ "type": "time" }, { + "type": "tag", "params": [ "host" - ], - "type": "tag" + ] }, { + "type": "tag", "params": [ "interface" - ], - "type": "tag" + ] }, { "params": [ @@ -178,7 +178,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: TX Current", + "alias": "$tag_host: $tag_interface: Outbound Current", "dsType": "influxdb", "groupBy": [ { @@ -188,16 +188,16 @@ "type": "time" }, { + "type": "tag", "params": [ "host" - ], - "type": "tag" + ] }, { + "type": "tag", "params": [ "interface" - ], - "type": "tag" + ] }, { "params": [ @@ -252,7 +252,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: RX Trend", + "alias": "$tag_host: $tag_interface: Inbound Trend", "dsType": "influxdb", "groupBy": [ { @@ -262,20 +262,20 @@ "type": "time" }, { + "type": "tag", "params": [ "host" - ], - "type": "tag" + ] }, { + "type": "tag", "params": [ "interface" - ], - "type": "tag" + ] }, { "params": [ - "linear" + "null" ], "type": "fill" } @@ -327,7 +327,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: TX Trend", + "alias": "$tag_host: $tag_interface: Outbound Trend", "dsType": "influxdb", "groupBy": [ { @@ -337,20 +337,20 @@ "type": "time" }, { + "type": "tag", "params": [ "host" - ], - "type": "tag" + ] }, { + "type": "tag", "params": [ "interface" - ], - "type": "tag" + ] }, { "params": [ - "linear" + "null" ], "type": "fill" } @@ -402,8 +402,8 @@ ] } ], - "description": "", "maxDataPoints": null, "timeFrom": null, - "timeShift": null + "timeShift": null, + "description": "" } diff --git a/salt/grafana/panels/memory_usage_graph.json.jinja b/salt/grafana/panels/memory_usage_graph.json.jinja index 662eb18c1..bac85a16f 100644 --- a/salt/grafana/panels/memory_usage_graph.json.jinja +++ b/salt/grafana/panels/memory_usage_graph.json.jinja @@ -1,30 +1,55 @@ { - "id": 61873, + "aliasColors": {}, + "dashLength": 10, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "fill": 1, "gridPos": { "x": {{ PANELS.memory_usage_graph.gridPos.x }}, "y": {{ PANELS.memory_usage_graph.gridPos.y }}, "w": {{ PANELS.memory_usage_graph.gridPos.w }}, "h": {{ PANELS.memory_usage_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Memory Usage", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } + "id": 61873, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true }, + "lines": true, + "linewidth": 1, + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "pluginVersion": "7.5.4", + "pointradius": 2, + "renderer": "flot", + "seriesOverrides": [ + { + "$$hashKey": "object:295", + "alias": "/total/", + "color": "#C4162A", + "fill": 0 + }, + { + "$$hashKey": "object:164", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "spaceLength": 10, "targets": [ { "alias": "$tag_host: $col", @@ -81,10 +106,9 @@ "type": "fill" } ], - "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trend_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", + "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trend_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", "queryType": "randomWalk", "rawQuery": true, "refId": "B", @@ -103,106 +127,61 @@ } ] ], - "tags": [] + "tags": [], + "hide": false } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "bytes", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/total/" - }, - "properties": [ - { - "id": "color", - "value": { - "fixedColor": "#C4162A", - "mode": "fixed" - } - }, - { - "id": "custom.fillOpacity", - "value": 0 - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] + "thresholds": [], + "timeRegions": [], + "title": "Memory Usage", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" }, - "maxDataPoints": null, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:235", + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "$$hashKey": "object:236", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + }, + "bars": false, + "dashes": false, "description": "", + "fillGradient": 0, + "hiddenSeries": false, + "percentage": false, + "points": false, + "stack": false, + "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja index 993926156..4423b8ef9 100644 --- a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja @@ -1,282 +1,263 @@ { - "id": 61387, + "type": "graph", + "title": "Monitor Interface Drops", "gridPos": { "x": {{ PANELS.monitor_interface_drops_graph.gridPos.x }}, "y": {{ PANELS.monitor_interface_drops_graph.gridPos.y }}, "w": {{ PANELS.monitor_interface_drops_graph.gridPos.w }}, "h": {{ PANELS.monitor_interface_drops_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Monitor Interface Drops", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "maxDataPoints": 750, - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, + "id": 61387, "targets": [ { - "alias": "$tag_host: $tag_interface: $col", + "refId": "A", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "rawQuery": true, + "alias": "$tag_host: $tag_interface: $col" }, { - "alias": "$tag_host: $tag_interface: $col", + "refId": "B", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "alias": "$tag_host: $tag_interface: $col" }, { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "queryType": "randomWalk", - "rawQuery": true, "refId": "C", + "queryType": "randomWalk", + "policy": "default", "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "rawQuery": true, + "alias": "$tag_host: $tag_interface: $col", + "hide": false }, { - "alias": "$tag_host: $tag_interface: $col", + "refId": "D", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "alias": "$tag_host: $tag_interface: $col" } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Drops per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] + "options": { + "alertThreshold": true }, - "timeFrom": null, - "timeShift": null + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "pluginVersion": "7.5.4", + "renderer": "flot", + "yaxes": [ + { + "label": "Drops per second", + "show": true, + "logBase": 1, + "min": 0, + "max": null, + "format": "pps", + "$$hashKey": "object:500" + }, + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short", + "$$hashKey": "object:501" + } + ], + "xaxis": { + "show": true, + "mode": "time", + "name": null, + "values": [], + "buckets": null + }, + "yaxis": { + "align": false, + "alignLevel": null + }, + "lines": true, + "fill": 1, + "linewidth": 1, + "dashLength": 10, + "spaceLength": 10, + "pointradius": 2, + "legend": { + "show": true, + "values": true, + "min": false, + "max": true, + "current": true, + "total": false, + "avg": true, + "alignAsTable": true + }, + "nullPointMode": "connected", + "tooltip": { + "value_type": "individual", + "shared": true, + "sort": 0 + }, + "aliasColors": {}, + "seriesOverrides": [ + { + "$$hashKey": "object:592", + "alias": "/veth/", + "hiddenSeries": true, + "legend": false + }, + { + "$$hashKey": "object:621", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "thresholds": [], + "timeRegions": [], + "fillGradient": 0, + "dashes": false, + "hiddenSeries": false, + "points": false, + "bars": false, + "stack": false, + "percentage": false, + "steppedLine": false, + "decimals": 0, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja index 4c44fdb87..0a9b526b7 100644 --- a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja @@ -1,282 +1,262 @@ { - "id": 61878, + "type": "graph", + "title": "Monitor Interface Packets", "gridPos": { "x": {{ PANELS.monitor_interface_packets_graph.gridPos.x }}, "y": {{ PANELS.monitor_interface_packets_graph.gridPos.y }}, "w": {{ PANELS.monitor_interface_packets_graph.gridPos.w }}, "h": {{ PANELS.monitor_interface_packets_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Monitor Interface Packets", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "maxDataPoints": 750, - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "last" - ] - } - }, + "id": 61878, "targets": [ { - "alias": "$tag_host: $tag_interface: $col", + "refId": "A", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "rawQuery": true, + "alias": "$tag_host: $tag_interface: $col" }, { - "alias": "$tag_host: $tag_interface: $col", + "refId": "B", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "alias": "$tag_host: $tag_interface: $col" }, { - "alias": "$tag_host: $tag_interface: $col", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "queryType": "randomWalk", - "rawQuery": true, "refId": "C", + "queryType": "randomWalk", + "policy": "default", "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "rawQuery": true, + "alias": "$tag_host: $tag_interface: $col", + "hide": false }, { - "alias": "$tag_host: $tag_interface: $col", + "refId": "D", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", + "select": [ + [ + { + "type": "field", + "params": [ + "value" + ] + }, + { + "type": "mean", + "params": [] + } + ] + ], "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", "rawQuery": true, - "refId": "D", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "alias": "$tag_host: $tag_interface: $col" } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "Packets per second", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "pps", - "min": 0, - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true - } - } - ] - } - ] + "options": { + "alertThreshold": true }, - "timeFrom": null, - "timeShift": null + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "pluginVersion": "7.5.4", + "renderer": "flot", + "yaxes": [ + { + "label": "Packets per second", + "show": true, + "logBase": 1, + "min": 0, + "max": null, + "format": "pps", + "$$hashKey": "object:241" + }, + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short", + "$$hashKey": "object:242" + } + ], + "xaxis": { + "show": true, + "mode": "time", + "name": null, + "values": [], + "buckets": null + }, + "yaxis": { + "align": false, + "alignLevel": null + }, + "lines": true, + "fill": 1, + "linewidth": 1, + "dashLength": 10, + "spaceLength": 10, + "pointradius": 2, + "legend": { + "show": true, + "values": true, + "min": false, + "max": true, + "current": true, + "total": false, + "avg": true, + "alignAsTable": true + }, + "nullPointMode": "connected", + "tooltip": { + "value_type": "individual", + "shared": true, + "sort": 0 + }, + "aliasColors": {}, + "seriesOverrides": [ + { + "$$hashKey": "object:413", + "alias": "/veth/", + "hiddenSeries": true, + "legend": false + }, + { + "$$hashKey": "object:442", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "thresholds": [], + "timeRegions": [], + "fillGradient": 0, + "dashes": false, + "hiddenSeries": false, + "points": false, + "bars": false, + "stack": false, + "percentage": false, + "steppedLine": false, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja index 3c1a6fc74..677279f72 100644 --- a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja @@ -56,8 +56,7 @@ }, "mappings": [], "links": [], - "unit": "bps", - "decimals": 1 + "unit": "bps" }, "overrides": [ { @@ -77,27 +76,11 @@ { "id": "custom.lineStyle", "value": { + "fill": "dash", "dash": [ 4, 10 - ], - "fill": "dash" - } - } - ] - }, - { - "matcher": { - "id": "byRegexp", - "options": "/veth/" - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "tooltip": true, - "viz": true, - "legend": true + ] } } ] @@ -110,17 +93,18 @@ }, "legend": { "displayMode": "table", - "placement": "right", + "placement": "bottom", "calcs": [ - "max", "mean", - "last" + "lastNotNull", + "max", + "min" ] } }, "targets": [ { - "alias": "$tag_host: $tag_interface: RX Current", + "alias": "$tag_host: $tag_interface: Inbound Current", "dsType": "influxdb", "groupBy": [ { @@ -130,16 +114,16 @@ "type": "time" }, { + "type": "tag", "params": [ "host" - ], - "type": "tag" + ] }, { + "type": "tag", "params": [ "interface" - ], - "type": "tag" + ] }, { "params": [ @@ -194,7 +178,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: RX Trend", + "alias": "$tag_host: $tag_interface: Inbound Trend", "dsType": "influxdb", "groupBy": [ { @@ -204,16 +188,16 @@ "type": "time" }, { + "type": "tag", "params": [ "host" - ], - "type": "tag" + ] }, { + "type": "tag", "params": [ "interface" - ], - "type": "tag" + ] }, { "params": [ @@ -269,8 +253,8 @@ ] } ], - "description": "", "maxDataPoints": null, "timeFrom": null, - "timeShift": null + "timeShift": null, + "description": "" } diff --git a/salt/grafana/panels/nsm_used_guage.json.jinja b/salt/grafana/panels/nsm_used_guage.json.jinja index 3175d3bfd..d22a1b962 100644 --- a/salt/grafana/panels/nsm_used_guage.json.jinja +++ b/salt/grafana/panels/nsm_used_guage.json.jinja @@ -1,69 +1,56 @@ { - "id": 12, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], + "datasource": "InfluxDB", + "editable": true, + "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": true, + "thresholdLabels": false, + "thresholdMarkers": true + }, "gridPos": { "x": {{ PANELS.nsm_used_guage.gridPos.x }}, "y": {{ PANELS.nsm_used_guage.gridPos.y }}, "w": {{ PANELS.nsm_used_guage.gridPos.w }}, "h": {{ PANELS.nsm_used_guage.gridPos.h }} }, - "type": "gauge", - "title": "NSM used", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", + "height": "150", + "id": 12, "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 85 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 95 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 0, - "max": 100, - "min": 0, - "unit": "percent" + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true, - "text": {} + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "postfixFontSize": "50%", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": false }, "targets": [ { @@ -83,7 +70,6 @@ } ], "measurement": "disk", - "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -104,8 +90,8 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" }, { "condition": "AND", @@ -113,9 +99,33 @@ "operator": "=", "value": "/nsm" } - ] + ], + "orderByTime": "ASC" } ], - "maxDataPoints": null, - "cacheTimeout": null + "thresholds": "85,95,100", + "title": "NSM used", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "cacheTimeout": null, + "colorBackground": false, + "decimals": 0, + "error": false, + "interval": null, + "nullText": null, + "postfix": "", + "prefix": "", + "tableColumn": "" } diff --git a/salt/grafana/panels/pcap_retention_stat.json.jinja b/salt/grafana/panels/pcap_retention_stat.json.jinja index 138b18e6b..29b81902d 100644 --- a/salt/grafana/panels/pcap_retention_stat.json.jinja +++ b/salt/grafana/panels/pcap_retention_stat.json.jinja @@ -1,16 +1,5 @@ { - "id": 26, - "gridPos": { - "x": {{ PANELS.pcap_retention_stat.gridPos.x }}, - "y": {{ PANELS.pcap_retention_stat.gridPos.y }}, - "w": {{ PANELS.pcap_retention_stat.gridPos.w }}, - "h": {{ PANELS.pcap_retention_stat.gridPos.h }} - }, - "type": "stat", - "title": "PCAP Retention", "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "links": [], "fieldConfig": { "defaults": { "thresholds": { @@ -24,39 +13,31 @@ }, "mappings": [ { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" + "op": "=", + "text": "N/A", + "value": "null", + "$$hashKey": "object:1382", + "id": 0, + "type": 1 } ], + "unit": "d", + "decimals": 2, "color": { "mode": "thresholds" - }, - "decimals": 2, - "unit": "d" + } }, "overrides": [] }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "value", - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto" + "gridPos": { + "x": {{ PANELS.pcap_retention_stat.gridPos.x }}, + "y": {{ PANELS.pcap_retention_stat.gridPos.y }}, + "w": {{ PANELS.pcap_retention_stat.gridPos.w }}, + "h": {{ PANELS.pcap_retention_stat.gridPos.h }} }, + "id": 26, + "links": [], + "maxDataPoints": 100, "targets": [ { "dsType": "influxdb", @@ -108,6 +89,24 @@ ] } ], - "maxDataPoints": null, - "cacheTimeout": null + "title": "PCAP Retention", + "type": "stat", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "value", + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto" + }, + "cacheTimeout": null, + "interval": null, + "pluginVersion": "7.5.4" } diff --git a/salt/grafana/panels/process_status_graph.json.jinja b/salt/grafana/panels/process_status_graph.json.jinja index 302175c36..3480c08b9 100644 --- a/salt/grafana/panels/process_status_graph.json.jinja +++ b/salt/grafana/panels/process_status_graph.json.jinja @@ -1,107 +1,57 @@ { - "id": 61852, + "aliasColors": {}, + "dashLength": 10, + "datasource": "InfluxDB", + "editable": true, + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, + "fill": 1, "gridPos": { "x": {{ PANELS.process_status_graph.gridPos.x }}, "y": {{ PANELS.process_status_graph.gridPos.y }}, "w": {{ PANELS.process_status_graph.gridPos.w }}, "h": {{ PANELS.process_status_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Process Status", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", + "height": "350", + "id": 61852, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": false, + "rightSide": false, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 1, "links": [], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "links": [], - "unit": "short", - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] - }, + "nullPointMode": "connected", "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } + "alertThreshold": true }, + "pluginVersion": "7.5.4", + "pointradius": 5, + "renderer": "flot", + "seriesOverrides": [ + { + "$$hashKey": "object:549", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "spaceLength": 10, "targets": [ { "alias": "$tag_host: $col", @@ -121,7 +71,6 @@ } ], "measurement": "processes", - "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(running) as running, mean(blocked) as blocked, mean(sleeping) as sleeping, mean(stopped) as stopped, mean(zombies) as zombies, mean(paging) as paging, mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", "rawQuery": true, @@ -147,7 +96,8 @@ "operator": "=~", "value": "/^$server$/" } - ] + ], + "orderByTime": "ASC" }, { "alias": "$tag_host: $col", @@ -166,11 +116,9 @@ "type": "fill" } ], - "hide": false, "measurement": "processes", - "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", + "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -194,10 +142,63 @@ "operator": "=~", "value": "/^$server$/" } - ] + ], + "orderByTime": "ASC", + "hide": false } ], - "maxDataPoints": null, + "thresholds": [], + "timeRegions": [], + "title": "Process Status", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 2, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true, + "$$hashKey": "object:512" + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true, + "$$hashKey": "object:513" + } + ], + "yaxis": { + "align": false, + "alignLevel": null + }, + "bars": false, + "dashes": false, + "error": false, + "fillGradient": 0, + "hiddenSeries": false, + "percentage": false, + "points": false, + "stack": false, + "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/ram_usage_guage.json.jinja b/salt/grafana/panels/ram_usage_guage.json.jinja index 813b9cba8..1a1bf04a1 100644 --- a/salt/grafana/panels/ram_usage_guage.json.jinja +++ b/salt/grafana/panels/ram_usage_guage.json.jinja @@ -1,69 +1,65 @@ { - "id": 61860, - "gridPos": { - "x": {{ PANELS.ram_usage_guage.gridPos.x }}, - "y": {{ PANELS.ram_usage_guage.gridPos.y }}, - "w": {{ PANELS.ram_usage_guage.gridPos.w }}, - "h": {{ PANELS.ram_usage_guage.gridPos.h }} - }, - "type": "gauge", - "title": "RAM usage", + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", - "pluginVersion": "8.2.1", + "editable": true, + "error": false, + "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": true, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "x": {{ PANELS.ram_usage_guage.gridPos.x }}, + "y": {{ PANELS.ram_usage_guage.gridPos.y }}, + "w": {{ PANELS.ram_usage_guage.gridPos.w }}, + "h": {{ PANELS.ram_usage_guage.gridPos.h }} + }, + "height": "150", + "id": 61860, + "interval": null, "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 70 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 80 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "max": 100, - "min": 0, - "unit": "percent" + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true, - "text": {} + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": false }, + "tableColumn": "", "targets": [ { "dsType": "influxdb", @@ -102,13 +98,26 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } - ], - "orderByTime": "ASC" + ] } ], - "maxDataPoints": null, - "cacheTimeout": null + "thresholds": "70,80,90", + "title": "RAM usage", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current", + "fieldConfig": { + "defaults": {}, + "overrides": [] + } } diff --git a/salt/grafana/panels/rootfs_used_guage.json.jinja b/salt/grafana/panels/rootfs_used_guage.json.jinja index b628d247c..d67e80e4a 100644 --- a/salt/grafana/panels/rootfs_used_guage.json.jinja +++ b/salt/grafana/panels/rootfs_used_guage.json.jinja @@ -1,69 +1,56 @@ { - "id": 61866, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], + "datasource": "InfluxDB", + "editable": true, + "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": true, + "thresholdLabels": false, + "thresholdMarkers": true + }, "gridPos": { "x": {{ PANELS.rootfs_used_guage.gridPos.x }}, "y": {{ PANELS.rootfs_used_guage.gridPos.y }}, "w": {{ PANELS.rootfs_used_guage.gridPos.w }}, "h": {{ PANELS.rootfs_used_guage.gridPos.h }} }, - "type": "gauge", - "title": "RootFS used", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", + "height": "150", + "id": 61866, "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 70 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 80 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 0, - "max": 100, - "min": 0, - "unit": "percent" + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true, - "text": {} + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "postfixFontSize": "50%", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": false }, "targets": [ { @@ -83,7 +70,6 @@ } ], "measurement": "disk", - "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -104,8 +90,8 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" }, { "condition": "AND", @@ -113,9 +99,33 @@ "operator": "=", "value": "/" } - ] + ], + "orderByTime": "ASC" } ], - "maxDataPoints": null, - "cacheTimeout": null + "thresholds": "70,80,90", + "title": "RootFS used", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "cacheTimeout": null, + "colorBackground": false, + "decimals": 0, + "error": false, + "interval": null, + "nullText": null, + "postfix": "", + "prefix": "", + "tableColumn": "" } diff --git a/salt/grafana/panels/swap_io_bytes_graph.json.jinja b/salt/grafana/panels/swap_io_bytes_graph.json.jinja index fe7989870..6d65f5039 100644 --- a/salt/grafana/panels/swap_io_bytes_graph.json.jinja +++ b/salt/grafana/panels/swap_io_bytes_graph.json.jinja @@ -1,187 +1,180 @@ { - "id": 68890, + "type": "graph", + "title": "Swap I/O Bytes", "gridPos": { "x": {{ PANELS.swap_io_bytes_graph.gridPos.x }}, "y": {{ PANELS.swap_io_bytes_graph.gridPos.y }}, "w": {{ PANELS.swap_io_bytes_graph.gridPos.w }}, "h": {{ PANELS.swap_io_bytes_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Swap I/O Bytes", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, + "id": 68890, "targets": [ { - "alias": "$tag_host: $col", + "refId": "A", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", + "rawQuery": true, + "alias": "$tag_host: $col" }, { - "alias": "$tag_host: $col", + "refId": "B", + "queryType": "randomWalk", + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [], "groupBy": [ { + "type": "time", "params": [ "$__interval" - ], - "type": "time" + ] }, { + "type": "fill", "params": [ "null" - ], - "type": "fill" + ] } ], - "hide": false, - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"mean_in\")) as \"trend_in\", non_negative_derivative(mean(\"mean_out\")) as \"trend_out\" FROM \"so_long_term\".\"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", - "queryType": "randomWalk", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", "select": [ [ { + "type": "field", "params": [ "value" - ], - "type": "field" + ] }, { - "params": [], - "type": "mean" + "type": "mean", + "params": [] } ] ], - "tags": [] + "query": "SELECT non_negative_derivative(mean(\"mean_in\")) as \"trend_in\", non_negative_derivative(mean(\"mean_out\")) as \"trend_out\" FROM \"so_long_term\".\"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", + "rawQuery": true, + "alias": "$tag_host: $col", + "hide": false } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "bytes", - "decimals": 1 - }, - "overrides": [ - { - "matcher": { - "id": "byRegexp", - "options": "/trend/" - }, - "properties": [ - { - "id": "custom.fillOpacity", - "value": 0 - }, - { - "id": "custom.lineWidth", - "value": 4 - }, - { - "id": "custom.lineStyle", - "value": { - "fill": "dash", - "dash": [ - 4, - 10 - ] - } - } - ] - } - ] + "options": { + "alertThreshold": true }, - "maxDataPoints": null, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "pluginVersion": "7.5.4", + "renderer": "flot", + "yaxes": [ + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "bytes", + "$$hashKey": "object:156" + }, + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short", + "$$hashKey": "object:157" + } + ], + "xaxis": { + "show": true, + "mode": "time", + "name": null, + "values": [], + "buckets": null + }, + "yaxis": { + "align": false, + "alignLevel": null + }, + "lines": true, + "fill": 1, + "linewidth": 1, + "dashLength": 10, + "spaceLength": 10, + "pointradius": 2, + "legend": { + "show": true, + "values": true, + "min": false, + "max": true, + "current": true, + "total": false, + "avg": true, + "alignAsTable": true + }, + "nullPointMode": "connected", + "tooltip": { + "value_type": "individual", + "shared": true, + "sort": 0 + }, + "aliasColors": {}, + "seriesOverrides": [ + { + "$$hashKey": "object:322", + "alias": "/trend/", + "fill": 0, + "linewidth": 4, + "dashes": true, + "dashLength": 4 + } + ], + "thresholds": [], + "timeRegions": [], + "fillGradient": 0, + "dashes": false, + "hiddenSeries": false, + "points": false, + "bars": false, + "stack": false, + "percentage": false, + "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "maxDataPoints": 750, + "interval": "30s" } diff --git a/salt/grafana/panels/swap_usage_guage.json.jinja b/salt/grafana/panels/swap_usage_guage.json.jinja index f7e3d4f34..895dd03f4 100644 --- a/salt/grafana/panels/swap_usage_guage.json.jinja +++ b/salt/grafana/panels/swap_usage_guage.json.jinja @@ -1,70 +1,66 @@ { - "id": 61863, - "gridPos": { - "x": {{ PANELS.swap_usage_guage.gridPos.x }}, - "y": {{ PANELS.swap_usage_guage.gridPos.y }}, - "w": {{ PANELS.swap_usage_guage.gridPos.w }}, - "h": {{ PANELS.swap_usage_guage.gridPos.h }} - }, - "type": "gauge", - "title": "Swap usage", + "cacheTimeout": null, + "colorBackground": false, + "colorValue": true, + "colors": [ + "rgba(50, 172, 45, 0.97)", + "rgba(237, 129, 40, 0.89)", + "rgba(245, 54, 54, 0.9)" + ], "datasource": "InfluxDB", - "pluginVersion": "8.2.1", + "decimals": 0, + "editable": true, + "error": false, + "format": "percent", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": true, + "thresholdLabels": false, + "thresholdMarkers": true + }, + "gridPos": { + "x": {{ PANELS.swap_usage_guage.gridPos.x }}, + "y": {{ PANELS.swap_usage_guage.gridPos.y }}, + "w": {{ PANELS.swap_usage_guage.gridPos.w }}, + "h": {{ PANELS.swap_usage_guage.gridPos.h }} + }, + "height": "150", + "id": 61863, + "interval": null, "links": [], - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 50 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 70 - } - ] - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "color": { - "mode": "thresholds" - }, - "decimals": 0, - "max": 100, - "min": 0, - "unit": "percent" + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 }, - "overrides": [] - }, - "interval": "30", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "showThresholdLabels": false, - "showThresholdMarkers": true, - "text": {} + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": false }, + "tableColumn": "", "targets": [ { "dsType": "influxdb", @@ -103,13 +99,26 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } - ], - "orderByTime": "ASC" + ] } ], - "maxDataPoints": null, - "cacheTimeout": null + "thresholds": "50,70,90", + "title": "Swap usage", + "type": "singlestat", + "valueFontSize": "80%", + "valueMaps": [ + { + "op": "=", + "text": "N/A", + "value": "null" + } + ], + "valueName": "current", + "fieldConfig": { + "defaults": {}, + "overrides": [] + } } From 936c796b9dc46399b2527c36a43c59df4f6eb9c3 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 1 Nov 2021 15:19:50 -0400 Subject: [PATCH 07/47] Revert "graph changes" This reverts commit 8857fca797d3546097f38baa9d4686b17a3490fb. --- salt/grafana/defaults.yaml | 4 +- ...u_docker_combined_current_graph.json.jinja | 2 - .../panels/system_uptime_graph.json.jinja | 255 +++++++++--------- ...e_docker_combined_current_graph.json.jinja | 172 ++++++------ 4 files changed, 227 insertions(+), 206 deletions(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index ee5f3a380..9f8b8821e 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -1388,10 +1388,10 @@ grafana: w: 4 monitor_interface_traffic_stat: gridPos: - x: 0 + x: 8 y: 5 h: 4 - w: 12 + w: 4 zeek_packet_loss_stat: gridPos: x: 12 diff --git a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja index 3e873292f..54f18ee6c 100644 --- a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja @@ -79,8 +79,6 @@ "legend": { "displayMode": "table", "placement": "right", - "sort": "lastNotNull", - "sortDesc": false, "calcs": [ "max", "mean", diff --git a/salt/grafana/panels/system_uptime_graph.json.jinja b/salt/grafana/panels/system_uptime_graph.json.jinja index a797a7600..bf26b520f 100644 --- a/salt/grafana/panels/system_uptime_graph.json.jinja +++ b/salt/grafana/panels/system_uptime_graph.json.jinja @@ -1,139 +1,148 @@ { - "id": 69016, - "gridPos": { - "h": 8, - "w": 12, - "x": 0, - "y": 1 - }, - "type": "timeseries", + "type": "graph", "title": "System Uptime", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "s", - "decimals": 1, - "min": 0, - "max": 604800 - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "sort": "lastNotNull", - "sortDesc": false, - "calcs": [ - "lastNotNull" - ] - } + "gridPos": { + "x": {{ PANELS.system_uptime_graph.gridPos.x }}, + "y": {{ PANELS.system_uptime_graph.gridPos.y }}, + "w": {{ PANELS.system_uptime_graph.gridPos.w }}, + "h": {{ PANELS.system_uptime_graph.gridPos.h }} }, + "id": 69016, "targets": [ { - "alias": "$tag_host $tag_role", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "role" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "system", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", "refId": "A", + "queryType": "randomWalk", + "policy": "default", "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "uptime" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], + "orderByTime": "ASC", "tags": [ { "key": "host", "operator": "=~", "value": "/^$servername$/" } - ] + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "role" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "uptime" + ] + }, + { + "type": "last", + "params": [] + } + ] + ], + "measurement": "system", + "alias": "$tag_host $tag_role" } ], - "description": "", - "timeFrom": null, - "timeShift": null, - "interval": "30" + "options": { + "alertThreshold": true + }, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "pluginVersion": "7.5.4", + "renderer": "flot", + "yaxes": [ + { + "label": "", + "show": true, + "logBase": 1, + "min": "0", + "max": "604800", + "format": "s", + "$$hashKey": "object:213", + "decimals": 1 + }, + { + "label": null, + "show": true, + "logBase": 1, + "min": null, + "max": null, + "format": "short", + "$$hashKey": "object:214" + } + ], + "xaxis": { + "show": true, + "mode": "time", + "name": null, + "values": [], + "buckets": null + }, + "yaxis": { + "align": false, + "alignLevel": null + }, + "lines": true, + "linewidth": 1, + "dashLength": 10, + "spaceLength": 10, + "pointradius": 2, + "legend": { + "show": true, + "values": true, + "min": false, + "max": false, + "current": true, + "total": false, + "avg": false, + "alignAsTable": true, + "rightSide": true + }, + "nullPointMode": "connected", + "tooltip": { + "value_type": "individual", + "shared": true, + "sort": 1 + }, + "aliasColors": {}, + "seriesOverrides": [], + "thresholds": [], + "timeRegions": [], + "fill": 0, + "fillGradient": 0, + "dashes": false, + "hiddenSeries": false, + "points": false, + "bars": false, + "stack": false, + "percentage": false, + "steppedLine": false, + "decimals": 1, + "description": "" } diff --git a/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja b/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja index a656f6522..ad4ff2805 100644 --- a/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja +++ b/salt/grafana/panels/uptime_docker_combined_current_graph.json.jinja @@ -1,29 +1,43 @@ { - "id": 68896, + "aliasColors": {}, + "dashLength": 10, + "datasource": "InfluxDB", + "decimals": 1, + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, "gridPos": { "x": {{ PANELS.uptime_docker_combined_current_graph.gridPos.x }}, "y": {{ PANELS.uptime_docker_combined_current_graph.gridPos.y }}, "w": {{ PANELS.uptime_docker_combined_current_graph.gridPos.w }}, "h": {{ PANELS.uptime_docker_combined_current_graph.gridPos.h }} }, - "type": "timeseries", - "title": "Container Uptime Current", - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "sort": "lastNotNull", - "sortDesc": false, - "calcs": [ - "lastNotNull" - ] - } + "id": 68896, + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "max": false, + "min": false, + "rightSide": true, + "show": true, + "sort": "current", + "sortDesc": false, + "total": false, + "values": true }, + "lines": true, + "linewidth": 1, + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "pluginVersion": "7.5.4", + "pointradius": 2, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, "targets": [ { "alias": "$tag_host $tag_role $tag_container_name", @@ -41,16 +55,16 @@ "type": "tag" }, { + "type": "tag", "params": [ "host" - ], - "type": "tag" + ] }, { + "type": "tag", "params": [ "role" - ], - "type": "tag" + ] }, { "params": [ @@ -59,7 +73,6 @@ "type": "fill" } ], - "limit": "", "measurement": "docker_container_status", "orderByTime": "ASC", "policy": "default", @@ -71,18 +84,17 @@ "select": [ [ { + "type": "field", "params": [ "uptime_ns" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "last", + "params": [] } ] ], - "slimit": "", "tags": [ { "key": "host", @@ -95,60 +107,62 @@ "operator": "=~", "value": "/^$containers$/" } - ] + ], + "slimit": "", + "limit": "" } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 0, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "ns", - "decimals": 1, - "min": 0, - "max": 604800000000000 - }, - "overrides": [] + "thresholds": [], + "timeRegions": [], + "title": "Container Uptime Current", + "tooltip": { + "shared": true, + "sort": 1, + "value_type": "individual" }, - "interval": "30s", + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:192", + "format": "ns", + "label": null, + "logBase": 1, + "max": "604800000000000", + "min": "0", + "show": true, + "decimals": 1 + }, + { + "$$hashKey": "object:193", + "decimals": 2, + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": "0", + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + }, + "bars": false, + "dashes": false, + "fill": 0, + "fillGradient": 0, + "hiddenSeries": false, + "percentage": false, + "points": false, + "stack": false, + "steppedLine": false, "timeFrom": null, "timeShift": null } From f4d9455872a245566ad3e7266e23a4d01bd99a51 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 1 Nov 2021 16:10:13 -0400 Subject: [PATCH 08/47] revert to b63b50d98ce33384e2de7aa083324672201bea0d --- ...u_docker_combined_current_graph.json.jinja | 65 +-- ...cpu_docker_combined_trend_graph.json.jinja | 281 +++++------ .../grafana/panels/cpu_usage_guage.json.jinja | 147 +++--- .../cpu_usage_tasks_all_graph.json.jinja | 196 ++++---- .../panels/disk_io_bytes_graph.json.jinja | 361 +++++++------- .../panels/disk_io_requests_graph.json.jinja | 351 +++++++------ .../panels/disk_io_time_graph.json.jinja | 350 +++++++------ .../panels/disk_usage_nsm_graph.json.jinja | 365 +++++++------- .../panels/disk_usage_root_graph.json.jinja | 365 +++++++------- salt/grafana/panels/io_wait_stat.json.jinja | 85 ++-- .../load_average_5_minute_stat.json.jinja | 81 +-- .../panels/load_averages_graph.json.jinja | 185 +++---- ...anagement_interface_drops_graph.json.jinja | 377 +++++++------- ...agement_interface_packets_graph.json.jinja | 461 +++++++++--------- ...nt_interface_traffic_both_graph.json.jinja | 62 +-- .../panels/memory_usage_graph.json.jinja | 209 ++++---- .../monitor_interface_drops_graph.json.jinja | 377 +++++++------- ...monitor_interface_packets_graph.json.jinja | 376 +++++++------- ...or_interface_traffic_both_graph.json.jinja | 54 +- salt/grafana/panels/nsm_used_guage.json.jinja | 136 +++--- .../panels/pcap_retention_stat.json.jinja | 75 +-- .../panels/process_status_graph.json.jinja | 205 ++++---- .../grafana/panels/ram_usage_guage.json.jinja | 147 +++--- .../panels/rootfs_used_guage.json.jinja | 136 +++--- .../panels/swap_io_bytes_graph.json.jinja | 333 ++++++------- .../panels/swap_usage_guage.json.jinja | 149 +++--- 26 files changed, 3041 insertions(+), 2888 deletions(-) diff --git a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja index 54f18ee6c..7d0f67135 100644 --- a/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined_current_graph.json.jinja @@ -8,6 +8,7 @@ }, "type": "timeseries", "title": "Container CPU Usage Current", + "transformations": [], "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s", @@ -67,6 +68,13 @@ { "id": "custom.fillOpacity", "value": 0 + }, + { + "id": "color", + "value": { + "mode": "fixed", + "fixedColor": "dark-red" + } } ] } @@ -115,6 +123,7 @@ "type": "fill" } ], + "hide": false, "measurement": "docker_container_cpu", "orderByTime": "ASC", "policy": "default", @@ -149,67 +158,65 @@ "operator": "=~", "value": "/^$containers$/" } - ], - "hide": false + ] }, { - "refId": "B", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], + "alias": "$tag_host: n_cpus*100", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "measurement": "system", + "orderByTime": "ASC", + "policy": "default", + "refId": "B", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "n_cpus" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "math", "params": [ " * 100" - ] + ], + "type": "math" } ] ], - "measurement": "system", - "alias": "$tag_host: n_cpus*100" + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + } + ] } ], - "transformations": [], "maxDataPoints": null, "timeFrom": null, "timeShift": null diff --git a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja index d587a0529..2e2dbe797 100644 --- a/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja +++ b/salt/grafana/panels/cpu_docker_combined_trend_graph.json.jinja @@ -11,140 +11,6 @@ "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s", - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "right", - "calcs": [ - "max", - "mean", - "lastNotNull" - ] - } - }, - "targets": [ - { - "alias": "$tag_host: $tag_container_name", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "container_name" - ], - "type": "tag" - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "docker_container_cpu", - "orderByTime": "ASC", - "policy": "so_long_term", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "mean_usage_percent" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - }, - { - "condition": "AND", - "key": "container_name", - "operator": "=~", - "value": "/^$containers$/" - } - ] - }, - { - "refId": "B", - "hide": false, - "policy": "so_long_term", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "host", - "value": "/^$servername$/", - "operator": "=~" - } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "mean_n_cpus" - ] - }, - { - "type": "last", - "params": [] - }, - { - "type": "math", - "params": [ - " * 100" - ] - } - ] - ], - "measurement": "system", - "alias": "$tag_host: n_cpus*100" - } - ], "fieldConfig": { "defaults": { "custom": { @@ -188,8 +54,8 @@ ] }, "mappings": [], - "unit": "percent", - "decimals": 1 + "decimals": 1, + "unit": "percent" }, "overrides": [ { @@ -201,13 +67,154 @@ { "id": "custom.fillOpacity", "value": 0 + }, + { + "id": "color", + "value": { + "mode": "fixed", + "fixedColor": "dark-red" + } } ] } ] }, - "maxDataPoints": null, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "alias": "$tag_host: $tag_container_name", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "container_name" + ], + "type": "tag" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "docker_container_cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=~", + "value": "/^$containers$/" + } + ] + }, + { + "alias": "$tag_host: n_cpus*100", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "system", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_n_cpus" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + " * 100" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + } + ] + } + ], "description": "", + "maxDataPoints": null, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/cpu_usage_guage.json.jinja b/salt/grafana/panels/cpu_usage_guage.json.jinja index 4a28c315c..d5cd949d8 100644 --- a/salt/grafana/panels/cpu_usage_guage.json.jinja +++ b/salt/grafana/panels/cpu_usage_guage.json.jinja @@ -1,65 +1,69 @@ { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "editable": true, - "error": false, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "x": {{ PANELS.cpu_usage_guage.gridPos.x }}, - "y": {{ PANELS.cpu_usage_guage.gridPos.y }}, - "w": {{ PANELS.cpu_usage_guage.gridPos.w }}, - "h": {{ PANELS.cpu_usage_guage.gridPos.h }} - }, - "height": "150", "id": 9, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "gridPos": { + "x": {{ PANELS.cpu_usage_guage.gridPos.x }}, + "y": {{ PANELS.cpu_usage_guage.gridPos.y }}, + "w": {{ PANELS.cpu_usage_guage.gridPos.w }}, + "h": {{ PANELS.cpu_usage_guage.gridPos.h }} + }, + "type": "gauge", + "title": "CPU usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 70 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 80 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "color": { + "mode": "thresholds" + }, + "max": 100, + "min": 0, + "unit": "percent" + }, + "overrides": [] + }, + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, - "tableColumn": "", "targets": [ { "dsType": "influxdb", @@ -104,8 +108,8 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" }, { "condition": "AND", @@ -113,23 +117,10 @@ "operator": "=", "value": "cpu-total" } - ] + ], + "orderByTime": "ASC" } ], - "thresholds": "70,80,90", - "title": "CPU usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current", - "fieldConfig": { - "defaults": {}, - "overrides": [] - } + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja index e865f446f..dea4c3d8c 100644 --- a/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks_all_graph.json.jinja @@ -1,51 +1,30 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, + "id": 61871, "gridPos": { "x": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_tasks_all_graph.gridPos.h }} }, - "id": 61871, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", + "type": "timeseries", + "title": "CPU Usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", "options": { - "alertThreshold": true - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:266", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $col", @@ -84,7 +63,8 @@ } ] ], - "tags": [] + "tags": [], + "hide": false }, { "alias": "$tag_host: $col", @@ -102,9 +82,10 @@ "type": "fill" } ], + "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\" FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), *", + "query": "SELECT mean(mean_usage_user) as \"trend_user\", mean(mean_usage_system) as \"trend_system\", mean(mean_usage_softirq) as \"trend_softirq\", mean(mean_usage_steal) as \"trend_steal\", mean(mean_usage_nice) as \"trend_nice\", mean(mean_usage_irq) as \"trend_irq\", mean(mean_usage_iowait) as \"trend_iowait\", mean(mean_usage_guest) as \"trend_guest\", mean(mean_usage_guest_nice) as \"trend_guest_nice\" FROM \"so_long_term\".\"cpu\" WHERE \"host\" =~ /^$servername$/ and cpu = 'cpu-total' AND $timeFilter GROUP BY time($__interval), * fill(linear)", "queryType": "randomWalk", "rawQuery": true, "refId": "B", @@ -123,61 +104,90 @@ } ] ], - "tags": [], - "hide": false + "tags": [] } ], - "thresholds": [], - "timeRegions": [], - "title": "CPU Usage", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:202", - "decimals": null, - "format": "percent", - "label": null, - "logBase": 1, - "max": "100", - "min": "0", - "show": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "percent", + "min": 0, + "decimals": 1 }, - { - "$$hashKey": "object:203", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "bars": false, - "dashes": false, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/disk_io_bytes_graph.json.jinja b/salt/grafana/panels/disk_io_bytes_graph.json.jinja index 8fce4e386..4b9c4c7ff 100644 --- a/salt/grafana/panels/disk_io_bytes_graph.json.jinja +++ b/salt/grafana/panels/disk_io_bytes_graph.json.jinja @@ -1,194 +1,189 @@ { - "aliasColors": {}, - "maxDataPoints": 750, - "interval": "30s", - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "links": [] + "id": 60200, + "gridPos": { + "x": {{ PANELS.disk_io_bytes_graph.gridPos.x }}, + "y": {{ PANELS.disk_io_bytes_graph.gridPos.y }}, + "w": {{ PANELS.disk_io_bytes_graph.gridPos.w }}, + "h": {{ PANELS.disk_io_bytes_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Disk I/O bytes for /dev/$disk", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": {}, - "gridPos": { - "x": {{ PANELS.disk_io_bytes_graph.gridPos.x }}, - "y": {{ PANELS.disk_io_bytes_graph.gridPos.y }}, - "w": {{ PANELS.disk_io_bytes_graph.gridPos.w }}, - "h": {{ PANELS.disk_io_bytes_graph.gridPos.h }} - }, - "hiddenSeries": false, - "id": 60200, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "maxPerRow": 6, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [{ - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Disk I/O bytes for /dev/$disk", + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "bytes", + "decimals": 1 + }, + "overrides": [] + }, + "options": { "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" + "mode": "single" }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [{ - "format": "bytes", - "logBase": 1, - "max": null, - "min": null, - "show": true + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" }, { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" } - ], - "yaxis": { - "align": false, - "alignLevel": null + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(read_bytes),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(write_bytes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } + ], + "scopedVars": { + "disk": { + "text": "sda", + "value": "sda", + "selected": false + } + }, + "maxDataPoints": null, + "repeat": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/disk_io_requests_graph.json.jinja b/salt/grafana/panels/disk_io_requests_graph.json.jinja index 1c2227fbd..a3f95772c 100644 --- a/salt/grafana/panels/disk_io_requests_graph.json.jinja +++ b/salt/grafana/panels/disk_io_requests_graph.json.jinja @@ -1,193 +1,190 @@ { - "aliasColors": {}, - "maxDataPoints": 750, - "interval": "30s", - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": {}, + "id": 13782, "gridPos": { "x": {{ PANELS.disk_io_requests_graph.gridPos.x }}, "y": {{ PANELS.disk_io_requests_graph.gridPos.y }}, "w": {{ PANELS.disk_io_requests_graph.gridPos.w }}, "h": {{ PANELS.disk_io_requests_graph.gridPos.h }} }, - "hiddenSeries": false, - "id": 13782, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "maxPerRow": 6, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [{ - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "type": "timeseries", + "title": "Disk I/O requests for /dev/$disk", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Disk I/O requests for /dev/$disk", + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "iops", + "decimals": 1 + }, + "overrides": [] + }, + "options": { "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" + "mode": "single" }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [{ - "format": "iops", - "logBase": 1, - "max": null, - "min": null, - "show": true + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" }, { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" } - ], - "yaxis": { - "align": false, - "alignLevel": null + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(reads),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [], + "hide": false + }, + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(writes),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } + ], + "scopedVars": { + "disk": { + "text": "sda", + "value": "sda", + "selected": false + } + }, + "maxDataPoints": null, + "repeat": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/disk_io_time_graph.json.jinja b/salt/grafana/panels/disk_io_time_graph.json.jinja index 0b0e00e42..fa7c7b51e 100644 --- a/salt/grafana/panels/disk_io_time_graph.json.jinja +++ b/salt/grafana/panels/disk_io_time_graph.json.jinja @@ -1,193 +1,189 @@ { - "aliasColors": {}, - "maxDataPoints": 750, - "interval": "30s", - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "editable": true, - "error": false, - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "grid": {}, + "id": 56720, "gridPos": { "x": {{ PANELS.disk_io_time_graph.gridPos.x }}, "y": {{ PANELS.disk_io_time_graph.gridPos.y }}, "w": {{ PANELS.disk_io_time_graph.gridPos.w }}, "h": {{ PANELS.disk_io_time_graph.gridPos.h }} }, - "hiddenSeries": false, - "id": 56720, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "links": [], - "maxPerRow": 6, - "nullPointMode": "connected", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 5, - "points": false, - "renderer": "flot", - "repeat": null, - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [{ - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "type": "timeseries", + "title": "Disk I/O time for /dev/$disk", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" }, - { - "alias": "$tag_host: $tag_name: $col", - "dsType": "influxdb", - "function": "mean", - "groupBy": [{ - "interval": "auto", - "params": [ - "auto" - ], - "type": "time" - }, - { - "key": "host", - "params": [ - "tag" - ], - "type": "tag" - }, - { - "key": "path", - "params": [ - "tag" - ], - "type": "tag" - } - ], - "measurement": "io_reads", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", - "rawQuery": true, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [{ - "params": [ - "value" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [] + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Disk I/O time for /dev/$disk", + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "ms", + "decimals": 1 + }, + "overrides": [] + }, + "options": { "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" + "mode": "single" }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [{ - "format": "ms", - "logBase": 1, - "max": null, - "min": null, - "show": true + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" }, { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" } - ], - "yaxis": { - "align": false, - "alignLevel": null + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(read_time),1s) as \"read\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_name: $col", + "dsType": "influxdb", + "function": "mean", + "groupBy": [ + { + "interval": "auto", + "params": [ + "auto" + ], + "type": "time" + }, + { + "key": "host", + "params": [ + "tag" + ], + "type": "tag" + }, + { + "key": "path", + "params": [ + "tag" + ], + "type": "tag" + } + ], + "measurement": "io_reads", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(write_time),1s) as \"write\" FROM \"diskio\" WHERE \"host\" =~ /$servername$/ AND \"name\" =~ /$disk$/ AND $timeFilter GROUP BY time($__interval), *", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } + ], + "scopedVars": { + "disk": { + "text": "sda", + "value": "sda", + "selected": false + } + }, + "maxDataPoints": null, + "repeat": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja index 223e2c041..90212b681 100644 --- a/salt/grafana/panels/disk_usage_nsm_graph.json.jinja +++ b/salt/grafana/panels/disk_usage_nsm_graph.json.jinja @@ -1,186 +1,211 @@ { - "type": "graph", - "title": "Disk Usage /nsm", + "id": 68888, "gridPos": { "x": {{ PANELS.disk_usage_nsm_graph.gridPos.x }}, "y": {{ PANELS.disk_usage_nsm_graph.gridPos.y }}, "w": {{ PANELS.disk_usage_nsm_graph.gridPos.w }}, "h": {{ PANELS.disk_usage_nsm_graph.gridPos.h }} }, - "id": 68888, + "type": "timeseries", + "title": "Disk Usage /nsm", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "rawQuery": true, - "alias": "$tag_host: mountpoint $tag_path - $col" - }, - { - "refId": "B", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "rawQuery": true, "alias": "$tag_host: mountpoint $tag_path - $col", - "hide": false + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: mountpoint $tag_path - $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\" fill(linear)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": "0", - "max": null, - "format": "bytes", - "$$hashKey": "object:235" + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "bytes", + "min": 0, + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:236" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/total/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#C4162A", + "mode": "fixed" + } + }, + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 2 + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:486", - "alias": "/total/", - "fill": 0, - "linewidth": 2, - "color": "#C4162A", - "zindex": 3 - }, - { - "$$hashKey": "object:829", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "steppedLine": true, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "maxDataPoints": 750, - "interval": "30s" + "maxDataPoints": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/disk_usage_root_graph.json.jinja b/salt/grafana/panels/disk_usage_root_graph.json.jinja index ee20e5d04..07ac20bbe 100644 --- a/salt/grafana/panels/disk_usage_root_graph.json.jinja +++ b/salt/grafana/panels/disk_usage_root_graph.json.jinja @@ -1,186 +1,211 @@ { - "type": "graph", - "title": "Disk Usage /", + "id": 61880, "gridPos": { "x": {{ PANELS.disk_usage_root_graph.gridPos.x }}, "y": {{ PANELS.disk_usage_root_graph.gridPos.y }}, "w": {{ PANELS.disk_usage_root_graph.gridPos.w }}, "h": {{ PANELS.disk_usage_root_graph.gridPos.h }} }, - "id": 61880, + "type": "timeseries", + "title": "Disk Usage /", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "rawQuery": true, - "alias": "$tag_host: mountpoint $tag_path - $col" - }, - { - "refId": "B", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", - "rawQuery": true, "alias": "$tag_host: mountpoint $tag_path - $col", - "hide": false + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: mountpoint $tag_path - $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(mean_total) AS \"trend_total\", mean(mean_used) as \"trend_used\" FROM \"so_long_term\".\"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\" fill(linear)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": "0", - "max": null, - "format": "bytes", - "$$hashKey": "object:235" + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "stepAfter", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "bytes", + "min": 0, + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:236" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/total/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#C4162A", + "mode": "fixed" + } + }, + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 2 + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:486", - "alias": "/total/", - "fill": 0, - "linewidth": 2, - "color": "#C4162A", - "zindex": 3 - }, - { - "$$hashKey": "object:829", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "steppedLine": true, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "maxDataPoints": 750, - "interval": "30s" + "maxDataPoints": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/io_wait_stat.json.jinja b/salt/grafana/panels/io_wait_stat.json.jinja index 470d0008f..4fe4a3d8e 100644 --- a/salt/grafana/panels/io_wait_stat.json.jinja +++ b/salt/grafana/panels/io_wait_stat.json.jinja @@ -1,5 +1,16 @@ { + "id": 61867, + "gridPos": { + "x": {{ PANELS.io_wait_stat.gridPos.x }}, + "y": {{ PANELS.io_wait_stat.gridPos.y }}, + "w": {{ PANELS.io_wait_stat.gridPos.w }}, + "h": {{ PANELS.io_wait_stat.gridPos.h }} + }, + "type": "stat", + "title": "IOWait", "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], "fieldConfig": { "defaults": { "thresholds": { @@ -21,31 +32,41 @@ }, "mappings": [ { - "op": "=", - "text": "N/A", - "value": "null", - "$$hashKey": "object:1217", - "id": 0, - "type": 1 + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" } ], - "unit": "percent", - "decimals": 2, "color": { "mode": "thresholds" - } + }, + "decimals": 2, + "max": 100, + "min": 0, + "unit": "percent" }, "overrides": [] }, - "gridPos": { - "x": {{ PANELS.io_wait_stat.gridPos.x }}, - "y": {{ PANELS.io_wait_stat.gridPos.y }}, - "w": {{ PANELS.io_wait_stat.gridPos.w }}, - "h": {{ PANELS.io_wait_stat.gridPos.h }} + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "auto", + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto" }, - "id": 61867, - "links": [], - "maxDataPoints": 100, "targets": [ { "dsType": "influxdb", @@ -64,6 +85,7 @@ } ], "measurement": "cpu", + "orderByTime": "ASC", "policy": "default", "query": "SELECT non_negative_derivative(mean(\"usage_iowait\"), 1s) FROM \"cpu\" WHERE (host =~ /$servername$/ AND \"cpu\" = 'cpu-total') AND $timeFilter GROUP BY time($interval) fill(null)", "rawQuery": false, @@ -86,8 +108,8 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" }, { "condition": "AND", @@ -95,28 +117,9 @@ "operator": "=", "value": "cpu-total" } - ], - "orderByTime": "ASC" + ] } ], - "title": "IOWait", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "cacheTimeout": null, - "interval": null, - "pluginVersion": "7.5.4" + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/load_average_5_minute_stat.json.jinja b/salt/grafana/panels/load_average_5_minute_stat.json.jinja index c4a75c35b..8198a8d19 100644 --- a/salt/grafana/panels/load_average_5_minute_stat.json.jinja +++ b/salt/grafana/panels/load_average_5_minute_stat.json.jinja @@ -1,5 +1,17 @@ { + "id": 61859, + "gridPos": { + "x": {{ PANELS.load_average_5_minute_stat.gridPos.x }}, + "y": {{ PANELS.load_average_5_minute_stat.gridPos.y }}, + "w": {{ PANELS.load_average_5_minute_stat.gridPos.w }}, + "h": {{ PANELS.load_average_5_minute_stat.gridPos.h }} + }, + "type": "stat", + "title": "5 Minute Load Average - $cpucount Cores", "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30", + "links": [], "fieldConfig": { "defaults": { "thresholds": { @@ -7,7 +19,7 @@ "steps": [ { "color": "rgba(50, 172, 45, 0.97)", - "value": "$cpucount / 2" + "value": null }, { "color": "rgba(237, 129, 40, 0.89)", @@ -21,30 +33,39 @@ }, "mappings": [ { - "op": "=", - "text": "N/A", - "value": "null", - "id": 0, - "type": 2 + "options": { + "from": null, + "result": { + "text": "N/A" + }, + "to": null + }, + "type": "range" } ], - "unit": "none", - "decimals": 1, "color": { "mode": "thresholds" - } + }, + "decimals": 1, + "unit": "none" }, "overrides": [] }, - "gridPos": { - "x": {{ PANELS.load_average_5_minute_stat.gridPos.x }}, - "y": {{ PANELS.load_average_5_minute_stat.gridPos.y }}, - "w": {{ PANELS.load_average_5_minute_stat.gridPos.w }}, - "h": {{ PANELS.load_average_5_minute_stat.gridPos.h }} + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "auto", + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto" }, - "id": 61859, - "links": [], - "maxDataPoints": 100, "targets": [ { "dsType": "influxdb", @@ -65,6 +86,8 @@ "measurement": "system", "orderByTime": "ASC", "policy": "default", + "query": "SELECT last(\"load5\") FROM \"system\" WHERE (\"host\" = '$servername') AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, "refId": "A", "resultFormat": "time_series", "select": [ @@ -84,30 +107,12 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" } ] } ], - "title": "5 Minute Load Average - $cpucount Cores", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "auto", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "pluginVersion": "7.5.4", "cacheTimeout": null, - "interval": null + "maxDataPoints": null } diff --git a/salt/grafana/panels/load_averages_graph.json.jinja b/salt/grafana/panels/load_averages_graph.json.jinja index 2f3706528..b92a5ba6c 100644 --- a/salt/grafana/panels/load_averages_graph.json.jinja +++ b/salt/grafana/panels/load_averages_graph.json.jinja @@ -1,48 +1,30 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, + "id": 61869, "gridPos": { "x": {{ PANELS.load_averages_graph.gridPos.x }}, "y": {{ PANELS.load_averages_graph.gridPos.y }}, "w": {{ PANELS.load_averages_graph.gridPos.w }}, "h": {{ PANELS.load_averages_graph.gridPos.h }} }, - "id": 61869, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", + "type": "timeseries", + "title": "1 Minute Load Average", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", "options": { - "alertThreshold": true - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:364", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $col", @@ -99,9 +81,10 @@ "type": "fill" } ], + "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_load1) as \"trend_1 minute\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * ORDER BY asc", + "query": "SELECT mean(mean_load1) as \"trend_1 minute\" FROM \"so_long_term\".\"system\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), * fill(linear) ORDER BY asc", "queryType": "randomWalk", "rawQuery": true, "refId": "B", @@ -120,61 +103,85 @@ } ] ], - "tags": [], - "hide": false + "tags": [] } ], - "thresholds": [], - "timeRegions": [], - "title": "1 Minute Load Average", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:287", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "short", + "decimals": 1 }, - { - "$$hashKey": "object:288", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "bars": false, - "dashes": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/management_interface_drops_graph.json.jinja b/salt/grafana/panels/management_interface_drops_graph.json.jinja index 831c6c45a..9de6c8f19 100644 --- a/salt/grafana/panels/management_interface_drops_graph.json.jinja +++ b/salt/grafana/panels/management_interface_drops_graph.json.jinja @@ -1,263 +1,282 @@ { - "type": "graph", - "title": "Management Interface Drops", + "id": 61877, "gridPos": { "x": {{ PANELS.management_interface_drops_graph.gridPos.x }}, "y": {{ PANELS.management_interface_drops_graph.gridPos.y }}, "w": {{ PANELS.management_interface_drops_graph.gridPos.w }}, "h": {{ PANELS.management_interface_drops_graph.gridPos.h }} }, - "id": 61877, + "type": "timeseries", + "title": "Management Interface Drops", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "maxDataPoints": 750, + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "tags": [] }, { - "refId": "B", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" - }, - { - "refId": "C", - "queryType": "randomWalk", - "policy": "default", + "refId": "B", "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, + "tags": [] + }, + { "alias": "$tag_host: $tag_interface: $col", - "hide": false - }, - { - "refId": "D", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": "Drops per second", - "show": true, - "logBase": 1, + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Drops per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "pps", "min": 0, - "max": null, - "format": "pps", - "$$hashKey": "object:500" + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:501" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:592", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false - }, - { - "$$hashKey": "object:621", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "decimals": 0, - "maxDataPoints": 750, - "interval": "30s" + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/management_interface_packets_graph.json.jinja b/salt/grafana/panels/management_interface_packets_graph.json.jinja index b113e8fc2..b3e429f2f 100644 --- a/salt/grafana/panels/management_interface_packets_graph.json.jinja +++ b/salt/grafana/panels/management_interface_packets_graph.json.jinja @@ -1,262 +1,283 @@ { - "type": "graph", - "title": "Management Interface Packets", + "id": 61875, "gridPos": { "x": {{ PANELS.management_interface_packets_graph.gridPos.x }}, "y": {{ PANELS.management_interface_packets_graph.gridPos.y }}, "w": {{ PANELS.management_interface_packets_graph.gridPos.w }}, "h": {{ PANELS.management_interface_packets_graph.gridPos.h }} }, - "id": 61875, + "type": "timeseries", + "title": "Management Interface Packets", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" - }, - { - "refId": "B", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" - }, - { - "refId": "C", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [], "hide": false }, { - "refId": "D", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$manint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": "Packets per second", - "show": true, - "logBase": 1, + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Packets per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "pps", "min": 0, - "max": null, - "format": "pps", - "$$hashKey": "object:241" + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:242" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:413", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false - }, - { - "$$hashKey": "object:442", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "maxDataPoints": 750, - "interval": "30s" + "maxDataPoints": null, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja index 2fa5e0bfa..e15bef885 100644 --- a/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja +++ b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja @@ -56,7 +56,8 @@ }, "mappings": [], "links": [], - "unit": "bps" + "unit": "bps", + "decimals": 1 }, "overrides": [ { @@ -76,11 +77,11 @@ { "id": "custom.lineStyle", "value": { - "fill": "dash", "dash": [ 4, 10 - ] + ], + "fill": "dash" } } ] @@ -93,18 +94,17 @@ }, "legend": { "displayMode": "table", - "placement": "bottom", + "placement": "right", "calcs": [ - "mean", - "lastNotNull", "max", - "min" + "mean", + "lastNotNull" ] } }, "targets": [ { - "alias": "$tag_host: $tag_interface: Inbound Current", + "alias": "$tag_host: $tag_interface: RX Current", "dsType": "influxdb", "groupBy": [ { @@ -114,16 +114,16 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ @@ -178,7 +178,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: Outbound Current", + "alias": "$tag_host: $tag_interface: TX Current", "dsType": "influxdb", "groupBy": [ { @@ -188,16 +188,16 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ @@ -252,7 +252,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: Inbound Trend", + "alias": "$tag_host: $tag_interface: RX Trend", "dsType": "influxdb", "groupBy": [ { @@ -262,20 +262,20 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ - "null" + "linear" ], "type": "fill" } @@ -327,7 +327,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: Outbound Trend", + "alias": "$tag_host: $tag_interface: TX Trend", "dsType": "influxdb", "groupBy": [ { @@ -337,20 +337,20 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ - "null" + "linear" ], "type": "fill" } @@ -402,8 +402,8 @@ ] } ], + "description": "", "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "description": "" + "timeShift": null } diff --git a/salt/grafana/panels/memory_usage_graph.json.jinja b/salt/grafana/panels/memory_usage_graph.json.jinja index bac85a16f..662eb18c1 100644 --- a/salt/grafana/panels/memory_usage_graph.json.jinja +++ b/salt/grafana/panels/memory_usage_graph.json.jinja @@ -1,55 +1,30 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, + "id": 61873, "gridPos": { "x": {{ PANELS.memory_usage_graph.gridPos.x }}, "y": {{ PANELS.memory_usage_graph.gridPos.y }}, "w": {{ PANELS.memory_usage_graph.gridPos.w }}, "h": {{ PANELS.memory_usage_graph.gridPos.h }} }, - "id": 61873, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": true, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", + "type": "timeseries", + "title": "Memory Usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", "options": { - "alertThreshold": true - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:295", - "alias": "/total/", - "color": "#C4162A", - "fill": 0 + "tooltip": { + "mode": "single" }, - { - "$$hashKey": "object:164", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $col", @@ -106,9 +81,10 @@ "type": "fill" } ], + "hide": false, "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trend_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", + "query": "SELECT mean(mean_total) as trend_total, mean(mean_used) as trend_used, mean(mean_cached) as trend_cached, mean(mean_free) as trend_free, mean(mean_buffered) as trend_buffered FROM \"so_long_term\".\"mem\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", "queryType": "randomWalk", "rawQuery": true, "refId": "B", @@ -127,61 +103,106 @@ } ] ], - "tags": [], - "hide": false + "tags": [] } ], - "thresholds": [], - "timeRegions": [], - "title": "Memory Usage", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:235", - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": "0", - "show": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "bytes", + "min": 0, + "decimals": 1 }, - { - "$$hashKey": "object:236", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/total/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "#C4162A", + "mode": "fixed" + } + }, + { + "id": "custom.fillOpacity", + "value": 0 + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "bars": false, - "dashes": false, + "maxDataPoints": null, "description": "", - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja index 4423b8ef9..993926156 100644 --- a/salt/grafana/panels/monitor_interface_drops_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_drops_graph.json.jinja @@ -1,263 +1,282 @@ { - "type": "graph", - "title": "Monitor Interface Drops", + "id": 61387, "gridPos": { "x": {{ PANELS.monitor_interface_drops_graph.gridPos.x }}, "y": {{ PANELS.monitor_interface_drops_graph.gridPos.y }}, "w": {{ PANELS.monitor_interface_drops_graph.gridPos.w }}, "h": {{ PANELS.monitor_interface_drops_graph.gridPos.h }} }, - "id": 61387, + "type": "timeseries", + "title": "Monitor Interface Drops", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "maxDataPoints": 750, + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(drop_in), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "tags": [] }, { - "refId": "B", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(drop_out), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" - }, - { - "refId": "C", - "queryType": "randomWalk", - "policy": "default", + "refId": "B", "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", - "rawQuery": true, + "tags": [] + }, + { "alias": "$tag_host: $tag_interface: $col", - "hide": false - }, - { - "refId": "D", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(mean_drop_in), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(mean_drop_out), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), host,interface fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": "Drops per second", - "show": true, - "logBase": 1, + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Drops per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "pps", "min": 0, - "max": null, - "format": "pps", - "$$hashKey": "object:500" + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:501" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:592", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false - }, - { - "$$hashKey": "object:621", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "decimals": 0, - "maxDataPoints": 750, - "interval": "30s" + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja index 0a9b526b7..4c44fdb87 100644 --- a/salt/grafana/panels/monitor_interface_packets_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_packets_graph.json.jinja @@ -1,262 +1,282 @@ { - "type": "graph", - "title": "Monitor Interface Packets", + "id": 61878, "gridPos": { "x": {{ PANELS.monitor_interface_packets_graph.gridPos.x }}, "y": {{ PANELS.monitor_interface_packets_graph.gridPos.y }}, "w": {{ PANELS.monitor_interface_packets_graph.gridPos.w }}, "h": {{ PANELS.monitor_interface_packets_graph.gridPos.h }} }, - "id": 61878, + "type": "timeseries", + "title": "Monitor Interface Packets", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "maxDataPoints": 750, + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "last" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(packets_recv), 1s) as \"in\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "tags": [] }, { - "refId": "B", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host: $tag_interface: $col", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(packets_sent), 1s) as \"out\" FROM \"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" - }, - { - "refId": "C", - "queryType": "randomWalk", - "policy": "default", + "refId": "B", "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", - "rawQuery": true, + "tags": [] + }, + { "alias": "$tag_host: $tag_interface: $col", - "hide": false - }, - { - "refId": "D", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(mean_packets_recv), 1s) as \"trend_in\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "C", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], + "tags": [] + }, + { + "alias": "$tag_host: $tag_interface: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", "query": "SELECT non_negative_derivative(mean(mean_packets_sent), 1s) as \"trend_out\" FROM \"so_long_term\".\"net\" WHERE host =~ /$servername/ AND interface =~ /$monint/ AND $timeFilter GROUP BY time($__interval), * fill(none)", "rawQuery": true, - "alias": "$tag_host: $tag_interface: $col" + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": "Packets per second", - "show": true, - "logBase": 1, + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Packets per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "pps", "min": 0, - "max": null, - "format": "pps", - "$$hashKey": "object:241" + "decimals": 1 }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:242" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:413", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false - }, - { - "$$hashKey": "object:442", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "maxDataPoints": 750, - "interval": "30s" + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja index 677279f72..3c1a6fc74 100644 --- a/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja @@ -56,7 +56,8 @@ }, "mappings": [], "links": [], - "unit": "bps" + "unit": "bps", + "decimals": 1 }, "overrides": [ { @@ -76,11 +77,27 @@ { "id": "custom.lineStyle", "value": { - "fill": "dash", "dash": [ 4, 10 - ] + ], + "fill": "dash" + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true } } ] @@ -93,18 +110,17 @@ }, "legend": { "displayMode": "table", - "placement": "bottom", + "placement": "right", "calcs": [ - "mean", - "lastNotNull", "max", - "min" + "mean", + "last" ] } }, "targets": [ { - "alias": "$tag_host: $tag_interface: Inbound Current", + "alias": "$tag_host: $tag_interface: RX Current", "dsType": "influxdb", "groupBy": [ { @@ -114,16 +130,16 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ @@ -178,7 +194,7 @@ ] }, { - "alias": "$tag_host: $tag_interface: Inbound Trend", + "alias": "$tag_host: $tag_interface: RX Trend", "dsType": "influxdb", "groupBy": [ { @@ -188,16 +204,16 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "interface" - ] + ], + "type": "tag" }, { "params": [ @@ -253,8 +269,8 @@ ] } ], + "description": "", "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "description": "" + "timeShift": null } diff --git a/salt/grafana/panels/nsm_used_guage.json.jinja b/salt/grafana/panels/nsm_used_guage.json.jinja index d22a1b962..3175d3bfd 100644 --- a/salt/grafana/panels/nsm_used_guage.json.jinja +++ b/salt/grafana/panels/nsm_used_guage.json.jinja @@ -1,56 +1,69 @@ { - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "editable": true, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, + "id": 12, "gridPos": { "x": {{ PANELS.nsm_used_guage.gridPos.x }}, "y": {{ PANELS.nsm_used_guage.gridPos.y }}, "w": {{ PANELS.nsm_used_guage.gridPos.w }}, "h": {{ PANELS.nsm_used_guage.gridPos.h }} }, - "height": "150", - "id": 12, + "type": "gauge", + "title": "NSM used", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 85 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 95 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "color": { + "mode": "thresholds" + }, + "decimals": 0, + "max": 100, + "min": 0, + "unit": "percent" }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "postfixFontSize": "50%", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "overrides": [] + }, + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, "targets": [ { @@ -70,6 +83,7 @@ } ], "measurement": "disk", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -90,8 +104,8 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" }, { "condition": "AND", @@ -99,33 +113,9 @@ "operator": "=", "value": "/nsm" } - ], - "orderByTime": "ASC" + ] } ], - "thresholds": "85,95,100", - "title": "NSM used", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "cacheTimeout": null, - "colorBackground": false, - "decimals": 0, - "error": false, - "interval": null, - "nullText": null, - "postfix": "", - "prefix": "", - "tableColumn": "" + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/pcap_retention_stat.json.jinja b/salt/grafana/panels/pcap_retention_stat.json.jinja index 29b81902d..138b18e6b 100644 --- a/salt/grafana/panels/pcap_retention_stat.json.jinja +++ b/salt/grafana/panels/pcap_retention_stat.json.jinja @@ -1,5 +1,16 @@ { + "id": 26, + "gridPos": { + "x": {{ PANELS.pcap_retention_stat.gridPos.x }}, + "y": {{ PANELS.pcap_retention_stat.gridPos.y }}, + "w": {{ PANELS.pcap_retention_stat.gridPos.w }}, + "h": {{ PANELS.pcap_retention_stat.gridPos.h }} + }, + "type": "stat", + "title": "PCAP Retention", "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], "fieldConfig": { "defaults": { "thresholds": { @@ -13,31 +24,39 @@ }, "mappings": [ { - "op": "=", - "text": "N/A", - "value": "null", - "$$hashKey": "object:1382", - "id": 0, - "type": 1 + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" } ], - "unit": "d", - "decimals": 2, "color": { "mode": "thresholds" - } + }, + "decimals": 2, + "unit": "d" }, "overrides": [] }, - "gridPos": { - "x": {{ PANELS.pcap_retention_stat.gridPos.x }}, - "y": {{ PANELS.pcap_retention_stat.gridPos.y }}, - "w": {{ PANELS.pcap_retention_stat.gridPos.w }}, - "h": {{ PANELS.pcap_retention_stat.gridPos.h }} + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "value", + "colorMode": "value", + "graphMode": "none", + "justifyMode": "auto" }, - "id": 26, - "links": [], - "maxDataPoints": 100, "targets": [ { "dsType": "influxdb", @@ -89,24 +108,6 @@ ] } ], - "title": "PCAP Retention", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "value", - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto" - }, - "cacheTimeout": null, - "interval": null, - "pluginVersion": "7.5.4" + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/process_status_graph.json.jinja b/salt/grafana/panels/process_status_graph.json.jinja index 3480c08b9..302175c36 100644 --- a/salt/grafana/panels/process_status_graph.json.jinja +++ b/salt/grafana/panels/process_status_graph.json.jinja @@ -1,57 +1,107 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "editable": true, - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, + "id": 61852, "gridPos": { "x": {{ PANELS.process_status_graph.gridPos.x }}, "y": {{ PANELS.process_status_graph.gridPos.y }}, "w": {{ PANELS.process_status_graph.gridPos.w }}, "h": {{ PANELS.process_status_graph.gridPos.h }} }, - "height": "350", - "id": 61852, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, + "type": "timeseries", + "title": "Process Status", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", "links": [], - "nullPointMode": "connected", - "options": { - "alertThreshold": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "short", + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "pluginVersion": "7.5.4", - "pointradius": 5, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:549", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $col", @@ -71,6 +121,7 @@ } ], "measurement": "processes", + "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(running) as running, mean(blocked) as blocked, mean(sleeping) as sleeping, mean(stopped) as stopped, mean(zombies) as zombies, mean(paging) as paging, mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", "rawQuery": true, @@ -96,8 +147,7 @@ "operator": "=~", "value": "/^$server$/" } - ], - "orderByTime": "ASC" + ] }, { "alias": "$tag_host: $col", @@ -116,9 +166,11 @@ "type": "fill" } ], + "hide": false, "measurement": "processes", + "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", + "query": "SELECT mean(mean_running) as trend_running, mean(mean_blocked) as trend_blocked, mean(mean_sleeping) as trend_sleeping, mean(mean_stopped) as trend_stopped, mean(mean_zombies) as trend_zombies, mean(mean_paging) as trend_paging, mean(mean_unknown) as trend_unknown FROM \"so_long_term\".\"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", "rawQuery": true, "refId": "A", "resultFormat": "time_series", @@ -142,63 +194,10 @@ "operator": "=~", "value": "/^$server$/" } - ], - "orderByTime": "ASC", - "hide": false + ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Process Status", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true, - "$$hashKey": "object:512" - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true, - "$$hashKey": "object:513" - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "bars": false, - "dashes": false, - "error": false, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/ram_usage_guage.json.jinja b/salt/grafana/panels/ram_usage_guage.json.jinja index 1a1bf04a1..813b9cba8 100644 --- a/salt/grafana/panels/ram_usage_guage.json.jinja +++ b/salt/grafana/panels/ram_usage_guage.json.jinja @@ -1,65 +1,69 @@ { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "editable": true, - "error": false, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "x": {{ PANELS.ram_usage_guage.gridPos.x }}, - "y": {{ PANELS.ram_usage_guage.gridPos.y }}, - "w": {{ PANELS.ram_usage_guage.gridPos.w }}, - "h": {{ PANELS.ram_usage_guage.gridPos.h }} - }, - "height": "150", "id": 61860, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "gridPos": { + "x": {{ PANELS.ram_usage_guage.gridPos.x }}, + "y": {{ PANELS.ram_usage_guage.gridPos.y }}, + "w": {{ PANELS.ram_usage_guage.gridPos.w }}, + "h": {{ PANELS.ram_usage_guage.gridPos.h }} + }, + "type": "gauge", + "title": "RAM usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 70 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 80 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "color": { + "mode": "thresholds" + }, + "max": 100, + "min": 0, + "unit": "percent" + }, + "overrides": [] + }, + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, - "tableColumn": "", "targets": [ { "dsType": "influxdb", @@ -98,26 +102,13 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" } - ] + ], + "orderByTime": "ASC" } ], - "thresholds": "70,80,90", - "title": "RAM usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current", - "fieldConfig": { - "defaults": {}, - "overrides": [] - } + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/rootfs_used_guage.json.jinja b/salt/grafana/panels/rootfs_used_guage.json.jinja index d67e80e4a..b628d247c 100644 --- a/salt/grafana/panels/rootfs_used_guage.json.jinja +++ b/salt/grafana/panels/rootfs_used_guage.json.jinja @@ -1,56 +1,69 @@ { - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "editable": true, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, + "id": 61866, "gridPos": { "x": {{ PANELS.rootfs_used_guage.gridPos.x }}, "y": {{ PANELS.rootfs_used_guage.gridPos.y }}, "w": {{ PANELS.rootfs_used_guage.gridPos.w }}, "h": {{ PANELS.rootfs_used_guage.gridPos.h }} }, - "height": "150", - "id": 61866, + "type": "gauge", + "title": "RootFS used", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 70 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 80 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "color": { + "mode": "thresholds" + }, + "decimals": 0, + "max": 100, + "min": 0, + "unit": "percent" }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "postfixFontSize": "50%", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "overrides": [] + }, + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, "targets": [ { @@ -70,6 +83,7 @@ } ], "measurement": "disk", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -90,8 +104,8 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" }, { "condition": "AND", @@ -99,33 +113,9 @@ "operator": "=", "value": "/" } - ], - "orderByTime": "ASC" + ] } ], - "thresholds": "70,80,90", - "title": "RootFS used", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "cacheTimeout": null, - "colorBackground": false, - "decimals": 0, - "error": false, - "interval": null, - "nullText": null, - "postfix": "", - "prefix": "", - "tableColumn": "" + "maxDataPoints": null, + "cacheTimeout": null } diff --git a/salt/grafana/panels/swap_io_bytes_graph.json.jinja b/salt/grafana/panels/swap_io_bytes_graph.json.jinja index 6d65f5039..fe7989870 100644 --- a/salt/grafana/panels/swap_io_bytes_graph.json.jinja +++ b/salt/grafana/panels/swap_io_bytes_graph.json.jinja @@ -1,180 +1,187 @@ { - "type": "graph", - "title": "Swap I/O Bytes", + "id": 68890, "gridPos": { "x": {{ PANELS.swap_io_bytes_graph.gridPos.x }}, "y": {{ PANELS.swap_io_bytes_graph.gridPos.y }}, "w": {{ PANELS.swap_io_bytes_graph.gridPos.w }}, "h": {{ PANELS.swap_io_bytes_graph.gridPos.h }} }, - "id": 68890, + "type": "timeseries", + "title": "Swap I/O Bytes", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host: $col" - }, - { - "refId": "B", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "value" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "query": "SELECT non_negative_derivative(mean(\"mean_in\")) as \"trend_in\", non_negative_derivative(mean(\"mean_out\")) as \"trend_out\" FROM \"so_long_term\".\"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", - "rawQuery": true, "alias": "$tag_host: $col", - "hide": false - } - ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "bytes", - "$$hashKey": "object:156" + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"in\")) as \"in\", non_negative_derivative(mean(\"out\")) as \"out\" FROM \"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] }, { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:157" + "alias": "$tag_host: $col", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"mean_in\")) as \"trend_in\", non_negative_derivative(mean(\"mean_out\")) as \"trend_out\" FROM \"so_long_term\".\"swap\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host fill(linear) ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "value" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [] } ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "bytes", + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "fill": 1, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "show": true, - "values": true, - "min": false, - "max": true, - "current": true, - "total": false, - "avg": true, - "alignAsTable": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 0 - }, - "aliasColors": {}, - "seriesOverrides": [ - { - "$$hashKey": "object:322", - "alias": "/trend/", - "fill": 0, - "linewidth": 4, - "dashes": true, - "dashLength": 4 - } - ], - "thresholds": [], - "timeRegions": [], - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "maxDataPoints": 750, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/swap_usage_guage.json.jinja b/salt/grafana/panels/swap_usage_guage.json.jinja index 895dd03f4..f7e3d4f34 100644 --- a/salt/grafana/panels/swap_usage_guage.json.jinja +++ b/salt/grafana/panels/swap_usage_guage.json.jinja @@ -1,66 +1,70 @@ { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": true, - "colors": [ - "rgba(50, 172, 45, 0.97)", - "rgba(237, 129, 40, 0.89)", - "rgba(245, 54, 54, 0.9)" - ], - "datasource": "InfluxDB", - "decimals": 0, - "editable": true, - "error": false, - "format": "percent", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": true, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "gridPos": { - "x": {{ PANELS.swap_usage_guage.gridPos.x }}, - "y": {{ PANELS.swap_usage_guage.gridPos.y }}, - "w": {{ PANELS.swap_usage_guage.gridPos.w }}, - "h": {{ PANELS.swap_usage_guage.gridPos.h }} - }, - "height": "150", "id": 61863, - "interval": null, - "links": [], - "mappingType": 1, - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "rangeMaps": [ - { - "from": "null", - "text": "N/A", - "to": "null" - } - ], - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false + "gridPos": { + "x": {{ PANELS.swap_usage_guage.gridPos.x }}, + "y": {{ PANELS.swap_usage_guage.gridPos.y }}, + "w": {{ PANELS.swap_usage_guage.gridPos.w }}, + "h": {{ PANELS.swap_usage_guage.gridPos.h }} + }, + "type": "gauge", + "title": "Swap usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(50, 172, 45, 0.97)", + "value": null + }, + { + "color": "rgba(237, 129, 40, 0.89)", + "value": 50 + }, + { + "color": "rgba(245, 54, 54, 0.9)", + "value": 70 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "color": { + "mode": "thresholds" + }, + "decimals": 0, + "max": 100, + "min": 0, + "unit": "percent" + }, + "overrides": [] + }, + "interval": "30", + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "showThresholdLabels": false, + "showThresholdMarkers": true, + "text": {} }, - "tableColumn": "", "targets": [ { "dsType": "influxdb", @@ -99,26 +103,13 @@ "tags": [ { "key": "host", - "operator": "=~", - "value": "/^$servername$/" + "operator": "=", + "value": "$servername" } - ] + ], + "orderByTime": "ASC" } ], - "thresholds": "50,70,90", - "title": "Swap usage", - "type": "singlestat", - "valueFontSize": "80%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "current", - "fieldConfig": { - "defaults": {}, - "overrides": [] - } + "maxDataPoints": null, + "cacheTimeout": null } From bf116d210ed5731d5445c98e5f807eada7ae8315 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 1 Nov 2021 17:48:02 -0400 Subject: [PATCH 09/47] mostly overview dash panel changes --- .../panels/cpu_usage_current_graph.json.jinja | 164 +++++------- .../cpu_usage_tasks_blocked_graph.json.jinja | 190 +++++++------ .../cpu_usage_tasks_paging_graph.json.jinja | 188 +++++++------ .../cpu_usage_tasks_running_graph.json.jinja | 190 +++++++------ .../cpu_usage_tasks_sleeping_graph.json.jinja | 190 +++++++------ .../cpu_usage_tasks_stopped_graph.json.jinja | 190 +++++++------ .../cpu_usage_tasks_unknown_graph.json.jinja | 190 +++++++------ .../cpu_usage_tasks_zombies_graph.json.jinja | 190 +++++++------ .../disk_usage_nsm_percent_graph.json.jinja | 164 ++++++------ .../disk_usage_root_percent_graph.json.jinja | 166 ++++++------ salt/grafana/panels/io_wait_graph.json.jinja | 253 +++++++++--------- ...t_interface_drops_inbound_graph.json.jinja | 175 ++++++------ ..._interface_drops_outbound_graph.json.jinja | 175 ++++++------ ...interface_traffic_inbound_graph.json.jinja | 164 +++++------- ...nterface_traffic_outbound_graph.json.jinja | 164 +++++------- .../memory_usage_percent_graph.json.jinja | 236 ++++++++-------- ...r_interface_drops_inbound_graph.json.jinja | 156 +++++------ ...interface_traffic_inbound_graph.json.jinja | 167 ++++++------ .../stenographer_packet_loss_graph.json.jinja | 228 ++++++++-------- .../suricata_packet_loss_graph.json.jinja | 211 ++++++++------- .../swap_usage_percent_graph.json.jinja | 251 +++++++++-------- .../panels/zeek_packet_loss_graph.json.jinja | 215 ++++++++------- 22 files changed, 2025 insertions(+), 2192 deletions(-) diff --git a/salt/grafana/panels/cpu_usage_current_graph.json.jinja b/salt/grafana/panels/cpu_usage_current_graph.json.jinja index ff7517029..15c70cedd 100644 --- a/salt/grafana/panels/cpu_usage_current_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_current_graph.json.jinja @@ -1,47 +1,79 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "decimals": 1, - "fieldConfig": { - "defaults": { - "unit": "percent" - }, - "overrides": [] - }, + "id": 69001, "gridPos": { "x": {{ PANELS.cpu_usage_current_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_current_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_current_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_current_graph.gridPos.h }} }, - "id": 69001, + "type": "timeseries", + "title": "CPU Usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "percent", + "min": 0, + "decimals": 1 + }, + "overrides": [] }, - "lines": true, - "linewidth": 1, - "maxDataPoints": 750, - "nullPointMode": "connected", "options": { - "alertThreshold": true + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, "targets": [ { "alias": "$tag_host $tag_role", @@ -59,10 +91,10 @@ "type": "tag" }, { - "type": "tag", "params": [ "role" - ] + ], + "type": "tag" }, { "params": [ @@ -80,20 +112,20 @@ "select": [ [ { - "type": "field", "params": [ "usage_idle" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" }, { - "type": "math", "params": [ "*-1 + 100" - ] + ], + "type": "math" } ] ], @@ -112,55 +144,7 @@ ] } ], - "thresholds": [], - "timeRegions": [], - "title": "CPU Usage", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:933", - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "$$hashKey": "object:934", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "bars": false, - "dashes": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja index 7285d6430..6a7371038 100644 --- a/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks_blocked_graph.json.jinja @@ -1,132 +1,124 @@ { - "type": "graph", - "title": "CPU Tasks Blocked", + "id": 69005, "gridPos": { "x": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_tasks_blocked_graph.gridPos.h }} }, - "id": 69005, + "type": "timeseries", + "title": "CPU Tasks Blocked", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "min": 0, + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host $tag_role", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(blocked) as blocked FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT mean(blocked) as blocked FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host $tag_role" + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": 0, - "max": null, - "format": "short", - "$$hashKey": "object:412" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:413" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "interval": "30s" } diff --git a/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja index 2af6c1bec..2f56dffaa 100644 --- a/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks_paging_graph.json.jinja @@ -1,132 +1,124 @@ { - "type": "graph", - "title": "CPU Tasks Paging", + "id": 69008, "gridPos": { "x": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_tasks_paging_graph.gridPos.h }} }, - "id": 69008, + "type": "timeseries", + "title": "CPU Tasks Paging", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "min": 0, + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host $tag_role", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(paging) as paging FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT mean(paging) as paging FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host $tag_role" + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": 0, - "max": null, - "format": "short", - "$$hashKey": "object:412" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:413" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, + "interval": "30s", "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja index c1148391f..657321696 100644 --- a/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks_running_graph.json.jinja @@ -1,132 +1,124 @@ { - "type": "graph", - "title": "CPU Tasks Running", + "id": 69003, "gridPos": { "x": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_tasks_running_graph.gridPos.h }} }, - "id": 69003, + "type": "timeseries", + "title": "CPU Tasks Running", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "min": 0, + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host $tag_role", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(running) as running FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT mean(running) as running FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host $tag_role" + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": 0, - "max": null, - "format": "short", - "$$hashKey": "object:412" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:413" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "interval": "30s" } diff --git a/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja index e23f5e0df..e88272d2d 100644 --- a/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks_sleeping_graph.json.jinja @@ -1,132 +1,124 @@ { - "type": "graph", - "title": "CPU Tasks Sleeping", + "id": 69006, "gridPos": { "x": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_tasks_sleeping_graph.gridPos.h }} }, - "id": 69006, + "type": "timeseries", + "title": "CPU Tasks Sleeping", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "min": 0, + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host $tag_role", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(sleeping) as sleeping FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT mean(sleeping) as sleeping FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host $tag_role" + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": 0, - "max": null, - "format": "short", - "$$hashKey": "object:412" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:413" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "interval": "30s" } diff --git a/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja index bbff2cd0f..d45d59a18 100644 --- a/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks_stopped_graph.json.jinja @@ -1,132 +1,124 @@ { - "type": "graph", - "title": "CPU Tasks Stopped", + "id": 69007, "gridPos": { "x": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_tasks_stopped_graph.gridPos.h }} }, - "id": 69007, + "type": "timeseries", + "title": "CPU Tasks Stopped", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "min": 0, + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host $tag_role", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(stopped) as stopped FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT mean(stopped) as stopped FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host $tag_role" + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": 0, - "max": null, - "format": "short", - "$$hashKey": "object:412" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:413" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "interval": "30s" } diff --git a/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja index 1c194bcbc..f0c3005eb 100644 --- a/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks_unknown_graph.json.jinja @@ -1,132 +1,124 @@ { - "type": "graph", - "title": "CPU Tasks Unknown", + "id": 69009, "gridPos": { "x": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_tasks_unknown_graph.gridPos.h }} }, - "id": 69009, + "type": "timeseries", + "title": "CPU Tasks Unknown", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "min": 0, + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host $tag_role", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT mean(unknown) as unknown FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host $tag_role" + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": 0, - "max": null, - "format": "short", - "$$hashKey": "object:412" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:413" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "interval": "30s" } diff --git a/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja b/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja index 2d3f90018..20149ae3b 100644 --- a/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja +++ b/salt/grafana/panels/cpu_usage_tasks_zombies_graph.json.jinja @@ -1,132 +1,124 @@ { - "type": "graph", - "title": "CPU Tasks Zombies", + "id": 69004, "gridPos": { "x": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.x }}, "y": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.y }}, "w": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.w }}, "h": {{ PANELS.cpu_usage_tasks_zombies_graph.gridPos.h }} }, - "id": 69004, + "type": "timeseries", + "title": "CPU Tasks Zombies", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "min": 0, + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [], + "alias": "$tag_host $tag_role", "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT mean(zombies) as zombies FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", + "queryType": "randomWalk", + "rawQuery": true, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "value" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], - "query": "SELECT mean(zombies) as zombies FROM \"processes\" WHERE host =~ /$servername$/ AND $timeFilter GROUP BY time($__interval), host, role ORDER BY asc", - "rawQuery": true, - "alias": "$tag_host $tag_role" + "tags": [] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": 0, - "max": null, - "format": "short", - "$$hashKey": "object:412" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:413" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, "timeFrom": null, - "timeShift": null + "timeShift": null, + "interval": "30s" } diff --git a/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja b/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja index 19e5e0777..7486b29d9 100644 --- a/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja +++ b/salt/grafana/panels/disk_usage_nsm_percent_graph.json.jinja @@ -1,45 +1,82 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, + "id": 47230, "gridPos": { "x": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.x }}, "y": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.y }}, "w": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.w }}, "h": {{ PANELS.disk_usage_nsm_percent_graph.gridPos.h }} }, - "id": 47230, + "type": "timeseries", + "title": "Disk Usage /nsm", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "percent", + "decimals": 1, + "min": 0, + "max": 100 + }, + "overrides": [] }, - "lines": true, - "linewidth": 1, - "maxDataPoints": 750, - "nullPointMode": "connected", "options": { - "alertThreshold": false + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "lastNotNull" + ] + } }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "steppedLine": true, "targets": [ { "alias": "$tag_host $tag_role", @@ -51,16 +88,16 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "role" - ] + ], + "type": "tag" }, { "params": [ @@ -69,6 +106,7 @@ "type": "fill" } ], + "measurement": "disk", "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/nsm' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", @@ -102,60 +140,10 @@ "operator": "=", "value": "/nsm" } - ], - "measurement": "disk" + ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Disk Usage /nsm", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:235", - "format": "percent", - "label": "", - "logBase": 1, - "max": "100", - "min": "0", - "show": true, - "decimals": 1 - }, - { - "$$hashKey": "object:236", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "fill": 0, - "bars": false, - "dashes": false, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "decimals": 1 + "timeShift": null } diff --git a/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja b/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja index 25315a94c..90cc3ff9b 100644 --- a/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja +++ b/salt/grafana/panels/disk_usage_root_percent_graph.json.jinja @@ -1,45 +1,82 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, + "id": 67830, "gridPos": { "x": {{ PANELS.disk_usage_root_percent_graph.gridPos.x }}, "y": {{ PANELS.disk_usage_root_percent_graph.gridPos.y }}, "w": {{ PANELS.disk_usage_root_percent_graph.gridPos.w }}, "h": {{ PANELS.disk_usage_root_percent_graph.gridPos.h }} }, - "id": 67830, + "type": "timeseries", + "title": "Disk Usage /", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "percent", + "decimals": 1, + "min": 0, + "max": 100 + }, + "overrides": [] }, - "lines": true, - "linewidth": 1, - "maxDataPoints": 750, - "nullPointMode": "connected", "options": { - "alertThreshold": false + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "lastNotNull" + ] + } }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "steppedLine": true, "targets": [ { "alias": "$tag_host $tag_role", @@ -51,24 +88,25 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "role" - ] + ], + "type": "tag" }, { "params": [ - "null" + "none" ], "type": "fill" } ], + "measurement": "disk", "orderByTime": "ASC", "policy": "default", "query": "SELECT mean(total) AS \"total\", mean(used) as \"used\" FROM \"disk\" WHERE \"host\" =~ /$servername$/ AND \"path\" = '/' AND $timeFilter GROUP BY time($__interval), \"host\", \"path\"", @@ -102,60 +140,10 @@ "operator": "=", "value": "/" } - ], - "measurement": "disk" + ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Disk Usage /", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:235", - "format": "percent", - "label": "", - "logBase": 1, - "max": "100", - "min": "0", - "show": true, - "decimals": 1 - }, - { - "$$hashKey": "object:236", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "fill": 0, - "bars": false, - "dashes": false, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, + "maxDataPoints": null, "timeFrom": null, - "timeShift": null, - "decimals": 1 + "timeShift": null } diff --git a/salt/grafana/panels/io_wait_graph.json.jinja b/salt/grafana/panels/io_wait_graph.json.jinja index 3a01467b0..9447563ec 100644 --- a/salt/grafana/panels/io_wait_graph.json.jinja +++ b/salt/grafana/panels/io_wait_graph.json.jinja @@ -1,20 +1,131 @@ { - "type": "graph", - "title": "IO Wait", + "id": 69011, "gridPos": { "x": {{ PANELS.io_wait_graph.gridPos.x }}, "y": {{ PANELS.io_wait_graph.gridPos.y }}, "w": {{ PANELS.io_wait_graph.gridPos.w }}, "h": {{ PANELS.io_wait_graph.gridPos.h }} }, - "id": 69011, + "type": "timeseries", + "title": "IO Wait", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "percent", + "min": 0, + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", + "alias": "$tag_host $tag_role", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "role" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "cpu", "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "usage_iowait" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", @@ -27,129 +138,11 @@ "operator": "=", "value": "cpu-total" } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "tag", - "params": [ - "role" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "usage_iowait" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "measurement": "cpu", - "alias": "$tag_host $tag_role" + ] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": "0", - "max": null, - "format": "percent", - "$$hashKey": "object:1740" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:1741" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "decimals": 1, - "description": "" + "description": "", + "timeFrom": null, + "timeShift": null, + "interval": "30s" } diff --git a/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja b/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja index f8aae9330..1ca096743 100644 --- a/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja +++ b/salt/grafana/panels/management_interface_drops_inbound_graph.json.jinja @@ -1,51 +1,100 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, + "id": 61877, "gridPos": { "x": {{ PANELS.management_interface_drops_inbound_graph.gridPos.x }}, "y": {{ PANELS.management_interface_drops_inbound_graph.gridPos.y }}, "w": {{ PANELS.management_interface_drops_inbound_graph.gridPos.w }}, "h": {{ PANELS.management_interface_drops_inbound_graph.gridPos.h }} }, - "id": 61877, + "type": "timeseries", + "title": "Management Interface Drops - Inbound", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Drops per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "pps", + "min": 0, + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true + } + } + ] + } + ] }, - "lines": true, - "linewidth": 1, - "maxDataPoints": 750, - "nullPointMode": "connected", "options": { - "alertThreshold": false - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:592", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $tag_role", @@ -87,57 +136,7 @@ "tags": [] } ], - "thresholds": [], - "timeRegions": [], - "title": "Management Interface Drops - Inbound", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:500", - "format": "pps", - "label": "Drops per second", - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "$$hashKey": "object:501", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true, - "decimals": 0 - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "fill": 0, - "bars": false, - "dashes": false, - "decimals": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja b/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja index 8c65a251a..91fcb5b22 100644 --- a/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja +++ b/salt/grafana/panels/management_interface_drops_outbound_graph.json.jinja @@ -1,51 +1,100 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, + "id": 188189, "gridPos": { "x": {{ PANELS.management_interface_drops_outbound_graph.gridPos.x }}, "y": {{ PANELS.management_interface_drops_outbound_graph.gridPos.y }}, "w": {{ PANELS.management_interface_drops_outbound_graph.gridPos.w }}, "h": {{ PANELS.management_interface_drops_outbound_graph.gridPos.h }} }, - "id": 188189, + "type": "timeseries", + "title": "Management Interface Drops - Outbound", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Drops per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "pps", + "min": 0, + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/veth/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "tooltip": true, + "viz": true, + "legend": true + } + } + ] + } + ] }, - "lines": true, - "linewidth": 1, - "maxDataPoints": 750, - "nullPointMode": "connected", "options": { - "alertThreshold": false - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:592", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $tag_role", @@ -87,57 +136,7 @@ "tags": [] } ], - "thresholds": [], - "timeRegions": [], - "title": "Management Interface Drops - Outbound", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:500", - "format": "pps", - "label": "Drops per second", - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "$$hashKey": "object:501", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true, - "decimals": 0 - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "fill": 0, - "bars": false, - "dashes": false, - "decimals": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja index 0f34d8ee3..3f876a18d 100644 --- a/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja +++ b/salt/grafana/panels/management_interface_traffic_inbound_graph.json.jinja @@ -1,53 +1,85 @@ { - "aliasColors": { - "InBound": "#629E51", - "OutBound": "#5195CE", - "net.non_negative_derivative": "super-light-blue" - }, - "dashLength": 10, - "datasource": "InfluxDB", - "decimals": 1, - "editable": true, - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, + "id": 18, "gridPos": { "x": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.x }}, "y": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.y }}, "w": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.w }}, "h": {{ PANELS.management_interface_traffic_inbound_graph.gridPos.h }} }, - "id": 18, + "type": "timeseries", + "title": "Management Interface Traffic - Inbound", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, "links": [], - "maxDataPoints": 750, - "nullPointMode": "connected", - "options": { - "alertThreshold": false + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 2, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "links": [], + "unit": "bps", + "decimals": 1, + "min": 0 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } }, - "pluginVersion": "7.5.4", - "pointradius": 5, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, "targets": [ { "alias": "$tag_host $tag_role", @@ -126,57 +158,7 @@ ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Management Interface Traffic - Inbound", - "tooltip": { - "msResolution": true, - "shared": true, - "sort": 2, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:353", - "decimals": 1, - "format": "bps", - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "$$hashKey": "object:354", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "bars": false, - "dashes": false, - "error": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja index 05f3cdb75..48817d448 100644 --- a/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja +++ b/salt/grafana/panels/management_interface_traffic_outbound_graph.json.jinja @@ -1,53 +1,85 @@ { - "aliasColors": { - "InBound": "#629E51", - "OutBound": "#5195CE", - "net.non_negative_derivative": "super-light-blue" - }, - "dashLength": 10, - "datasource": "InfluxDB", - "decimals": 1, - "editable": true, - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, + "id": 69014, "gridPos": { "x": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.x }}, "y": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.y }}, "w": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.w }}, "h": {{ PANELS.management_interface_traffic_outbound_graph.gridPos.h }} }, - "id": 69014, + "type": "timeseries", + "title": "Management Interface Traffic - Outbound", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, "links": [], - "maxDataPoints": 750, - "nullPointMode": "connected", - "options": { - "alertThreshold": false + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 2, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "links": [], + "unit": "bps", + "decimals": 1, + "min": 0 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } }, - "pluginVersion": "7.5.4", - "pointradius": 5, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, "targets": [ { "alias": "$tag_host $tag_role", @@ -124,57 +156,7 @@ ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Management Interface Traffic - Outbound", - "tooltip": { - "msResolution": true, - "shared": true, - "sort": 2, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:353", - "decimals": 1, - "format": "bps", - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "$$hashKey": "object:354", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "bars": false, - "dashes": false, - "error": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/memory_usage_percent_graph.json.jinja b/salt/grafana/panels/memory_usage_percent_graph.json.jinja index 9060a41f6..620c3ea72 100644 --- a/salt/grafana/panels/memory_usage_percent_graph.json.jinja +++ b/salt/grafana/panels/memory_usage_percent_graph.json.jinja @@ -1,149 +1,139 @@ { - "type": "graph", - "title": "Memory Usage", + "id": 69013, "gridPos": { "x": {{ PANELS.memory_usage_percent_graph.gridPos.x }}, "y": {{ PANELS.memory_usage_percent_graph.gridPos.y }}, "w": {{ PANELS.memory_usage_percent_graph.gridPos.w }}, "h": {{ PANELS.memory_usage_percent_graph.gridPos.h }} }, - "id": 69013, + "type": "timeseries", + "title": "Memory Usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", + "alias": "$tag_host $tag_role", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "role" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "mem", "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "used_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$servername$/" } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] + ] + } + ], + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" }, - { - "type": "tag", - "params": [ - "host" - ] + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" }, - { - "type": "tag", - "params": [ - "role" - ] + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false }, - { - "type": "fill", - "params": [ - "null" - ] + "thresholdsStyle": { + "mode": "off" } - ], - "select": [ - [ + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ { - "type": "field", - "params": [ - "used_percent" - ] - }, - { - "type": "mean", - "params": [] + "color": "green", + "value": null } ] - ], - "measurement": "mem", - "alias": "$tag_host $tag_role" - } - ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, + }, + "mappings": [], + "unit": "percent", + "min": 0, + "decimals": 1 + }, "overrides": [] }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": "0", - "max": null, - "format": "percent", - "$$hashKey": "object:504" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:505" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "decimals": 1, - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false, - "description": "" + "interval": "30s", + "description": "", + "timeFrom": null, + "timeShift": null, + "maxDataPoints": null } diff --git a/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja b/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja index c784e8efc..2c4574f84 100644 --- a/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_drops_inbound_graph.json.jinja @@ -1,49 +1,83 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, + "id": 188190, "gridPos": { "x": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.x }}, "y": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.y }}, "w": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.w }}, "h": {{ PANELS.monitor_interface_drops_inbound_graph.gridPos.h }} }, - "id": 188190, + "type": "timeseries", + "title": "Monitor Interface Drops - Inbound", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": false, - "min": false, - "show": true, - "total": false, - "values": true, - "rightSide": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "Drops per second", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "pps", + "min": 0, + "decimals": 1 + }, + "overrides": [] }, - "lines": true, - "linewidth": 1, - "maxDataPoints": 750, - "nullPointMode": "connected", "options": { - "alertThreshold": false - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:592", - "alias": "/veth/", - "hiddenSeries": true, - "legend": false + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "$tag_host: $tag_role", @@ -85,57 +119,7 @@ "tags": [] } ], - "thresholds": [], - "timeRegions": [], - "title": "Monitor Interface Drops - Inbound", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:500", - "format": "pps", - "label": "Drops per second", - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "$$hashKey": "object:501", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true, - "decimals": 0 - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "fill": 0, - "bars": false, - "dashes": false, - "decimals": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja index f5fad1509..5365bd3ac 100644 --- a/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja @@ -1,53 +1,88 @@ { - "aliasColors": { - "InBound": "#629E51", - "OutBound": "#5195CE", - "net.non_negative_derivative": "super-light-blue" - }, - "dashLength": 10, - "datasource": "InfluxDB", - "decimals": 1, - "editable": true, - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, + "id": 188188, "gridPos": { "x": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.x }}, "y": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.y }}, "w": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.w }}, "h": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.h }} }, - "id": 188188, + "type": "timeseries", + "title": "Monitor Interface Traffic - Inbound", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, "links": [], - "maxDataPoints": 750, - "nullPointMode": "connected", - "options": { - "alertThreshold": false + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 2, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + }, + "lineStyle": { + "fill": "solid" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "links": [], + "unit": "bps", + "decimals": 1, + "min": 0 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } }, - "pluginVersion": "7.5.4", - "pointradius": 5, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, "targets": [ { "alias": "$tag_host $tag_role", @@ -126,57 +161,7 @@ ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Monitor Interface Traffic - Inbound", - "tooltip": { - "msResolution": true, - "shared": true, - "sort": 2, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:353", - "decimals": 1, - "format": "bps", - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "$$hashKey": "object:354", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "bars": false, - "dashes": false, - "error": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, + "maxDataPoints": null, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja b/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja index 5bd3f5a07..0fb56dbe7 100644 --- a/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja +++ b/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja @@ -1,57 +1,112 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, + "id": 19, "gridPos": { "x": {{ PANELS.stenographer_packet_loss_graph.gridPos.x }}, "y": {{ PANELS.stenographer_packet_loss_graph.gridPos.y }}, "w": {{ PANELS.stenographer_packet_loss_graph.gridPos.w }}, "h": {{ PANELS.stenographer_packet_loss_graph.gridPos.h }} }, - "id": 19, + "type": "timeseries", + "title": "Stenographer Packet Loss", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, "links": [], - "maxDataPoints": 750, - "nullPointMode": "connected", - "options": { - "alertThreshold": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "links": [], + "unit": "percent", + "min": 0, + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4, - "$$hashKey": "object:2274" + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "Current $tag_host $tag_role", @@ -64,20 +119,20 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "role" - ] + ], + "type": "tag" }, { "params": [ - "null" + "none" ], "type": "fill" } @@ -90,14 +145,14 @@ "select": [ [ { - "type": "field", "params": [ "drop" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], @@ -120,20 +175,20 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "role" - ] + ], + "type": "tag" }, { "params": [ - "null" + "none" ], "type": "fill" } @@ -147,14 +202,14 @@ "select": [ [ { - "type": "field", "params": [ "mean_drop" - ] + ], + "type": "field" }, { - "type": "mean", - "params": [] + "params": [], + "type": "mean" } ] ], @@ -167,57 +222,8 @@ ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Stenographer Packet Loss", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "decimals": null, - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true, - "$$hashKey": "object:2287" - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false, - "$$hashKey": "object:2288" - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "bars": false, + "maxDataPoints": null, "cacheTimeout": null, - "dashes": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/suricata_packet_loss_graph.json.jinja b/salt/grafana/panels/suricata_packet_loss_graph.json.jinja index 39b53d166..eb26f9d8b 100644 --- a/salt/grafana/panels/suricata_packet_loss_graph.json.jinja +++ b/salt/grafana/panels/suricata_packet_loss_graph.json.jinja @@ -1,57 +1,112 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, + "id": 21, "gridPos": { "x": {{ PANELS.suricata_packet_loss_graph.gridPos.x }}, "y": {{ PANELS.suricata_packet_loss_graph.gridPos.y }}, "w": {{ PANELS.suricata_packet_loss_graph.gridPos.w }}, "h": {{ PANELS.suricata_packet_loss_graph.gridPos.h }} }, - "id": 21, + "type": "timeseries", + "title": "Suricata Packet Loss", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, "links": [], - "maxDataPoints": 750, - "nullPointMode": "connected", - "options": { - "alertThreshold": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "links": [], + "unit": "percent", + "min": 0, + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4, - "$$hashKey": "object:1059" + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "Current $tag_host $tag_role", @@ -64,20 +119,20 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "role" - ] + ], + "type": "tag" }, { "params": [ - "null" + "none" ], "type": "fill" } @@ -126,20 +181,20 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "role" - ] + ], + "type": "tag" }, { "params": [ - "null" + "none" ], "type": "fill" } @@ -179,56 +234,8 @@ ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Suricata Packet Loss", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true, - "$$hashKey": "object:1072" - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false, - "$$hashKey": "object:1073" - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "bars": false, + "maxDataPoints": null, "cacheTimeout": null, - "dashes": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/panels/swap_usage_percent_graph.json.jinja b/salt/grafana/panels/swap_usage_percent_graph.json.jinja index b40412994..875107fd7 100644 --- a/salt/grafana/panels/swap_usage_percent_graph.json.jinja +++ b/salt/grafana/panels/swap_usage_percent_graph.json.jinja @@ -1,148 +1,141 @@ { - "type": "graph", - "title": "Swap Usage", + "id": 69873, "gridPos": { "x": {{ PANELS.swap_usage_percent_graph.gridPos.x }}, "y": {{ PANELS.swap_usage_percent_graph.gridPos.y }}, "w": {{ PANELS.swap_usage_percent_graph.gridPos.w }}, "h": {{ PANELS.swap_usage_percent_graph.gridPos.h }} }, - "id": 69873, + "type": "timeseries", + "title": "Swap Usage", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "percent", + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, "targets": [ { - "refId": "A", - "queryType": "randomWalk", - "policy": "default", - "resultFormat": "time_series", + "alias": "$tag_host $tag_role", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "role" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "swap", "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "used_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], "tags": [ { "key": "host", "operator": "=~", "value": "/^$servername$/" } - ], - "groupBy": [ - { - "type": "time", - "params": [ - "$__interval" - ] - }, - { - "type": "tag", - "params": [ - "host" - ] - }, - { - "type": "tag", - "params": [ - "role" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "used_percent" - ] - }, - { - "type": "mean", - "params": [] - } - ] - ], - "measurement": "swap", - "alias": "$tag_host $tag_role" + ] } ], - "options": { - "alertThreshold": true - }, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "pluginVersion": "7.5.4", - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "percent", - "$$hashKey": "object:100", - "decimals": 1 - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short", - "$$hashKey": "object:101" - } - ], - "xaxis": { - "show": true, - "mode": "time", - "name": null, - "values": [], - "buckets": null - }, - "yaxis": { - "align": false, - "alignLevel": null - }, - "lines": true, - "linewidth": 1, - "dashLength": 10, - "spaceLength": 10, - "pointradius": 2, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": true, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "nullPointMode": "connected", - "tooltip": { - "value_type": "individual", - "shared": true, - "sort": 2 - }, - "aliasColors": {}, - "seriesOverrides": [], - "thresholds": [], - "timeRegions": [], - "fill": 0, - "fillGradient": 0, - "dashes": false, - "hiddenSeries": false, - "points": false, - "bars": false, - "stack": false, - "percentage": false, - "steppedLine": false + "timeFrom": null, + "timeShift": null, + "interval": "30s", + "maxDataPoints": null } diff --git a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja b/salt/grafana/panels/zeek_packet_loss_graph.json.jinja index 7656cb575..7d2c8ae2b 100644 --- a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja +++ b/salt/grafana/panels/zeek_packet_loss_graph.json.jinja @@ -1,57 +1,115 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, + "id": 2022, "gridPos": { "x": {{ PANELS.zeek_packet_loss_graph.gridPos.x }}, "y": {{ PANELS.zeek_packet_loss_graph.gridPos.y }}, "w": {{ PANELS.zeek_packet_loss_graph.gridPos.w }}, "h": {{ PANELS.zeek_packet_loss_graph.gridPos.h }} }, - "id": 2022, + "type": "timeseries", + "title": "Zeek Packet Loss", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", "interval": "30s", - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": false, - "min": false, - "rightSide": true, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, "links": [], - "maxDataPoints": 750, - "nullPointMode": "connected", - "options": { - "alertThreshold": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + }, + "lineStyle": { + "fill": "solid" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "links": [], + "unit": "percent", + "min": 0, + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [ - { - "$$hashKey": "object:314", - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] } - ], - "spaceLength": 10, + }, "targets": [ { "alias": "Current $tag_host $tag_role", @@ -64,20 +122,20 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "role" - ] + ], + "type": "tag" }, { "params": [ - "null" + "none" ], "type": "fill" } @@ -126,20 +184,20 @@ "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "tag", "params": [ "role" - ] + ], + "type": "tag" }, { "params": [ - "null" + "none" ], "type": "fill" } @@ -179,57 +237,8 @@ ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Zeek Packet Loss", - "tooltip": { - "shared": true, - "sort": 2, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:327", - "decimals": null, - "format": "percent", - "label": null, - "logBase": 1, - "max": null, - "min": 0, - "show": true - }, - { - "$$hashKey": "object:328", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "bars": false, + "maxDataPoints": null, "cacheTimeout": null, - "dashes": false, - "fill": 0, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, "timeFrom": null, "timeShift": null } From a9be0a040993365798c091224a86a68616b4d9ce Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 07:55:39 -0400 Subject: [PATCH 10/47] create and add mon traffic combined graph to sensor dash --- salt/grafana/defaults.yaml | 58 +++--- ..._traffic_inbound_combined_graph.json.jinja | 178 ++++++++++++++++++ 2 files changed, 210 insertions(+), 26 deletions(-) create mode 100644 salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 9f8b8821e..2e1311361 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -1498,166 +1498,172 @@ grafana: y: 61 h: 8 w: 24 - monitor_interface_packets_graph: + monitor_interface_traffic_inbound_combined_graph: gridPos: x: 0 y: 69 h: 8 + w: 24 + monitor_interface_packets_graph: + gridPos: + x: 0 + y: 77 + h: 8 w: 12 monitor_interface_drops_graph: gridPos: x: 12 - y: 69 + y: 77 h: 8 w: 12 row_disk_usage: gridPos: x: 0 - y: 77 + y: 85 h: 1 w: 24 disk_usage_root_graph: gridPos: x: 0 - y: 78 + y: 86 h: 8 w: 12 disk_usage_nsm_graph: gridPos: x: 12 - y: 78 + y: 86 h: 8 w: 12 row_disk_iops: gridPos: x: 0 - y: 86 + y: 94 h: 1 w: 24 disk_io_requests_graph: gridPos: x: 0 - y: 87 + y: 95 h: 8 w: 8 disk_io_bytes_graph: gridPos: x: 8 - y: 87 + y: 95 h: 8 w: 8 disk_io_time_graph: gridPos: x: 16 - y: 87 + y: 95 h: 8 w: 8 row_docker_details: gridPos: x: 0 - y: 95 + y: 103 h: 1 w: 24 cpu_docker_combined_current_graph: gridPos: x: 0 - y: 96 + y: 104 h: 8 w: 24 cpu_docker_combined_trend_graph: gridPos: x: 0 - y: 104 + y: 112 h: 8 w: 24 memory_used_docker_combined_current_graph: gridPos: x: 0 - y: 112 + y: 120 h: 8 w: 24 memory_used_docker_combined_trend_graph: gridPos: x: 0 - y: 120 + y: 128 h: 8 w: 24 network_usage_docker_combined_current_graph: gridPos: x: 0 - y: 128 + y: 136 h: 8 w: 24 network_usage_docker_combined_trend_graph: gridPos: x: 0 - y: 136 + y: 144 h: 8 w: 24 uptime_docker_combined_current_graph: gridPos: x: 0 - y: 144 + y: 152 h: 8 w: 12 uptime_docker_combined_trend_graph: gridPos: x: 12 - y: 144 + y: 152 h: 8 w: 12 row_zeek: gridPos: x: 0 - y: 152 + y: 160 h: 1 w: 24 zeek_packet_loss_graph: gridPos: x: 0 - y: 153 + y: 161 h: 8 w: 12 zeek_capture_loss_graph: gridPos: x: 12 - y: 153 + y: 161 h: 8 w: 12 row_suricata: gridPos: x: 0 - y: 161 + y: 169 h: 1 w: 24 suricata_packet_loss_graph: gridPos: x: 0 - y: 162 + y: 170 h: 8 w: 24 row_stenographer: gridPos: x: 0 - y: 170 + y: 178 h: 1 w: 24 stenographer_packet_loss_graph: gridPos: x: 0 - y: 171 + y: 179 h: 8 w: 16 stenographer_pcap_retention_graph: gridPos: x: 16 - y: 171 + y: 179 h: 8 w: 8 diff --git a/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja new file mode 100644 index 000000000..d3fb119fb --- /dev/null +++ b/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja @@ -0,0 +1,178 @@ +{ + "id": 224244, + "gridPos": { + "x": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.x }}, + "y": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.y }}, + "w": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.w }}, + "h": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Monitor Traffic - Combined", + "transformations": [ + { + "id": "calculateField", + "options": { + "alias": "Monitor Traffic", + "mode": "reduceRow", + "reduce": { + "reducer": "sum" + }, + "replaceFields": true + } + } + ], + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "links": [], + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "auto", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "rgba(245, 54, 54, 0.9)", + "value": null + }, + { + "color": "rgba(50, 172, 45, 0.97)", + "value": 1 + } + ] + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "text": "N/A" + } + }, + "type": "special" + } + ], + "decimals": 1, + "unit": "bps" + }, + "overrides": [] + }, + "interval": "30s", + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "none" + ], + "type": "fill" + } + ], + "measurement": "net", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"bytes_recv\"), 1s) *8 FROM \"net\" WHERE (\"host\" =~ /^$servername$/ AND \"interface\" = '$monint') AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "bytes_recv" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "1s" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + "*8" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "interface", + "operator": "=~", + "value": "/^$monint$/" + } + ] + } + ], + "cacheTimeout": null, + "description": "", + "maxDataPoints": null +} From 5d414c8bdd298544c3100848cadac3af3e3912ea Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 08:36:13 -0400 Subject: [PATCH 11/47] remove logstash row from manager --- salt/grafana/defaults.yaml | 31 ++++++------------- ..._traffic_inbound_combined_graph.json.jinja | 2 +- .../monitor_interface_traffic_stat.json.jinja | 2 +- 3 files changed, 11 insertions(+), 24 deletions(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 2e1311361..fb5b7b4b6 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -908,73 +908,60 @@ grafana: h: 8 w: 12 - row_logstash: + row_elasticsearch: gridPos: x: 0 y: 152 h: 1 w: 24 - logstash_estimated_eps_graph: - gridPos: - x: 0 - y: 153 - h: 8 - w: 24 - - row_elasticsearch: - gridPos: - x: 0 - y: 161 - h: 1 - w: 24 elasticsearch_document_count_graph: gridPos: x: 0 - y: 162 + y: 153 h: 8 w: 12 elasticsearch_thread_count_graph: gridPos: x: 12 - y: 162 + y: 153 h: 8 w: 12 elasticsearch_store_size_graph: gridPos: x: 0 - y: 170 + y: 161 h: 8 w: 12 elasticsearch_field_data_cache_size_graph: gridPos: x: 12 - y: 170 + y: 161 h: 8 w: 12 row_redis: gridPos: x: 0 - y: 178 + y: 169 h: 1 w: 24 redis_queue_graph: gridPos: x: 0 - y: 179 + y: 170 h: 8 w: 24 row_influxdb: gridPos: x: 0 - y: 214 + y: 178 h: 1 w: 24 influxdb_db_size_graph: gridPos: x: 0 - y: 214 + y: 179 h: 8 w: 24 diff --git a/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja index d3fb119fb..3d21fad48 100644 --- a/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja @@ -7,7 +7,7 @@ "h": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.h }} }, "type": "timeseries", - "title": "Monitor Traffic - Combined", + "title": "Monitor Traffic - Selected Combined", "transformations": [ { "id": "calculateField", diff --git a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja index 9061c323e..f30a8daf4 100644 --- a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja @@ -7,7 +7,7 @@ "h": {{ PANELS.monitor_interface_traffic_stat.gridPos.h }} }, "type": "stat", - "title": "Monitor Traffic", + "title": "Monitor Traffic - Combined", "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s", From 3517ea3f2a72235a0fa4540c6216e78d66560307 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 08:41:57 -0400 Subject: [PATCH 12/47] select last value for cpucount var --- salt/grafana/templates/cpucount.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/grafana/templates/cpucount.json b/salt/grafana/templates/cpucount.json index c3917ebd7..c41889565 100644 --- a/salt/grafana/templates/cpucount.json +++ b/salt/grafana/templates/cpucount.json @@ -2,7 +2,7 @@ "allValue": null, "current": {}, "datasource": "InfluxDB", - "definition": "SELECT \"n_cpus\" FROM \"system\" WHERE \"host\" =~ /^$servername$/", + "definition": "SELECT last(\"n_cpus\") FROM \"system\" WHERE \"host\" =~ /^$servername$/", "description": null, "error": null, "hide": 2, @@ -11,7 +11,7 @@ "multi": false, "name": "cpucount", "options": [], - "query": "SELECT \"n_cpus\" FROM \"system\" WHERE \"host\" =~ /^$servername$/", + "query": "SELECT last(\"n_cpus\") FROM \"system\" WHERE \"host\" =~ /^$servername$/", "refresh": 1, "regex": "", "skipUrlSync": false, From b109d95d6f86a13dd1188db092e829114e0f2eb9 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 09:02:48 -0400 Subject: [PATCH 13/47] add max to zeek capture loss legend --- salt/grafana/panels/zeek_capture_loss_graph.json.jinja | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/grafana/panels/zeek_capture_loss_graph.json.jinja b/salt/grafana/panels/zeek_capture_loss_graph.json.jinja index f432142c8..53adcd7fa 100644 --- a/salt/grafana/panels/zeek_capture_loss_graph.json.jinja +++ b/salt/grafana/panels/zeek_capture_loss_graph.json.jinja @@ -96,6 +96,7 @@ "displayMode": "table", "placement": "right", "calcs": [ + "max", "mean", "lastNotNull" ] From 561f86eac8ac9b025310e208013a75faf2084717 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 11:06:29 -0400 Subject: [PATCH 14/47] change eps graphs to use logstash data and not consumptioneps script --- ...logstash_estimated_eps_in_graph.json.jinja | 230 ++++++++++++++++++ .../logstash_estimated_eps_in_stat.json.jinja | 136 +++++++++++ ...timated_eps_in_total_graph.json copy.jinja | 156 ++++++++++++ ...ogstash_estimated_eps_out_graph.json.jinja | 230 ++++++++++++++++++ ...ash_estimated_eps_out_stat.json copy.jinja | 136 +++++++++++ ...h_estimated_eps_out_total_graph.json.jinja | 156 ++++++++++++ 6 files changed, 1044 insertions(+) create mode 100644 salt/grafana/panels/logstash_estimated_eps_in_graph.json.jinja create mode 100644 salt/grafana/panels/logstash_estimated_eps_in_stat.json.jinja create mode 100644 salt/grafana/panels/logstash_estimated_eps_in_total_graph.json copy.jinja create mode 100644 salt/grafana/panels/logstash_estimated_eps_out_graph.json.jinja create mode 100644 salt/grafana/panels/logstash_estimated_eps_out_stat.json copy.jinja create mode 100644 salt/grafana/panels/logstash_estimated_eps_out_total_graph.json.jinja diff --git a/salt/grafana/panels/logstash_estimated_eps_in_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_graph.json.jinja new file mode 100644 index 000000000..c1c9ed39a --- /dev/null +++ b/salt/grafana/panels/logstash_estimated_eps_in_graph.json.jinja @@ -0,0 +1,230 @@ +{ + "id": 76, + "gridPos": { + "x": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.x }}, + "y": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.y }}, + "w": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.w }}, + "h": {{ PANELS.logstash_estimated_eps_in_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Estimated EPS In", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "EPS", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "refId": "A", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "measurement": "logstash_events", + "alias": "$tag_host: $col", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) as \"current_in\" FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": true + }, + { + "refId": "B", + "hide": false, + "policy": "so_long_term", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "mean_in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "measurement": "logstash_events", + "alias": "$tag_host: $col", + "query": "SELECT non_negative_derivative(mean(\"mean_in\"), 1s) as \"trend_in\" FROM \"so_long_term\".\"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": true + } + ], + "maxDataPoints": null, + "description": "", + "timeFrom": null, + "timeShift": null, + "transformations": [] +} diff --git a/salt/grafana/panels/logstash_estimated_eps_in_stat.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_stat.json.jinja new file mode 100644 index 000000000..f492dd4b9 --- /dev/null +++ b/salt/grafana/panels/logstash_estimated_eps_in_stat.json.jinja @@ -0,0 +1,136 @@ +{ + "id": 23, + "gridPos": { + "x": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.x }}, + "y": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.y }}, + "w": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.w }}, + "h": {{ PANELS.logstash_estimated_eps_in_stat.gridPos.h }} + }, + "type": "stat", + "title": "Estimated EPS In - Selected Total", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "dark-red", + "value": null + }, + { + "color": "dark-green", + "value": 1 + } + ] + }, + "mappings": [ + { + "type": "special", + "options": { + "match": "null", + "result": { + "text": "N/A" + } + } + } + ], + "color": { + "mode": "thresholds" + }, + "decimals": 0, + "unit": "short" + }, + "overrides": [] + }, + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "value", + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto" + }, + "targets": [ + { + "refId": "A", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "measurement": "logstash_events" + } + ], + "transformations": [ + { + "id": "calculateField", + "options": { + "mode": "reduceRow", + "reduce": { + "reducer": "sum" + }, + "replaceFields": true + } + } + ], + "maxDataPoints": null, + "cacheTimeout": null, + "timeFrom": null +} diff --git a/salt/grafana/panels/logstash_estimated_eps_in_total_graph.json copy.jinja b/salt/grafana/panels/logstash_estimated_eps_in_total_graph.json copy.jinja new file mode 100644 index 000000000..42399b5ca --- /dev/null +++ b/salt/grafana/panels/logstash_estimated_eps_in_total_graph.json copy.jinja @@ -0,0 +1,156 @@ +{ + "id": 69001, + "gridPos": { + "x": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.x }}, + "y": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.y }}, + "w": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.w }}, + "h": {{ PANELS.logstash_estimated_eps_in_total_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Estimated EPS In - Selected Total", + "transformations": [ + { + "id": "calculateField", + "options": { + "mode": "reduceRow", + "reduce": { + "reducer": "sum" + }, + "replaceFields": true, + "alias": "Total EPS" + } + } + ], + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "EPS", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "refId": "A", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "measurement": "logstash_events", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": false + } + ], + "maxDataPoints": null, + "description": "", + "timeFrom": null, + "timeShift": null +} diff --git a/salt/grafana/panels/logstash_estimated_eps_out_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_out_graph.json.jinja new file mode 100644 index 000000000..16878ee6e --- /dev/null +++ b/salt/grafana/panels/logstash_estimated_eps_out_graph.json.jinja @@ -0,0 +1,230 @@ +{ + "id": 69000, + "gridPos": { + "x": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.x }}, + "y": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.y }}, + "w": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.w }}, + "h": {{ PANELS.logstash_estimated_eps_out_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Estimated EPS Out", + "transformations": [], + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "EPS", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "decimals": 1 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "refId": "A", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "measurement": "logstash_events", + "alias": "$tag_host: $col", + "query": "SELECT non_negative_derivative(mean(\"out\"), 1s) as \"current_out\" FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": true + }, + { + "refId": "B", + "hide": false, + "policy": "so_long_term", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "mean_in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "measurement": "logstash_events", + "alias": "$tag_host: $col", + "query": "SELECT non_negative_derivative(mean(\"mean_out\"), 1s) as \"trend_out\" FROM \"so_long_term\".\"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": true + } + ], + "maxDataPoints": null, + "description": "", + "timeFrom": null, + "timeShift": null +} diff --git a/salt/grafana/panels/logstash_estimated_eps_out_stat.json copy.jinja b/salt/grafana/panels/logstash_estimated_eps_out_stat.json copy.jinja new file mode 100644 index 000000000..dc87661f5 --- /dev/null +++ b/salt/grafana/panels/logstash_estimated_eps_out_stat.json copy.jinja @@ -0,0 +1,136 @@ +{ + "id": 22323, + "gridPos": { + "x": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.x }}, + "y": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.y }}, + "w": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.w }}, + "h": {{ PANELS.logstash_estimated_eps_out_stat.gridPos.h }} + }, + "type": "stat", + "title": "Estimated EPS Out - Selected Total", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "links": [], + "fieldConfig": { + "defaults": { + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "dark-red", + "value": null + }, + { + "color": "dark-green", + "value": 1 + } + ] + }, + "mappings": [ + { + "type": "special", + "options": { + "match": "null", + "result": { + "text": "N/A" + } + } + } + ], + "color": { + "mode": "thresholds" + }, + "decimals": 0, + "unit": "short" + }, + "overrides": [] + }, + "options": { + "reduceOptions": { + "values": false, + "calcs": [ + "lastNotNull" + ], + "fields": "" + }, + "orientation": "horizontal", + "text": {}, + "textMode": "value", + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto" + }, + "targets": [ + { + "refId": "A", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "out" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "measurement": "logstash_events" + } + ], + "transformations": [ + { + "id": "calculateField", + "options": { + "mode": "reduceRow", + "reduce": { + "reducer": "sum" + }, + "replaceFields": true + } + } + ], + "maxDataPoints": null, + "cacheTimeout": null, + "timeFrom": null +} diff --git a/salt/grafana/panels/logstash_estimated_eps_out_total_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_out_total_graph.json.jinja new file mode 100644 index 000000000..3d1600c39 --- /dev/null +++ b/salt/grafana/panels/logstash_estimated_eps_out_total_graph.json.jinja @@ -0,0 +1,156 @@ +{ + "id": 69002, + "gridPos": { + "x": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.x }}, + "y": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.y }}, + "w": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.w }}, + "h": {{ PANELS.logstash_estimated_eps_out_total_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Estimated EPS Out - Selected Total", + "transformations": [ + { + "id": "calculateField", + "options": { + "mode": "reduceRow", + "reduce": { + "reducer": "sum" + }, + "replaceFields": true, + "alias": "Total EPS" + } + } + ], + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "EPS", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "refId": "A", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "out" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "measurement": "logstash_events", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"host\" =~ /^$servername$/) AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": false + } + ], + "maxDataPoints": null, + "description": "", + "timeFrom": null, + "timeShift": null +} From 7abb2e5935781d0da15a13bdfb3cdf15e1ae17a9 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 11:07:29 -0400 Subject: [PATCH 15/47] monitor interface graph total --- salt/grafana/defaults.yaml | 42 +++- .../logstash_estimated_eps_graph.json.jinja | 192 ------------------ .../logstash_estimated_eps_stat.json.jinja | 112 ---------- ...ce_traffic_inbound_total_graph.json.jinja} | 12 +- .../monitor_interface_traffic_stat.json.jinja | 2 +- 5 files changed, 40 insertions(+), 320 deletions(-) delete mode 100644 salt/grafana/panels/logstash_estimated_eps_graph.json.jinja delete mode 100644 salt/grafana/panels/logstash_estimated_eps_stat.json.jinja rename salt/grafana/panels/{monitor_interface_traffic_inbound_combined_graph.json.jinja => monitor_interface_traffic_inbound_total_graph.json.jinja} (89%) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index fb5b7b4b6..9e0147d2b 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -294,7 +294,7 @@ grafana: y: 1 h: 4 w: 4 - logstash_estimated_eps_stat: + logstash_estimated_eps_in_stat: gridPos: x: 0 y: 5 @@ -536,7 +536,7 @@ grafana: y: 152 h: 1 w: 24 - logstash_estimated_eps_graph: + logstash_estimated_eps_in_graph: gridPos: x: 0 y: 153 @@ -1034,7 +1034,7 @@ grafana: y: 1 h: 4 w: 4 - logstash_estimated_eps_stat: + logstash_estimated_eps_in_stat: gridPos: x: 0 y: 5 @@ -1234,7 +1234,7 @@ grafana: y: 152 h: 1 w: 24 - logstash_estimated_eps_graph: + logstash_estimated_eps_in_graph: gridPos: x: 0 y: 153 @@ -1485,7 +1485,7 @@ grafana: y: 61 h: 8 w: 24 - monitor_interface_traffic_inbound_combined_graph: + monitor_interface_traffic_inbound_total_graph: gridPos: x: 0 y: 69 @@ -1723,12 +1723,18 @@ grafana: y: 1 h: 4 w: 4 - logstash_estimated_eps_stat: + logstash_estimated_eps_in_stat: gridPos: x: 0 y: 5 h: 4 w: 4 + logstash_estimated_eps_out_stat: + gridPos: + x: 4 + y: 5 + h: 4 + w: 4 row_cpu: gridPos: @@ -1917,12 +1923,30 @@ grafana: y: 152 h: 1 w: 24 - logstash_estimated_eps_graph: + logstash_estimated_eps_in_graph: gridPos: x: 0 y: 153 h: 8 w: 24 + logstash_estimated_eps_in_total_graph: + gridPos: + x: 0 + y: 161 + h: 8 + w: 24 + logstash_estimated_eps_out_graph: + gridPos: + x: 0 + y: 169 + h: 8 + w: 24 + logstash_estimated_eps_out_total_graph: + gridPos: + x: 0 + y: 172 + h: 8 + w: 24 heavynode: @@ -1999,7 +2023,7 @@ grafana: y: 1 h: 4 w: 4 - logstash_estimated_eps_stat: + logstash_estimated_eps_in_stat: gridPos: x: 0 y: 5 @@ -2235,7 +2259,7 @@ grafana: y: 152 h: 1 w: 24 - logstash_estimated_eps_graph: + logstash_estimated_eps_in_graph: gridPos: x: 0 y: 153 diff --git a/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja deleted file mode 100644 index c40f6c927..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja +++ /dev/null @@ -1,192 +0,0 @@ -{ - "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "description": "", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_graph.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_graph.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_graph.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_graph.gridPos.h }} - }, - "hiddenSeries": false, - "id": 76, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", - "options": { - "alertThreshold": false - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "EPS Current", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "consumptioneps", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "eps" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - }, - { - "alias": "EPS Trend", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "consumptioneps", - "orderByTime": "ASC", - "policy": "so_long_term", - "queryType": "randomWalk", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_eps" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Estimated EPS", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": "EPS", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } -} diff --git a/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja b/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja deleted file mode 100644 index c983521a4..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja +++ /dev/null @@ -1,112 +0,0 @@ -{ - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "dark-red", - "value": null - }, - { - "value": 1, - "color": "dark-green" - } - ] - }, - "mappings": [ - { - "op": "=", - "text": "N/A", - "value": "null", - "$$hashKey": "object:730", - "id": 0, - "type": 1 - } - ], - "unit": "short", - "decimals": 0, - "color": { - "mode": "thresholds" - } - }, - "overrides": [] - }, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_stat.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_stat.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_stat.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_stat.gridPos.h }} - }, - "id": 23, - "interval": "30s", - "links": [], - "maxDataPoints": 750, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "consumptioneps", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "eps" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "title": "Estimated EPS", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "value", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "cacheTimeout": null, - "pluginVersion": "7.5.4", - "timeFrom": null -} diff --git a/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja similarity index 89% rename from salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja rename to salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja index 3d21fad48..67e92668d 100644 --- a/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja @@ -1,18 +1,18 @@ { "id": 224244, "gridPos": { - "x": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.x }}, - "y": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.y }}, - "w": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.w }}, - "h": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.h }} + "x": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.x }}, + "y": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.y }}, + "w": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.w }}, + "h": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.h }} }, "type": "timeseries", - "title": "Monitor Traffic - Selected Combined", + "title": "Monitor Traffic - Selected Total", "transformations": [ { "id": "calculateField", "options": { - "alias": "Monitor Traffic", + "alias": "Total Monitor Traffic", "mode": "reduceRow", "reduce": { "reducer": "sum" diff --git a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja index f30a8daf4..283d93f7a 100644 --- a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja @@ -7,7 +7,7 @@ "h": {{ PANELS.monitor_interface_traffic_stat.gridPos.h }} }, "type": "stat", - "title": "Monitor Traffic - Combined", + "title": "Monitor Traffic - Selected Total", "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s", From f65eea6a03c2b8be6b677395a39b84df5b63ee8a Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 12:09:32 -0400 Subject: [PATCH 16/47] rename file --- ...json copy.jinja => logstash_estimated_eps_out_stat.json.jinja} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename salt/grafana/panels/{logstash_estimated_eps_out_stat.json copy.jinja => logstash_estimated_eps_out_stat.json.jinja} (100%) diff --git a/salt/grafana/panels/logstash_estimated_eps_out_stat.json copy.jinja b/salt/grafana/panels/logstash_estimated_eps_out_stat.json.jinja similarity index 100% rename from salt/grafana/panels/logstash_estimated_eps_out_stat.json copy.jinja rename to salt/grafana/panels/logstash_estimated_eps_out_stat.json.jinja From 2232759fa41f2392a93f37406e91181122437794 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 12:21:54 -0400 Subject: [PATCH 17/47] rename file --- ...opy.jinja => logstash_estimated_eps_in_total_graph.json.jinja} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename salt/grafana/panels/{logstash_estimated_eps_in_total_graph.json copy.jinja => logstash_estimated_eps_in_total_graph.json.jinja} (100%) diff --git a/salt/grafana/panels/logstash_estimated_eps_in_total_graph.json copy.jinja b/salt/grafana/panels/logstash_estimated_eps_in_total_graph.json.jinja similarity index 100% rename from salt/grafana/panels/logstash_estimated_eps_in_total_graph.json copy.jinja rename to salt/grafana/panels/logstash_estimated_eps_in_total_graph.json.jinja From 54b034b53778289b311b74d247dfbafb746fcd3a Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 13:43:59 -0400 Subject: [PATCH 18/47] fix spacing on es input --- salt/telegraf/etc/telegraf.conf | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf index fa7dabe09..318be2e0e 100644 --- a/salt/telegraf/etc/telegraf.conf +++ b/salt/telegraf/etc/telegraf.conf @@ -625,23 +625,23 @@ # # Read stats from one or more Elasticsearch servers or clusters {%- if grains['role'] in ['so-manager', 'so-eval', 'so-managersearch', 'so-standalone'] %} - [[inputs.elasticsearch]] - servers = ["https://{{ MANAGER }}:9200"] - cluster_stats = true +[[inputs.elasticsearch]] + servers = ["https://{{ MANAGER }}:9200"] + cluster_stats = true {%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %} - username = "{{ ES_USER }}" - password = "{{ ES_PASS }}" + username = "{{ ES_USER }}" + password = "{{ ES_PASS }}" {%- endif %} - insecure_skip_verify = true + insecure_skip_verify = true {%- elif grains['role'] in ['so-node', 'so-hotnode', 'so-warmnode', 'so-heavynode'] %} - [[inputs.elasticsearch]] - servers = ["https://{{ NODEIP }}:9200"] - cluster_stats = true +[[inputs.elasticsearch]] + servers = ["https://{{ NODEIP }}:9200"] + cluster_stats = true {%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %} - username = "{{ ES_USER }}" - password = "{{ ES_PASS }}" + username = "{{ ES_USER }}" + password = "{{ ES_PASS }}" {%- endif %} - insecure_skip_verify = true + insecure_skip_verify = true {%- endif %} # From 677f62ebd163914ba96d8b86353d4afb46c9e501 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 18:22:37 -0400 Subject: [PATCH 19/47] dont show changes for telegraf conf --- salt/telegraf/init.sls | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/telegraf/init.sls b/salt/telegraf/init.sls index 2c188367b..600d7ddf7 100644 --- a/salt/telegraf/init.sls +++ b/salt/telegraf/init.sls @@ -44,6 +44,7 @@ tgrafconf: - mode: 660 - template: jinja - source: salt://telegraf/etc/telegraf.conf + - show_changes: False #this file will be read by telegraf to send node details(management interface, monitor interface, etc) # into influx so that grafan can build dashboards using queries From 8e3b08a8315b593e616e6650eb4aab7f5d57042d Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 3 Nov 2021 08:33:20 -0400 Subject: [PATCH 20/47] start of pipeline dashboard --- salt/grafana/defaults.yaml | 37 + salt/grafana/init.sls | 1 + ...csearch_index_performance_graph.json.jinja | 805 ++++++++++++++++++ ...imated_eps_in_out_manager_graph.json.jinja | 182 ++++ ...d_eps_in_searchnode_total_graph.json.jinja | 156 ++++ salt/telegraf/etc/telegraf.conf | 13 +- 6 files changed, 1191 insertions(+), 3 deletions(-) create mode 100644 salt/grafana/panels/elasticsearch_index_performance_graph.json.jinja create mode 100644 salt/grafana/panels/logstash_estimated_eps_in_out_manager_graph.json.jinja create mode 100644 salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 9e0147d2b..a1d2ba875 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2729,3 +2729,40 @@ grafana: y: 214 h: 8 w: 24 + + + pipeline_overview: + title: 'Pipeline Overview' + templating: + list: + servername: + text: All + value: "$__all" + role: + allValue: true + multi: true + hide: 0 + text: All + value: "$__all" + panels: + logstash_estimated_eps_in_total_graph: + gridPos: + x: 0 + y: 0 + h: 8 + w: 12 + logstash_estimated_eps_in_out_manager_total_graph: + gridPos: + x: 12 + y: 0 + h: 8 + w: 12 + + + + elasticsearch_index_performance_graph: + gridPos: + x: 12 + y: 0 + h: 8 + w: 12 diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls index 9113cdbe1..4a5a1dfe2 100644 --- a/salt/grafana/init.sls +++ b/salt/grafana/init.sls @@ -17,6 +17,7 @@ {% if grains.role == 'so-eval' %} {% do DASHBOARDS.append('eval') %} {% else %} + {% do DASHBOARDS.append('pipeline_overview') %} {# Grab a unique listing of nodetypes that exists so that we create only the needed dashboards #} {% for dashboard in salt['cmd.shell']("ls /opt/so/saltstack/local/pillar/minions/|awk -F'_' {'print $2'}|awk -F'.' {'print $1'}").split() %} {% if dashboard in ALLOWED_DASHBOARDS %} diff --git a/salt/grafana/panels/elasticsearch_index_performance_graph.json.jinja b/salt/grafana/panels/elasticsearch_index_performance_graph.json.jinja new file mode 100644 index 000000000..202829f67 --- /dev/null +++ b/salt/grafana/panels/elasticsearch_index_performance_graph.json.jinja @@ -0,0 +1,805 @@ +{ + "aliasColors": {}, + "dashLength": 10, + "datasource": "InfluxDB", + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "fill": 1, + "gridPos": { + "x": {{ PANELS.elasticsearch_index_performance_graph.gridPos.x }}, + "y": {{ PANELS.elasticsearch_index_performance_graph.gridPos.y }}, + "w": {{ PANELS.elasticsearch_index_performance_graph.gridPos.w }}, + "h": {{ PANELS.elasticsearch_index_performance_graph.gridPos.h }} + }, + "id": 445548, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "pluginVersion": "7.5.4", + "pointradius": 2, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "targets": [ + { + "alias": "community.id_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "ingest_processor_stats_community_id_time_in_millis" + ] + }, + { + "type": "last", + "params": [] + }, + { + "type": "non_negative_difference", + "params": [] + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "conditionals_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_conditional_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "convert_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_convert_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "data.index.name_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "F", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_date_index_name_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "data_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "G", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_date_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "dissect_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "H", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "ingest_processor_stats_dissect_time_in_millis" + ] + }, + { + "type": "last", + "params": [] + }, + { + "type": "non_negative_difference", + "params": [] + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "dot.expander_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "I", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_dot_expander_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "geoip_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "K", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_geoip_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "grok_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "L", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_grok_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "json_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "O", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_json_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "kv_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "P", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_kv_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "lowercase_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "Q", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_lowercase_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "remove_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "R", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_remove_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "rename_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "S", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "ingest_processor_stats_rename_time_in_millis" + ] + }, + { + "type": "last", + "params": [] + }, + { + "type": "non_negative_difference", + "params": [] + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "script_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "T", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_script_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "url_decodes", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "U", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_user_agent_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + } + ], + "thresholds": [], + "timeRegions": [], + "title": "Elastic Ingest Performance", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:1668", + "format": "dtdurationms", + "label": "", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:1669", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + }, + "bars": false, + "dashes": false, + "description": "", + "fillGradient": 0, + "hiddenSeries": false, + "percentage": false, + "points": false, + "stack": false, + "steppedLine": false, + "timeFrom": null, + "timeShift": null, + "interval": "30s" +} diff --git a/salt/grafana/panels/logstash_estimated_eps_in_out_manager_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_out_manager_graph.json.jinja new file mode 100644 index 000000000..e79312625 --- /dev/null +++ b/salt/grafana/panels/logstash_estimated_eps_in_out_manager_graph.json.jinja @@ -0,0 +1,182 @@ +{ + "aliasColors": {}, + "dashLength": 10, + "datasource": "InfluxDB", + "description": "Events from the grid to redis", + "fieldConfig": { + "defaults": { + "unit": "short" + }, + "overrides": [] + }, + "fill": 1, + "gridPos": { + "x": {{ PANELS.logstash_estimated_eps_in_out_manager_total_graph.gridPos.x }}, + "y": {{ PANELS.logstash_estimated_eps_in_out_manager_total_graph.gridPos.y }}, + "w": {{ PANELS.logstash_estimated_eps_in_out_manager_total_graph.gridPos.w }}, + "h": {{ PANELS.logstash_estimated_eps_in_out_manager_total_graph.gridPos.h }} + }, + "id": 77741, + "legend": { + "avg": false, + "current": false, + "max": false, + "min": false, + "show": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "pluginVersion": "7.5.4", + "pointradius": 2, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "targets": [ + { + "alias": "Logstash Events In", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "so_short_term", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + }, + { + "alias": "Logstash Events Out", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "so_short_term", + "queryType": "randomWalk", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "out" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=", + "value": "manager" + } + ] + } + ], + "thresholds": [], + "timeRegions": [], + "title": "Manager Logstash Events", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "$$hashKey": "object:1159", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "$$hashKey": "object:1160", + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + }, + "timeFrom": null, + "timeShift": null, + "interval": "30s", + "bars": false, + "dashes": false, + "fillGradient": 0, + "hiddenSeries": false, + "percentage": false, + "points": false, + "stack": false, + "steppedLine": false +} diff --git a/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja new file mode 100644 index 000000000..2c51dab53 --- /dev/null +++ b/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja @@ -0,0 +1,156 @@ +{ + "id": 69001, + "gridPos": { + "x": {{ PANELS.logstash_estimated_eps_in_searchnode_total_graph.gridPos.x }}, + "y": {{ PANELS.logstash_estimated_eps_in_searchnode_total_graph.gridPos.y }}, + "w": {{ PANELS.logstash_estimated_eps_in_searchnode_total_graph.gridPos.w }}, + "h": {{ PANELS.logstash_estimated_eps_in_searchnode_total_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Estimated EPS In", + "transformations": [ + { + "id": "calculateField", + "options": { + "mode": "reduceRow", + "reduce": { + "reducer": "sum" + }, + "replaceFields": true, + "alias": "Total EPS" + } + } + ], + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "EPS", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "short", + "decimals": 1 + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean", + "lastNotNull" + ] + } + }, + "targets": [ + { + "refId": "A", + "hide": false, + "policy": "default", + "resultFormat": "time_series", + "orderByTime": "ASC", + "tags": [ + { + "key": "host", + "value": "/^$servername$/", + "operator": "=~" + } + ], + "groupBy": [ + { + "type": "time", + "params": [ + "$__interval" + ] + }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "fill", + "params": [ + "null" + ] + } + ], + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "measurement": "logstash_events", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": false + } + ], + "maxDataPoints": null, + "description": "", + "timeFrom": null, + "timeShift": null +} diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf index 318be2e0e..878d79caa 100644 --- a/salt/telegraf/etc/telegraf.conf +++ b/salt/telegraf/etc/telegraf.conf @@ -644,7 +644,6 @@ insecure_skip_verify = true {%- endif %} -# # ## Timeout for HTTP requests to the elastic search server(s) # http_timeout = "5s" # @@ -688,10 +687,18 @@ {% endif %} {%- endif %} -{% if grains.role in ['so-eval','so-standalone','so-manager', 'so-managersearch', 'so-heavynode'] -%} +{# if grains.role in ['so-eval','so-standalone','so-manager', 'so-managersearch', 'so-heavynode'] -%} [[inputs.redis]] servers = ["tcp://localhost:6379"] -{%- endif %} +{%- endif #} + +{% if grains.role == 'so-node' %} +[[inputs.beat]] + url = "http://127.0.0.1:5066" + include = ["libbeat"] + username = "{{ salt['pillar.get']('elasticsearch:auth:users:so_beats_user:user') }}" + password = "{{ salt['pillar.get']('elasticsearch:auth:users:so_beats_user:pass') }}" +{% endif %} # # Read metrics from one or more commands that can output to stdout [[inputs.exec]] From db80315c069a99044d42b2b234ad45dd0940940d Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 3 Nov 2021 08:37:33 -0400 Subject: [PATCH 21/47] rename panel --- ... logstash_estimated_eps_in_out_manager_total_graph.json.jinja} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename salt/grafana/panels/{logstash_estimated_eps_in_out_manager_graph.json.jinja => logstash_estimated_eps_in_out_manager_total_graph.json.jinja} (100%) diff --git a/salt/grafana/panels/logstash_estimated_eps_in_out_manager_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_out_manager_total_graph.json.jinja similarity index 100% rename from salt/grafana/panels/logstash_estimated_eps_in_out_manager_graph.json.jinja rename to salt/grafana/panels/logstash_estimated_eps_in_out_manager_total_graph.json.jinja From c8ee67f354cd596325b5c85743541e9a64a8d4f1 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 3 Nov 2021 09:12:32 -0400 Subject: [PATCH 22/47] update panel for pipeline_overview --- salt/grafana/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index a1d2ba875..f91a424ca 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2745,7 +2745,7 @@ grafana: text: All value: "$__all" panels: - logstash_estimated_eps_in_total_graph: + logstash_estimated_eps_in_searchnode_total_graph: gridPos: x: 0 y: 0 From 32f986c50541a61e73c4a114ac7a0f4a6dc52511 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 3 Nov 2021 09:23:21 -0400 Subject: [PATCH 23/47] change panel --- ...stash_estimated_eps_in_searchnode_total_graph.json.jinja | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja index 2c51dab53..c57461e2c 100644 --- a/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja +++ b/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja @@ -7,7 +7,7 @@ "h": {{ PANELS.logstash_estimated_eps_in_searchnode_total_graph.gridPos.h }} }, "type": "timeseries", - "title": "Estimated EPS In", + "title": "Indexing Events Per Second", "transformations": [ { "id": "calculateField", @@ -100,8 +100,8 @@ "tags": [ { "key": "host", - "value": "/^$servername$/", - "operator": "=~" + "value": "searchnode", + "operator": "=" } ], "groupBy": [ From 2cb31a4c0507560799a50498a2c77da36ac5e3d4 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 3 Nov 2021 09:27:02 -0400 Subject: [PATCH 24/47] fix query --- .../logstash_estimated_eps_in_searchnode_total_graph.json.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja index c57461e2c..41def86be 100644 --- a/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja +++ b/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja @@ -99,7 +99,7 @@ "orderByTime": "ASC", "tags": [ { - "key": "host", + "key": "role", "value": "searchnode", "operator": "=" } From fab0dd2badbd6bbc5f80aabc4b78b85642d336b2 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 3 Nov 2021 13:25:42 -0400 Subject: [PATCH 25/47] add repeating es ingest panel for nontc --- salt/grafana/defaults.yaml | 16 +- ..._ingest_performance_nontc_graph.json.jinja | 807 ++++++++++++++++++ ...ch_ingest_performance_tc_graph.json.jinja} | 8 +- salt/grafana/templates/searchnode.json | 29 + 4 files changed, 845 insertions(+), 15 deletions(-) create mode 100644 salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja rename salt/grafana/panels/{elasticsearch_index_performance_graph.json.jinja => elasticsearch_ingest_performance_tc_graph.json.jinja} (98%) create mode 100644 salt/grafana/templates/searchnode.json diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index f91a424ca..f3c9a52c6 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2735,10 +2735,7 @@ grafana: title: 'Pipeline Overview' templating: list: - servername: - text: All - value: "$__all" - role: + searchnode: allValue: true multi: true hide: 0 @@ -2757,12 +2754,9 @@ grafana: y: 0 h: 8 w: 12 - - - - elasticsearch_index_performance_graph: + elasticsearch_ingest_performance_nontc_graph: gridPos: - x: 12 - y: 0 + x: 0 + y: 8 h: 8 - w: 12 + w: 24 diff --git a/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja new file mode 100644 index 000000000..a9ecb55b6 --- /dev/null +++ b/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja @@ -0,0 +1,807 @@ +{ + "id": 445549, + "gridPos": { + "x": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.x }}, + "y": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.y }}, + "w": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.w }}, + "h": {{ PANELS.elasticsearch_ingest_performance_nontc_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Elastic Ingest Performance - $searchnode", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "options": { + "tooltip": { + "mode": "multi" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean" + ] + } + }, + "targets": [ + { + "alias": "community.id_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_community_id_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "conditionals_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_conditional_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "convert_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_convert_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "data.index.name_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "F", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_date_index_name_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "data_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "G", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_date_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "dissect_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "H", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_dissect_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "dot.expander_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "I", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_dot_expander_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "geoip_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "K", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "ingest_processor_stats_geoip_time_in_millis" + ] + }, + { + "type": "last", + "params": [] + }, + { + "type": "non_negative_difference", + "params": [] + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "grok_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "L", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_grok_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "json_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "O", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_json_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "kv_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "P", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_kv_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "lowercase_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "Q", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_lowercase_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "remove_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "R", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_remove_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "rename_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "S", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_rename_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "script_time", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "T", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_script_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "url_decodes", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "queryType": "randomWalk", + "rawQuery": false, + "refId": "U", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "ingest_processor_stats_user_agent_time_in_millis" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [], + "type": "non_negative_difference" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + } + ], + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "value": null, + "color": "green" + }, + { + "value": 80, + "color": "red" + } + ] + }, + "mappings": [], + "unit": "ms", + "decimals": 0 + }, + "overrides": [] + }, + "repeat": "searchnodes", + "repeatDirection": "v", + "description": "", + "timeFrom": null, + "timeShift": null, + "scopedVars": { + "searchnodes": { + "text": "jppce2390sea5955-1", + "value": "jppce2390sea5955-1", + "selected": false + } + } +} diff --git a/salt/grafana/panels/elasticsearch_index_performance_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja similarity index 98% rename from salt/grafana/panels/elasticsearch_index_performance_graph.json.jinja rename to salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja index 202829f67..d94ff2759 100644 --- a/salt/grafana/panels/elasticsearch_index_performance_graph.json.jinja +++ b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja @@ -8,10 +8,10 @@ }, "fill": 1, "gridPos": { - "x": {{ PANELS.elasticsearch_index_performance_graph.gridPos.x }}, - "y": {{ PANELS.elasticsearch_index_performance_graph.gridPos.y }}, - "w": {{ PANELS.elasticsearch_index_performance_graph.gridPos.w }}, - "h": {{ PANELS.elasticsearch_index_performance_graph.gridPos.h }} + "x": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.x }}, + "y": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.y }}, + "w": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.w }}, + "h": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.h }} }, "id": 445548, "legend": { diff --git a/salt/grafana/templates/searchnode.json b/salt/grafana/templates/searchnode.json new file mode 100644 index 000000000..899454636 --- /dev/null +++ b/salt/grafana/templates/searchnode.json @@ -0,0 +1,29 @@ +{ + "allValue": null, + "current": { + "selected": true, + "tags": [], + "text": [{{ TEMPLATES.searchnode.get('text', DASHBOARD)| json }}], + "value": [{{ TEMPLATES.searchnode.get('value', DASHBOARD)| json }}] + }, + "datasource": "InfluxDB", + "definition": "show tag values with key=\"host\" WHERE (\"role\" = \"searchnode\")", + "description": null, + "error": null, + "hide": {{ TEMPLATES.searchnode.get('hide', 0)| json }}, + "includeAll": {{ TEMPLATES.searchnode.get('includeAll', true)| json }}, + "label": "Searchnode", + "multi": {{ TEMPLATES.searchnode.get('multi', true)| json }}, + "name": "searchnode", + "options": [], + "query": "show tag values with key=\"host\" WHERE (\"role\" = \"searchnode\")", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 1, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false +} From f1d66e2d51aaf4ccf8f1e32b6ce1b869420664b1 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 3 Nov 2021 13:40:09 -0400 Subject: [PATCH 26/47] change searchnode var --- salt/grafana/defaults.yaml | 2 +- salt/grafana/templates/searchnode.json | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index f3c9a52c6..ff8ff6660 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2736,7 +2736,7 @@ grafana: templating: list: searchnode: - allValue: true + includeAll: true multi: true hide: 0 text: All diff --git a/salt/grafana/templates/searchnode.json b/salt/grafana/templates/searchnode.json index 899454636..6a507bed4 100644 --- a/salt/grafana/templates/searchnode.json +++ b/salt/grafana/templates/searchnode.json @@ -7,7 +7,7 @@ "value": [{{ TEMPLATES.searchnode.get('value', DASHBOARD)| json }}] }, "datasource": "InfluxDB", - "definition": "show tag values with key=\"host\" WHERE (\"role\" = \"searchnode\")", + "definition": "show tag values with key=\"host\" WHERE (\"role\" = 'searchnode' )", "description": null, "error": null, "hide": {{ TEMPLATES.searchnode.get('hide', 0)| json }}, @@ -16,14 +16,10 @@ "multi": {{ TEMPLATES.searchnode.get('multi', true)| json }}, "name": "searchnode", "options": [], - "query": "show tag values with key=\"host\" WHERE (\"role\" = \"searchnode\")", + "query": "show tag values with key=\"host\" WHERE (\"role\" = 'searchnode' )", "refresh": 1, "regex": "", "skipUrlSync": false, - "sort": 1, - "tagValuesQuery": "", - "tags": [], - "tagsQuery": "", - "type": "query", - "useTags": false + "sort": 0, + "type": "query" } From 4fc58e7a5a2187db3830a957b23df4af1ab6ec09 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 3 Nov 2021 13:51:57 -0400 Subject: [PATCH 27/47] update panel --- ...asticsearch_ingest_performance_nontc_graph.json.jinja | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja index a9ecb55b6..fecd1723c 100644 --- a/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja +++ b/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja @@ -796,12 +796,5 @@ "repeatDirection": "v", "description": "", "timeFrom": null, - "timeShift": null, - "scopedVars": { - "searchnodes": { - "text": "jppce2390sea5955-1", - "value": "jppce2390sea5955-1", - "selected": false - } - } + "timeShift": null } From 05456b38d11494b992d93c2e0fd9b05fefcaf4b2 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 3 Nov 2021 13:54:05 -0400 Subject: [PATCH 28/47] update panel --- .../elasticsearch_ingest_performance_nontc_graph.json.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja index fecd1723c..ece9e38f6 100644 --- a/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja +++ b/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja @@ -792,7 +792,7 @@ }, "overrides": [] }, - "repeat": "searchnodes", + "repeat": "searchnode", "repeatDirection": "v", "description": "", "timeFrom": null, From edb3b602a99e58e02a8f2a0c3d639e273c10a802 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 4 Nov 2021 10:59:01 -0400 Subject: [PATCH 29/47] pipeline overview dashboard changs --- salt/grafana/defaults.yaml | 18 +- ..._ingest_performance_nontc_graph.json.jinja | 286 ++++++------ ...earch_pipeline_time_nontc_graph.json.jinja | 153 +++++++ ...gstash_eps_in_out_manager_graph.json.jinja | 400 +++++++++++++++++ ..._eps_in_out_manager_total_graph.json.jinja | 182 -------- ...ing_eps_in_out_searchnode_graph.json.jinja | 408 ++++++++++++++++++ ..._eps_in_searchnode_total_graph.json.jinja} | 94 ++-- salt/grafana/templates/searchnode.json | 4 +- 8 files changed, 1173 insertions(+), 372 deletions(-) create mode 100644 salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja create mode 100644 salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja delete mode 100644 salt/grafana/panels/logstash_estimated_eps_in_out_manager_total_graph.json.jinja create mode 100644 salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja rename salt/grafana/panels/{logstash_estimated_eps_in_searchnode_total_graph.json.jinja => logstash_indexing_eps_in_searchnode_total_graph.json.jinja} (67%) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index ff8ff6660..fb698b705 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2742,21 +2742,33 @@ grafana: text: All value: "$__all" panels: - logstash_estimated_eps_in_searchnode_total_graph: + logstash_eps_in_out_manager_graph: gridPos: x: 0 y: 0 h: 8 w: 12 - logstash_estimated_eps_in_out_manager_total_graph: + logstash_indexing_eps_in_searchnode_total_graph: gridPos: x: 12 y: 0 h: 8 w: 12 - elasticsearch_ingest_performance_nontc_graph: + logstash_indexing_eps_in_out_searchnode_graph: gridPos: x: 0 y: 8 h: 8 w: 24 + elasticsearch_ingest_performance_nontc_graph: + gridPos: + x: 0 + y: 16 + h: 8 + w: 24 + elasticsearch_pipeline_time_nontc_graph: + gridPos: + x: 0 + y: 24 + h: 8 + w: 24 diff --git a/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja index ece9e38f6..0166ae4b6 100644 --- a/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja +++ b/salt/grafana/panels/elasticsearch_ingest_performance_nontc_graph.json.jinja @@ -8,9 +8,59 @@ }, "type": "timeseries", "title": "Elastic Ingest Performance - $searchnode", + "repeat": "searchnode", + "repeatDirection": "v", "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "decimals": 0, + "unit": "ms" + }, + "overrides": [] + }, "options": { "tooltip": { "mode": "multi" @@ -45,18 +95,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_community_id_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -88,18 +138,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_conditional_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -131,18 +181,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_convert_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -176,18 +226,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_date_index_name_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -221,18 +271,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_date_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -266,18 +316,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_dissect_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -311,18 +361,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_dot_expander_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -362,7 +412,7 @@ ] }, { - "type": "last", + "type": "mean", "params": [] }, { @@ -401,18 +451,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_grok_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -446,18 +496,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_json_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -491,18 +541,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_kv_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -536,18 +586,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_lowercase_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -581,18 +631,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_remove_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -626,18 +676,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_rename_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -671,18 +721,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_script_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -716,18 +766,18 @@ "select": [ [ { + "type": "field", "params": [ "ingest_processor_stats_user_agent_time_in_millis" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] }, { - "params": [], - "type": "non_negative_difference" + "type": "non_negative_difference", + "params": [] } ] ], @@ -740,60 +790,6 @@ ] } ], - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "palette-classic" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" - } - ] - }, - "mappings": [], - "unit": "ms", - "decimals": 0 - }, - "overrides": [] - }, - "repeat": "searchnode", - "repeatDirection": "v", "description": "", "timeFrom": null, "timeShift": null diff --git a/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja b/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja new file mode 100644 index 000000000..3df3ef8d7 --- /dev/null +++ b/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja @@ -0,0 +1,153 @@ +{ + "id": 445552, + "gridPos": { + "x": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.x }}, + "y": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.y }}, + "w": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.w }}, + "h": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Pipeline Time", + "datasource": "InfluxDB", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "auto", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "ms" + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "multi" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean" + ] + } + }, + "targets": [ + { + "alias": "$tag_host", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "ingest_processor_stats_pipeline_time_in_millis" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_difference", + "params": [] + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=~", + "value": "/search/" + }, + { + "key": "role", + "value": "heavynode", + "operator": "=", + "condition": "OR" + }, + { + "key": "role", + "value": "standalone", + "operator": "=", + "condition": "OR" + }, + { + "key": "role", + "value": "eval", + "operator": "=", + "condition": "OR" + } + ] + } + ] +} + + + + + + + diff --git a/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja b/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja new file mode 100644 index 000000000..f8211b8de --- /dev/null +++ b/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja @@ -0,0 +1,400 @@ +{ + "id": 77741, + "gridPos": { + "x": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.x }}, + "y": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.y }}, + "w": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.w }}, + "h": {{ PANELS.logstash_eps_in_out_manager_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Manager Logstash Events", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "description": "Events from the grid to redis", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 50, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "EPS", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "decimals": 0, + "unit": "short" + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Incoming/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/Outgoing/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "green", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Incoming hidden" + }, + "properties": [ + { + "id": "custom.fillBelowTo", + "value": "Outgoing hidden" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Outgoing hidden" + }, + "properties": [ + { + "id": "custom.fillBelowTo", + "value": "Incoming hidden" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Incoming" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Outgoing" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/hidden/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + } + ] + }, + "options": { + "tooltip": { + "mode": "multi" + }, + "legend": { + "displayMode": "list", + "placement": "bottom", + "calcs": [] + } + }, + "targets": [ + { + "alias": "Incoming", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=~", + "value": "/^manager/" + }, + { + "key": "role", + "value": "standalone", + "operator": "=", + "condition": "OR" + }, + { + "key": "role", + "value": "eval", + "operator": "=", + "condition": "OR" + } + ] + }, + { + "alias": "Outgoing", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "out" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=~", + "value": "/^manager/" + }, + { + "key": "role", + "value": "standalone", + "operator": "=", + "condition": "OR" + }, + { + "key": "role", + "value": "eval", + "operator": "=", + "condition": "OR" + } + ] + }, + { + "alias": "Incoming hidden", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=~", + "value": "/^manager/" + }, + { + "key": "role", + "value": "standalone", + "operator": "=", + "condition": "OR" + }, + { + "key": "role", + "value": "eval", + "operator": "=", + "condition": "OR" + } + ] + }, + { + "alias": "Outgoing hidden", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + } + ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "default", + "queryType": "randomWalk", + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "out" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "role", + "operator": "=~", + "value": "/^manager/" + }, + { + "key": "role", + "value": "standalone", + "operator": "=", + "condition": "OR" + }, + { + "key": "role", + "value": "eval", + "operator": "=", + "condition": "OR" + } + ] + } + ], + "timeFrom": null, + "timeShift": null +} diff --git a/salt/grafana/panels/logstash_estimated_eps_in_out_manager_total_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_in_out_manager_total_graph.json.jinja deleted file mode 100644 index e79312625..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_in_out_manager_total_graph.json.jinja +++ /dev/null @@ -1,182 +0,0 @@ -{ - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "description": "Events from the grid to redis", - "fieldConfig": { - "defaults": { - "unit": "short" - }, - "overrides": [] - }, - "fill": 1, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_in_out_manager_total_graph.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_in_out_manager_total_graph.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_in_out_manager_total_graph.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_in_out_manager_total_graph.gridPos.h }} - }, - "id": 77741, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "targets": [ - { - "alias": "Logstash Events In", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "so_short_term", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=", - "value": "manager" - } - ] - }, - { - "alias": "Logstash Events Out", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "so_short_term", - "queryType": "randomWalk", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "out" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=", - "value": "manager" - } - ] - } - ], - "thresholds": [], - "timeRegions": [], - "title": "Manager Logstash Events", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:1159", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "$$hashKey": "object:1160", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - }, - "timeFrom": null, - "timeShift": null, - "interval": "30s", - "bars": false, - "dashes": false, - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false -} diff --git a/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja new file mode 100644 index 000000000..2d09b923c --- /dev/null +++ b/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja @@ -0,0 +1,408 @@ +{ + "id": 445554, + "gridPos": { + "x": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.x }}, + "y": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.y }}, + "w": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.w }}, + "h": {{ PANELS.logstash_indexing_eps_in_out_searchnode_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Indexing Events Per Second - $searchnode", + "repeat": "searchnode", + "repeatDirection": "v", + "transformations": [], + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 50, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "EPS", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "decimals": 0, + "unit": "short" + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Incoming/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "orange", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/Outgoing/" + }, + "properties": [ + { + "id": "color", + "value": { + "fixedColor": "green", + "mode": "fixed" + } + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Incoming hidden" + }, + "properties": [ + { + "id": "custom.fillBelowTo", + "value": "Outgoing hidden" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Incoming" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Outgoing" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Outgoing hidden" + }, + "properties": [ + { + "id": "custom.fillBelowTo", + "value": "Incoming hidden" + } + ] + }, + { + "matcher": { + "id": "byRegexp", + "options": "/hidden/" + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "legend": true, + "tooltip": true, + "viz": false + } + } + ] + } + ] + }, + "options": { + "tooltip": { + "mode": "multi" + }, + "legend": { + "displayMode": "list", + "placement": "bottom", + "calcs": [] + } + }, + "targets": [ + { + "alias": "Incoming", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "Outgoing", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": false, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "out" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "Incoming hidden", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": false, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + }, + { + "alias": "Outgoing hidden", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": false, + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "out" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$searchnode" + } + ] + } + ], + "description": "", + "maxDataPoints": null, + "timeFrom": null, + "timeShift": null +} diff --git a/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja similarity index 67% rename from salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja rename to salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja index 41def86be..53a9b99fd 100644 --- a/salt/grafana/panels/logstash_estimated_eps_in_searchnode_total_graph.json.jinja +++ b/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja @@ -1,23 +1,23 @@ { "id": 69001, "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_in_searchnode_total_graph.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_in_searchnode_total_graph.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_in_searchnode_total_graph.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_in_searchnode_total_graph.gridPos.h }} + "x": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.x }}, + "y": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.y }}, + "w": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.w }}, + "h": {{ PANELS.logstash_indexing_eps_in_searchnode_total_graph.gridPos.h }} }, "type": "timeseries", - "title": "Indexing Events Per Second", + "title": "Total Searchnode Indexing Events Per Second", "transformations": [ { "id": "calculateField", "options": { + "alias": "Total EPS", "mode": "reduceRow", "reduce": { "reducer": "sum" }, - "replaceFields": true, - "alias": "Total EPS" + "replaceFields": true } } ], @@ -55,24 +55,20 @@ } }, "color": { - "mode": "palette-classic" + "mode": "fixed", + "fixedColor": "orange" }, "thresholds": { "mode": "absolute", "steps": [ { - "value": null, - "color": "green" - }, - { - "value": 80, - "color": "red" + "color": "green", + "value": null } ] }, "mappings": [], - "unit": "short", - "decimals": 1 + "unit": "short" }, "overrides": [] }, @@ -82,48 +78,44 @@ }, "legend": { "displayMode": "table", - "placement": "right", + "placement": "bottom", "calcs": [ "max", "mean", - "lastNotNull" + "min" ] } }, "targets": [ { - "refId": "A", - "hide": false, - "policy": "default", - "resultFormat": "time_series", - "orderByTime": "ASC", - "tags": [ - { - "key": "role", - "value": "searchnode", - "operator": "=" - } - ], "groupBy": [ { - "type": "time", "params": [ "$__interval" - ] + ], + "type": "time" }, { - "type": "tag", "params": [ "host" - ] + ], + "type": "tag" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", "select": [ [ { @@ -144,13 +136,35 @@ } ] ], - "measurement": "logstash_events", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" = \"searchnode\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": false + "tags": [ + { + "key": "role", + "operator": "=~", + "value": "/search/" + }, + { + "key": "role", + "value": "heavynode", + "operator": "=", + "condition": "OR" + }, + { + "key": "role", + "value": "standalone", + "operator": "=", + "condition": "OR" + }, + { + "key": "role", + "value": "eval", + "operator": "=", + "condition": "OR" + } + ] } ], - "maxDataPoints": null, "description": "", + "maxDataPoints": null, "timeFrom": null, "timeShift": null } diff --git a/salt/grafana/templates/searchnode.json b/salt/grafana/templates/searchnode.json index 6a507bed4..57365cc57 100644 --- a/salt/grafana/templates/searchnode.json +++ b/salt/grafana/templates/searchnode.json @@ -7,7 +7,7 @@ "value": [{{ TEMPLATES.searchnode.get('value', DASHBOARD)| json }}] }, "datasource": "InfluxDB", - "definition": "show tag values with key=\"host\" WHERE (\"role\" = 'searchnode' )", + "definition": "show tag values with key=\"host\" WHERE (\"role\" =~ /search/) OR (\"role\" = 'heavynode') OR (\"role\" = 'standalone') OR (\"role\" = 'eval') ", "description": null, "error": null, "hide": {{ TEMPLATES.searchnode.get('hide', 0)| json }}, @@ -16,7 +16,7 @@ "multi": {{ TEMPLATES.searchnode.get('multi', true)| json }}, "name": "searchnode", "options": [], - "query": "show tag values with key=\"host\" WHERE (\"role\" = 'searchnode' )", + "query": "show tag values with key=\"host\" WHERE (\"role\" =~ /search/) OR (\"role\" = 'heavynode') OR (\"role\" = 'standalone') OR (\"role\" = 'eval') ", "refresh": 1, "regex": "", "skipUrlSync": false, From b599b49630d69a508e482f77dd3d410d84c48bc2 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 4 Nov 2021 13:52:45 -0400 Subject: [PATCH 30/47] enable beat input plugin for telegraf --- salt/telegraf/etc/telegraf.conf | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf index 878d79caa..8b37632ce 100644 --- a/salt/telegraf/etc/telegraf.conf +++ b/salt/telegraf/etc/telegraf.conf @@ -681,10 +681,10 @@ [[inputs.logstash]] url = "http://localhost:9600" collect = ["pipelines"] - {%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %} +{%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %} username = "{{ salt['pillar.get']('elasticsearch:auth:users:so_logstash_user:user') }}" password = "{{ salt['pillar.get']('elasticsearch:auth:users:so_logstash_user:pass') }}" - {% endif %} +{%- endif %} {%- endif %} {# if grains.role in ['so-eval','so-standalone','so-manager', 'so-managersearch', 'so-heavynode'] -%} @@ -692,13 +692,15 @@ servers = ["tcp://localhost:6379"] {%- endif #} -{% if grains.role == 'so-node' %} +{%- if grains.role in ['so-node', 'so-sensor', 'so-eval', 'so-manager', 'so-standalone', 'so-managersearch', 'so-heavynode'] %} [[inputs.beat]] url = "http://127.0.0.1:5066" - include = ["libbeat"] + include = ["filebeat", "libbeat"] +{%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %} username = "{{ salt['pillar.get']('elasticsearch:auth:users:so_beats_user:user') }}" password = "{{ salt['pillar.get']('elasticsearch:auth:users:so_beats_user:pass') }}" -{% endif %} +{%- endif %} +{%- endif %} # # Read metrics from one or more commands that can output to stdout [[inputs.exec]] @@ -709,7 +711,6 @@ timeout = "15s" interval = "60s" - # ## Commands array {% if grains['role'] in ['so-manager'] %} [[inputs.exec]] From 665732bd327556417ab5b0be02e3e65261e93fa1 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 4 Nov 2021 14:23:11 -0400 Subject: [PATCH 31/47] dont show points --- .../panels/elasticsearch_pipeline_time_nontc_graph.json.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja b/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja index 3df3ef8d7..2920ef314 100644 --- a/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja +++ b/salt/grafana/panels/elasticsearch_pipeline_time_nontc_graph.json.jinja @@ -20,7 +20,7 @@ "fillOpacity": 0, "gradientMode": "none", "spanNulls": false, - "showPoints": "auto", + "showPoints": "never", "pointSize": 5, "stacking": { "mode": "none", From 0b28e89f3cc1291461c5197a23f37d744ae844dd Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 4 Nov 2021 23:22:13 -0400 Subject: [PATCH 32/47] change how telegraf script determine if there is already and instance of the script already running --- salt/telegraf/scripts/beatseps.sh | 8 +++----- salt/telegraf/scripts/checkfiles.sh | 13 ++++++------- salt/telegraf/scripts/eps.sh | 9 ++++----- salt/telegraf/scripts/helixeps.sh | 12 ++++++------ salt/telegraf/scripts/influxdbsize.sh | 13 ++++++------- salt/telegraf/scripts/oldpcap.sh | 12 ++++++------ salt/telegraf/scripts/raid.sh | 13 +++++++------ salt/telegraf/scripts/redis.sh | 10 +++++----- salt/telegraf/scripts/sostatus.sh | 9 +++++---- salt/telegraf/scripts/stenoloss.sh | 13 ++++++------- salt/telegraf/scripts/suriloss.sh | 12 ++++++------ salt/telegraf/scripts/zeekcaptureloss.sh | 10 +++++----- salt/telegraf/scripts/zeekloss.sh | 12 ++++++------ 13 files changed, 71 insertions(+), 75 deletions(-) diff --git a/salt/telegraf/scripts/beatseps.sh b/salt/telegraf/scripts/beatseps.sh index 5e8256c22..5a1765620 100644 --- a/salt/telegraf/scripts/beatseps.sh +++ b/salt/telegraf/scripts/beatseps.sh @@ -15,9 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then PREVCOUNTFILE='/tmp/beatseps.txt' EVENTCOUNTCURRENT="$(curl -s localhost:5066/stats | jq '.libbeat.output.events.acked')" @@ -42,7 +41,6 @@ if [ ! "$THEGREP" ]; then echo "fbstats eps=${EVENTS%%.*},failed=$FAILEDEVENTCOUNT" fi -else - exit 0 fi +exit 0 diff --git a/salt/telegraf/scripts/checkfiles.sh b/salt/telegraf/scripts/checkfiles.sh index 5c6ab56c1..02510706a 100644 --- a/salt/telegraf/scripts/checkfiles.sh +++ b/salt/telegraf/scripts/checkfiles.sh @@ -15,13 +15,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then FILES=$(ls -1x /host/nsm/strelka/unprocessed | wc -l) - echo "faffiles files=$FILES" -else - exit 0 -fi \ No newline at end of file + +fi + +exit 0 diff --git a/salt/telegraf/scripts/eps.sh b/salt/telegraf/scripts/eps.sh index b497c2519..7181ff140 100644 --- a/salt/telegraf/scripts/eps.sh +++ b/salt/telegraf/scripts/eps.sh @@ -15,9 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then PREVCOUNTFILE='/tmp/eps.txt' EVENTCOUNTCURRENT="$(curl -s localhost:9600/_node/stats | jq '.events.in')" @@ -40,7 +39,7 @@ if [ ! "$THEGREP" ]; then echo "consumptioneps eps=${EVENTS%%.*}" fi -else - exit 0 + fi +exit 0 diff --git a/salt/telegraf/scripts/helixeps.sh b/salt/telegraf/scripts/helixeps.sh index 1411cc40b..f8201df2a 100644 --- a/salt/telegraf/scripts/helixeps.sh +++ b/salt/telegraf/scripts/helixeps.sh @@ -15,9 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then PREVCOUNTFILE='/tmp/helixevents.txt' EVENTCOUNTCURRENT="$(curl -s localhost:9600/_node/stats | jq '.pipelines.helix.events.out')" @@ -39,6 +38,7 @@ if [ ! "$THEGREP" ]; then echo "helixeps eps=${EVENTS%%.*}" fi -else - exit 0 -fi \ No newline at end of file + +fi + +exit 0 diff --git a/salt/telegraf/scripts/influxdbsize.sh b/salt/telegraf/scripts/influxdbsize.sh index 46e230a8a..9f9c6f315 100644 --- a/salt/telegraf/scripts/influxdbsize.sh +++ b/salt/telegraf/scripts/influxdbsize.sh @@ -15,13 +15,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then INFLUXSIZE=$(du -s -k /host/nsm/influxdb | awk {'print $1'}) - echo "influxsize kbytes=$INFLUXSIZE" -else - exit 0 -fi \ No newline at end of file + +fi + +exit 0 diff --git a/salt/telegraf/scripts/oldpcap.sh b/salt/telegraf/scripts/oldpcap.sh index f23c0c83f..947e978d1 100644 --- a/salt/telegraf/scripts/oldpcap.sh +++ b/salt/telegraf/scripts/oldpcap.sh @@ -15,9 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then # Get the data OLDPCAP=$(find /host/nsm/pcap -type f -exec stat -c'%n %Z' {} + | sort | grep -v "\." | head -n 1 | awk {'print $2'}) @@ -25,6 +24,7 @@ if [ ! "$THEGREP" ]; then AGE=$(($DATE - $OLDPCAP)) echo "pcapage seconds=$AGE" -else - exit 0 -fi \ No newline at end of file + +fi + +exit 0 diff --git a/salt/telegraf/scripts/raid.sh b/salt/telegraf/scripts/raid.sh index f237e8021..391e568d4 100644 --- a/salt/telegraf/scripts/raid.sh +++ b/salt/telegraf/scripts/raid.sh @@ -15,17 +15,18 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) -RAIDLOG=/var/log/raid/status.log -RAIDSTATUS=$(cat /var/log/raid/status.log) +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then -if [ ! "$THEGREP" ]; then + RAIDLOG=/var/log/raid/status.log + RAIDSTATUS=$(cat /var/log/raid/status.log) if [ -f "$RAIDLOG" ]; then echo "raid $RAIDSTATUS" else exit 0 fi -else - exit 0 + fi + +exit 0 diff --git a/salt/telegraf/scripts/redis.sh b/salt/telegraf/scripts/redis.sh index b448bba2d..d499ef44f 100644 --- a/salt/telegraf/scripts/redis.sh +++ b/salt/telegraf/scripts/redis.sh @@ -15,14 +15,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then UNPARSED=$(redis-cli llen logstash:unparsed | awk '{print $1}') PARSED=$(redis-cli llen logstash:parsed | awk '{print $1}') echo "redisqueue unparsed=$UNPARSED,parsed=$PARSED" -else - exit 0 + fi + +exit 0 diff --git a/salt/telegraf/scripts/sostatus.sh b/salt/telegraf/scripts/sostatus.sh index a7222b67d..4eef34c1c 100644 --- a/salt/telegraf/scripts/sostatus.sh +++ b/salt/telegraf/scripts/sostatus.sh @@ -14,9 +14,9 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then SOSTATUSLOG=/var/log/sostatus/status.log SOSTATUSSTATUS=$(cat /var/log/sostatus/status.log) @@ -26,6 +26,7 @@ if [ ! "$THEGREP" ]; then else exit 0 fi -else - exit 0 + fi + +exit 0 diff --git a/salt/telegraf/scripts/stenoloss.sh b/salt/telegraf/scripts/stenoloss.sh index 09b7ddb70..20e860285 100644 --- a/salt/telegraf/scripts/stenoloss.sh +++ b/salt/telegraf/scripts/stenoloss.sh @@ -15,9 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then CHECKIT=$(grep "Thread 0" /var/log/stenographer/stenographer.log |tac |head -2|wc -l) STENOGREP=$(grep "Thread 0" /var/log/stenographer/stenographer.log |tac |head -2) @@ -42,7 +41,7 @@ if [ ! "$THEGREP" ]; then echo "stenodrop drop=$LOSS" fi fi - -else - exit 0 -fi \ No newline at end of file + +fi + +exit 0 diff --git a/salt/telegraf/scripts/suriloss.sh b/salt/telegraf/scripts/suriloss.sh index 2d0a56106..ef458a4f3 100644 --- a/salt/telegraf/scripts/suriloss.sh +++ b/salt/telegraf/scripts/suriloss.sh @@ -16,9 +16,8 @@ # along with this program. If not, see . -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then SURILOG=$(tac /var/log/suricata/stats.log | grep kernel | head -4) CHECKIT=$(echo $SURILOG | grep -o 'drop' | wc -l) @@ -43,6 +42,7 @@ if [ ! "$THEGREP" ]; then echo "suridrop drop=$LOSS" fi fi -else - echo "suridrop drop=0" -fi \ No newline at end of file + +fi + +exit 0 diff --git a/salt/telegraf/scripts/zeekcaptureloss.sh b/salt/telegraf/scripts/zeekcaptureloss.sh index 6cb2dd2e2..6b3f7036c 100644 --- a/salt/telegraf/scripts/zeekcaptureloss.sh +++ b/salt/telegraf/scripts/zeekcaptureloss.sh @@ -18,9 +18,8 @@ # This script returns the average of all the workers average capture loss to telegraf / influxdb in influx format include nanosecond precision timestamp -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then if [ -d "/host/nsm/zeek/spool/logger" ]; then WORKERS={{ salt['pillar.get']('sensor:zeek_lbprocs', salt['pillar.get']('sensor:zeek_pins') | length) }} @@ -45,6 +44,7 @@ if [ ! "$THEGREP" ]; then fi echo "$CURRENTTS" > $LASTCAPTURELOSSLOG fi -else - exit 0 + fi + +exit 0 diff --git a/salt/telegraf/scripts/zeekloss.sh b/salt/telegraf/scripts/zeekloss.sh index 3dbd42833..4d33841a3 100644 --- a/salt/telegraf/scripts/zeekloss.sh +++ b/salt/telegraf/scripts/zeekloss.sh @@ -17,9 +17,8 @@ # This script returns the packets dropped by Zeek, but it isn't a percentage. $LOSS * 100 would be the percentage -THEGREP=$(ps -ef | grep $0 | grep -v $$ | grep -v grep) - -if [ ! "$THEGREP" ]; then +# if this script isn't already running +if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then ZEEKLOG=$(tac /host/nsm/zeek/logs/packetloss.log | head -2) declare RESULT=($ZEEKLOG) @@ -43,6 +42,7 @@ if [ ! "$THEGREP" ]; then LOSS=$(echo 4 k $DROPPED $TOTAL / p | dc) echo "zeekdrop drop=$LOSS" fi -else - exit 0 -fi \ No newline at end of file + +fi + +exit 0 From d67e34dac4b9fe442e781455f3cd048136185ad4 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 12:09:35 -0500 Subject: [PATCH 33/47] add pipeline overview for true cluster --- salt/grafana/defaults.yaml | 31 ++++ salt/grafana/init.sls | 6 +- ...rch_ingest_performance_tc_graph.json.jinja | 92 +++++------ ...icsearch_pipeline_time_tc_graph.json.jinja | 135 ++++++++++++++++ ..._indexing_eps_in_tc_total_graph.json.jinja | 152 ++++++++++++++++++ salt/grafana/templates/cluster_name.json | 25 +++ 6 files changed, 394 insertions(+), 47 deletions(-) create mode 100644 salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja create mode 100644 salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja create mode 100644 salt/grafana/templates/cluster_name.json diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index fb698b705..47279bf6d 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2772,3 +2772,34 @@ grafana: y: 24 h: 8 w: 24 + + + pipeline_overview_tc: + title: 'Pipeline Overview' + templating: + list: + cluster_name: + includeAll: true + multi: true + hide: 0 + text: All + value: "$__all" + panels: + logstash_indexing_eps_in_tc_total_graph: + gridPos: + x: 12 + y: 0 + h: 8 + w: 12 + elasticsearch_ingest_performance_tc_graph: + gridPos: + x: 0 + y: 16 + h: 8 + w: 24 + elasticsearch_pipeline_time_tc_graph: + gridPos: + x: 0 + y: 24 + h: 8 + w: 24 diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls index 4a5a1dfe2..745b03028 100644 --- a/salt/grafana/init.sls +++ b/salt/grafana/init.sls @@ -17,7 +17,11 @@ {% if grains.role == 'so-eval' %} {% do DASHBOARDS.append('eval') %} {% else %} - {% do DASHBOARDS.append('pipeline_overview') %} + {% if not salt['pillar.get']('elasticsearch:true_cluster', False) %} + {% do DASHBOARDS.append('pipeline_overview_nontc') %} + {% else %} + {% do DASHBOARDS.append('pipeline_overview_tc') %} + {% fi %} {# Grab a unique listing of nodetypes that exists so that we create only the needed dashboards #} {% for dashboard in salt['cmd.shell']("ls /opt/so/saltstack/local/pillar/minions/|awk -F'_' {'print $2'}|awk -F'.' {'print $1'}").split() %} {% if dashboard in ALLOWED_DASHBOARDS %} diff --git a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja index d94ff2759..d129382d1 100644 --- a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja +++ b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja @@ -8,7 +8,7 @@ }, "fill": 1, "gridPos": { - "x": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.x }}, + "x": {{ PANELS.elasticsearch_ingest_performance_graph.gridPos.x }}, "y": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.y }}, "w": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.w }}, "h": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.h }} @@ -72,9 +72,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -115,9 +115,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -158,9 +158,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -178,7 +178,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "F", @@ -203,9 +203,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -223,7 +223,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "G", @@ -248,9 +248,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -268,7 +268,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "H", @@ -293,9 +293,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -313,7 +313,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "I", @@ -338,9 +338,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -358,7 +358,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "K", @@ -383,9 +383,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -403,7 +403,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "L", @@ -428,9 +428,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -448,7 +448,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "O", @@ -473,9 +473,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -493,7 +493,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "P", @@ -518,9 +518,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -538,7 +538,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "Q", @@ -563,9 +563,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -583,7 +583,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "R", @@ -608,9 +608,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -628,7 +628,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "S", @@ -653,9 +653,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -673,7 +673,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "T", @@ -698,9 +698,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] }, @@ -718,7 +718,7 @@ "measurement": "elasticsearch_clusterstats_nodes", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"role\" = 'manager') AND $timeFilter GROUP BY time($__interval) fill(linear)", + "query": "SELECT non_negative_difference(mode(\"ingest_processor_stats_date_index_name_time_in_millis\")) FROM \"elasticsearch_clusterstats_nodes\" WHERE (\"cluster_name\" = '$cluster_name') AND $timeFilter GROUP BY time($__interval) fill(linear)", "queryType": "randomWalk", "rawQuery": false, "refId": "U", @@ -743,9 +743,9 @@ ], "tags": [ { - "key": "role", + "key": "cluster_name", "operator": "=", - "value": "manager" + "value": "$cluster_name" } ] } diff --git a/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja b/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja new file mode 100644 index 000000000..185649598 --- /dev/null +++ b/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja @@ -0,0 +1,135 @@ +{ + "id": 445552, + "gridPos": { + "x": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.x }}, + "y": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.y }}, + "w": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.w }}, + "h": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Pipeline Time", + "datasource": "InfluxDB", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 0, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "ms" + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "multi" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean" + ] + } + }, + "targets": [ + { + "alias": "$tag_host", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "elasticsearch_clusterstats_nodes", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "ingest_processor_stats_pipeline_time_in_millis" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_difference", + "params": [] + } + ] + ], + "tags": [ + { + "key": "cluster_name", + "operator": "=", + "value": "$cluster_name" + } + ] + } + ] +} + + + + + + + diff --git a/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja new file mode 100644 index 000000000..89e1deef5 --- /dev/null +++ b/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja @@ -0,0 +1,152 @@ +{ + "id": 69001, + "gridPos": { + "x": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.x }}, + "y": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.y }}, + "w": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.w }}, + "h": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.h }} + }, + "type": "timeseries", + "title": "Total Searchnode Indexing Events Per Second", + "transformations": [ + { + "id": "calculateField", + "options": { + "alias": "Total EPS", + "mode": "reduceRow", + "reduce": { + "reducer": "sum" + }, + "replaceFields": true + } + } + ], + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "EPS", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "fixed", + "fixedColor": "orange" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "short" + }, + "overrides": [] + }, + "options": { + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "table", + "placement": "bottom", + "calcs": [ + "max", + "mean", + "min" + ] + } + }, + "targets": [ + { + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "host" + ], + "type": "tag" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "logstash_events", + "orderByTime": "ASC", + "policy": "default", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"cluster_name\" = \"$cluster_name\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "rawQuery": false, + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "type": "field", + "params": [ + "in" + ] + }, + { + "type": "mean", + "params": [] + }, + { + "type": "non_negative_derivative", + "params": [ + "1s" + ] + } + ] + ], + "tags": [ + { + "key": "cluster_name", + "operator": "=", + "value": "$cluster_name" + } + ] + } + ], + "description": "", + "maxDataPoints": null, + "timeFrom": null, + "timeShift": null +} diff --git a/salt/grafana/templates/cluster_name.json b/salt/grafana/templates/cluster_name.json new file mode 100644 index 000000000..bf6dbfb3f --- /dev/null +++ b/salt/grafana/templates/cluster_name.json @@ -0,0 +1,25 @@ +{ + "allValue": null, + "current": { + "selected": true, + "tags": [], + "text": [{{ TEMPLATES.cluster_name.get('text', DASHBOARD)| json }}], + "value": [{{ TEMPLATES.cluster_name.get('value', DASHBOARD)| json }}] + }, + "datasource": "InfluxDB", + "definition": "show tag values with key=\"cluster_name\"", + "description": null, + "error": null, + "hide": {{ TEMPLATES.cluster_name.get('hide', 0)| json }}, + "includeAll": {{ TEMPLATES.cluster_name.get('includeAll', true)| json }}, + "label": "Cluster Name", + "multi": {{ TEMPLATES.cluster_name.get('multi', true)| json }}, + "name": "cluster_name", + "options": [], + "query": "show tag values with key=\"cluster_name\"", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" +} From 199c97684c9ffe37c5b98456ad0945c16317686a Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 12:10:23 -0500 Subject: [PATCH 34/47] fix nontc name in defaults --- salt/grafana/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 47279bf6d..124df1f25 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2731,7 +2731,7 @@ grafana: w: 24 - pipeline_overview: + pipeline_overview_nontc: title: 'Pipeline Overview' templating: list: From 3b2ca89852da69fb0805a75a8c6b64c03761bcd3 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 12:20:07 -0500 Subject: [PATCH 35/47] use endif not fi --- salt/grafana/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls index 745b03028..3034bc679 100644 --- a/salt/grafana/init.sls +++ b/salt/grafana/init.sls @@ -21,7 +21,7 @@ {% do DASHBOARDS.append('pipeline_overview_nontc') %} {% else %} {% do DASHBOARDS.append('pipeline_overview_tc') %} - {% fi %} + {% endif %} {# Grab a unique listing of nodetypes that exists so that we create only the needed dashboards #} {% for dashboard in salt['cmd.shell']("ls /opt/so/saltstack/local/pillar/minions/|awk -F'_' {'print $2'}|awk -F'.' {'print $1'}").split() %} {% if dashboard in ALLOWED_DASHBOARDS %} From 5b70ff61d1836cc0df646c4b0dfab23a18881e91 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 12:37:03 -0500 Subject: [PATCH 36/47] fix gridPos --- .../panels/elasticsearch_ingest_performance_tc_graph.json.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja index d129382d1..2a40327e2 100644 --- a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja +++ b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja @@ -8,7 +8,7 @@ }, "fill": 1, "gridPos": { - "x": {{ PANELS.elasticsearch_ingest_performance_graph.gridPos.x }}, + "x": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.x }}, "y": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.y }}, "w": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.w }}, "h": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.h }} From e2ee460fdde15c3c7358cda91a8a430514676d2b Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 12:39:23 -0500 Subject: [PATCH 37/47] fix gridPos --- .../elasticsearch_pipeline_time_tc_graph.json.jinja | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja b/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja index 185649598..343610617 100644 --- a/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja +++ b/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja @@ -1,10 +1,10 @@ { "id": 445552, "gridPos": { - "x": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.x }}, - "y": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.y }}, - "w": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.w }}, - "h": {{ PANELS.elasticsearch_pipeline_time_nontc_graph.gridPos.h }} + "x": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.x }}, + "y": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.y }}, + "w": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.w }}, + "h": {{ PANELS.elasticsearch_pipeline_time_tc_graph.gridPos.h }} }, "type": "timeseries", "title": "Pipeline Time", From 9ea292b11e1cd8e96e104278d29779f066371bc9 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 13:48:33 -0500 Subject: [PATCH 38/47] fix query --- ...h_indexing_eps_in_tc_total_graph.json.jinja | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja index 89e1deef5..fab71fd8b 100644 --- a/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja +++ b/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja @@ -112,7 +112,7 @@ "measurement": "logstash_events", "orderByTime": "ASC", "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"cluster_name\" = \"$cluster_name\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", + "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" =~ \"manager\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -138,9 +138,21 @@ ], "tags": [ { - "key": "cluster_name", + "key": "role", + "operator": "=~", + "value": "/^manager/" + }, + { + "key": "role", + "value": "standalone", "operator": "=", - "value": "$cluster_name" + "condition": "OR" + }, + { + "key": "role", + "value": "eval", + "operator": "=", + "condition": "OR" } ] } From f026ac1b41fc4e3e384100e6647b48f546586024 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 15:02:52 -0500 Subject: [PATCH 39/47] pipeline overview tc changes --- ...rch_ingest_performance_tc_graph.json.jinja | 174 ++++++++---------- ...icsearch_pipeline_time_tc_graph.json.jinja | 8 +- 2 files changed, 82 insertions(+), 100 deletions(-) diff --git a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja index 2a40327e2..aaf997836 100644 --- a/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja +++ b/salt/grafana/panels/elasticsearch_ingest_performance_tc_graph.json.jinja @@ -1,39 +1,29 @@ { - "aliasColors": {}, - "dashLength": 10, - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, + "id": 445548, "gridPos": { "x": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.x }}, "y": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.y }}, "w": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.w }}, "h": {{ PANELS.elasticsearch_ingest_performance_tc_graph.gridPos.h }} }, - "id": 445548, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", + "type": "timeseries", + "title": "Elastic Ingest Performance", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", "options": { - "alertThreshold": true + "tooltip": { + "mode": "multi" + }, + "legend": { + "displayMode": "table", + "placement": "right", + "calcs": [ + "max", + "mean" + ] + } }, - "pluginVersion": "7.5.4", - "pointradius": 2, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, "targets": [ { "alias": "community.id_time", @@ -55,18 +45,18 @@ "select": [ [ { - "type": "field", "params": [ "ingest_processor_stats_community_id_time_in_millis" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "non_negative_difference", - "params": [] + "params": [], + "type": "non_negative_difference" } ] ], @@ -276,18 +266,18 @@ "select": [ [ { - "type": "field", "params": [ "ingest_processor_stats_dissect_time_in_millis" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "non_negative_difference", - "params": [] + "params": [], + "type": "non_negative_difference" } ] ], @@ -636,18 +626,18 @@ "select": [ [ { - "type": "field", "params": [ "ingest_processor_stats_rename_time_in_millis" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "non_negative_difference", - "params": [] + "params": [], + "type": "non_negative_difference" } ] ], @@ -750,56 +740,54 @@ ] } ], - "thresholds": [], - "timeRegions": [], - "title": "Elastic Ingest Performance", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "$$hashKey": "object:1668", - "format": "dtdurationms", - "label": "", - "logBase": 1, - "max": null, - "min": null, - "show": true + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "unit": "ms" }, - { - "$$hashKey": "object:1669", - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null + "overrides": [] }, - "bars": false, - "dashes": false, "description": "", - "fillGradient": 0, - "hiddenSeries": false, - "percentage": false, - "points": false, - "stack": false, - "steppedLine": false, "timeFrom": null, - "timeShift": null, - "interval": "30s" + "timeShift": null } diff --git a/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja b/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja index 343610617..42ac51038 100644 --- a/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja +++ b/salt/grafana/panels/elasticsearch_pipeline_time_tc_graph.json.jinja @@ -72,7 +72,7 @@ }, "targets": [ { - "alias": "$tag_host", + "alias": "Time", "groupBy": [ { "params": [ @@ -80,12 +80,6 @@ ], "type": "time" }, - { - "params": [ - "host" - ], - "type": "tag" - }, { "params": [ "null" From ccd84e441d46035162c807aaf60e3518bcd664c1 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 15:09:46 -0500 Subject: [PATCH 40/47] add redis queue to pipeline overview --- salt/grafana/defaults.yaml | 22 ++++++++++++++----- ..._indexing_eps_in_tc_total_graph.json.jinja | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 124df1f25..c756fb2b4 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2742,18 +2742,24 @@ grafana: text: All value: "$__all" panels: - logstash_eps_in_out_manager_graph: + redis_queue_graph: gridPos: x: 0 y: 0 h: 8 - w: 12 - logstash_indexing_eps_in_searchnode_total_graph: + w: 8 + logstash_eps_in_out_manager_graph: gridPos: - x: 12 + x: 8 y: 0 h: 8 - w: 12 + w: 8 + logstash_indexing_eps_in_searchnode_total_graph: + gridPos: + x: 16 + y: 0 + h: 8 + w: 8 logstash_indexing_eps_in_out_searchnode_graph: gridPos: x: 0 @@ -2785,6 +2791,12 @@ grafana: text: All value: "$__all" panels: + redis_queue_graph: + gridPos: + x: 0 + y: 0 + h: 8 + w: 12 logstash_indexing_eps_in_tc_total_graph: gridPos: x: 12 diff --git a/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja index fab71fd8b..28e9ff3af 100644 --- a/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja +++ b/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja @@ -7,7 +7,7 @@ "h": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.h }} }, "type": "timeseries", - "title": "Total Searchnode Indexing Events Per Second", + "title": "Total Indexing Events Per Second", "transformations": [ { "id": "calculateField", From fbef42015531c1fd7d87e3b291f6d3ae8de5ebbe Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 15:15:53 -0500 Subject: [PATCH 41/47] update redis queue query --- .../panels/redis_queue_graph.json.jinja | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/salt/grafana/panels/redis_queue_graph.json.jinja b/salt/grafana/panels/redis_queue_graph.json.jinja index 1b1ca1e3a..de0becdbd 100644 --- a/salt/grafana/panels/redis_queue_graph.json.jinja +++ b/salt/grafana/panels/redis_queue_graph.json.jinja @@ -98,9 +98,15 @@ ], "tags": [ { - "key": "host", + "key": "role", + "operator": "=~", + "value": "/^manager/" + }, + { + "key": "role", + "value": "standalone", "operator": "=", - "value": "$servername" + "condition": "OR" } ] }, @@ -142,9 +148,15 @@ ], "tags": [ { - "key": "host", + "key": "role", + "operator": "=~", + "value": "/^manager/" + }, + { + "key": "role", + "value": "standalone", "operator": "=", - "value": "$servername" + "condition": "OR" } ] } From 79640342f254033d087a36edba32ce8e6a76ae7b Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 15:20:28 -0500 Subject: [PATCH 42/47] update redis queue query --- .../panels/redis_queue_graph.json.jinja | 194 +++++++++--------- 1 file changed, 99 insertions(+), 95 deletions(-) diff --git a/salt/grafana/panels/redis_queue_graph.json.jinja b/salt/grafana/panels/redis_queue_graph.json.jinja index de0becdbd..fbd1dc1b4 100644 --- a/salt/grafana/panels/redis_queue_graph.json.jinja +++ b/salt/grafana/panels/redis_queue_graph.json.jinja @@ -1,65 +1,105 @@ { - "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "description": "", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, + "id": 55, "gridPos": { "x": {{ PANELS.redis_queue_graph.gridPos.x }}, "y": {{ PANELS.redis_queue_graph.gridPos.y }}, "w": {{ PANELS.redis_queue_graph.gridPos.w }}, "h": {{ PANELS.redis_queue_graph.gridPos.h }} }, - "hiddenSeries": false, - "id": 55, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true + "type": "timeseries", + "title": "Redis Queue", + "datasource": "InfluxDB", + "pluginVersion": "8.2.1", + "interval": "30s", + "fieldConfig": { + "defaults": { + "custom": { + "drawStyle": "line", + "lineInterpolation": "linear", + "barAlignment": 0, + "lineWidth": 1, + "fillOpacity": 10, + "gradientMode": "none", + "spanNulls": false, + "showPoints": "never", + "pointSize": 5, + "stacking": { + "mode": "none", + "group": "A" + }, + "axisPlacement": "auto", + "axisLabel": "", + "scaleDistribution": { + "type": "linear" + }, + "hideFrom": { + "tooltip": false, + "viz": false, + "legend": false + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "color": { + "mode": "palette-classic" + }, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "mappings": [], + "links": [], + "unit": "short", + "decimals": 2 + }, + "overrides": [ + { + "matcher": { + "id": "byRegexp", + "options": "/Trend/" + }, + "properties": [ + { + "id": "custom.fillOpacity", + "value": 0 + }, + { + "id": "custom.lineWidth", + "value": 4 + }, + { + "id": "custom.lineStyle", + "value": { + "fill": "dash", + "dash": [ + 4, + 10 + ] + } + } + ] + } + ] }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 + "tooltip": { + "mode": "single" + }, + "legend": { + "displayMode": "list", + "placement": "bottom", + "calcs": [ + "max", + "mean" + ] } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, + }, "targets": [ { "alias": "Queue Current", @@ -103,10 +143,10 @@ "value": "/^manager/" }, { + "condition": "OR", "key": "role", - "value": "standalone", "operator": "=", - "condition": "OR" + "value": "standalone" } ] }, @@ -153,52 +193,16 @@ "value": "/^manager/" }, { + "condition": "OR", "key": "role", - "value": "standalone", "operator": "=", - "condition": "OR" + "value": "standalone" } ] } ], - "thresholds": [], + "maxDataPoints": null, + "description": "", "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Redis Queue", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } + "timeShift": null } From 17fc03a553cac7f29fe3ef74bd96a9bbe34dbfe6 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 16:15:42 -0500 Subject: [PATCH 43/47] pipleine overview tc changes --- salt/grafana/defaults.yaml | 26 ++- ..._indexing_eps_in_tc_total_graph.json.jinja | 164 ------------------ 2 files changed, 22 insertions(+), 168 deletions(-) delete mode 100644 salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index c756fb2b4..fecfa47eb 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2784,6 +2784,12 @@ grafana: title: 'Pipeline Overview' templating: list: + searchnode: + includeAll: true + multi: true + hide: 0 + text: All + value: "$__all" cluster_name: includeAll: true multi: true @@ -2796,13 +2802,25 @@ grafana: x: 0 y: 0 h: 8 - w: 12 - logstash_indexing_eps_in_tc_total_graph: + w: 8 + logstash_eps_in_out_manager_graph: gridPos: - x: 12 + x: 8 y: 0 h: 8 - w: 12 + w: 8 + logstash_indexing_eps_in_searchnode_total_graph: + gridPos: + x: 16 + y: 0 + h: 8 + w: 8 + logstash_indexing_eps_in_out_searchnode_graph: + gridPos: + x: 0 + y: 8 + h: 8 + w: 24 elasticsearch_ingest_performance_tc_graph: gridPos: x: 0 diff --git a/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja deleted file mode 100644 index 28e9ff3af..000000000 --- a/salt/grafana/panels/logstash_indexing_eps_in_tc_total_graph.json.jinja +++ /dev/null @@ -1,164 +0,0 @@ -{ - "id": 69001, - "gridPos": { - "x": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.x }}, - "y": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.y }}, - "w": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.w }}, - "h": {{ PANELS.logstash_indexing_eps_in_tc_total_graph.gridPos.h }} - }, - "type": "timeseries", - "title": "Total Indexing Events Per Second", - "transformations": [ - { - "id": "calculateField", - "options": { - "alias": "Total EPS", - "mode": "reduceRow", - "reduce": { - "reducer": "sum" - }, - "replaceFields": true - } - } - ], - "datasource": "InfluxDB", - "pluginVersion": "8.2.1", - "interval": "30s", - "fieldConfig": { - "defaults": { - "custom": { - "drawStyle": "line", - "lineInterpolation": "linear", - "barAlignment": 0, - "lineWidth": 1, - "fillOpacity": 10, - "gradientMode": "none", - "spanNulls": false, - "showPoints": "never", - "pointSize": 5, - "stacking": { - "mode": "none", - "group": "A" - }, - "axisPlacement": "auto", - "axisLabel": "EPS", - "scaleDistribution": { - "type": "linear" - }, - "hideFrom": { - "tooltip": false, - "viz": false, - "legend": false - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "color": { - "mode": "fixed", - "fixedColor": "orange" - }, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - } - ] - }, - "mappings": [], - "unit": "short" - }, - "overrides": [] - }, - "options": { - "tooltip": { - "mode": "single" - }, - "legend": { - "displayMode": "table", - "placement": "bottom", - "calcs": [ - "max", - "mean", - "min" - ] - } - }, - "targets": [ - { - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "logstash_events", - "orderByTime": "ASC", - "policy": "default", - "query": "SELECT non_negative_derivative(mean(\"in\"), 1s) FROM \"logstash_events\" WHERE (\"role\" =~ \"manager\") AND $timeFilter GROUP BY time($__interval), \"host\" fill(null)", - "rawQuery": false, - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "type": "field", - "params": [ - "in" - ] - }, - { - "type": "mean", - "params": [] - }, - { - "type": "non_negative_derivative", - "params": [ - "1s" - ] - } - ] - ], - "tags": [ - { - "key": "role", - "operator": "=~", - "value": "/^manager/" - }, - { - "key": "role", - "value": "standalone", - "operator": "=", - "condition": "OR" - }, - { - "key": "role", - "value": "eval", - "operator": "=", - "condition": "OR" - } - ] - } - ], - "description": "", - "maxDataPoints": null, - "timeFrom": null, - "timeShift": null -} From f6b753b805ee9b3521615919743b96a31183d0ae Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 16:26:41 -0500 Subject: [PATCH 44/47] panel cleanup --- .../panels/logstash_eps_in_out_manager_graph.json.jinja | 7 +++++-- ...stash_indexing_eps_in_out_searchnode_graph.json.jinja | 9 ++++++--- ...ash_indexing_eps_in_searchnode_total_graph.json.jinja | 4 ++-- salt/grafana/panels/redis_queue_graph.json.jinja | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja b/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja index f8211b8de..c345f2c7a 100644 --- a/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja +++ b/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja @@ -160,9 +160,12 @@ "mode": "multi" }, "legend": { - "displayMode": "list", + "displayMode": "table", "placement": "bottom", - "calcs": [] + "calcs": [ + "max", + "mean" + ] } }, "targets": [ diff --git a/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja index 2d09b923c..ab7a569bb 100644 --- a/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja +++ b/salt/grafana/panels/logstash_indexing_eps_in_out_searchnode_graph.json.jinja @@ -57,7 +57,7 @@ ] }, "mappings": [], - "decimals": 0, + "decimals": 2, "unit": "short" }, "overrides": [ @@ -162,9 +162,12 @@ "mode": "multi" }, "legend": { - "displayMode": "list", + "displayMode": "table", "placement": "bottom", - "calcs": [] + "calcs": [ + "max", + "mean" + ] } }, "targets": [ diff --git a/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja b/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja index 53a9b99fd..81876a606 100644 --- a/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja +++ b/salt/grafana/panels/logstash_indexing_eps_in_searchnode_total_graph.json.jinja @@ -68,6 +68,7 @@ ] }, "mappings": [], + "decimals": 2, "unit": "short" }, "overrides": [] @@ -81,8 +82,7 @@ "placement": "bottom", "calcs": [ "max", - "mean", - "min" + "mean" ] } }, diff --git a/salt/grafana/panels/redis_queue_graph.json.jinja b/salt/grafana/panels/redis_queue_graph.json.jinja index fbd1dc1b4..b33290008 100644 --- a/salt/grafana/panels/redis_queue_graph.json.jinja +++ b/salt/grafana/panels/redis_queue_graph.json.jinja @@ -92,7 +92,7 @@ "mode": "single" }, "legend": { - "displayMode": "list", + "displayMode": "table", "placement": "bottom", "calcs": [ "max", From 42b89558834b32df221f4bc408157f09d3995e70 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 16:33:57 -0500 Subject: [PATCH 45/47] panel cleanup --- .../grafana/panels/logstash_eps_in_out_manager_graph.json.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja b/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja index c345f2c7a..7812ca0bd 100644 --- a/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja +++ b/salt/grafana/panels/logstash_eps_in_out_manager_graph.json.jinja @@ -55,7 +55,7 @@ ] }, "mappings": [], - "decimals": 0, + "decimals": 2, "unit": "short" }, "overrides": [ From 70e3bc7eb8d65a0ebd140607dc8d3f9b4bcc65c6 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 16:52:15 -0500 Subject: [PATCH 46/47] hide vars on pipeline overview --- salt/grafana/defaults.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index fecfa47eb..ba39a708c 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2738,7 +2738,7 @@ grafana: searchnode: includeAll: true multi: true - hide: 0 + hide: 1 text: All value: "$__all" panels: @@ -2787,13 +2787,13 @@ grafana: searchnode: includeAll: true multi: true - hide: 0 + hide: 1 text: All value: "$__all" cluster_name: includeAll: true multi: true - hide: 0 + hide: 1 text: All value: "$__all" panels: From 497de0fedebabdfb17fafcbc3120a32df9e77675 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 8 Nov 2021 16:54:39 -0500 Subject: [PATCH 47/47] hide vars on pipeline overview --- salt/grafana/defaults.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index ba39a708c..77500778c 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2738,7 +2738,7 @@ grafana: searchnode: includeAll: true multi: true - hide: 1 + hide: 2 text: All value: "$__all" panels: @@ -2787,13 +2787,13 @@ grafana: searchnode: includeAll: true multi: true - hide: 1 + hide: 2 text: All value: "$__all" cluster_name: includeAll: true multi: true - hide: 1 + hide: 2 text: All value: "$__all" panels: