From bf116d210ed5731d5445c98e5f807eada7ae8315 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 1 Nov 2021 17:48:02 -0400 Subject: [PATCH] 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 }