Merge "Add http_response input"
diff --git a/telegraf/agent.sls b/telegraf/agent.sls
index 249ab22..d04385f 100644
--- a/telegraf/agent.sls
+++ b/telegraf/agent.sls
@@ -35,6 +35,9 @@
file.managed:
- name: {{ agent.dir.config_d }}/input-{{ name }}.conf
- source:
+{%- if values.template is defined %}
+ - salt://{{ values.template }}
+{%- endif %}
- salt://telegraf/files/input/{{ name }}.conf
- salt://telegraf/files/input/generic.conf
- user: root
diff --git a/telegraf/files/input/influxdb.conf b/telegraf/files/input/influxdb.conf
new file mode 100644
index 0000000..f9acde9
--- /dev/null
+++ b/telegraf/files/input/influxdb.conf
@@ -0,0 +1,4 @@
+[[inputs.influxdb]]
+ urls = [{%- for server in values.servers|default([]) %}"{{ server.url }}"{%- if not loop.last%}, {% endif %} {%- endfor %}]
+ timeout = "{{ values.timeout|default(5) }}s"
+{%- include 'telegraf/files/input/_tags.conf' %}
diff --git a/telegraf/files/input/zookeeper.conf b/telegraf/files/input/zookeeper.conf
new file mode 100644
index 0000000..205c030
--- /dev/null
+++ b/telegraf/files/input/zookeeper.conf
@@ -0,0 +1,2 @@
+[[inputs.zookeeper]]
+ servers = ["{{ values.address|default("127.0.0.1") }}:{{ values.port|default(2181) }}"]
diff --git a/telegraf/remote_agent.sls b/telegraf/remote_agent.sls
index d79ffb3..f7123f1 100644
--- a/telegraf/remote_agent.sls
+++ b/telegraf/remote_agent.sls
@@ -46,6 +46,9 @@
file.managed:
- name: {{ remote_agent.dir.config_d }}/input-{{ name }}.conf
- source:
+{%- if values.template is defined %}
+ - salt://{{ values.template }}
+{%- endif %}
- salt://telegraf/files/input/{{ name }}.conf
- salt://telegraf/files/input/generic.conf
- user: root