From f1576105c81964f6516a7239bd2ced07e48f738b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Vachon?= Date: Wed, 27 May 2015 17:58:13 -0400 Subject: [PATCH] Added host services list to status API Change-Id: Ia062b28d315d63a2992ccf8514ca73d689fb3041 --- surveil/api/datamodel/status/live_host.py | 6 +++++- surveil/tests/api/controllers/v2/status/test_hosts.py | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/surveil/api/datamodel/status/live_host.py b/surveil/api/datamodel/status/live_host.py index 20b0aed..a5294a2 100644 --- a/surveil/api/datamodel/status/live_host.py +++ b/surveil/api/datamodel/status/live_host.py @@ -52,6 +52,9 @@ class LiveHost(types.Base): long_output = wsme.wsattr(wtypes.text, mandatory=False) """Plugin long output of the last check""" + services = wsme.wsattr([wtypes.text], mandatory=False) + """The services of the host""" + @classmethod def sample(cls): return cls( @@ -65,5 +68,6 @@ class LiveHost(types.Base): last_check=1429220785, last_state_change=1429220785, plugin_output='PING OK - Packet loss = 0%, RTA = 0.02 ms', - long_output='The ping was great\nI love epic ping-pong games' + long_output='The ping was great\nI love epic ping-pong games', + services=['load', 'cpu', 'disk_usage'] ) diff --git a/surveil/tests/api/controllers/v2/status/test_hosts.py b/surveil/tests/api/controllers/v2/status/test_hosts.py index 2c3f9f0..f36f334 100644 --- a/surveil/tests/api/controllers/v2/status/test_hosts.py +++ b/surveil/tests/api/controllers/v2/status/test_hosts.py @@ -36,6 +36,7 @@ class TestStatusHosts(functionalTest.FunctionalTest): "state_type": "HARD", "problem_has_been_acknowledged": True, "host_name": "localhost", + "services": ["load", "cpu"], }, { "display_name": "test_keystone", @@ -50,6 +51,7 @@ class TestStatusHosts(functionalTest.FunctionalTest): "state_type": "HARD", "problem_has_been_acknowledged": True, "host_name": "test_keystone", + "services": ["apache"], }, { "display_name": "ws-arbiter", @@ -64,6 +66,7 @@ class TestStatusHosts(functionalTest.FunctionalTest): "state_type": "HARD", "problem_has_been_acknowledged": True, "host_name": "ws-arbiter", + "services": [], }, ] self.mongoconnection.shinken_live.hosts.insert( @@ -111,6 +114,7 @@ class TestStatusHosts(functionalTest.FunctionalTest): "last_check": 1429405764, "state": "OK", "acknowledged": True, + "services": ["load", "cpu"], "host_name": "localhost"}, {"description": "test_keystone", "address": "127.0.0.1", @@ -122,6 +126,7 @@ class TestStatusHosts(functionalTest.FunctionalTest): "last_check": 1429405763, "state": "OK", "acknowledged": True, + "services": ["apache"], "host_name": "test_keystone"}, {"description": "ws-arbiter", "address": "127.0.0.1", @@ -133,6 +138,7 @@ class TestStatusHosts(functionalTest.FunctionalTest): "last_check": 1429405764, "state": "OK", "acknowledged": True, + "services": [], "host_name": "ws-arbiter"}] self.assert_count_equal_backport(json.loads(response.body.decode()), @@ -170,6 +176,7 @@ class TestStatusHosts(functionalTest.FunctionalTest): "last_check": 1429812191, "state": "OK", "host_name": "localhost", + "services": ["load", "cpu"], "address": "localhost"} self.assert_count_equal_backport(json.loads(response.body.decode()),