ambari git commit: AMBARI-14839 - DEA is not enabled due to configuration conflict and history log directory can not be changed (Jeff Zhang via jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2.1 6f982173d -> 5179e5ab9
AMBARI-14839 - DEA is not enabled due to configuration conflict and history log
directory can not be changed (Jeff Zhang via jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5179e5ab
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5179e5ab
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5179e5ab
Branch: refs/heads/branch-2.2.1
Commit: 5179e5ab94805e37562a9a4c5e270ac9cf37defc
Parents: 6f98217
Author: Jonathan Hurley
Authored: Thu Jan 28 23:11:37 2016 -0500
Committer: Jonathan Hurley
Committed: Thu Jan 28 23:13:52 2016 -0500
--
.../SPARK/1.2.0.2.2/package/scripts/params.py | 4 ++-
.../SPARK/configuration/spark-defaults.xml | 4 +--
.../configuration/spark-thrift-sparkconf.xml| 31
3 files changed, 31 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5179e5ab/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index a681a5c..a25db6f 100644
---
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -79,7 +79,9 @@ hive_user = status_params.hive_user
spark_group = status_params.spark_group
user_group = status_params.user_group
spark_hdfs_user_dir = format("/user/{spark_user}")
-spark_history_dir = 'hdfs:///spark-history'
+spark_history_dir = "hdfs:///spark-history"
+if 'spark-defaults' in config['configurations'] and
'spark.history.fs.logDirectory' in config['configurations']['spark-defaults']:
+ spark_history_dir =
config['configurations']['spark-defaults']['spark.history.fs.logDirectory']
spark_history_server_pid_file = status_params.spark_history_server_pid_file
spark_thrift_server_pid_file = status_params.spark_thrift_server_pid_file
http://git-wip-us.apache.org/repos/asf/ambari/blob/5179e5ab/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
index d8af790..1a6552f 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
@@ -31,7 +31,7 @@
spark.history.fs.logDirectory
-{{spark_history_dir}}
+hdfs:///spark-history
Base directory for history spark application log.
@@ -45,7 +45,7 @@
spark.eventLog.dir
-{{spark_history_dir}}
+hdfs:///spark-history
Base directory in which Spark events are logged, if
spark.eventLog.enabled is true.
http://git-wip-us.apache.org/repos/asf/ambari/blob/5179e5ab/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
index 3b13496..2dbfe51 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -75,14 +75,17 @@
spark.history.fs.logDirectory
{{spark_history_dir}}
+true
- Base directory for history spark application log.
+ Base directory for history spark application log. It is the same value
+ as in spark-defaults.xml.
spark.eventLog.enabled
true
+true
Whether to log Spark events, useful for reconstructing the Web UI after
the application has finished.
@@ -91,8 +94,10 @@
spark.eventLog.dir
{{spark_history_dir}}
+true
- Base directory in which Spark events are logged, if
spark.eventLog.enabled is true.
+ Base directory in which Spark events are logged, if
spark.eventLog.enabled is true. It
ambari git commit: AMBARI-14839 - DEA is not enabled due to configuration conflict and history log directory can not be changed (Jeff Zhang via jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 432a3d972 -> 87604be7f
AMBARI-14839 - DEA is not enabled due to configuration conflict and history log
directory can not be changed (Jeff Zhang via jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/87604be7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87604be7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87604be7
Branch: refs/heads/branch-2.2
Commit: 87604be7f3c17ce82cf3512d14b07cc4326e44e5
Parents: 432a3d9
Author: Jonathan Hurley
Authored: Thu Jan 28 23:11:37 2016 -0500
Committer: Jonathan Hurley
Committed: Thu Jan 28 23:13:33 2016 -0500
--
.../SPARK/1.2.0.2.2/package/scripts/params.py | 4 ++-
.../SPARK/configuration/spark-defaults.xml | 4 +--
.../configuration/spark-thrift-sparkconf.xml| 31
3 files changed, 31 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/87604be7/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index a681a5c..a25db6f 100644
---
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -79,7 +79,9 @@ hive_user = status_params.hive_user
spark_group = status_params.spark_group
user_group = status_params.user_group
spark_hdfs_user_dir = format("/user/{spark_user}")
-spark_history_dir = 'hdfs:///spark-history'
+spark_history_dir = "hdfs:///spark-history"
+if 'spark-defaults' in config['configurations'] and
'spark.history.fs.logDirectory' in config['configurations']['spark-defaults']:
+ spark_history_dir =
config['configurations']['spark-defaults']['spark.history.fs.logDirectory']
spark_history_server_pid_file = status_params.spark_history_server_pid_file
spark_thrift_server_pid_file = status_params.spark_thrift_server_pid_file
http://git-wip-us.apache.org/repos/asf/ambari/blob/87604be7/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
index d8af790..1a6552f 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
@@ -31,7 +31,7 @@
spark.history.fs.logDirectory
-{{spark_history_dir}}
+hdfs:///spark-history
Base directory for history spark application log.
@@ -45,7 +45,7 @@
spark.eventLog.dir
-{{spark_history_dir}}
+hdfs:///spark-history
Base directory in which Spark events are logged, if
spark.eventLog.enabled is true.
http://git-wip-us.apache.org/repos/asf/ambari/blob/87604be7/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
index 3b13496..2dbfe51 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -75,14 +75,17 @@
spark.history.fs.logDirectory
{{spark_history_dir}}
+true
- Base directory for history spark application log.
+ Base directory for history spark application log. It is the same value
+ as in spark-defaults.xml.
spark.eventLog.enabled
true
+true
Whether to log Spark events, useful for reconstructing the Web UI after
the application has finished.
@@ -91,8 +94,10 @@
spark.eventLog.dir
{{spark_history_dir}}
+true
- Base directory in which Spark events are logged, if
spark.eventLog.enabled is true.
+ Base directory in which Spark events are logged, if
spark.eventLog.enabled is true. It is
[1/2] ambari git commit: AMBARI-14819 - RU : Storm Topologies stopped running while rolling upgrade (jonathanhurley)
Repository: ambari Updated Branches: refs/heads/trunk d63469935 -> a2f436a61 AMBARI-14819 - RU : Storm Topologies stopped running while rolling upgrade (jonathanhurley) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a2f436a6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a2f436a6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a2f436a6 Branch: refs/heads/trunk Commit: a2f436a610b130799c49fdafa30b11f6de1c8157 Parents: 981ede5 Author: Jonathan Hurley Authored: Wed Jan 27 16:38:32 2016 -0500 Committer: Jonathan Hurley Committed: Thu Jan 28 23:12:48 2016 -0500 -- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 76 1 file changed, 76 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a2f436a6/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml index 33a9b16..660dbe2 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml @@ -747,105 +747,29 @@ - - -scripts/storm_upgrade.py -delete_storm_zookeeper_data - - - -scripts/storm_upgrade.py -delete_storm_local_data - - - - - -Before continuing, please deactivate and kill any currently running topologies. - - - -scripts/storm_upgrade.py -delete_storm_zookeeper_data - - - -scripts/storm_upgrade.py -delete_storm_local_data - - - - - - -scripts/storm_upgrade.py -delete_storm_local_data - - - - - -Before continuing, please deactivate and kill any currently running topologies. - - - -scripts/storm_upgrade.py -delete_storm_local_data - - - - - - -scripts/storm_upgrade.py -delete_storm_local_data - - - - - -scripts/storm_upgrade.py -delete_storm_local_data - - - - - - -scripts/storm_upgrade.py -delete_storm_local_data - - - - - - -Please rebuild your topology using the new Storm version dependencies and resubmit it using the newly created jar. - -
[2/2] ambari git commit: AMBARI-14839 - DEA is not enabled due to configuration conflict and history log directory can not be changed (Jeff Zhang via jonathanhurley)
AMBARI-14839 - DEA is not enabled due to configuration conflict and history log
directory can not be changed (Jeff Zhang via jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/981ede54
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/981ede54
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/981ede54
Branch: refs/heads/trunk
Commit: 981ede5455c02ae1bd4aac7495c2c667bc889dbc
Parents: d634699
Author: Jonathan Hurley
Authored: Thu Jan 28 23:11:37 2016 -0500
Committer: Jonathan Hurley
Committed: Thu Jan 28 23:12:48 2016 -0500
--
.../SPARK/1.2.0.2.2/package/scripts/params.py | 4 ++-
.../SPARK/configuration/spark-defaults.xml | 4 +--
.../configuration/spark-thrift-sparkconf.xml| 31
3 files changed, 31 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/981ede54/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
index 935c47e..abf9191 100644
---
a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/package/scripts/params.py
@@ -86,7 +86,9 @@ hive_user = status_params.hive_user
spark_group = status_params.spark_group
user_group = status_params.user_group
spark_hdfs_user_dir = format("/user/{spark_user}")
-spark_history_dir = 'hdfs:///spark-history'
+spark_history_dir = "hdfs:///spark-history"
+if 'spark-defaults' in config['configurations'] and
'spark.history.fs.logDirectory' in config['configurations']['spark-defaults']:
+ spark_history_dir =
config['configurations']['spark-defaults']['spark.history.fs.logDirectory']
spark_history_server_pid_file = status_params.spark_history_server_pid_file
spark_thrift_server_pid_file = status_params.spark_thrift_server_pid_file
http://git-wip-us.apache.org/repos/asf/ambari/blob/981ede54/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
index d8af790..1a6552f 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-defaults.xml
@@ -31,7 +31,7 @@
spark.history.fs.logDirectory
-{{spark_history_dir}}
+hdfs:///spark-history
Base directory for history spark application log.
@@ -45,7 +45,7 @@
spark.eventLog.dir
-{{spark_history_dir}}
+hdfs:///spark-history
Base directory in which Spark events are logged, if
spark.eventLog.enabled is true.
http://git-wip-us.apache.org/repos/asf/ambari/blob/981ede54/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
index 3b13496..2dbfe51 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -75,14 +75,17 @@
spark.history.fs.logDirectory
{{spark_history_dir}}
+true
- Base directory for history spark application log.
+ Base directory for history spark application log. It is the same value
+ as in spark-defaults.xml.
spark.eventLog.enabled
true
+true
Whether to log Spark events, useful for reconstructing the Web UI after
the application has finished.
@@ -91,8 +94,10 @@
spark.eventLog.dir
{{spark_history_dir}}
+true
- Base directory in which Spark events are logged, if
spark.eventLog.enabled is true.
+ Base directory in which Spark events are logged, if
spark.eventLog.enabled is true. It is the same value
+ as in spark-defaults.xml.
@@ -138,10 +143,26 @@
ambari git commit: AMBARI-14794: Stop HAWQ Cluster Immediate command should be disabled if HAWQMASTER is stopped (adenissov via jaoki)
Repository: ambari
Updated Branches:
refs/heads/trunk b037ef5cf -> d63469935
AMBARI-14794: Stop HAWQ Cluster Immediate command should be disabled if
HAWQMASTER is stopped (adenissov via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d6346993
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d6346993
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d6346993
Branch: refs/heads/trunk
Commit: d63469935d0933af5e625cfea1d581f056055685
Parents: b037ef5
Author: Jun Aoki
Authored: Thu Jan 28 17:42:04 2016 -0800
Committer: Jun Aoki
Committed: Thu Jan 28 17:42:04 2016 -0800
--
ambari-web/app/models/host_component.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d6346993/ambari-web/app/models/host_component.js
--
diff --git a/ambari-web/app/models/host_component.js
b/ambari-web/app/models/host_component.js
index 77395f2..b205d38 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -269,6 +269,7 @@ App.HostComponentActionMap = {
var NN =
ctx.get('controller.content.hostComponents').findProperty('componentName',
'NAMENODE');
var RM =
ctx.get('controller.content.hostComponents').findProperty('componentName',
'RESOURCEMANAGER');
var RA =
ctx.get('controller.content.hostComponents').findProperty('componentName',
'RANGER_ADMIN');
+var HM =
ctx.get('controller.content.hostComponents').findProperty('componentName',
'HAWQMASTER');
var HS =
ctx.get('controller.content.hostComponents').findProperty('componentName',
'HAWQSTANDBY');
return {
RESTART_ALL: {
@@ -378,7 +379,7 @@ App.HostComponentActionMap = {
context:
Em.I18n.t('services.service.actions.run.immediateStopHawqCluster.context'),
label:
Em.I18n.t('services.service.actions.run.immediateStopHawqCluster.context'),
cssClass: 'icon-stop',
-disabled: false
+disabled: !HM || HM.get('workStatus') !=
App.HostComponentStatus.started
},
IMMEDIATE_STOP: {
customCommand: 'IMMEDIATE_STOP',
ambari git commit: AMBARI-14794: Stop HAWQ Cluster Immediate command should be disabled if HAWQMASTER is stopped (adenissov via jaoki)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 3895968b7 -> 432a3d972
AMBARI-14794: Stop HAWQ Cluster Immediate command should be disabled if
HAWQMASTER is stopped (adenissov via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/432a3d97
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/432a3d97
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/432a3d97
Branch: refs/heads/branch-2.2
Commit: 432a3d972f428f6e9624aa5b9173ffde7289e92b
Parents: 3895968
Author: Jun Aoki
Authored: Thu Jan 28 17:41:01 2016 -0800
Committer: Jun Aoki
Committed: Thu Jan 28 17:41:01 2016 -0800
--
ambari-web/app/models/host_component.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/432a3d97/ambari-web/app/models/host_component.js
--
diff --git a/ambari-web/app/models/host_component.js
b/ambari-web/app/models/host_component.js
index b76da20..bc481b5 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -263,6 +263,7 @@ App.HostComponentStatus = {
App.HostComponentActionMap = {
getMap: function(ctx) {
+var HM =
ctx.get('controller.content.hostComponents').findProperty('componentName',
'HAWQMASTER');
var HS =
ctx.get('controller.content.hostComponents').findProperty('componentName',
'HAWQSTANDBY');
return {
RESTART_ALL: {
@@ -372,7 +373,7 @@ App.HostComponentActionMap = {
context:
Em.I18n.t('services.service.actions.run.immediateStopHawqCluster.context'),
label:
Em.I18n.t('services.service.actions.run.immediateStopHawqCluster.context'),
cssClass: 'icon-stop',
-disabled: false
+disabled: !HM || HM.get('workStatus') !=
App.HostComponentStatus.started
},
IMMEDIATE_STOP: {
customCommand: 'IMMEDIATE_STOP',
ambari git commit: AMBARI-14822 Combo Search: Create auto suggest for Host attribute filters (Joe Wang via rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk cad69e613 -> b037ef5cf
AMBARI-14822 Combo Search: Create auto suggest for Host attribute filters (Joe
Wang via rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b037ef5c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b037ef5c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b037ef5c
Branch: refs/heads/trunk
Commit: b037ef5cfc9cfd72126818cf8c5c5e7c3525dc52
Parents: cad69e6
Author: Richard Zang
Authored: Fri Jan 29 08:58:08 2016 +0800
Committer: Richard Zang
Committed: Fri Jan 29 08:58:08 2016 +0800
--
.../controllers/main/host/combo_search_box.js | 30 +++-
ambari-web/app/utils/ajax/ajax.js | 15 ++
.../app/views/main/host/combo_search_box.js | 1 +
ambari-web/vendor/scripts/visualsearch.js | 2 +-
4 files changed, 34 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b037ef5c/ambari-web/app/controllers/main/host/combo_search_box.js
--
diff --git a/ambari-web/app/controllers/main/host/combo_search_box.js
b/ambari-web/app/controllers/main/host/combo_search_box.js
index 3832611..1c2a87f 100644
--- a/ambari-web/app/controllers/main/host/combo_search_box.js
+++ b/ambari-web/app/controllers/main/host/combo_search_box.js
@@ -21,6 +21,7 @@ var App = require('app');
App.MainHostComboSearchBoxController = Em.Controller.extend({
name: 'mainHostComboSearchBoxController',
currentSuggestion: [],
+ page_size: 10,
VSCallbacks : {
search: function (query, searchCollection) {
@@ -42,12 +43,12 @@ App.MainHostComboSearchBoxController =
Em.Controller.extend({
},
facetMatches: function (callback) {
- console.log('called');
callback([
-{label: 'name', category: 'Host'},
+{label: 'host_name', category: 'Host'},
{label: 'ip', category: 'Host'},
{label: 'version', category: 'Host'},
{label: 'health', category: 'Host'},
+{label: 'rack', category: 'Host'},
{label: 'service', category: 'Service'},
{label: 'component', category: 'Service'},
{label: 'state', category: 'Service'}
@@ -57,13 +58,11 @@ App.MainHostComboSearchBoxController =
Em.Controller.extend({
valueMatches: function (facet, searchTerm, callback) {
var controller = App.router.get('mainHostComboSearchBoxController');
switch (facet) {
-case 'name':
- controller.getHostPropertySuggestions('name',
searchTerm).done(function() {
-callback(controller.get('currentSuggestion'));
- });
- break;
+case 'host_name':
case 'ip':
- callback(App.Host.find().toArray().mapProperty('ip'));
+ controller.getPropertySuggestions(facet, searchTerm).done(function()
{
+callback(controller.get('currentSuggestion'), {preserveMatches:
true});
+ });
break;
case 'rack':
callback(App.Host.find().toArray().mapProperty('rack').uniq());
@@ -104,18 +103,23 @@ App.MainHostComboSearchBoxController =
Em.Controller.extend({
}
},
- getHostPropertySuggestions: function(facet, searchTerm) {
+ getPropertySuggestions: function(facet, searchTerm) {
return App.ajax.send({
- name: 'hosts.all.install',
+ name: 'hosts.with_searchTerm',
sender: this,
- success: 'updateHostNameSuggestion',
+ data: {
+facet: facet,
+searchTerm: searchTerm,
+page_size: this.get('page_size')
+ },
+ success: 'getPropertySuggestionsSuccess',
error: 'commonSuggestionErrorCallback'
});
},
- updateHostNameSuggestion: function(data) {
+ getPropertySuggestionsSuccess: function(data, opt, params) {
this.updateSuggestion(data.items.map(function(item) {
- return item.Hosts.host_name;
+ return item.Hosts[params.facet];
}));
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/b037ef5c/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index df3782f..4d8d195 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2358,6 +2358,21 @@ var urls = {
'real':
'/clusters/{clusterName}/hosts?fields=Hosts/cpu_count,Hosts/disk_info,Hosts/total_mem,Hosts/os_type,Hosts/os_arch,Hosts/ip,host_components/HostRoles/state&minimal_response=true',
'mock': '/data/hosts/HDP2/hosts.json'
},
+ 'hosts.with_searchTerm': {
+'real':
'/clusters/{clusterName}/hosts?fields=Hosts/{facet}&minimal_response=true&page_size={page_size}',
+'mock': '',
+f
ambari git commit: Revert "AMBARI-14822 Combo Search: Create auto suggest for Host attribute filters (Joe Wang via rzang)"
Repository: ambari
Updated Branches:
refs/heads/trunk 5e09053de -> cad69e613
Revert "AMBARI-14822 Combo Search: Create auto suggest for Host attribute
filters (Joe Wang via rzang)"
This reverts commit 5e09053deb0700b09ced4f8f12902ff2ea60154a.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cad69e61
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cad69e61
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cad69e61
Branch: refs/heads/trunk
Commit: cad69e6132b554386e82d45950fc1b302f689af7
Parents: 5e09053
Author: Richard Zang
Authored: Fri Jan 29 08:51:50 2016 +0800
Committer: Richard Zang
Committed: Fri Jan 29 08:51:50 2016 +0800
--
.../main/admin/stack_and_upgrade_controller.js | 22 ++--
ambari-web/app/messages.js | 2 --
.../stack_upgrade/stack_upgrade_wizard.hbs | 8 +++
ambari-web/app/utils/ajax/ajax.js | 3 ---
4 files changed, 6 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/cad69e61/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 16a58d6..f80c5ea 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -553,15 +553,13 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
* abort upgrade (in order to start Downgrade)
*/
abortUpgrade: function () {
-var errorCallback = this.get('isDowngrade') ?
'abortDowngradeErrorCallback' : 'abortUpgradeErrorCallback';
return App.ajax.send({
name: 'admin.upgrade.abort',
sender: this,
data: {
-upgradeId: this.get('upgradeId'),
-isDowngrade: this.get('isDowngrade')
+upgradeId: this.get('upgradeId')
},
- error: errorCallback
+ error: 'abortUpgradeErrorCallback'
});
},
@@ -581,22 +579,6 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
App.showAlertPopup(header, body);
},
- /**
- * error callback of abortDowngrade()
- * @param {object} data
- */
- abortDowngradeErrorCallback: function (data) {
-var header = Em.I18n.t('admin.stackDowngrade.state.paused.fail.header');
-var body = Em.I18n.t('admin.stackDowngrade.state.paused.fail.body');
-if(data && data.responseText){
- try {
-var json = $.parseJSON(data.responseText);
-body = body + ' ' + json.message;
- } catch (err) {}
-}
-App.showAlertPopup(header, body);
- },
-
retryUpgrade: function () {
this.setProperties({
requestInProgress: true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/cad69e61/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 916ca2a..d6ecbf3 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1497,8 +1497,6 @@ Em.I18n.translations = {
'admin.stackVersions.version.downgrade.suspended': "Downgrade: Paused",
'admin.stackUpgrade.state.paused.fail.header': "Pause Upgrade failed",
'admin.stackUpgrade.state.paused.fail.body': "Upgrade could not be paused.
Try again later.",
- 'admin.stackDowngrade.state.paused.fail.header': "Pause Downgrade failed",
- 'admin.stackDowngrade.state.paused.fail.body': "Downgrade could not be
paused. Try again later.",
'admin.stackVersions.version.upgrade.upgradeOptions.header': "Upgrade
Options",
'admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.version': "You
are about to perform an upgrade to {0}.",
http://git-wip-us.apache.org/repos/asf/ambari/blob/cad69e61/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
--
diff --git
a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index 02022cf..a13e2c2 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -81,7 +81,7 @@
{{t common.downgrade}}
{{/if}}
{{#if isDowngrade}}
-{{t admin.stackUpgrade.pauseDowngrade}}
+{{t admin.stackUpgrade.pauseDowngrade}}
{{else}}
{{t admin.stackUpgrade.pauseUp
ambari git commit: AMBARI-14822 Combo Search: Create auto suggest for Host attribute filters (Joe Wang via rzang)
Repository: ambari
Updated Branches:
refs/heads/trunk c9e51380b -> 5e09053de
AMBARI-14822 Combo Search: Create auto suggest for Host attribute filters (Joe
Wang via rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5e09053d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5e09053d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5e09053d
Branch: refs/heads/trunk
Commit: 5e09053deb0700b09ced4f8f12902ff2ea60154a
Parents: c9e5138
Author: Richard Zang
Authored: Fri Jan 29 08:37:44 2016 +0800
Committer: Richard Zang
Committed: Fri Jan 29 08:37:44 2016 +0800
--
.../main/admin/stack_and_upgrade_controller.js | 22 ++--
ambari-web/app/messages.js | 2 ++
.../stack_upgrade/stack_upgrade_wizard.hbs | 8 +++
ambari-web/app/utils/ajax/ajax.js | 3 +++
4 files changed, 29 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e09053d/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index f80c5ea..16a58d6 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -553,13 +553,15 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
* abort upgrade (in order to start Downgrade)
*/
abortUpgrade: function () {
+var errorCallback = this.get('isDowngrade') ?
'abortDowngradeErrorCallback' : 'abortUpgradeErrorCallback';
return App.ajax.send({
name: 'admin.upgrade.abort',
sender: this,
data: {
-upgradeId: this.get('upgradeId')
+upgradeId: this.get('upgradeId'),
+isDowngrade: this.get('isDowngrade')
},
- error: 'abortUpgradeErrorCallback'
+ error: errorCallback
});
},
@@ -579,6 +581,22 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
App.showAlertPopup(header, body);
},
+ /**
+ * error callback of abortDowngrade()
+ * @param {object} data
+ */
+ abortDowngradeErrorCallback: function (data) {
+var header = Em.I18n.t('admin.stackDowngrade.state.paused.fail.header');
+var body = Em.I18n.t('admin.stackDowngrade.state.paused.fail.body');
+if(data && data.responseText){
+ try {
+var json = $.parseJSON(data.responseText);
+body = body + ' ' + json.message;
+ } catch (err) {}
+}
+App.showAlertPopup(header, body);
+ },
+
retryUpgrade: function () {
this.setProperties({
requestInProgress: true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e09053d/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index d6ecbf3..916ca2a 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1497,6 +1497,8 @@ Em.I18n.translations = {
'admin.stackVersions.version.downgrade.suspended': "Downgrade: Paused",
'admin.stackUpgrade.state.paused.fail.header': "Pause Upgrade failed",
'admin.stackUpgrade.state.paused.fail.body': "Upgrade could not be paused.
Try again later.",
+ 'admin.stackDowngrade.state.paused.fail.header': "Pause Downgrade failed",
+ 'admin.stackDowngrade.state.paused.fail.body': "Downgrade could not be
paused. Try again later.",
'admin.stackVersions.version.upgrade.upgradeOptions.header': "Upgrade
Options",
'admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.version': "You
are about to perform an upgrade to {0}.",
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e09053d/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
--
diff --git
a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index a13e2c2..02022cf 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -81,7 +81,7 @@
{{t common.downgrade}}
{{/if}}
{{#if isDowngrade}}
-{{t admin.stackUpgrade.pauseDowngrade}}
+{{t admin.stackUpgrade.pauseDowngrade}}
{{else}}
{{t admin.stackUpgrade.pauseUpgrade}}
{{/if}}
@@ -108,7 +108,7 @@
ambari git commit: AMBARI-14836. RU/EU from HDP 2.3 to 2.4 fails on HDFS Balancer command if NN HA since config dfs.namenode.rpc-address needs to be deleted (alejandro)
Repository: ambari Updated Branches: refs/heads/branch-2.2.1 f30bd1b45 -> 6f982173d AMBARI-14836. RU/EU from HDP 2.3 to 2.4 fails on HDFS Balancer command if NN HA since config dfs.namenode.rpc-address needs to be deleted (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6f982173 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f982173 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f982173 Branch: refs/heads/branch-2.2.1 Commit: 6f982173da908a48c439c67499303823fe9a50fb Parents: f30bd1b Author: Alejandro Fernandez Authored: Thu Jan 28 15:01:11 2016 -0800 Committer: Alejandro Fernandez Committed: Thu Jan 28 15:01:11 2016 -0800 -- .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 5 + .../resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml| 4 .../resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 11 +++ 3 files changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/6f982173/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml index ee83348..9b36ec9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml @@ -268,6 +268,11 @@ true false + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/6f982173/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml index 0366fc4..4ce6dc3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml @@ -436,6 +436,10 @@ + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/6f982173/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml index 0145f3b..5949486 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml @@ -20,6 +20,17 @@ + + + + +hdfs-site + + + + + +
ambari git commit: AMBARI-14836. RU/EU from HDP 2.3 to 2.4 fails on HDFS Balancer command if NN HA since config dfs.namenode.rpc-address needs to be deleted (alejandro)
Repository: ambari Updated Branches: refs/heads/trunk 195a35953 -> c9e51380b AMBARI-14836. RU/EU from HDP 2.3 to 2.4 fails on HDFS Balancer command if NN HA since config dfs.namenode.rpc-address needs to be deleted (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9e51380 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9e51380 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9e51380 Branch: refs/heads/trunk Commit: c9e51380bdb155dcb4f4f1885dfa739c6c6a6445 Parents: 195a359 Author: Alejandro Fernandez Authored: Thu Jan 28 12:54:34 2016 -0800 Committer: Alejandro Fernandez Committed: Thu Jan 28 15:00:11 2016 -0800 -- .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 5 + .../resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml| 4 .../resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 11 +++ 3 files changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c9e51380/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml index 3d65252..6154634 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml @@ -268,6 +268,11 @@ true false + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/c9e51380/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml index f248293..33a9b16 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml @@ -436,6 +436,10 @@ + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/c9e51380/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml index 0145f3b..5949486 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml @@ -20,6 +20,17 @@ + + + + +hdfs-site + + + + + +
ambari git commit: AMBARI-14836. RU/EU from HDP 2.3 to 2.4 fails on HDFS Balancer command if NN HA since config dfs.namenode.rpc-address needs to be deleted (alejandro)
Repository: ambari Updated Branches: refs/heads/branch-2.2 dffc6ddd7 -> 3895968b7 AMBARI-14836. RU/EU from HDP 2.3 to 2.4 fails on HDFS Balancer command if NN HA since config dfs.namenode.rpc-address needs to be deleted (alejandro) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3895968b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3895968b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3895968b Branch: refs/heads/branch-2.2 Commit: 3895968b72ab278812cce7abc6d86a62adec490e Parents: dffc6dd Author: Alejandro Fernandez Authored: Thu Jan 28 12:50:31 2016 -0800 Committer: Alejandro Fernandez Committed: Thu Jan 28 14:59:08 2016 -0800 -- .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 5 + .../resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml| 4 .../resources/stacks/HDP/2.4/upgrades/config-upgrade.xml | 11 +++ 3 files changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/3895968b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml index ee83348..9b36ec9 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml @@ -268,6 +268,11 @@ true false + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/3895968b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml index f248293..33a9b16 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml @@ -436,6 +436,10 @@ + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/3895968b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml index 0145f3b..5949486 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml @@ -20,6 +20,17 @@ + + + + +hdfs-site + + + + + +
ambari git commit: AMBARI-12597. Ambari should support custom stack names (Sumit Mohanty via alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 c573c142f -> dffc6ddd7
AMBARI-12597. Ambari should support custom stack names (Sumit Mohanty via
alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dffc6ddd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dffc6ddd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dffc6ddd
Branch: refs/heads/branch-2.2
Commit: dffc6ddd77592deaa6af09b9aab17cdaadd1616c
Parents: c573c14
Author: Alejandro Fernandez
Authored: Thu Jan 28 14:52:26 2016 -0800
Committer: Alejandro Fernandez
Committed: Thu Jan 28 14:52:26 2016 -0800
--
.../orm/entities/RepositoryVersionEntity.java | 2 +-
.../ambari/server/stack/ServiceDirectory.java | 4 ++-
.../ambari/server/stack/StackDirectory.java | 12 ---
.../ambari/server/utils/VersionUtils.java | 34 +---
.../RepositoryVersionResourceProviderTest.java | 17 ++
.../ambari/server/utils/TestVersionUtils.java | 3 ++
6 files changed, 62 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dffc6ddd/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index cfe7901..b1e54de 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -269,7 +269,7 @@ public class RepositoryVersionEntity {
String leading = stackId.getStackVersion(); // E.g, 2.3
// In some cases during unit tests, the leading can contain 3 digits,
so only the major number (first two parts) are needed.
-String[] leadingParts = leading.split(".");
+String[] leadingParts = leading.split("\\.");
if (null != leadingParts && leadingParts.length > 2) {
leading = leadingParts[0] + "." + leadingParts[1];
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/dffc6ddd/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
index 25c2260..d574d60 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceDirectory.java
@@ -215,7 +215,9 @@ public abstract class ServiceDirectory extends
StackDefinitionDirectory {
} catch (JAXBException e) {
metaInfoXml = new ServiceMetainfoXml();
metaInfoXml.setValid(false);
- metaInfoXml.setErrors(String.format("Unable to parse service
metainfo.xml file '%s' ", f.getAbsolutePath()));
+ String msg = String.format("Unable to parse service metainfo.xml file
'%s' ", f.getAbsolutePath());
+ metaInfoXml.setErrors(msg);
+ LOG.warn(msg);
metaInfoXml.setSchemaVersion(getAbsolutePath().replace(f.getParentFile().getParentFile().getParent()+File.separator,
""));
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/dffc6ddd/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
index 1aecde9..c552e41 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackDirectory.java
@@ -337,8 +337,10 @@ public class StackDirectory extends
StackDefinitionDirectory {
} catch (JAXBException e) {
repoFile = new RepositoryXml();
repoFile.setValid(false);
- repoFile.setErrors("Unable to parse repo file at location: " +
- repositoryFile.getAbsolutePath());
+ String msg = "Unable to parse repo file at location: " +
+ repositoryFile.getAbsolutePath();
+ repoFile.setErrors(msg);
+ LOG.warn(msg);
}
}
}
@@ -371,8 +373,10 @@ public class StackDirectory extends
StackDefinitionDirectory {
} catch (JAXBException e) {
metaInfoXml = new StackMetainfoXml();
metaInfoXml.setValid(false);
-
ambari git commit: AMBARI-14831. Upgrading ambari-server from 2.0.1 to 2.2.0 sets incorrect value for "storm.zookeeper.superACL".(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk e72a6b466 -> 195a35953
AMBARI-14831. Upgrading ambari-server from 2.0.1 to 2.2.0 sets incorrect value
for "storm.zookeeper.superACL".(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/195a3595
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/195a3595
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/195a3595
Branch: refs/heads/trunk
Commit: 195a35953606263d2810b10a731f3b295aa29a60
Parents: e72a6b4
Author: Vitaly Brodetskyi
Authored: Thu Jan 28 21:29:15 2016 +0200
Committer: Vitaly Brodetskyi
Committed: Thu Jan 28 21:29:15 2016 +0200
--
.../ambari/server/upgrade/UpgradeCatalog210.java | 4 +---
.../ambari/server/upgrade/UpgradeCatalog222.java | 15 +++
.../ambari/server/upgrade/UpgradeCatalog222Test.java | 6 --
3 files changed, 20 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/195a3595/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index 7940e02..faf4b96 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -24,7 +24,6 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.inject.Inject;
import com.google.inject.Injector;
-import com.google.inject.persist.Transactional;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -47,7 +46,6 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.StackId;
-import
org.apache.ambari.server.state.kerberos.AbstractKerberosDescriptorContainer;
import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
@@ -1648,7 +1646,7 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
newStormProps.put("nimbus.supervisors.users",
"['{{storm_user}}']");
}
if
(!cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("storm.zookeeper.superACL"))
{
- newStormProps.put("storm.zookeeper.superACL",
"sasl:{{storm_base_jaas_principal}}");
+ newStormProps.put("storm.zookeeper.superACL",
"sasl:{{storm_bare_jaas_principal}}");
}
if
(!cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("ui.filter.params"))
{
newStormProps.put("ui.filter.params", "{'type': 'kerberos',
'kerberos.principal': '{{storm_ui_jaas_principal}}', 'kerberos.keytab':
'{{storm_ui_keytab_path}}', 'kerberos.name.rules': 'DEFAULT'}");
http://git-wip-us.apache.org/repos/asf/ambari/blob/195a3595/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
index bcbbf41..22f6a39 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.SQLException;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -97,7 +98,21 @@ public class UpgradeCatalog222 extends
AbstractUpgradeCatalog {
protected void executeDMLUpdates() throws AmbariException, SQLException {
addNewConfigurationsFromXml();
updateAlerts();
+updateStormConfigs();
+ }
+
+ protected void updateStormConfigs() throws AmbariException {
+AmbariManagementController ambariManagementController =
injector.getInstance(AmbariManagementController.class);
+Map clusterMap =
getCheckedClusterMap(ambariManagementController.getClusters());
+for (final Cluster cluster : clusterMap.values()) {
+ if (cluster.getDesiredConfigByType("storm-site") != null &&
cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("storm.zookeeper.superACL")
ambari git commit: AMBARI-14831. Upgrading ambari-server from 2.0.1 to 2.2.0 sets incorrect value for "storm.zookeeper.superACL".(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 b6a591a60 -> c573c142f
AMBARI-14831. Upgrading ambari-server from 2.0.1 to 2.2.0 sets incorrect value
for "storm.zookeeper.superACL".(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c573c142
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c573c142
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c573c142
Branch: refs/heads/branch-2.2
Commit: c573c142f63f5b6b98d2bfc65c32b2788e7cf5ce
Parents: b6a591a
Author: Vitaly Brodetskyi
Authored: Thu Jan 28 21:27:34 2016 +0200
Committer: Vitaly Brodetskyi
Committed: Thu Jan 28 21:27:34 2016 +0200
--
.../ambari/server/upgrade/UpgradeCatalog210.java | 4 +---
.../ambari/server/upgrade/UpgradeCatalog222.java | 15 +++
.../ambari/server/upgrade/UpgradeCatalog222Test.java | 6 --
3 files changed, 20 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c573c142/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index 7940e02..faf4b96 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -24,7 +24,6 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.inject.Inject;
import com.google.inject.Injector;
-import com.google.inject.persist.Transactional;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -47,7 +46,6 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.StackId;
-import
org.apache.ambari.server.state.kerberos.AbstractKerberosDescriptorContainer;
import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
@@ -1648,7 +1646,7 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
newStormProps.put("nimbus.supervisors.users",
"['{{storm_user}}']");
}
if
(!cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("storm.zookeeper.superACL"))
{
- newStormProps.put("storm.zookeeper.superACL",
"sasl:{{storm_base_jaas_principal}}");
+ newStormProps.put("storm.zookeeper.superACL",
"sasl:{{storm_bare_jaas_principal}}");
}
if
(!cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("ui.filter.params"))
{
newStormProps.put("ui.filter.params", "{'type': 'kerberos',
'kerberos.principal': '{{storm_ui_jaas_principal}}', 'kerberos.keytab':
'{{storm_ui_keytab_path}}', 'kerberos.name.rules': 'DEFAULT'}");
http://git-wip-us.apache.org/repos/asf/ambari/blob/c573c142/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
index bcbbf41..22f6a39 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog222.java
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.sql.SQLException;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -97,7 +98,21 @@ public class UpgradeCatalog222 extends
AbstractUpgradeCatalog {
protected void executeDMLUpdates() throws AmbariException, SQLException {
addNewConfigurationsFromXml();
updateAlerts();
+updateStormConfigs();
+ }
+
+ protected void updateStormConfigs() throws AmbariException {
+AmbariManagementController ambariManagementController =
injector.getInstance(AmbariManagementController.class);
+Map clusterMap =
getCheckedClusterMap(ambariManagementController.getClusters());
+for (final Cluster cluster : clusterMap.values()) {
+ if (cluster.getDesiredConfigByType("storm-site") != null &&
cluster.getDesiredConfigByType("storm-site").getProperties().containsKey("storm.zookeeper.
ambari git commit: AMBARI-14713: Service checks for PXF using HDFS and HBase (nalex via jaoki)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 dcb7d4524 -> b6a591a60
AMBARI-14713: Service checks for PXF using HDFS and HBase (nalex via jaoki)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b6a591a6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b6a591a6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b6a591a6
Branch: refs/heads/branch-2.2
Commit: b6a591a607b9d49a66619b5103fd037d2a838810
Parents: dcb7d45
Author: Jun Aoki
Authored: Thu Jan 28 13:41:19 2016 -0800
Committer: Jun Aoki
Committed: Thu Jan 28 13:41:19 2016 -0800
--
.../common-services/PXF/3.0.0/metainfo.xml | 6 +
.../PXF/3.0.0/package/scripts/params.py | 31 ++-
.../PXF/3.0.0/package/scripts/pxf_constants.py | 26 ++
.../PXF/3.0.0/package/scripts/pxf_utils.py | 49
.../PXF/3.0.0/package/scripts/service_check.py | 266 +++
5 files changed, 377 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b6a591a6/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml
index cb2411c..1797b29 100644
--- a/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/PXF/3.0.0/metainfo.xml
@@ -66,6 +66,12 @@
+
+scripts/service_check.py
+PYTHON
+300
+
+
pxf-profiles
pxf-public-classpath
http://git-wip-us.apache.org/repos/asf/ambari/blob/b6a591a6/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
index 1d77787..36dc7c1 100644
---
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/params.py
@@ -16,17 +16,23 @@ See the License for the specific language governing
permissions and
limitations under the License.
"""
+import os
+import functools
+
from resource_management import Script
+from resource_management.libraries.functions.default import default
+from resource_management.libraries.functions import get_kinit_path
+from resource_management.libraries.resources.hdfs_resource import HdfsResource
config = Script.get_config()
-
pxf_service_name = "pxf-service"
stack_name = str(config["hostLevelParams"]["stack_name"])
# Users and Groups
pxf_user = "pxf"
pxf_group = pxf_user
+hdfs_superuser = config['configurations']['hadoop-env']['hdfs_user']
hdfs_superuser_group =
config["configurations"]["hdfs-site"]["dfs.permissions.superusergroup"]
user_group = config["configurations"]["cluster-env"]["user_group"]
tomcat_group = "tomcat"
@@ -44,3 +50,26 @@ default_exec_timeout = 600
# security related
security_enabled = config['configurations']['cluster-env']['security_enabled']
realm_name = config['configurations']['kerberos-env']['realm']
+
+#HBase
+is_hbase_installed = default("/clusterHostInfo/hbase_master_hosts", None) is
not None
+
+# HDFS
+hdfs_site = config['configurations']['hdfs-site']
+default_fs = config['configurations']['core-site']['fs.defaultFS']
+
+security_enabled = config['configurations']['cluster-env']['security_enabled']
+hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
+kinit_path_local =
get_kinit_path(default('/configurations/kerberos-env/executable_search_paths',
None))
+hdfs_principal_name =
config['configurations']['hadoop-env']['hdfs_principal_name']
+
+# HDFSResource partial function
+HdfsResource = functools.partial(HdfsResource,
+user=hdfs_superuser,
+security_enabled=security_enabled,
+keytab=hdfs_user_keytab,
+kinit_path_local=kinit_path_local,
+principal_name=hdfs_principal_name,
+hdfs_site=hdfs_site,
+default_fs=default_fs)
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/b6a591a6/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
--
diff --git
a/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
b/ambari-server/src/main/resources/common-services/PXF/3.0.0/package/scripts/pxf_constants.py
new file mode 100644
index 000..3138379
--- /dev/null
+++
b/ambari-server/src/main/resources/c
ambari git commit: AMBARI-14825 Metrics collector fails to start after upgrade to 2.2.1 on a secure cluster (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2.1 82ac1c302 -> f30bd1b45
AMBARI-14825 Metrics collector fails to start after upgrade to 2.2.1 on a
secure cluster (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f30bd1b4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f30bd1b4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f30bd1b4
Branch: refs/heads/branch-2.2.1
Commit: f30bd1b45b8ff05fa5f39ccaaf5e433c0dc6473d
Parents: 82ac1c3
Author: Dmytro Sen
Authored: Thu Jan 28 20:06:20 2016 +0200
Committer: Dmytro Sen
Committed: Thu Jan 28 20:11:29 2016 +0200
--
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java | 1 +
.../org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java | 4
2 files changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f30bd1b4/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
index 98789db..2adc8b9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
@@ -163,6 +163,7 @@ public class UpgradeCatalog221 extends
AbstractUpgradeCatalog {
updateOozieConfigs();
updateTezConfigs();
updateRangerKmsDbksConfigs();
+updateAMSConfigs();
}
protected void updateAlerts() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/f30bd1b4/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
index cee8c90..906167e 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
@@ -155,6 +155,7 @@ public class UpgradeCatalog221Test {
Method updateOozieConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateOozieConfigs");
Method updateTezConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateTezConfigs");
Method updateRangerKmsDbksConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateRangerKmsDbksConfigs");
+Method updateAMSConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateAMSConfigs");
UpgradeCatalog221 upgradeCatalog221 =
createMockBuilder(UpgradeCatalog221.class)
.addMockedMethod(addNewConfigurationsFromXml)
@@ -162,6 +163,7 @@ public class UpgradeCatalog221Test {
.addMockedMethod(updateOozieConfigs)
.addMockedMethod(updateTezConfigs)
.addMockedMethod(updateRangerKmsDbksConfigs)
+ .addMockedMethod(updateAMSConfigs)
.createMock();
upgradeCatalog221.addNewConfigurationsFromXml();
@@ -174,6 +176,8 @@ public class UpgradeCatalog221Test {
expectLastCall().once();
upgradeCatalog221.updateRangerKmsDbksConfigs();
expectLastCall().once();
+upgradeCatalog221.updateAMSConfigs();
+expectLastCall().once();
replay(upgradeCatalog221);
ambari git commit: AMBARI-14825 Metrics collector fails to start after upgrade to 2.2.1 on a secure cluster (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 22d12b877 -> dcb7d4524
AMBARI-14825 Metrics collector fails to start after upgrade to 2.2.1 on a
secure cluster (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dcb7d452
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dcb7d452
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dcb7d452
Branch: refs/heads/branch-2.2
Commit: dcb7d4524caab258ff778cc6433fde017b2098eb
Parents: 22d12b8
Author: Dmytro Sen
Authored: Thu Jan 28 20:04:06 2016 +0200
Committer: Dmytro Sen
Committed: Thu Jan 28 20:06:20 2016 +0200
--
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java | 1 +
.../org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java | 4
2 files changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcb7d452/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
index 98789db..2adc8b9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
@@ -163,6 +163,7 @@ public class UpgradeCatalog221 extends
AbstractUpgradeCatalog {
updateOozieConfigs();
updateTezConfigs();
updateRangerKmsDbksConfigs();
+updateAMSConfigs();
}
protected void updateAlerts() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/dcb7d452/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
index cee8c90..906167e 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
@@ -155,6 +155,7 @@ public class UpgradeCatalog221Test {
Method updateOozieConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateOozieConfigs");
Method updateTezConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateTezConfigs");
Method updateRangerKmsDbksConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateRangerKmsDbksConfigs");
+Method updateAMSConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateAMSConfigs");
UpgradeCatalog221 upgradeCatalog221 =
createMockBuilder(UpgradeCatalog221.class)
.addMockedMethod(addNewConfigurationsFromXml)
@@ -162,6 +163,7 @@ public class UpgradeCatalog221Test {
.addMockedMethod(updateOozieConfigs)
.addMockedMethod(updateTezConfigs)
.addMockedMethod(updateRangerKmsDbksConfigs)
+ .addMockedMethod(updateAMSConfigs)
.createMock();
upgradeCatalog221.addNewConfigurationsFromXml();
@@ -174,6 +176,8 @@ public class UpgradeCatalog221Test {
expectLastCall().once();
upgradeCatalog221.updateRangerKmsDbksConfigs();
expectLastCall().once();
+upgradeCatalog221.updateAMSConfigs();
+expectLastCall().once();
replay(upgradeCatalog221);
ambari git commit: AMBARI-14825 Metrics collector fails to start after upgrade to 2.2.1 on a secure cluster (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk f10d41ccb -> e72a6b466
AMBARI-14825 Metrics collector fails to start after upgrade to 2.2.1 on a
secure cluster (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e72a6b46
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e72a6b46
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e72a6b46
Branch: refs/heads/trunk
Commit: e72a6b4665bceb472a1cc1d9a2080b741d1cb560
Parents: f10d41c
Author: Dmytro Sen
Authored: Thu Jan 28 20:04:06 2016 +0200
Committer: Dmytro Sen
Committed: Thu Jan 28 20:04:06 2016 +0200
--
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java | 1 +
.../org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java | 4
2 files changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e72a6b46/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
index 4eebb66..13ec345 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
@@ -163,6 +163,7 @@ public class UpgradeCatalog221 extends
AbstractUpgradeCatalog {
updateOozieConfigs();
updateTezConfigs();
updateRangerKmsDbksConfigs();
+updateAMSConfigs();
}
protected void updateAlerts() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/e72a6b46/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
index 5a14bc9..c15fbd8 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog221Test.java
@@ -144,6 +144,7 @@ public class UpgradeCatalog221Test {
Method updateOozieConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateOozieConfigs");
Method updateTezConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateTezConfigs");
Method updateRangerKmsDbksConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateRangerKmsDbksConfigs");
+Method updateAMSConfigs =
UpgradeCatalog221.class.getDeclaredMethod("updateAMSConfigs");
UpgradeCatalog221 upgradeCatalog221 =
createMockBuilder(UpgradeCatalog221.class)
.addMockedMethod(addNewConfigurationsFromXml)
@@ -151,6 +152,7 @@ public class UpgradeCatalog221Test {
.addMockedMethod(updateOozieConfigs)
.addMockedMethod(updateTezConfigs)
.addMockedMethod(updateRangerKmsDbksConfigs)
+ .addMockedMethod(updateAMSConfigs)
.createMock();
upgradeCatalog221.addNewConfigurationsFromXml();
@@ -163,6 +165,8 @@ public class UpgradeCatalog221Test {
expectLastCall().once();
upgradeCatalog221.updateRangerKmsDbksConfigs();
expectLastCall().once();
+upgradeCatalog221.updateAMSConfigs();
+expectLastCall().once();
replay(upgradeCatalog221);
ambari git commit: AMBARI-14829 Memory leak on Alerts page. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk d057581b5 -> f10d41ccb
AMBARI-14829 Memory leak on Alerts page. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f10d41cc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f10d41cc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f10d41cc
Branch: refs/heads/trunk
Commit: f10d41ccbc935cdad2627f51a7b3ddba38190abf
Parents: d057581
Author: ababiichuk
Authored: Thu Jan 28 16:01:19 2016 +0200
Committer: ababiichuk
Committed: Thu Jan 28 16:01:19 2016 +0200
--
.../main/alert_definitions_controller.js| 41
.../mappers/alert_definition_summary_mapper.js | 8 ++-
.../app/models/alerts/alert_definition.js | 1 +
ambari-web/app/templates/main/alerts.hbs| 32 ++
.../alert_definition/alert_definition_state.hbs | 31 ++
.../alert_definition_summary.hbs| 28 +
ambari-web/app/utils/ember_reopen.js| 14 +
ambari-web/app/views.js | 2 +
ambari-web/app/views/common/sort_view.js| 19 +-
.../app/views/main/alert_definitions_view.js| 23 +--
.../alert_definition/alert_definition_state.js | 34 ++
.../alert_definition_summary.js | 65
12 files changed, 245 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f10d41cc/ambari-web/app/controllers/main/alert_definitions_controller.js
--
diff --git a/ambari-web/app/controllers/main/alert_definitions_controller.js
b/ambari-web/app/controllers/main/alert_definitions_controller.js
index 58eecf5..0cfff21 100644
--- a/ambari-web/app/controllers/main/alert_definitions_controller.js
+++ b/ambari-web/app/controllers/main/alert_definitions_controller.js
@@ -28,6 +28,8 @@ App.MainAlertDefinitionsController =
Em.ArrayController.extend({
*/
showFilterConditionsFirstLoad: false,
+ contentUpdater: null,
+
/**
* List of all App.AlertDefinition
* @type {App.AlertDefinition[]}
@@ -35,6 +37,45 @@ App.MainAlertDefinitionsController =
Em.ArrayController.extend({
content: App.AlertDefinition.find(),
/**
+ * Generates key for alert summary that represents current state
+ */
+ getSummaryCache: function () {
+var res = '';
+this.get('content').forEach(function(o) {
+ var summary = o.get('summary');
+ o.get('order').forEach(function (state) {
+res += summary[state] ? summary[state].count +
summary[state].maintenanceCount : 0;
+ });
+});
+
+return res;
+ },
+
+ generateCacheByKey: function(key) {
+if (key === 'summary') {
+ return this.getSummaryCache();
+}
+
+return this.get('content').mapProperty(key).join('');
+ },
+
+ contentWasChanged: function(key) {
+var updatedCache = this.generateCacheByKey(key);
+if (this.get('cache.' + key) !== updatedCache) {
+ this.set('cache.' + key, updatedCache);
+ this.propertyDidChange('contentUpdater');
+}
+ },
+
+ cache: {
+'label': '',
+'summary': '',
+'serviceName': '',
+'lastTriggered': '',
+'enabled': ''
+ },
+
+ /**
* Enable/disable alertDefinition confirmation popup
* @param {object} event
* @method toggleState
http://git-wip-us.apache.org/repos/asf/ambari/blob/f10d41cc/ambari-web/app/mappers/alert_definition_summary_mapper.js
--
diff --git a/ambari-web/app/mappers/alert_definition_summary_mapper.js
b/ambari-web/app/mappers/alert_definition_summary_mapper.js
index 3977518..69f1b16 100644
--- a/ambari-web/app/mappers/alert_definition_summary_mapper.js
+++ b/ambari-web/app/mappers/alert_definition_summary_mapper.js
@@ -56,6 +56,9 @@ App.alertDefinitionSummaryMapper =
App.QuickDataMapper.create({
alertDefinitions.forEach(function (d) {
var id = d.get('id');
+ if ((alertDefinitionsMap[id].get('stateManager.currentState.name') !==
'saved')) {
+alertDefinitionsMap[id].get('stateManager').transitionTo('saved');
+ }
alertDefinitionsMap[id].setProperties(summaryMap[id]);
if (!alertDefinitionsMap[id].get('enabled')) {
// clear summary for disabled alert definitions
@@ -89,7 +92,10 @@ App.alertDefinitionSummaryMapper =
App.QuickDataMapper.create({
});
}
});
-
+if (!$.mocho) {
+ //for some reasons this causing error in unit test
+ App.store.commit();
+}
console.timeEnd('App.alertDefinitionSummaryMapper execution time');
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f10d41cc/ambari-web/app/models/alerts/alert_definition.js
---
[2/2] ambari git commit: AMBARI-14828. Config History table does not update data after clear filters (onechiporenko)
AMBARI-14828. Config History table does not update data after clear filters
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d057581b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d057581b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d057581b
Branch: refs/heads/trunk
Commit: d057581b5b6930c988fe805b799258a9fb5a9744
Parents: 7371c1b
Author: Oleg Nechiporenko
Authored: Thu Jan 28 15:05:11 2016 +0200
Committer: Oleg Nechiporenko
Committed: Thu Jan 28 15:05:11 2016 +0200
--
ambari-web/app/views/common/table_view.js | 18 --
.../views/main/dashboard/config_history_view.js | 12
2 files changed, 28 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d057581b/ambari-web/app/views/common/table_view.js
--
diff --git a/ambari-web/app/views/common/table_view.js
b/ambari-web/app/views/common/table_view.js
index 2ac9649..386a2aa 100644
--- a/ambari-web/app/views/common/table_view.js
+++ b/ambari-web/app/views/common/table_view.js
@@ -359,9 +359,23 @@ App.TableView = Em.View.extend(App.UserPref, {
};
this.get('filterConditions').push(filterCondition);
}
+
+this.saveAllFilterConditions();
+ },
+
+ /**
+ * Save not empty filterConditions to the localStorage
+ *
+ * @method saveAllFilterConditions
+ */
+ saveAllFilterConditions: function () {
+var filterConditions = this.get('filterConditions');
// remove empty entries
-this.set('filterConditions',
this.get('filterConditions').filter(function(item){ return
!Em.isEmpty(item.value); }));
-App.db.setFilterConditions(this.get('controller.name'),
this.get('filterConditions'));
+filterConditions = filterConditions.filter(function(item) {
+ return !Em.isEmpty(item.value);
+});
+this.set('filterConditions', filterConditions);
+App.db.setFilterConditions(this.get('controller.name'), filterConditions);
},
saveDisplayLength: function() {
http://git-wip-us.apache.org/repos/asf/ambari/blob/d057581b/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 88f9025..3bfb22b 100644
--- a/ambari-web/app/views/main/dashboard/config_history_view.js
+++ b/ambari-web/app/views/main/dashboard/config_history_view.js
@@ -208,6 +208,18 @@ App.MainConfigHistoryView =
App.TableView.extend(App.TableServerViewMixin, {
},
/**
+ * Clear all filter values, update filter conditions in the localStorage and
update table data with API-request
+ *
+ * @method clearFilters
+ * @override
+ */
+ clearFilters: function () {
+this._super();
+this.saveAllFilterConditions();
+this.refresh();
+ },
+
+ /**
* callback executed after refresh call done
* @method refreshDone
*/
[1/2] ambari git commit: AMBARI-14826. Alert Definitions Table doesn't clear Alert group filter (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 62ff3b963 -> d057581b5
AMBARI-14826. Alert Definitions Table doesn't clear Alert group filter
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7371c1b2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7371c1b2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7371c1b2
Branch: refs/heads/trunk
Commit: 7371c1b24979c373a53c17cc5a6e226a179c8dba
Parents: 62ff3b9
Author: Oleg Nechiporenko
Authored: Thu Jan 28 13:23:16 2016 +0200
Committer: Oleg Nechiporenko
Committed: Thu Jan 28 13:23:16 2016 +0200
--
ambari-web/app/views/common/table_view.js | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7371c1b2/ambari-web/app/views/common/table_view.js
--
diff --git a/ambari-web/app/views/common/table_view.js
b/ambari-web/app/views/common/table_view.js
index 422ab4f..2ac9649 100644
--- a/ambari-web/app/views/common/table_view.js
+++ b/ambari-web/app/views/common/table_view.js
@@ -487,10 +487,8 @@ App.TableView = Em.View.extend(App.UserPref, {
*/
clearFilters: function() {
this.set('filterConditions', []);
-this.get('_childViews').forEach(function(childView) {
- if (childView['clearFilter']) {
-childView.clearFilter();
- }
+this.get('childViews').forEach(function(childView) {
+ Em.tryInvoke(childView, 'clearFilter');
});
}
ambari git commit: AMBARI-14788. Alerts: Ability to customize timeout for WEB alerts in Ambari Web (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 778580b4f -> 22d12b877
AMBARI-14788. Alerts: Ability to customize timeout for WEB alerts in Ambari Web
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22d12b87
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22d12b87
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22d12b87
Branch: refs/heads/branch-2.2
Commit: 22d12b877c54a799492550eaa859d21c86e3f252
Parents: 778580b
Author: Oleg Nechiporenko
Authored: Mon Jan 25 17:47:15 2016 +0200
Committer: Oleg Nechiporenko
Committed: Thu Jan 28 12:51:37 2016 +0200
--
.../alerts/definition_configs_controller.js | 12 +---
.../app/mappers/alert_definitions_mapper.js | 24 +--
ambari-web/app/models/alerts/alert_config.js| 20 +---
.../app/models/alerts/alert_definition.js | 32 ++--
.../definitions_configs_controller_test.js | 4 +--
5 files changed, 69 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/22d12b87/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
--
diff --git
a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
index 326a900..38f3fa0 100644
--- a/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
+++ b/ambari-web/app/controllers/main/alerts/definition_configs_controller.js
@@ -289,6 +289,9 @@ App.MainAlertDefinitionConfigsController =
Em.Controller.extend({
showInputForValue: false,
text: isWizard ? '' : this.getThresholdsProperty('critical', 'text'),
value: isWizard ? '' : this.getThresholdsProperty('critical', 'value')
+ }),
+ App.AlertConfigProperties.ConnectionTimeout.create({
+value: alertDefinition.get('uri.connectionTimeout')
})
]);
@@ -542,13 +545,14 @@ App.MainAlertDefinitionConfigsController =
Em.Controller.extend({
* @type {Boolean}
*/
hasThresholdsError: function () {
+var smallValue, smallValid, largeValue, largeValid;
if (this.get('configs').findProperty('name', 'warning_threshold')) {
- var smallValue = Em.get(this.get('configs').findProperty('name',
'warning_threshold'), 'value');
- var smallValid = Em.get(this.get('configs').findProperty('name',
'warning_threshold'), 'isValid');
+ smallValue = Em.get(this.get('configs').findProperty('name',
'warning_threshold'), 'value');
+ smallValid = Em.get(this.get('configs').findProperty('name',
'warning_threshold'), 'isValid');
}
if (this.get('configs').findProperty('name', 'critical_threshold')) {
- var largeValue = Em.get(this.get('configs').findProperty('name',
'critical_threshold'), 'value');
- var largeValid = Em.get(this.get('configs').findProperty('name',
'critical_threshold'), 'isValid');
+ largeValue = Em.get(this.get('configs').findProperty('name',
'critical_threshold'), 'value');
+ largeValid = Em.get(this.get('configs').findProperty('name',
'critical_threshold'), 'isValid');
}
return smallValid && largeValid ? Number(smallValue) > Number(largeValue)
: false;
}.property('configs.@each.value'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/22d12b87/ambari-web/app/mappers/alert_definitions_mapper.js
--
diff --git a/ambari-web/app/mappers/alert_definitions_mapper.js
b/ambari-web/app/mappers/alert_definitions_mapper.js
index 976f7e1..b79a90c 100644
--- a/ambari-web/app/mappers/alert_definitions_mapper.js
+++ b/ambari-web/app/mappers/alert_definitions_mapper.js
@@ -25,6 +25,7 @@ App.alertDefinitionsMapper = App.QuickDataMapper.create({
reportModel: App.AlertReportDefinition,
metricsSourceModel: App.AlertMetricsSourceDefinition,
metricsUriModel: App.AlertMetricsUriDefinition,
+ parameterModel: App.AlertDefinitionParameter,
config: {
id: 'AlertDefinition.id',
@@ -42,6 +43,11 @@ App.alertDefinitionsMapper = App.QuickDataMapper.create({
reporting_type: 'array',
reporting: {
item: 'id'
+},
+parameters_key: 'reporting',
+parameters_type: 'array',
+parameters: {
+ item: 'id'
}
},
@@ -66,7 +72,19 @@ App.alertDefinitionsMapper = App.QuickDataMapper.create({
http: 'AlertDefinition.source.uri.http',
https: 'AlertDefinition.source.uri.https',
https_property: 'AlertDefinition.source.uri.https_property',
-https_property_value: 'AlertDefinition.source.uri.https_property_value'
+https_property_value: 'AlertDefinition.source.uri.https_property_value',
+connection_timeout: 'AlertDefin
ambari git commit: AMBARI-14824 Unexpected icon for service check during rolling upgrade while Skip all Service Check failures enabled. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 eb5b9c5ca -> 778580b4f
AMBARI-14824 Unexpected icon for service check during rolling upgrade while
Skip all Service Check failures enabled. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/778580b4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/778580b4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/778580b4
Branch: refs/heads/branch-2.2
Commit: 778580b4f0f8a847579199b97986c7a151b3f472
Parents: eb5b9c5
Author: Andrii Tkach
Authored: Thu Jan 28 12:05:43 2016 +0200
Committer: Andrii Tkach
Committed: Thu Jan 28 12:05:43 2016 +0200
--
ambari-web/app/utils/ajax/ajax.js | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/778580b4/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 258c7c1..325d673 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1561,6 +1561,7 @@ var urls = {
'Upgrade/progress_percent,Upgrade/request_context,Upgrade/request_status,Upgrade/direction,Upgrade/downgrade_allowed,'
+
'upgrade_groups/UpgradeGroup,' +
'upgrade_groups/upgrade_items/UpgradeItem/status,' +
+'upgrade_groups/upgrade_items/UpgradeItem/display_status,' +
'upgrade_groups/upgrade_items/UpgradeItem/context,' +
'upgrade_groups/upgrade_items/UpgradeItem/group_id,' +
'upgrade_groups/upgrade_items/UpgradeItem/progress_percent,' +
ambari git commit: AMBARI-14824 Unexpected icon for service check during rolling upgrade while Skip all Service Check failures enabled. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk d38a9531e -> 62ff3b963
AMBARI-14824 Unexpected icon for service check during rolling upgrade while
Skip all Service Check failures enabled. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/62ff3b96
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/62ff3b96
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/62ff3b96
Branch: refs/heads/trunk
Commit: 62ff3b963052cdf73b2913ea3b162e0586016bc8
Parents: d38a953
Author: Andrii Tkach
Authored: Thu Jan 28 10:54:08 2016 +0200
Committer: Andrii Tkach
Committed: Thu Jan 28 10:54:08 2016 +0200
--
ambari-web/app/utils/ajax/ajax.js | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/62ff3b96/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index c4a1611..df3782f 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1578,6 +1578,7 @@ var urls = {
'Upgrade/progress_percent,Upgrade/request_context,Upgrade/request_status,Upgrade/direction,Upgrade/downgrade_allowed,'
+
'upgrade_groups/UpgradeGroup,' +
'upgrade_groups/upgrade_items/UpgradeItem/status,' +
+'upgrade_groups/upgrade_items/UpgradeItem/display_status,' +
'upgrade_groups/upgrade_items/UpgradeItem/context,' +
'upgrade_groups/upgrade_items/UpgradeItem/group_id,' +
'upgrade_groups/upgrade_items/UpgradeItem/progress_percent,' +
