From 1cd1ad9214660e066b6f014558b7ca453f48b85d Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 28 Jan 2022 17:18:31 -0500 Subject: [PATCH 1/5] add inputs for so-receiver to telegraf conf --- salt/telegraf/etc/telegraf.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf index 8b37632ce..2644f152d 100644 --- a/salt/telegraf/etc/telegraf.conf +++ b/salt/telegraf/etc/telegraf.conf @@ -677,7 +677,7 @@ # ## Use TLS but skip chain & host verification # # insecure_skip_verify = false -{% if grains.role in ['so-node','so-standalone','so-manager', 'so-managersearch', 'so-heavynode'] -%} +{% if grains.role in ['so-node','so-standalone','so-manager', 'so-managersearch', 'so-heavynode', 'so-receiver'] -%} [[inputs.logstash]] url = "http://localhost:9600" collect = ["pipelines"] @@ -687,7 +687,7 @@ {%- endif %} {%- endif %} -{# if grains.role in ['so-eval','so-standalone','so-manager', 'so-managersearch', 'so-heavynode'] -%} +{# if grains.role in ['so-eval','so-standalone','so-manager', 'so-managersearch', 'so-heavynode', 'so-receiver'] -%} [[inputs.redis]] servers = ["tcp://localhost:6379"] {%- endif #} @@ -735,7 +735,7 @@ data_format = "influx" ## Timeout for each command to complete. timeout = "15s" -{% elif grains['role'] in ['so-node'] %} +{% elif grains['role'] in ['so-node', 'so-receiver'] %} [[inputs.exec]] commands = [ "/scripts/eps.sh", From da3e1e402a32682c700ee0c0417678420b7bcae1 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 28 Jan 2022 17:27:58 -0500 Subject: [PATCH 2/5] add receiver dashboard grafana --- salt/grafana/defaults.yaml | 313 +++++++++++++++++++++++++++++++++++++ 1 file changed, 313 insertions(+) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index 77500778c..024fd5dfd 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -2731,6 +2731,319 @@ grafana: w: 24 + receiver: + templating: + list: + servername: {} + role: + allValue: false + multi: false + hide: 2 + 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 + io_wait_stat: + gridPos: + x: 20 + y: 1 + h: 4 + w: 4 + 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 + redis_queue_stat: + gridPos: + x: 8 + y: 5 + h: 4 + w: 4 + + row_cpu: + gridPos: + x: 0 + y: 9 + h: 1 + w: 24 + cpu_usage_tasks_all_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_interface_traffic_both_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 + + 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_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 + + row_redis: + gridPos: + x: 0 + y: 180 + h: 1 + w: 24 + redis_queue_graph: + gridPos: + x: 0 + y: 181 + h: 8 + w: 24 + + pipeline_overview_nontc: title: 'Pipeline Overview' templating: From bf26ae8e41be4ea01549ea4b63306bd83815f438 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 28 Jan 2022 17:32:53 -0500 Subject: [PATCH 3/5] add receiver to allowed dashboards --- salt/grafana/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/grafana/init.sls b/salt/grafana/init.sls index 3034bc679..667d2052b 100644 --- a/salt/grafana/init.sls +++ b/salt/grafana/init.sls @@ -12,7 +12,7 @@ {% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone'] or (grains.role == 'so-eval' and GRAFANA == 1) %} -{% set ALLOWED_DASHBOARDS = ['overview', 'standalone', 'manager', 'managersearch', 'sensor', 'searchnode', 'heavynode', 'eval'] %} +{% set ALLOWED_DASHBOARDS = ['overview', 'standalone', 'manager', 'managersearch', 'sensor', 'searchnode', 'heavynode', 'eval', 'receiver'] %} {% set DASHBOARDS = ['overview'] %} {% if grains.role == 'so-eval' %} {% do DASHBOARDS.append('eval') %} From 980a1a0c3de2950f4da674b6f8d7df01711d7b18 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 28 Jan 2022 17:44:04 -0500 Subject: [PATCH 4/5] add redis to receiver telegraf --- salt/telegraf/etc/telegraf.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf index 2644f152d..c43aae746 100644 --- a/salt/telegraf/etc/telegraf.conf +++ b/salt/telegraf/etc/telegraf.conf @@ -740,6 +740,9 @@ commands = [ "/scripts/eps.sh", "/scripts/raid.sh", + {% if grains.role == 'so-receiver'% } + "/scripts/redis.sh", + {% endif %} "/scripts/beatseps.sh" ] data_format = "influx" From 3aee8656d45fca8726c3b005f086b381d9542209 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 28 Jan 2022 17:45:12 -0500 Subject: [PATCH 5/5] fix %} - add redis to receiver telegraf --- salt/telegraf/etc/telegraf.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/telegraf/etc/telegraf.conf b/salt/telegraf/etc/telegraf.conf index c43aae746..cc494f252 100644 --- a/salt/telegraf/etc/telegraf.conf +++ b/salt/telegraf/etc/telegraf.conf @@ -740,7 +740,7 @@ commands = [ "/scripts/eps.sh", "/scripts/raid.sh", - {% if grains.role == 'so-receiver'% } + {% if grains.role == 'so-receiver' %} "/scripts/redis.sh", {% endif %} "/scripts/beatseps.sh"