diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index eecd2d1f5..bfd914a55 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -342,7 +342,7 @@ grafana: y: 44 h: 1 w: 24 - management_interface_traffic_graph: + management_interface_traffic_both_graph: gridPos: x: 0 y: 45 @@ -360,7 +360,7 @@ grafana: y: 53 h: 8 w: 12 - monitor_interface_traffic_graph: + monitor_interface_traffic_both_graph: gridPos: x: 0 y: 61 @@ -746,7 +746,7 @@ grafana: y: 44 h: 1 w: 24 - management_interface_traffic_graph: + management_interface_traffic_both_graph: gridPos: x: 0 y: 45 @@ -1075,7 +1075,7 @@ grafana: y: 44 h: 1 w: 24 - management_interface_traffic_graph: + management_interface_traffic_both_graph: gridPos: x: 0 y: 45 @@ -1422,7 +1422,7 @@ grafana: y: 44 h: 1 w: 24 - management_interface_traffic_graph: + management_interface_traffic_both_graph: gridPos: x: 0 y: 45 @@ -1440,7 +1440,7 @@ grafana: y: 53 h: 8 w: 12 - monitor_interface_traffic_graph: + monitor_interface_traffic_both_graph: gridPos: x: 0 y: 61 @@ -1755,7 +1755,7 @@ grafana: y: 44 h: 1 w: 24 - management_interface_traffic_graph: + management_interface_traffic_both_graph: gridPos: x: 0 y: 45 @@ -2070,7 +2070,7 @@ grafana: y: 44 h: 1 w: 24 - management_interface_traffic_graph: + management_interface_traffic_both_graph: gridPos: x: 0 y: 45 @@ -2088,7 +2088,7 @@ grafana: y: 53 h: 8 w: 12 - monitor_interface_traffic_graph: + monitor_interface_traffic_both_graph: gridPos: x: 0 y: 61 diff --git a/salt/grafana/panels/management_interface_traffic_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja similarity index 95% rename from salt/grafana/panels/management_interface_traffic_graph.json.jinja rename to salt/grafana/panels/management_interface_traffic_both_graph.json.jinja index 179a6fdc0..94e067d53 100644 --- a/salt/grafana/panels/management_interface_traffic_graph.json.jinja +++ b/salt/grafana/panels/management_interface_traffic_both_graph.json.jinja @@ -21,10 +21,10 @@ "fill": 1, "fillGradient": 0, "gridPos": { - "x": {{ PANELS.management_interface_traffic_graph.gridPos.x }}, - "y": {{ PANELS.management_interface_traffic_graph.gridPos.y }}, - "w": {{ PANELS.management_interface_traffic_graph.gridPos.w }}, - "h": {{ PANELS.management_interface_traffic_graph.gridPos.h }} + "x": {{ PANELS.management_interface_traffic_both_graph.gridPos.x }}, + "y": {{ PANELS.management_interface_traffic_both_graph.gridPos.y }}, + "w": {{ PANELS.management_interface_traffic_both_graph.gridPos.w }}, + "h": {{ PANELS.management_interface_traffic_both_graph.gridPos.h }} }, "hiddenSeries": false, "id": 18, diff --git a/salt/grafana/panels/monitor_interface_traffic_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja similarity index 93% rename from salt/grafana/panels/monitor_interface_traffic_graph.json.jinja rename to salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja index 91ec7c4f1..0c7fd3a0c 100644 --- a/salt/grafana/panels/monitor_interface_traffic_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_both_graph.json.jinja @@ -21,10 +21,10 @@ "fill": 1, "fillGradient": 0, "gridPos": { - "x": {{ PANELS.monitor_interface_traffic_graph.gridPos.x }}, - "y": {{ PANELS.monitor_interface_traffic_graph.gridPos.y }}, - "w": {{ PANELS.monitor_interface_traffic_graph.gridPos.w }}, - "h": {{ PANELS.monitor_interface_traffic_graph.gridPos.h }} + "x": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.x }}, + "y": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.y }}, + "w": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.w }}, + "h": {{ PANELS.monitor_interface_traffic_both_graph.gridPos.h }} }, "hiddenSeries": false, "id": 10, diff --git a/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja new file mode 100644 index 000000000..bc84d89d1 --- /dev/null +++ b/salt/grafana/panels/monitor_interface_traffic_inbound_graph.json.jinja @@ -0,0 +1,224 @@ +{ + "aliasColors": { + "InBound": "#629E51", + "OutBound": "#5195CE", + "net.non_negative_derivative": "light-orange" + }, + "bars": false, + "maxDataPoints": 750, + "interval": "30s", + "dashLength": 10, + "dashes": false, + "datasource": "InfluxDB", + "editable": true, + "error": false, + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "x": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.x }}, + "y": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.y }}, + "w": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.w }}, + "h": {{ PANELS.monitor_interface_traffic_inbound_graph.gridPos.h }} + }, + "hiddenSeries": false, + "id": 111845, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": true, + "min": true, + "show": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "7.5.4", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "alias": "Inbound Current", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "measurement": "net", + "orderByTime": "ASC", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "bytes_recv" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "1s" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + "*8" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$servername" + }, + { + "condition": "AND", + "key": "interface", + "operator": "=", + "value": "$monint" + } + ] + }, + { + "alias": "Inbound Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "net", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_bytes_recv" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "1s" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + "*8" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "$servername" + }, + { + "condition": "AND", + "key": "interface", + "operator": "=", + "value": "$monint" + } + ] + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Monitor Interface Inbound Traffic", + "tooltip": { + "msResolution": true, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bps", + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } +}