Merge "Optimize 'noservices' condition"
diff --git a/telegraf/agent.sls b/telegraf/agent.sls
index 5f83274..3b677bc 100644
--- a/telegraf/agent.sls
+++ b/telegraf/agent.sls
@@ -34,10 +34,8 @@
- template: jinja
- require:
- pkg: telegraf_packages_agent
- {%- if not grains.get('noservices', False)%}
- watch_in:
- service: telegraf_service_agent
- {%- endif %}
- defaults:
name: {{ name }}
values: {{ values }}
@@ -58,10 +56,8 @@
- name: {{ agent.dir.config_d }}/input-{{ name }}.conf
- require:
- pkg: telegraf_packages_agent
- {%- if not grains.get('noservices', False)%}
- watch_in:
- service: telegraf_service_agent
- {%- endif %}
{%- endif %}
{%- endfor %}
@@ -78,25 +74,22 @@
- template: jinja
- require:
- pkg: telegraf_packages_agent
- {%- if not grains.get('noservices', False)%}
- watch_in:
- service: telegraf_service_agent
- {%- endif %}
- defaults:
name: {{ name }}
values: {{ values }}
{%- endfor %}
-{%- if not grains.get('noservices', False)%}
-
telegraf_service_agent:
service.running:
- name: telegraf
- enable: True
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
- watch:
- file: telegraf_config_agent
{%- endif %}
-
-{%- endif %}