diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 2e1311361..fb5b7b4b6 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -908,73 +908,60 @@ grafana: h: 8 w: 12 - row_logstash: + row_elasticsearch: gridPos: x: 0 y: 152 h: 1 w: 24 - logstash_estimated_eps_graph: - gridPos: - x: 0 - y: 153 - h: 8 - w: 24 - - row_elasticsearch: - gridPos: - x: 0 - y: 161 - h: 1 - w: 24 elasticsearch_document_count_graph: gridPos: x: 0 - y: 162 + y: 153 h: 8 w: 12 elasticsearch_thread_count_graph: gridPos: x: 12 - y: 162 + y: 153 h: 8 w: 12 elasticsearch_store_size_graph: gridPos: x: 0 - y: 170 + y: 161 h: 8 w: 12 elasticsearch_field_data_cache_size_graph: gridPos: x: 12 - y: 170 + y: 161 h: 8 w: 12 row_redis: gridPos: x: 0 - y: 178 + y: 169 h: 1 w: 24 redis_queue_graph: gridPos: x: 0 - y: 179 + y: 170 h: 8 w: 24 row_influxdb: gridPos: x: 0 - y: 214 + y: 178 h: 1 w: 24 influxdb_db_size_graph: gridPos: x: 0 - y: 214 + y: 179 h: 8 w: 24 diff --git a/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja b/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja index d3fb119fb..3d21fad48 100644 --- a/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja +++ b/salt/grafana/panels/monitor_interface_traffic_inbound_combined_graph.json.jinja @@ -7,7 +7,7 @@ "h": {{ PANELS.monitor_interface_traffic_inbound_combined_graph.gridPos.h }} }, "type": "timeseries", - "title": "Monitor Traffic - Combined", + "title": "Monitor Traffic - Selected Combined", "transformations": [ { "id": "calculateField", diff --git a/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja b/salt/grafana/panels/monitor_interface_traffic_stat.json.jinja index 9061c323e..f30a8daf4 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", + "title": "Monitor Traffic - Combined", "datasource": "InfluxDB", "pluginVersion": "8.2.1", "interval": "30s",