Merge pull request Normation#783 from peckpeck/bug_7338/all_reports_a…

…re_missing_totally_orange_for_a_node_due_to_multiple_cf_execd_processes Fixes #7338: All reports are missing (totally orange) for a node due to multiple cf-execd processes
amousset · Nov 4, 2015 · 6ab33d7 · 6ab33d7
2 parents a8f2032 + 05320e8
commit 6ab33d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/rudder-agent/SOURCES/check-rudder-agent b/rudder-agent/SOURCES/check-rudder-agent
@@ -76,7 +76,8 @@ check_and_fix_cfengine_processes() {
       PS_COMMAND="/opt/rudder/bin/vzps.py -E 0"
     fi
   elif [ -n "${ns}" ]; then # we have namespaces
-    PS_COMMAND="eval ps --no-header -e -O utsns | grep -E '^[[:space:]]*[[:digit:]]*[[:space:]]+${ns}'"
+    # the sed is here to prepend a fake user field that is removed by the -o option (it is never used)
+    PS_COMMAND="eval ps --no-header -e -O utsns | grep -E '^[[:space:]]*[[:digit:]]*[[:space:]]+${ns}' | sed 's/^/user /'"
   else # standard unix
     PS_COMMAND="ps -ef"
   fi

diff --git a/rudder-agent/SOURCES/rudder-agent.init b/rudder-agent/SOURCES/rudder-agent.init
@@ -75,7 +75,8 @@ if [ -e "/proc/bc/0" ]; then # we have openvz
     PS_COMMAND="/opt/rudder/bin/vzps.py -E 0"
   fi
 elif [ -n "${ns}" ]; then # we have namespaces
-  PS_COMMAND="eval ps --no-header -e -O utsns | grep -E '^[[:space:]]*[[:digit:]]*[[:space:]]+${ns}'"
+  # the sed is here to prepend a fake user field that is removed by the -o option (it is never used)
+  PS_COMMAND="eval ps --no-header -e -O utsns | grep -E '^[[:space:]]*[[:digit:]]*[[:space:]]+${ns}' | sed 's/^/user /'"
 else # standard unix
   PS_COMMAND="ps -ef"
 fi