Added elasticsearch_port to the default. Support clusters in the config. [ci skip]

analytically · analytically · commit 503a749e2a1b · 2014-03-18T11:18:05.000+01:00
diff --git a/roles/td_agent/defaults/main.yml b/roles/td_agent/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+
+elasticsearch_port: 9200
diff --git a/roles/td_agent/tasks/main.yml b/roles/td_agent/tasks/main.yml
@@ -40,6 +40,8 @@
 
 - name: configure td-agent in /etc/td-agent/td-agent.conf
   template: src=td-agent.conf dest=/etc/td-agent/td-agent.conf owner=root group=root mode=0644
-  tags: tdagent
+  tags:
+    - tdagent
+    - configuration
   notify:
     - restart td-agent
diff --git a/roles/td_agent/templates/td-agent.conf b/roles/td_agent/templates/td-agent.conf
@@ -17,7 +17,14 @@
 </source>
 
 <match syslog.**>
+
   type elasticsearch
   logstash_format true
-  host {{ hostvars[groups["monitors"][0]]["ansible_default_ipv4"]["address"] }}
-</match>
+  {% if groups["elasticsearch"]|length == 1 %}
+  host {{ hostvars[groups["elasticsearch"][0]]["ansible_default_ipv4"]["address"] }}
+  port {{ elasticsearch_port }}
+  {% else %}
+  hosts {% for host in groups['elasticsearch'] %}{{ hostvars[host]["ansible_default_ipv4"]["address"] }}:{{ elasticsearch_port }}{% if not loop.last %},{% endif %}{% endfor %}
+  {% endif %}
+
+</match>
