You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/11/11 21:43:07 UTC
[04/17] ambari git commit: AMBARI-8276 - Alerts: Remove Nagios
Service From The Stack (jonathanhurley)
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_mm_wrapper.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_mm_wrapper.py b/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_mm_wrapper.py
deleted file mode 100644
index ff556ce..0000000
--- a/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_mm_wrapper.py
+++ /dev/null
@@ -1,549 +0,0 @@
-#!/usr/bin/env python
-
-'''
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-'''
-import StringIO
-
-import os, sys
-import pprint
-import subprocess
-from unittest import TestCase
-from mock.mock import Mock, MagicMock, patch
-import mm_wrapper
-
-class TestOrWrapper(TestCase):
-
- dummy_ignore_file = """
-vm-4.vm HIVE HIVE_METASTORE
-vm-5.vm GANGLIA GANGLIA_MONITOR
-vm-4.vm YARN NODEMANAGER
-vm-3.vm YARN NODEMANAGER
-vm-3.vm HBASE HBASE_REGIONSERVER
-vm-4.vm HBASE HBASE_REGIONSERVER
-vm-4.vm STORM STORM_REST_API
-vm-4.vm HDFS DATANODE
-vm-4.vm STORM SUPERVISOR
-vm-4.vm STORM NIMBUS
-vm-4.vm STORM STORM_UI_SERVER
-vm-3.vm STORM SUPERVISOR
-vm-4.vm HDFS SECONDARY_NAMENODE
-vm-3.vm FLUME FLUME_HANDLER
-vm-4.vm GANGLIA GANGLIA_SERVER
-vm-4.vm HIVE HIVE_SERVER
-vm-4.vm ZOOKEEPER ZOOKEEPER_SERVER
-vm-4.vm WEBHCAT WEBHCAT_SERVER
-vm-3.vm HBASE HBASE_MASTER
-vm-4.vm GANGLIA GANGLIA_MONITOR
-vm-3.vm GANGLIA GANGLIA_MONITOR
-vm-3.vm HDFS NAMENODE
-vm-4.vm HIVE MYSQL_SERVER
-vm-4.vm YARN APP_TIMELINE_SERVER
-vm-4.vm FALCON FALCON_SERVER
-vm-3.vm HDFS DATANODE
-vm-4.vm YARN RESOURCEMANAGER
-vm-4.vm OOZIE OOZIE_SERVER
-vm-4.vm MAPREDUCE2 HISTORYSERVER
-vm-4.vm STORM DRPC_SERVER
-vm-4.vm FLUME FLUME_HANDLER
-vm-3.vm ZOOKEEPER ZOOKEEPER_SERVER
-"""
-
- default_empty_check_result = {
- 'message': 'No checks have been run (no hostnames provided)',
- 'retcode': -1,
- 'real_retcode': None
- }
-
-
- @patch("__builtin__.open")
- def test_ignored_host_list(self, open_mock):
- # Check with empty file content
- open_mock.return_value.__enter__.return_value.read.return_value = ""
- lst = mm_wrapper.ignored_host_list('STORM', 'SUPERVISOR')
- self.assertEqual(pprint.pformat(lst), '[]')
- # Check with dummy content
- open_mock.return_value.__enter__.return_value.read.return_value = self.dummy_ignore_file
- lst = mm_wrapper.ignored_host_list('STORM', 'SUPERVISOR')
- self.assertEqual(pprint.pformat(lst), "['vm-4.vm', 'vm-3.vm']")
- # Check if service name/comp name are not defined
- open_mock.return_value.__enter__.return_value.read.return_value = self.dummy_ignore_file
- lst = mm_wrapper.ignored_host_list('', '')
- self.assertEqual(pprint.pformat(lst), "[]")
-
-
- @patch("sys.exit")
- def test_print_usage(self, exit_mock):
- mm_wrapper.print_usage()
- self.assertTrue(exit_mock.called)
- self.assertEqual(exit_mock.call_args_list[0][0][0], 1)
-
-
- def test_get_real_component(self):
- with patch.dict(os.environ, {'NAGIOS__SERVICEHOST_COMPONENT': 'SUPERVISOR'}, clear=True):
- component = mm_wrapper.get_real_component()
- self.assertEqual(component, 'SUPERVISOR')
- with patch.dict(os.environ, {'NAGIOS__SERVICEHOST_COMPONENT': 'MAPREDUCE2'}, clear=True):
- component = mm_wrapper.get_real_component()
- self.assertEqual(component, 'MAPREDUCE2')
-
-
- @patch("mm_wrapper.print_usage")
- def test_parse_args(self, print_usage_mock):
- args = ['or', 'h1', 'h2', '--', 'prog', '-h', '^^', '-opt', 'yet', 'another', 'opt']
- mode, hostnames, command_line = mm_wrapper.parse_args(args)
- self.assertEquals(mode, mm_wrapper.OR)
- self.assertEquals(hostnames, ['h1', 'h2'])
- self.assertEquals(command_line, ['prog', '-h', '^^', '-opt', 'yet', 'another', 'opt'])
-
- args = ['and', 'h1', 'h2', '--', 'prog', '-h', '^^', '-opt', 'yet', 'another', 'opt']
- mode, hostnames, command_line = mm_wrapper.parse_args(args)
- self.assertEquals(mode, mm_wrapper.AND)
- self.assertEquals(hostnames, ['h1', 'h2'])
- self.assertEquals(command_line, ['prog', '-h', '^^', '-opt', 'yet', 'another', 'opt'])
-
- args = ['env_only', 'h1', 'h2', '--', 'prog', '-h', '^^', '-opt', 'yet', 'another', 'opt']
- mode, hostnames, command_line = mm_wrapper.parse_args(args)
- self.assertEquals(mode, mm_wrapper.ENV_ONLY)
- self.assertEquals(hostnames, ['h1', 'h2'])
- self.assertEquals(command_line, ['prog', '-h', '^^', '-opt', 'yet', 'another', 'opt'])
-
- # Check wrong usage
- args = []
- mm_wrapper.parse_args(args)
- self.assertTrue(print_usage_mock.called)
-
-
- @patch("mm_wrapper.ignored_host_list")
- @patch("mm_wrapper.work_in_or_mode")
- @patch("mm_wrapper.work_in_and_mode")
- @patch("mm_wrapper.work_in_env_only_mode")
- @patch("mm_wrapper.work_in_filter_mm_mode")
- @patch("mm_wrapper.work_in_legacy_check_wrapper_mode")
- def test_do_work(self, work_in_legacy_check_wrapper_mode, work_in_filter_mm_mode_mock,
- work_in_env_only_mode_mock, work_in_and_mode_mock,
- work_in_or_mode_mock,
- ignored_host_list_mock):
- hostnames = ['h1', 'h2', 'h3', 'h4']
- ignored_host_list_mock.return_value = ['h2', 'h3']
- command_line = ['prog', '-h', '^^', '-opt', 'yet', 'another', 'opt']
- work_in_or_mode_mock.return_value = {
- 'message': "or_mode mode result",
- 'retcode': 0,
- 'real_retcode': None
- }
- work_in_and_mode_mock.return_value = {
- 'message': "and_mode mode result",
- 'retcode': 0,
- 'real_retcode': None
- }
- work_in_env_only_mode_mock.return_value = {
- 'message': "env_only mode result",
- 'retcode': 0,
- 'real_retcode': None
- }
- work_in_filter_mm_mode_mock.return_value = {
- 'message': "filter_mm mode result",
- 'retcode': 0,
- 'real_retcode': None
- }
- work_in_legacy_check_wrapper_mode.return_value = {
- 'message': "legacy_check_wrapper mode result",
- 'retcode': 0,
- 'real_retcode': None
- }
- result = mm_wrapper.do_work(mm_wrapper.OR, hostnames, command_line)
- self.assertEquals(str(result), "(['or_mode mode result'], 0)")
-
- result = mm_wrapper.do_work(mm_wrapper.AND, hostnames, command_line)
- self.assertEquals(str(result), "(['and_mode mode result'], 0)")
-
- result = mm_wrapper.do_work(mm_wrapper.ENV_ONLY, hostnames, command_line)
- self.assertEquals(str(result), "(['env_only mode result'], 0)")
-
- result = mm_wrapper.do_work(mm_wrapper.FILTER_MM, hostnames, command_line)
- self.assertEquals(str(result), "(['filter_mm mode result'], 0)")
-
- result = mm_wrapper.do_work(mm_wrapper.LEGACY_CHECK_WRAPPER, hostnames, command_line)
- self.assertEquals(str(result), "(['legacy_check_wrapper mode result'], 0)")
-
- # Check behaviour when real_retcode is defined
- work_in_or_mode_mock.return_value = {
- 'message': "or_mode mode result",
- 'retcode': 0,
- 'real_retcode': 1
- }
- result = mm_wrapper.do_work(mm_wrapper.OR, hostnames, command_line)
- self.assertEquals(str(result), "(['or_mode mode result', 'AMBARIPASSIVE=1'], 0)")
-
-
- @patch("mm_wrapper.check_output")
- def test_work_in_or_mode(self, check_output_mock):
- hostnames = ['h1', 'h2', 'h3', 'h4']
- ignored_hosts = ['h2', 'h3']
- command_line = ['prog', '-h', '^^', '-opt', 'yet', 'another', 'opt']
- custom_env = {'MM_HOSTS': ignored_hosts}
-
- # Normal usage
- check_output_mock.return_value = 'Dummy message'
- result = mm_wrapper.work_in_or_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(str(result),
- "{'message': 'Dummy message', 'real_retcode': None, 'retcode': 0}")
- self.assertEquals(check_output_mock.call_count, 1) # Exited on first success
- self.assertEquals(check_output_mock.call_args[1]['env']['MM_HOSTS'], ignored_hosts)
- for check_tupple in zip(check_output_mock.call_args_list, hostnames):
- self.assertEquals(check_tupple[0][0][0], ['prog', '-h', check_tupple[1], '-opt', 'yet', 'another', 'opt'])
-
- check_output_mock.reset_mock()
-
- # Failed all checks
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(3, 'dummy cmd')
- error.output = 'dummy output2'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output3'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(2, 'dummy cmd')
- error.output = 'dummy output4'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
-
- result = mm_wrapper.work_in_or_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(check_output_mock.call_count, 4)
- self.assertEquals(str(result),
- "{'message': 'dummy output4', 'real_retcode': None, 'retcode': 2}")
-
- check_output_mock.reset_mock()
-
- # Failed all but MM host component checks
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(0, 'dummy cmd')
- error.output = 'dummy output2'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(2, 'dummy cmd')
- error.output = 'dummy output3'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(3, 'dummy cmd')
- error.output = 'dummy output4'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
-
- result = mm_wrapper.work_in_or_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(check_output_mock.call_count, 4)
- self.assertEquals(str(result),
- "{'message': 'dummy output4', 'real_retcode': None, 'retcode': 3}")
-
- check_output_mock.reset_mock()
-
- # Components check only for one check is successful
- ignored_hosts = []
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(0, 'dummy cmd')
- error.output = 'dummy output2'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(2, 'dummy cmd')
- error.output = 'dummy output3'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(3, 'dummy cmd')
- error.output = 'dummy output4'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
-
- result = mm_wrapper.work_in_or_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(check_output_mock.call_count, 2)
- self.assertEquals(str(result),
- "{'message': 'dummy output2', 'real_retcode': None, 'retcode': 0}")
-
-
- @patch("mm_wrapper.check_output")
- def test_work_in_and_mode(self, check_output_mock):
- hostnames = ['h1', 'h2', 'h3', 'h4']
- ignored_hosts = ['h2', 'h3']
- command_line = ['prog', '-h', '^^', '-opt', 'yet', 'another', 'opt']
- custom_env = {'MM_HOSTS': ignored_hosts}
-
- # Normal usage
- check_output_mock.return_value = 'Dummy message'
- result = mm_wrapper.work_in_and_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(str(result),
- "{'message': 'Dummy message', 'real_retcode': None, 'retcode': 0}")
- self.assertEquals(check_output_mock.call_count, 4)
- self.assertEquals(check_output_mock.call_args[1]['env']['MM_HOSTS'], ignored_hosts)
- for check_tupple in zip(check_output_mock.call_args_list, hostnames):
- self.assertEquals(check_tupple[0][0][0], ['prog', '-h', check_tupple[1], '-opt', 'yet', 'another', 'opt'])
-
- check_output_mock.reset_mock()
-
- # Failed all checks
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(3, 'dummy cmd')
- error.output = 'dummy output2'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output3'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(2, 'dummy cmd')
- error.output = 'dummy output4'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
- result = mm_wrapper.work_in_and_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(check_output_mock.call_count, 4)
- self.assertEquals(str(result),
- "{'message': 'dummy output4', 'real_retcode': None, 'retcode': 2}")
-
- check_output_mock.reset_mock()
-
- # Failed all but MM host component checks
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(0, 'dummy cmd')
- error.output = 'dummy output2'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(2, 'dummy cmd')
- error.output = 'dummy output3'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(3, 'dummy cmd')
- error.output = 'dummy output4'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
- result = mm_wrapper.work_in_and_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(check_output_mock.call_count, 4)
- self.assertEquals(str(result),
- "{'message': 'dummy output4', 'real_retcode': None, 'retcode': 3}")
-
- check_output_mock.reset_mock()
-
- # Components check only for one check is successful
- ignored_hosts = []
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(0, 'dummy cmd')
- error.output = 'dummy output2'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(2, 'dummy cmd')
- error.output = 'dummy output3'
- check_output_side_effects.append(error)
-
- error = subprocess.CalledProcessError(3, 'dummy cmd')
- error.output = 'dummy output4'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
- result = mm_wrapper.work_in_and_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(check_output_mock.call_count, 4)
- self.assertEquals(str(result),
- "{'message': 'dummy output4', 'real_retcode': None, 'retcode': 3}")
-
-
- @patch("mm_wrapper.check_output")
- def test_work_in_env_only_mode(self, check_output_mock):
- hostnames = ['h1', 'h2', 'h3', 'h4']
- ignored_hosts = ['h2', 'h3']
- command_line = ['prog', '-h', '^^', '-opt', 'yet', 'another', 'opt']
- custom_env = {'MM_HOSTS' : ignored_hosts}
-
- # Normal usage
- check_output_mock.return_value = 'Dummy message'
- result = mm_wrapper.work_in_env_only_mode(hostnames, command_line, custom_env)
- self.assertEquals(str(result),
- "{'message': 'Dummy message', 'real_retcode': None, 'retcode': 0}")
- self.assertEquals(check_output_mock.call_count, 1)
- self.assertEquals(check_output_mock.call_args[1]['env']['MM_HOSTS'], ignored_hosts)
- self.assertEquals(check_output_mock.call_args[0][0],
- ['prog', '-h', 'h1', 'h2', 'h3', 'h4', '-opt', 'yet', 'another', 'opt'])
-
- check_output_mock.reset_mock()
-
- # Failed all checks
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
- result = mm_wrapper.work_in_env_only_mode(hostnames, command_line, custom_env)
- self.assertEquals(check_output_mock.call_count, 1)
- self.assertEquals(str(result),
- "{'message': 'dummy output1', 'real_retcode': None, 'retcode': 1}")
-
- check_output_mock.reset_mock()
-
-
- @patch("mm_wrapper.check_output")
- def test_work_in_filter_mm_mode(self, check_output_mock):
- hostnames = ['h1', 'h2', 'h3', 'h4']
- ignored_hosts = ['h2', 'h3']
- command_line = ['prog', '-h', '^^', '-opt', 'yet', 'another', 'opt']
- custom_env = {'MM_HOSTS' : ignored_hosts}
-
- # Normal usage
- check_output_mock.return_value = 'Dummy message'
- result = mm_wrapper.work_in_filter_mm_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(str(result),
- "{'message': 'Dummy message', 'real_retcode': None, 'retcode': 0}")
- self.assertEquals(check_output_mock.call_count, 1)
- self.assertEquals(check_output_mock.call_args[1]['env']['MM_HOSTS'], ignored_hosts)
- self.assertEquals(check_output_mock.call_args[0][0],
- ['prog', '-h', 'h1', 'h4', '-opt', 'yet', 'another', 'opt'])
-
- check_output_mock.reset_mock()
-
- # Failed all checks
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
- result = mm_wrapper.work_in_filter_mm_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(check_output_mock.call_count, 1)
- self.assertEquals(str(result),
- "{'message': 'dummy output1', 'real_retcode': None, 'retcode': 1}")
-
- check_output_mock.reset_mock()
-
- # All host components are in MM
- ignored_hosts = hostnames
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
- result = mm_wrapper.work_in_filter_mm_mode(hostnames, ignored_hosts, command_line,
- custom_env,
- self.default_empty_check_result)
- self.assertEquals(check_output_mock.call_count, 0)
- self.assertEquals(str(result),
- "{'message': 'No checks have been run (no hostnames provided)', "
- "'real_retcode': None, 'retcode': -1}")
-
- check_output_mock.reset_mock()
-
-
- @patch("mm_wrapper.check_output")
- @patch.dict(os.environ, {'NAGIOS_HOSTNAME': 'h2'}, clear=True)
- def test_work_in_legacy_check_wrapper_mode(self, check_output_mock):
- command_line = ['prog', '-opt', 'yet', 'another', 'opt']
- ignored_hosts = []
- custom_env = {'MM_HOSTS': ignored_hosts}
-
- # Normal usage
- ignored_hosts = []
- check_output_mock.return_value = 'Dummy message'
- result = mm_wrapper.work_in_legacy_check_wrapper_mode(ignored_hosts, command_line,
- custom_env)
- self.assertEquals(str(result),
- "{'message': 'Dummy message', 'real_retcode': None, 'retcode': 0}")
- self.assertEquals(check_output_mock.call_count, 1)
- self.assertEquals(check_output_mock.call_args[1]['env']['MM_HOSTS'], ignored_hosts)
- self.assertEquals(check_output_mock.call_args[0][0],
- ['prog', '-opt', 'yet', 'another', 'opt'])
-
- check_output_mock.reset_mock()
-
- # Failed check on host that is not in MM state
- ignored_hosts = ['h3']
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
- result = mm_wrapper.work_in_legacy_check_wrapper_mode(ignored_hosts, command_line,
- custom_env)
- self.assertEquals(check_output_mock.call_count, 1)
- self.assertEquals(str(result),
- "{'message': 'dummy output1', 'real_retcode': None, 'retcode': 1}")
-
- check_output_mock.reset_mock()
-
- # Failed check on host that is in MM state
- ignored_hosts = ['h2']
- check_output_side_effects = []
- error = subprocess.CalledProcessError(1, 'dummy cmd')
- error.output = 'dummy output1'
- check_output_side_effects.append(error)
-
- check_output_mock.side_effect = check_output_side_effects
- result = mm_wrapper.work_in_legacy_check_wrapper_mode(ignored_hosts, command_line,
- custom_env)
- self.assertEquals(check_output_mock.call_count, 1)
- self.assertEquals(str(result),
- "{'message': 'dummy output1', 'real_retcode': 1, 'retcode': 0}")
-
- check_output_mock.reset_mock()
-
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py b/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py
deleted file mode 100644
index a35f537..0000000
--- a/ambari-server/src/test/python/stacks/2.0.6/NAGIOS/test_nagios_server.py
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/usr/bin/env python
-
-'''
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-'''
-
-import os
-
-from mock.mock import Mock, MagicMock, patch
-from stacks.utils.RMFTestCase import *
-
-
-class TestNagiosServer(RMFTestCase):
- def test_configure_default(self):
- self.executeScript("2.0.6/services/NAGIOS/package/scripts/nagios_server.py",
- classname="NagiosServer",
- command="configure",
- config_file="default.json"
- )
- self.assert_configure_default()
- self.assertNoMoreResources()
-
- def test_start_default(self):
- self.executeScript(
- "2.0.6/services/NAGIOS/package/scripts/nagios_service.py",
- classname="NagiosServer",
- command="start",
- config_file="default.json"
- )
- self.assert_configure_default()
- self.assertResourceCalled('Execute', 'service nagios start',
- )
- self.assertResourceCalled('MonitorWebserver', 'restart',
- )
- self.assertNoMoreResources()
-
-
- @patch('os.path.isfile')
- def test_stop_default(self, os_path_isfile_mock):
- src_dir = RMFTestCase._getSrcFolder()
- os_path_isfile_mock.side_effect = [False, True]
-
- self.executeScript(
- "2.0.6/services/NAGIOS/package/scripts/nagios_service.py",
- classname="NagiosServer",
- command="stop",
- config_file="default.json"
- )
-
- self.assertResourceCalled('Execute','service nagios stop')
- self.assertResourceCalled('Execute','rm -f /var/run/nagios/nagios.pid')
- self.assertResourceCalled('MonitorWebserver', 'restart')
-
- self.assertNoMoreResources()
-
-
- def assert_configure_default(self):
- self.assertResourceCalled('File', '/etc/apache2/conf.d/nagios.conf',
- owner='nagios',
- group='nagios',
- content=Template("nagios.conf.j2"),
- mode=0644
- )
- self.assertResourceCalled('Directory', '/etc/nagios',
- owner='nagios',
- group='nagios',
- )
- self.assertResourceCalled('Directory', '/usr/lib64/nagios/plugins'
- )
- self.assertResourceCalled('Directory', '/etc/nagios/objects'
- )
- self.assertResourceCalled('Directory', '/var/run/nagios',
- owner='nagios',
- group='nagios',
- mode=0755,
- recursive=True
- )
- self.assertResourceCalled('Directory', '/var/nagios',
- owner='nagios',
- group='nagios',
- recursive=True
- )
- self.assertResourceCalled('Directory', '/var/nagios/spool/checkresults',
- owner='nagios',
- group='nagios',
- recursive=True
- )
- self.assertResourceCalled('Directory', '/var/nagios/rw',
- owner='nagios',
- group='nagios',
- recursive=True
- )
- self.assertResourceCalled('Directory', '/usr/share/hdp/nagios/',
- owner='nagios',
- group='nagios',
- recursive=True
- )
- self.assertResourceCalled('Directory', '/var/log/nagios',
- owner='nagios',
- group='nagios',
- mode=0755
- )
- self.assertResourceCalled('Directory', '/var/log/nagios/archives',
- owner='nagios',
- group='nagios',
- mode=0755
- )
- self.assertResourceCalled('TemplateConfig', '/etc/nagios/nagios.cfg',
- owner='nagios',
- group='nagios',
- mode=None
- )
- self.assertResourceCalled('TemplateConfig', '/etc/nagios/resource.cfg',
- owner='nagios',
- group='nagios',
- mode=None
- )
- self.assertResourceCalled('TemplateConfig',
- '/etc/nagios/objects/hadoop-hosts.cfg',
- owner='nagios',
- group='hadoop',
- mode=None
- )
- self.assertResourceCalled('TemplateConfig',
- '/etc/nagios/objects/hadoop-hostgroups.cfg',
- owner='nagios',
- group='hadoop',
- mode=None
- )
- self.assertResourceCalled('TemplateConfig',
- '/etc/nagios/objects/hadoop-servicegroups.cfg',
- owner='nagios',
- group='hadoop',
- mode=None
- )
- self.assertResourceCalled('TemplateConfig',
- '/etc/nagios/objects/hadoop-services.cfg',
- owner='nagios',
- group='hadoop',
- mode=None
- )
- self.assertResourceCalled('TemplateConfig',
- '/etc/nagios/objects/hadoop-commands.cfg',
- owner='nagios',
- group='hadoop',
- mode=None
- )
- self.assertResourceCalled('TemplateConfig',
- '/etc/nagios/objects/contacts.cfg',
- owner='nagios',
- group='hadoop',
- mode=None
- )
- self.assertResourceCalled('File', '/usr/lib64/nagios/plugins/check_cpu.pl',
- content=StaticFile('check_cpu.pl'),
- mode=0755
- )
- self.assertResourceCalled('File', '/usr/lib64/nagios/plugins/check_cpu.php',
- content=StaticFile('check_cpu.php'),
- mode=0755
- )
- self.assertResourceCalled('File', '/usr/lib64/nagios/plugins/check_cpu_ha.php',
- content=StaticFile('check_cpu_ha.php'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_datanode_storage.php',
- content=StaticFile('check_datanode_storage.php'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_aggregate.php',
- content=StaticFile('check_aggregate.php'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_hdfs_blocks.php',
- content=StaticFile('check_hdfs_blocks.php'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_hdfs_capacity.php',
- content=StaticFile('check_hdfs_capacity.php'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_rpcq_latency.php',
- content=StaticFile('check_rpcq_latency.php'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_rpcq_latency_ha.php',
- content=StaticFile('check_rpcq_latency_ha.php'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_webui.sh',
- content=StaticFile('check_webui.sh'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_webui_ha.sh',
- content=StaticFile('check_webui_ha.sh'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_name_dir_status.php',
- content=StaticFile('check_name_dir_status.php'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_oozie_status.sh',
- content=StaticFile('check_oozie_status.sh'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_templeton_status.sh',
- content=StaticFile('check_templeton_status.sh'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_hive_metastore_status.sh',
- content=StaticFile(
- 'check_hive_metastore_status.sh'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_hue_status.sh',
- content=StaticFile('check_hue_status.sh'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_mapred_local_dir_used.sh',
- content=StaticFile(
- 'check_mapred_local_dir_used.sh'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_nodemanager_health.sh',
- content=StaticFile('check_nodemanager_health.sh'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_namenodes_ha.sh',
- content=StaticFile('check_namenodes_ha.sh'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/hdp_nagios_init.php',
- content=StaticFile('hdp_nagios_init.php'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_checkpoint_time.py',
- content=StaticFile('check_checkpoint_time.py'),
- mode=0755
- )
- self.assertResourceCalled('File', '/usr/lib64/nagios/plugins/sys_logger.py',
- content = StaticFile('sys_logger.py'),
- mode = 0755,
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_ambari_alerts.py',
- content=StaticFile('check_ambari_alerts.py'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/mm_wrapper.py',
- content=StaticFile('mm_wrapper.py'),
- mode=0755
- )
- self.assertResourceCalled('File',
- '/usr/lib64/nagios/plugins/check_hive_thrift_port.py',
- content=StaticFile('check_hive_thrift_port.py'),
- mode=0755
- )
- self.assertResourceCalled('Execute',
- 'htpasswd2 -c -b /etc/nagios/htpasswd.users nagiosadmin \'!`"\'"\'"\' 1\''
- )
- self.assertResourceCalled('File', '/etc/nagios/htpasswd.users',
- owner='nagios',
- group='nagios',
- mode=0640
- )
- self.assertResourceCalled('Execute', 'usermod -G nagios wwwrun'
- )
- self.assertResourceCalled('File', '/etc/nagios/command.cfg',
- owner='nagios',
- group='nagios'
- )
- self.assertResourceCalled('File', '/usr/share/hdp/nagios//nagios_alerts.php',
- content = StaticFile('nagios_alerts.php'),
- )
- self.assertResourceCalled('File', '/etc/apache2/conf.d/hdp_mon_nagios_addons.conf',
- content = StaticFile('hdp_mon_nagios_addons.conf'),
- )
- self.assertResourceCalled('File', '/var/nagios/ignore.dat',
- owner='nagios',
- group='nagios',
- mode=0664
- )
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
index c7a04f1..f6e9570 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.hbasedecom.json
@@ -673,9 +673,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 83e36ae..4ddc718 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -15,8 +15,8 @@
"ambari_db_rca_username": "mapred",
"java_home": "/usr/jdk64/jdk1.7.0_45",
"db_name": "ambari",
- "group_list": "[\"hadoop\",\"nobody\",\"users\",\"nagios\"]",
- "user_list": "[\"hive\",\"oozie\",\"nobody\",\"nagios\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
+ "group_list": "[\"hadoop\",\"nobody\",\"users\"]",
+ "user_list": "[\"hive\",\"oozie\",\"nobody\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
},
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
@@ -509,14 +509,6 @@
"jobhistory_heapsize": "900",
"mapred_log_dir_prefix": "/var/log/hadoop-mapreduce"
},
- "nagios-env": {
- "hive_metastore_user_passwd": "password",
- "nagios_web_password": "!`\"' 1",
- "nagios_user": "nagios",
- "nagios_group": "nagios",
- "nagios_web_login": "nagiosadmin",
- "nagios_contact": "user@com.ua"
- },
"tez-env": {
"content": "\n# Tez specific configuration\nexport TEZ_CONF_DIR={{config_dir}}\n\n# Set HADOOP_HOME to point to a specific hadoop install directory\nexport HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}\n\n# The java implementation to use.\nexport JAVA_HOME={{java64_home}}",
"tez_user": "tez"
@@ -776,9 +768,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
index e4f0970..b31d4b9 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.non_gmetad_host.json
@@ -720,9 +720,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
index 18d9c46..c8333ac 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_client.json
@@ -499,14 +499,6 @@
"jobhistory_heapsize": "900",
"mapred_log_dir_prefix": "/var/log/hadoop-mapreduce"
},
- "nagios-env": {
- "hive_metastore_user_passwd": "password",
- "nagios_web_password": "!`\"' 1",
- "nagios_user": "nagios",
- "nagios_group": "nagios",
- "nagios_web_login": "nagiosadmin",
- "nagios_contact": "user@com.ua"
- },
"tez-env": {
"content": "\n# Tez specific configuration\nexport TEZ_CONF_DIR={{config_dir}}\n\n# Set HADOOP_HOME to point to a specific hadoop install directory\nexport HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}\n\n# The java implementation to use.\nexport JAVA_HOME={{java64_home}}",
"tez_user": "tez"
@@ -759,9 +751,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
index 8ab2406..c4f44d8 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
@@ -15,8 +15,8 @@
"ambari_db_rca_username": "mapred",
"java_home": "/usr/jdk64/jdk1.7.0_45",
"db_name": "ambari",
- "group_list": "[\"hadoop\",\"nobody\",\"users\",\"nagios\"]",
- "user_list": "[\"hive\",\"oozie\",\"nobody\",\"nagios\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
+ "group_list": "[\"hadoop\",\"nobody\",\"users\"]",
+ "user_list": "[\"hive\",\"oozie\",\"nobody\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]"
},
"commandType": "EXECUTION_COMMAND",
"roleParams": {},
@@ -504,14 +504,6 @@
"jobhistory_heapsize": "900",
"mapred_log_dir_prefix": "/var/log/hadoop-mapreduce"
},
- "nagios-env": {
- "hive_metastore_user_passwd": "password",
- "nagios_web_password": "!`\"' 1",
- "nagios_user": "nagios",
- "nagios_group": "nagios",
- "nagios_web_login": "nagiosadmin",
- "nagios_contact": "user@com.ua"
- },
"tez-env": {
"content": "\n# Tez specific configuration\nexport TEZ_CONF_DIR={{config_dir}}\n\n# Set HADOOP_HOME to point to a specific hadoop install directory\nexport HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}\n\n# The java implementation to use.\nexport JAVA_HOME={{java64_home}}",
"tez_user": "tez"
@@ -771,9 +763,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
index 1d12254..0b7a3bb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
@@ -233,7 +233,6 @@
"yarn_log_dir_prefix": "/var/log/hadoop-yarn",
"zk_log_dir": "/var/log/zookeeper",
"hive_aux_jars_path": "/usr/lib/hcatalog/share/hcatalog/hcatalog-core.jar",
- "nagios_web_password": "!`\"' 1",
"tickTime": "2000",
"hive_ambari_database": "MySQL",
"falcon_user": "falcon",
@@ -265,15 +264,12 @@
"user_group": "hadoop",
"yarn_user": "yarn",
"gmond_user": "nobody",
- "nagios_web_login": "nagiosadmin",
"storm_user": "storm",
- "nagios_contact": "asd@asd.asd",
"hive_database": "New MySQL Database",
"storm_log_dir": "/var/log/storm",
"clientPort": "2181",
"oozie_derby_database": "Derby",
"mapred_log_dir_prefix": "/var/log/hadoop-mapreduce",
- "nagios_group": "nagios",
"hdfs_user": "hdfs",
"hbase_user": "hbase",
"oozie_database_type": "derby",
@@ -290,7 +286,6 @@
"hcat_user": "hcat",
"hadoop_heapsize": "1024",
"hadoop_pid_dir_prefix": "/var/run/hadoop",
- "nagios_user": "nagios",
"hbase_log_dir": "/var/log/hbase",
"falcon_user": "falcon",
"falcon_port": "15000",
@@ -683,9 +678,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
index fa3b505..253747a 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_default.json
@@ -104,8 +104,7 @@
"storm_user": "storm",
"clientPort": "2181",
"yarn_log_dir_prefix": "/var/log/hadoop-yarn",
- "mapred_log_dir_prefix": "/var/log/hadoop-mapreduce",
- "nagios_group": "nagios",
+ "mapred_log_dir_prefix": "/var/log/hadoop-mapreduce",
"hdfs_user": "hdfs",
"hbase_user": "hbase",
"webhcat_user": "hcat",
@@ -118,8 +117,7 @@
"resourcemanager_heapsize": "1024",
"hcat_user": "hcat",
"hadoop_heapsize": "1024",
- "hadoop_pid_dir_prefix": "/var/run/hadoop",
- "nagios_user": "nagios"
+ "hadoop_pid_dir_prefix": "/var/run/hadoop"
},
"capacity-scheduler": {
"yarn.scheduler.capacity.node-locality-delay": "40",
@@ -443,14 +441,6 @@
"jobhistory_heapsize": "900",
"mapred_log_dir_prefix": "/var/log/hadoop-mapreduce"
},
- "nagios-env": {
- "hive_metastore_user_passwd": "password",
- "nagios_web_password": "password",
- "nagios_user": "nagios",
- "nagios_group": "nagios",
- "nagios_web_login": "nagiosadmin",
- "nagios_contact": "user@com.ua"
- },
"tez-env": {
"content": "\n# Tez specific configuration\nexport TEZ_CONF_DIR={{config_dir}}\n\n# Set HADOOP_HOME to point to a specific hadoop install directory\nexport HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}\n\n# The java implementation to use.\nexport JAVA_HOME={{java64_home}}",
"tez_user": "tez"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
index 15d6273..6c06f35 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/ha_secured.json
@@ -369,11 +369,9 @@
"hadoop_pid_dir_prefix": "/var/run/hadoop",
"jobhistory_http_keytab": "/etc/security/keytabs/spnego.service.keytab",
"resourcemanager_principal_name": "rm/_HOST",
- "hadoop_http_principal_name": "HTTP/_HOST",
- "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab",
+ "hadoop_http_principal_name": "HTTP/_HOST",
"namenode_principal_name": "nn/_HOST",
- "namenode_keytab": "/etc/security/keytabs/nn.service.keytab",
- "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM",
+ "namenode_keytab": "/etc/security/keytabs/nn.service.keytab",
"hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab",
"journalnode_keytab": "/etc/security/keytabs/jn.service.keytab",
"hbase_master_keytab": "/etc/security/keytabs/hbase.service.keytab",
@@ -465,14 +463,6 @@
"jobhistory_heapsize": "900",
"mapred_log_dir_prefix": "/var/log/hadoop-mapreduce"
},
- "nagios-env": {
- "hive_metastore_user_passwd": "password",
- "nagios_web_password": "password",
- "nagios_user": "nagios",
- "nagios_group": "nagios",
- "nagios_web_login": "nagiosadmin",
- "nagios_contact": "user@com.ua"
- },
"tez-env": {
"content": "\n# Tez specific configuration\nexport TEZ_CONF_DIR={{config_dir}}\n\n# Set HADOOP_HOME to point to a specific hadoop install directory\nexport HADOOP_HOME=${HADOOP_HOME:-{{hadoop_home}}}\n\n# The java implementation to use.\nexport JAVA_HOME={{java64_home}}",
"tez_user": "tez"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
index dba36e5..c60227b 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured.json
@@ -561,16 +561,6 @@
"jobhistory_heapsize": "900",
"mapred_log_dir_prefix": "/var/log/hadoop-mapreduce"
},
- "nagios-env": {
- "hive_metastore_user_passwd": "password",
- "nagios_web_password": "password",
- "nagios_user": "nagios",
- "nagios_group": "nagios",
- "nagios_web_login": "nagiosadmin",
- "nagios_contact": "user@com.ua",
- "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM",
- "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab"
- },
"oozie-env": {
"oozie_derby_database": "Derby",
"oozie_admin_port": "11001",
@@ -796,9 +786,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
index 0f49ddf..a2c4fef 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_client.json
@@ -549,16 +549,6 @@
"jobhistory_heapsize": "900",
"mapred_log_dir_prefix": "/var/log/hadoop-mapreduce"
},
- "nagios-env": {
- "hive_metastore_user_passwd": "password",
- "nagios_web_password": "password",
- "nagios_user": "nagios",
- "nagios_group": "nagios",
- "nagios_web_login": "nagiosadmin",
- "nagios_contact": "user@com.ua",
- "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM",
- "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab"
- },
"oozie-env": {
"oozie_derby_database": "Derby",
"oozie_admin_port": "11001",
@@ -781,9 +771,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
index d779beb..f1eefdb 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/secured_no_jce_name.json
@@ -234,19 +234,16 @@
"syncLimit": "5",
"resourcemanager_principal_name": "rm/_HOST",
"hadoop_http_principal_name": "HTTP/_HOST",
- "kinit_path_local": "/usr/bin",
- "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab",
+ "kinit_path_local": "/usr/bin",
"hbase_regionserver_heapsize": "1024m",
"hbase_regionserver_xmn_max": "512",
"hbase_regionserver_xmn_ratio": "0.2",
"resourcemanager_http_primary_name": "HTTP",
"datanode_primary_name": "dn",
"namenode_principal_name": "nn/_HOST",
- "namenode_keytab": "/etc/security/keytabs/nn.service.keytab",
- "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM",
+ "namenode_keytab": "/etc/security/keytabs/nn.service.keytab",
"dfs_datanode_http_address": "1022",
"falcon_user": "falcon",
- "nagios_web_login": "nagiosadmin",
"hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab",
"yarn_heapsize": "1024",
"hbase_pid_dir": "/var/run/hbase",
@@ -256,7 +253,6 @@
"oozie_jdbc_driver": "org.apache.derby.jdbc.EmbeddedDriver",
"hive_metastore_primary_name": "hive",
"hbase_master_keytab": "/etc/security/keytabs/hbase.service.keytab",
- "nagios_primary_name": "nagios",
"hive_database": "New MySQL Database",
"clientPort": "2181",
"oozie_derby_database": "Derby",
@@ -264,7 +260,6 @@
"oozie_pid_dir": "/var/run/oozie",
"datanode_principal_name": "dn/_HOST",
"hive_metastore_keytab": "/etc/security/keytabs/hive.service.keytab",
- "nagios_group": "nagios",
"hcat_user": "hcat",
"hadoop_heapsize": "1024",
"hbase_regionserver_primary_name": "hbase",
@@ -283,7 +278,6 @@
"yarn_nodemanager_container-executor_class": "org.apache.hadoop.yarn.server.nodemanager.LinuxContainerExecutor",
"snamenode_keytab": "/etc/security/keytabs/nn.service.keytab",
"dfs_datanode_address": "1019",
- "nagios_server": "c6402.ambari.apache.org",
"ganglia_runtime_dir": "/var/run/ganglia/hdp",
"lzo_enabled": "true",
"oozie_principal_name": "oozie/c6402.ambari.apache.org",
@@ -334,8 +328,7 @@
"oozie_keytab": "/etc/security/keytabs/oozie.service.keytab",
"yarn_user": "yarn",
"gmond_user": "nobody",
- "keytab_path": "/etc/security/keytabs",
- "nagios_contact": "asd@asd.asd",
+ "keytab_path": "/etc/security/keytabs",
"snamenode_primary_name": "nn",
"jobhistory_primary_name": "jhs",
"hdfs_user": "hdfs",
@@ -375,13 +368,11 @@
"nodemanager_http_principal_name": "HTTP/_HOST",
"hive_user": "hive",
"resourcemanager_http_principal_name": "HTTP/_HOST",
- "webHCat_http_primary_name": "HTTP",
- "nagios_web_password": "!`\"' 1",
+ "webHCat_http_primary_name": "HTTP",
"smokeuser": "ambari-qa",
"hbase_master_heapsize": "1024m",
"kerberos_install_type": "MANUALLY_SET_KERBEROS",
- "hadoop_pid_dir_prefix": "/var/run/hadoop",
- "nagios_user": "nagios",
+ "hadoop_pid_dir_prefix": "/var/run/hadoop",
"resourcemanager_heapsize": "1024",
"hbase_regionserver_keytab": "/etc/security/keytabs/hbase.service.keytab",
"hbase_principal_name": "hbase",
@@ -796,9 +787,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
index 6ca1377..8b5a698 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
@@ -45,9 +45,6 @@ class TestHookBeforeInstall(RMFTestCase):
self.assertResourceCalled('Group', 'users',
ignore_failures = False,
)
- self.assertResourceCalled('Group', 'nagios',
- ignore_failures = False,
- )
self.assertResourceCalled('User', 'hive',
gid = 'hadoop',
ignore_failures = False,
@@ -63,11 +60,6 @@ class TestHookBeforeInstall(RMFTestCase):
ignore_failures = False,
groups = [u'nobody'],
)
- self.assertResourceCalled('User', 'nagios',
- gid = 'nagios',
- ignore_failures = False,
- groups = [u'hadoop'],
- )
self.assertResourceCalled('User', 'ambari-qa',
gid = 'hadoop',
ignore_failures = False,
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.1/common/services.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/common/services.json b/ambari-server/src/test/python/stacks/2.1/common/services.json
index c4af73c..6559077 100644
--- a/ambari-server/src/test/python/stacks/2.1/common/services.json
+++ b/ambari-server/src/test/python/stacks/2.1/common/services.json
@@ -1,5 +1,5 @@
{
- "href" : "/api/v1/stacks/HDP/versions/2.1?fields=Versions/stack_name,Versions/stack_version,Versions/parent_stack_version,services/StackServices/service_name,services/StackServices/service_version,services/components/StackServiceComponents,services/components/dependencies,services/components/auto_deploy&services/StackServices/service_name.in(HDFS,MAPREDUCE2,YARN,TEZ,NAGIOS,GANGLIA,HIVE,HBASE,PIG,SQOOP,OOZIE,ZOOKEEPER,FALCON,STORM,FLUME)",
+ "href" : "/api/v1/stacks/HDP/versions/2.1?fields=Versions/stack_name,Versions/stack_version,Versions/parent_stack_version,services/StackServices/service_name,services/StackServices/service_version,services/components/StackServiceComponents,services/components/dependencies,services/components/auto_deploy&services/StackServices/service_name.in(HDFS,MAPREDUCE2,YARN,TEZ,GANGLIA,HIVE,HBASE,PIG,SQOOP,OOZIE,ZOOKEEPER,FALCON,STORM,FLUME)",
"Versions" : {
"parent_stack_version" : "2.0.6",
"stack_name" : "HDP",
@@ -562,85 +562,6 @@
"dependencies" : [ ]
} ]
}, {
- "href" : "/api/v1/stacks/HDP/versions/2.1/services/NAGIOS",
- "StackServices" : {
- "service_name" : "NAGIOS",
- "service_version" : "3.5.0",
- "stack_name" : "HDP",
- "stack_version" : "2.1"
- },
- "components" : [ {
- "href" : "/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER",
- "StackServiceComponents" : {
- "cardinality" : "1",
- "component_category" : "MASTER",
- "component_name" : "NAGIOS_SERVER",
- "custom_commands" : [ ],
- "display_name" : "Nagios Server",
- "is_client" : false,
- "is_master" : true,
- "service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.1",
- "hostnames" : [ ]
- },
- "dependencies" : [ {
- "href" : "/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HCAT",
- "Dependencies" : {
- "component_name" : "HCAT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.1"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HDFS_CLIENT",
- "Dependencies" : {
- "component_name" : "HDFS_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.1"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/MAPREDUCE2_CLIENT",
- "Dependencies" : {
- "component_name" : "MAPREDUCE2_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.1"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/OOZIE_CLIENT",
- "Dependencies" : {
- "component_name" : "OOZIE_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.1"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/TEZ_CLIENT",
- "Dependencies" : {
- "component_name" : "TEZ_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.1"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.1/services/NAGIOS/components/NAGIOS_SERVER/dependencies/YARN_CLIENT",
- "Dependencies" : {
- "component_name" : "YARN_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.1"
- }
- } ]
- } ]
- }, {
"href" : "/api/v1/stacks/HDP/versions/2.1/services/OOZIE",
"StackServices" : {
"service_name" : "OOZIE",
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
index 1dd7211..64b3170 100644
--- a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
@@ -115,7 +115,7 @@ class TestHDP21StackAdvisor(TestCase):
hosts = json.load(open(os.path.join(self.testDirectory, 'hosts.json')))
expected_layout = [
- [u'NAMENODE', u'NAGIOS_SERVER', u'GANGLIA_SERVER', u'ZOOKEEPER_SERVER', u'DRPC_SERVER', u'NIMBUS', u'STORM_REST_API', u'STORM_UI_SERVER', u'MYSQL_SERVER'],
+ [u'NAMENODE', u'GANGLIA_SERVER', u'ZOOKEEPER_SERVER', u'DRPC_SERVER', u'NIMBUS', u'STORM_REST_API', u'STORM_UI_SERVER', u'MYSQL_SERVER'],
[u'SECONDARY_NAMENODE', u'HISTORYSERVER', u'APP_TIMELINE_SERVER', u'RESOURCEMANAGER', u'ZOOKEEPER_SERVER'],
[u'HIVE_METASTORE', u'HIVE_SERVER', u'WEBHCAT_SERVER', u'HBASE_MASTER', u'OOZIE_SERVER', u'ZOOKEEPER_SERVER', u'FALCON_SERVER']
]
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.1/configs/default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/default.json b/ambari-server/src/test/python/stacks/2.1/configs/default.json
index 3ff06a5..f291201 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/default.json
@@ -273,7 +273,6 @@
"yarn_log_dir_prefix": "/var/log/hadoop-yarn",
"zk_log_dir": "/var/log/zookeeper",
"hive_aux_jars_path": "/usr/lib/hcatalog/share/hcatalog/hcatalog-core.jar",
- "nagios_web_password": "asd",
"tickTime": "2000",
"hive_ambari_database": "MySQL",
"falcon_user": "falcon",
@@ -305,15 +304,12 @@
"user_group": "hadoop",
"yarn_user": "yarn",
"gmond_user": "nobody",
- "nagios_web_login": "nagiosadmin",
"storm_user": "storm",
- "nagios_contact": "asd@asd.asd",
"hive_database": "New MySQL Database",
"storm_log_dir": "/var/log/storm",
"clientPort": "2181",
"oozie_derby_database": "Derby",
"mapred_log_dir_prefix": "/var/log/hadoop-mapreduce",
- "nagios_group": "nagios",
"hdfs_user": "hdfs",
"hbase_user": "hbase",
"oozie_database_type": "derby",
@@ -330,7 +326,6 @@
"hcat_user": "hcat",
"hadoop_heapsize": "1024",
"hadoop_pid_dir_prefix": "/var/run/hadoop",
- "nagios_user": "nagios",
"hbase_log_dir": "/var/log/hbase",
"falcon_user": "falcon",
"falcon_port": "15000",
@@ -582,14 +577,6 @@
"hbase_regionserver_xmn_ratio": "0.2",
"hbase_log_dir": "/var/log/hbase"
},
- "nagios-env": {
- "hive_metastore_user_passwd": "password",
- "nagios_web_password": "!`\"' 1",
- "nagios_user": "nagios",
- "nagios_group": "nagios",
- "nagios_web_login": "nagiosadmin",
- "nagios_contact": "user@com.ua"
- },
"ganglia-env": {
"gmond_user": "nobody",
"ganglia_runtime_dir": "/var/run/ganglia/hdp",
@@ -853,9 +840,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.1/configs/secured.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.1/configs/secured.json b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
index be88df4..3eedb77 100644
--- a/ambari-server/src/test/python/stacks/2.1/configs/secured.json
+++ b/ambari-server/src/test/python/stacks/2.1/configs/secured.json
@@ -564,16 +564,6 @@
"hbase_log_dir": "/var/log/hbase",
"hbase_user_keytab": "/etc/security/keytabs/hbase.headless.keytab"
},
- "nagios-env": {
- "hive_metastore_user_passwd": "password",
- "nagios_web_password": "!`\"' 1",
- "nagios_user": "nagios",
- "nagios_group": "nagios",
- "nagios_web_login": "nagiosadmin",
- "nagios_contact": "user@com.ua",
- "nagios_principal_name": "nagios/c6402.ambari.apache.org@EXAMPLE.COM",
- "nagios_keytab_path": "/etc/security/keytabs/nagios.service.keytab"
- },
"ganglia-env": {
"gmond_user": "nobody",
"ganglia_runtime_dir": "/var/run/ganglia/hdp",
@@ -834,9 +824,6 @@
"c6401.ambari.apache.org",
"c6402.ambari.apache.org"
],
- "nagios_server_host": [
- "c6402.ambari.apache.org"
- ],
"all_ping_ports": [
"8670",
"8670"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.2/common/1/services.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/1/services.json b/ambari-server/src/test/python/stacks/2.2/common/1/services.json
index c47f139..5815a9f 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/1/services.json
+++ b/ambari-server/src/test/python/stacks/2.2/common/1/services.json
@@ -1,5 +1,5 @@
{
- "href" : "/api/v1/stacks/HDP/versions/2.2?fields=Versions/stack_name,Versions/stack_version,Versions/parent_stack_version,services/StackServices/service_name,services/StackServices/service_version,services/components/StackServiceComponents,services/components/dependencies,services/components/auto_deploy&services/StackServices/service_name.in(HDFS,MAPREDUCE2,YARN,TEZ,NAGIOS,GANGLIA,HIVE,HBASE,PIG,SQOOP,OOZIE,ZOOKEEPER,FALCON,STORM,FLUME,SLIDER,KNOX,KAFKA)",
+ "href" : "/api/v1/stacks/HDP/versions/2.2?fields=Versions/stack_name,Versions/stack_version,Versions/parent_stack_version,services/StackServices/service_name,services/StackServices/service_version,services/components/StackServiceComponents,services/components/dependencies,services/components/auto_deploy&services/StackServices/service_name.in(HDFS,MAPREDUCE2,YARN,TEZ,GANGLIA,HIVE,HBASE,PIG,SQOOP,OOZIE,ZOOKEEPER,FALCON,STORM,FLUME,SLIDER,KNOX,KAFKA)",
"Versions" : {
"parent_stack_version" : "2.1",
"stack_name" : "HDP",
@@ -621,85 +621,6 @@
"dependencies" : [ ]
} ]
}, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS",
- "StackServices" : {
- "service_name" : "NAGIOS",
- "service_version" : "3.5.0",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- },
- "components" : [ {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER",
- "StackServiceComponents" : {
- "cardinality" : "1",
- "component_category" : "MASTER",
- "component_name" : "NAGIOS_SERVER",
- "custom_commands" : [ ],
- "display_name" : "Nagios Server",
- "is_client" : false,
- "is_master" : true,
- "service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2",
- "hostnames" : [ ]
- },
- "dependencies" : [ {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HCAT",
- "Dependencies" : {
- "component_name" : "HCAT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HDFS_CLIENT",
- "Dependencies" : {
- "component_name" : "HDFS_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/MAPREDUCE2_CLIENT",
- "Dependencies" : {
- "component_name" : "MAPREDUCE2_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/OOZIE_CLIENT",
- "Dependencies" : {
- "component_name" : "OOZIE_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/TEZ_CLIENT",
- "Dependencies" : {
- "component_name" : "TEZ_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/YARN_CLIENT",
- "Dependencies" : {
- "component_name" : "YARN_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- } ]
- } ]
- }, {
"href" : "/api/v1/stacks/HDP/versions/2.2/services/OOZIE",
"StackServices" : {
"service_name" : "OOZIE",
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/python/stacks/2.2/common/2/services.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/common/2/services.json b/ambari-server/src/test/python/stacks/2.2/common/2/services.json
index c47f139..6e6678e 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/2/services.json
+++ b/ambari-server/src/test/python/stacks/2.2/common/2/services.json
@@ -1,5 +1,5 @@
{
- "href" : "/api/v1/stacks/HDP/versions/2.2?fields=Versions/stack_name,Versions/stack_version,Versions/parent_stack_version,services/StackServices/service_name,services/StackServices/service_version,services/components/StackServiceComponents,services/components/dependencies,services/components/auto_deploy&services/StackServices/service_name.in(HDFS,MAPREDUCE2,YARN,TEZ,NAGIOS,GANGLIA,HIVE,HBASE,PIG,SQOOP,OOZIE,ZOOKEEPER,FALCON,STORM,FLUME,SLIDER,KNOX,KAFKA)",
+ "href" : "/api/v1/stacks/HDP/versions/2.2?fields=Versions/stack_name,Versions/stack_version,Versions/parent_stack_version,services/StackServices/service_name,services/StackServices/service_version,services/components/StackServiceComponents,services/components/dependencies,services/components/auto_deploy&services/StackServices/service_name.in(HDFS,MAPREDUCE2,YARN,TEZ,GANGLIA,HIVE,HBASE,PIG,SQOOP,OOZIE,ZOOKEEPER,FALCON,STORM,FLUME,SLIDER,KNOX,KAFKA)",
"Versions" : {
"parent_stack_version" : "2.1",
"stack_name" : "HDP",
@@ -620,86 +620,8 @@
},
"dependencies" : [ ]
} ]
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS",
- "StackServices" : {
- "service_name" : "NAGIOS",
- "service_version" : "3.5.0",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- },
- "components" : [ {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER",
- "StackServiceComponents" : {
- "cardinality" : "1",
- "component_category" : "MASTER",
- "component_name" : "NAGIOS_SERVER",
- "custom_commands" : [ ],
- "display_name" : "Nagios Server",
- "is_client" : false,
- "is_master" : true,
- "service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2",
- "hostnames" : [ ]
- },
- "dependencies" : [ {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HCAT",
- "Dependencies" : {
- "component_name" : "HCAT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/HDFS_CLIENT",
- "Dependencies" : {
- "component_name" : "HDFS_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/MAPREDUCE2_CLIENT",
- "Dependencies" : {
- "component_name" : "MAPREDUCE2_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/OOZIE_CLIENT",
- "Dependencies" : {
- "component_name" : "OOZIE_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/TEZ_CLIENT",
- "Dependencies" : {
- "component_name" : "TEZ_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- }, {
- "href" : "/api/v1/stacks/HDP/versions/2.2/services/NAGIOS/components/NAGIOS_SERVER/dependencies/YARN_CLIENT",
- "Dependencies" : {
- "component_name" : "YARN_CLIENT",
- "dependent_component_name" : "NAGIOS_SERVER",
- "dependent_service_name" : "NAGIOS",
- "stack_name" : "HDP",
- "stack_version" : "2.2"
- }
- } ]
- } ]
- }, {
+ },
+ {
"href" : "/api/v1/stacks/HDP/versions/2.2/services/OOZIE",
"StackServices" : {
"service_name" : "OOZIE",
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/TestAmbaryServer.samples/multinode-default.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/TestAmbaryServer.samples/multinode-default.json b/ambari-server/src/test/resources/TestAmbaryServer.samples/multinode-default.json
index ce88922..a9a44da 100644
--- a/ambari-server/src/test/resources/TestAmbaryServer.samples/multinode-default.json
+++ b/ambari-server/src/test/resources/TestAmbaryServer.samples/multinode-default.json
@@ -1 +1 @@
-{"host_groups":[{"name":"master_1","components":[{"name":"NAMENODE"},{"name":"ZOOKEEPER_SERVER"},{"name":"HBASE_MASTER"},{"name":"GANGLIA_SERVER"},{"name":"HDFS_CLIENT"},{"name":"YARN_CLIENT"},{"name":"HCAT"},{"name":"GANGLIA_MONITOR"}],"cardinality":"1"},{"name":"master_2","components":[{"name":"ZOOKEEPER_CLIENT"},{"name":"HISTORYSERVER"},{"name":"HIVE_SERVER"},{"name":"SECONDARY_NAMENODE"},{"name":"HIVE_METASTORE"},{"name":"HDFS_CLIENT"},{"name":"HIVE_CLIENT"},{"name":"YARN_CLIENT"},{"name":"MYSQL_SERVER"},{"name":"GANGLIA_MONITOR"},{"name":"WEBHCAT_SERVER"}],"cardinality":"1"},{"name":"master_3","components":[{"name":"RESOURCEMANAGER"},{"name":"ZOOKEEPER_SERVER"},{"name":"GANGLIA_MONITOR"}],"cardinality":"1"},{"name":"master_4","components":[{"name":"OOZIE_SERVER"},{"name":"ZOOKEEPER_SERVER"},{"name":"GANGLIA_MONITOR"}],"cardinality":"1"},{"name":"slave","components":[{"name":"HBASE_REGIONSERVER"},{"name":"NODEMANAGER"},{"name":"DATANODE"},{"name":"GANGLIA_MONITOR"}],"cardinality
":"${slavesCount}"},{"name":"gateway","components":[{"name":"AMBARI_SERVER"},{"name":"NAGIOS_SERVER"},{"name":"GANGLIA_SERVER"},{"name":"ZOOKEEPER_CLIENT"},{"name":"PIG"},{"name":"OOZIE_CLIENT"},{"name":"HBASE_CLIENT"},{"name":"HCAT"},{"name":"SQOOP"},{"name":"HDFS_CLIENT"},{"name":"HIVE_CLIENT"},{"name":"YARN_CLIENT"},{"name":"MAPREDUCE2_CLIENT"},{"name":"GANGLIA_MONITOR"}],"cardinality":"1"}],"Blueprints":{"blueprint_name":"blueprint-multinode-default","stack_name":"HDP","stack_version":"2.1"}}
\ No newline at end of file
+{"host_groups":[{"name":"master_1","components":[{"name":"NAMENODE"},{"name":"ZOOKEEPER_SERVER"},{"name":"HBASE_MASTER"},{"name":"GANGLIA_SERVER"},{"name":"HDFS_CLIENT"},{"name":"YARN_CLIENT"},{"name":"HCAT"},{"name":"GANGLIA_MONITOR"}],"cardinality":"1"},{"name":"master_2","components":[{"name":"ZOOKEEPER_CLIENT"},{"name":"HISTORYSERVER"},{"name":"HIVE_SERVER"},{"name":"SECONDARY_NAMENODE"},{"name":"HIVE_METASTORE"},{"name":"HDFS_CLIENT"},{"name":"HIVE_CLIENT"},{"name":"YARN_CLIENT"},{"name":"MYSQL_SERVER"},{"name":"GANGLIA_MONITOR"},{"name":"WEBHCAT_SERVER"}],"cardinality":"1"},{"name":"master_3","components":[{"name":"RESOURCEMANAGER"},{"name":"ZOOKEEPER_SERVER"},{"name":"GANGLIA_MONITOR"}],"cardinality":"1"},{"name":"master_4","components":[{"name":"OOZIE_SERVER"},{"name":"ZOOKEEPER_SERVER"},{"name":"GANGLIA_MONITOR"}],"cardinality":"1"},{"name":"slave","components":[{"name":"HBASE_REGIONSERVER"},{"name":"NODEMANAGER"},{"name":"DATANODE"},{"name":"GANGLIA_MONITOR"}],"cardinality
":"${slavesCount}"},{"name":"gateway","components":[{"name":"AMBARI_SERVER"},{"name":"GANGLIA_SERVER"},{"name":"ZOOKEEPER_CLIENT"},{"name":"PIG"},{"name":"OOZIE_CLIENT"},{"name":"HBASE_CLIENT"},{"name":"HCAT"},{"name":"SQOOP"},{"name":"HDFS_CLIENT"},{"name":"HIVE_CLIENT"},{"name":"YARN_CLIENT"},{"name":"MAPREDUCE2_CLIENT"},{"name":"GANGLIA_MONITOR"}],"cardinality":"1"}],"Blueprints":{"blueprint_name":"blueprint-multinode-default","stack_name":"HDP","stack_version":"2.1"}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4ededeb/ambari-server/src/test/resources/api_testscripts/curl-addnagios.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/api_testscripts/curl-addnagios.sh b/ambari-server/src/test/resources/api_testscripts/curl-addnagios.sh
deleted file mode 100644
index 59e56eb..0000000
--- a/ambari-server/src/test/resources/api_testscripts/curl-addnagios.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-curl -i -X POST http://localhost:8080/api/clusters/c1/services/NAGIOS
-curl -i -X POST http://localhost:8080/api/clusters/c1/services/NAGIOS/components/NAGIOS_SERVER
-curl -i -X POST http://localhost:8080/api/clusters/c1/hosts/localhost.localdomain/host_components/NAGIOS_SERVER
-curl -i -X POST -d '{"type": "nagios-global", "tag": "version1", "properties" : { "nagios_web_login" : "nagiosadmin", "nagios_web_password" : "password", "nagios_contact": "a\u0040b.c" }}' http://localhost:8080/api/clusters/c1/configurations
-curl -i -X PUT -d '{"config": {"nagios-global": "version1" }}' http://localhost:8080/api/clusters/c1/services/NAGIOS
-curl -i -X PUT -d '{"ServiceInfo": {"state" : "INSTALLED"}}' http://localhost:8080/api/clusters/c1/services/NAGIOS/