diff --git a/telegraf/agent.sls b/telegraf/agent.sls
index 56bbc2a..5c2728f 100644
--- a/telegraf/agent.sls
+++ b/telegraf/agent.sls
@@ -41,12 +41,12 @@
         name: {{ name }}
         values: {{ values }}
 
-{%- if name == 'docker' %}
-telegraf_user:
+{%- if name in ('docker', 'haproxy') %}
+telegraf_user_in_group_{{ name }}:
   user.present:
     - name: telegraf
     - optional_groups:
-      - docker
+      - {{ name }}
     - require:
       - pkg: telegraf_packages
 {%- endif %}
diff --git a/telegraf/files/input/haproxy.conf b/telegraf/files/input/haproxy.conf
new file mode 100644
index 0000000..e054b0e
--- /dev/null
+++ b/telegraf/files/input/haproxy.conf
@@ -0,0 +1,4 @@
+[[inputs.haproxy]]
+  servers = [{%- for server in values.servers|default([]) %}"{{ server }}"{%- if not loop.last%}, {% endif %} {%- endfor %}]
+
+{%- include 'telegraf/files/input/_tags.conf' %}