summaryrefslogtreecommitdiff
path: root/ctdb/utils
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-11-21 10:48:25 +1100
committerKarolin Seeger <kseeger@samba.org>2014-12-10 20:56:09 +0100
commit410c785c9800c4c61c2a02edc134c80f0fda9605 (patch)
tree9372a4aabccedf10efb47b5dfb85ce5cfa2f1d5f /ctdb/utils
parent4d3d4bc66be7ddbd788175f77e5f5ab3a56406f7 (diff)
downloadsamba-410c785c9800c4c61c2a02edc134c80f0fda9605.tar.gz
ctdb-utils: Update Nagios code to use ctdb -X
Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com> (cherry picked from commit b41c1bdaa1df92ee6c510ae6749d0524b88ef828)
Diffstat (limited to 'ctdb/utils')
-rwxr-xr-x[-rw-r--r--]ctdb/utils/nagios/check_ctdb4
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/utils/nagios/check_ctdb b/ctdb/utils/nagios/check_ctdb
index 837a0a4539a..7803f9a6c3d 100644..100755
--- a/ctdb/utils/nagios/check_ctdb
+++ b/ctdb/utils/nagios/check_ctdb
@@ -177,7 +177,7 @@ sub safe_close_command {
if ($info eq "scriptstatus") {
$result = OK;
- safe_open_command('ctdb', '-Y', 'scriptstatus');
+ safe_open_command('ctdb', '-X', 'scriptstatus');
if ($result == OK) {
my $script_count = 0;
my $ok_script_count = 0;
@@ -187,7 +187,7 @@ if ($info eq "scriptstatus") {
next if $. == 1; # Header
$script_count++;
chop;
- my ($col0, $type, $name, $code, $status, $start, $end, @error) = split(":");
+ my ($col0, $type, $name, $code, $status, $start, $end, @error) = split("|");
if ($col0 ne '') {
# Old version, before 30 Aug 2011 and commit a779d83a6213
($type, $name, $code, $status, $start, $end, @error) = ($col0, $type, $name, $code, $status, $start, $end, @error);