[2/2] git commit: AMBARI-7400. Slider View: Most view parameters should be made required. (onechiporenko)
AMBARI-7400. Slider View: Most view parameters should be made required.
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d62147ed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d62147ed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d62147ed
Branch: refs/heads/trunk
Commit: d62147ed37864f7f9f321448c3036ade0eeb681f
Parents: d7b09b6
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Fri Sep 19 13:13:34 2014 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Fri Sep 19 13:13:34 2014 +0300
--
.../app/assets/data/resource/cluster_name.json | 12 -
.../assets/data/resource/components_hosts.json | 16 -
.../ui/app/assets/data/resource/empty_json.json |1 +
.../assets/data/resource/service_configs.json | 38 -
.../assets/data/resource/service_status.json| 95 --
.../assets/data/resource/slider-properties.json |7 +-
.../createAppWizard/step1_controller.js | 90 +-
.../ui/app/controllers/slider_controller.js | 308 +---
.../src/main/resources/ui/app/helpers/ajax.js | 119 +-
.../src/main/resources/ui/app/initialize.js |9 +-
.../ui/app/mappers/slider_apps_mapper.js|7 +
.../resources/ui/app/models/slider_config.js| 51 +
.../src/main/resources/ui/app/routes/main.js| 16 +
.../resources/ui/app/templates/application.hbs |4 +-
.../ui/app/templates/slider_title_tooltip.hbs |2 +-
.../src/main/resources/ui/app/translations.js |7 +-
.../resources/ui/app/views/application_view.js | 13 +-
.../slider/src/main/resources/ui/config.js |1 +
.../resources/ui/vendor/scripts/common/tv4.js | 1605 ++
.../views/slider/src/main/resources/view.xml| 21 +-
20 files changed, 1815 insertions(+), 607 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d62147ed/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/cluster_name.json
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/cluster_name.json
b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/cluster_name.json
deleted file mode 100644
index f559483..000
---
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/cluster_name.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- href : http://162.216.151.215:8080/api/v1/clusters?_=1409232826826;,
- items : [
-{
- href : http://162.216.151.215:8080/api/v1/clusters/mycluster;,
- Clusters : {
-cluster_name : mycluster,
-version : HDP-2.1
- }
-}
- ]
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d62147ed/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/components_hosts.json
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/components_hosts.json
b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/components_hosts.json
deleted file mode 100644
index eaf72b4..000
---
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/components_hosts.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- items : [
-{
- Hosts : {
-host_name : myHost
- },
- host_components : [
-{
- HostRoles : {
-component_name :
- }
-}
- ]
-}
- ]
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d62147ed/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/empty_json.json
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/empty_json.json
b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/empty_json.json
new file mode 100644
index 000..0967ef4
--- /dev/null
+++
b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/empty_json.json
@@ -0,0 +1 @@
+{}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d62147ed/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_configs.json
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_configs.json
b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_configs.json
deleted file mode 100644
index 24c1a31..000
---
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_configs.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- items : [
-{
- cluster_name : cl,
- configurations : [
-{
- Config : {
-cluster_name : cl
-
[1/2] AMBARI-7400. Slider View: Most view parameters should be made required. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk d7b09b61a - d62147ed3
http://git-wip-us.apache.org/repos/asf/ambari/blob/d62147ed/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/tv4.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/tv4.js
b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/tv4.js
new file mode 100644
index 000..b530ab3
--- /dev/null
+++ b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/tv4.js
@@ -0,0 +1,1605 @@
+/*
+ Author: Geraint Luff and others
+ Year: 2013
+
+ This code is released into the public domain by its author(s). Anybody may
use, alter and distribute the code without restriction. The author makes no
guarantees, and takes no liability of any kind for use of this code.
+
+ If you find a bug or make an improvement, it would be courteous to let the
author know, but it is not compulsory.
+ */
+(function (global, factory) {
+ if (typeof define === 'function' define.amd) {
+// AMD. Register as an anonymous module.
+define([], factory);
+ } else if (typeof module !== 'undefined' module.exports){
+// CommonJS. Define export.
+module.exports = factory();
+ } else {
+// Browser globals
+global.tv4 = factory();
+ }
+}(this, function () {
+
+//
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys?redirectlocale=en-USredirectslug=JavaScript%2FReference%2FGlobal_Objects%2FObject%2Fkeys
+ if (!Object.keys) {
+Object.keys = (function () {
+ var hasOwnProperty = Object.prototype.hasOwnProperty,
+hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'),
+dontEnums = [
+ 'toString',
+ 'toLocaleString',
+ 'valueOf',
+ 'hasOwnProperty',
+ 'isPrototypeOf',
+ 'propertyIsEnumerable',
+ 'constructor'
+],
+dontEnumsLength = dontEnums.length;
+
+ return function (obj) {
+if (typeof obj !== 'object' typeof obj !== 'function' || obj ===
null) {
+ throw new TypeError('Object.keys called on non-object');
+}
+
+var result = [];
+
+for (var prop in obj) {
+ if (hasOwnProperty.call(obj, prop)) {
+result.push(prop);
+ }
+}
+
+if (hasDontEnumBug) {
+ for (var i=0; i dontEnumsLength; i++) {
+if (hasOwnProperty.call(obj, dontEnums[i])) {
+ result.push(dontEnums[i]);
+}
+ }
+}
+return result;
+ };
+})();
+ }
+//
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create
+ if (!Object.create) {
+Object.create = (function(){
+ function F(){}
+
+ return function(o){
+if (arguments.length !== 1) {
+ throw new Error('Object.create implementation only accepts one
parameter.');
+}
+F.prototype = o;
+return new F();
+ };
+})();
+ }
+//
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray?redirectlocale=en-USredirectslug=JavaScript%2FReference%2FGlobal_Objects%2FArray%2FisArray
+ if(!Array.isArray) {
+Array.isArray = function (vArg) {
+ return Object.prototype.toString.call(vArg) === [object Array];
+};
+ }
+//
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf?redirectlocale=en-USredirectslug=JavaScript%2FReference%2FGlobal_Objects%2FArray%2FindexOf
+ if (!Array.prototype.indexOf) {
+Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) {
+ if (this === null) {
+throw new TypeError();
+ }
+ var t = Object(this);
+ var len = t.length 0;
+
+ if (len === 0) {
+return -1;
+ }
+ var n = 0;
+ if (arguments.length 1) {
+n = Number(arguments[1]);
+if (n !== n) { // shortcut for verifying if it's NaN
+ n = 0;
+} else if (n !== 0 n !== Infinity n !== -Infinity) {
+ n = (n 0 || -1) * Math.floor(Math.abs(n));
+}
+ }
+ if (n = len) {
+return -1;
+ }
+ var k = n = 0 ? n : Math.max(len - Math.abs(n), 0);
+ for (; k len; k++) {
+if (k in t t[k] === searchElement) {
+ return k;
+}
+ }
+ return -1;
+};
+ }
+
+// Grungey Object.isFrozen hack
+ if (!Object.isFrozen) {
+Object.isFrozen = function (obj) {
+ var key = tv4_test_frozen_key;
+ while (obj.hasOwnProperty(key)) {
+key += Math.random();
+ }
+ try {
+obj[key] = true;
+delete obj[key];
+return false;
+ } catch (e) {
+return true;
+ }
+};
+ }
+// Based on: https://github.com/geraintluff/uri-templates, but with all the
de-substitution stuff removed
+
+ var
git commit: AMBARI-7399. Slider View: Firefox has Create action inside the table header. (Max Shepel via akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk d62147ed3 - 6eda8c66a
AMBARI-7399. Slider View: Firefox has Create action inside the table header.
(Max Shepel via akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6eda8c66
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6eda8c66
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6eda8c66
Branch: refs/heads/trunk
Commit: 6eda8c66a44189320c2e2270be0f74a33c0a6f68
Parents: d62147e
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Fri Sep 19 13:14:22 2014 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Fri Sep 19 13:19:24 2014 +0300
--
.../src/main/resources/ui/app/styles/application.less | 13 +
.../main/resources/ui/app/templates/application.hbs| 13 +++--
.../main/resources/ui/app/templates/slider_apps.hbs| 7 ---
.../main/resources/ui/app/views/application_view.js| 5 +
4 files changed, 25 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6eda8c66/contrib/views/slider/src/main/resources/ui/app/styles/application.less
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
index 44c6487..7497b6e 100644
--- a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
+++ b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
@@ -44,11 +44,16 @@ a {
cursor: pointer;
}
-#slider-apps-table {
- .create-app {
-margin-bottom: 20px;
+.slider-header {
+ overflow: hidden;
+ .box-header {
+padding-top: 20px;
}
-#slider-table {
+}
+
+#slider-apps-table {
+
+ #slider-table {
margin-top: 10px;
margin-bottom: 10px;
font-size: 13px\9;
http://git-wip-us.apache.org/repos/asf/ambari/blob/6eda8c66/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
index da828bf..f62 100755
--- a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
+++ b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
@@ -16,9 +16,18 @@
* limitations under the License.
}}
-div
+div class=slider-header
{{#view view.SliderTitleView}}
-h1{{t slider.apps.title}} - span class=slider-app-title
{{bs-bind-popover view.popover}}{{App.instance}}/span/h1
+h1 class=pull-left{{t slider.apps.title}} - span
class=slider-app-title {{bs-bind-popover
view.popover}}{{App.instance}}/span/h1
+{{#if view.isIndexPage}}
+ div class=box-header pull-right
+div class=create-app
+ a href=# class=btn btn-primary {{action createApp}}
+i class=icon-plus/ispannbsp;{{t
slider.apps.create}}/span
+ /a
+/div
+ /div
+{{/if}}
{{/view}}
{{outlet bs-tooltip-box}}
/div
http://git-wip-us.apache.org/repos/asf/ambari/blob/6eda8c66/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs
b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs
index aecfb30..ef72291 100644
--- a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs
+++ b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs
@@ -17,13 +17,6 @@
}}
div id=slider-apps-table
- div class=box-header
-div class=pull-right create-app
- a href=# class=btn btn-primary {{action createApp}}
-i class=icon-plus/ispannbsp;{{t slider.apps.create}}/span
- /a
-/div
- /div
table class=datatable table table-bordered table-striped
id=slider-table
thead
http://git-wip-us.apache.org/repos/asf/ambari/blob/6eda8c66/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
b/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
index 1860944..7471f04 100644
--- a/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
+++ b/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
@@ -33,6 +33,11 @@ App.ApplicationView = Ember.View.extend({
placement: 'bottom'
}),
+isIndexPage: function () {
+ var currentPath =
git commit: AMBARI-7402 Incorrect behavior of filtering by custom date on Config History tab. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 6eda8c66a - 5c48015d6
AMBARI-7402 Incorrect behavior of filtering by custom date on Config History
tab. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c48015d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c48015d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c48015d
Branch: refs/heads/trunk
Commit: 5c48015d6b62e3052b2555fefc0cc4604c74a88a
Parents: 6eda8c6
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Fri Sep 19 13:36:18 2014 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Fri Sep 19 13:36:35 2014 +0300
--
ambari-web/app/views/common/filter_view.js | 8 +++-
ambari-web/app/views/main/dashboard/config_history_view.js | 4 ++--
2 files changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c48015d/ambari-web/app/views/common/filter_view.js
--
diff --git a/ambari-web/app/views/common/filter_view.js
b/ambari-web/app/views/common/filter_view.js
index 93c2d90..f279fd3 100644
--- a/ambari-web/app/views/common/filter_view.js
+++ b/ambari-web/app/views/common/filter_view.js
@@ -495,7 +495,13 @@ module.exports = {
break;
case 'range':
return function (origin, compareValue){
- //TODO add filter by range value
+ if (compareValue[1] compareValue[0]) {
+return origin = compareValue[0] origin = compareValue[1];
+ } else if (compareValue[0]){
+return origin = compareValue[0];
+ } else if (compareValue[1]) {
+return origin = compareValue[1]
+ }
return true;
};
break;
http://git-wip-us.apache.org/repos/asf/ambari/blob/5c48015d/ambari-web/app/views/main/dashboard/config_history_view.js
--
diff --git a/ambari-web/app/views/main/dashboard/config_history_view.js
b/ambari-web/app/views/main/dashboard/config_history_view.js
index 436451e..792e31f 100644
--- a/ambari-web/app/views/main/dashboard/config_history_view.js
+++ b/ambari-web/app/views/main/dashboard/config_history_view.js
@@ -155,8 +155,8 @@ App.MainConfigHistoryView = App.TableView.extend({
startTimeBinding: controller.modifiedFilter.actualValues.startTime,
endTimeBinding: controller.modifiedFilter.actualValues.endTime,
onTimeChange: function () {
- this.get('parentView').updateFilter(this.get('column'),
[this.get('startTime'), this.get('endTime')], 'range');
-}.observes('startTime')
+ this.get('parentView').updateFilter(this.get('column'),
[this.get('controller.modifiedFilter.actualValues.startTime'),
this.get('controller.modifiedFilter.actualValues.endTime')], 'range');
+}.observes('controller.modifiedFilter.actualValues.startTime',
'controller.modifiedFilter.actualValues.endTime')
}),
authorFilterView: filters.createTextView({
git commit: AMBARI-7401. Ambari Unit Tests failing on Jenkins.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 5c48015d6 - 0eb3937c2
AMBARI-7401. Ambari Unit Tests failing on Jenkins.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0eb3937c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0eb3937c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0eb3937c
Branch: refs/heads/trunk
Commit: 0eb3937c208ac650725059356ec909effc367534
Parents: 5c48015
Author: Vitaly Brodetskyi vbrodets...@hortonworks.com
Authored: Fri Sep 19 13:41:24 2014 +0300
Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com
Committed: Fri Sep 19 13:41:24 2014 +0300
--
ambari-agent/src/test/python/ambari_agent/TestController.py | 4 ++--
.../test/python/ambari_agent/TestCustomServiceOrchestrator.py| 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0eb3937c/ambari-agent/src/test/python/ambari_agent/TestController.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestController.py
b/ambari-agent/src/test/python/ambari_agent/TestController.py
index ad8303f..7ef64cc 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestController.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestController.py
@@ -364,7 +364,7 @@ class TestController(unittest.TestCase):
self.fail(Should throw exception!)
except IOError, e: # Expected
self.assertEquals('Response parsing failed! Request data: ' + data +
-'; Response: {invalid_object}', e.message)
+'; Response: {invalid_object}', str(e))
exceptionMessage = Connection Refused
conMock.request.side_effect = Exception(exceptionMessage)
@@ -373,7 +373,7 @@ class TestController(unittest.TestCase):
self.fail(Should throw exception!)
except IOError, e: # Expected
self.assertEquals('Request to ' + url + ' failed due to ' +
-exceptionMessage, e.message)
+exceptionMessage, str(e))
@patch.object(threading._Event, wait)
http://git-wip-us.apache.org/repos/asf/ambari/blob/0eb3937c/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 92791e2..6a61c0d 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestCustomServiceOrchestrator.py
@@ -486,7 +486,8 @@ class TestCustomServiceOrchestrator(TestCase):
'taskId' : '13',
'roleCommand': 'ACTIONEXECUTE',
'commandType': 'BACKGROUND_EXECUTION_COMMAND',
- '__handle' : BackgroundCommandExecutionHandle(None,13,MagicMock(),
MagicMock())
+ '__handle': BackgroundCommandExecutionHandle({'taskId': '13'}, 13,
+ MagicMock(), MagicMock())
}
dummy_controller = MagicMock()
orchestrator = CustomServiceOrchestrator(self.config, dummy_controller)
git commit: AMBARI-7404. configTypes field for stack service API should provide supports addProperty field. (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 201bcb3e8 - 05f0b402f
AMBARI-7404. configTypes field for stack service API should provide supports
addProperty field. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/05f0b402
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/05f0b402
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/05f0b402
Branch: refs/heads/trunk
Commit: 05f0b402fc8ee7d79325985ed4468809455e13ef
Parents: 201bcb3
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Sep 19 15:10:30 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Sep 19 15:10:30 2014 +0300
--
.../server/api/util/StackExtensionHelper.java | 3 +-
.../src/main/resources/properties.json | 1 +
.../configuration/capacity-scheduler.xml| 2 +-
.../YARN/configuration/capacity-scheduler.xml | 2 +-
.../api/util/StackExtensionHelperTest.java | 40 ++--
.../services/YARN/configuration/yarn-site.xml | 2 +-
6 files changed, 42 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/05f0b402/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
index 2c5396b..fe6c6bc 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
@@ -916,7 +916,8 @@ public class StackExtensionHelper {
*/
protected enum Supports {
-FINAL(supports_final);
+FINAL(supports_final),
+ADDING_FORBIDDEN(supports_adding_forbidden);
public static final String KEYWORD = supports;
http://git-wip-us.apache.org/repos/asf/ambari/blob/05f0b402/ambari-server/src/main/resources/properties.json
--
diff --git a/ambari-server/src/main/resources/properties.json
b/ambari-server/src/main/resources/properties.json
index 76797d3..b99ede5 100644
--- a/ambari-server/src/main/resources/properties.json
+++ b/ambari-server/src/main/resources/properties.json
@@ -248,6 +248,7 @@
StackConfigurations/property_description,
StackConfigurations/type,
StackConfigurations/final,
+StackConfigurations/adding_forbidden,
StackConfigurations/property_type,
_
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/05f0b402/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/capacity-scheduler.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/capacity-scheduler.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/capacity-scheduler.xml
index 010a313..574d508 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/capacity-scheduler.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/capacity-scheduler.xml
@@ -22,7 +22,7 @@
!-- The properties for a queue follow a naming convention,such as, --
!-- mapred.capacity-scheduler.queue.queue-name.property-name. --
-configuration supports_final=true
+configuration supports_final=true supports_adding_forbidden=true
property
namemapred.capacity-scheduler.maximum-system-jobs/name
http://git-wip-us.apache.org/repos/asf/ambari/blob/05f0b402/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
index 261d872..a8dc5c2 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
@@ -15,7 +15,7 @@
limitations under the License.
--
-configuration supports_final=true
+configuration supports_final=true supports_adding_forbidden=true
property
nameyarn.scheduler.capacity.maximum-applications/name
http://git-wip-us.apache.org/repos/asf/ambari/blob/05f0b402/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
git commit: AMBARI-7405 Slider View: Error when creating new app not shown to user. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 05f0b402f - 0f7dee0b4
AMBARI-7405 Slider View: Error when creating new app not shown to user. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0f7dee0b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0f7dee0b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0f7dee0b
Branch: refs/heads/trunk
Commit: 0f7dee0b4582e277604ab8866dcc9711f3b8643a
Parents: 05f0b40
Author: atkach atk...@hortonworks.com
Authored: Fri Sep 19 15:59:18 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Fri Sep 19 15:59:18 2014 +0300
--
.../createAppWizard/step4_controller.js | 10 +--
.../ui/app/controllers/slider_app_controller.js | 2 +-
.../src/main/resources/ui/app/helpers/ajax.js | 14 +++-
.../ui/app/mixins/ajax_error_handler.js | 84
.../resources/ui/app/styles/application.less| 6 ++
.../ui/app/templates/common/ajax_error.hbs | 24 ++
.../src/main/resources/ui/app/translations.js | 9 ++-
7 files changed, 137 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0f7dee0b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
index e703c27..6454938 100644
---
a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
+++
b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-App.CreateAppWizardStep4Controller = Ember.ObjectController.extend({
+App.CreateAppWizardStep4Controller =
Ember.ObjectController.extend(App.AjaxErrorHandler, {
needs: createAppWizard,
@@ -95,15 +95,15 @@ App.CreateAppWizardStep4Controller =
Ember.ObjectController.extend({
typeConfigs: app.get('configs')
}
},
- complete: 'sendAppDataToServerCompleteCallback'
+ success: 'sendAppDataToServerSuccessCallback'
});
},
/**
- * Complete-callback for create new app-request
- * @method sendAppDataToServerCompleteCallback
+ * Success-callback for create new app-request
+ * @method sendAppDataToServerSuccessCallback
*/
- sendAppDataToServerCompleteCallback: function() {
+ sendAppDataToServerSuccessCallback: function() {
this.get('appWizardController').hidePopup();
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/0f7dee0b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
index d1bfccf..b2effa0 100644
---
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
+++
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-App.SliderAppController = Ember.ObjectController.extend({
+App.SliderAppController = Ember.ObjectController.extend(App.AjaxErrorHandler, {
/**
* List of Slider App tabs
http://git-wip-us.apache.org/repos/asf/ambari/blob/0f7dee0b/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
--
diff --git a/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
b/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
index ba7fbce..ea01d82 100644
--- a/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
+++ b/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
@@ -132,7 +132,8 @@ var urls = {
format: function (data) {
return {
type: 'POST',
-data: JSON.stringify(data.data)
+data: JSON.stringify(data.data),
+showErrorPopup: true
}
}
},
@@ -142,7 +143,8 @@ var urls = {
mock: '',
format: function () {
return {
-method: 'DELETE'
+method: 'DELETE',
+showErrorPopup: true
}
}
},
@@ -156,7 +158,8 @@ var urls = {
format: function (data) {
return {
method: 'PUT',
-data: JSON.stringify(data.data)
+data: JSON.stringify(data.data),
+showErrorPopup: true
}
}
},
@@ -169,7 +172,8 @@ var urls = {
format: function (data) {
return {
git commit: AMBARI-7406. hive database name and type showing in UI. (Denys Buzhor via akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 0f7dee0b4 - 52d8c27aa
AMBARI-7406. hive database name and type showing in UI. (Denys Buzhor via
akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/52d8c27a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52d8c27a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52d8c27a
Branch: refs/heads/trunk
Commit: 52d8c27aa5f709074bbf33a2c908dd6ca739b89b
Parents: 0f7dee0
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Fri Sep 19 16:07:35 2014 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Fri Sep 19 16:15:09 2014 +0300
--
ambari-web/app/data/HDP2/site_properties.js | 24
ambari-web/app/data/site_properties.js | 24
2 files changed, 48 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/52d8c27a/ambari-web/app/data/HDP2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2/site_properties.js
b/ambari-web/app/data/HDP2/site_properties.js
index 8643095..1d2dbb4 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -2638,6 +2638,30 @@ module.exports =
filename: webhcat-env.xml,
category: Advanced webhcat-env
},
+{
+ id: puppet var,
+ name: hive_database_name,
+ displayName: hive_database_name,
+ defaultValue: ,
+ isReconfigurable: false,
+ isOverridable: false,
+ isVisible: true,
+ serviceName: HIVE,
+ filename: hive-env.xml,
+ category: Advanced hive-env
+},
+{
+ id: puppet var,
+ name: hive_database_type,
+ displayName: hive_database_type,
+ defaultValue: ,
+ isReconfigurable: false,
+ isOverridable: false,
+ isVisible: true,
+ serviceName: HIVE,
+ filename: hive-env.xml,
+ category: Advanced hive-env
+},
/**OOZIE***/
{
id: puppet var,
http://git-wip-us.apache.org/repos/asf/ambari/blob/52d8c27a/ambari-web/app/data/site_properties.js
--
diff --git a/ambari-web/app/data/site_properties.js
b/ambari-web/app/data/site_properties.js
index 14c7045..06bbe09 100644
--- a/ambari-web/app/data/site_properties.js
+++ b/ambari-web/app/data/site_properties.js
@@ -1730,6 +1730,30 @@ module.exports =
filename: hive-env.xml,
category: Advanced hive-env
},
+{
+ id: puppet var,
+ name: hive_database_name,
+ displayName: hive_database_name,
+ defaultValue: ,
+ isReconfigurable: false,
+ isOverridable: false,
+ isVisible: true,
+ serviceName: HIVE,
+ filename: hive-env.xml,
+ category: Advanced hive-env
+},
+{
+ id: puppet var,
+ name: hive_database_type,
+ displayName: hive_database_type,
+ defaultValue: ,
+ isReconfigurable: false,
+ isOverridable: false,
+ isVisible: true,
+ serviceName: HIVE,
+ filename: hive-env.xml,
+ category: Advanced hive-env
+},
/**HIVE***/
{
id: puppet var,
git commit: AMBARI-7408. Slider View: Multiple small fixes to Create App wizard UI. (onechiporenko)
Repository: ambari Updated Branches: refs/heads/trunk 52d8c27aa - 0255e5dac AMBARI-7408. Slider View: Multiple small fixes to Create App wizard UI. (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0255e5da Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0255e5da Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0255e5da Branch: refs/heads/trunk Commit: 0255e5dacf6ad02d262969d87edb9639c5bfb9ec Parents: 52d8c27 Author: Oleg Nechiporenko onechipore...@apache.org Authored: Fri Sep 19 16:58:39 2014 +0300 Committer: Oleg Nechiporenko onechipore...@apache.org Committed: Fri Sep 19 17:01:10 2014 +0300 -- .../ui-bg_flat_0_aa_40x100.png | Bin 0 - 180 bytes .../ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 - 120 bytes .../ui-bg_glass_65_ff_1x400.png | Bin 0 - 105 bytes .../ui-bg_glass_75_dadada_1x400.png | Bin 0 - 111 bytes .../ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 - 110 bytes .../ui-bg_glass_75_ff_1x400.png | Bin 0 - 107 bytes .../ui-bg_highlight-soft_75_cc_1x100.png| Bin 0 - 101 bytes .../ui-bg_inset-soft_95_fef1ec_1x100.png| Bin 0 - 123 bytes .../ui-icons_22_256x240.png | Bin 0 - 4369 bytes .../ui-icons_2e83ff_256x240.png | Bin 0 - 4369 bytes .../ui-icons_454545_256x240.png | Bin 0 - 4369 bytes .../ui-icons_88_256x240.png | Bin 0 - 4369 bytes .../ui-icons_cd0a0a_256x240.png | Bin 0 - 4369 bytes .../ui-icons_f6cf3b_256x240.png | Bin 0 - 8884 bytes .../resources/ui/app/styles/application.less| 37 +++ .../resources/ui/app/templates/slider_apps.hbs | 3 +- .../src/main/resources/ui/app/translations.js | 6 +-- 17 files changed, 41 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png new file mode 100644 index 000..5b5dab2 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png new file mode 100644 index 000..ad3d634 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png new file mode 100644 index 000..42ccba2 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png new file mode 100644 index 000..5a46b47 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_e6e6e6_1x400.png --
git commit: AMBARI-7409 Slider View: Config keys should be wrapped even in the middle of words. (Max Shepel via atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 0255e5dac - 69e8e9cc4
AMBARI-7409 Slider View: Config keys should be wrapped even in the middle of
words. (Max Shepel via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/69e8e9cc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/69e8e9cc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/69e8e9cc
Branch: refs/heads/trunk
Commit: 69e8e9cc44bb55dc14c6625e740b0dc8e39b69fe
Parents: 0255e5d
Author: atkach atk...@hortonworks.com
Authored: Fri Sep 19 17:26:02 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Fri Sep 19 17:26:02 2014 +0300
--
.../slider/src/main/resources/ui/app/styles/application.less | 3 +++
.../src/main/resources/ui/app/templates/slider_app/configs.hbs| 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/69e8e9cc/contrib/views/slider/src/main/resources/ui/app/styles/application.less
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
index 2ea4ed8..f0d0bab 100644
--- a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
+++ b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
@@ -731,6 +731,9 @@ select {
cursor: not-allowed;
background-color: #ee;
}
+.property-name {
+ word-wrap: break-word;
+}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/69e8e9cc/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
b/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
index 6eddc8d..f073a8d 100644
---
a/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
+++
b/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
@@ -23,7 +23,7 @@
div class=container-fluid
{{#each configCategory.configs}}
div class=row
- div class=col-md-3{{formatWordBreak key devider=.}}/div
+ div class=col-md-3 property-name{{formatWordBreak key
devider=.}}/div
div
{{#if isMultiline}}
{{textarea disabled=true value=value classNames=col-md-6}}
git commit: AMBARI-7411. Slider View: After starting a stopped view, route to Apps table page. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 69e8e9cc4 - 843579eb2
AMBARI-7411. Slider View: After starting a stopped view, route to Apps table
page. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/843579eb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/843579eb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/843579eb
Branch: refs/heads/trunk
Commit: 843579eb2926a48572111dec63167de3155b364a
Parents: 69e8e9c
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Fri Sep 19 18:14:02 2014 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Fri Sep 19 18:14:02 2014 +0300
--
.../ui/app/controllers/slider_app_controller.js | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/843579eb/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
index b2effa0..f042e38 100644
---
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
+++
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
@@ -114,11 +114,20 @@ App.SliderAppController =
Ember.ObjectController.extend(App.AjaxErrorHandler, {
name: model.get('name'),
state: RUNNING
}
- }
+ },
+ success: 'thawSuccessCallback'
});
},
/**
+ * Redirect to Slider Apps Table page on successful thawing
+ * @method thawSuccessCallback
+ */
+ thawSuccessCallback: function () {
+this.transitionToRoute('slider_apps.index');
+ },
+
+ /**
* Do request to strongfreeze/strong current slider's app
* @returns {$.ajax}
* @method freeze
git commit: AMBARI-7412. Slider View: Alerts keep jumping in a Slider App (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 843579eb2 - 5da5019a8
AMBARI-7412. Slider View: Alerts keep jumping in a Slider App (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5da5019a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5da5019a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5da5019a
Branch: refs/heads/trunk
Commit: 5da5019a81323dbb3ef2a5699afac28679b138ea
Parents: 843579e
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Sep 19 18:47:41 2014 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Sep 19 18:48:08 2014 +0300
--
.../slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5da5019a/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
b/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
index 7312f86..ebff57c 100644
---
a/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
+++
b/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
@@ -59,6 +59,7 @@ App.SliderAppsMapper =
App.Mapper.createWithMixins(App.RunPeriodically, {
lastCheck: alert.last_status_time
});
});
+ alerts = alerts.sortBy('title');
App.SliderApp.store.pushMany('sliderAppAlert', alerts);
}
return alerts.mapProperty('id');
[06/29] git commit: AMBARI-7394. Recommend properties were changed after cluster install (srimanth)
AMBARI-7394. Recommend properties were changed after cluster install (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bf5f1c6d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bf5f1c6d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bf5f1c6d
Branch: refs/heads/branch-alerts-dev
Commit: bf5f1c6da72ed46844298a152906fdd77c1fba28
Parents: 1498061
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Thu Sep 18 14:47:58 2014 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Thu Sep 18 14:48:03 2014 -0700
--
ambari-web/app/mixins/common/serverValidator.js | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bf5f1c6d/ambari-web/app/mixins/common/serverValidator.js
--
diff --git a/ambari-web/app/mixins/common/serverValidator.js
b/ambari-web/app/mixins/common/serverValidator.js
index 8d551f8..2a31a4f 100644
--- a/ambari-web/app/mixins/common/serverValidator.js
+++ b/ambari-web/app/mixins/common/serverValidator.js
@@ -201,13 +201,22 @@ App.ServerValidatorMixin = Em.Mixin.create({
var self = this;
var recommendations = this.get('hostGroups');
recommendations.blueprint.configurations =
blueprintUtils.buildConfisJSON(this.get('services'), this.get('stepConfigs'));
+
+var serviceNames = this.get('serviceNames');
+if (!self.get('isInstaller')) {
+ // When editing a service we validate only that service's configs.
+ // However, we should pass the IDs of services installed, or else,
+ // default value calculations will alter.
+ serviceNames = App.Service.find().mapProperty('serviceName');
+}
+
return App.ajax.send({
name: 'config.validations',
sender: this,
data: {
stackVersionUrl: App.get('stackVersionURL'),
hosts: this.get('hostNames'),
-services: this.get('serviceNames'),
+services: serviceNames,
validate: 'configurations',
recommendations: recommendations
},
[16/29] git commit: AMBARI-7399. Slider View: Firefox has Create action inside the table header. (Max Shepel via akovalenko)
AMBARI-7399. Slider View: Firefox has Create action inside the table header.
(Max Shepel via akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6eda8c66
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6eda8c66
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6eda8c66
Branch: refs/heads/branch-alerts-dev
Commit: 6eda8c66a44189320c2e2270be0f74a33c0a6f68
Parents: d62147e
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Fri Sep 19 13:14:22 2014 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Fri Sep 19 13:19:24 2014 +0300
--
.../src/main/resources/ui/app/styles/application.less | 13 +
.../main/resources/ui/app/templates/application.hbs| 13 +++--
.../main/resources/ui/app/templates/slider_apps.hbs| 7 ---
.../main/resources/ui/app/views/application_view.js| 5 +
4 files changed, 25 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6eda8c66/contrib/views/slider/src/main/resources/ui/app/styles/application.less
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
index 44c6487..7497b6e 100644
--- a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
+++ b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
@@ -44,11 +44,16 @@ a {
cursor: pointer;
}
-#slider-apps-table {
- .create-app {
-margin-bottom: 20px;
+.slider-header {
+ overflow: hidden;
+ .box-header {
+padding-top: 20px;
}
-#slider-table {
+}
+
+#slider-apps-table {
+
+ #slider-table {
margin-top: 10px;
margin-bottom: 10px;
font-size: 13px\9;
http://git-wip-us.apache.org/repos/asf/ambari/blob/6eda8c66/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
index da828bf..f62 100755
--- a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
+++ b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
@@ -16,9 +16,18 @@
* limitations under the License.
}}
-div
+div class=slider-header
{{#view view.SliderTitleView}}
-h1{{t slider.apps.title}} - span class=slider-app-title
{{bs-bind-popover view.popover}}{{App.instance}}/span/h1
+h1 class=pull-left{{t slider.apps.title}} - span
class=slider-app-title {{bs-bind-popover
view.popover}}{{App.instance}}/span/h1
+{{#if view.isIndexPage}}
+ div class=box-header pull-right
+div class=create-app
+ a href=# class=btn btn-primary {{action createApp}}
+i class=icon-plus/ispannbsp;{{t
slider.apps.create}}/span
+ /a
+/div
+ /div
+{{/if}}
{{/view}}
{{outlet bs-tooltip-box}}
/div
http://git-wip-us.apache.org/repos/asf/ambari/blob/6eda8c66/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs
b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs
index aecfb30..ef72291 100644
--- a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs
+++ b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs
@@ -17,13 +17,6 @@
}}
div id=slider-apps-table
- div class=box-header
-div class=pull-right create-app
- a href=# class=btn btn-primary {{action createApp}}
-i class=icon-plus/ispannbsp;{{t slider.apps.create}}/span
- /a
-/div
- /div
table class=datatable table table-bordered table-striped
id=slider-table
thead
http://git-wip-us.apache.org/repos/asf/ambari/blob/6eda8c66/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
b/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
index 1860944..7471f04 100644
--- a/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
+++ b/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
@@ -33,6 +33,11 @@ App.ApplicationView = Ember.View.extend({
placement: 'bottom'
}),
+isIndexPage: function () {
+ var currentPath = this.get('controller.currentPath');
+ return currentPath
[28/29] git commit: AMBARI-7407 Move service configs to /etc/ for versioned RPM's (dsen)
AMBARI-7407 Move service configs to /etc/ for versioned RPM's (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d7ed4316 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d7ed4316 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d7ed4316 Branch: refs/heads/branch-alerts-dev Commit: d7ed4316202b6af7e6157ec97f9f137b43ad4eb0 Parents: 5da5019 Author: Dmytro Sen d...@hortonworks.com Authored: Fri Sep 19 19:12:06 2014 +0300 Committer: Dmytro Sen d...@hortonworks.com Committed: Fri Sep 19 19:12:06 2014 +0300 -- .../resource_management/TestCopyFromLocal.py| 8 +-- .../TestExecuteHadoopResource.py| 12 ++-- .../resource_management/TestExecuteResource.py | 3 +- .../core/providers/system.py| 12 ++-- .../python/resource_management/core/shell.py| 24 --- .../libraries/providers/copy_from_local.py | 4 ++ .../libraries/providers/execute_hadoop.py | 6 +- .../libraries/providers/hdfs_directory.py | 6 +- .../libraries/resources/copy_from_local.py | 1 + .../2.0.6/hooks/after-INSTALL/scripts/params.py | 11 ++- .../scripts/shared_initialization.py| 4 ++ .../2.0.6/hooks/before-START/scripts/params.py | 13 ++-- .../services/FLUME/package/scripts/flume.py | 2 +- .../services/FLUME/package/scripts/params.py| 6 +- .../services/HBASE/package/scripts/params.py| 16 ++--- .../services/HDFS/package/scripts/params.py | 18 +++-- .../HDFS/package/scripts/service_check.py | 2 +- .../2.0.6/services/HIVE/package/scripts/hcat.py | 2 + .../HIVE/package/scripts/hcat_service_check.py | 10 ++- .../HIVE/package/scripts/install_jars.py| 2 + .../services/HIVE/package/scripts/params.py | 70 .../services/HIVE/package/scripts/webhcat.py| 4 ++ .../services/PIG/package/scripts/params.py | 12 ++-- .../2.0.6/services/PIG/package/scripts/pig.py | 1 + .../services/SQOOP/package/scripts/params.py| 11 ++- .../package/scripts/mapred_service_check.py | 4 ++ .../services/YARN/package/scripts/params.py | 24 +++ .../YARN/package/scripts/service_check.py | 2 +- .../ZOOKEEPER/package/scripts/params.py | 7 +- .../services/FALCON/package/scripts/params.py | 12 ++-- .../services/STORM/package/scripts/params.py| 11 ++- .../stacks/HDP/2.2/services/FALCON/metainfo.xml | 2 +- .../stacks/HDP/2.2/services/FLUME/metainfo.xml | 2 +- .../stacks/HDP/2.2/services/HBASE/metainfo.xml | 2 +- .../services/HDFS/configuration/hadoop-env.xml | 2 +- .../services/HDFS/configuration/hdfs-site.xml | 34 -- .../stacks/HDP/2.2/services/HDFS/metainfo.xml | 4 +- .../HIVE/configuration/webhcat-site.xml | 14 ++-- .../stacks/HDP/2.2/services/HIVE/metainfo.xml | 6 +- .../services/OOZIE/configuration/oozie-site.xml | 13 .../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 6 +- .../stacks/HDP/2.2/services/PIG/metainfo.xml| 2 +- .../services/SLIDER/package/scripts/params.py | 4 +- .../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 2 +- .../services/STORM/configuration/storm-env.xml | 29 .../services/STORM/configuration/storm-site.xml | 6 +- .../stacks/HDP/2.2/services/STORM/metainfo.xml | 2 +- .../stacks/HDP/2.2/services/TEZ/metainfo.xml| 2 +- .../HDP/2.2/services/WEBHCAT/metainfo.xml | 43 .../YARN/configuration-mapred/mapred-site.xml | 11 ++- .../services/YARN/configuration/yarn-site.xml | 11 +-- .../stacks/HDP/2.2/services/YARN/metainfo.xml | 6 +- .../HDP/2.2/services/ZOOKEEPER/metainfo.xml | 2 +- .../stacks/1.3.2/HDFS/test_service_check.py | 2 +- .../python/stacks/2.0.6/FLUME/test_flume.py | 4 +- .../stacks/2.0.6/HDFS/test_service_check.py | 2 +- .../stacks/2.0.6/HIVE/test_hcat_client.py | 4 ++ .../stacks/2.0.6/HIVE/test_hive_metastore.py| 9 ++- .../stacks/2.0.6/HIVE/test_hive_server.py | 12 ++-- .../2.0.6/HIVE/test_hive_service_check.py | 17 ++--- .../stacks/2.0.6/HIVE/test_webhcat_server.py| 8 +++ .../python/stacks/2.0.6/PIG/test_pig_client.py | 2 + .../2.0.6/YARN/test_mapreduce2_service_check.py | 8 +++ .../2.0.6/YARN/test_yarn_service_check.py | 4 +- .../stacks/2.1/HIVE/test_hive_metastore.py | 8 +-- 65 files changed, 249 insertions(+), 356 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/d7ed4316/ambari-agent/src/test/python/resource_management/TestCopyFromLocal.py -- diff --git a/ambari-agent/src/test/python/resource_management/TestCopyFromLocal.py b/ambari-agent/src/test/python/resource_management/TestCopyFromLocal.py index 6862db3..3991bae 100644 ---
[24/29] git commit: AMBARI-7409 Slider View: Config keys should be wrapped even in the middle of words. (Max Shepel via atkach)
AMBARI-7409 Slider View: Config keys should be wrapped even in the middle of
words. (Max Shepel via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/69e8e9cc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/69e8e9cc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/69e8e9cc
Branch: refs/heads/branch-alerts-dev
Commit: 69e8e9cc44bb55dc14c6625e740b0dc8e39b69fe
Parents: 0255e5d
Author: atkach atk...@hortonworks.com
Authored: Fri Sep 19 17:26:02 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Fri Sep 19 17:26:02 2014 +0300
--
.../slider/src/main/resources/ui/app/styles/application.less | 3 +++
.../src/main/resources/ui/app/templates/slider_app/configs.hbs| 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/69e8e9cc/contrib/views/slider/src/main/resources/ui/app/styles/application.less
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
index 2ea4ed8..f0d0bab 100644
--- a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
+++ b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
@@ -731,6 +731,9 @@ select {
cursor: not-allowed;
background-color: #ee;
}
+.property-name {
+ word-wrap: break-word;
+}
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/69e8e9cc/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
b/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
index 6eddc8d..f073a8d 100644
---
a/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
+++
b/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/configs.hbs
@@ -23,7 +23,7 @@
div class=container-fluid
{{#each configCategory.configs}}
div class=row
- div class=col-md-3{{formatWordBreak key devider=.}}/div
+ div class=col-md-3 property-name{{formatWordBreak key
devider=.}}/div
div
{{#if isMultiline}}
{{textarea disabled=true value=value classNames=col-md-6}}
[04/29] git commit: AMBARI-7005. ambari trunk commit build fails due to unresolvable eclipselink plugin when the first time mvn build. (Jun Aoki via vgogate)
AMBARI-7005. ambari trunk commit build fails due to unresolvable eclipselink plugin when the first time mvn build. (Jun Aoki via vgogate) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c24d29a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c24d29a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c24d29a Branch: refs/heads/branch-alerts-dev Commit: 5c24d29ad21848707eabd4a3ae3fdedeb7044fca Parents: 742b718 Author: Vitthal(Suhas) Gogate vgog...@apache.org Authored: Thu Sep 18 14:33:49 2014 + Committer: root r...@c6401.ambari.apache.org Committed: Thu Sep 18 19:02:44 2014 + -- ambari-server/pom.xml | 8 1 file changed, 8 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/5c24d29a/ambari-server/pom.xml -- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index b07afbf..bbf21fe 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -1422,4 +1422,12 @@ !--reporting plugins plugin groupIdorg.codehaus.mojo/groupId artifactIdfindbugs-maven-plugin/artifactId version2.5.2/version /plugin /plugins /reporting -- + + pluginRepositories +pluginRepository + idEclipseLink/id + urlhttp://download.eclipse.org/rt/eclipselink/maven.repo/url +/pluginRepository + /pluginRepositories + /project
[10/29] git commit: AMBARI-7396. After saving empty property become required only for Custom Properties.(xiwang)
AMBARI-7396. After saving empty property become required only for Custom
Properties.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/01ff6a79
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/01ff6a79
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/01ff6a79
Branch: refs/heads/branch-alerts-dev
Commit: 01ff6a79b6d6d4bb4f3d3dc36a0642db350e1b3a
Parents: 6446499
Author: Xi Wang xiw...@apache.org
Authored: Thu Sep 18 17:57:05 2014 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Thu Sep 18 18:03:54 2014 -0700
--
ambari-web/app/utils/config.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/01ff6a79/ambari-web/app/utils/config.js
--
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 8226811..52f918d 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -350,7 +350,7 @@ App.config = Em.Object.create({
filename: filename,
isUserProperty: false,
isOverridable: true,
- isRequired: true,
+ isRequired: advancedConfigs.someProperty('name', index),
isFinal: finalAttributes[index] === true,
defaultIsFinal: finalAttributes[index] === true,
showLabel: true,
[21/29] git commit: AMBARI-7405 Slider View: Error when creating new app not shown to user. (atkach)
AMBARI-7405 Slider View: Error when creating new app not shown to user. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0f7dee0b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0f7dee0b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0f7dee0b
Branch: refs/heads/branch-alerts-dev
Commit: 0f7dee0b4582e277604ab8866dcc9711f3b8643a
Parents: 05f0b40
Author: atkach atk...@hortonworks.com
Authored: Fri Sep 19 15:59:18 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Fri Sep 19 15:59:18 2014 +0300
--
.../createAppWizard/step4_controller.js | 10 +--
.../ui/app/controllers/slider_app_controller.js | 2 +-
.../src/main/resources/ui/app/helpers/ajax.js | 14 +++-
.../ui/app/mixins/ajax_error_handler.js | 84
.../resources/ui/app/styles/application.less| 6 ++
.../ui/app/templates/common/ajax_error.hbs | 24 ++
.../src/main/resources/ui/app/translations.js | 9 ++-
7 files changed, 137 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0f7dee0b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
index e703c27..6454938 100644
---
a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
+++
b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-App.CreateAppWizardStep4Controller = Ember.ObjectController.extend({
+App.CreateAppWizardStep4Controller =
Ember.ObjectController.extend(App.AjaxErrorHandler, {
needs: createAppWizard,
@@ -95,15 +95,15 @@ App.CreateAppWizardStep4Controller =
Ember.ObjectController.extend({
typeConfigs: app.get('configs')
}
},
- complete: 'sendAppDataToServerCompleteCallback'
+ success: 'sendAppDataToServerSuccessCallback'
});
},
/**
- * Complete-callback for create new app-request
- * @method sendAppDataToServerCompleteCallback
+ * Success-callback for create new app-request
+ * @method sendAppDataToServerSuccessCallback
*/
- sendAppDataToServerCompleteCallback: function() {
+ sendAppDataToServerSuccessCallback: function() {
this.get('appWizardController').hidePopup();
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/0f7dee0b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
index d1bfccf..b2effa0 100644
---
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
+++
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-App.SliderAppController = Ember.ObjectController.extend({
+App.SliderAppController = Ember.ObjectController.extend(App.AjaxErrorHandler, {
/**
* List of Slider App tabs
http://git-wip-us.apache.org/repos/asf/ambari/blob/0f7dee0b/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
--
diff --git a/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
b/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
index ba7fbce..ea01d82 100644
--- a/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
+++ b/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js
@@ -132,7 +132,8 @@ var urls = {
format: function (data) {
return {
type: 'POST',
-data: JSON.stringify(data.data)
+data: JSON.stringify(data.data),
+showErrorPopup: true
}
}
},
@@ -142,7 +143,8 @@ var urls = {
mock: '',
format: function () {
return {
-method: 'DELETE'
+method: 'DELETE',
+showErrorPopup: true
}
}
},
@@ -156,7 +158,8 @@ var urls = {
format: function (data) {
return {
method: 'PUT',
-data: JSON.stringify(data.data)
+data: JSON.stringify(data.data),
+showErrorPopup: true
}
}
},
@@ -169,7 +172,8 @@ var urls = {
format: function (data) {
return {
method: 'PUT',
-data: JSON.stringify(data.data)
+
[26/29] git commit: AMBARI-7412. Slider View: Alerts keep jumping in a Slider App (alexantonenko)
AMBARI-7412. Slider View: Alerts keep jumping in a Slider App (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5da5019a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5da5019a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5da5019a
Branch: refs/heads/branch-alerts-dev
Commit: 5da5019a81323dbb3ef2a5699afac28679b138ea
Parents: 843579e
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Sep 19 18:47:41 2014 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Sep 19 18:48:08 2014 +0300
--
.../slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5da5019a/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
b/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
index 7312f86..ebff57c 100644
---
a/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
+++
b/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
@@ -59,6 +59,7 @@ App.SliderAppsMapper =
App.Mapper.createWithMixins(App.RunPeriodically, {
lastCheck: alert.last_status_time
});
});
+ alerts = alerts.sortBy('title');
App.SliderApp.store.pushMany('sliderAppAlert', alerts);
}
return alerts.mapProperty('id');
[01/29] git commit: AMBARI-7311 Incorrect name for turning on/off Maintenance Mode in Background operations window (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-alerts-dev 179290e0f - e2e79668e
AMBARI-7311 Incorrect name for turning on/off Maintenance Mode in Background
operations window (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/31a41066
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/31a41066
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/31a41066
Branch: refs/heads/branch-alerts-dev
Commit: 31a410662cb626b04ec551495120b9bf2109cad1
Parents: 5fc5828
Author: Dmytro Sen d...@hortonworks.com
Authored: Thu Sep 18 18:29:53 2014 +0300
Committer: Dmytro Sen d...@hortonworks.com
Committed: Thu Sep 18 18:29:53 2014 +0300
--
.../apache/ambari/server/controller/MaintenanceStateHelper.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/31a41066/ambari-server/src/main/java/org/apache/ambari/server/controller/MaintenanceStateHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/MaintenanceStateHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/MaintenanceStateHelper.java
index f24..459f01f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/MaintenanceStateHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/MaintenanceStateHelper.java
@@ -50,7 +50,7 @@ public class MaintenanceStateHelper {
private static final String NAGIOS_COMPONENT = NAGIOS_SERVER;
private static final String NAGIOS_ACTION_NAME = nagios_update_ignore;
private static final Logger LOG =
LoggerFactory.getLogger(MaintenanceStateHelper.class);
- public static final String UPDATE_NAGIOS_REQUEST_NAME = Update Nagios
configuration;
+ public static final String UPDATE_NAGIOS_REQUEST_NAME = Adjusting ignored
alerts for Services/Hosts Maintenance Mode;
@Inject
private Clusters clusters;
[07/29] git commit: AMBARI-7373. Admin View: Landing page should say the same thing on INSTALL/CREATE buttons.(xiwang)
AMBARI-7373. Admin View: Landing page should say the same thing on INSTALL/CREATE buttons.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/84133c22 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84133c22 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84133c22 Branch: refs/heads/branch-alerts-dev Commit: 84133c222408788a15b35310c7194dc36d7fe4e3 Parents: e0215f5 Author: Xi Wang xiw...@apache.org Authored: Wed Sep 17 14:35:26 2014 -0700 Committer: Xi Wang xiw...@apache.org Committed: Thu Sep 18 16:26:58 2014 -0700 -- .../src/main/resources/ui/admin-web/app/views/leftNavbar.html | 3 +-- ambari-admin/src/main/resources/ui/admin-web/app/views/main.html | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/84133c22/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html -- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html index 8fd8c6a..0aa9340 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html @@ -63,8 +63,7 @@ div ng-hide=cluster a href=/#/installer/step0 class=btn btn-primary btn-block createcluster-btn - span class=glyphicon glyphicon-plus/span - Create a Cluster + Launch Install Wizard /a /div http://git-wip-us.apache.org/repos/asf/ambari/blob/84133c22/ambari-admin/src/main/resources/ui/admin-web/app/views/main.html -- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/main.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/main.html index a542b4f..126f4f0 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/main.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/main.html @@ -36,7 +36,7 @@ h4 class=titleCreate a Cluster/h4 div class=descriptionUse the Install Wizard to select services and configure your cluster/div div class=glyphicon glyphicon-cloud/div -div class=buttons a href=/#/installer/step0 class=btn btn-primary create-cluster-buttonInstall Cluster/a/div +div class=buttons a href=/#/installer/step0 class=btn btn-primary create-cluster-buttonLaunch Install Wizard/a/div /div !--Manage Users and groups--
[12/29] git commit: AMBARI-7347. Fixes for Ambari view to work aftsrimanth)
AMBARI-7347. Fixes for Ambari view to work aftsrimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/44fbccef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/44fbccef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/44fbccef
Branch: refs/heads/branch-alerts-dev
Commit: 44fbccef840e07899b4ba18eac1007f8e15336aa
Parents: 7270881
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Thu Sep 18 19:58:17 2014 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Thu Sep 18 19:58:22 2014 -0700
--
.../ui/app/controllers/slider_controller.js | 3 +
.../ui/app/mappers/slider_apps_mapper.js| 33 +++--
.../main/resources/ui/app/models/slider_app.js | 5 ++
.../views/slider_app/metrics/app_metric_view.js | 71
.../ui/app/views/slider_app/summary_view.js | 71 +++-
5 files changed, 174 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/44fbccef/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
index 5eb323d..eb2762e 100644
---
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
+++
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_controller.js
@@ -106,6 +106,9 @@ App.SliderController =
Ember.Controller.extend(App.RunPeriodically, {
|| properties['zookeeper.quorum'] == null) {
this.getClusterName();
} else {
+ // TODO remove below line as it is a temporary hack
+ this.getClusterName();
+
initialValuesToLoad.setProperties({
ambariAddress: location.protocol + // + document.location.host,
hdfsAddress: properties['hdfs.address'],
http://git-wip-us.apache.org/repos/asf/ambari/blob/44fbccef/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
b/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
index 013c65c..a8ebbff 100644
---
a/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
+++
b/contrib/views/slider/src/main/resources/ui/app/mappers/slider_apps_mapper.js
@@ -113,25 +113,38 @@ App.SliderAppsMapper =
App.Mapper.createWithMixins(App.RunPeriodically, {
* @param {object} data received from server data
* @method parse
*/
- parseQuickLinks: function (data) {
+ parseQuickLinks : function(data) {
var quickLinks = [],
- appId = data.id;
+appId = data.id;
+var yarnAppId = appId;
+var index = appId.lastIndexOf('_');
+if (index 0) {
+ yarnAppId = appId.substring(0, index + 1);
+ for (var k = (appId.length - index - 1); k 4; k++) {
+yarnAppId += '0';
+ }
+ yarnAppId += appId.substring(index + 1);
+}
+var yarnUI = http://+window.location.hostname+:8088;;
+if (App.viewUrls) {
+ yarnUI = App.viewUrls['yarn.resourcemanager.webapp.address'];
+}
quickLinks.push(
Ember.Object.create({
id: 'YARN application',
label: 'YARN application',
-url: http://; + window.location.hostname + :8088
+url: yarnUI + '/cluster/app/application_' + yarnAppId
})
);
-if (!data.urls) {
+if(!data.urls){
return quickLinks.mapProperty('id');
}
Object.keys(data.urls).forEach(function (key) {
quickLinks.push(
Ember.Object.create({
- id: appId + key,
+ id: appId+key,
label: key,
url: data.urls[key]
})
@@ -148,6 +161,13 @@ App.SliderAppsMapper =
App.Mapper.createWithMixins(App.RunPeriodically, {
});
},
+ parseMetricNames : function(app) {
+if (app.supportedMetrics) {
+ return app.supportedMetrics.join(,);
+}
+return ;
+ },
+
/**
* Parse loaded data
* Load codeApp.SliderApp/code model
@@ -190,7 +210,8 @@ App.SliderAppsMapper =
App.Mapper.createWithMixins(App.RunPeriodically, {
alerts: alerts,
configs: configs,
jmx: jmx,
- runtimeProperties: app.configs
+ runtimeProperties: app.configs,
+ supportedMetricNames: metricNames
})
);
http://git-wip-us.apache.org/repos/asf/ambari/blob/44fbccef/contrib/views/slider/src/main/resources/ui/app/models/slider_app.js
--
diff --git
[08/29] git commit: AMBARI-7372. Admin View: various UI.(xiwang)
AMBARI-7372. Admin View: various UI.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e0215f54
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e0215f54
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e0215f54
Branch: refs/heads/branch-alerts-dev
Commit: e0215f5401d03ff90cf35cf9cb01b9aba843829b
Parents: bf5f1c6
Author: Xi Wang xiw...@apache.org
Authored: Wed Sep 17 14:23:48 2014 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Thu Sep 18 16:26:58 2014 -0700
--
.../clusters/ClustersManageAccessCtrl.js | 2 +-
.../app/scripts/directives/editableList.js| 18 --
.../resources/ui/admin-web/app/styles/main.css| 14 --
.../app/views/directives/editableList.html| 2 +-
.../ui/admin-web/app/views/groups/list.html | 2 +-
.../ui/admin-web/app/views/leftNavbar.html| 4 ++--
.../resources/ui/admin-web/app/views/main.html| 1 +
.../ui/admin-web/app/views/users/list.html| 2 +-
8 files changed, 23 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e0215f54/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
index 8999594..4cf39af 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/clusters/ClustersManageAccessCtrl.js
@@ -52,7 +52,7 @@ angular.module('ambariAdminConsole')
PermissionSaver.saveClusterPermissions(
$scope.permissionsEdit,
{
-clusterId: $routeParams.id,
+clusterId: $routeParams.id
}
).then(reloadClusterData)
.catch(function(data) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/e0215f54/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/editableList.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/editableList.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/editableList.js
index 5d72078..f157d70 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/editableList.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/editableList.js
@@ -53,7 +53,6 @@ angular.module('ambariAdminConsole')
var elem = $editBox[0];
var selection = window.getSelection(),
range = document.createRange();
-
elem.innerHTML = '\u00a0';
range.selectNodeContents(elem);
selection.removeAllRanges();
@@ -72,6 +71,7 @@ angular.module('ambariAdminConsole')
case 13: // Enter
$scope.$apply(function() {
$scope.addItem();
+ $scope.focusOnInput();
});
return false;
break;
@@ -117,6 +117,7 @@ angular.module('ambariAdminConsole')
$scope.addItem(item);
});
$scope.clearInput();
+$scope.focusOnInput();
} else {
// Load typeahed items based on current input
@@ -129,30 +130,27 @@ angular.module('ambariAdminConsole')
} else if($scope.resourceType === 'Group'){
name = item.Groups.group_name;
}
-
if($scope.items.indexOf(name) 0){ // Only if item not in list
items.push(name);
}
-$scope.typeahead = items.slice(0, 5);
-$scope.selectedTypeahed = 0;
});
+ $scope.typeahead = items.slice(0, 5);
+ $scope.selectedTypeahed = 0;
});
}
-
-
} else {
$scope.typeahead = [];
$scope.selectedTypeahed = 0;
+ $scope.focusOnInput();
}
});
- $scope.enableEditMode = function() {
+ $scope.enableEditMode = function(event) {
if( $scope.editable !$scope.editMode){
$scope.editMode = true;
- if( $scope.items.length === 0){
-$scope.focusOnInput();
- }
+ $scope.focusOnInput();
}
+event.stopPropagation();
};
$scope.cancel = function(event) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/e0215f54/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css
[22/29] git commit: AMBARI-7406. hive database name and type showing in UI. (Denys Buzhor via akovalenko)
AMBARI-7406. hive database name and type showing in UI. (Denys Buzhor via
akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/52d8c27a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52d8c27a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52d8c27a
Branch: refs/heads/branch-alerts-dev
Commit: 52d8c27aa5f709074bbf33a2c908dd6ca739b89b
Parents: 0f7dee0
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Fri Sep 19 16:07:35 2014 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Fri Sep 19 16:15:09 2014 +0300
--
ambari-web/app/data/HDP2/site_properties.js | 24
ambari-web/app/data/site_properties.js | 24
2 files changed, 48 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/52d8c27a/ambari-web/app/data/HDP2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2/site_properties.js
b/ambari-web/app/data/HDP2/site_properties.js
index 8643095..1d2dbb4 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -2638,6 +2638,30 @@ module.exports =
filename: webhcat-env.xml,
category: Advanced webhcat-env
},
+{
+ id: puppet var,
+ name: hive_database_name,
+ displayName: hive_database_name,
+ defaultValue: ,
+ isReconfigurable: false,
+ isOverridable: false,
+ isVisible: true,
+ serviceName: HIVE,
+ filename: hive-env.xml,
+ category: Advanced hive-env
+},
+{
+ id: puppet var,
+ name: hive_database_type,
+ displayName: hive_database_type,
+ defaultValue: ,
+ isReconfigurable: false,
+ isOverridable: false,
+ isVisible: true,
+ serviceName: HIVE,
+ filename: hive-env.xml,
+ category: Advanced hive-env
+},
/**OOZIE***/
{
id: puppet var,
http://git-wip-us.apache.org/repos/asf/ambari/blob/52d8c27a/ambari-web/app/data/site_properties.js
--
diff --git a/ambari-web/app/data/site_properties.js
b/ambari-web/app/data/site_properties.js
index 14c7045..06bbe09 100644
--- a/ambari-web/app/data/site_properties.js
+++ b/ambari-web/app/data/site_properties.js
@@ -1730,6 +1730,30 @@ module.exports =
filename: hive-env.xml,
category: Advanced hive-env
},
+{
+ id: puppet var,
+ name: hive_database_name,
+ displayName: hive_database_name,
+ defaultValue: ,
+ isReconfigurable: false,
+ isOverridable: false,
+ isVisible: true,
+ serviceName: HIVE,
+ filename: hive-env.xml,
+ category: Advanced hive-env
+},
+{
+ id: puppet var,
+ name: hive_database_type,
+ displayName: hive_database_type,
+ defaultValue: ,
+ isReconfigurable: false,
+ isOverridable: false,
+ isVisible: true,
+ serviceName: HIVE,
+ filename: hive-env.xml,
+ category: Advanced hive-env
+},
/**HIVE***/
{
id: puppet var,
[15/29] git commit: AMBARI-7400. Slider View: Most view parameters should be made required. (onechiporenko)
AMBARI-7400. Slider View: Most view parameters should be made required.
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d62147ed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d62147ed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d62147ed
Branch: refs/heads/branch-alerts-dev
Commit: d62147ed37864f7f9f321448c3036ade0eeb681f
Parents: d7b09b6
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Fri Sep 19 13:13:34 2014 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Fri Sep 19 13:13:34 2014 +0300
--
.../app/assets/data/resource/cluster_name.json | 12 -
.../assets/data/resource/components_hosts.json | 16 -
.../ui/app/assets/data/resource/empty_json.json |1 +
.../assets/data/resource/service_configs.json | 38 -
.../assets/data/resource/service_status.json| 95 --
.../assets/data/resource/slider-properties.json |7 +-
.../createAppWizard/step1_controller.js | 90 +-
.../ui/app/controllers/slider_controller.js | 308 +---
.../src/main/resources/ui/app/helpers/ajax.js | 119 +-
.../src/main/resources/ui/app/initialize.js |9 +-
.../ui/app/mappers/slider_apps_mapper.js|7 +
.../resources/ui/app/models/slider_config.js| 51 +
.../src/main/resources/ui/app/routes/main.js| 16 +
.../resources/ui/app/templates/application.hbs |4 +-
.../ui/app/templates/slider_title_tooltip.hbs |2 +-
.../src/main/resources/ui/app/translations.js |7 +-
.../resources/ui/app/views/application_view.js | 13 +-
.../slider/src/main/resources/ui/config.js |1 +
.../resources/ui/vendor/scripts/common/tv4.js | 1605 ++
.../views/slider/src/main/resources/view.xml| 21 +-
20 files changed, 1815 insertions(+), 607 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d62147ed/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/cluster_name.json
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/cluster_name.json
b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/cluster_name.json
deleted file mode 100644
index f559483..000
---
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/cluster_name.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- href : http://162.216.151.215:8080/api/v1/clusters?_=1409232826826;,
- items : [
-{
- href : http://162.216.151.215:8080/api/v1/clusters/mycluster;,
- Clusters : {
-cluster_name : mycluster,
-version : HDP-2.1
- }
-}
- ]
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d62147ed/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/components_hosts.json
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/components_hosts.json
b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/components_hosts.json
deleted file mode 100644
index eaf72b4..000
---
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/components_hosts.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- items : [
-{
- Hosts : {
-host_name : myHost
- },
- host_components : [
-{
- HostRoles : {
-component_name :
- }
-}
- ]
-}
- ]
-}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d62147ed/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/empty_json.json
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/empty_json.json
b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/empty_json.json
new file mode 100644
index 000..0967ef4
--- /dev/null
+++
b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/empty_json.json
@@ -0,0 +1 @@
+{}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d62147ed/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_configs.json
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_configs.json
b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_configs.json
deleted file mode 100644
index 24c1a31..000
---
a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/service_configs.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- items : [
-{
- cluster_name : cl,
- configurations : [
-{
- Config : {
-cluster_name :
[05/29] git commit: AMBARI-7379. Add ability for Ganglia to create arbitrary clusters for metrics collection
AMBARI-7379. Add ability for Ganglia to create arbitrary clusters for metrics
collection
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1498061e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1498061e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1498061e
Branch: refs/heads/branch-alerts-dev
Commit: 1498061ee682e92f60b82ce496f7e25fc5ff474b
Parents: 5c24d29
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Thu Sep 18 13:30:16 2014 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Thu Sep 18 13:30:16 2014 -0700
--
.../HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml | 2 +-
.../HDP/2.0.6/services/GANGLIA/package/scripts/params.py | 8 +---
2 files changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1498061e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml
index 3328acf..59d607a 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/configuration/ganglia-env.xml
@@ -71,7 +71,7 @@
property
nameadditional_clusters/name
value /value
-descriptionAdd additional desired Ganglia metrics cluster in the form
name1:port1,name2:port2. Ensure that the names and ports are unique across
all cluster and ports are available on ganglia server host. Ambari has reserved
ports 8667-8669 within its own pool./description
+descriptionAdd additional desired Ganglia metrics cluster in the form
name1,port1,name2,port2. Ensure that the names and ports are unique across
all cluster and ports are available on ganglia server host. Ambari has reserved
ports 8667-8669 within its own pool./description
/property
/configuration
http://git-wip-us.apache.org/repos/asf/ambari/blob/1498061e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
index bf36b93..a00f7b1 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/GANGLIA/package/scripts/params.py
@@ -37,9 +37,11 @@ if gmond_add_clusters_str and
gmond_add_clusters_str.isspace():
gmond_app_strs = [] if gmond_add_clusters_str is None else
gmond_add_clusters_str.split(',')
gmond_apps = []
-for x in gmond_app_strs:
- a,b = x.strip().split(':')
- gmond_apps.append((a.strip(),b.strip()))
+
+i = 0
+while i len(gmond_app_strs):
+ gmond_apps.append((gmond_app_strs[i].strip(), gmond_app_strs[i+1].strip()))
+ i = i + 2
if System.get_instance().os_family == ubuntu:
gmond_service_name = ganglia-monitor
[19/29] git commit: AMBARI-7403. Slider View: AppTypes should be determined only once at view load. (onechiporenko)
AMBARI-7403. Slider View: AppTypes should be determined only once at view load.
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/201bcb3e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/201bcb3e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/201bcb3e
Branch: refs/heads/branch-alerts-dev
Commit: 201bcb3e81b172d585744c66449d76ca2f1b1d89
Parents: 0eb3937
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Fri Sep 19 14:12:23 2014 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Fri Sep 19 14:12:23 2014 +0300
--
contrib/views/slider/src/main/resources/ui/app/initialize.js | 2 +-
.../slider/src/main/resources/ui/app/mappers/application_type.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/201bcb3e/contrib/views/slider/src/main/resources/ui/app/initialize.js
--
diff --git a/contrib/views/slider/src/main/resources/ui/app/initialize.js
b/contrib/views/slider/src/main/resources/ui/app/initialize.js
index 5428c3d..2a85588 100755
--- a/contrib/views/slider/src/main/resources/ui/app/initialize.js
+++ b/contrib/views/slider/src/main/resources/ui/app/initialize.js
@@ -112,7 +112,7 @@ App.initializer({
});
application.SliderController.proto().initResources();
-application.ApplicationTypeMapper.loop('load');
+application.ApplicationTypeMapper.load();
application.SliderAppsMapper.loop('load');
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/201bcb3e/contrib/views/slider/src/main/resources/ui/app/mappers/application_type.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/mappers/application_type.js
b/contrib/views/slider/src/main/resources/ui/app/mappers/application_type.js
index 938412e..e4bdd85 100644
--- a/contrib/views/slider/src/main/resources/ui/app/mappers/application_type.js
+++ b/contrib/views/slider/src/main/resources/ui/app/mappers/application_type.js
@@ -34,7 +34,7 @@
* /ul
* @type {App.Mapper}
*/
-App.ApplicationTypeMapper = App.Mapper.createWithMixins(App.RunPeriodically, {
+App.ApplicationTypeMapper = App.Mapper.create({
/**
* Map for parsing JSON received from server
[03/29] git commit: AMBARI-7353. Upgrade from ambari 1.6.0 - 1.7.0 fails, with schema upgrade failed. (jaimin)
AMBARI-7353. Upgrade from ambari 1.6.0 - 1.7.0 fails, with schema upgrade
failed. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/742b7189
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/742b7189
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/742b7189
Branch: refs/heads/branch-alerts-dev
Commit: 742b71893633afd7ce1424239bd8937ba502a7a5
Parents: 35e
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Thu Sep 18 11:21:27 2014 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Thu Sep 18 11:21:27 2014 -0700
--
.../server/api/util/StackExtensionHelper.java | 119 ++-
.../server/upgrade/UpgradeCatalog170.java | 43 +++
2 files changed, 88 insertions(+), 74 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/742b7189/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
index 3e211fe..2c5396b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
@@ -17,6 +17,40 @@
*/
package org.apache.ambari.server.api.util;
+import com.google.inject.Injector;
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.api.services.AmbariMetaInfo;
+import org.apache.ambari.server.metadata.ActionMetadata;
+import org.apache.ambari.server.state.ClientConfigFileDefinition;
+import org.apache.ambari.server.state.CommandScriptDefinition;
+import org.apache.ambari.server.state.ComponentInfo;
+import org.apache.ambari.server.state.ConfigHelper;
+import org.apache.ambari.server.state.CustomCommandDefinition;
+import org.apache.ambari.server.state.DependencyInfo;
+import org.apache.ambari.server.state.PropertyInfo;
+import org.apache.ambari.server.state.ServiceInfo;
+import org.apache.ambari.server.state.ServiceOsSpecific;
+import org.apache.ambari.server.state.StackInfo;
+import org.apache.ambari.server.state.stack.ConfigurationXml;
+import org.apache.ambari.server.state.stack.RepositoryXml;
+import org.apache.ambari.server.state.stack.ServiceMetainfoXml;
+import org.apache.ambari.server.state.stack.StackMetainfoXml;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -31,33 +65,6 @@ import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.api.services.AmbariMetaInfo;
-import org.apache.ambari.server.metadata.ActionMetadata;
-import org.apache.ambari.server.state.*;
-import org.apache.ambari.server.state.stack.ConfigurationXml;
-import org.apache.ambari.server.state.stack.RepositoryXml;
-import org.apache.ambari.server.state.stack.ServiceMetainfoXml;
-import org.apache.ambari.server.state.stack.StackMetainfoXml;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
-
-import com.google.inject.Injector;
-
/**
* Helper methods for providing stack extension behavior -
* Apache Jira: AMBARI-2819
@@ -520,8 +527,8 @@ public class StackExtensionHelper {
}
void populateServicesForStack(StackInfo stackInfo) throws
- ParserConfigurationException, SAXException,
- XPathExpressionException, IOException, JAXBException {
+ ParserConfigurationException, SAXException,
+ XPathExpressionException, IOException, JAXBException {
[29/29] git commit: Merge branch 'trunk' into branch-alerts-dev
Merge branch 'trunk' into branch-alerts-dev Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e2e79668 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e2e79668 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e2e79668 Branch: refs/heads/branch-alerts-dev Commit: e2e79668ed94266487fe9d1d2ccba2003922e883 Parents: 179290e d7ed431 Author: Jonathan Hurley jhur...@hortonworks.com Authored: Fri Sep 19 13:18:45 2014 -0400 Committer: Jonathan Hurley jhur...@hortonworks.com Committed: Fri Sep 19 13:18:45 2014 -0400 -- .../clusters/ClustersManageAccessCtrl.js|2 +- .../app/scripts/directives/editableList.js | 18 +- .../resources/ui/admin-web/app/styles/main.css | 14 +- .../app/views/directives/editableList.html |2 +- .../ui/admin-web/app/views/groups/list.html |2 +- .../ui/admin-web/app/views/leftNavbar.html |9 +- .../resources/ui/admin-web/app/views/main.html |3 +- .../ui/admin-web/app/views/users/list.html |2 +- .../test/python/ambari_agent/TestController.py |4 +- .../TestCustomServiceOrchestrator.py|3 +- .../resource_management/TestCopyFromLocal.py|8 +- .../TestExecuteHadoopResource.py| 12 +- .../resource_management/TestExecuteResource.py |3 +- .../core/providers/system.py| 12 +- .../python/resource_management/core/shell.py| 24 +- .../libraries/providers/copy_from_local.py |4 + .../libraries/providers/execute_hadoop.py |6 +- .../libraries/providers/hdfs_directory.py |6 +- .../libraries/resources/copy_from_local.py |1 + ambari-server/pom.xml |8 + .../server/api/util/StackExtensionHelper.java | 122 +- .../controller/MaintenanceStateHelper.java |2 +- .../server/upgrade/UpgradeCatalog170.java | 43 +- .../src/main/resources/properties.json |1 + .../1.3.2/hooks/before-START/scripts/params.py |2 +- .../services/HIVE/configuration/hcat-env.xml| 57 + .../stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 19 +- .../1.3.2/services/HIVE/package/scripts/hcat.py | 13 +- .../services/HIVE/package/scripts/params.py |2 + .../HIVE/package/templates/hcat-env.sh.j2 | 44 - .../configuration/capacity-scheduler.xml|2 +- .../2.0.6/hooks/after-INSTALL/scripts/params.py | 11 +- .../scripts/shared_initialization.py|4 + .../2.0.6/hooks/before-START/scripts/params.py | 13 +- .../services/FLUME/package/scripts/flume.py |2 +- .../services/FLUME/package/scripts/params.py|6 +- .../GANGLIA/configuration/ganglia-env.xml |2 +- .../services/GANGLIA/package/scripts/params.py |8 +- .../services/HBASE/package/scripts/params.py| 16 +- .../services/HDFS/package/scripts/params.py | 18 +- .../HDFS/package/scripts/service_check.py |2 +- .../services/HIVE/configuration/hcat-env.xml| 57 + .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 19 +- .../2.0.6/services/HIVE/package/scripts/hcat.py | 15 +- .../HIVE/package/scripts/hcat_service_check.py | 10 +- .../HIVE/package/scripts/install_jars.py|2 + .../services/HIVE/package/scripts/params.py | 71 +- .../services/HIVE/package/scripts/webhcat.py|4 + .../HIVE/package/templates/hcat-env.sh.j2 | 43 - .../services/PIG/package/scripts/params.py | 12 +- .../2.0.6/services/PIG/package/scripts/pig.py |1 + .../services/SQOOP/package/scripts/params.py| 11 +- .../YARN/configuration/capacity-scheduler.xml |2 +- .../package/scripts/mapred_service_check.py |4 + .../services/YARN/package/scripts/params.py | 24 +- .../YARN/package/scripts/service_check.py |2 +- .../ZOOKEEPER/package/scripts/params.py |7 +- .../services/FALCON/package/scripts/params.py | 12 +- .../services/STORM/package/scripts/params.py| 11 +- .../stacks/HDP/2.2/services/FALCON/metainfo.xml |2 +- .../stacks/HDP/2.2/services/FLUME/metainfo.xml |2 +- .../stacks/HDP/2.2/services/HBASE/metainfo.xml |2 +- .../services/HDFS/configuration/hadoop-env.xml |2 +- .../services/HDFS/configuration/hdfs-site.xml | 34 - .../stacks/HDP/2.2/services/HDFS/metainfo.xml |4 +- .../HIVE/configuration/webhcat-site.xml | 14 +- .../stacks/HDP/2.2/services/HIVE/metainfo.xml |6 +- .../services/OOZIE/configuration/oozie-site.xml | 13 - .../stacks/HDP/2.2/services/OOZIE/metainfo.xml |6 +- .../stacks/HDP/2.2/services/PIG/metainfo.xml|2 +- .../services/SLIDER/package/scripts/params.py |4 +- .../stacks/HDP/2.2/services/SQOOP/metainfo.xml |2 +- .../services/STORM/configuration/storm-env.xml | 29 -
[02/29] git commit: AMBARI-7392. HCatalog config downloads Hive config files (aonishuk)
AMBARI-7392. HCatalog config downloads Hive config files (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/35ec Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/35ec Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/35ec Branch: refs/heads/branch-alerts-dev Commit: 35ec804bf2a2dadff6348f1fdfa5b64295f1 Parents: 31a4106 Author: Andrew Onishuk aonis...@hortonworks.com Authored: Thu Sep 18 20:14:34 2014 +0300 Committer: Andrew Onishuk aonis...@hortonworks.com Committed: Thu Sep 18 20:14:34 2014 +0300 -- .../1.3.2/hooks/before-START/scripts/params.py | 2 +- .../services/HIVE/configuration/hcat-env.xml| 57 .../stacks/HDP/1.3.2/services/HIVE/metainfo.xml | 19 +-- .../1.3.2/services/HIVE/package/scripts/hcat.py | 13 ++--- .../services/HIVE/package/scripts/params.py | 2 + .../HIVE/package/templates/hcat-env.sh.j2 | 44 --- .../services/HIVE/configuration/hcat-env.xml| 57 .../stacks/HDP/2.0.6/services/HIVE/metainfo.xml | 19 +-- .../2.0.6/services/HIVE/package/scripts/hcat.py | 13 ++--- .../services/HIVE/package/scripts/params.py | 1 + .../HIVE/package/templates/hcat-env.sh.j2 | 43 --- .../stacks/1.3.2/HIVE/test_hcat_client.py | 20 +++ .../python/stacks/1.3.2/configs/default.json| 5 +- .../python/stacks/1.3.2/configs/secured.json| 5 +- .../stacks/2.0.6/HIVE/test_hcat_client.py | 18 --- .../python/stacks/2.0.6/configs/default.json| 5 +- .../python/stacks/2.0.6/configs/secured.json| 5 +- 17 files changed, 166 insertions(+), 162 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/35ec/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py -- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py index 51f8d61..a6aff0e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-START/scripts/params.py @@ -94,7 +94,7 @@ ambari_db_rca_driver = config['hostLevelParams']['ambari_db_rca_driver'] ambari_db_rca_username = config['hostLevelParams']['ambari_db_rca_username'] ambari_db_rca_password = config['hostLevelParams']['ambari_db_rca_password'] -if has_namenode and 'rca_enabled' in config['configurations']['mapred-env']: +if has_namenode and 'mapred-env' in config['configurations']: rca_enabled = config['configurations']['mapred-env']['rca_enabled'] else: rca_enabled = False http://git-wip-us.apache.org/repos/asf/ambari/blob/35ec/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/hcat-env.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/hcat-env.xml b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/hcat-env.xml new file mode 100644 index 000..91b402b --- /dev/null +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HIVE/configuration/hcat-env.xml @@ -0,0 +1,57 @@ +?xml version=1.0? +?xml-stylesheet type=text/xsl href=configuration.xsl? +!-- +/** + * 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. + */ +-- + +configuration + !-- hcat-env.sh -- + property +namecontent/name +descriptionThis is the jinja template for hcat-env.sh file/description +value + # 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);
[09/29] git commit: AMBARI-7395. Configs: hover dismiss issues and ui cleanup.(xiwang)
AMBARI-7395. Configs: hover dismiss issues and ui cleanup.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6446499d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6446499d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6446499d
Branch: refs/heads/branch-alerts-dev
Commit: 6446499d27acfa78c78608293a377a43835911e2
Parents: 84133c2
Author: Xi Wang xiw...@apache.org
Authored: Thu Sep 18 16:26:51 2014 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Thu Sep 18 16:50:29 2014 -0700
--
.../ui/admin-web/app/views/leftNavbar.html | 2 -
ambari-web/app/messages.js | 1 +
ambari-web/app/models/service_config_version.js | 7 ++-
ambari-web/app/styles/application.less | 51
.../common/configs/config_history_flow.hbs | 20
.../common/configs/service_version_box.hbs | 17 +++
.../templates/main/dashboard/config_history.hbs | 6 +--
.../views/common/configs/config_history_flow.js | 19 +++-
8 files changed, 63 insertions(+), 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6446499d/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
index 0aa9340..8119428 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html
@@ -66,7 +66,6 @@
Launch Install Wizard
/a
/div
-
/div
/div
@@ -98,6 +97,5 @@
/div
/div
-
/div
http://git-wip-us.apache.org/repos/asf/ambari/blob/6446499d/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1052d9b..67b7799 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -2013,6 +2013,7 @@ Em.I18n.translations = {
'dashboard.configHistory.table.configGroup.default' : 'default',
'dashboard.configHistory.table.empty' : 'No history to display',
'dashboard.configHistory.table.notes.default': 'Initial configurations for
{0}',
+ 'dashboard.configHistory.table.notes.no': 'iNo notes/i',
'dashboard.configHistory.table.version.versionText' : 'V{0}',
'dashboard.configHistory.table.version.prefix' : 'V',
'dashboard.configHistory.table.current.tooltip' : 'Current config for
{0}:{1}',
http://git-wip-us.apache.org/repos/asf/ambari/blob/6446499d/ambari-web/app/models/service_config_version.js
--
diff --git a/ambari-web/app/models/service_config_version.js
b/ambari-web/app/models/service_config_version.js
index 61703ad..0f436a8 100644
--- a/ambari-web/app/models/service_config_version.js
+++ b/ambari-web/app/models/service_config_version.js
@@ -42,9 +42,12 @@ App.ServiceConfigVersion = DS.Model.extend({
configGroupName: function () {
return (this.get('groupName') === 'default') ? (this.get('displayName') +
' ' + Em.I18n.t('common.default')) : this.get('groupName');
}.property('groupName'),
- briefNotes: function () {
-return (typeof this.get('notes') === 'string') ?
this.get('notes').slice(0, 81) : ;
+ fullNotes: function () {
+return (typeof this.get('notes') === 'string') ? this.get('notes') ||
Em.I18n.t('dashboard.configHistory.table.notes.no') :
Em.I18n.t('dashboard.configHistory.table.notes.no');
}.property('notes'),
+ briefNotes: function () {
+return this.get('fullNotes').slice(0, 81);
+ }.property('fullNotes'),
moreNotesExists: function () {
return (typeof this.get('notes') === 'string') ? this.get('notes').length
80 : false;
}.property('notes'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/6446499d/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 0420804..e20980a 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -4995,15 +4995,15 @@ ul.inline li {
height: 58px;
margin: 5px 0;
.flow-element {
- width: 18.5%;
height: 58px;
+ width: 15.2%;
.version-box {
position: relative;
height: 90%;
}
.version-box .box {
cursor: pointer;
-width: 72%;
+width: 92%;
height: 100%;
background-color: #ff;
-webkit-border-radius: 4px;
@@ -5066,11 +5066,14 @@
[20/29] git commit: AMBARI-7404. configTypes field for stack service API should provide supports addProperty field. (aonishuk)
AMBARI-7404. configTypes field for stack service API should provide supports
addProperty field. (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/05f0b402
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/05f0b402
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/05f0b402
Branch: refs/heads/branch-alerts-dev
Commit: 05f0b402fc8ee7d79325985ed4468809455e13ef
Parents: 201bcb3
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Sep 19 15:10:30 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Sep 19 15:10:30 2014 +0300
--
.../server/api/util/StackExtensionHelper.java | 3 +-
.../src/main/resources/properties.json | 1 +
.../configuration/capacity-scheduler.xml| 2 +-
.../YARN/configuration/capacity-scheduler.xml | 2 +-
.../api/util/StackExtensionHelperTest.java | 40 ++--
.../services/YARN/configuration/yarn-site.xml | 2 +-
6 files changed, 42 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/05f0b402/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
index 2c5396b..fe6c6bc 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/util/StackExtensionHelper.java
@@ -916,7 +916,8 @@ public class StackExtensionHelper {
*/
protected enum Supports {
-FINAL(supports_final);
+FINAL(supports_final),
+ADDING_FORBIDDEN(supports_adding_forbidden);
public static final String KEYWORD = supports;
http://git-wip-us.apache.org/repos/asf/ambari/blob/05f0b402/ambari-server/src/main/resources/properties.json
--
diff --git a/ambari-server/src/main/resources/properties.json
b/ambari-server/src/main/resources/properties.json
index 76797d3..b99ede5 100644
--- a/ambari-server/src/main/resources/properties.json
+++ b/ambari-server/src/main/resources/properties.json
@@ -248,6 +248,7 @@
StackConfigurations/property_description,
StackConfigurations/type,
StackConfigurations/final,
+StackConfigurations/adding_forbidden,
StackConfigurations/property_type,
_
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/05f0b402/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/capacity-scheduler.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/capacity-scheduler.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/capacity-scheduler.xml
index 010a313..574d508 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/capacity-scheduler.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/MAPREDUCE/configuration/capacity-scheduler.xml
@@ -22,7 +22,7 @@
!-- The properties for a queue follow a naming convention,such as, --
!-- mapred.capacity-scheduler.queue.queue-name.property-name. --
-configuration supports_final=true
+configuration supports_final=true supports_adding_forbidden=true
property
namemapred.capacity-scheduler.maximum-system-jobs/name
http://git-wip-us.apache.org/repos/asf/ambari/blob/05f0b402/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
index 261d872..a8dc5c2 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/YARN/configuration/capacity-scheduler.xml
@@ -15,7 +15,7 @@
limitations under the License.
--
-configuration supports_final=true
+configuration supports_final=true supports_adding_forbidden=true
property
nameyarn.scheduler.capacity.maximum-applications/name
http://git-wip-us.apache.org/repos/asf/ambari/blob/05f0b402/ambari-server/src/test/java/org/apache/ambari/server/api/util/StackExtensionHelperTest.java
[23/29] git commit: AMBARI-7408. Slider View: Multiple small fixes to Create App wizard UI. (onechiporenko)
AMBARI-7408. Slider View: Multiple small fixes to Create App wizard UI. (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0255e5da Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0255e5da Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0255e5da Branch: refs/heads/branch-alerts-dev Commit: 0255e5dacf6ad02d262969d87edb9639c5bfb9ec Parents: 52d8c27 Author: Oleg Nechiporenko onechipore...@apache.org Authored: Fri Sep 19 16:58:39 2014 +0300 Committer: Oleg Nechiporenko onechipore...@apache.org Committed: Fri Sep 19 17:01:10 2014 +0300 -- .../ui-bg_flat_0_aa_40x100.png | Bin 0 - 180 bytes .../ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 - 120 bytes .../ui-bg_glass_65_ff_1x400.png | Bin 0 - 105 bytes .../ui-bg_glass_75_dadada_1x400.png | Bin 0 - 111 bytes .../ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 - 110 bytes .../ui-bg_glass_75_ff_1x400.png | Bin 0 - 107 bytes .../ui-bg_highlight-soft_75_cc_1x100.png| Bin 0 - 101 bytes .../ui-bg_inset-soft_95_fef1ec_1x100.png| Bin 0 - 123 bytes .../ui-icons_22_256x240.png | Bin 0 - 4369 bytes .../ui-icons_2e83ff_256x240.png | Bin 0 - 4369 bytes .../ui-icons_454545_256x240.png | Bin 0 - 4369 bytes .../ui-icons_88_256x240.png | Bin 0 - 4369 bytes .../ui-icons_cd0a0a_256x240.png | Bin 0 - 4369 bytes .../ui-icons_f6cf3b_256x240.png | Bin 0 - 8884 bytes .../resources/ui/app/styles/application.less| 37 +++ .../resources/ui/app/templates/slider_apps.hbs | 3 +- .../src/main/resources/ui/app/translations.js | 6 +-- 17 files changed, 41 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png new file mode 100644 index 000..5b5dab2 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png new file mode 100644 index 000..ad3d634 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png new file mode 100644 index 000..42ccba2 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png new file mode 100644 index 000..5a46b47 Binary files /dev/null and b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png differ http://git-wip-us.apache.org/repos/asf/ambari/blob/0255e5da/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_e6e6e6_1x400.png -- diff --git
git commit: AMBARI-7415. Properties from Xml should be automatically added during upgrade (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk edce1b29b - d99a275f5
AMBARI-7415. Properties from Xml should be automatically added during upgrade
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d99a275f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d99a275f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d99a275f
Branch: refs/heads/trunk
Commit: d99a275f552813593ff378270a8d411f34a25937
Parents: edce1b2
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Fri Sep 19 20:53:05 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Fri Sep 19 20:53:05 2014 +0300
--
.../ambari/server/state/ConfigHelper.java | 39
.../server/upgrade/AbstractUpgradeCatalog.java | 215 ++-
.../server/upgrade/UpgradeCatalog161.java | 2 +-
.../server/upgrade/UpgradeCatalog170.java | 27 +--
.../server/upgrade/UpgradeCatalog161Test.java | 2 +-
.../server/upgrade/UpgradeCatalog170Test.java | 35 +--
6 files changed, 216 insertions(+), 104 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d99a275f/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index 191549b..8b724b1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -474,6 +474,8 @@ public class ConfigHelper {
for(ServiceInfo serviceInfo:stack.getServices()) {
SetPropertyInfo stackProperties =
ambariMetaInfo.getProperties(stack.getName(), stack.getVersion(),
serviceInfo.getName());
+ SetPropertyInfo stackLevelProperties =
ambariMetaInfo.getStackProperties(stack.getName(), stack.getVersion());
+ stackProperties.addAll(stackLevelProperties);
for (PropertyInfo stackProperty : stackProperties) {
String stackPropertyConfigType =
fileNameToConfigType(stackProperty.getFilename());
@@ -488,6 +490,43 @@ public class ConfigHelper {
return null;
}
+ public ServiceInfo getPropertyOwnerService(Cluster cluster, String
configType, String propertyName) throws AmbariException {
+StackId stackId = cluster.getCurrentStackVersion();
+StackInfo stack = ambariMetaInfo.getStackInfo(stackId.getStackName(),
+stackId.getStackVersion());
+
+for(ServiceInfo serviceInfo:stack.getServices()) {
+ SetPropertyInfo stackProperties =
ambariMetaInfo.getProperties(stack.getName(), stack.getVersion(),
serviceInfo.getName());
+
+ for (PropertyInfo stackProperty : stackProperties) {
+String stackPropertyConfigType =
fileNameToConfigType(stackProperty.getFilename());
+
+if(stackProperty.getName().equals(propertyName)
stackPropertyConfigType.equals(configType)) {
+ return serviceInfo;
+}
+ }
+
+}
+
+return null;
+ }
+
+ public SetPropertyInfo getServiceProperties(Cluster cluster, String
serviceName) throws AmbariException {
+StackId stackId = cluster.getCurrentStackVersion();
+StackInfo stack = ambariMetaInfo.getStackInfo(stackId.getStackName(),
+stackId.getStackVersion());
+
+return ambariMetaInfo.getProperties(stack.getName(), stack.getVersion(),
serviceName);
+ }
+
+ public SetPropertyInfo getStackProperties(Cluster cluster) throws
AmbariException {
+StackId stackId = cluster.getCurrentStackVersion();
+StackInfo stack = ambariMetaInfo.getStackInfo(stackId.getStackName(),
+stackId.getStackVersion());
+
+return ambariMetaInfo.getStackProperties(stack.getName(),
stack.getVersion());
+ }
+
public void createConfigType(Cluster cluster, AmbariManagementController
ambariManagementController,
String configType, MapString, String properties, String authName)
throws AmbariException {
String tag;
http://git-wip-us.apache.org/repos/asf/ambari/blob/d99a275f/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index a53159c..d245b51 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -22,6
git commit: AMBARI-7416. Slider View: Do not show Flex action when app is stopped (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk fbe97db79 - d018aa6a1
AMBARI-7416. Slider View: Do not show Flex action when app is stopped
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d018aa6a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d018aa6a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d018aa6a
Branch: refs/heads/trunk
Commit: d018aa6a1b720149fe4417801122cd72c322e4ab
Parents: fbe97db
Author: Alex Antonenko hiv...@gmail.com
Authored: Fri Sep 19 21:11:25 2014 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Fri Sep 19 21:22:46 2014 +0300
--
.../main/resources/ui/app/controllers/slider_app_controller.js | 2 +-
.../slider/src/main/resources/ui/app/styles/application.less | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d018aa6a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
index f042e38..94ae7e7 100644
---
a/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
+++
b/contrib/views/slider/src/main/resources/ui/app/controllers/slider_app_controller.js
@@ -56,7 +56,7 @@ App.SliderAppController =
Ember.ObjectController.extend(App.AjaxErrorHandler, {
confirm: true
});
}
-if ('FINISHED' !== status) {
+if ('RUNNING' == status) {
actions.push({
title: 'Flex',
action: 'flex',
http://git-wip-us.apache.org/repos/asf/ambari/blob/d018aa6a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
index f0d0bab..98f52d4 100644
--- a/contrib/views/slider/src/main/resources/ui/app/styles/application.less
+++ b/contrib/views/slider/src/main/resources/ui/app/styles/application.less
@@ -595,6 +595,9 @@ select {
border-width: 0;
}
}
+td:nth-child(2) span{
+ word-break: break-all;
+}
}
.panel-heading {
font-weight: 700;
@@ -604,9 +607,6 @@ select {
td:first-child {
text-align: right;
}
-span{
- word-break: break-all;
-}
}
.panel-components {
.status {
[2/2] git commit: AMBARI-7417. Admin Views: Remove SYNC LDAP from the UI and create commandline ambari-server sync-ldap to call the API for syncing.
AMBARI-7417. Admin Views: Remove SYNC LDAP from the UI and create commandline
ambari-server sync-ldap to call the API for syncing.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/21d784b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/21d784b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/21d784b6
Branch: refs/heads/trunk
Commit: 21d784b68764899c8aa7262ba4b9a447911ddc22
Parents: d018aa6
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Fri Sep 19 11:21:04 2014 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Fri Sep 19 11:24:05 2014 -0700
--
.../main/resources/ui/admin-web/app/index.html |1 -
.../app/scripts/controllers/NavbarCtrl.js | 22 +-
.../ui/admin-web/app/scripts/services/ldap.js | 60 -
.../resources/ui/admin-web/app/styles/main.css | 10 +-
.../ui/admin-web/app/views/leftNavbar.html |9 -
ambari-server/sbin/ambari-server|4 +
.../controller/AmbariManagementController.java | 10 +-
.../AmbariManagementControllerImpl.java | 31 +-
.../internal/ControllerResourceProvider.java| 53 +-
.../server/security/authorization/Users.java| 17 +-
.../security/ldap/AmbariLdapDataPopulator.java | 268 +++-
ambari-server/src/main/python/ambari-server.py | 74 +
.../ldap/AmbariLdapDataPopulatorTest.java | 1329 +-
.../security/ldap/LdapPerformanceTest.java | 10 +-
14 files changed, 1673 insertions(+), 225 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/21d784b6/ambari-admin/src/main/resources/ui/admin-web/app/index.html
--
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
index 7ff0638..2fb9fce 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/index.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/index.html
@@ -134,7 +134,6 @@
script src=scripts/services/User.js/script
script src=scripts/services/Group.js/script
script src=scripts/services/View.js/script
-script src=scripts/services/ldap.js/script
script src=scripts/services/Cluster.js/script
script src=scripts/services/uiAlert.js/script
script src=scripts/services/PermissionLoader.js/script
http://git-wip-us.apache.org/repos/asf/ambari/blob/21d784b6/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js
index 9434cff..130d6fc 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/NavbarCtrl.js
@@ -18,7 +18,7 @@
'use strict';
angular.module('ambariAdminConsole')
-.controller('NavbarCtrl',['$scope', 'Cluster', '$location', 'uiAlert',
'ROUTES', 'LDAP', 'ConfirmationModal', '$rootScope', function($scope, Cluster,
$location, uiAlert, ROUTES, LDAP, ConfirmationModal, $rootScope) {
+.controller('NavbarCtrl',['$scope', 'Cluster', '$location', 'uiAlert',
'ROUTES', 'ConfirmationModal', '$rootScope', function($scope, Cluster,
$location, uiAlert, ROUTES, ConfirmationModal, $rootScope) {
$scope.cluster = null;
$scope.editCluster = {
name: '',
@@ -73,24 +73,4 @@ angular.module('ambariAdminConsole')
var r = new RegExp( route.url.replace(/(:\w+)/, '\\w+'));
return r.test($location.path());
};
-
- $scope.isLDAPConfigured = false;
- $scope.ldapData = {};
- LDAP.get().then(function(data) {
-$scope.ldapData = data.data;
-$scope.isLDAPConfigured = data.data['LDAP']['configured'];
- });
-
- $scope.syncLDAP = function() {
-ConfirmationModal.show('Sync LDAP', 'Are you sure you want to sync
LDAP?').then(function() {
- LDAP.sync($scope.ldapData['LDAP'].groups,
$scope.ldapData['LDAP'].users).then(function() {
-uiAlert.success('LDAP synced successful');
-$rootScope.$evalAsync(function() {
- $rootScope.LDAPSynced = true;
-});
- }).catch(function(data) {
-uiAlert.danger(data.data.status, data.data.message);
- });
-});
- };
}]);
http://git-wip-us.apache.org/repos/asf/ambari/blob/21d784b6/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/ldap.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/ldap.js
git commit: AMBARI-7349 - Admin : LDAP Sync API to support sync events
Repository: ambari
Updated Branches:
refs/heads/trunk 21d784b68 - 1f7dbd5df
AMBARI-7349 - Admin : LDAP Sync API to support sync events
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f7dbd5d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f7dbd5d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f7dbd5d
Branch: refs/heads/trunk
Commit: 1f7dbd5df4b624a083cc8f8fe4141e6289ecf46e
Parents: 21d784b
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Thu Sep 18 22:12:45 2014 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Fri Sep 19 14:25:08 2014 -0400
--
.../LdapSyncEventResourceDefinition.java| 57 +++
.../resources/ResourceInstanceFactoryImpl.java | 4 +
.../api/services/LdapSyncEventService.java | 144 ++
.../internal/DefaultProviderModule.java | 2 +
.../internal/LdapSyncEventResourceProvider.java | 438 +++
.../ambari/server/controller/spi/Resource.java | 4 +-
.../orm/entities/LdapSyncEventEntity.java | 284
.../server/orm/entities/LdapSyncSpecEntity.java | 143 ++
.../LdapSyncEventResourceDefinitionTest.java| 49 +++
.../api/services/LdapSyncEventServiceTest.java | 97
.../LdapSyncEventResourceProviderTest.java | 114 +
.../orm/entities/LdapSyncEventEntityTest.java | 166 +++
.../orm/entities/LdapSyncSpecEntityTest.java| 95
13 files changed, 1596 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f7dbd5d/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LdapSyncEventResourceDefinition.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LdapSyncEventResourceDefinition.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LdapSyncEventResourceDefinition.java
new file mode 100644
index 000..554c688
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/LdapSyncEventResourceDefinition.java
@@ -0,0 +1,57 @@
+/**
+ * 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.
+ */
+
+package org.apache.ambari.server.api.resources;
+
+import org.apache.ambari.server.controller.spi.Resource;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * LDAP sync event resource definition.
+ */
+public class LdapSyncEventResourceDefinition extends BaseResourceDefinition {
+
+ // - Constructors --
+
+ /**
+ * Construct an event resource definition.
+ */
+ public LdapSyncEventResourceDefinition() {
+super(Resource.Type.LdapSyncEvent);
+ }
+
+
+ // - ResourceDefinition
+
+ @Override
+ public String getPluralName() {
+return ldap_sync_events;
+ }
+
+ @Override
+ public String getSingularName() {
+return ldap_sync_event;
+ }
+
+ @Override
+ public SetSubResourceDefinition getSubResourceDefinitions() {
+return Collections.emptySet();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f7dbd5d/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
index f85c0ea..2676fd3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/ResourceInstanceFactoryImpl.java
@@ -280,6 +280,10 @@ public class ResourceInstanceFactoryImpl implements
ResourceInstanceFactory {
resourceDefinition = new ClientConfigResourceDefinition();
break;
+ case LdapSyncEvent:
+resourceDefinition = new
git commit: AMBARI-7348. Single Sign-On with Views API to impersonate account (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 1f7dbd5df - 40050513e
AMBARI-7348. Single Sign-On with Views API to impersonate account (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/40050513
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/40050513
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/40050513
Branch: refs/heads/trunk
Commit: 40050513e2cecaabf4139e40e09f8b198e6a7bd5
Parents: 1f7dbd5
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Wed Sep 17 19:52:41 2014 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Fri Sep 19 11:47:20 2014 -0700
--
.../controller/internal/URLStreamProvider.java | 4 +
.../ambari/server/proxy/ProxyService.java | 17 +-
.../server/view/HttpImpersonatorImpl.java | 167 +++
.../server/view/ImpersonatorSettingImpl.java| 63 +++
.../ambari/server/view/ViewContextImpl.java | 18 +-
.../ambari/server/proxy/ProxyServiceTest.java | 14 ++
.../server/view/HttpImpersonatorImplTest.java | 128 ++
.../apache/ambari/view/HttpImpersonator.java| 53 ++
.../apache/ambari/view/ImpersonatorSetting.java | 46 +
.../org/apache/ambari/view/ViewContext.java | 15 ++
ambari-web/app/utils/ajax/ajax.js | 22 ---
contrib/views/jobs/pom.xml | 15 ++
.../apache/ambari/view/jobs/ProxyServlet.java | 68
.../jobs/src/main/resources/WEB-INF/web.xml | 37
.../app/scripts/controllers/jobs_controller.js | 10 +-
.../resources/ui/app/scripts/helpers/ajax.js| 25 ++-
.../resources/ui/app/scripts/helpers/jobs.js| 15 +-
.../ui/app/scripts/routes/application_route.js | 8 +
18 files changed, 687 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/40050513/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java
index 2b32d11..1b57c84 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/URLStreamProvider.java
@@ -218,4 +218,8 @@ public class URLStreamProvider implements StreamProvider {
return connection;
}
+
+ public AppCookieManager getAppCookieManager() {
+return appCookieManager;
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/40050513/ambari-server/src/main/java/org/apache/ambari/server/proxy/ProxyService.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/proxy/ProxyService.java
b/ambari-server/src/main/java/org/apache/ambari/server/proxy/ProxyService.java
index 30e998b..2cdffef 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/proxy/ProxyService.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/proxy/ProxyService.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.proxy;
import com.google.gson.Gson;
import org.apache.ambari.server.controller.internal.URLStreamProvider;
+import org.apache.ambari.server.view.ImpersonatorSettingImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,6 +37,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
import java.io.IOException;
import java.io.InputStream;
@@ -48,9 +50,9 @@ import java.util.HashMap;
@Path(/)
public class ProxyService {
- private static final int URL_CONNECT_TIMEOUT = 2;
- private static final int URL_READ_TIMEOUT = 15000;
- private static final int HTTP_ERROR_RANGE_START =
Response.Status.BAD_REQUEST.getStatusCode();
+ public static final int URL_CONNECT_TIMEOUT = 2;
+ public static final int URL_READ_TIMEOUT = 15000;
+ public static final int HTTP_ERROR_RANGE_START =
Response.Status.BAD_REQUEST.getStatusCode();
private static final String REQUEST_TYPE_GET = GET;
private static final String REQUEST_TYPE_POST = POST;
@@ -59,6 +61,7 @@ public class ProxyService {
private static final String QUERY_PARAMETER_URL = url=;
private static final String AMBARI_PROXY_PREFIX = AmbariProxy-;
private static final String ERROR_PROCESSING_URL = Error occurred during
processing URL ;
+ private static final String INVALID_PARAM_IN_URL = Invalid query params
found in URL ;
private final
git commit: AMBARI-7418 - Views: cannot create instance w/o a restart.
Repository: ambari
Updated Branches:
refs/heads/trunk 40050513e - c840be073
AMBARI-7418 - Views: cannot create instance w/o a restart.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c840be07
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c840be07
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c840be07
Branch: refs/heads/trunk
Commit: c840be073d1b969b50bedee9d8252dbc20ea9ab9
Parents: 4005051
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Fri Sep 19 18:32:31 2014 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Fri Sep 19 18:49:46 2014 -0400
--
.../ambari/server/view/ViewProviderModule.java | 26
.../apache/ambari/server/view/ViewRegistry.java | 22 -
.../ambari/server/view/ViewRegistryTest.java| 20 +++
3 files changed, 46 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c840be07/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
index edaff1b..5fadf22 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
@@ -22,9 +22,7 @@ import
org.apache.ambari.server.controller.spi.PropertyProvider;
import org.apache.ambari.server.controller.spi.ProviderModule;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.ResourceProvider;
-import org.apache.ambari.server.orm.entities.ViewEntity;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,11 +33,6 @@ import java.util.Map;
*/
public class ViewProviderModule implements ProviderModule {
/**
- * Mapping of view resource type to resource provider.
- */
- private final MapResource.Type, ResourceProvider resourceProviders;
-
- /**
* The delegate provider module.
*/
private final ProviderModule providerModule;
@@ -51,12 +44,9 @@ public class ViewProviderModule implements ProviderModule {
* Construct a view provider module.
*
* @param providerModule the delegate provider module
- * @param resourceProviders the map of view resource types to resource
providers
*/
- private ViewProviderModule(ProviderModule providerModule,
-MapResource.Type, ResourceProvider
resourceProviders) {
+ private ViewProviderModule(ProviderModule providerModule) {
this.providerModule = providerModule;
-this.resourceProviders = resourceProviders;
}
@@ -65,6 +55,9 @@ public class ViewProviderModule implements ProviderModule {
@Override
public ResourceProvider getResourceProvider(Resource.Type type) {
+MapResource.Type, ResourceProvider resourceProviders =
+ViewRegistry.getInstance().getResourceProviders();
+
if (resourceProviders.containsKey(type)) {
return resourceProviders.get(type);
}
@@ -87,15 +80,6 @@ public class ViewProviderModule implements ProviderModule {
* @return a view provider module
*/
public static ViewProviderModule getViewProviderModule(ProviderModule
module) {
-MapResource.Type, ResourceProvider resourceProviders = new
HashMapResource.Type, ResourceProvider();
-
-ViewRegistry registry = ViewRegistry.getInstance();
-for (ViewEntity definition : registry.getDefinitions()) {
- for (Resource.Type type : definition.getViewResourceTypes()){
-ResourceProvider provider = definition.getResourceProvider(type);
-resourceProviders.put(type, provider);
- }
-}
-return new ViewProviderModule(module, resourceProviders);
+return new ViewProviderModule(module);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/c840be07/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
index 5e652a1..58c4334 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
@@ -29,6 +29,7 @@ import
org.apache.ambari.server.api.services.ViewExternalSubResourceService;
import org.apache.ambari.server.api.services.ViewSubResourceService;
import org.apache.ambari.server.configuration.Configuration;
import
git commit: AMBARI-7286. Use latest repo url in blueprints rather than the default (Cabir Zounaidou via alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk c840be073 - 348d918a9
AMBARI-7286. Use latest repo url in blueprints rather than the default (Cabir
Zounaidou via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/348d918a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/348d918a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/348d918a
Branch: refs/heads/trunk
Commit: 348d918a91cd12688ea43b08931b419a7325ac9d
Parents: c840be0
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Fri Sep 19 16:07:52 2014 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Fri Sep 19 16:07:52 2014 -0700
--
.../server/state/stack/LatestRepoCallable.java | 59
.../server/api/services/AmbariMetaInfoTest.java | 135 ++-
2 files changed, 164 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/348d918a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
index 47d93f1..efb2d0a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
@@ -41,13 +41,13 @@ import com.google.gson.reflect.TypeToken;
public class LatestRepoCallable implements CallableVoid {
private static final int LOOKUP_CONNECTION_TIMEOUT = 2000;
private static final int LOOKUP_READ_TIMEOUT = 1000;
-
+
private final static Logger LOG =
LoggerFactory.getLogger(LatestRepoCallable.class);
-
+
private String sourceUri = null;
private File stackRepoFolder = null;
private StackInfo stack = null;
-
+
public LatestRepoCallable(String latestSourceUri, File stackRepoFolder,
StackInfo stack) {
this.sourceUri = latestSourceUri;
this.stackRepoFolder = stackRepoFolder;
@@ -56,19 +56,19 @@ public class LatestRepoCallable implements CallableVoid {
@Override
public Void call() throws Exception {
-
+
Type type = new TypeTokenMapString, MapString, Object(){}.getType();
Gson gson = new Gson();
-
+
MapString, MapString, Object latestUrlMap = null;
-
+
try {
if (sourceUri.startsWith(http)) {
-
+
URLStreamProvider streamProvider = new URLStreamProvider(
LOOKUP_CONNECTION_TIMEOUT, LOOKUP_READ_TIMEOUT,
null, null, null);
-
+
LOG.info(Loading latest URL info from + sourceUri);
latestUrlMap = gson.fromJson(new InputStreamReader(
streamProvider.readFrom(sourceUri)), type);
@@ -79,7 +79,7 @@ public class LatestRepoCallable implements CallableVoid {
} else {
jsonFile = new File(sourceUri);
}
-
+
if (jsonFile.exists()) {
LOG.info(Loading latest URL info from + jsonFile);
latestUrlMap = gson.fromJson(new FileReader(jsonFile), type);
@@ -89,71 +89,76 @@ public class LatestRepoCallable implements CallableVoid {
LOG.error(Could not load the URI + sourceUri + ( + e.getMessage()
+ ));
throw e;
}
-
-
+
+
if (null != latestUrlMap) {
for (RepositoryInfo ri : stack.getRepositories()) {
if (latestUrlMap.containsKey(ri.getRepoId())) {
MapString, Object valueMap = latestUrlMap.get(ri.getRepoId());
if (valueMap.containsKey(latest)) {
-
+
@SuppressWarnings(unchecked)
MapString, String osMap = (MapString, String)
valueMap.get(latest);
-
+
String baseUrl = resolveOsUrl(ri.getOsType(), osMap);
if (null != baseUrl) {
// !!! in the case where name.repo is defined with the base
url, strip that off.
// Agents do the reverse action (take the base url, and append
name.repo)
-
+
String repo_file_format;
if(ri.getOsType().equals(ubuntu12)) {
repo_file_format = list;
} else {
repo_file_format = repo;
}
-
+
String repoFileName = stack.getName().toLowerCase() + . +
repo_file_format;
- int idx = baseUrl.toLowerCase().indexOf(repoFileName);
-
+ int idx = baseUrl.toLowerCase().indexOf(repoFileName);
+
if (-1 != idx baseUrl.toLowerCase().endsWith(repoFileName)) {
baseUrl = baseUrl.substring(0, idx);
}
-
+
git commit: Revert AMBARI-7286. Use latest repo url in blueprints rather than the default (Cabir Zounaidou via alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 348d918a9 - 380fc2c70
Revert AMBARI-7286. Use latest repo url in blueprints rather than the default
(Cabir Zounaidou via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/380fc2c7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/380fc2c7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/380fc2c7
Branch: refs/heads/trunk
Commit: 380fc2c70c24a6fd719cfd6843043b1189243f70
Parents: 348d918
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Fri Sep 19 17:24:17 2014 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Fri Sep 19 17:24:17 2014 -0700
--
.../server/state/stack/LatestRepoCallable.java | 59
.../server/api/services/AmbariMetaInfoTest.java | 135 +--
2 files changed, 30 insertions(+), 164 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/380fc2c7/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
index efb2d0a..47d93f1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
@@ -41,13 +41,13 @@ import com.google.gson.reflect.TypeToken;
public class LatestRepoCallable implements CallableVoid {
private static final int LOOKUP_CONNECTION_TIMEOUT = 2000;
private static final int LOOKUP_READ_TIMEOUT = 1000;
-
+
private final static Logger LOG =
LoggerFactory.getLogger(LatestRepoCallable.class);
-
+
private String sourceUri = null;
private File stackRepoFolder = null;
private StackInfo stack = null;
-
+
public LatestRepoCallable(String latestSourceUri, File stackRepoFolder,
StackInfo stack) {
this.sourceUri = latestSourceUri;
this.stackRepoFolder = stackRepoFolder;
@@ -56,19 +56,19 @@ public class LatestRepoCallable implements CallableVoid {
@Override
public Void call() throws Exception {
-
+
Type type = new TypeTokenMapString, MapString, Object(){}.getType();
Gson gson = new Gson();
-
+
MapString, MapString, Object latestUrlMap = null;
-
+
try {
if (sourceUri.startsWith(http)) {
-
+
URLStreamProvider streamProvider = new URLStreamProvider(
LOOKUP_CONNECTION_TIMEOUT, LOOKUP_READ_TIMEOUT,
null, null, null);
-
+
LOG.info(Loading latest URL info from + sourceUri);
latestUrlMap = gson.fromJson(new InputStreamReader(
streamProvider.readFrom(sourceUri)), type);
@@ -79,7 +79,7 @@ public class LatestRepoCallable implements CallableVoid {
} else {
jsonFile = new File(sourceUri);
}
-
+
if (jsonFile.exists()) {
LOG.info(Loading latest URL info from + jsonFile);
latestUrlMap = gson.fromJson(new FileReader(jsonFile), type);
@@ -89,76 +89,71 @@ public class LatestRepoCallable implements CallableVoid {
LOG.error(Could not load the URI + sourceUri + ( + e.getMessage()
+ ));
throw e;
}
-
-
+
+
if (null != latestUrlMap) {
for (RepositoryInfo ri : stack.getRepositories()) {
if (latestUrlMap.containsKey(ri.getRepoId())) {
MapString, Object valueMap = latestUrlMap.get(ri.getRepoId());
if (valueMap.containsKey(latest)) {
-
+
@SuppressWarnings(unchecked)
MapString, String osMap = (MapString, String)
valueMap.get(latest);
-
+
String baseUrl = resolveOsUrl(ri.getOsType(), osMap);
if (null != baseUrl) {
// !!! in the case where name.repo is defined with the base
url, strip that off.
// Agents do the reverse action (take the base url, and append
name.repo)
-
+
String repo_file_format;
if(ri.getOsType().equals(ubuntu12)) {
repo_file_format = list;
} else {
repo_file_format = repo;
}
-
+
String repoFileName = stack.getName().toLowerCase() + . +
repo_file_format;
- int idx = baseUrl.toLowerCase().indexOf(repoFileName);
-
+ int idx = baseUrl.toLowerCase().indexOf(repoFileName);
+
if (-1 != idx baseUrl.toLowerCase().endsWith(repoFileName)) {
baseUrl = baseUrl.substring(0, idx);
}
-
+
git commit: AMBARI-7286. Associating repository latest url for deploying cluster using blueprint (Cabir Zounaidou via alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 380fc2c70 - b82ac7abf
AMBARI-7286. Associating repository latest url for deploying cluster using
blueprint (Cabir Zounaidou via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b82ac7ab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b82ac7ab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b82ac7ab
Branch: refs/heads/trunk
Commit: b82ac7abf4e9979a8c9d5a244565e2e3e58c2374
Parents: 380fc2c
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Fri Sep 19 22:11:50 2014 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Fri Sep 19 22:11:50 2014 -0700
--
.../server/state/stack/LatestRepoCallable.java | 59
.../server/api/services/AmbariMetaInfoTest.java | 145 ++-
2 files changed, 174 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b82ac7ab/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
index 47d93f1..efb2d0a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
@@ -41,13 +41,13 @@ import com.google.gson.reflect.TypeToken;
public class LatestRepoCallable implements CallableVoid {
private static final int LOOKUP_CONNECTION_TIMEOUT = 2000;
private static final int LOOKUP_READ_TIMEOUT = 1000;
-
+
private final static Logger LOG =
LoggerFactory.getLogger(LatestRepoCallable.class);
-
+
private String sourceUri = null;
private File stackRepoFolder = null;
private StackInfo stack = null;
-
+
public LatestRepoCallable(String latestSourceUri, File stackRepoFolder,
StackInfo stack) {
this.sourceUri = latestSourceUri;
this.stackRepoFolder = stackRepoFolder;
@@ -56,19 +56,19 @@ public class LatestRepoCallable implements CallableVoid {
@Override
public Void call() throws Exception {
-
+
Type type = new TypeTokenMapString, MapString, Object(){}.getType();
Gson gson = new Gson();
-
+
MapString, MapString, Object latestUrlMap = null;
-
+
try {
if (sourceUri.startsWith(http)) {
-
+
URLStreamProvider streamProvider = new URLStreamProvider(
LOOKUP_CONNECTION_TIMEOUT, LOOKUP_READ_TIMEOUT,
null, null, null);
-
+
LOG.info(Loading latest URL info from + sourceUri);
latestUrlMap = gson.fromJson(new InputStreamReader(
streamProvider.readFrom(sourceUri)), type);
@@ -79,7 +79,7 @@ public class LatestRepoCallable implements CallableVoid {
} else {
jsonFile = new File(sourceUri);
}
-
+
if (jsonFile.exists()) {
LOG.info(Loading latest URL info from + jsonFile);
latestUrlMap = gson.fromJson(new FileReader(jsonFile), type);
@@ -89,71 +89,76 @@ public class LatestRepoCallable implements CallableVoid {
LOG.error(Could not load the URI + sourceUri + ( + e.getMessage()
+ ));
throw e;
}
-
-
+
+
if (null != latestUrlMap) {
for (RepositoryInfo ri : stack.getRepositories()) {
if (latestUrlMap.containsKey(ri.getRepoId())) {
MapString, Object valueMap = latestUrlMap.get(ri.getRepoId());
if (valueMap.containsKey(latest)) {
-
+
@SuppressWarnings(unchecked)
MapString, String osMap = (MapString, String)
valueMap.get(latest);
-
+
String baseUrl = resolveOsUrl(ri.getOsType(), osMap);
if (null != baseUrl) {
// !!! in the case where name.repo is defined with the base
url, strip that off.
// Agents do the reverse action (take the base url, and append
name.repo)
-
+
String repo_file_format;
if(ri.getOsType().equals(ubuntu12)) {
repo_file_format = list;
} else {
repo_file_format = repo;
}
-
+
String repoFileName = stack.getName().toLowerCase() + . +
repo_file_format;
- int idx = baseUrl.toLowerCase().indexOf(repoFileName);
-
+ int idx = baseUrl.toLowerCase().indexOf(repoFileName);
+
if (-1 != idx baseUrl.toLowerCase().endsWith(repoFileName)) {
baseUrl = baseUrl.substring(0, idx);
}
-
