ambari git commit: Revert "AMBARI-10243 [WinTP2] ambari-web build is incomplete"
Repository: ambari Updated Branches: refs/heads/trunk 9a1b0eb4e -> c37394ad0 Revert "AMBARI-10243 [WinTP2] ambari-web build is incomplete" This reverts commit 9a1b0eb4ec0b54381aa5987574bd98cae1c4ee76. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c37394ad Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c37394ad Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c37394ad Branch: refs/heads/trunk Commit: c37394ad06526c8eaec826af95282b99aa4ccb9e Parents: 9a1b0eb Author: Florian Barca Authored: Mon Mar 30 16:31:14 2015 -0700 Committer: Florian Barca Committed: Mon Mar 30 16:31:14 2015 -0700 -- ambari-agent/pom.xml | 4 +- ambari-client/python-client/pom.xml| 2 +- ambari-metrics/ambari-metrics-assembly/pom.xml | 2 +- ambari-server/pom.xml | 4 +- ambari-shell/ambari-python-shell/pom.xml | 2 +- ambari-web/pom.xml | 168 ambari-web/set-ambari-version.cmd | 17 -- ambari-web/set-ambari-version.ps1 | 27 ambari-web/set-default-stack-version.cmd | 17 -- ambari-web/set-default-stack-version.ps1 | 35 ambari-web/toggle-experimental.cmd | 17 -- ambari-web/toggle-experimental.ps1 | 27 contrib/views/slider/pom.xml | 133 ++-- 13 files changed, 119 insertions(+), 336 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c37394ad/ambari-agent/pom.xml -- diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml index 4476011..110a8d5 100644 --- a/ambari-agent/pom.xml +++ b/ambari-agent/pom.xml @@ -113,7 +113,7 @@ org.codehaus.mojo exec-maven-plugin -1.2.1 +1.2 @@ -799,7 +799,7 @@ org.codehaus.mojo exec-maven-plugin -1.2.1 +1.2 run-heat http://git-wip-us.apache.org/repos/asf/ambari/blob/c37394ad/ambari-client/python-client/pom.xml -- diff --git a/ambari-client/python-client/pom.xml b/ambari-client/python-client/pom.xml index 73a6825..3c957ee 100644 --- a/ambari-client/python-client/pom.xml +++ b/ambari-client/python-client/pom.xml @@ -71,7 +71,7 @@ org.codehaus.mojo exec-maven-plugin -1.2.1 +1.2 http://git-wip-us.apache.org/repos/asf/ambari/blob/c37394ad/ambari-metrics/ambari-metrics-assembly/pom.xml -- diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml index 296d399..cf7a92d 100644 --- a/ambari-metrics/ambari-metrics-assembly/pom.xml +++ b/ambari-metrics/ambari-metrics-assembly/pom.xml @@ -925,7 +925,7 @@ org.codehaus.mojo exec-maven-plugin -1.2.1 +1.2 run-heat-collector http://git-wip-us.apache.org/repos/asf/ambari/blob/c37394ad/ambari-server/pom.xml -- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 1e6be0c..18593bd 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -1133,7 +1133,7 @@ org.codehaus.mojo exec-maven-plugin -1.2.1 +1.2 @@ -1358,7 +1358,7 @@ org.codehaus.mojo exec-maven-plugin -1.2.1 +1.2 run-heat http://git-wip-us.apache.org/repos/asf/ambari/blob/c37394ad/ambari-shell/ambari-python-shell/pom.xml -- diff --git a/ambari-shell/ambari-python-shell/pom.xml b/ambari-shell/ambari-python-shell/pom.xml index c4dddf4..d78c6ea 100644 --- a/ambari-shell/ambari-python-shell/pom.xml +++ b/ambari-shell/ambari-python-shell/pom.xml @@ -71,7 +71,7 @@ org.codehaus.mojo exec-maven-plugin -1.2.1 +1.2 http://git-wip-us.apache.org/repos/asf/ambari/blob/c37394ad/ambari-web/pom.xml -- diff --git a/ambari-web/pom.xml b/ambari-web/pom.xml index 04f9b5d..0849111 100644 --- a/ambari-web/pom.xml +++ b/ambari-web/pom.xml @@ -87,130 +87,90 @@ -org.codehaus.mojo -exec-maven-plugin -
ambari git commit: AMBARI-10243 [WinTP2] ambari-web build is incomplete
Repository: ambari Updated Branches: refs/heads/trunk 6af1c2cb0 -> 9a1b0eb4e AMBARI-10243 [WinTP2] ambari-web build is incomplete Replaced maven-antrun-plugin with exec-maven-plugin. Upgraded to v1.2.1 was necessary because v1.2 doesn't process the tag. Created Windows scripts with identical functionality for set-ambari-version.sh, set-default-stack-version.sh and toggle-experimental.sh. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a1b0eb4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a1b0eb4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a1b0eb4 Branch: refs/heads/trunk Commit: 9a1b0eb4ec0b54381aa5987574bd98cae1c4ee76 Parents: 6af1c2c Author: Florian Barca Authored: Mon Mar 30 16:02:34 2015 -0700 Committer: Florian Barca Committed: Mon Mar 30 16:02:34 2015 -0700 -- ambari-agent/pom.xml | 4 +- ambari-client/python-client/pom.xml| 2 +- ambari-metrics/ambari-metrics-assembly/pom.xml | 2 +- ambari-server/pom.xml | 4 +- ambari-shell/ambari-python-shell/pom.xml | 2 +- ambari-web/pom.xml | 168 ambari-web/set-ambari-version.cmd | 17 ++ ambari-web/set-ambari-version.ps1 | 27 ambari-web/set-default-stack-version.cmd | 17 ++ ambari-web/set-default-stack-version.ps1 | 35 ambari-web/toggle-experimental.cmd | 17 ++ ambari-web/toggle-experimental.ps1 | 27 contrib/views/slider/pom.xml | 133 ++-- 13 files changed, 336 insertions(+), 119 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/9a1b0eb4/ambari-agent/pom.xml -- diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml index 110a8d5..4476011 100644 --- a/ambari-agent/pom.xml +++ b/ambari-agent/pom.xml @@ -113,7 +113,7 @@ org.codehaus.mojo exec-maven-plugin -1.2 +1.2.1 @@ -799,7 +799,7 @@ org.codehaus.mojo exec-maven-plugin -1.2 +1.2.1 run-heat http://git-wip-us.apache.org/repos/asf/ambari/blob/9a1b0eb4/ambari-client/python-client/pom.xml -- diff --git a/ambari-client/python-client/pom.xml b/ambari-client/python-client/pom.xml index 3c957ee..73a6825 100644 --- a/ambari-client/python-client/pom.xml +++ b/ambari-client/python-client/pom.xml @@ -71,7 +71,7 @@ org.codehaus.mojo exec-maven-plugin -1.2 +1.2.1 http://git-wip-us.apache.org/repos/asf/ambari/blob/9a1b0eb4/ambari-metrics/ambari-metrics-assembly/pom.xml -- diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml b/ambari-metrics/ambari-metrics-assembly/pom.xml index cf7a92d..296d399 100644 --- a/ambari-metrics/ambari-metrics-assembly/pom.xml +++ b/ambari-metrics/ambari-metrics-assembly/pom.xml @@ -925,7 +925,7 @@ org.codehaus.mojo exec-maven-plugin -1.2 +1.2.1 run-heat-collector http://git-wip-us.apache.org/repos/asf/ambari/blob/9a1b0eb4/ambari-server/pom.xml -- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 18593bd..1e6be0c 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -1133,7 +1133,7 @@ org.codehaus.mojo exec-maven-plugin -1.2 +1.2.1 @@ -1358,7 +1358,7 @@ org.codehaus.mojo exec-maven-plugin -1.2 +1.2.1 run-heat http://git-wip-us.apache.org/repos/asf/ambari/blob/9a1b0eb4/ambari-shell/ambari-python-shell/pom.xml -- diff --git a/ambari-shell/ambari-python-shell/pom.xml b/ambari-shell/ambari-python-shell/pom.xml index d78c6ea..c4dddf4 100644 --- a/ambari-shell/ambari-python-shell/pom.xml +++ b/ambari-shell/ambari-python-shell/pom.xml @@ -71,7 +71,7 @@ org.codehaus.mojo exec-maven-plugin -1.2 +1.2.1 http://git-wip-us.apache.org/repos/asf/ambari/blob/9a1b0eb4/ambari-web/pom.xml -- diff --git a/ambari-web/pom.xml b/ambari-web/pom
ambari git commit: AMBARI-10267. BE: Populate non-UI metadata for Hive, Tez, HBase and HDFS service configs (srimanth)
Repository: ambari Updated Branches: refs/heads/trunk 27d351459 -> 6af1c2cb0 AMBARI-10267. BE: Populate non-UI metadata for Hive, Tez, HBase and HDFS service configs (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6af1c2cb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6af1c2cb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6af1c2cb Branch: refs/heads/trunk Commit: 6af1c2cb0658ba27433e60a3d6787085a6b9e44c Parents: 27d3514 Author: Srimanth Gunturi Authored: Sun Mar 29 18:33:50 2015 -0700 Committer: Srimanth Gunturi Committed: Mon Mar 30 15:13:22 2015 -0700 -- .../0.96.0.2.0/configuration/hbase-env.xml | 16 ++ .../0.96.0.2.0/configuration/hbase-site.xml | 152 - .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 48 + .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 28 +++ .../HIVE/0.12.0.2.0/configuration/hive-site.xml | 87 +++- .../TEZ/0.4.0.2.1/configuration/tez-site.xml| 8 + .../configuration-mapred/mapred-site.xml| 4 + .../YARN/2.1.0.2.0/configuration/yarn-site.xml | 4 + .../services/HIVE/configuration/hive-site.xml | 33 +++ .../services/HIVE/configuration/hive-site.xml | 213 ++- .../services/YARN/configuration/yarn-site.xml | 3 + 11 files changed, 586 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/6af1c2cb/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml index 231baa6..7ed92ed 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml @@ -35,6 +35,14 @@ hbase_regionserver_heapsize 1024 HBase RegionServer Heap Size. +HBase RegionServer Maximum Memory + + int + 1024 + 6554 + MB + 250 + hbase_regionserver_xmn_max @@ -50,6 +58,14 @@ hbase_master_heapsize 1024 HBase Master Heap Size +HBase Master Maximum Memory + + int + 1024 + 16384 + MB + 250 + hbase_user http://git-wip-us.apache.org/repos/asf/ambari/blob/6af1c2cb/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml index 0cdabf4..206ac81 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml @@ -84,22 +84,42 @@ Maximum size of all memstores in a region server before new updates are blocked and flushes are forced. Defaults to 40% of heap +% of RegionServer Allocated to Write Buffers + + float + 0 + 0.8 + hbase.regionserver.handler.count -60 +30 Count of RPC Listener instances spun up on RegionServers. Same property is used by the Master for count of master handlers. Default is 10. +Number of Handlers per RegionServer + + int + 5 + 240 + 1 + hbase.hregion.majorcompaction -8640 +60480 The time (in milliseconds) between 'major' compactions of all HStoreFiles in a region. Default: 1 day. Set to 0 to disable automated major compactions. +Major Compaction Interval + + int + 0 + 259200 + milliseconds + @@ -114,7 +134,7 @@ hbase.hregion.memstore.block.multiplier -2 +4 Block updates if memstore has hbase.hregion.memstore.block.multiplier time hbase.hregion.flush.size bytes. Useful preventing runaway memstore during spikes in update traffic. Without an @@ -122,6 +142,14 @@ resultant flush files take a long time to compact or split, or worse, we OOME +Per-Column Family Memstore Block Multiplier + + value-list + 2 + 4 + 8 + 1 + hbase.hregion.memstore.flush.size @@ -131,6 +159,14 @@ exceeds this number of bytes. Value is checked by a thread that runs every hbase.server.thread.wakefrequency. +Per-Colu
ambari git commit: AMBARI-10287 [WinTP2] Ambari server fails to start in debug mode on Windows
Repository: ambari
Updated Branches:
refs/heads/trunk c86d38823 -> 27d351459
AMBARI-10287 [WinTP2] Ambari server fails to start in debug mode on Windows
Fixed Java process command line in debug mode.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27d35145
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27d35145
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27d35145
Branch: refs/heads/trunk
Commit: 27d3514595a9858d68f3d8dc491c5fed78469024
Parents: c86d388
Author: Florian Barca
Authored: Mon Mar 30 14:23:31 2015 -0700
Committer: Florian Barca
Committed: Mon Mar 30 14:23:31 2015 -0700
--
ambari-server/src/main/python/ambari_server_main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/27d35145/ambari-server/src/main/python/ambari_server_main.py
--
diff --git a/ambari-server/src/main/python/ambari_server_main.py
b/ambari-server/src/main/python/ambari_server_main.py
index 1847f94..902b457 100644
--- a/ambari-server/src/main/python/ambari_server_main.py
+++ b/ambari-server/src/main/python/ambari_server_main.py
@@ -85,7 +85,7 @@ SERVER_START_CMD_DEBUG_WINDOWS = "{0} " \
"-XX:+UseConcMarkSweepGC " \
"{1} {2} " \
"-Xdebug -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend={4} "
\
-"-cp {3}" \
+"-cp {3} " \
"org.apache.ambari.server.controller.AmbariServer"
SERVER_INIT_TIMEOUT = 5
ambari git commit: AMBARI-10286 [WinTP2] Storm service fails to set up
Repository: ambari
Updated Branches:
refs/heads/trunk e426e7151 -> c86d38823
AMBARI-10286 [WinTP2] Storm service fails to set up
Fixed STORM metrics file structure.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c86d3882
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c86d3882
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c86d3882
Branch: refs/heads/trunk
Commit: c86d38823fd44c8d4e98088e94e98f786f3b7922
Parents: e426e71
Author: Florian Barca
Authored: Mon Mar 30 14:19:15 2015 -0700
Committer: Florian Barca
Committed: Mon Mar 30 14:19:15 2015 -0700
--
.../common-services/STORM/0.9.1.2.1/metrics.json | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c86d3882/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
index 3c746f7..21db93b 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/metrics.json
@@ -416,7 +416,7 @@
"Component": [
{
"type": "ganglia",
-"metrics": {
+"metrics": {"default":{
"metrics/boottime": {
"metric": "boottime",
"pointInTime": true,
@@ -597,15 +597,13 @@
"pointInTime": true,
"temporal": true
}
-
-
-}
+}}
}
],
"HostComponent": [
{
"type": "ganglia",
-"metrics": {
+"metrics": {"default":{
"metrics/boottime": {
"metric": "boottime",
"pointInTime": true,
@@ -786,7 +784,7 @@
"pointInTime": true,
"temporal": true
}
-}
+}}
}
]
}
ambari git commit: AMBARI-10220 [WinTP2] Automatic db structure populating is broken
Repository: ambari
Updated Branches:
refs/heads/trunk 4e5e8dc71 -> e426e7151
AMBARI-10220 [WinTP2] Automatic db structure populating is broken
Fixed sqlcmd arguments to allow it to return non-zero codes.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e426e715
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e426e715
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e426e715
Branch: refs/heads/trunk
Commit: e426e715137e8d0dd60a47317990498bac2e8150
Parents: 4e5e8dc
Author: Florian Barca
Authored: Mon Mar 30 13:47:47 2015 -0700
Committer: Florian Barca
Committed: Mon Mar 30 13:47:47 2015 -0700
--
.../src/main/python/ambari_server/dbConfiguration_windows.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e426e715/ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py
--
diff --git
a/ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py
b/ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py
index 027a84f..f34caeb 100644
--- a/ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py
+++ b/ambari-server/src/main/python/ambari_server/dbConfiguration_windows.py
@@ -294,8 +294,8 @@ class SQLServerConfig(DBMSConfig):
pass
@staticmethod
- def _execute_db_script(databaseHost, databaseScript):
-dbCmd = 'sqlcmd -S {0} -i {1}'.format(databaseHost, databaseScript)
+ def _execute_db_script(databaseHost, databaseScript,
minReportedSeverityLevel=10):
+dbCmd = 'sqlcmd -S {0} -b -V {1} -i {2}'.format(databaseHost,
minReportedSeverityLevel, databaseScript)
retCode, outData, errData = run_os_command(['cmd', '/C', dbCmd])
if not retCode == 0:
err = 'Running database create script failed. Error output: {0} Output:
{1} Exiting.'.format(errData, outData)
ambari git commit: AMBARI-10282. Add missing Oozie dependency on hive-site, tez-site. (swagle)
Repository: ambari Updated Branches: refs/heads/trunk 2b43a272c -> 4e5e8dc71 AMBARI-10282. Add missing Oozie dependency on hive-site, tez-site. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e5e8dc7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e5e8dc7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e5e8dc7 Branch: refs/heads/trunk Commit: 4e5e8dc719b88730d9a42157423b7fccf029e9b2 Parents: 2b43a27 Author: Siddharth Wagle Authored: Mon Mar 30 10:36:09 2015 -0700 Committer: Siddharth Wagle Committed: Mon Mar 30 12:39:44 2015 -0700 -- .../main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml| 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/4e5e8dc7/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml -- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml index 563d8a0..17d4c17 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml @@ -161,6 +161,8 @@ oozie-env oozie-log4j yarn-site +hive-site +tez-site
ambari git commit: AMBARI-10284. Implement radio-buttons widget for config (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 804577346 -> 2b43a272c
AMBARI-10284. Implement radio-buttons widget for config (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b43a272
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b43a272
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b43a272
Branch: refs/heads/trunk
Commit: 2b43a272c2fed8e36565f2e6727cd1fd0760cab1
Parents: 8045773
Author: Alex Antonenko
Authored: Mon Mar 30 21:59:07 2015 +0300
Committer: Alex Antonenko
Committed: Mon Mar 30 22:11:55 2015 +0300
--
.../configs/widgets/radio_button_config.hbs | 33 ++
ambari-web/app/views.js | 1 +
.../configs/service_config_layout_tab_view.js | 11 -
.../widgets/radio_button_config_widget_view.js | 48
4 files changed, 92 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b43a272/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
--
diff --git
a/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
b/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
new file mode 100644
index 000..fd23429
--- /dev/null
+++ b/ambari-web/app/templates/common/configs/widgets/radio_button_config.hbs
@@ -0,0 +1,33 @@
+{{!
+* 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.
+}}
+
+{{#if view.isOriginalSCP}}
+
+{{view.configLabel}}
+
+{{/if}}
+
+ {{#each item in view.content}}
+
+ {{view Ember.RadioButton nameBinding="view.elementId"
valueBinding="item.value" selectionBinding="view.config.value"}}
+ {{item.label}}
+
+ {{/each}}
+
+{{view App.RestoreConfigView}}
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b43a272/ambari-web/app/views.js
--
diff --git a/ambari-web/app/views.js b/ambari-web/app/views.js
index 602f68a..c7b8824 100644
--- a/ambari-web/app/views.js
+++ b/ambari-web/app/views.js
@@ -60,6 +60,7 @@
require('views/common/configs/widgets/combo_config_widget_view');
require('views/common/configs/widgets/number_config_widget_view');
require('views/common/configs/widgets/password_config_widget_view');
require('views/common/configs/widgets/list_config_widget_view');
+require('views/common/configs/widgets/radio_button_config_widget_view');
require('views/common/configs/widgets/slider_config_widget_view');
require('views/common/configs/widgets/string_config_widget_view');
require('views/common/configs/widgets/time_interval_spinner_view');
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b43a272/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
--
diff --git
a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
index e1fbb4e..d1b9121 100644
--- a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
+++ b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
@@ -37,7 +37,16 @@ App.ServiceConfigLayoutTabView =
Em.View.extend(App.ConfigOverridable, {
* @type {object}
*/
widgetTypeMap: {
-slider: App.SliderConfigWidgetView
+checkbox: App.CheckboxConfigWidgetView,
+combo: App.ComboConfigWidgetView,
+directory: App.DirectoryConfigWidgetView,
+directories: App.DirectoryConfigWidgetView,
+list: App.ListConfigWidgetView,
+password: App.PasswordConfigWidgetView,
+'radio-buttons': App.RadioButtonConfigWidgetView,
+slider: App.SliderConfigWidgetView,
+'time-interval-spinner': App.TimeIntervalSpinnerView,
+toggle: App.ToggleConfigWidgetView
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b43a272/ambari-web/app/views/common/configs/widgets/radio_button_config_widget_view.js
--
ambari git commit: AMBARI-10281. Enable Ranger Admin HA Wizard skeleton. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c77993e13 -> 804577346
AMBARI-10281. Enable Ranger Admin HA Wizard skeleton. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/80457734
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/80457734
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/80457734
Branch: refs/heads/trunk
Commit: 804577346e85297a61fca6119df51d5ec1f10335
Parents: c77993e
Author: Aleksandr Kovalenko
Authored: Mon Mar 30 20:36:35 2015 +0300
Committer: Aleksandr Kovalenko
Committed: Mon Mar 30 21:29:29 2015 +0300
--
ambari-web/app/app.js | 17 +-
ambari-web/app/controllers.js | 5 +
.../rangerAdmin/step1_controller.js | 24 +++
.../rangerAdmin/step2_controller.js | 24 +++
.../rangerAdmin/step3_controller.js | 24 +++
.../rangerAdmin/step4_controller.js | 24 +++
.../rangerAdmin/wizard_controller.js| 81 +
.../main/admin/highAvailability_controller.js | 9 +
ambari-web/app/controllers/main/service/item.js | 5 +
ambari-web/app/messages.js | 9 +
ambari-web/app/models/host_component.js | 7 +
ambari-web/app/models/service.js| 3 +-
.../app/models/stack_service_component.js | 2 +-
ambari-web/app/routes/main.js | 2 +
.../app/routes/ra_high_availability_routes.js | 177 +++
.../highAvailability/rangerAdmin/step1.hbs | 21 +++
.../highAvailability/rangerAdmin/step2.hbs | 21 +++
.../highAvailability/rangerAdmin/step3.hbs | 21 +++
.../highAvailability/rangerAdmin/step4.hbs | 21 +++
.../highAvailability/rangerAdmin/wizard.hbs | 41 +
ambari-web/app/utils/db.js | 1 +
ambari-web/app/views.js | 5 +
.../highAvailability/rangerAdmin/step1_view.js | 26 +++
.../highAvailability/rangerAdmin/step2_view.js | 26 +++
.../highAvailability/rangerAdmin/step3_view.js | 26 +++
.../highAvailability/rangerAdmin/step4_view.js | 26 +++
.../highAvailability/rangerAdmin/wizard_view.js | 25 +++
ambari-web/app/views/main/service/item.js | 3 +
28 files changed, 673 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/80457734/ambari-web/app/app.js
--
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index bd5090e..38ba4bd 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -190,7 +190,7 @@ module.exports = Em.Application.create({
/**
* If ResourceManager High Availability is enabled
- * Based on number of ResourceManager components host components installed
+ * Based on number of ResourceManager host components installed
*
* @type {bool}
*/
@@ -204,6 +204,21 @@ module.exports = Em.Application.create({
}.property('router.clusterController.isLoaded', 'isStackServicesLoaded'),
/**
+ * If Ranger Admin High Availability is enabled
+ * Based on number of Ranger Admin host components installed
+ *
+ * @type {bool}
+ */
+ isRAHaEnabled: function () {
+var result = false;
+var raStackComponent =
App.StackServiceComponent.find().findProperty('componentName','RANGER_ADMIN');
+if (raStackComponent && raStackComponent.get('isMultipleAllowed')) {
+ result = App.HostComponent.find().filterProperty('componentName',
'RANGER_ADMIN').length > 1;
+}
+return result;
+ }.property('router.clusterController.isLoaded', 'isStackServicesLoaded'),
+
+ /**
* Object with utility functions for list of service names with similar
behavior
*/
services: Em.Object.create({
http://git-wip-us.apache.org/repos/asf/ambari/blob/80457734/ambari-web/app/controllers.js
--
diff --git a/ambari-web/app/controllers.js b/ambari-web/app/controllers.js
index 5319723..56b144d 100644
--- a/ambari-web/app/controllers.js
+++ b/ambari-web/app/controllers.js
@@ -51,6 +51,11 @@
require('controllers/main/admin/highAvailability/resourceManager/step1_controlle
require('controllers/main/admin/highAvailability/resourceManager/step2_controller');
require('controllers/main/admin/highAvailability/resourceManager/step3_controller');
require('controllers/main/admin/highAvailability/resourceManager/step4_controller');
+require('controllers/main/admin/highAvailability/rangerAdmin/wizard_controller');
+require('controllers/main/admin/highAvailability/rangerAdmin/step1_controller');
+require('controllers/main/admin/highAvailability/rangerAdmin/step2_controller');
+require('controllers/main/admin/highAvailability/rangerAdmin/step3_controller
ambari git commit: AMBARI-10274. Add support for OpenJDK 8 (dlysnichenko)
Repository: ambari Updated Branches: refs/heads/trunk 03f96b251 -> c77993e13 AMBARI-10274. Add support for OpenJDK 8 (dlysnichenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c77993e1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c77993e1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c77993e1 Branch: refs/heads/trunk Commit: c77993e13eff49aca09be4503872dc19498f947c Parents: 03f96b2 Author: Lisnichenko Dmitro Authored: Mon Mar 30 13:04:16 2015 +0300 Committer: Lisnichenko Dmitro Committed: Mon Mar 30 20:52:56 2015 +0300 -- .../ambari/server/agent/ExecutionCommand.java| 1 + .../server/configuration/Configuration.java | 19 +++ .../AmbariCustomCommandExecutionHelper.java | 2 ++ .../internal/ClientConfigResourceProvider.java | 1 + .../0.1.0/configuration/ams-hbase-env.xml| 8 .../0.1.0/package/scripts/params.py | 1 + .../HDFS/2.1.0.2.0/configuration/hadoop-env.xml | 17 + .../HDFS/2.1.0.2.0/package/scripts/params.py | 1 + .../OOZIE/4.0.0.2.0/configuration/oozie-env.xml | 5 - .../3.4.5.2.0/package/scripts/params_linux.py| 3 ++- .../HDP/2.0.6/hooks/before-ANY/scripts/params.py | 1 + .../services/HDFS/configuration/hadoop-env.xml | 19 +++ .../services/OOZIE/configuration/oozie-env.xml | 5 + .../AmbariManagementControllerImplTest.java | 5 - .../ClientConfigResourceProviderTest.java| 2 ++ ambari-server/src/test/python/TestUtils.py | 7 +-- .../configs/install_packages_config.json | 3 ++- .../stacks/2.0.6/configs/client-upgrade.json | 3 ++- .../stacks/2.0.6/configs/default.hbasedecom.json | 1 + .../python/stacks/2.0.6/configs/default.json | 1 + .../2.0.6/configs/default.non_gmetad_host.json | 1 + .../stacks/2.0.6/configs/default_client.json | 1 + .../2.0.6/configs/default_oozie_mysql.json | 1 + .../default_update_exclude_file_only.json| 1 + .../python/stacks/2.0.6/configs/flume_22.json| 1 + .../stacks/2.0.6/configs/flume_target.json | 1 + .../2.0.6/configs/ha_bootstrap_active_node.json | 3 ++- .../2.0.6/configs/ha_bootstrap_standby_node.json | 3 ++- .../python/stacks/2.0.6/configs/ha_default.json | 3 ++- .../python/stacks/2.0.6/configs/ha_secured.json | 3 ++- .../python/stacks/2.0.6/configs/hbase-2.2.json | 3 ++- .../stacks/2.0.6/configs/hbase-check-2.2.json| 3 ++- .../stacks/2.0.6/configs/hbase-preupgrade.json | 3 ++- .../stacks/2.0.6/configs/hbase-rs-2.2.json | 3 ++- .../python/stacks/2.0.6/configs/nn_ru_lzo.json | 3 ++- .../2.0.6/configs/ranger-namenode-start.json | 1 + .../2.0.6/configs/rebalancehdfs_default.json | 3 ++- .../2.0.6/configs/rebalancehdfs_secured.json | 3 ++- .../python/stacks/2.0.6/configs/secured.json | 3 ++- .../stacks/2.0.6/configs/secured_client.json | 3 ++- .../2.0.6/configs/secured_no_jce_name.json | 3 ++- .../2.0.6/configs/zk-service_check_2.2.json | 3 ++- .../stacks/2.1/configs/client-upgrade.json | 3 ++- .../stacks/2.1/configs/default-storm-start.json | 1 + .../test/python/stacks/2.1/configs/default.json | 1 + .../stacks/2.1/configs/secured-storm-start.json | 3 ++- .../test/python/stacks/2.1/configs/secured.json | 3 ++- .../test/python/stacks/2.2/configs/default.json | 1 + .../stacks/2.2/configs/falcon-upgrade.json | 3 ++- .../python/stacks/2.2/configs/hive-upgrade.json | 1 + .../configs/journalnode-upgrade-hdfs-secure.json | 3 ++- .../stacks/2.2/configs/journalnode-upgrade.json | 3 ++- .../stacks/2.2/configs/oozie-downgrade.json | 3 ++- .../python/stacks/2.2/configs/oozie-upgrade.json | 3 ++- .../2.2/configs/pig-service-check-secure.json| 3 ++- .../stacks/2.2/configs/ranger-admin-upgrade.json | 3 ++- .../2.2/configs/ranger-usersync-upgrade.json | 3 ++- .../test/python/stacks/2.2/configs/secured.json | 1 + .../2.2/configs/spark-job-history-server.json| 3 ++- 59 files changed, 156 insertions(+), 42 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c77993e1/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java index dd1dfd5..7b9709e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java @@ -286,6 +286,7 @@ public class ExecutionCommand extends AgentCom
[1/3] ambari git commit: AMBARI-10276. Install wizard (step 3): Removing hosts during bootstrap, will case unexpected behaviour (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 8c237ec86 -> 03f96b251
AMBARI-10276. Install wizard (step 3): Removing hosts during bootstrap, will
case unexpected behaviour (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d75309a7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d75309a7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d75309a7
Branch: refs/heads/trunk
Commit: d75309a7b98f8f68c227514f2109003a9efa7f40
Parents: 8c237ec
Author: Alex Antonenko
Authored: Mon Mar 30 19:54:19 2015 +0300
Committer: Alex Antonenko
Committed: Mon Mar 30 19:54:19 2015 +0300
--
ambari-web/app/controllers/wizard/step3_controller.js | 14 +++---
ambari-web/app/templates/wizard/step3.hbs | 12 +++-
ambari-web/test/controllers/wizard/step3_test.js | 9 -
3 files changed, 18 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d75309a7/ambari-web/app/controllers/wizard/step3_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js
b/ambari-web/app/controllers/wizard/step3_controller.js
index 1a6ebe5..4c56afa 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -68,7 +68,9 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
* is Retry button disabled
* @type {bool}
*/
- isRetryDisabled: true,
+ isRetryDisabled: function() {
+return (this.get('isBackDisabled')) ? this.get('isBackDisabled') :
!this.get('bootHosts').filterProperty('bootStatus', 'FAILED').length;
+ }.property('bootHosts.@each.bootStatus', 'isBackDisabled'),
/**
* Is Back button disabled
@@ -216,7 +218,6 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
this.set('registrationStartedAt', null);
this.set('isLoaded', false);
this.set('isSubmitDisabled', true);
-this.set('isRetryDisabled', true);
this.set('stopChecking', false);
},
@@ -235,10 +236,10 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
});
App.router.get(this.get('content.controllerName')).launchBootstrap(bootStrapData,
function (requestId) {
if (requestId == '0') {
-var controller =
App.router.get(App.clusterStatus.wizardControllerName);
-controller.registerErrPopup(Em.I18n.t('common.information'),
Em.I18n.t('installer.step2.evaluateStep.hostRegInProgress'));
+self.startBootstrap();
} else if (requestId) {
self.set('content.installOptions.bootRequestId', requestId);
+
App.router.get(self.get('content.controllerName')).save('installOptions');
self.startBootstrap();
}
});
@@ -325,7 +326,8 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
* @method removeHost
*/
removeHost: function (hostInfo) {
-this.removeHosts([hostInfo]);
+if (!this.get('isBackDisabled'))
+ this.removeHosts([hostInfo]);
},
/**
@@ -412,7 +414,6 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
*/
retrySelectedHosts: function () {
if (!this.get('isRetryDisabled')) {
- this.set('isRetryDisabled', true);
var selectedHosts = this.get('bootHosts').filterProperty('bootStatus',
'FAILED');
selectedHosts.forEach(function (_host) {
_host.set('bootStatus', 'DONE');
@@ -1214,7 +1215,6 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
*/
stopRegistration: function () {
this.set('isSubmitDisabled',
!this.get('bootHosts').someProperty('bootStatus', 'REGISTERED'));
-this.set('isRetryDisabled',
!this.get('bootHosts').someProperty('bootStatus', 'FAILED'));
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/d75309a7/ambari-web/app/templates/wizard/step3.hbs
--
diff --git a/ambari-web/app/templates/wizard/step3.hbs
b/ambari-web/app/templates/wizard/step3.hbs
index cb75709..b34c64d 100644
--- a/ambari-web/app/templates/wizard/step3.hbs
+++ b/ambari-web/app/templates/wizard/step3.hbs
@@ -24,10 +24,12 @@
-
- {{t installer.step3.removeSelected}}
-
+{{#unless isBackDisabled}}
+
+{{t installer.step3.removeSelected}}
+
+{{/unless}}
{{#unless isRetryDisabled}}
@@ -91,7 +93,7 @@
data-toggle="modal" {{action hostLogPopup host
target="controller"}}>{{host.bootStatusForDisplay}}
-
+
[3/3] ambari git commit: AMBARI-10278. Unable to create alert notification if invalid parameters don't refer to selected method (alexantonenko)
AMBARI-10278. Unable to create alert notification if invalid parameters don't
refer to selected method (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/03f96b25
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03f96b25
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03f96b25
Branch: refs/heads/trunk
Commit: 03f96b2513754e8846d3a093f448bc0054e0d896
Parents: 6fd09d2
Author: Alex Antonenko
Authored: Mon Mar 30 20:00:47 2015 +0300
Committer: Alex Antonenko
Committed: Mon Mar 30 20:00:47 2015 +0300
--
.../manage_alert_notifications_controller.js| 15 ++
...anage_alert_notifications_controller_test.js | 30 +++-
2 files changed, 44 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/03f96b25/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
--
diff --git
a/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
b/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
index 995f2ae..b215758 100644
---
a/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
+++
b/ambari-web/app/controllers/main/alerts/manage_alert_notifications_controller.js
@@ -350,6 +350,21 @@ App.ManageAlertNotificationsController =
Em.Controller.extend({
return this.get('controller.inputFields.method.value') === 'EMAIL';
}.property('controller.inputFields.method.value'),
+clearValidationErrors: function () {
+ var linkedErrorsMap = {
+ EMAIL: ['emailToError', 'emailFromError', 'smtpPortError',
'passwordError'],
+ SNMP: ['portError']
+},
+method = this.get('controller.inputFields.method.value');
+ Em.keys(linkedErrorsMap).forEach(function (name) {
+if (name != method) {
+ linkedErrorsMap[name].forEach(function (key) {
+this.set(key, false);
+ }, this);
+}
+ }, this);
+}.observes('controller.inputFields.method.value'),
+
nameValidation: function () {
var newName = this.get('controller.inputFields.name.value').trim();
var errorMessage = '';
http://git-wip-us.apache.org/repos/asf/ambari/blob/03f96b25/ambari-web/test/controllers/main/alerts/manage_alert_notifications_controller_test.js
--
diff --git
a/ambari-web/test/controllers/main/alerts/manage_alert_notifications_controller_test.js
b/ambari-web/test/controllers/main/alerts/manage_alert_notifications_controller_test.js
index b6cbc39..2b7fc4c 100644
---
a/ambari-web/test/controllers/main/alerts/manage_alert_notifications_controller_test.js
+++
b/ambari-web/test/controllers/main/alerts/manage_alert_notifications_controller_test.js
@@ -356,7 +356,8 @@ describe('App.ManageAlertNotificationsController', function
() {
global: {},
allGroups: {},
SMTPPassword: {},
- retypeSMTPPassword: {}
+ retypeSMTPPassword: {},
+ method: {}
}
}),
groupSelect: Em.Object.create({
@@ -462,6 +463,33 @@ describe('App.ManageAlertNotificationsController',
function () {
});
+ describe('#clearValidationErrors', function () {
+
+var cases = [
+ {
+method: 'EMAIL',
+errors: ['portError']
+ },
+ {
+method: 'SNMP',
+errors: ['emailToError', 'emailFromError', 'smtpPortError',
'passwordError']
+ }
+];
+
+cases.forEach(function (item) {
+ it(item.method, function () {
+item.errors.forEach(function (errorName) {
+ view.set(errorName, true);
+});
+view.set('controller.inputFields.method.value', item.method);
+item.errors.forEach(function (errorName) {
+ expect(view.get(errorName)).to.be.false;
+});
+ });
+});
+
+ });
+
});
});
[2/3] ambari git commit: AMBARI-10277. Add host wizard (step 2): Host checks spinner missing (alexantonenko)
AMBARI-10277. Add host wizard (step 2): Host checks spinner missing
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6fd09d24
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6fd09d24
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6fd09d24
Branch: refs/heads/trunk
Commit: 6fd09d24bf16d8ae76c9acc46df0ee95ffe131a1
Parents: d75309a
Author: Alex Antonenko
Authored: Mon Mar 30 19:58:11 2015 +0300
Committer: Alex Antonenko
Committed: Mon Mar 30 19:58:11 2015 +0300
--
ambari-web/app/controllers/wizard/step3_controller.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fd09d24/ambari-web/app/controllers/wizard/step3_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js
b/ambari-web/app/controllers/wizard/step3_controller.js
index 4c56afa..d68059e 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -534,7 +534,8 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
// Single host : if the only hostname is invalid (data.status == 'ERROR')
// Multiple hosts : if one or more hostnames are invalid
// following check will mark the bootStatus as 'FAILED' for the invalid
hostname
- if (data.status == 'ERROR' || data.hostsStatus.length !=
this.get('bootHosts').length) {
+ var installedHosts = App.Host.find().mapProperty('hostName');
+ if (data.status == 'ERROR' ||
data.hostsStatus.mapProperty('hostName').removeObjects(installedHosts).length
!= this.get('bootHosts').length) {
var hosts = this.get('bootHosts');
ambari git commit: AMBARI-4782. Error in getting host components with state INSTALL_FAILED.(vbrodetskyi)
Repository: ambari Updated Branches: refs/heads/trunk 8769adc35 -> 8c237ec86 AMBARI-4782. Error in getting host components with state INSTALL_FAILED.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8c237ec8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8c237ec8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8c237ec8 Branch: refs/heads/trunk Commit: 8c237ec8660ea728b7ec5632fd9ea555d2373d1a Parents: 8769adc Author: Vitaly Brodetskyi Authored: Mon Mar 30 18:10:23 2015 +0300 Committer: Vitaly Brodetskyi Committed: Mon Mar 30 18:10:38 2015 +0300 -- .../AmbariManagementControllerImpl.java | 107 +++ .../controller/ServiceComponentHostRequest.java | 16 +++ .../internal/HostComponentResourceProvider.java | 39 --- .../AmbariManagementControllerImplTest.java | 82 +- .../HostComponentResourceProviderTest.java | 4 +- 5 files changed, 180 insertions(+), 68 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/8c237ec8/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java index a3ede22..e0bbe9f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java @@ -18,44 +18,14 @@ package org.apache.ambari.server.controller; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.AMBARI_DB_RCA_DRIVER; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.AMBARI_DB_RCA_PASSWORD; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.AMBARI_DB_RCA_URL; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.AMBARI_DB_RCA_USERNAME; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.CLIENTS_TO_UPDATE_CONFIGS; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.COMMAND_TIMEOUT; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.DB_DRIVER_FILENAME; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.GROUP_LIST; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.HOOKS_FOLDER; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.PACKAGE_LIST; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.REPO_INFO; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SCRIPT_TYPE; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_PACKAGE_FOLDER; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_REPO_INFO; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.USER_LIST; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.VERSION; - -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; -import java.util.concurrent.TimeUnit; - +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; +import com.google.inject.Inject; +import com.google.inject.Injector; +import com.google.inject.Singleton; +import com.google.inject.persist.Transactional; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.ClusterNotFoundException; import org.apache.ambari.server.DuplicateResourceException; @@ -144,13 +114,42 @@ import org.apache.http.client.utils.URIBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; -import com.google.gson.Gson; -import com.google.inject.Inject; -import com.google.inject.Injector; -import com.google.inject.Singleton; -import com.google.inject.persist.Transactional; +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.text.MessageFormat; +impo
ambari git commit: AMBARI-10273 Changing of enhanced-config value should trigger /recommendations call. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk f15fce5bb -> 8769adc35
AMBARI-10273 Changing of enhanced-config value should trigger /recommendations
call. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8769adc3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8769adc3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8769adc3
Branch: refs/heads/trunk
Commit: 8769adc3536a11e73e49addaa3458958444b1336
Parents: f15fce5
Author: aBabiichuk
Authored: Mon Mar 30 16:18:11 2015 +0300
Committer: aBabiichuk
Committed: Mon Mar 30 17:48:42 2015 +0300
--
.../controllers/main/service/info/configs.js| 14 +-
ambari-web/app/messages.js | 2 +
.../mixins/common/configs/enhanced_configs.js | 139 +--
.../templates/common/configs/service_config.hbs | 5 +
.../configs/widgets/slider_config_widget.hbs| 2 +-
.../configs/widgets/config_widget_view.js | 21 ++-
.../widgets/slider_config_widget_view.js| 25
ambari-web/app/views/common/controls_view.js| 16 +--
.../dependent_configs_list_popup.js | 2 +-
9 files changed, 196 insertions(+), 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8769adc3/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 28c1a63..8c5d8ed 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -1198,14 +1198,20 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
* @method showWarningPopupsBeforeSave
*/
showWarningPopupsBeforeSave: function() {
-var displayName = this.get('content.displayName');
+var self = this;
if (this.isDirChanged()) {
- App.showConfirmationPopup(this.restartServicePopup.bind(this),
-
Em.I18n.t('services.service.config.confirmDirectoryChange').format(displayName),
+ App.showConfirmationPopup(function() {
+self.showChangedDependentConfigs(null, function() {
+ self.restartServicePopup();
+});
+ },
+
Em.I18n.t('services.service.config.confirmDirectoryChange').format(self.get('content.displayName')),
this.completeSave.bind(this)
);
} else {
- this.restartServicePopup();
+ self.showChangedDependentConfigs(null, function() {
+self.restartServicePopup();
+ });
}
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/8769adc3/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 42a0aaa..18fcd17 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -347,6 +347,8 @@ Em.I18n.translations = {
'popup.dependent.configs.select.config.group': 'Please select to which
config group would you like to save dependent properties',
+ 'popup.dependent.configs.dependencies.info': 'There are {0} configs was
changed in {1} services.',
+
'login.header':'Sign in',
'login.username':'Username',
'login.loginButton':'Sign in',
http://git-wip-us.apache.org/repos/asf/ambari/blob/8769adc3/ambari-web/app/mixins/common/configs/enhanced_configs.js
--
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 61c2a2e..6de333a 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -22,6 +22,30 @@ var blueprintUtils = require('utils/blueprint');
App.EnhancedConfigsMixin = Em.Mixin.create({
/**
+ * this value is used for observing
+ * whether recommendations for dependent properties was received from server
+ * @type {number}
+ */
+ recommendationTimeStamp: null,
+
+ /**
+ * flag is true when Ambari changes some of the dependent properties
+ * @type {boolean}
+ */
+ hasChangedDependencies: function() {
+return App.get('supports.enhancedConfigs') &&
this.get('_dependentConfigValues.length') > 0;
+ }.property('_dependentConfigValues.length'),
+
+ /**
+ * message fro alert box for dependent configs
+ * @type {string}
+ */
+ dependenciesMessage: function() {
+var changedServices =
this.get('changedProperties').mapProperty('serviceName').uniq();
+return Em.I18n.t('popup.dependent.configs.dependencies.info').format(
this.get('changedProperties.length'), changedServices.length);
+ }.property('chang
ambari git commit: AMBARI-10270. Running ambari-server setup -s should not do anything after already setup.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk 1cfd63b53 -> f15fce5bb
AMBARI-10270. Running ambari-server setup -s should not do anything after
already setup.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f15fce5b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f15fce5b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f15fce5b
Branch: refs/heads/trunk
Commit: f15fce5bb379cd0fa3540964fbb0c0e94fa47900
Parents: 1cfd63b
Author: Vitaly Brodetskyi
Authored: Mon Mar 30 16:21:06 2015 +0300
Committer: Vitaly Brodetskyi
Committed: Mon Mar 30 16:21:06 2015 +0300
--
.../src/main/python/ambari_server/serverSetup.py | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f15fce5b/ambari-server/src/main/python/ambari_server/serverSetup.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py
b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 9e15c43..5c51423 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -38,7 +38,7 @@ from ambari_server.serverConfiguration import configDefaults,
JDKRelease, \
get_resources_location, get_value_from_properties, read_ambari_user,
update_properties, validate_jdk, write_property, \
JAVA_HOME, JAVA_HOME_PROPERTY, JCE_NAME_PROPERTY, JDBC_RCA_URL_PROPERTY,
JDBC_URL_PROPERTY, \
JDK_NAME_PROPERTY, JDK_RELEASES, NR_USER_PROPERTY, OS_FAMILY,
OS_FAMILY_PROPERTY, OS_TYPE, OS_TYPE_PROPERTY, OS_VERSION, \
- SERVICE_PASSWORD_KEY, SERVICE_USERNAME_KEY, VIEWS_DIR_PROPERTY
+ SERVICE_PASSWORD_KEY, SERVICE_USERNAME_KEY, VIEWS_DIR_PROPERTY,
JDBC_DATABASE_PROPERTY
from ambari_server.serverUtils import is_server_runing
from ambari_server.setupSecurity import adjust_directory_permissions
from ambari_server.userInput import get_YN_input, get_validated_string_input
@@ -934,10 +934,23 @@ def expand_jce_zip_file(jce_zip_path, jdk_security_path):
shutil.rmtree(dir_to_delete)
+def check_setup_already_done():
+ properties = get_ambari_properties()
+ if properties == -1:
+print_error_msg("Error getting ambari properties")
+return -1
+
+ return properties.get_property(JDK_NAME_PROPERTY) and
properties.get_property(JDBC_DATABASE_PROPERTY)
+
#
# Setup the Ambari Server.
#
def setup(options):
+ if get_silent():
+if check_setup_already_done():
+ print "Nothing was done. Please, use ambari-server setup command without
[-s] key, to change configuration."
+ sys.exit(0)
+
retcode = verify_setup_allowed()
if not retcode == 0:
raise FatalException(1, None)
ambari git commit: AMBARI-10272. Host level configs should be shown as enhanced configs (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk d794a8470 -> 1cfd63b53
AMBARI-10272. Host level configs should be shown as enhanced configs
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cfd63b5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cfd63b5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cfd63b5
Branch: refs/heads/trunk
Commit: 1cfd63b538aefe41b6e347fd7ac943d5a95cc506
Parents: d794a84
Author: Oleg Nechiporenko
Authored: Mon Mar 30 16:06:29 2015 +0300
Committer: Oleg Nechiporenko
Committed: Mon Mar 30 16:06:29 2015 +0300
--
ambari-web/app/views/common/configs/service_config_view.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1cfd63b5/ambari-web/app/views/common/configs/service_config_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_view.js
b/ambari-web/app/views/common/configs/service_config_view.js
index 8c32494..3f06e15 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -42,7 +42,7 @@ App.ServiceConfigView = Em.View.extend({
* @returns {Boolean}
*/
supportsConfigLayout: function() {
-var supportedControllers = ['wizardStep7Controller',
'mainServiceInfoConfigsController'];
+var supportedControllers = ['wizardStep7Controller',
'mainServiceInfoConfigsController', 'mainHostServiceConfigsController'];
if (!App.get('supports.enhancedConfigs')) {
return false;
}
ambari git commit: AMBARI-10269. Config overrides have isOriginalSCP field as true, but should be false (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk d2e2a7914 -> d794a8470
AMBARI-10269. Config overrides have isOriginalSCP field as true, but should be
false (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d794a847
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d794a847
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d794a847
Branch: refs/heads/trunk
Commit: d794a8470e671d4188317c5a525cdabc92fa5407
Parents: d2e2a79
Author: Oleg Nechiporenko
Authored: Mon Mar 30 14:35:55 2015 +0300
Committer: Oleg Nechiporenko
Committed: Mon Mar 30 14:35:55 2015 +0300
--
.../controllers/main/service/info/configs.js| 96 +---
.../configs/widgets/slider_config_widget.hbs| 8 +-
ambari-web/app/views.js | 1 +
.../configs/selectable_popup_body_view.js | 58
.../configs/widgets/config_widget_view.js | 8 ++
.../widgets/slider_config_widget_view.js| 2 +-
6 files changed, 117 insertions(+), 56 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d794a847/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 670d06e..28c1a63 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -165,6 +165,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
/**
* Dropdown menu items in filter combobox
+ * @type {{attributeName: string, attributeValue: string, name: string,
selected: boolean}[]}
*/
filterColumns: function () {
var filterColumns = [];
@@ -183,7 +184,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
}.property('propertyFilters', 'isCompareMode'),
/**
- * indicate wtether service config version belongs to default config group
+ * indicate whether service config version belongs to default config group
* @method isVersionDefault
* @param version
* @return {Boolean}
@@ -202,26 +203,29 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
/**
* clear and set properties to default value
+ * @method clearStep
*/
clearStep: function () {
if (this.get('requestInProgress') &&
this.get('requestInProgress').readyState !== 4) {
this.get('requestInProgress').abort();
this.set('requestInProgress', null);
}
-this.set("saveInProgress", false);
-this.set('modifiedFileNames', []);
-this.set('isInit', true);
-this.set('hash', null);
-this.set('forceTransition', false);
-this.set('dataIsLoaded', false);
-this.set('versionLoaded', false);
-this.set('filter', '');
+this.setProperties({
+ saveInProgress: false,
+ modifiedFileNames: [],
+ isInit: true,
+ hash: null,
+ forceTransition: false,
+ dataIsLoaded: false,
+ versionLoaded: false,
+ filter: '',
+ loadedGroupToOverrideSiteToTagMap: {},
+ serviceConfigVersionNote: ''
+});
this.get('filterColumns').setEach('selected', false);
this.get('stepConfigs').clear();
this.get('allConfigs').clear();
this.get('uiConfigs').clear();
-this.set('loadedGroupToOverrideSiteToTagMap', {});
-this.set('serviceConfigVersionNote', '');
if (this.get('serviceConfigTags')) {
this.set('serviceConfigTags', null);
}
@@ -237,6 +241,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
* {String}
*/
hash: null,
+
/**
* Is this initial config group changing
* {Boolean}
@@ -245,6 +250,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
/**
* On load function
+ * @method loadStep
*/
loadStep: function () {
console.log("TRACE: Loading configure for service");
@@ -943,10 +949,12 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
this.get('stepConfigs').pushObject(serviceConfig);
this.set('selectedService', this.get('stepConfigs').objectAt(0));
this.checkForSecureConfig(this.get('selectedService'));
-this.set('dataIsLoaded', true);
-this.set('versionLoaded', true);
-this.set('hash', this.getHash());
-this.set('isInit', false);
+this.setProperties({
+ dataIsLoaded: true,
+ versionLoaded: true,
+ hash: this.getHash(),
+ isInit: false
+});
},
/**
@@ -1009,7 +1017,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
var defaultGroupSelect
ambari git commit: AMBARI-10268 Draw Gauge widget from the relevant retrieved widget data from the API. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 5cd8c291a -> d2e2a7914
AMBARI-10268 Draw Gauge widget from the relevant retrieved widget data from the
API. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d2e2a791
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d2e2a791
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d2e2a791
Branch: refs/heads/trunk
Commit: d2e2a79141afe440f713533f99ab98722c3084dd
Parents: 5cd8c29
Author: Andrii Tkach
Authored: Mon Mar 30 13:52:35 2015 +0300
Committer: Andrii Tkach
Committed: Mon Mar 30 13:52:35 2015 +0300
--
.../HBASE/Append_num_ops_&_Delete_num_ops.json | 6 +-
.../data/widget_layouts/HBASE/stack_layout.json | 32 +
.../controllers/main/service/info/summary.js| 3 +-
ambari-web/app/mixins/common/widget_mixin.js| 58 -
ambari-web/app/models/widget.js | 2 +
ambari-web/app/styles/widget_layout.less| 29 +++--
.../templates/common/widget/gauge_widget.hbs| 22
ambari-web/app/views.js | 3 +-
.../views/common/widget/gauge_widget_view.js| 120 +++
.../views/common/widget/graph_widget_view.js| 4 +-
.../views/common/widget/template_widget_view.js | 51 +---
.../test/mixins/common/widget_mixin_test.js | 80 +++--
12 files changed, 328 insertions(+), 82 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e2a791/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops_&_Delete_num_ops.json
--
diff --git
a/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops_&_Delete_num_ops.json
b/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops_&_Delete_num_ops.json
index 2db12a0..87e0294 100644
---
a/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops_&_Delete_num_ops.json
+++
b/ambari-web/app/assets/data/metrics/HBASE/Append_num_ops_&_Delete_num_ops.json
@@ -6,6 +6,10 @@
"service_name" : "HBASE"
},
"metrics" : {
+"jvm": {
+ "HeapMemoryUsed": 61,
+ "HeapMemoryMax": 100
+},
"hbase" : {
"ipc" : {
"IPC" : {
@@ -13,8 +17,8 @@
}
},
"regionserver" : {
+"percentFilesLocal" : 99,
"Server" : {
- "percentFilesLocal" : 99,
"Append_num_ops" : [
[
2.0,
http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e2a791/ambari-web/app/assets/data/widget_layouts/HBASE/stack_layout.json
--
diff --git a/ambari-web/app/assets/data/widget_layouts/HBASE/stack_layout.json
b/ambari-web/app/assets/data/widget_layouts/HBASE/stack_layout.json
index 4c8d3ee..6285138 100644
--- a/ambari-web/app/assets/data/widget_layouts/HBASE/stack_layout.json
+++ b/ambari-web/app/assets/data/widget_layouts/HBASE/stack_layout.json
@@ -72,6 +72,38 @@
"properties": {
"display_unit": "%"
}
+ },
+ {
+"widget_name": "NAMENODE_HEAP",
+"display_name": "NameNode Heap",
+"widget_type": "GAUGE",
+"description": "",
+"metrics":[
+ {
+"name": "java.lang:type=Memory.HeapMemoryUsage[used]",
+"widget_id": "metrics/jvm/HeapMemoryUsed",
+"category": "",
+"service_name": "HBASE",
+"component_name": "HBASE_REGIONSERVER"
+ },
+ {
+"name": "java.lang:type=Memory.HeapMemoryUsage[max]",
+"widget_id": "metrics/jvm/HeapMemoryMax",
+"category": "",
+"service_name": "HBASE",
+"component_name": "HBASE_REGIONSERVER"
+ }
+],
+"values": [
+ {
+"name": "NameNode heap",
+"value":
"${java.lang:type=Memory.HeapMemoryUsage[used]/java.lang:type=Memory.HeapMemoryUsage[max]}"
+ }
+],
+"properties": {
+ "warning_threshold": 0.9,
+ "error_threshold": 0.7
+}
}
]
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d2e2a791/ambari-web/app/controllers/main/service/info/summary.js
--
diff --git a/ambari-web/app/controllers/main/service/info/summary.js
b/ambari-web/app/controllers/main/service/info/summary.js
index ed5dbb9..d1d1be8 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -346,8 +346,7 @@ App.MainServiceInfoSummaryController =
Em.Controller.extend({
