You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2014/01/20 23:32:03 UTC
git commit: AMBARI-4360. Fix for value parsing with Nagios alerts
(ncole)
Updated Branches:
refs/heads/trunk 2949ce171 -> 49bf41a56
AMBARI-4360. Fix for value parsing with Nagios alerts (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/49bf41a5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49bf41a5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49bf41a5
Branch: refs/heads/trunk
Commit: 49bf41a56510f5911a391fc63adc8637853811e7
Parents: 2949ce1
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Jan 20 17:21:49 2014 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Jan 20 17:31:14 2014 -0500
----------------------------------------------------------------------
.../server/controller/nagios/NagiosAlert.java | 20 ++++++++++++++------
.../src/test/resources/nagios_alerts.txt | 2 +-
2 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/49bf41a5/ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosAlert.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosAlert.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosAlert.java
index 034bdf7..d456f78 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosAlert.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosAlert.java
@@ -123,16 +123,16 @@ public class NagiosAlert {
try {
switch (getStatus()) {
case 0:
- l = Long.parseLong (last_time_ok);
+ l = getLong (last_time_ok);
break;
case 1:
- l = Long.parseLong(last_time_warning);
+ l = getLong(last_time_warning);
break;
case 2:
- l = Long.parseLong(last_time_critical);
+ l = getLong(last_time_critical);
break;
default:
- l = Long.parseLong(last_time_unknown);
+ l = getLong(last_time_unknown);
break;
}
} catch (Exception e) {
@@ -146,8 +146,16 @@ public class NagiosAlert {
* @return the last status timestamp
*/
public long getLastStatusTime() {
- return Long.parseLong(last_hard_state_change);
- }
+ return getLong(last_hard_state_change);
+ }
+
+ private long getLong(String str) {
+ try {
+ return Long.parseLong(str);
+ } catch (Exception e) {
+ return 0L;
+ }
+ }
@Override
public String toString() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/49bf41a5/ambari-server/src/test/resources/nagios_alerts.txt
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/nagios_alerts.txt b/ambari-server/src/test/resources/nagios_alerts.txt
index 9255981..196a2fd 100644
--- a/ambari-server/src/test/resources/nagios_alerts.txt
+++ b/ambari-server/src/test/resources/nagios_alerts.txt
@@ -102,7 +102,7 @@
"current_attempt": "1",
"current_state": "0",
"plugin_output": "1 CPU, load 7.0% < 200% : OK",
- "last_hard_state_change": "1389125423",
+ "last_hard_state_change": "",
"last_hard_state": "0",
"last_time_ok": "1389288443",
"last_time_warning": "0",