diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 72e5f0bc0..5e3a11853 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -810,6 +810,394 @@ grafana: h: 8 w: 8 + searchnode: + templating: + list: + - servername_searchnode + - containers + - manint + - monint + - cpucount + - disk + panels: + row_overview: + gridPos: + x: 0 + y: 0 + h: 1 + w: 24 + system_uptime: + gridPos: + x: 0 + y: 1 + h: 4 + w: 4 + load_average_5_minute_stat: + gridPos: + x: 4 + y: 1 + h: 4 + w: 4 + cpu_usage_guage: + gridPos: + x: 8 + y: 1 + h: 4 + w: 2 + ram_usage_guage: + gridPos: + x: 10 + y: 1 + h: 4 + w: 2 + swap_usage_guage: + gridPos: + x: 12 + y: 1 + h: 4 + w: 2 + rootfs_used_guage: + gridPos: + x: 14 + y: 1 + h: 4 + w: 2 + nsm_used_guage: + gridPos: + x: 16 + y: 1 + h: 4 + w: 2 + pcap_retention_stat: + gridPos: + x: 18 + y: 1 + h: 4 + w: 2 + io_wait_stat: + gridPos: + x: 20 + y: 1 + h: 4 + w: 4 + logstash_estimated_eps_stat: + gridPos: + x: 0 + y: 5 + h: 4 + w: 4 + redis_queue_stat: + gridPos: + x: 4 + y: 5 + h: 4 + w: 4 + monitor_interface_traffic_stat: + gridPos: + x: 8 + y: 5 + h: 4 + w: 4 + zeek_packet_loss_stat: + gridPos: + x: 12 + y: 5 + h: 4 + w: 4 + suricata_packet_loss_stat: + gridPos: + x: 16 + y: 5 + h: 4 + w: 4 + stenographer_packet_loss_stat: + gridPos: + x: 20 + y: 5 + h: 4 + w: 4 + + row_cpu: + gridPos: + x: 0 + y: 9 + h: 1 + w: 24 + cpu_usage_tasks_graph: + gridPos: + x: 0 + y: 10 + h: 8 + w: 24 + load_averages_graph: + gridPos: + x: 0 + y: 18 + h: 8 + w: 12 + process_status_graph: + gridPos: + x: 12 + y: 18 + h: 8 + w: 12 + + row_memory: + gridPos: + x: 0 + y: 26 + h: 1 + w: 24 + memory_usage_graph: + gridPos: + x: 0 + y: 27 + h: 8 + w: 24 + + row_swap: + gridPos: + x: 0 + y: 35 + h: 1 + w: 24 + swap_io_bytes_graph: + gridPos: + x: 0 + y: 36 + h: 8 + w: 12 + swap_usage_bytes_graph: + gridPos: + x: 12 + y: 36 + h: 8 + w: 12 + + row_network: + gridPos: + x: 0 + y: 44 + h: 1 + w: 24 + management_traffic_graph: + gridPos: + x: 0 + y: 45 + h: 8 + w: 24 + management_interface_packets_graph: + gridPos: + x: 0 + y: 53 + h: 8 + w: 12 + management_interface_drops_graph: + gridPos: + x: 12 + y: 53 + h: 8 + w: 12 + monitor_traffic_graph: + gridPos: + x: 0 + y: 61 + h: 8 + w: 24 + monitor_interface_packets_graph: + gridPos: + x: 0 + y: 69 + h: 8 + w: 12 + monitor_interface_drops_graph: + gridPos: + x: 12 + y: 69 + h: 8 + w: 12 + + row_disk_usage: + gridPos: + x: 0 + y: 77 + h: 1 + w: 24 + disk_usage_root_graph: + gridPos: + x: 0 + y: 78 + h: 8 + w: 12 + disk_usage_nsm_graph: + gridPos: + x: 12 + y: 78 + h: 8 + w: 12 + + row_disk_iops: + gridPos: + x: 0 + y: 86 + h: 1 + w: 24 + disk_io_requests_graph: + gridPos: + x: 0 + y: 87 + h: 8 + w: 8 + disk_io_bytes_graph: + gridPos: + x: 8 + y: 87 + h: 8 + w: 8 + disk_io_time_graph: + gridPos: + x: 16 + y: 87 + h: 8 + w: 8 + + row_docker_details: + gridPos: + x: 0 + y: 95 + h: 1 + w: 24 + cpu_docker_combined_current_graph: + gridPos: + x: 0 + y: 96 + h: 8 + w: 24 + cpu_docker_combined_trend_graph: + gridPos: + x: 0 + y: 104 + h: 8 + w: 24 + memory_used_docker_combined_current_graph: + gridPos: + x: 0 + y: 112 + h: 8 + w: 24 + memory_used_docker_combined_trend_graph: + gridPos: + x: 0 + y: 120 + h: 8 + w: 24 + network_usage_docker_combined_current_graph: + gridPos: + x: 0 + y: 128 + h: 8 + w: 24 + network_usage_docker_combined_trend_graph: + gridPos: + x: 0 + y: 136 + h: 8 + w: 24 + uptime_docker_combined_current_graph: + gridPos: + x: 0 + y: 144 + h: 8 + w: 12 + uptime_docker_combined_trend_graph: + gridPos: + x: 12 + y: 144 + h: 8 + w: 12 + + row_logstash: + gridPos: + x: 0 + y: 152 + h: 1 + w: 24 + logstash_estimated_eps_graph: + gridPos: + x: 0 + y: 153 + h: 8 + w: 24 + + row_redis: + gridPos: + x: 0 + y: 161 + h: 1 + w: 24 + redis_queue_graph: + gridPos: + x: 0 + y: 162 + h: 8 + w: 24 + + row_zeek: + gridPos: + x: 0 + y: 170 + h: 1 + w: 24 + zeek_packet_loss_graph: + gridPos: + x: 0 + y: 171 + h: 8 + w: 10 + zeek_capture_loss_graph: + gridPos: + x: 10 + y: 171 + h: 8 + w: 10 + zeek_restarts_healthcheck_stat: + gridPos: + x: 20 + y: 171 + h: 8 + w: 4 + + row_suricata: + gridPos: + x: 0 + y: 179 + h: 1 + w: 24 + suricata_packet_loss_graph: + gridPos: + x: 0 + y: 180 + h: 8 + w: 24 + + row_stenographer: + gridPos: + x: 0 + y: 188 + h: 1 + w: 24 + stenographer_packet_loss_graph: + gridPos: + x: 0 + y: 189 + h: 8 + w: 16 + stenographer_pcap_retention_graph: + gridPos: + x: 16 + y: 189 + h: 8 + w: 8 heavynode: templating: diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls index 4b47504c0..118290e58 100644 --- a/salt/grafana/init.sls +++ b/salt/grafana/init.sls @@ -14,7 +14,7 @@ {% set nodeTypes = ['eval'] %} {% else %} {#% set nodeTypes = ['standalone', 'manager', 'managersearch', 'sensortab', 'searchnode'] %#} - {% set nodeTypes = ['standalone', 'heavynode', 'sensor'] %} + {% set nodeTypes = ['standalone', 'sensor', 'searchnode', 'heavynode'] %} {% endif %} {% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone'] or (grains.role == 'so-eval' and GRAFANA == 1) %} diff --git a/salt/grafana/templates/servername_searchnode.json b/salt/grafana/templates/servername_searchnode.json new file mode 100644 index 000000000..4660e1b50 --- /dev/null +++ b/salt/grafana/templates/servername_searchnode.json @@ -0,0 +1,24 @@ +{ + "allValue": null, + "current": {}, + "datasource": "InfluxDB", + "definition": "show tag values with key=\"host\" where \"role\" = 'searchnode'", + "description": "", + "error": null, + "hide": 0, + "includeAll": false, + "label": "Node", + "multi": false, + "name": "servername", + "options": [], + "query": "show tag values with key=\"host\" where \"role\" = 'searchnode'", + "refresh": 1, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "tagValuesQuery": "", + "tags": [], + "tagsQuery": "", + "type": "query", + "useTags": false + }