From 7abb2e5935781d0da15a13bdfb3cdf15e1ae17a9 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 2 Nov 2021 11:07:29 -0400 Subject: [PATCH] monitor interface graph total --- salt/grafana/defaults.yaml | 42 +++- .../logstash_estimated_eps_graph.json.jinja | 192 ------------------ .../logstash_estimated_eps_stat.json.jinja | 112 ---------- ...ce_traffic_inbound_total_graph.json.jinja} | 12 +- .../monitor_interface_traffic_stat.json.jinja | 2 +- 5 files changed, 40 insertions(+), 320 deletions(-) delete mode 100644 salt/grafana/panels/logstash_estimated_eps_graph.json.jinja delete mode 100644 salt/grafana/panels/logstash_estimated_eps_stat.json.jinja rename salt/grafana/panels/{monitor_interface_traffic_inbound_combined_graph.json.jinja => monitor_interface_traffic_inbound_total_graph.json.jinja} (89%) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index fb5b7b4b6..9e0147d2b 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -294,7 +294,7 @@ grafana: y: 1 h: 4 w: 4 - logstash_estimated_eps_stat: + logstash_estimated_eps_in_stat: gridPos: x: 0 y: 5 @@ -536,7 +536,7 @@ grafana: y: 152 h: 1 w: 24 - logstash_estimated_eps_graph: + logstash_estimated_eps_in_graph: gridPos: x: 0 y: 153 @@ -1034,7 +1034,7 @@ grafana: y: 1 h: 4 w: 4 - logstash_estimated_eps_stat: + logstash_estimated_eps_in_stat: gridPos: x: 0 y: 5 @@ -1234,7 +1234,7 @@ grafana: y: 152 h: 1 w: 24 - logstash_estimated_eps_graph: + logstash_estimated_eps_in_graph: gridPos: x: 0 y: 153 @@ -1485,7 +1485,7 @@ grafana: y: 61 h: 8 w: 24 - monitor_interface_traffic_inbound_combined_graph: + monitor_interface_traffic_inbound_total_graph: gridPos: x: 0 y: 69 @@ -1723,12 +1723,18 @@ grafana: y: 1 h: 4 w: 4 - logstash_estimated_eps_stat: + logstash_estimated_eps_in_stat: gridPos: x: 0 y: 5 h: 4 w: 4 + logstash_estimated_eps_out_stat: + gridPos: + x: 4 + y: 5 + h: 4 + w: 4 row_cpu: gridPos: @@ -1917,12 +1923,30 @@ grafana: y: 152 h: 1 w: 24 - logstash_estimated_eps_graph: + logstash_estimated_eps_in_graph: gridPos: x: 0 y: 153 h: 8 w: 24 + logstash_estimated_eps_in_total_graph: + gridPos: + x: 0 + y: 161 + h: 8 + w: 24 + logstash_estimated_eps_out_graph: + gridPos: + x: 0 + y: 169 + h: 8 + w: 24 + logstash_estimated_eps_out_total_graph: + gridPos: + x: 0 + y: 172 + h: 8 + w: 24 heavynode: @@ -1999,7 +2023,7 @@ grafana: y: 1 h: 4 w: 4 - logstash_estimated_eps_stat: + logstash_estimated_eps_in_stat: gridPos: x: 0 y: 5 @@ -2235,7 +2259,7 @@ grafana: y: 152 h: 1 w: 24 - logstash_estimated_eps_graph: + logstash_estimated_eps_in_graph: gridPos: x: 0 y: 153 diff --git a/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja b/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja deleted file mode 100644 index c40f6c927..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_graph.json.jinja +++ /dev/null @@ -1,192 +0,0 @@ -{ - "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "dashLength": 10, - "dashes": false, - "datasource": "InfluxDB", - "description": "", - "fieldConfig": { - "defaults": {}, - "overrides": [] - }, - "fill": 1, - "fillGradient": 0, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_graph.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_graph.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_graph.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_graph.gridPos.h }} - }, - "hiddenSeries": false, - "id": 76, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "max": true, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "connected", - "options": { - "alertThreshold": false - }, - "percentage": false, - "pluginVersion": "7.5.4", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/Trend/", - "dashLength": 4, - "dashes": true, - "fill": 0, - "linewidth": 4 - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "EPS Current", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "consumptioneps", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "eps" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - }, - { - "alias": "EPS Trend", - "groupBy": [ - { - "params": [ - "$__interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "hide": false, - "measurement": "consumptioneps", - "orderByTime": "ASC", - "policy": "so_long_term", - "queryType": "randomWalk", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "mean_eps" - ], - "type": "field" - }, - { - "params": [], - "type": "mean" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=~", - "value": "/^$servername$/" - } - ] - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Estimated EPS", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": "EPS", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } -} diff --git a/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja b/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja deleted file mode 100644 index c983521a4..000000000 --- a/salt/grafana/panels/logstash_estimated_eps_stat.json.jinja +++ /dev/null @@ -1,112 +0,0 @@ -{ - "datasource": "InfluxDB", - "fieldConfig": { - "defaults": { - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "dark-red", - "value": null - }, - { - "value": 1, - "color": "dark-green" - } - ] - }, - "mappings": [ - { - "op": "=", - "text": "N/A", - "value": "null", - "$$hashKey": "object:730", - "id": 0, - "type": 1 - } - ], - "unit": "short", - "decimals": 0, - "color": { - "mode": "thresholds" - } - }, - "overrides": [] - }, - "gridPos": { - "x": {{ PANELS.logstash_estimated_eps_stat.gridPos.x }}, - "y": {{ PANELS.logstash_estimated_eps_stat.gridPos.y }}, - "w": {{ PANELS.logstash_estimated_eps_stat.gridPos.w }}, - "h": {{ PANELS.logstash_estimated_eps_stat.gridPos.h }} - }, - "id": 23, - "interval": "30s", - "links": [], - "maxDataPoints": 750, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "consumptioneps", - "orderByTime": "ASC", - "policy": "default", - "queryType": "randomWalk", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "eps" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [ - { - "key": "host", - "operator": "=", - "value": "$servername" - } - ] - } - ], - "title": "Estimated EPS", - "type": "stat", - "options": { - "reduceOptions": { - "values": false, - "calcs": [ - "lastNotNull" - ], - "fields": "" - }, - "orientation": "horizontal", - "text": {}, - "textMode": "value", - "colorMode": "value", - "graphMode": "area", - "justifyMode": "auto" - }, - "cacheTimeout": null, - "pluginVersion": "7.5.4", - "timeFrom": null -} diff --git a/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja similarity index 89% rename from salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja rename to salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja index 3d21fad48..67e92668d 100644 --- a/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_inbound_total_graph.json.jinja @@ -1,18 +1,18 @@ { "id": 224244, "gridPos": { - "x": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.x }}, - "y": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.y }}, - "w": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.w }}, - "h": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.h }} + "x": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.x }}, + "y": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.y }}, + "w": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.w }}, + "h": {{ PANELS.monitor_interface_traffic_inbound_total_graph.gridPos.h }} }, "type": "timeseries", - "title": "Monitor Traffic - Selected Combined", + "title": "Monitor Traffic - Selected Total", "transformations": [ { "id": "calculateField", "options": { - "alias": "Monitor Traffic", + "alias": "Total Monitor Traffic", "mode": "reduceRow", "reduce": { "reducer": "sum" diff --git a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja index f30a8daf4..283d93f7a 100644 --- a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja @@ -7,7 +7,7 @@ "h": {{ PANELS.monitor_interface_traffic_stat.gridPos.h }} }, "type": "stat", - "title": "Monitor Traffic - Combined", + "title": "Monitor Traffic - Selected Total", "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s",