commit dc341ced0a291775c28e2a0bc2d8b1a5da5623f5
author jenkins-mk jenkins-mk <jenkins-mk@gerrit.mcp.mirantis.net> Thu Jul 13 15:05:13 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Thu Jul 13 15:05:13 2017 +0000
tree 75d7cdb0758c981b4986894ff7d17a192a82205b
parent 51dc3eb9f3ed6fb1216f7b219ef1f7aeb6b61fb9
parent e41890c2d255579d7b0c826b348fc50b3249348f

Merge "Redirect docker stderr to /dev/null"

telegraf/remote_agent.sls

diff --git a/telegraf/remote_agent.sls b/telegraf/remote_agent.sls
index 2f32561..6a508cf 100644
--- a/telegraf/remote_agent.sls
+++ b/telegraf/remote_agent.sls
@@ -4,7 +4,7 @@
 {%- if remote_agent.get('enabled', False) %}
 
 {%- set remote_agent_label = pillar.get('docker', {}).get('client', {}).get('stack', {}).get('monitoring', {}).get('service', {}).get('remote_agent', {}).get('deploy', {}).get('labels', {}).get('com.mirantis.monitoring', 'remote_agent') %}
-{%- set docker_ids = salt['cmd.run']("docker ps -q -f 'label=com.mirantis.monitoring=" + remote_agent_label + "'") %}
+{%- set docker_ids = salt['cmd.run']("docker ps -q -f 'label=com.mirantis.monitoring=" + remote_agent_label + "' 2> /dev/null") %}
 
 config_dir_remote_agent:
   file.directory: