diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 29678137e..eecd2d1f5 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -36,117 +36,140 @@ grafana: - cpucount - disk panels: - system_uptime_graph: + row_overview: gridPos: x: 0 y: 0 - h: 8 + h: 1 w: 24 - row_cpu: + system_uptime_graph: gridPos: x: 0 - y: 8 - h: 1 + y: 1 + h: 8 w: 24 cpu_usage_current_graph: gridPos: x: 0 - y: 8 + y: 9 h: 8 w: 24 - io_wait_graph: + memory_usage_percent_graph: gridPos: x: 0 y: 17 h: 8 w: 24 - cpu_usage_tasks_running_graph: + disk_usage_root_graph: gridPos: x: 0 y: 25 h: 8 w: 24 - cpu_usage_tasks_zombies_graph: + disk_usage_nsm_graph: gridPos: x: 0 y: 33 h: 8 - w: 12 - cpu_usage_tasks_stopped_graph: - gridPos: - x: 12 - y: 33 - h: 8 - w: 12 - cpu_usage_tasks_sleeping_graph: - gridPos: - x: 0 - y: 41 - h: 8 - w: 12 - cpu_usage_tasks_blocked_graph: - gridPos: - x: 12 - y: 41 - h: 8 - w: 12 - cpu_usage_tasks_paging_graph: - gridPos: - x: 0 - y: 49 - h: 8 - w: 12 - cpu_usage_tasks_unknown_graph: - gridPos: - x: 12 - y: 49 - h: 8 - w: 12 - - row_memory: - gridPos: - x: 0 - y: 57 - h: 1 - w: 24 - memory_usage_percent_graph: - gridPos: - x: 0 - y: 58 - h: 8 - w: 24 - - row_swap: - gridPos: - x: 0 - y: 64 - h: 1 w: 24 swap_usage_percent_graph: gridPos: x: 0 - y: 65 + y: 41 + h: 8 + w: 24 + io_wait_graph: + gridPos: + x: 0 + y: 49 h: 8 w: 24 row_network: gridPos: x: 0 - y: 73 + y: 57 h: 1 w: 24 management_interface_traffic_inbound_graph: gridPos: x: 0 - y: 74 + y: 58 h: 8 w: 24 management_interface_traffic_outbound_graph: gridPos: x: 0 - y: 82 + y: 58 h: 8 w: 24 + management_interface_drops_graph: + gridPos: + x: 0 + y: 58 + h: 8 + w: 24 + monitor_interface_traffic_inbound_graph: + gridPos: + x: 0 + y: 58 + h: 8 + w: 24 + monitor_interface_drops_graph: + gridPos: + x: 0 + y: 66 + h: 8 + w: 24 + + cpu_network: + gridPos: + x: 0 + y: 74 + h: 1 + w: 24 + cpu_usage_tasks_running_graph: + gridPos: + x: 0 + y: 75 + h: 8 + w: 24 + cpu_usage_tasks_zombies_graph: + gridPos: + x: 0 + y: 83 + h: 8 + w: 12 + cpu_usage_tasks_stopped_graph: + gridPos: + x: 12 + y: 83 + h: 8 + w: 12 + cpu_usage_tasks_sleeping_graph: + gridPos: + x: 0 + y: 91 + h: 8 + w: 12 + cpu_usage_tasks_blocked_graph: + gridPos: + x: 12 + y: 91 + h: 8 + w: 12 + cpu_usage_tasks_paging_graph: + gridPos: + x: 0 + y: 99 + h: 8 + w: 12 + cpu_usage_tasks_unknown_graph: + gridPos: + x: 12 + y: 99 + h: 8 + w: 12 standalone: @@ -319,7 +342,7 @@ grafana: y: 44 h: 1 w: 24 - management_traffic_graph: + management_interface_traffic_graph: gridPos: x: 0 y: 45 @@ -337,7 +360,7 @@ grafana: y: 53 h: 8 w: 12 - monitor_traffic_graph: + monitor_interface_traffic_graph: gridPos: x: 0 y: 61 @@ -723,7 +746,7 @@ grafana: y: 44 h: 1 w: 24 - management_traffic_graph: + management_interface_traffic_graph: gridPos: x: 0 y: 45 @@ -1052,7 +1075,7 @@ grafana: y: 44 h: 1 w: 24 - management_traffic_graph: + management_interface_traffic_graph: gridPos: x: 0 y: 45 @@ -1399,7 +1422,7 @@ grafana: y: 44 h: 1 w: 24 - management_traffic_graph: + management_interface_traffic_graph: gridPos: x: 0 y: 45 @@ -1417,7 +1440,7 @@ grafana: y: 53 h: 8 w: 12 - monitor_traffic_graph: + monitor_interface_traffic_graph: gridPos: x: 0 y: 61 @@ -1732,7 +1755,7 @@ grafana: y: 44 h: 1 w: 24 - management_traffic_graph: + management_interface_traffic_graph: gridPos: x: 0 y: 45 @@ -2047,7 +2070,7 @@ grafana: y: 44 h: 1 w: 24 - management_traffic_graph: + management_interface_traffic_graph: gridPos: x: 0 y: 45 @@ -2065,7 +2088,7 @@ grafana: y: 53 h: 8 w: 12 - monitor_traffic_graph: + monitor_interface_traffic_graph: gridPos: x: 0 y: 61 diff --git a/salt/grafana/panels/management_traffic_graph.json.jinja b/salt/grafana/panels/management_interface_traffic_graph.json.jinja similarity index 96% rename from salt/grafana/panels/management_traffic_graph.json.jinja rename to salt/grafana/panels/management_interface_traffic_graph.json.jinja index f8dedf55a..179a6fdc0 100644 --- a/salt/grafana/panels/management_traffic_graph.json.jinja +++ b/salt/grafana/panels/management_interface_traffic_graph.json.jinja @@ -21,10 +21,10 @@ "fill": 1, "fillGradient": 0, "gridPos": { - "x": {{ PANELS.management_traffic_graph.gridPos.x }}, - "y": {{ PANELS.management_traffic_graph.gridPos.y }}, - "w": {{ PANELS.management_traffic_graph.gridPos.w }}, - "h": {{ PANELS.management_traffic_graph.gridPos.h }} + "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 }} }, "hiddenSeries": false, "id": 18, diff --git a/salt/grafana/panels/monitor_traffic_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_graph.json.jinja similarity index 94% rename from salt/grafana/panels/monitor_traffic_graph.json.jinja rename to salt/grafana/panels/monitor_interface_traffic_graph.json.jinja index b446f9a74..91ec7c4f1 100644 --- a/salt/grafana/panels/monitor_traffic_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_graph.json.jinja @@ -21,10 +21,10 @@ "fill": 1, "fillGradient": 0, "gridPos": { - "x": {{ PANELS.monitor_traffic_graph.gridPos.x }}, - "y": {{ PANELS.monitor_traffic_graph.gridPos.y }}, - "w": {{ PANELS.monitor_traffic_graph.gridPos.w }}, - "h": {{ PANELS.monitor_traffic_graph.gridPos.h }} + "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 }} }, "hiddenSeries": false, "id": 10,