ambari git commit: AMBARI-18986. Deployment failure when command does not have role (smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk b7d55f0c9 -> fc46088d9
AMBARI-18986. Deployment failure when command does not have role (smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc46088d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc46088d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc46088d
Branch: refs/heads/trunk
Commit: fc46088d9a9943c8e6bd7ea9b29512064faf72c4
Parents: b7d55f0
Author: Sumit Mohanty
Authored: Thu Nov 24 10:15:30 2016 -0800
Committer: Sumit Mohanty
Committed: Thu Nov 24 10:16:11 2016 -0800
--
.../main/python/ambari_agent/CustomServiceOrchestrator.py| 8 ++--
.../python/ambari_agent/TestCustomServiceOrchestrator.py | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc46088d/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index b814334..770484d 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -42,6 +42,7 @@ class CustomServiceOrchestrator():
"""
SCRIPT_TYPE_PYTHON = "PYTHON"
+ COMMAND_TYPE = "commandType"
COMMAND_NAME_STATUS = "STATUS"
COMMAND_NAME_SECURITY_STATUS = "SECURITY_STATUS"
CUSTOM_ACTION_COMMAND = 'ACTIONEXECUTE'
@@ -58,7 +59,6 @@ class CustomServiceOrchestrator():
AMBARI_SERVER_HOST = "ambari_server_host"
AMBARI_SERVER_PORT = "ambari_server_port"
AMBARI_SERVER_USE_SSL = "ambari_server_use_ssl"
- METRICS_GRAFANA = "METRICS_GRAFANA"
FREQUENT_COMMANDS = [COMMAND_NAME_SECURITY_STATUS, COMMAND_NAME_STATUS]
DONT_DEBUG_FAILURES_FOR_COMMANDS = FREQUENT_COMMANDS
@@ -154,7 +154,11 @@ class CustomServiceOrchestrator():
self.file_cache.get_host_scripts_base_dir(server_url_prefix)
hook_dir = self.file_cache.get_hook_base_dir(command,
server_url_prefix)
base_dir = self.file_cache.get_service_base_dir(command,
server_url_prefix)
-if command['role'] == self.METRICS_GRAFANA:
+from ActionQueue import ActionQueue # To avoid cyclic dependency
+if self.COMMAND_TYPE in command and command[self.COMMAND_TYPE] ==
ActionQueue.EXECUTION_COMMAND:
+ logger.info("Found it - " + str(command[self.COMMAND_TYPE]) + "
yeah")
+ # limiting to only EXECUTION_COMMANDs for now
+ # TODO need a design for limiting to specific role/component such as
METRICS_GRAFANA
self.file_cache.get_dashboard_base_dir(server_url_prefix)
script_path = self.resolve_script_path(base_dir, script)
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc46088d/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
--
diff --git
a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
index d0d6ac4..2be6e1a 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
@@ -239,6 +239,7 @@ class TestCustomServiceOrchestrator(TestCase):
FileCache_mock.return_value = None
command = {
+ 'commandType' : 'EXECUTION_COMMAND',
'role' : 'REGION_SERVER',
'hostLevelParams' : {
'stack_name' : 'HDP',
@@ -277,8 +278,7 @@ class TestCustomServiceOrchestrator(TestCase):
self.assertEqual(ret['exitcode'], 0)
self.assertTrue(run_file_mock.called)
self.assertEqual(run_file_mock.call_count, 3)
-# Should only be called for METRICS_GRAFANA
-self.assertFalse(get_dashboard_base_dir_mock.called)
+self.assertTrue(get_dashboard_base_dir_mock.called)
run_file_mock.reset_mock()
ambari git commit: AMBARI-18986. Deployment failure when command does not have role (smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 92823a75d -> 7afe172d2
AMBARI-18986. Deployment failure when command does not have role (smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7afe172d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7afe172d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7afe172d
Branch: refs/heads/branch-2.5
Commit: 7afe172d20c88abe6b51110364c5200ae1e29618
Parents: 92823a7
Author: Sumit Mohanty
Authored: Thu Nov 24 10:15:30 2016 -0800
Committer: Sumit Mohanty
Committed: Thu Nov 24 10:15:30 2016 -0800
--
.../main/python/ambari_agent/CustomServiceOrchestrator.py| 8 ++--
.../python/ambari_agent/TestCustomServiceOrchestrator.py | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe172d/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index b814334..770484d 100644
--- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
+++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
@@ -42,6 +42,7 @@ class CustomServiceOrchestrator():
"""
SCRIPT_TYPE_PYTHON = "PYTHON"
+ COMMAND_TYPE = "commandType"
COMMAND_NAME_STATUS = "STATUS"
COMMAND_NAME_SECURITY_STATUS = "SECURITY_STATUS"
CUSTOM_ACTION_COMMAND = 'ACTIONEXECUTE'
@@ -58,7 +59,6 @@ class CustomServiceOrchestrator():
AMBARI_SERVER_HOST = "ambari_server_host"
AMBARI_SERVER_PORT = "ambari_server_port"
AMBARI_SERVER_USE_SSL = "ambari_server_use_ssl"
- METRICS_GRAFANA = "METRICS_GRAFANA"
FREQUENT_COMMANDS = [COMMAND_NAME_SECURITY_STATUS, COMMAND_NAME_STATUS]
DONT_DEBUG_FAILURES_FOR_COMMANDS = FREQUENT_COMMANDS
@@ -154,7 +154,11 @@ class CustomServiceOrchestrator():
self.file_cache.get_host_scripts_base_dir(server_url_prefix)
hook_dir = self.file_cache.get_hook_base_dir(command,
server_url_prefix)
base_dir = self.file_cache.get_service_base_dir(command,
server_url_prefix)
-if command['role'] == self.METRICS_GRAFANA:
+from ActionQueue import ActionQueue # To avoid cyclic dependency
+if self.COMMAND_TYPE in command and command[self.COMMAND_TYPE] ==
ActionQueue.EXECUTION_COMMAND:
+ logger.info("Found it - " + str(command[self.COMMAND_TYPE]) + "
yeah")
+ # limiting to only EXECUTION_COMMANDs for now
+ # TODO need a design for limiting to specific role/component such as
METRICS_GRAFANA
self.file_cache.get_dashboard_base_dir(server_url_prefix)
script_path = self.resolve_script_path(base_dir, script)
http://git-wip-us.apache.org/repos/asf/ambari/blob/7afe172d/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
--
diff --git
a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
index d0d6ac4..2be6e1a 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
@@ -239,6 +239,7 @@ class TestCustomServiceOrchestrator(TestCase):
FileCache_mock.return_value = None
command = {
+ 'commandType' : 'EXECUTION_COMMAND',
'role' : 'REGION_SERVER',
'hostLevelParams' : {
'stack_name' : 'HDP',
@@ -277,8 +278,7 @@ class TestCustomServiceOrchestrator(TestCase):
self.assertEqual(ret['exitcode'], 0)
self.assertTrue(run_file_mock.called)
self.assertEqual(run_file_mock.call_count, 3)
-# Should only be called for METRICS_GRAFANA
-self.assertFalse(get_dashboard_base_dir_mock.called)
+self.assertTrue(get_dashboard_base_dir_mock.called)
run_file_mock.reset_mock()
ambari git commit: AMBARI-18985. typeahead was lost while bootstrap 2 to bootstrap3 mirgation (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 14d63dd9b -> b7d55f0c9
AMBARI-18985. typeahead was lost while bootstrap 2 to bootstrap3 mirgation
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7d55f0c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7d55f0c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7d55f0c
Branch: refs/heads/trunk
Commit: b7d55f0c9375686b8949ada3a4688eb936cf8404
Parents: 14d63dd
Author: Oleg Nechiporenko
Authored: Thu Nov 24 15:49:00 2016 +0200
Committer: Oleg Nechiporenko
Committed: Thu Nov 24 15:49:00 2016 +0200
--
.../common/assign_master_components_view.js | 2 +
ambari-web/brunch-config.js | 1 +
ambari-web/vendor/scripts/jquery.typeahead.js | 300 +++
3 files changed, 303 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7d55f0c/ambari-web/app/views/common/assign_master_components_view.js
--
diff --git a/ambari-web/app/views/common/assign_master_components_view.js
b/ambari-web/app/views/common/assign_master_components_view.js
index 53859f6..4646cf0 100644
--- a/ambari-web/app/views/common/assign_master_components_view.js
+++ b/ambari-web/app/views/common/assign_master_components_view.js
@@ -63,6 +63,8 @@ App.InputHostView = Em.TextField.extend(App.SelectHost, {
*/
typeahead: null,
+ classNames: ['form-control'],
+
/**
* When value (host_info) is changed this method is triggered
* If new hostname is valid, this host is assigned to master component
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7d55f0c/ambari-web/brunch-config.js
--
diff --git a/ambari-web/brunch-config.js b/ambari-web/brunch-config.js
index 27a6057..d646fdc 100644
--- a/ambari-web/brunch-config.js
+++ b/ambari-web/brunch-config.js
@@ -67,6 +67,7 @@ module.exports.config = {
'vendor/scripts/jquery.timeago.js',
'vendor/scripts/jquery.ajax-retry.js',
'vendor/scripts/jquery.sticky-kit.js',
+ 'vendor/scripts/jquery.typeahead.js',
'vendor/scripts/underscore.js',
'vendor/scripts/backbone.js',
'vendor/scripts/difflib.js',
http://git-wip-us.apache.org/repos/asf/ambari/blob/b7d55f0c/ambari-web/vendor/scripts/jquery.typeahead.js
--
diff --git a/ambari-web/vendor/scripts/jquery.typeahead.js
b/ambari-web/vendor/scripts/jquery.typeahead.js
new file mode 100644
index 000..c020a8e
--- /dev/null
+++ b/ambari-web/vendor/scripts/jquery.typeahead.js
@@ -0,0 +1,300 @@
+/* =
+ * bootstrap-typeahead.js v2.1.1
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed 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.
+ * */
+
+
+!function($){
+
+ "use strict"; // jshint ;_;
+
+
+ /* TYPEAHEAD PUBLIC CLASS DEFINITION
+ * = */
+
+ var Typeahead = function (element, options) {
+this.$element = $(element)
+this.options = $.extend({}, $.fn.typeahead.defaults, options)
+this.matcher = this.options.matcher || this.matcher
+this.sorter = this.options.sorter || this.sorter
+this.highlighter = this.options.highlighter || this.highlighter
+this.updater = this.options.updater || this.updater
+this.$menu = $(this.options.menu).appendTo('body')
+this.source = this.options.source
+this.shown = false
+this.listen()
+ }
+
+ Typeahead.prototype = {
+
+constructor: Typeahead
+
+, select: function () {
+ var val = this.$menu.find('.active').attr('data-value')
+ this.$element
+.val(this.updater(val))
+.change()
+ return this.hide()
+}
+
+, updater: function (item) {
+ return item
+}
+
+, show: function () {
+ var pos = $.extend({}, this.$element.offset(), {
+height: this.$element[0].offsetHeight
+ })
+
+ this.$menu.css({
+top: po
ambari git commit: AMBARI-18984 Test and fix new tables styles on Ambari (part 5). (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 3081aec39 -> 14d63dd9b
AMBARI-18984 Test and fix new tables styles on Ambari (part 5). (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/14d63dd9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14d63dd9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14d63dd9
Branch: refs/heads/trunk
Commit: 14d63dd9b4241ef5cf6624c3ca3d5a1f303bc68c
Parents: 3081aec
Author: ababiichuk
Authored: Thu Nov 24 13:20:26 2016 +0200
Committer: ababiichuk
Committed: Thu Nov 24 13:20:26 2016 +0200
--
ambari-web/app/messages.js | 2 +-
ambari-web/app/styles/alerts.less | 75 +
ambari-web/app/styles/application.less | 123 ++--
ambari-web/app/styles/modal_popups.less | 67 +---
ambari-web/app/styles/stack_versions.less | 6 +-
ambari-web/app/styles/wizard.less | 4 -
.../templates/common/configs/overrideWindow.hbs | 2 +-
.../templates/common/host_progress_popup.hbs| 316 +++
.../common/modal_popups/alerts_popup.hbs| 80 +++--
.../modal_popups/dependent_configs_list.hbs | 2 +-
ambari-web/app/templates/experimental.hbs | 2 +-
.../templates/main/admin/service_auto_start.hbs | 70 ++--
.../admin/stack_upgrade/edit_repositories.hbs | 52 +--
.../stack_upgrade/stack_upgrade_wizard.hbs | 4 +-
.../stack_upgrade/upgrade_history_details.hbs | 4 +-
.../main/admin/stack_upgrade/upgrade_task.hbs | 4 +-
.../alerts/add_definition_to_group_popup.hbs| 2 +-
.../main/host/bulk_operation_confirm_popup.hbs | 2 +-
ambari-web/app/templates/wizard/step1.hbs | 2 +-
.../wizard/step9/step9HostTasksLogPopup.hbs | 88 +++---
ambari-web/app/utils/host_progress_popup.js | 5 +-
ambari-web/app/views/main/host.js | 5 +-
ambari-web/app/views/wizard/step3_view.js | 2 +-
.../views/wizard/step9/hostLogPopupBody_view.js | 2 +
24 files changed, 414 insertions(+), 507 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index aa4e2aa..a1d84a3 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1700,7 +1700,7 @@ Em.I18n.translations = {
'admin.stackVersions.upgrade.installPackage.fail.title':'Packages could not
be installed',
'admin.stackVersions.upgrade.installPackage.fail.timeout':'Request timed
out.',
- 'admin.stackVersions.editRepositories.info': 'Provide Base URLs for the
Operating Systems you are configuring. Uncheck all other Operating Systems.',
+ 'admin.stackVersions.editRepositories.info': 'Provide Base URLs for the
Operating Systems you are configuring.',
'admin.stackVersions.editRepositories.validation.warning': 'Some of the
repositories failed validation. Make changes to the base url or skip validation
if you are sure that urls are correct',
'admin.stackVersions.version.install.confirm': 'You are about to install
packages for version {0} on all hosts.',
'admin.stackVersions.version.linkTooltip': 'Click to Edit Repositories',
http://git-wip-us.apache.org/repos/asf/ambari/blob/14d63dd9/ambari-web/app/styles/alerts.less
--
diff --git a/ambari-web/app/styles/alerts.less
b/ambari-web/app/styles/alerts.less
index bf3eaf3..77cc13c 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -416,11 +416,6 @@
.modal-body, .modal-footer, .modal-header {
min-width: 600px;
}
- #alert-info {
-.alert-list-wrap:hover {
- background-color: #e6e6e6;
-}
- }
}
.service-alerts {
@@ -444,76 +439,16 @@
}
.alerts-popup-wrap {
- .trim_hostname{
-display: block;
-overflow: hidden;
-text-overflow: ellipsis;
- }
- .top-wrap {
-width: 100%;
-border-bottom: 1px solid #CCC;
-text-align: center;
-font-size: 15px;
-padding: 0 0 20px 0;
-height: 20px;
-.name-top {
- width: 32%;
- padding-left: 10px;
-}
-.service-top {
- width: 31%;
- padding-left: 10px;
-}
-.status-top,.name-top,.service-top,.last-triggered-top {
- float: left;
- text-align: left;
-}
- }
- #alert-info{
+ #alert-info {
overflow: auto;
max-height: 340px;
-width: 100%;
.alert-list-wrap {
padding: 10px 5px;
- border-top: 1px solid #CCC;
- border-bottom: 1px solid #CCC;
-}
-.alert-list-line-cursor{
- width: 100%;
- min-height: 20px;
- .status-icon {
-padding-right: 5px;
-min-width: 20p
ambari git commit: AMBARI-18983. Service Summary fix add widget button size (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c9f6944b0 -> 3081aec39
AMBARI-18983. Service Summary fix add widget button size (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3081aec3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3081aec3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3081aec3
Branch: refs/heads/trunk
Commit: 3081aec39c0f6dfc13545667ec1a1b2ef87d3b06
Parents: c9f6944
Author: Aleksandr Kovalenko
Authored: Thu Nov 24 10:59:37 2016 +0200
Committer: Aleksandr Kovalenko
Committed: Thu Nov 24 13:07:34 2016 +0200
--
ambari-web/app/styles/enhanced_service_dashboard.less | 2 ++
ambari-web/app/templates/main/service/info/summary.hbs | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3081aec3/ambari-web/app/styles/enhanced_service_dashboard.less
--
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less
b/ambari-web/app/styles/enhanced_service_dashboard.less
index e783c52..870e9a8 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -20,10 +20,12 @@
@border-color: #ddd;
@invalid-color: red;
+@add-widget-btn-color: #f5f5f5;
.service-metrics-block {
#add-widget-action-box {
+background-color: @add-widget-btn-color;
width: 98%;
padding: 43px;
border: 1px solid @border-color;
http://git-wip-us.apache.org/repos/asf/ambari/blob/3081aec3/ambari-web/app/templates/main/service/info/summary.hbs
--
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs
b/ambari-web/app/templates/main/service/info/summary.hbs
index 385465d..c142464 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -136,7 +136,7 @@
{{#if isAmbariMetricsInstalled}}
[2/2] ambari git commit: AMBARI-18974. A number of Ambari Server Unit Test failures on branch-2.5 (dlysnichenko)
AMBARI-18974. A number of Ambari Server Unit Test failures on branch-2.5
(dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92823a75
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92823a75
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92823a75
Branch: refs/heads/branch-2.5
Commit: 92823a75d38cb5649ed6edddfbc29796f5853ab9
Parents: c538cd8
Author: Lisnichenko Dmitro
Authored: Thu Nov 24 11:51:54 2016 +0200
Committer: Lisnichenko Dmitro
Committed: Thu Nov 24 11:52:32 2016 +0200
--
.../controller/internal/StackDefinedPropertyProviderTest.java | 2 ++
.../server/controller/metrics/RestMetricsPropertyProviderTest.java | 2 ++
2 files changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/92823a75/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
index 958957b..75d5bd8 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
@@ -52,6 +52,7 @@ import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.TemporalInfo;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.orm.OrmTestHelper;
@@ -157,6 +158,7 @@ public class StackDefinedPropertyProviderTest {
field.set(null, amc);
Clusters clustersMock = createNiceMock(Clusters.class);
Cluster clusterMock = createNiceMock(Cluster.class);
+
expect(amc.getAmbariEventPublisher()).andReturn(createNiceMock(AmbariEventPublisher.class)).anyTimes();
expect(amc.getClusters()).andReturn(clustersMock).anyTimes();
expect(clustersMock.getCluster(CLUSTER_NAME_PROPERTY_ID)).andReturn(clusterMock).anyTimes();
expect(clusterMock.getResourceId()).andReturn(2L).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/92823a75/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
index a9934a2..410e2f1 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
@@ -46,6 +46,7 @@ import
org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.TemporalInfo;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.controller.utilities.StreamProvider;
+import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.security.TestAuthenticationFactory;
@@ -135,6 +136,7 @@ public class RestMetricsPropertyProviderTest {
ConfigHelper configHelperMock = createNiceMock(ConfigHelper.class);
expect(amc.getClusters()).andReturn(clusters).anyTimes();
+
expect(amc.getAmbariEventPublisher()).andReturn(createNiceMock(AmbariEventPublisher.class)).anyTimes();
expect(amc.findConfigurationTagsWithOverrides(eq(c1),
anyString())).andReturn(Collections.singletonMap("storm-site",
Collections.singletonMap("tag", "version1"))).anyTimes();
expect(amc.getConfigHelper()).andReturn(configHelperMock).anyTimes();
[1/2] ambari git commit: AMBARI-18974. A number of Ambari Server Unit Test failures on branch-2.5 (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 c538cd8ac -> 92823a75d
refs/heads/trunk cb1bce2f5 -> c9f6944b0
AMBARI-18974. A number of Ambari Server Unit Test failures on branch-2.5
(dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9f6944b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9f6944b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9f6944b
Branch: refs/heads/trunk
Commit: c9f6944b038b73ce41aaa5fc9adb0aa2745e01e8
Parents: cb1bce2
Author: Lisnichenko Dmitro
Authored: Thu Nov 24 11:51:54 2016 +0200
Committer: Lisnichenko Dmitro
Committed: Thu Nov 24 11:51:54 2016 +0200
--
.../controller/internal/StackDefinedPropertyProviderTest.java | 2 ++
.../server/controller/metrics/RestMetricsPropertyProviderTest.java | 2 ++
2 files changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f6944b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
index 958957b..75d5bd8 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
@@ -52,6 +52,7 @@ import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.TemporalInfo;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
+import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.orm.OrmTestHelper;
@@ -157,6 +158,7 @@ public class StackDefinedPropertyProviderTest {
field.set(null, amc);
Clusters clustersMock = createNiceMock(Clusters.class);
Cluster clusterMock = createNiceMock(Cluster.class);
+
expect(amc.getAmbariEventPublisher()).andReturn(createNiceMock(AmbariEventPublisher.class)).anyTimes();
expect(amc.getClusters()).andReturn(clustersMock).anyTimes();
expect(clustersMock.getCluster(CLUSTER_NAME_PROPERTY_ID)).andReturn(clusterMock).anyTimes();
expect(clusterMock.getResourceId()).andReturn(2L).anyTimes();
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9f6944b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
index a9934a2..410e2f1 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/RestMetricsPropertyProviderTest.java
@@ -46,6 +46,7 @@ import
org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.TemporalInfo;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.controller.utilities.StreamProvider;
+import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
import org.apache.ambari.server.orm.GuiceJpaInitializer;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.security.TestAuthenticationFactory;
@@ -135,6 +136,7 @@ public class RestMetricsPropertyProviderTest {
ConfigHelper configHelperMock = createNiceMock(ConfigHelper.class);
expect(amc.getClusters()).andReturn(clusters).anyTimes();
+
expect(amc.getAmbariEventPublisher()).andReturn(createNiceMock(AmbariEventPublisher.class)).anyTimes();
expect(amc.findConfigurationTagsWithOverrides(eq(c1),
anyString())).andReturn(Collections.singletonMap("storm-site",
Collections.singletonMap("tag", "version1"))).anyTimes();
expect(amc.getConfigHelper()).andReturn(configHelperMock).anyTimes();
ambari git commit: AMBARI-18971 Populate Ranger LDAP group configs under LDAP category used for authentication (mugdha)
Repository: ambari
Updated Branches:
refs/heads/trunk 998baf64d -> cb1bce2f5
AMBARI-18971 Populate Ranger LDAP group configs under LDAP category used for
authentication (mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cb1bce2f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cb1bce2f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cb1bce2f
Branch: refs/heads/trunk
Commit: cb1bce2f5af7f4fa6c55b819b23c53ce342d9a45
Parents: 998baf6
Author: Mugdha Varadkar
Authored: Thu Nov 24 14:24:51 2016 +0530
Committer: Mugdha Varadkar
Committed: Thu Nov 24 14:28:42 2016 +0530
--
.../data/configs/services/ranger_properties.js | 26 +---
1 file changed, 22 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/cb1bce2f/ambari-web/app/data/configs/services/ranger_properties.js
--
diff --git a/ambari-web/app/data/configs/services/ranger_properties.js
b/ambari-web/app/data/configs/services/ranger_properties.js
index b78a9df..754e4d4 100644
--- a/ambari-web/app/data/configs/services/ranger_properties.js
+++ b/ambari-web/app/data/configs/services/ranger_properties.js
@@ -181,7 +181,8 @@ module.exports = [
"category": "LDAPSettings",
"filename": "ranger-admin-site.xml",
"name": "ranger.ldap.url",
-"serviceName": "RANGER"
+"serviceName": "RANGER",
+"index": 1
},
{
"category": "LDAPSettings",
@@ -205,13 +206,15 @@ module.exports = [
"category": "LDAPSettings",
"filename": "ranger-admin-site.xml",
"name": "ranger.ldap.bind.dn",
-"serviceName": "RANGER"
+"serviceName": "RANGER",
+"index": 2
},
{
"category": "LDAPSettings",
"filename": "ranger-admin-site.xml",
"name": "ranger.ldap.bind.password",
-"serviceName": "RANGER"
+"serviceName": "RANGER",
+"index": 3
},
{
"category": "LDAPSettings",
@@ -223,7 +226,22 @@ module.exports = [
"category": "LDAPSettings",
"filename": "ranger-admin-site.xml",
"name": "ranger.ldap.user.searchfilter",
-"serviceName": "RANGER"
+"serviceName": "RANGER",
+"index": 4
+ },
+ {
+"category": "LDAPSettings",
+"filename": "ranger-admin-site.xml",
+"name": "ranger.ldap.group.searchbase",
+"serviceName": "RANGER",
+"index": 5
+ },
+ {
+"category": "LDAPSettings",
+"filename": "ranger-admin-site.xml",
+"name": "ranger.ldap.group.searchfilter",
+"serviceName": "RANGER",
+"index": 6
},
{
"category": "KnoxSSOSettings",
ambari git commit: AMBARI-18971 Populate Ranger LDAP group configs under LDAP category used for authentication (mugdha)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 81839272f -> c538cd8ac
AMBARI-18971 Populate Ranger LDAP group configs under LDAP category used for
authentication (mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c538cd8a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c538cd8a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c538cd8a
Branch: refs/heads/branch-2.5
Commit: c538cd8ac7eb6499167efc999af91c15d70cae38
Parents: 8183927
Author: Mugdha Varadkar
Authored: Wed Nov 23 15:14:44 2016 +0530
Committer: Mugdha Varadkar
Committed: Thu Nov 24 14:11:49 2016 +0530
--
ambari-web/app/data/HDP2.3/site_properties.js | 25 ++
1 file changed, 21 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c538cd8a/ambari-web/app/data/HDP2.3/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2.3/site_properties.js
b/ambari-web/app/data/HDP2.3/site_properties.js
index 9ae68df..ca2564d 100644
--- a/ambari-web/app/data/HDP2.3/site_properties.js
+++ b/ambari-web/app/data/HDP2.3/site_properties.js
@@ -146,7 +146,8 @@ hdp23properties.push({
"name": "ranger.ldap.url",
"serviceName": "RANGER",
"filename": "ranger-admin-site.xml",
-"category": "LDAPSettings"
+"category": "LDAPSettings",
+"index": 1
},
{
"name": "ranger.ldap.user.dnpattern",
@@ -170,13 +171,15 @@ hdp23properties.push({
"name": "ranger.ldap.bind.dn",
"serviceName": "RANGER",
"filename": "ranger-admin-site.xml",
-"category": "LDAPSettings"
+"category": "LDAPSettings",
+"index": 2
},
{
"name": "ranger.ldap.bind.password",
"serviceName": "RANGER",
"filename": "ranger-admin-site.xml",
-"category": "LDAPSettings"
+"category": "LDAPSettings",
+"index": 3
},
{
"name": "ranger.ldap.referral",
@@ -188,7 +191,21 @@ hdp23properties.push({
"name": "ranger.ldap.user.searchfilter",
"serviceName": "RANGER",
"filename": "ranger-admin-site.xml",
-"category": "LDAPSettings"
+"category": "LDAPSettings",
+"index": 4
+ },
+ {
+"name": "ranger.ldap.group.searchbase",
+"serviceName": "RANGER",
+"filename": "ranger-admin-site.xml",
+"category": "LDAPSettings",
+"index": 5
+ },
+ { "name": "ranger.ldap.group.searchfilter",
+"serviceName": "RANGER",
+"filename": "ranger-admin-site.xml",
+"category": "LDAPSettings",
+"index": 6
},
{
"name": "ranger.sso.providerurl",
