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/08/10 19:16:34 UTC
git commit: AMBARI-6805. Flume: Alert should not show up as warning
if there are no agents configured on the host (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk 6396b5b7c -> 9293ae940
AMBARI-6805. Flume: Alert should not show up as warning if there are no agents configured on the host (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9293ae94
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9293ae94
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9293ae94
Branch: refs/heads/trunk
Commit: 9293ae9409a435570ec6b8a263a398d7ca3bda5c
Parents: 6396b5b
Author: Nate Cole <nc...@hortonworks.com>
Authored: Fri Aug 8 21:56:05 2014 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Sat Aug 9 08:06:08 2014 -0400
----------------------------------------------------------------------
.../HDP/2.0.6/services/FLUME/package/scripts/flume_handler.py | 2 +-
ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9293ae94/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/flume_handler.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/flume_handler.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/flume_handler.py
index 36bc889..99c29cb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/flume_handler.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/FLUME/package/scripts/flume_handler.py
@@ -68,7 +68,7 @@ class FlumeHandler(Script):
alert['label'] = 'Flume Agent process'
if len(processes) == 0 and len(expected_agents) == 0:
- alert['state'] = 'WARNING'
+ alert['state'] = 'OK'
if not params.hostname is None:
alert['text'] = 'No agents defined on ' + params.hostname
http://git-wip-us.apache.org/repos/asf/ambari/blob/9293ae94/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
index c1f48d0..e4fd61d 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/FLUME/test_flume.py
@@ -98,7 +98,7 @@ class TestFlumeHandler(RMFTestCase):
# test that the method was called with empty processes
self.assertTrue(structured_out_mock.called)
structured_out_mock.assert_called_with({'processes': [],
- 'alerts': [{'text': 'No agents defined on c6401.ambari.apache.org', 'state': 'WARNING', 'name': 'flume_agent', 'label': 'Flume Agent process'}]})
+ 'alerts': [{'text': 'No agents defined on c6401.ambari.apache.org', 'state': 'OK', 'name': 'flume_agent', 'label': 'Flume Agent process'}]})
self.assertNoMoreResources()
@patch("resource_management.libraries.script.Script.put_structured_out")