You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2014/05/16 17:26:19 UTC
git commit: AMBARI-5763. Nagios should send alert for
NumberOfMissingBlocks instead of CorruptBlocks.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 7e8c4aad1 -> 221b456c6
AMBARI-5763. Nagios should send alert for NumberOfMissingBlocks instead of CorruptBlocks.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/221b456c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/221b456c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/221b456c
Branch: refs/heads/trunk
Commit: 221b456c66153898c3a2f1c164e0fa6feaa8b407
Parents: 7e8c4aa
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Fri May 16 18:25:53 2014 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Fri May 16 18:25:53 2014 +0300
----------------------------------------------------------------------
.../NAGIOS/package/files/check_hdfs_blocks.php | 25 +++++---------------
.../package/templates/hadoop-commands.cfg.j2 | 2 +-
.../package/templates/hadoop-services.cfg.j2 | 2 +-
.../NAGIOS/package/files/check_hdfs_blocks.php | 23 ++++--------------
.../package/templates/hadoop-commands.cfg.j2 | 2 +-
.../package/templates/hadoop-services.cfg.j2 | 2 +-
6 files changed, 15 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/221b456c/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_hdfs_blocks.php
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_hdfs_blocks.php b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_hdfs_blocks.php
index 19347b4..ca52ccc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_hdfs_blocks.php
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/files/check_hdfs_blocks.php
@@ -24,17 +24,13 @@
include "hdp_nagios_init.php";
- $options = getopt ("h:p:w:c:s:e:k:r:t:u:");
- if (!array_key_exists('h', $options) || !array_key_exists('p', $options) || !array_key_exists('w', $options)
- || !array_key_exists('c', $options) || !array_key_exists('s', $options)) {
+ $options = getopt ("h:p:s:e:k:r:t:u:");
+ if (!array_key_exists('h', $options) || !array_key_exists('p', $options) || !array_key_exists('s', $options)) {
usage();
exit(3);
}
-
$hosts=$options['h'];
$port=$options['p'];
- $warn=$options['w']; $warn = preg_replace('/%$/', '', $warn);
- $crit=$options['c']; $crit = preg_replace('/%$/', '', $crit);
$nn_jmx_property=$options['s'];
$keytab_path=$options['k'];
$principal_name=$options['r'];
@@ -75,10 +71,8 @@
curl_close($ch);
$json_array = json_decode($json_string, true);
$m_percent = 0;
- $c_percent = 0;
$object = $json_array['beans'][0];
$missing_blocks = $object['MissingBlocks'];
- $corrupt_blocks = $object['CorruptBlocks'];
$total_blocks = $object['BlocksTotal'];
if (count($object) == 0) {
echo "CRITICAL: Data inaccessible, Status code = ". $info['http_code'] ."\n";
@@ -86,30 +80,23 @@
}
if($total_blocks == 0) {
$m_percent = 0;
- $c_percent = 0;
} else {
$m_percent = ($missing_blocks/$total_blocks)*100;
- $c_percent = ($corrupt_blocks/$total_blocks)*100;
break;
}
}
- $out_msg = "corrupt_blocks:<" . $corrupt_blocks .
- ">, missing_blocks:<" . $missing_blocks .
+ $out_msg = "missing_blocks:<" . $missing_blocks .
">, total_blocks:<" . $total_blocks . ">";
- if ($m_percent > $crit || $c_percent > $crit) {
+ if ($m_percent > 0) {
echo "CRITICAL: " . $out_msg . "\n";
exit (2);
}
- if ($m_percent > $warn || $c_percent > $warn) {
- echo "WARNING: " . $out_msg . "\n";
- exit (1);
- }
echo "OK: " . $out_msg . "\n";
exit(0);
/* print usage */
function usage () {
- echo "Usage: $0 -h <host> -p port -w <warn%> -c <crit%> -s <namenode bean name> -k keytab path -r principal name -t kinit path -s security enabled -e ssl enabled\n";
+ echo "Usage: $0 -h <host> -p port -s <namenode bean name> -k keytab path -r principal name -t kinit path -u security enabled -e ssl enabled\n";
}
-?>
+?>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/221b456c/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-commands.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
index ae95427..7aade5b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
@@ -55,7 +55,7 @@ define command {
define command{
command_name check_hdfs_blocks
- command_line $USER1$/check_wrapper.sh php $USER1$/check_hdfs_blocks.php -h $ARG1$ -p $ARG2$ -w $ARG3$ -c $ARG4$ -s $ARG5$ -e $ARG6$ -k $ARG7$ -r $ARG8$ -t $ARG9$ -u $ARG10$
+ command_line $USER1$/check_wrapper.sh php $USER1$/check_hdfs_blocks.php -h $ARG1$ -p $ARG2$ -s $ARG3$ -e $ARG4$ -k $ARG5$ -r $ARG6$ -t $ARG7$ -u $ARG8$
}
define command{
http://git-wip-us.apache.org/repos/asf/ambari/blob/221b456c/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 882e781..a42d795 100644
--- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2
@@ -304,7 +304,7 @@ define service {
use hadoop-service
service_description HDFS::Blocks health
servicegroups HDFS
- check_command check_hdfs_blocks!$HOSTGROUPMEMBERS:namenode$!{{ namenode_port }}!0%!0%!{{ nn_metrics_property }}!{{ str(hadoop_ssl_enabled).lower() }}!{{ nagios_keytab_path }}!{{ nagios_principal_name }}!{{ kinit_path_local }}!{{ str(security_enabled).lower() }}
+ check_command check_hdfs_blocks!$HOSTGROUPMEMBERS:namenode$!{{ namenode_port }}!{{ nn_metrics_property }}!{{ str(hadoop_ssl_enabled).lower() }}!{{ nagios_keytab_path }}!{{ nagios_principal_name }}!{{ kinit_path_local }}!{{ str(security_enabled).lower() }}
normal_check_interval 2
retry_check_interval 1
max_check_attempts 1
http://git-wip-us.apache.org/repos/asf/ambari/blob/221b456c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_hdfs_blocks.php
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_hdfs_blocks.php b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_hdfs_blocks.php
index 19347b4..3693aa0 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_hdfs_blocks.php
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/check_hdfs_blocks.php
@@ -24,17 +24,13 @@
include "hdp_nagios_init.php";
- $options = getopt ("h:p:w:c:s:e:k:r:t:u:");
- if (!array_key_exists('h', $options) || !array_key_exists('p', $options) || !array_key_exists('w', $options)
- || !array_key_exists('c', $options) || !array_key_exists('s', $options)) {
+ $options = getopt ("h:p:s:e:k:r:t:u:");
+ if (!array_key_exists('h', $options) || !array_key_exists('p', $options) || !array_key_exists('s', $options)) {
usage();
exit(3);
}
-
$hosts=$options['h'];
$port=$options['p'];
- $warn=$options['w']; $warn = preg_replace('/%$/', '', $warn);
- $crit=$options['c']; $crit = preg_replace('/%$/', '', $crit);
$nn_jmx_property=$options['s'];
$keytab_path=$options['k'];
$principal_name=$options['r'];
@@ -75,10 +71,8 @@
curl_close($ch);
$json_array = json_decode($json_string, true);
$m_percent = 0;
- $c_percent = 0;
$object = $json_array['beans'][0];
$missing_blocks = $object['MissingBlocks'];
- $corrupt_blocks = $object['CorruptBlocks'];
$total_blocks = $object['BlocksTotal'];
if (count($object) == 0) {
echo "CRITICAL: Data inaccessible, Status code = ". $info['http_code'] ."\n";
@@ -86,30 +80,23 @@
}
if($total_blocks == 0) {
$m_percent = 0;
- $c_percent = 0;
} else {
$m_percent = ($missing_blocks/$total_blocks)*100;
- $c_percent = ($corrupt_blocks/$total_blocks)*100;
break;
}
}
- $out_msg = "corrupt_blocks:<" . $corrupt_blocks .
- ">, missing_blocks:<" . $missing_blocks .
+ $out_msg = "missing_blocks:<" . $missing_blocks .
">, total_blocks:<" . $total_blocks . ">";
- if ($m_percent > $crit || $c_percent > $crit) {
+ if ($m_percent > 0) {
echo "CRITICAL: " . $out_msg . "\n";
exit (2);
}
- if ($m_percent > $warn || $c_percent > $warn) {
- echo "WARNING: " . $out_msg . "\n";
- exit (1);
- }
echo "OK: " . $out_msg . "\n";
exit(0);
/* print usage */
function usage () {
- echo "Usage: $0 -h <host> -p port -w <warn%> -c <crit%> -s <namenode bean name> -k keytab path -r principal name -t kinit path -s security enabled -e ssl enabled\n";
+ echo "Usage: $0 -h <host> -p port -s <namenode bean name> -k keytab path -r principal name -t kinit path -u security enabled -e ssl enabled\n";
}
?>
http://git-wip-us.apache.org/repos/asf/ambari/blob/221b456c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-commands.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
index ba5c532..582557b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-commands.cfg.j2
@@ -55,7 +55,7 @@ define command {
define command{
command_name check_hdfs_blocks
- command_line $USER1$/check_wrapper.sh php $USER1$/check_hdfs_blocks.php -h $ARG1$ -p $ARG2$ -w $ARG3$ -c $ARG4$ -s $ARG5$ -e $ARG6$ -k $ARG7$ -r $ARG8$ -t $ARG9$ -u $ARG10$
+ command_line $USER1$/check_wrapper.sh php $USER1$/check_hdfs_blocks.php -h $ARG1$ -p $ARG2$ -s $ARG3$ -e $ARG4$ -k $ARG5$ -r $ARG6$ -t $ARG7$ -u $ARG8$
}
define command{
http://git-wip-us.apache.org/repos/asf/ambari/blob/221b456c/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2 b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
index 4cb63b2..007cc78 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2
@@ -425,7 +425,7 @@ define service {
use hadoop-service
service_description HDFS::Blocks health
servicegroups HDFS
- check_command check_hdfs_blocks!$HOSTGROUPMEMBERS:namenode$!{{ namenode_port }}!0%!0%!{{ nn_metrics_property }}!{{ str(hadoop_ssl_enabled).lower() }}!{{ nagios_keytab_path }}!{{ nagios_principal_name }}!{{ kinit_path_local }}!{{ str(security_enabled).lower() }}
+ check_command check_hdfs_blocks!$HOSTGROUPMEMBERS:namenode$!{{ namenode_port }}!{{ nn_metrics_property }}!{{ str(hadoop_ssl_enabled).lower() }}!{{ nagios_keytab_path }}!{{ nagios_principal_name }}!{{ kinit_path_local }}!{{ str(security_enabled).lower() }}
normal_check_interval 2
retry_check_interval 1
max_check_attempts 1