Merge pull request #5 from arruko/feature/jhg/ANS-001

ANS-004 Change configuration for logstash output and beats default listen port
arruko · Sep 26, 2018 · 1b0c7dc · 1b0c7dc
2 parents 8087297 + a7cf7a2
commit 1b0c7dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -2,12 +2,12 @@
 logstash_major_ver: 6.x
 logstash_repo_key: https://artifacts.elastic.co/GPG-KEY-elasticsearch
 logstash_deb_repo: "deb https://artifacts.elastic.co/packages/{{ logstash_major_ver }}/apt stable main"
-logstash_listen_port_beats: 5044
+logstash_listen_port_beats: 5043
 logstash_local_syslog_path: /var/log/syslog
 logstash_monitor_local_syslog: true
 logstash_enabled_on_boot: yes
 logstash_min_memory_required: 2048
-logstash_elasticsearch_hosts: "{{ groups['elasticsearch'] | map('extract', hostvars, ['ansible_host']) | list }}"
 logstash_elasticsearch_inventory_group_name: elasticsearch
+logstash_elasticsearch_hosts: "{{ groups[logstash_elasticsearch_inventory_group_name] | map('extract', hostvars, ['ansible_host']) | list }}"
 logstash_install_plugins:
   - logstash-input-beats
diff --git a/files/filters/nginx.conf b/files/filters/nginx.conf
diff --git a/templates/03-elasticsearch-output.conf.j2 b/templates/03-elasticsearch-output.conf.j2
@@ -2,7 +2,7 @@ output {
   elasticsearch {
     hosts => {{ logstash_elasticsearch_hosts | to_json }}
     index => "%{[@metadata][beat]}-%{+YYYY.MM.dd}"
-    document_type => "%{[@metadata][type]}"
+    document_type => "%{[@metadata][beat]}-%{+YYYY.MM.dd}"
     flush_size => '100'
   }
 }