From f4d9455872a245566ad3e7266e23a4d01bd99a51 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Mon, 1 Nov 2021 16:10:13 -0400 Subject: [PATCH] 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 }