shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-26 06:50:09 +03:00
Code Releases Wiki Activity

F #3859: Fix probe renaming

Browse Source 
(cherry picked from commit 7424216f46226450dc27bc0a34030c37dfcce314)
This commit is contained in:
Ruben S. Montero 2020-03-17 16:31:58 +01:00
parent cdeb24acc4
commit 577619deb8
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/im_mad/remotes/common.d/monitord-client-shepherd.sh
View File

@ -19,7 +19,7 @@
(
[ -f /tmp/one-monitord-client.pid ] || exit 0
running_pid=$(cat /tmp/one-monitord-client.pid)
pids=$(ps axuwww | grep -e /collectd-client.rb -e /monitord-client.rb| grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
pids=$(ps axuwww | grep -e /monitord-client.rb| grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
if [ -n "$pids" ]; then
kill -6 $pids

2
src/im_mad/remotes/common.d/monitord-client-shepherd_local.sh
View File

@ -27,7 +27,7 @@ CLIENT_PID_FILE=/tmp/one-monitord-$HID.pid
[ -f $CLIENT_PID_FILE ] || exit 0
running_pid=$(cat $CLIENT_PID_FILE)
pids=$(ps axuwww | grep -e "/collectd-client.rb.*${HID}" -e "/monitord-client.rb.*${HID} " | grep -v grep | \
pids=$(ps axuwww | grep -e "/monitord-client.rb.*${HID} " | grep -v grep | \
awk '{ print $2 }' | grep -v "^${running_pid}$")
if [ -n "$pids" ]; then

2
src/im_mad/remotes/kvm-probes.d/host/beacon/monitord-client-shepherd.sh
View File

@ -19,7 +19,7 @@
(
[ -f /tmp/one-monitord-client.pid ] || exit 0
running_pid=$(cat /tmp/one-monitord-client.pid)
pids=$(ps axuwww | grep -e "/collectd-client.rb kvm" -e "/monitord-client.rb kvm" | grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
pids=$(ps axuwww | grep -e "/monitord-client.rb kvm" | grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
if [ -n "$pids" ]; then
kill -6 $pids

2
src/im_mad/remotes/lxd-probes.d/host/beacon/monitord-client-shepherd.sh
View File

@ -19,7 +19,7 @@
(
[ -f /tmp/one-monitord-client.pid ] || exit 0
running_pid=$(cat /tmp/one-monitord-client.pid)
pids=$(ps axuwww | grep -e "/monitord-client.rb lxd" -e "/collectd-client.rb lxd" | grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
pids=$(ps axuwww | grep -e "/monitord-client.rb lxd" | grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
if [ -n "$pids" ]; then
kill -6 $pids