Merge pillar + mine data for remote input plugins
This is needed to enable additional plugins (such as http_listener)
from the user/system model.
Change-Id: Ibd647e855e38a492a0de2b8ead6df755e99fe921
diff --git a/telegraf/remote_agent.sls b/telegraf/remote_agent.sls
index 5442d53..ca83129 100644
--- a/telegraf/remote_agent.sls
+++ b/telegraf/remote_agent.sls
@@ -30,7 +30,7 @@
- context:
agent: {{ remote_agent }}
-{%- set remote_agent_inputs = {'input': {}} %}
+{%- set remote_agent_inputs = {'input': remote_agent.input} %}
{%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
{%- set remote_agent_input = node_grains.get('telegraf', {}).get('remote_agent', {}).get('input', {}) %}
{%- if remote_agent_input %}