ambari git commit: AMBARI-22069.Zeppelin JDBC queries should be split by default(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 c63880912 -> e305b9f08 AMBARI-22069.Zeppelin JDBC queries should be split by default(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e305b9f0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e305b9f0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e305b9f0 Branch: refs/heads/branch-2.6 Commit: e305b9f08bce5ab2eff05dadb803286f47ded173 Parents: c638809 Author: Venkata SairamAuthored: Wed Sep 27 19:48:45 2017 +0530 Committer: Venkata Sairam Committed: Wed Sep 27 19:48:45 2017 +0530 -- .../ZEPPELIN/0.7.0/package/scripts/master.py | 13 + 1 file changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/e305b9f0/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py index 8bdfaec..af5758a 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py @@ -326,6 +326,7 @@ class Master(Script): type="file", action="download_on_execute", source=self.getZeppelinConfFS(params), + user=params.zeppelin_user, group=params.zeppelin_group, owner=params.zeppelin_user) except Fail as fail: @@ -456,6 +457,9 @@ class Master(Script): interpreter['properties']['hive.url'] = 'jdbc:hive2://' + \ params.hive_server_host + \ ':' + params.hive_server_port + if 'hive.splitQueries' not in interpreter['properties']: +interpreter['properties']["hive.splitQueries"] = "true" + if params.hive_server_interactive_hosts: interpreter['properties'][hive_interactive_properties_key + '.driver'] = 'org.apache.hive.jdbc.HiveDriver' interpreter['properties'][hive_interactive_properties_key + '.user'] = 'hive' @@ -470,6 +474,8 @@ class Master(Script): interpreter['properties'][hive_interactive_properties_key + '.url'] = 'jdbc:hive2://' + \ params.hive_server_interactive_hosts + \ ':' + params.hive_server_port + if hive_interactive_properties_key + '.splitQueries' not in interpreter['properties']: +interpreter['properties'][hive_interactive_properties_key + '.splitQueries'] = "true" if params.spark_thrift_server_hosts: interpreter['properties']['spark.driver'] = 'org.apache.hive.jdbc.HiveDriver' @@ -480,6 +486,8 @@ class Master(Script): params.spark_thrift_server_hosts + ':' + params.spark_hive_thrift_port + '/' if params.spark_hive_principal: interpreter['properties']['spark.url'] += ';principal=' + params.spark_hive_principal + if 'spark.splitQueries' not in interpreter['properties']: +interpreter['properties']['spark.splitQueries'] = "true" if params.spark2_thrift_server_hosts: interpreter['properties']['spark2.driver'] = 'org.apache.hive.jdbc.HiveDriver' @@ -490,6 +498,8 @@ class Master(Script): params.spark2_thrift_server_hosts + ':' + params.spark2_hive_thrift_port + '/' if params.spark_hive_principal: interpreter['properties']['spark2.url'] += ';principal=' + params.spark2_hive_principal + if 'spark2.splitQueries' not in interpreter['properties']: +interpreter['properties']['spark2.splitQueries'] = "true" if params.zookeeper_znode_parent \ and params.hbase_zookeeper_quorum: @@ -500,6 +510,9 @@ class Master(Script): interpreter['properties']['phoenix.url'] = "jdbc:phoenix:" + \ params.hbase_zookeeper_quorum + ':' + \ params.zookeeper_znode_parent +if 'phoenix.splitQueries' not in interpreter['properties']: + interpreter['properties']['phoenix.splitQueries'] = "true" + elif interpreter['group'] == 'livy' and interpreter['name'] ==
ambari git commit: AMBARI-22069.Zeppelin JDBC queries should be split by default(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 407eb5435 -> f4e4fae8e AMBARI-22069.Zeppelin JDBC queries should be split by default(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4e4fae8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4e4fae8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4e4fae8 Branch: refs/heads/trunk Commit: f4e4fae8ef085a7e646ea0c5f986b00f10cfdfdc Parents: 407eb54 Author: Venkata SairamAuthored: Wed Sep 27 19:46:56 2017 +0530 Committer: Venkata Sairam Committed: Wed Sep 27 19:46:56 2017 +0530 -- .../ZEPPELIN/0.7.0/package/scripts/master.py | 13 + .../python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py| 6 +++--- 2 files changed, 16 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/f4e4fae8/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py index 8bdfaec..af5758a 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py @@ -326,6 +326,7 @@ class Master(Script): type="file", action="download_on_execute", source=self.getZeppelinConfFS(params), + user=params.zeppelin_user, group=params.zeppelin_group, owner=params.zeppelin_user) except Fail as fail: @@ -456,6 +457,9 @@ class Master(Script): interpreter['properties']['hive.url'] = 'jdbc:hive2://' + \ params.hive_server_host + \ ':' + params.hive_server_port + if 'hive.splitQueries' not in interpreter['properties']: +interpreter['properties']["hive.splitQueries"] = "true" + if params.hive_server_interactive_hosts: interpreter['properties'][hive_interactive_properties_key + '.driver'] = 'org.apache.hive.jdbc.HiveDriver' interpreter['properties'][hive_interactive_properties_key + '.user'] = 'hive' @@ -470,6 +474,8 @@ class Master(Script): interpreter['properties'][hive_interactive_properties_key + '.url'] = 'jdbc:hive2://' + \ params.hive_server_interactive_hosts + \ ':' + params.hive_server_port + if hive_interactive_properties_key + '.splitQueries' not in interpreter['properties']: +interpreter['properties'][hive_interactive_properties_key + '.splitQueries'] = "true" if params.spark_thrift_server_hosts: interpreter['properties']['spark.driver'] = 'org.apache.hive.jdbc.HiveDriver' @@ -480,6 +486,8 @@ class Master(Script): params.spark_thrift_server_hosts + ':' + params.spark_hive_thrift_port + '/' if params.spark_hive_principal: interpreter['properties']['spark.url'] += ';principal=' + params.spark_hive_principal + if 'spark.splitQueries' not in interpreter['properties']: +interpreter['properties']['spark.splitQueries'] = "true" if params.spark2_thrift_server_hosts: interpreter['properties']['spark2.driver'] = 'org.apache.hive.jdbc.HiveDriver' @@ -490,6 +498,8 @@ class Master(Script): params.spark2_thrift_server_hosts + ':' + params.spark2_hive_thrift_port + '/' if params.spark_hive_principal: interpreter['properties']['spark2.url'] += ';principal=' + params.spark2_hive_principal + if 'spark2.splitQueries' not in interpreter['properties']: +interpreter['properties']['spark2.splitQueries'] = "true" if params.zookeeper_znode_parent \ and params.hbase_zookeeper_quorum: @@ -500,6 +510,9 @@ class Master(Script): interpreter['properties']['phoenix.url'] = "jdbc:phoenix:" + \ params.hbase_zookeeper_quorum + ':' + \ params.zookeeper_znode_parent +if 'phoenix.splitQueries' not in interpreter['properties']: + interpreter['properties']['phoenix.splitQueries'] = "true" +
ambari git commit: AMBARI-22052.Zeppelin's conf HDFS directory owner is wrong(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 3c956c754 -> c8f566ef3 AMBARI-22052.Zeppelin's conf HDFS directory owner is wrong(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c8f566ef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c8f566ef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c8f566ef Branch: refs/heads/branch-2.6 Commit: c8f566ef3586ecb9f0dd33964b53b0b8f4770410 Parents: 3c956c7 Author: Venkata SairamAuthored: Tue Sep 26 16:11:14 2017 +0530 Committer: Venkata Sairam Committed: Tue Sep 26 16:11:14 2017 +0530 -- .../common-services/ZEPPELIN/0.7.0/package/scripts/master.py| 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c8f566ef/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py index 382566e..8bdfaec 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py @@ -358,6 +358,7 @@ class Master(Script): source=interpreter_config, group=params.zeppelin_group, owner=params.zeppelin_user, +user=params.zeppelin_user, replace_existing_files=True) def update_kerberos_properties(self):
ambari git commit: AMBARI-22052.Zeppelin's conf HDFS directory owner is wrong(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk ee618e124 -> 6a99bd8b9 AMBARI-22052.Zeppelin's conf HDFS directory owner is wrong(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6a99bd8b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6a99bd8b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6a99bd8b Branch: refs/heads/trunk Commit: 6a99bd8b9723b806c6b099fc3c6836bf96f66a43 Parents: ee618e1 Author: Venkata SairamAuthored: Tue Sep 26 16:05:03 2017 +0530 Committer: Venkata Sairam Committed: Tue Sep 26 16:05:03 2017 +0530 -- .../common-services/ZEPPELIN/0.7.0/package/scripts/master.py | 1 + .../src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/6a99bd8b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py index 382566e..8bdfaec 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py @@ -358,6 +358,7 @@ class Master(Script): source=interpreter_config, group=params.zeppelin_group, owner=params.zeppelin_user, +user=params.zeppelin_user, replace_existing_files=True) def update_kerberos_properties(self): http://git-wip-us.apache.org/repos/asf/ambari/blob/6a99bd8b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py -- diff --git a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py index f379f40..1fdbadb 100644 --- a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py +++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py @@ -337,7 +337,7 @@ class TestZeppelin070(RMFTestCase): hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site={u'a': u'b'}, kinit_path_local='/usr/bin/kinit', - user="hdfs", + user="zeppelin", owner="zeppelin", group="zeppelin", type='file', @@ -382,7 +382,7 @@ class TestZeppelin070(RMFTestCase): hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site={u'a': u'b'}, kinit_path_local='/usr/bin/kinit', - user="hdfs", + user="zeppelin", owner="zeppelin", group="zeppelin", type='file', @@ -427,7 +427,7 @@ class TestZeppelin070(RMFTestCase): hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore', hdfs_site={u'a': u'b'}, kinit_path_local='/usr/bin/kinit', - user="hdfs", + user="zeppelin", owner="zeppelin", group="zeppelin", type='file',
ambari git commit: AMBARI-22053.Zeppelin's version is wrong in alerts.json(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 8f87b4d9c -> ec37c9f6c AMBARI-22053.Zeppelin's version is wrong in alerts.json(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec37c9f6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec37c9f6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec37c9f6 Branch: refs/heads/branch-2.6 Commit: ec37c9f6c8137451b565dcf885a0e8bf1e6085b2 Parents: 8f87b4d Author: Venkata SairamAuthored: Tue Sep 26 14:10:27 2017 +0530 Committer: Venkata Sairam Committed: Tue Sep 26 14:10:27 2017 +0530 -- .../src/main/resources/common-services/ZEPPELIN/0.6.0/alerts.json | 2 +- .../src/main/resources/common-services/ZEPPELIN/0.7.0/alerts.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/ec37c9f6/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/alerts.json -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/alerts.json b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/alerts.json index 8e9b6e7..4b62236 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/alerts.json +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/alerts.json @@ -10,7 +10,7 @@ "scope": "ANY", "source": { "type": "SCRIPT", - "path": "ZEPPELIN/0.6.0.2.5/package/scripts/alert_check_zeppelin.py" + "path": "ZEPPELIN/0.6.0/package/scripts/alert_check_zeppelin.py" } } ] http://git-wip-us.apache.org/repos/asf/ambari/blob/ec37c9f6/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/alerts.json -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/alerts.json b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/alerts.json index 8e9b6e7..53dc4a2 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/alerts.json +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/alerts.json @@ -10,7 +10,7 @@ "scope": "ANY", "source": { "type": "SCRIPT", - "path": "ZEPPELIN/0.6.0.2.5/package/scripts/alert_check_zeppelin.py" + "path": "ZEPPELIN/0.7.0/package/scripts/alert_check_zeppelin.py" } } ]
ambari git commit: AMBARI-22021.Livy not working with the default configuration(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 412c7d2fc -> 7165eefa8 AMBARI-22021.Livy not working with the default configuration(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7165eefa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7165eefa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7165eefa Branch: refs/heads/branch-2.6 Commit: 7165eefa8feee0550769f3bc8019a11ea1574292 Parents: 412c7d2 Author: Venkata SairamAuthored: Fri Sep 22 12:46:55 2017 +0530 Committer: Venkata Sairam Committed: Fri Sep 22 12:47:32 2017 +0530 -- .../0.7.0/package/scripts/interpreter_json_template.py| 7 ++- .../ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py | 7 ++- 2 files changed, 12 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/7165eefa/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py index 6a98919..d5a70a7 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py @@ -182,7 +182,7 @@ template = ''' "zeppelin.livy.concurrentSQL": "false", "zeppelin.livy.spark.sql.field.truncate": "true", "livy.spark.executor.cores": "", -"zeppelin.livy.displayAppInfo": "false", +"zeppelin.livy.displayAppInfo": "true", "zeppelin.livy.url": "http://localhost:8998;, "livy.spark.dynamicAllocation.minExecutors": "", "livy.spark.driver.cores": "", @@ -240,6 +240,11 @@ template = ''' "language": "r", "editOnDblClick": false } +}, +{ + "name": "shared", + "class": "org.apache.zeppelin.livy.LivySharedInterpreter", + "defaultInterpreter": false } ], "dependencies": [], http://git-wip-us.apache.org/repos/asf/ambari/blob/7165eefa/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py index 71d3817..c9030bd 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py @@ -34,7 +34,7 @@ template = ''' "livy.spark.dynamicAllocation.initialExecutors": "", "zeppelin.livy.session.create_timeout": "120", "livy.spark.driver.memory": "", -"zeppelin.livy.displayAppInfo": "false", +"zeppelin.livy.displayAppInfo": "true", "livy.spark.jars.packages": "", "livy.spark.dynamicAllocation.maxExecutors": "", "zeppelin.livy.concurrentSQL": "false", @@ -90,6 +90,11 @@ template = ''' }, "name": "sparkr", "defaultInterpreter": false +}, +{ + "name": "shared", + "class": "org.apache.zeppelin.livy.LivySharedInterpreter", + "defaultInterpreter": false } ], "dependencies": [],
ambari git commit: AMBARI-22021.Livy not working with the default configuration(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 5d5f9749e -> d221ab786 AMBARI-22021.Livy not working with the default configuration(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d221ab78 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d221ab78 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d221ab78 Branch: refs/heads/trunk Commit: d221ab786277abf6d8e9e8dbc9442e37423484a4 Parents: 5d5f974 Author: Venkata SairamAuthored: Fri Sep 22 12:46:55 2017 +0530 Committer: Venkata Sairam Committed: Fri Sep 22 12:46:55 2017 +0530 -- .../0.7.0/package/scripts/interpreter_json_template.py| 7 ++- .../ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py | 7 ++- 2 files changed, 12 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/d221ab78/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py index 6a98919..d5a70a7 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py @@ -182,7 +182,7 @@ template = ''' "zeppelin.livy.concurrentSQL": "false", "zeppelin.livy.spark.sql.field.truncate": "true", "livy.spark.executor.cores": "", -"zeppelin.livy.displayAppInfo": "false", +"zeppelin.livy.displayAppInfo": "true", "zeppelin.livy.url": "http://localhost:8998;, "livy.spark.dynamicAllocation.minExecutors": "", "livy.spark.driver.cores": "", @@ -240,6 +240,11 @@ template = ''' "language": "r", "editOnDblClick": false } +}, +{ + "name": "shared", + "class": "org.apache.zeppelin.livy.LivySharedInterpreter", + "defaultInterpreter": false } ], "dependencies": [], http://git-wip-us.apache.org/repos/asf/ambari/blob/d221ab78/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py index 71d3817..c9030bd 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py @@ -34,7 +34,7 @@ template = ''' "livy.spark.dynamicAllocation.initialExecutors": "", "zeppelin.livy.session.create_timeout": "120", "livy.spark.driver.memory": "", -"zeppelin.livy.displayAppInfo": "false", +"zeppelin.livy.displayAppInfo": "true", "livy.spark.jars.packages": "", "livy.spark.dynamicAllocation.maxExecutors": "", "zeppelin.livy.concurrentSQL": "false", @@ -90,6 +90,11 @@ template = ''' }, "name": "sparkr", "defaultInterpreter": false +}, +{ + "name": "shared", + "class": "org.apache.zeppelin.livy.LivySharedInterpreter", + "defaultInterpreter": false } ], "dependencies": [],
ambari git commit: AMBARI-22002.Ambari Unit Tests Fail In trunk(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk c8832728a -> 8467a2048 AMBARI-22002.Ambari Unit Tests Fail In trunk(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8467a204 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8467a204 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8467a204 Branch: refs/heads/trunk Commit: 8467a2048300ac54caf84ad785a8cc0a96f3cb65 Parents: c883272 Author: Venkata SairamAuthored: Wed Sep 20 15:21:27 2017 +0530 Committer: Venkata Sairam Committed: Wed Sep 20 15:21:27 2017 +0530 -- .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py| 135 +-- 1 file changed, 125 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/8467a204/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py -- diff --git a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py index 9a28e68..b9b34e8 100644 --- a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py +++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py @@ -21,8 +21,7 @@ from ambari_commons import OSCheck import glob -import time -from mock.mock import MagicMock, patch, call +from mock.mock import MagicMock, patch from resource_management.core import sudo from stacks.utils.RMFTestCase import * @@ -34,7 +33,7 @@ import interpreter_json_generated new=MagicMock(return_value=interpreter_json_generated.template)) class TestZeppelin070(RMFTestCase): COMMON_SERVICES_PACKAGE_DIR = "ZEPPELIN/0.7.0/package" - STACK_VERSION = "2.5" + STACK_VERSION = "2.6" def assert_configure_default(self): self.assertResourceCalled('Directory', '/var/log/zeppelin', @@ -59,7 +58,7 @@ class TestZeppelin070(RMFTestCase): cd_access='a', ) self.assertResourceCalled('Execute', ( -'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo=True) + 'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo=True) self.assertResourceCalled('XmlConfig', 'zeppelin-site.xml', owner='zeppelin', group='zeppelin', @@ -118,7 +117,7 @@ class TestZeppelin070(RMFTestCase): cd_access='a', ) self.assertResourceCalled('Execute', ( -'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo=True) + 'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo=True) self.assertResourceCalled('XmlConfig', 'zeppelin-site.xml', owner='zeppelin', group='zeppelin', @@ -181,7 +180,7 @@ class TestZeppelin070(RMFTestCase): cd_access='a', ) self.assertResourceCalled('Execute', ( -'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), + 'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo=True, ) self.assertResourceCalled('Execute', @@ -200,7 +199,7 @@ class TestZeppelin070(RMFTestCase): ) self.assert_configure_default() self.assertResourceCalled('Execute', ( -'chown', '-R', u'zeppelin:zeppelin', '/etc/zeppelin'), + 'chown', '-R', u'zeppelin:zeppelin', '/etc/zeppelin'), sudo=True, ) @@ -215,7 +214,7 @@ class TestZeppelin070(RMFTestCase): ) self.assert_configure_secured() self.assertResourceCalled('Execute', ( -'chown', '-R', u'zeppelin:zeppelin', '/etc/zeppelin'), + 'chown', '-R', u'zeppelin:zeppelin', '/etc/zeppelin'), sudo=True, ) self.assertResourceCalled('Execute', ('chown', '-R', 'zeppelin:zeppelin', @@ -305,23 +304,139 @@ class TestZeppelin070(RMFTestCase): principal_name=UnknownConfigurationMock(), security_enabled=False, ) + +self.assertResourceCalled('HdfsResource', + '/etc/zeppelin/conf/interpreter.json', + hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin', + default_fs=u'hdfs://c6401.ambari.apache.org:8020', + hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
ambari git commit: AMBARI-21987.Store Zeppelin's interpreter.json in HDFS(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 f49cf54e9 -> c7b9348da AMBARI-21987.Store Zeppelin's interpreter.json in HDFS(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c7b9348d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7b9348d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7b9348d Branch: refs/heads/branch-2.6 Commit: c7b9348da34ce7d78c37eb93b254cdaf396bc061 Parents: f49cf54 Author: Venkata SairamAuthored: Wed Sep 20 12:02:29 2017 +0530 Committer: Venkata Sairam Committed: Wed Sep 20 12:02:29 2017 +0530 -- .../0.6.0/configuration/zeppelin-config.xml | 2 +- .../ZEPPELIN/0.6.0/package/scripts/master.py| 2 +- .../0.7.0/configuration/zeppelin-config.xml | 8 ++- .../ZEPPELIN/0.7.0/package/scripts/master.py| 67 4 files changed, 63 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c7b9348d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/configuration/zeppelin-config.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/configuration/zeppelin-config.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/configuration/zeppelin-config.xml index bd6ad76..03ad5f7 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/configuration/zeppelin-config.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/configuration/zeppelin-config.xml @@ -77,7 +77,7 @@ zeppelin.notebook.storage -org.apache.zeppelin.notebook.repo.HdfsNotebookRepo +org.apache.zeppelin.notebook.repo.VFSNotebookRepo notebook persistence layer implementation. If S3 is used, set this to org.apache.zeppelin.notebook.repo.S3NotebookRepo instead. If S3 is used to store the notebooks, it is necessary to use the following folder structure http://git-wip-us.apache.org/repos/asf/ambari/blob/c7b9348d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py index ba73d10..0fdc27c 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py @@ -242,7 +242,7 @@ class Master(Script): os.path.join(params.zeppelin_dir, "notebook")), sudo=True) if 'zeppelin.notebook.storage' in params.config['configurations']['zeppelin-config'] \ -and params.config['configurations']['zeppelin-config']['zeppelin.notebook.storage'] == 'org.apache.zeppelin.notebook.repo.HdfsNotebookRepo': +and params.config['configurations']['zeppelin-config']['zeppelin.notebook.storage'] == 'org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo': self.check_and_copy_notebook_in_hdfs(params) if params.security_enabled: http://git-wip-us.apache.org/repos/asf/ambari/blob/c7b9348d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml index bd6ad76..29821f2 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml @@ -77,7 +77,7 @@ zeppelin.notebook.storage -org.apache.zeppelin.notebook.repo.HdfsNotebookRepo +org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo notebook persistence layer implementation. If S3 is used, set this to org.apache.zeppelin.notebook.repo.S3NotebookRepo instead. If S3 is used to store the notebooks, it is necessary to use the following folder structure @@ -86,6 +86,12 @@ +zeppelin.config.fs.dir +conf +Location where interpreter.json should be installed + + + zeppelin.interpreter.dir interpreter Interpreter implementation base directory
[1/2] ambari git commit: AMBARI-21987.Store Zeppelin's interpreter.json in HDFS(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 87c4205c2 -> a90f3b36c http://git-wip-us.apache.org/repos/asf/ambari/blob/a90f3b36/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py -- diff --git a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py new file mode 100644 index 000..1d2cf86 --- /dev/null +++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/interpreter_json_generated.py @@ -0,0 +1,27 @@ +#!/usr/bin/env python +""" +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +""" + +template = '\n{\n "interpreterSettings": {\n"2CKEKWY8Z": {\n "id": "2CKEKWY8Z",\n "name": "angular",\n "group": "angular",\n "properties": {},\n "status": "READY",\n "interpreterGroup": [\n {\n "name": "angular",\n "class": "org.apache.zeppelin.angular.AngularInterpreter",\n "defaultInterpreter": false,\n "editor": {\n "editOnDblClick": true\n }\n}\n ],\n "dependencies": [],\n "option": {\n"remote": true,\n"port": -1,\n "perNote": "shared",\n"perUser": "shared",\n "isExistingProcess": false,\n"setPermission": false,\n"users": [],\n"isUserImpersonate": false\n }\n},\n"2CKX8WPU1": {\n "id": "2CKX8WPU1",\n "name": "spark",\n "group": "spark",\n "properties": {\n"spark.executor.memory": "512m",\n"args": "",\n"zeppelin.spark.printREPLOutput": "true",\n "spark.cores.max": "",\n "zeppelin.dep.additionalRemoteRepository": "spark-packages,http://dl.bintray.com/spark-packages/maven,false;",\n "zeppelin.spark.sql.stacktrace": "false",\n "zeppelin.spark.importImplicit": "true",\n "zeppelin.spark.concurrentSQL": "false",\n "zeppelin.spark.useHiveContext": "true",\n"zeppelin.pyspark.python": "python",\n"zeppelin.dep.localrepo": "local-repo",\n "zeppelin.R.knitr": "true",\n"zeppelin.spark.maxResult": "1000",\n "master": "yarn-client",\n"spark.app.name": "Zeppelin",\n "zeppelin.R.image.width": "100%",\n"zeppelin.R.render.options": "out.format \\u003d \\u0027html\\u0027, comment \\u003d NA, echo \\u003d FALSE, results \\u003d \\u0027asis\\u0027, message \\u003d F, warning \\u003d F",\n "zeppelin.R.cmd": "R"\n },\n "status": "READY",\n "interpreterGroup": [\n{\n "name": "spark",\n "class": "org .apache.zeppelin.spark.SparkInterpreter",\n "defaultInterpreter": true,\n "editor": {\n"language": "scala"\n }\n },\n{\n "name": "sql",\n "class": "org.apache.zeppelin.spark.SparkSqlInterpreter",\n "defaultInterpreter": false,\n "editor": {\n"language": "sql"\n }\n},\n{\n "name": "dep",\n "class": "org.apache.zeppelin.spark.DepInterpreter",\n "defaultInterpreter": false,\n "editor": {\n"language": "scala"\n }\n},\n{\n "name": "pyspark",\n "class": "org.apache.zeppelin.spark.PySparkInterpreter",\n "defaultInterpreter": false,\n "editor": {\n"language": "python"\n }\n},\n{\n "name": "r",\n "class": "org.apache.zeppelin.spark.SparkRInterpreter",\n "defaultInterpreter": false,\n "edi tor": {\n"language": "r"\n }\n}\n ],\n "dependencies": [],\n "option": {\n"remote": true,\n "port": -1,\n"perNote": "shared",\n"perUser": "shared",\n "isExistingProcess": false,\n"setPermission": false,\n"users": [],\n"isUserImpersonate": false\n }\n},\n"2CK8A9MEG": {\n "id": "2CK8A9MEG",\n "name": "jdbc",\n "group": "jdbc",\n "properties": {\n"default.password":
[2/2] ambari git commit: AMBARI-21987.Store Zeppelin's interpreter.json in HDFS(Prabhjyot Singh via Venkata Sairam)
AMBARI-21987.Store Zeppelin's interpreter.json in HDFS(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a90f3b36 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a90f3b36 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a90f3b36 Branch: refs/heads/trunk Commit: a90f3b36c878e30b9ecab678b9736f83254b Parents: 87c4205 Author: Venkata SairamAuthored: Wed Sep 20 12:00:54 2017 +0530 Committer: Venkata Sairam Committed: Wed Sep 20 12:00:54 2017 +0530 -- .../0.6.0/configuration/zeppelin-config.xml | 2 +- .../ZEPPELIN/0.6.0/package/scripts/master.py| 2 +- .../0.7.0/configuration/zeppelin-config.xml | 8 +- .../ZEPPELIN/0.7.0/package/scripts/master.py| 67 +++- .../stacks/2.5/ZEPPELIN/test_zeppelin_060.py| 339 +++ .../stacks/2.5/ZEPPELIN/test_zeppelin_master.py | 339 --- .../test/python/stacks/2.5/configs/default.json | 54 +-- .../test/python/stacks/2.5/configs/secured.json | 72 ++-- .../2.6/ZEPPELIN/interpreter_json_generated.py | 27 ++ .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py| 327 ++ .../test/python/stacks/2.6/configs/default.json | 80 ++--- 11 files changed, 861 insertions(+), 456 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a90f3b36/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/configuration/zeppelin-config.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/configuration/zeppelin-config.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/configuration/zeppelin-config.xml index bd6ad76..03ad5f7 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/configuration/zeppelin-config.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/configuration/zeppelin-config.xml @@ -77,7 +77,7 @@ zeppelin.notebook.storage -org.apache.zeppelin.notebook.repo.HdfsNotebookRepo +org.apache.zeppelin.notebook.repo.VFSNotebookRepo notebook persistence layer implementation. If S3 is used, set this to org.apache.zeppelin.notebook.repo.S3NotebookRepo instead. If S3 is used to store the notebooks, it is necessary to use the following folder structure http://git-wip-us.apache.org/repos/asf/ambari/blob/a90f3b36/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py index ba73d10..0fdc27c 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py @@ -242,7 +242,7 @@ class Master(Script): os.path.join(params.zeppelin_dir, "notebook")), sudo=True) if 'zeppelin.notebook.storage' in params.config['configurations']['zeppelin-config'] \ -and params.config['configurations']['zeppelin-config']['zeppelin.notebook.storage'] == 'org.apache.zeppelin.notebook.repo.HdfsNotebookRepo': +and params.config['configurations']['zeppelin-config']['zeppelin.notebook.storage'] == 'org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo': self.check_and_copy_notebook_in_hdfs(params) if params.security_enabled: http://git-wip-us.apache.org/repos/asf/ambari/blob/a90f3b36/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml index ca6b295..171b7eb 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/configuration/zeppelin-config.xml @@ -77,7 +77,7 @@ zeppelin.notebook.storage -org.apache.zeppelin.notebook.repo.HdfsNotebookRepo +org.apache.zeppelin.notebook.repo.FileSystemNotebookRepo notebook persistence layer implementation. If S3 is used, set this to org.apache.zeppelin.notebook.repo.S3NotebookRepo instead. If S3 is used to store the notebooks, it is necessary to use the following folder
[4/4] ambari git commit: AMBARI-21901.Add 0.7.x stack definition for Zeppelin(Prabhjyot Singh via Venkata Sairam)
AMBARI-21901.Add 0.7.x stack definition for Zeppelin(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/78afc58d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/78afc58d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/78afc58d Branch: refs/heads/branch-2.6 Commit: 78afc58daaec7dc8c0e747a0bd4204d485146444 Parents: 395cf3b Author: Venkata SairamAuthored: Mon Sep 18 12:28:14 2017 +0530 Committer: Venkata Sairam Committed: Mon Sep 18 12:28:14 2017 +0530 -- .../ZEPPELIN/0.6.0.2.5/alerts.json | 18 - .../0.6.0.2.5/configuration/zeppelin-config.xml | 208 .../0.6.0.2.5/configuration/zeppelin-env.xml| 185 --- .../configuration/zeppelin-log4j-properties.xml | 37 -- .../configuration/zeppelin-logsearch-conf.xml | 80 --- .../configuration/zeppelin-shiro-ini.xml| 97 .../ZEPPELIN/0.6.0.2.5/kerberos.json| 51 -- .../ZEPPELIN/0.6.0.2.5/metainfo.xml | 103 .../package/scripts/alert_check_zeppelin.py | 47 -- .../scripts/interpreter_json_template.py| 361 - .../package/scripts/livy2_config_template.py| 107 .../0.6.0.2.5/package/scripts/master.py | 522 --- .../0.6.0.2.5/package/scripts/params.py | 258 - .../0.6.0.2.5/package/scripts/service_check.py | 40 -- .../package/scripts/spark2_config_template.py | 84 --- .../0.6.0.2.5/package/scripts/status_params.py | 29 -- .../0.6.0.2.5/quicklinks/quicklinks.json| 35 -- .../common-services/ZEPPELIN/0.6.0/alerts.json | 18 + .../0.6.0/configuration/zeppelin-config.xml | 208 .../0.6.0/configuration/zeppelin-env.xml| 185 +++ .../configuration/zeppelin-log4j-properties.xml | 37 ++ .../configuration/zeppelin-logsearch-conf.xml | 80 +++ .../0.6.0/configuration/zeppelin-shiro-ini.xml | 97 .../ZEPPELIN/0.6.0/kerberos.json| 51 ++ .../common-services/ZEPPELIN/0.6.0/metainfo.xml | 103 .../package/scripts/alert_check_zeppelin.py | 47 ++ .../scripts/interpreter_json_template.py| 361 + .../package/scripts/livy2_config_template.py| 107 .../ZEPPELIN/0.6.0/package/scripts/master.py| 522 +++ .../ZEPPELIN/0.6.0/package/scripts/params.py| 258 + .../0.6.0/package/scripts/service_check.py | 40 ++ .../package/scripts/spark2_config_template.py | 84 +++ .../0.6.0/package/scripts/status_params.py | 29 ++ .../ZEPPELIN/0.6.0/quicklinks/quicklinks.json | 35 ++ .../common-services/ZEPPELIN/0.7.0/alerts.json | 18 + .../0.7.0/configuration/zeppelin-config.xml | 208 .../0.7.0/configuration/zeppelin-env.xml| 185 +++ .../configuration/zeppelin-log4j-properties.xml | 37 ++ .../configuration/zeppelin-logsearch-conf.xml | 80 +++ .../0.7.0/configuration/zeppelin-shiro-ini.xml | 97 .../ZEPPELIN/0.7.0/kerberos.json| 51 ++ .../common-services/ZEPPELIN/0.7.0/metainfo.xml | 103 .../package/scripts/alert_check_zeppelin.py | 47 ++ .../scripts/interpreter_json_template.py| 361 + .../package/scripts/livy2_config_template.py| 107 .../ZEPPELIN/0.7.0/package/scripts/master.py| 522 +++ .../ZEPPELIN/0.7.0/package/scripts/params.py| 258 + .../0.7.0/package/scripts/service_check.py | 40 ++ .../package/scripts/spark2_config_template.py | 84 +++ .../0.7.0/package/scripts/status_params.py | 29 ++ .../ZEPPELIN/0.7.0/quicklinks/quicklinks.json | 35 ++ .../HDP/2.5/services/ZEPPELIN/metainfo.xml | 4 +- .../HDP/2.6/services/ZEPPELIN/metainfo.xml | 21 +- 53 files changed, 4546 insertions(+), 2265 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/78afc58d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/alerts.json -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/alerts.json b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/alerts.json deleted file mode 100644 index 8e9b6e7..000 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/alerts.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "ZEPPELIN": { -"service": [], -"ZEPPELIN_MASTER": [ - { -"name": "zeppelin_server_status", -"label": "Zeppelin Server Status", -"description": "This host-level alert is triggered if the Zeppelin server cannot be determined to be up and responding to client requests.", -"interval": 1, -"scope": "ANY",
[2/4] ambari git commit: AMBARI-21901.Add 0.7.x stack definition for Zeppelin(Prabhjyot Singh via Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/78afc58d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py new file mode 100644 index 000..ba73d10 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py @@ -0,0 +1,522 @@ +#!/usr/bin/env python +""" +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +""" + +import glob +import os + +from resource_management.core import shell, sudo +from resource_management.core.logger import Logger +from resource_management.core.resources import Directory +from resource_management.core.resources.system import Execute, File +from resource_management.core.source import InlineTemplate +from resource_management.libraries import XmlConfig +from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions import get_kinit_path +from resource_management.libraries.functions import stack_select +from resource_management.libraries.functions.check_process_status import check_process_status +from resource_management.libraries.functions.default import default +from resource_management.libraries.functions.format import format +from resource_management.libraries.functions.stack_features import check_stack_feature +from resource_management.libraries.functions.version import format_stack_version +from resource_management.libraries.script.script import Script + + +class Master(Script): + def install(self, env): +import params +env.set_params(params) +self.install_packages(env) + +self.create_zeppelin_log_dir(env) + +if params.spark_version: + Execute('echo spark_version:' + str(params.spark_version) + ' detected for spark_home: ' + + params.spark_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user) +if params.spark2_version: + Execute('echo spark2_version:' + str(params.spark2_version) + ' detected for spark2_home: ' + + params.spark2_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user) + + def create_zeppelin_dir(self, params): +params.HdfsResource(format("/user/{zeppelin_user}"), +type="directory", +action="create_on_execute", +owner=params.zeppelin_user, +recursive_chown=True, +recursive_chmod=True +) +params.HdfsResource(format("/user/{zeppelin_user}/test"), +type="directory", +action="create_on_execute", +owner=params.zeppelin_user, +recursive_chown=True, +recursive_chmod=True +) +params.HdfsResource(format("/apps/zeppelin"), +type="directory", +action="create_on_execute", +owner=params.zeppelin_user, +recursive_chown=True, +recursive_chmod=True +) + +spark_deps_full_path = self.get_zeppelin_spark_dependencies()[0] +spark_dep_file_name = os.path.basename(spark_deps_full_path) + +params.HdfsResource(params.spark_jar_dir + "/" + spark_dep_file_name, +type="file", +action="create_on_execute", +source=spark_deps_full_path, +group=params.zeppelin_group, +owner=params.zeppelin_user, +mode=0444, +replace_existing_files=True, +) + +params.HdfsResource(None, action="execute") + + def create_zeppelin_log_dir(self, env): +import params +env.set_params(params) +Directory([params.zeppelin_log_dir], + owner=params.zeppelin_user, + group=params.zeppelin_group, + cd_access="a", +
[3/4] ambari git commit: AMBARI-21901.Add 0.7.x stack definition for Zeppelin(Prabhjyot Singh via Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/78afc58d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py deleted file mode 100644 index e07da18..000 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py +++ /dev/null @@ -1,258 +0,0 @@ -#!/usr/bin/env python -""" -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -""" - -import functools -import os -import re -from resource_management.libraries.functions import StackFeature -from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import get_kinit_path -from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions.default import default -from resource_management.libraries.functions.format import format -from resource_management.libraries.functions.get_stack_version import get_stack_version -from resource_management.libraries.functions.stack_features import check_stack_feature -from resource_management.libraries.functions.version import format_stack_version, get_major_version -from resource_management.libraries.resources.hdfs_resource import HdfsResource -from resource_management.libraries.script.script import Script - -def get_port_from_url(address): - if not (address is None): -return address.split(':')[-1] - else: -return address - -def extract_spark_version(spark_home): - try: -with open(spark_home + "/RELEASE") as fline: - return re.search('Spark (\d\.\d).+', fline.readline().rstrip()).group(1) - except: -pass - return None - - -# server configurations -config = Script.get_config() -stack_root = Script.get_stack_root() - -# e.g. /var/lib/ambari-agent/cache/stacks/HDP/2.2/services/zeppelin-stack/package -service_packagedir = os.path.realpath(__file__).split('/scripts')[0] - -zeppelin_dirname = 'zeppelin-server' - -install_dir = os.path.join(stack_root, "current") -executor_mem = config['configurations']['zeppelin-env']['zeppelin.executor.mem'] -executor_instances = config['configurations']['zeppelin-env'][ - 'zeppelin.executor.instances'] - -security_enabled = config['configurations']['cluster-env']['security_enabled'] - -spark_jar_dir = config['configurations']['zeppelin-env']['zeppelin.spark.jar.dir'] -spark_jar = format("{spark_jar_dir}/zeppelin-spark-0.5.5-SNAPSHOT.jar") -setup_view = True -temp_file = config['configurations']['zeppelin-env']['zeppelin.temp.file'] - -spark_home = "" -spark_version = None -spark2_home = "" -spark2_version = None -if 'spark-defaults' in config['configurations']: - spark_home = os.path.join(stack_root, "current", 'spark-client') - spark_version = extract_spark_version(spark_home) -if 'spark2-defaults' in config['configurations']: - spark2_home = os.path.join(stack_root, "current", 'spark2-client') - spark2_version = extract_spark_version(spark2_home) - -# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade -version = default("/commandParams/version", None) -stack_name = default("/hostLevelParams/stack_name", None) - -# params from zeppelin-config -zeppelin_port = str(config['configurations']['zeppelin-config']['zeppelin.server.port']) -zeppelin_interpreter = None -if 'zeppelin.interpreter.group.order' in config['configurations']['zeppelin-config']: - zeppelin_interpreter = str(config['configurations']['zeppelin-config'] - ['zeppelin.interpreter.group.order']).split(",") - -# params from zeppelin-env -zeppelin_user = config['configurations']['zeppelin-env']['zeppelin_user'] -zeppelin_group = config['configurations']['zeppelin-env']['zeppelin_group'] -zeppelin_log_dir = config['configurations']['zeppelin-env']['zeppelin_log_dir'] -zeppelin_pid_dir = config['configurations']['zeppelin-env']['zeppelin_pid_dir'] -zeppelin_log_file = os.path.join(zeppelin_log_dir, 'zeppelin-setup.log') -zeppelin_hdfs_user_dir = format("/user/{zeppelin_user}") -
[1/4] ambari git commit: AMBARI-21901.Add 0.7.x stack definition for Zeppelin(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 395cf3b59 -> 78afc58da http://git-wip-us.apache.org/repos/asf/ambari/blob/78afc58d/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py new file mode 100644 index 000..6a98919 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py @@ -0,0 +1,361 @@ +#!/usr/bin/env python +""" +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +""" + +template = ''' +{ + "interpreterSettings": { +"2CKEKWY8Z": { + "id": "2CKEKWY8Z", + "name": "angular", + "group": "angular", + "properties": {}, + "status": "READY", + "interpreterGroup": [ +{ + "name": "angular", + "class": "org.apache.zeppelin.angular.AngularInterpreter", + "defaultInterpreter": false, + "editor": { +"editOnDblClick": true + } +} + ], + "dependencies": [], + "option": { +"remote": true, +"port": -1, +"perNote": "shared", +"perUser": "shared", +"isExistingProcess": false, +"setPermission": false, +"users": [], +"isUserImpersonate": false + } +}, +"2CKX8WPU1": { + "id": "2CKX8WPU1", + "name": "spark", + "group": "spark", + "properties": { +"spark.executor.memory": "512m", +"args": "", +"zeppelin.spark.printREPLOutput": "true", +"spark.cores.max": "", +"zeppelin.dep.additionalRemoteRepository": "spark-packages,http://dl.bintray.com/spark-packages/maven,false;;, +"zeppelin.spark.sql.stacktrace": "false", +"zeppelin.spark.importImplicit": "true", +"zeppelin.spark.concurrentSQL": "false", +"zeppelin.spark.useHiveContext": "true", +"zeppelin.pyspark.python": "python", +"zeppelin.dep.localrepo": "local-repo", +"zeppelin.R.knitr": "true", +"zeppelin.spark.maxResult": "1000", +"master": "yarn-client", +"spark.app.name": "Zeppelin", +"zeppelin.R.image.width": "100%", +"zeppelin.R.render.options": "out.format \u003d \u0027html\u0027, comment \u003d NA, echo \u003d FALSE, results \u003d \u0027asis\u0027, message \u003d F, warning \u003d F", +"zeppelin.R.cmd": "R" + }, + "status": "READY", + "interpreterGroup": [ +{ + "name": "spark", + "class": "org.apache.zeppelin.spark.SparkInterpreter", + "defaultInterpreter": true, + "editor": { +"language": "scala" + } +}, +{ + "name": "sql", + "class": "org.apache.zeppelin.spark.SparkSqlInterpreter", + "defaultInterpreter": false, + "editor": { +"language": "sql" + } +}, +{ + "name": "dep", + "class": "org.apache.zeppelin.spark.DepInterpreter", + "defaultInterpreter": false, + "editor": { +"language": "scala" + } +}, +{ + "name": "pyspark", + "class": "org.apache.zeppelin.spark.PySparkInterpreter", + "defaultInterpreter": false, + "editor": { +"language": "python" + } +}, +{ + "name": "r", + "class": "org.apache.zeppelin.spark.SparkRInterpreter", + "defaultInterpreter": false, + "editor": { +"language": "r" + } +} + ], + "dependencies": [], + "option": { +"remote": true, +"port": -1, +"perNote": "shared", +"perUser": "shared", +"isExistingProcess": false, +"setPermission": false, +"users": [], +"isUserImpersonate": false + } +}, +"2CK8A9MEG": { + "id": "2CK8A9MEG", + "name": "jdbc", +
[3/5] ambari git commit: AMBARI-21901.Add 0.7.x stack definition for Zeppelin(Prabhjyot Singh via Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/190094ba/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/package/scripts/params.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/package/scripts/params.py deleted file mode 100644 index 2340df9..000 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/package/scripts/params.py +++ /dev/null @@ -1,228 +0,0 @@ -#!/usr/bin/env python -""" -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -""" - -import functools -import os -import re -from resource_management.libraries.functions import StackFeature -from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import get_kinit_path -from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions.default import default -from resource_management.libraries.functions.format import format -from resource_management.libraries.functions.get_stack_version import get_stack_version -from resource_management.libraries.functions.stack_features import check_stack_feature -from resource_management.libraries.functions.version import format_stack_version -from resource_management.libraries.resources.hdfs_resource import HdfsResource -from resource_management.libraries.script.script import Script - -def get_port_from_url(address): - if not (address is None): -return address.split(':')[-1] - else: -return address - -def extract_spark_version(spark_home): - try: -with open(spark_home + "/RELEASE") as fline: - return re.search('Spark (\d\.\d).+', fline.readline().rstrip()).group(1) - except: -pass - return None - - -# server configurations -config = Script.get_config() -stack_root = Script.get_stack_root() - -# e.g. /var/lib/ambari-agent/cache/stacks/HDP/2.2/services/zeppelin-stack/package -service_packagedir = os.path.realpath(__file__).split('/scripts')[0] - -zeppelin_dirname = 'zeppelin-server' - -install_dir = os.path.join(stack_root, "current") -executor_mem = config['configurations']['zeppelin-env']['zeppelin.executor.mem'] -executor_instances = config['configurations']['zeppelin-env'][ - 'zeppelin.executor.instances'] - -spark_jar_dir = config['configurations']['zeppelin-env']['zeppelin.spark.jar.dir'] -spark_jar = format("{spark_jar_dir}/zeppelin-spark-0.5.5-SNAPSHOT.jar") -setup_view = True -temp_file = config['configurations']['zeppelin-env']['zeppelin.temp.file'] - -spark_home = "" -spark_version = None -spark2_home = "" -spark2_version = None -if 'spark-defaults' in config['configurations']: - spark_home = os.path.join(stack_root, "current", 'spark-client') - spark_version = extract_spark_version(spark_home) -if 'spark2-defaults' in config['configurations']: - spark2_home = os.path.join(stack_root, "current", 'spark2-client') - spark2_version = extract_spark_version(spark2_home) - -# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade -version = default("/commandParams/version", None) -stack_name = default("/hostLevelParams/stack_name", None) - -# params from zeppelin-config -zeppelin_port = str(config['configurations']['zeppelin-config']['zeppelin.server.port']) -zeppelin_interpreter = None -if 'zeppelin.interpreter.group.order' in config['configurations']['zeppelin-config']: - zeppelin_interpreter = str(config['configurations']['zeppelin-config'] - ['zeppelin.interpreter.group.order']).split(",") - -# params from zeppelin-env -zeppelin_user = config['configurations']['zeppelin-env']['zeppelin_user'] -zeppelin_group = config['configurations']['zeppelin-env']['zeppelin_group'] -zeppelin_log_dir = config['configurations']['zeppelin-env']['zeppelin_log_dir'] -zeppelin_pid_dir = config['configurations']['zeppelin-env']['zeppelin_pid_dir'] -zeppelin_log_file = os.path.join(zeppelin_log_dir, 'zeppelin-setup.log') -zeppelin_hdfs_user_dir = format("/user/{zeppelin_user}") - -zeppelin_dir = os.path.join(*[install_dir, zeppelin_dirname]) -conf_dir = "/etc/zeppelin/conf"
[4/5] ambari git commit: AMBARI-21901.Add 0.7.x stack definition for Zeppelin(Prabhjyot Singh via Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/190094ba/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py deleted file mode 100644 index 3242f26..000 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py +++ /dev/null @@ -1,258 +0,0 @@ -#!/usr/bin/env python -""" -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -""" - -import functools -import os -import re -from resource_management.libraries.functions import StackFeature -from resource_management.libraries.functions import conf_select -from resource_management.libraries.functions import get_kinit_path -from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions.default import default -from resource_management.libraries.functions.format import format -from resource_management.libraries.functions.get_stack_version import get_stack_version -from resource_management.libraries.functions.stack_features import check_stack_feature -from resource_management.libraries.functions.version import format_stack_version, get_major_version -from resource_management.libraries.resources.hdfs_resource import HdfsResource -from resource_management.libraries.script.script import Script - -def get_port_from_url(address): - if not (address is None): -return address.split(':')[-1] - else: -return address - -def extract_spark_version(spark_home): - try: -with open(spark_home + "/RELEASE") as fline: - return re.search('Spark (\d\.\d).+', fline.readline().rstrip()).group(1) - except: -pass - return None - - -# server configurations -config = Script.get_config() -stack_root = Script.get_stack_root() - -# e.g. /var/lib/ambari-agent/cache/stacks/HDP/2.2/services/zeppelin-stack/package -service_packagedir = os.path.realpath(__file__).split('/scripts')[0] - -zeppelin_dirname = 'zeppelin-server' - -install_dir = os.path.join(stack_root, "current") -executor_mem = config['configurations']['zeppelin-env']['zeppelin.executor.mem'] -executor_instances = config['configurations']['zeppelin-env'][ - 'zeppelin.executor.instances'] - -security_enabled = config['configurations']['cluster-env']['security_enabled'] - -spark_jar_dir = config['configurations']['zeppelin-env']['zeppelin.spark.jar.dir'] -spark_jar = format("{spark_jar_dir}/zeppelin-spark-0.5.5-SNAPSHOT.jar") -setup_view = True -temp_file = config['configurations']['zeppelin-env']['zeppelin.temp.file'] - -spark_home = "" -spark_version = None -spark2_home = "" -spark2_version = None -if 'spark-defaults' in config['configurations']: - spark_home = os.path.join(stack_root, "current", 'spark-client') - spark_version = extract_spark_version(spark_home) -if 'spark2-defaults' in config['configurations']: - spark2_home = os.path.join(stack_root, "current", 'spark2-client') - spark2_version = extract_spark_version(spark2_home) - -# New Cluster Stack Version that is defined during the RESTART of a Rolling Upgrade -version = default("/commandParams/version", None) -stack_name = default("/hostLevelParams/stack_name", None) - -# params from zeppelin-config -zeppelin_port = str(config['configurations']['zeppelin-config']['zeppelin.server.port']) -zeppelin_interpreter = None -if 'zeppelin.interpreter.group.order' in config['configurations']['zeppelin-config']: - zeppelin_interpreter = str(config['configurations']['zeppelin-config'] - ['zeppelin.interpreter.group.order']).split(",") - -# params from zeppelin-env -zeppelin_user = config['configurations']['zeppelin-env']['zeppelin_user'] -zeppelin_group = config['configurations']['zeppelin-env']['zeppelin_group'] -zeppelin_log_dir = config['configurations']['zeppelin-env']['zeppelin_log_dir'] -zeppelin_pid_dir = config['configurations']['zeppelin-env']['zeppelin_pid_dir'] -zeppelin_log_file = os.path.join(zeppelin_log_dir, 'zeppelin-setup.log') -zeppelin_hdfs_user_dir = format("/user/{zeppelin_user}") -
[2/5] ambari git commit: AMBARI-21901.Add 0.7.x stack definition for Zeppelin(Prabhjyot Singh via Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/190094ba/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py new file mode 100644 index 000..ba73d10 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0/package/scripts/master.py @@ -0,0 +1,522 @@ +#!/usr/bin/env python +""" +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +""" + +import glob +import os + +from resource_management.core import shell, sudo +from resource_management.core.logger import Logger +from resource_management.core.resources import Directory +from resource_management.core.resources.system import Execute, File +from resource_management.core.source import InlineTemplate +from resource_management.libraries import XmlConfig +from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions import get_kinit_path +from resource_management.libraries.functions import stack_select +from resource_management.libraries.functions.check_process_status import check_process_status +from resource_management.libraries.functions.default import default +from resource_management.libraries.functions.format import format +from resource_management.libraries.functions.stack_features import check_stack_feature +from resource_management.libraries.functions.version import format_stack_version +from resource_management.libraries.script.script import Script + + +class Master(Script): + def install(self, env): +import params +env.set_params(params) +self.install_packages(env) + +self.create_zeppelin_log_dir(env) + +if params.spark_version: + Execute('echo spark_version:' + str(params.spark_version) + ' detected for spark_home: ' + + params.spark_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user) +if params.spark2_version: + Execute('echo spark2_version:' + str(params.spark2_version) + ' detected for spark2_home: ' + + params.spark2_home + ' >> ' + params.zeppelin_log_file, user=params.zeppelin_user) + + def create_zeppelin_dir(self, params): +params.HdfsResource(format("/user/{zeppelin_user}"), +type="directory", +action="create_on_execute", +owner=params.zeppelin_user, +recursive_chown=True, +recursive_chmod=True +) +params.HdfsResource(format("/user/{zeppelin_user}/test"), +type="directory", +action="create_on_execute", +owner=params.zeppelin_user, +recursive_chown=True, +recursive_chmod=True +) +params.HdfsResource(format("/apps/zeppelin"), +type="directory", +action="create_on_execute", +owner=params.zeppelin_user, +recursive_chown=True, +recursive_chmod=True +) + +spark_deps_full_path = self.get_zeppelin_spark_dependencies()[0] +spark_dep_file_name = os.path.basename(spark_deps_full_path) + +params.HdfsResource(params.spark_jar_dir + "/" + spark_dep_file_name, +type="file", +action="create_on_execute", +source=spark_deps_full_path, +group=params.zeppelin_group, +owner=params.zeppelin_user, +mode=0444, +replace_existing_files=True, +) + +params.HdfsResource(None, action="execute") + + def create_zeppelin_log_dir(self, env): +import params +env.set_params(params) +Directory([params.zeppelin_log_dir], + owner=params.zeppelin_user, + group=params.zeppelin_group, + cd_access="a", +
[5/5] ambari git commit: AMBARI-21901.Add 0.7.x stack definition for Zeppelin(Prabhjyot Singh via Venkata Sairam)
AMBARI-21901.Add 0.7.x stack definition for Zeppelin(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/190094ba Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/190094ba Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/190094ba Branch: refs/heads/trunk Commit: 190094ba26b24e1f0dd7b39b0b39721d95bfd874 Parents: 8c104df Author: Venkata SairamAuthored: Mon Sep 18 12:26:33 2017 +0530 Committer: Venkata Sairam Committed: Mon Sep 18 12:26:33 2017 +0530 -- .../ZEPPELIN/0.6.0.2.5/alerts.json | 18 - .../0.6.0.2.5/configuration/zeppelin-config.xml | 208 .../0.6.0.2.5/configuration/zeppelin-env.xml| 185 --- .../configuration/zeppelin-log4j-properties.xml | 37 -- .../configuration/zeppelin-shiro-ini.xml| 97 .../ZEPPELIN/0.6.0.2.5/kerberos.json| 51 -- .../ZEPPELIN/0.6.0.2.5/metainfo.xml | 103 .../package/scripts/alert_check_zeppelin.py | 47 -- .../scripts/interpreter_json_template.py| 361 - .../package/scripts/livy2_config_template.py| 107 .../0.6.0.2.5/package/scripts/master.py | 522 --- .../0.6.0.2.5/package/scripts/params.py | 258 - .../0.6.0.2.5/package/scripts/service_check.py | 39 -- .../package/scripts/spark2_config_template.py | 84 --- .../0.6.0.2.5/package/scripts/status_params.py | 29 -- .../templates/input.config-zeppelin.json.j2 | 48 -- .../0.6.0.2.5/quicklinks/quicklinks.json| 35 -- .../ZEPPELIN/0.6.0.2.5/role_command_order.json | 7 - .../ZEPPELIN/0.6.0.3.0/alerts.json | 18 - .../0.6.0.3.0/configuration/zeppelin-config.xml | 208 .../0.6.0.3.0/configuration/zeppelin-env.xml| 186 --- .../configuration/zeppelin-log4j-properties.xml | 37 -- .../configuration/zeppelin-shiro-ini.xml| 97 .../ZEPPELIN/0.6.0.3.0/kerberos.json| 51 -- .../ZEPPELIN/0.6.0.3.0/metainfo.xml | 111 .../package/scripts/alert_check_zeppelin.py | 47 -- .../package/scripts/livy2_config_template.py| 107 .../0.6.0.3.0/package/scripts/master.py | 443 .../0.6.0.3.0/package/scripts/params.py | 228 .../0.6.0.3.0/package/scripts/service_check.py | 39 -- .../package/scripts/spark2_config_template.py | 84 --- .../0.6.0.3.0/package/scripts/status_params.py | 29 -- .../templates/input.config-zeppelin.json.j2 | 48 -- .../0.6.0.3.0/quicklinks/quicklinks.json| 35 -- .../ZEPPELIN/0.6.0.3.0/role_command_order.json | 7 - .../ZEPPELIN/0.6.0.3.0/service_advisor.py | 209 .../common-services/ZEPPELIN/0.6.0/alerts.json | 18 + .../0.6.0/configuration/zeppelin-config.xml | 208 .../0.6.0/configuration/zeppelin-env.xml| 184 +++ .../configuration/zeppelin-log4j-properties.xml | 37 ++ .../0.6.0/configuration/zeppelin-shiro-ini.xml | 97 .../ZEPPELIN/0.6.0/kerberos.json| 51 ++ .../common-services/ZEPPELIN/0.6.0/metainfo.xml | 103 .../package/scripts/alert_check_zeppelin.py | 47 ++ .../scripts/interpreter_json_template.py| 361 + .../package/scripts/livy2_config_template.py| 107 .../ZEPPELIN/0.6.0/package/scripts/master.py| 522 +++ .../ZEPPELIN/0.6.0/package/scripts/params.py| 258 + .../0.6.0/package/scripts/service_check.py | 39 ++ .../package/scripts/spark2_config_template.py | 84 +++ .../0.6.0/package/scripts/status_params.py | 29 ++ .../templates/input.config-zeppelin.json.j2 | 48 ++ .../ZEPPELIN/0.6.0/quicklinks/quicklinks.json | 35 ++ .../ZEPPELIN/0.6.0/role_command_order.json | 7 + .../common-services/ZEPPELIN/0.7.0/alerts.json | 18 + .../0.7.0/configuration/zeppelin-config.xml | 208 .../0.7.0/configuration/zeppelin-env.xml| 184 +++ .../configuration/zeppelin-log4j-properties.xml | 37 ++ .../0.7.0/configuration/zeppelin-shiro-ini.xml | 97 .../ZEPPELIN/0.7.0/kerberos.json| 51 ++ .../common-services/ZEPPELIN/0.7.0/metainfo.xml | 103 .../package/scripts/alert_check_zeppelin.py | 47 ++ .../scripts/interpreter_json_template.py| 361 + .../package/scripts/livy2_config_template.py| 107 .../ZEPPELIN/0.7.0/package/scripts/master.py| 522 +++ .../ZEPPELIN/0.7.0/package/scripts/params.py| 258 + .../0.7.0/package/scripts/service_check.py | 39 ++ .../package/scripts/spark2_config_template.py | 84 +++ .../0.7.0/package/scripts/status_params.py | 29 ++ .../templates/input.config-zeppelin.json.j2 | 48 ++
ambari git commit: AMBARI-21912.Make Ambari changes for external-conf(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 7ef365215 -> 395cf3b59 AMBARI-21912.Make Ambari changes for external-conf(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/395cf3b5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/395cf3b5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/395cf3b5 Branch: refs/heads/branch-2.6 Commit: 395cf3b5924755c826d46e6966d15cf6b8d81cdf Parents: 7ef3652 Author: Venkata SairamAuthored: Mon Sep 18 12:22:05 2017 +0530 Committer: Venkata Sairam Committed: Mon Sep 18 12:22:42 2017 +0530 -- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 13 + .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 5 + .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 5 + .../resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 7 ++- .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 7 ++- 5 files changed, 35 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/395cf3b5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml index 75a8782..5618e14 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml @@ -566,5 +566,18 @@ + + + + +zeppelin-env + + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/395cf3b5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml index 07bc8a4..9f77065 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml @@ -271,6 +271,11 @@ UPGRADE true + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/395cf3b5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml index 850f725..8824de5 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml @@ -276,6 +276,11 @@ UPGRADE true + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/395cf3b5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml index 9a42098..a6d7a49 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml @@ -806,8 +806,13 @@ + + + + + - + http://git-wip-us.apache.org/repos/asf/ambari/blob/395cf3b5/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml index ea58559..2a61034 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml @@ -952,8 +952,13 @@ + + + + + - +
ambari git commit: AMBARI-21912.Make Ambari changes for external-conf(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk cb46f39ee -> 8c104df93 AMBARI-21912.Make Ambari changes for external-conf(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8c104df9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8c104df9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8c104df9 Branch: refs/heads/trunk Commit: 8c104df93ae5d3732c6bfd3657b803985f2c0553 Parents: cb46f39 Author: Venkata SairamAuthored: Mon Sep 18 12:22:05 2017 +0530 Committer: Venkata Sairam Committed: Mon Sep 18 12:22:05 2017 +0530 -- .../stacks/HDP/2.5/upgrades/config-upgrade.xml | 13 + .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 5 + .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 5 + .../resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 7 ++- .../resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 7 ++- 5 files changed, 35 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/8c104df9/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml index f5fa744..bd69f1e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml @@ -558,5 +558,18 @@ + + + + +zeppelin-env + + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/8c104df9/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml index b79f644..b25db24 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml @@ -271,6 +271,11 @@ UPGRADE true + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/8c104df9/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml index c509f34..12d2832 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml @@ -276,6 +276,11 @@ UPGRADE true + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/8c104df9/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml index f3b1fa6..35f564e 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.5.xml @@ -806,8 +806,13 @@ + + + + + - + http://git-wip-us.apache.org/repos/asf/ambari/blob/8c104df9/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml index 5f1bf12..32822a7 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml @@ -952,8 +952,13 @@ + + + + + - +
ambari git commit: AMBARI-21890.Ambari Files View - browser going to hung state while opening a HDFS folder which has huge number of files(>10000)(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 f67dd616d -> 65535fbb1 AMBARI-21890.Ambari Files View - browser going to hung state while opening a HDFS folder which has huge number of files(>1)(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/65535fbb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/65535fbb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/65535fbb Branch: refs/heads/branch-2.6 Commit: 65535fbb175df3c1f62c8eec82e1db42b2d7876a Parents: f67dd61 Author: Venkata SairamAuthored: Fri Sep 8 08:38:54 2017 +0530 Committer: Venkata Sairam Committed: Fri Sep 8 08:39:50 2017 +0530 -- .../view/commons/hdfs/FileOperationService.java | 41 +++- .../resources/ui/app/components/file-search.js | 10 +- .../main/resources/ui/app/controllers/files.js | 20 +- .../src/main/resources/ui/app/routes/files.js | 16 +- .../ui/app/templates/components/file-row.hbs| 2 +- .../ui/app/templates/components/file-search.hbs | 2 +- .../main/resources/ui/app/templates/files.hbs | 8 +- .../view/filebrowser/FilebrowserTest.java | 4 +- .../ambari/view/utils/hdfs/DirListInfo.java | 97 + .../ambari/view/utils/hdfs/DirStatus.java | 75 +++ .../apache/ambari/view/utils/hdfs/HdfsApi.java | 124 ++-- .../ambari/view/utils/hdfs/HdfsApiTest.java | 201 +++ 12 files changed, 557 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/65535fbb/contrib/views/commons/src/main/java/org/apache/ambari/view/commons/hdfs/FileOperationService.java -- diff --git a/contrib/views/commons/src/main/java/org/apache/ambari/view/commons/hdfs/FileOperationService.java b/contrib/views/commons/src/main/java/org/apache/ambari/view/commons/hdfs/FileOperationService.java index d6e484d..6fa1056 100644 --- a/contrib/views/commons/src/main/java/org/apache/ambari/view/commons/hdfs/FileOperationService.java +++ b/contrib/views/commons/src/main/java/org/apache/ambari/view/commons/hdfs/FileOperationService.java @@ -18,12 +18,17 @@ package org.apache.ambari.view.commons.hdfs; +import com.google.common.base.Strings; import org.apache.ambari.view.ViewContext; import org.apache.ambari.view.commons.exceptions.NotFoundFormattedException; import org.apache.ambari.view.commons.exceptions.ServiceFormattedException; +import org.apache.ambari.view.utils.hdfs.DirListInfo; +import org.apache.ambari.view.utils.hdfs.DirStatus; import org.apache.ambari.view.utils.hdfs.HdfsApi; import org.apache.ambari.view.utils.hdfs.HdfsApiException; import org.json.simple.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.ws.rs.*; import javax.ws.rs.core.*; @@ -41,6 +46,14 @@ import java.util.Map; * File operations service */ public class FileOperationService extends HdfsService { + private final static Logger LOG = + LoggerFactory.getLogger(FileOperationService.class); + + + private static final String FILES_VIEW_MAX_FILE_PER_PAGE = "views.files.max.files.per.page"; + private static final int DEFAULT_FILES_VIEW_MAX_FILE_PER_PAGE = 5000; + + private Integer maxFilesPerPage = DEFAULT_FILES_VIEW_MAX_FILE_PER_PAGE; /** * Constructor @@ -48,6 +61,19 @@ public class FileOperationService extends HdfsService { */ public FileOperationService(ViewContext context) { super(context); +setMaxFilesPerPage(context); + } + + private void setMaxFilesPerPage(ViewContext context) { +String maxFilesPerPageProperty = context.getAmbariProperty(FILES_VIEW_MAX_FILE_PER_PAGE); +LOG.info("maxFilesPerPageProperty = {}", maxFilesPerPageProperty); +if(!Strings.isNullOrEmpty(maxFilesPerPageProperty)){ + try { +maxFilesPerPage = Integer.parseInt(maxFilesPerPageProperty); + }catch(Exception e){ +LOG.error("{} should be integer, but it is {}, using default value of {}", FILES_VIEW_MAX_FILE_PER_PAGE , maxFilesPerPageProperty, DEFAULT_FILES_VIEW_MAX_FILE_PER_PAGE); + } +} } /** @@ -56,21 +82,30 @@ public class FileOperationService extends HdfsService { */ public FileOperationService(ViewContext context, Map customProperties) { super(context, customProperties); +this.setMaxFilesPerPage(context); } /** * List dir * @param path path + * @param nameFilter : name on which filter is applied * @return response with dir content */ @GET @Path("/listdir") @Produces(MediaType.APPLICATION_JSON) - public Response listdir(@QueryParam("path") String path) { + public Response listdir(@QueryParam("path") String path,
ambari git commit: AMBARI-21890.Ambari Files View - browser going to hung state while opening a HDFS folder which has huge number of files(>10000)(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 5b1a63b71 -> f6ecbd1d7 AMBARI-21890.Ambari Files View - browser going to hung state while opening a HDFS folder which has huge number of files(>1)(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f6ecbd1d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f6ecbd1d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f6ecbd1d Branch: refs/heads/trunk Commit: f6ecbd1d7fa5f90ec020e64dbb403b3c3c2bdeb3 Parents: 5b1a63b Author: Venkata SairamAuthored: Fri Sep 8 08:38:54 2017 +0530 Committer: Venkata Sairam Committed: Fri Sep 8 08:38:54 2017 +0530 -- .../view/commons/hdfs/FileOperationService.java | 41 +++- .../resources/ui/app/components/file-search.js | 10 +- .../main/resources/ui/app/controllers/files.js | 20 +- .../src/main/resources/ui/app/routes/files.js | 16 +- .../ui/app/templates/components/file-row.hbs| 2 +- .../ui/app/templates/components/file-search.hbs | 2 +- .../main/resources/ui/app/templates/files.hbs | 8 +- .../view/filebrowser/FilebrowserTest.java | 4 +- .../ambari/view/utils/hdfs/DirListInfo.java | 97 + .../ambari/view/utils/hdfs/DirStatus.java | 75 +++ .../apache/ambari/view/utils/hdfs/HdfsApi.java | 124 ++-- .../ambari/view/utils/hdfs/HdfsApiTest.java | 201 +++ 12 files changed, 557 insertions(+), 43 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/f6ecbd1d/contrib/views/commons/src/main/java/org/apache/ambari/view/commons/hdfs/FileOperationService.java -- diff --git a/contrib/views/commons/src/main/java/org/apache/ambari/view/commons/hdfs/FileOperationService.java b/contrib/views/commons/src/main/java/org/apache/ambari/view/commons/hdfs/FileOperationService.java index d6e484d..6fa1056 100644 --- a/contrib/views/commons/src/main/java/org/apache/ambari/view/commons/hdfs/FileOperationService.java +++ b/contrib/views/commons/src/main/java/org/apache/ambari/view/commons/hdfs/FileOperationService.java @@ -18,12 +18,17 @@ package org.apache.ambari.view.commons.hdfs; +import com.google.common.base.Strings; import org.apache.ambari.view.ViewContext; import org.apache.ambari.view.commons.exceptions.NotFoundFormattedException; import org.apache.ambari.view.commons.exceptions.ServiceFormattedException; +import org.apache.ambari.view.utils.hdfs.DirListInfo; +import org.apache.ambari.view.utils.hdfs.DirStatus; import org.apache.ambari.view.utils.hdfs.HdfsApi; import org.apache.ambari.view.utils.hdfs.HdfsApiException; import org.json.simple.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.ws.rs.*; import javax.ws.rs.core.*; @@ -41,6 +46,14 @@ import java.util.Map; * File operations service */ public class FileOperationService extends HdfsService { + private final static Logger LOG = + LoggerFactory.getLogger(FileOperationService.class); + + + private static final String FILES_VIEW_MAX_FILE_PER_PAGE = "views.files.max.files.per.page"; + private static final int DEFAULT_FILES_VIEW_MAX_FILE_PER_PAGE = 5000; + + private Integer maxFilesPerPage = DEFAULT_FILES_VIEW_MAX_FILE_PER_PAGE; /** * Constructor @@ -48,6 +61,19 @@ public class FileOperationService extends HdfsService { */ public FileOperationService(ViewContext context) { super(context); +setMaxFilesPerPage(context); + } + + private void setMaxFilesPerPage(ViewContext context) { +String maxFilesPerPageProperty = context.getAmbariProperty(FILES_VIEW_MAX_FILE_PER_PAGE); +LOG.info("maxFilesPerPageProperty = {}", maxFilesPerPageProperty); +if(!Strings.isNullOrEmpty(maxFilesPerPageProperty)){ + try { +maxFilesPerPage = Integer.parseInt(maxFilesPerPageProperty); + }catch(Exception e){ +LOG.error("{} should be integer, but it is {}, using default value of {}", FILES_VIEW_MAX_FILE_PER_PAGE , maxFilesPerPageProperty, DEFAULT_FILES_VIEW_MAX_FILE_PER_PAGE); + } +} } /** @@ -56,21 +82,30 @@ public class FileOperationService extends HdfsService { */ public FileOperationService(ViewContext context, Map customProperties) { super(context, customProperties); +this.setMaxFilesPerPage(context); } /** * List dir * @param path path + * @param nameFilter : name on which filter is applied * @return response with dir content */ @GET @Path("/listdir") @Produces(MediaType.APPLICATION_JSON) - public Response listdir(@QueryParam("path") String path) { + public Response listdir(@QueryParam("path") String path,
ambari git commit: AMBARI-21835.Support for Zeppelin notebook storage in HDFS(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 fb64507a4 -> 2270b89a0 AMBARI-21835.Support for Zeppelin notebook storage in HDFS(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2270b89a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2270b89a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2270b89a Branch: refs/heads/branch-2.6 Commit: 2270b89a09e2957a6e905fc4bd8e4d2ddd96d55e Parents: fb64507 Author: Venkata SairamAuthored: Mon Sep 4 15:12:26 2017 +0530 Committer: Venkata Sairam Committed: Mon Sep 4 15:12:26 2017 +0530 -- .../0.6.0.2.5/configuration/zeppelin-config.xml | 2 +- .../0.6.0.2.5/package/scripts/master.py | 59 +--- .../0.6.0.2.5/package/scripts/params.py | 2 + 3 files changed, 54 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/2270b89a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml index 03ad5f7..bd6ad76 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml @@ -77,7 +77,7 @@ zeppelin.notebook.storage -org.apache.zeppelin.notebook.repo.VFSNotebookRepo +org.apache.zeppelin.notebook.repo.HdfsNotebookRepo notebook persistence layer implementation. If S3 is used, set this to org.apache.zeppelin.notebook.repo.S3NotebookRepo instead. If S3 is used to store the notebooks, it is necessary to use the following folder structure http://git-wip-us.apache.org/repos/asf/ambari/blob/2270b89a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index 2142bb4..ba73d10 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -20,25 +20,25 @@ limitations under the License. import glob import os -from resource_management.core.base import Fail + +from resource_management.core import shell, sudo +from resource_management.core.logger import Logger from resource_management.core.resources import Directory from resource_management.core.resources.system import Execute, File from resource_management.core.source import InlineTemplate -from resource_management.core import sudo -from resource_management.core.logger import Logger -from resource_management.core.source import StaticFile from resource_management.libraries import XmlConfig +from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions import get_kinit_path +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.check_process_status import check_process_status +from resource_management.libraries.functions.default import default from resource_management.libraries.functions.format import format -from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions import StackFeature -from resource_management.libraries.functions.decorator import retry from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.version import format_stack_version from resource_management.libraries.script.script import Script -class Master(Script): +class Master(Script): def install(self, env): import params env.set_params(params) @@ -185,6 +185,45 @@ class Master(Script): group=params.zeppelin_group, mode=0644) + def check_and_copy_notebook_in_hdfs(self, params): +if params.config['configurations']['zeppelin-config']['zeppelin.notebook.dir'].startswith("/"): + notebook_directory = params.config['configurations']['zeppelin-config']['zeppelin.notebook.dir'] +else: + notebook_directory = "/user/" + format("{zeppelin_user}") + "/" + \ +
ambari git commit: AMBARI-21835.Support for Zeppelin notebook storage in HDFS(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 7e222173b -> a679281f7 AMBARI-21835.Support for Zeppelin notebook storage in HDFS(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a679281f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a679281f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a679281f Branch: refs/heads/trunk Commit: a679281f7abe6768e0896e32df7c298b59877064 Parents: 7e22217 Author: Venkata SairamAuthored: Mon Sep 4 14:44:25 2017 +0530 Committer: Venkata Sairam Committed: Mon Sep 4 14:45:22 2017 +0530 -- .../0.6.0.2.5/configuration/zeppelin-config.xml | 2 +- .../0.6.0.2.5/package/scripts/master.py | 59 +--- .../0.6.0.2.5/package/scripts/params.py | 2 + .../0.6.0.3.0/configuration/zeppelin-config.xml | 2 +- 4 files changed, 55 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a679281f/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml index 03ad5f7..bd6ad76 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-config.xml @@ -77,7 +77,7 @@ zeppelin.notebook.storage -org.apache.zeppelin.notebook.repo.VFSNotebookRepo +org.apache.zeppelin.notebook.repo.HdfsNotebookRepo notebook persistence layer implementation. If S3 is used, set this to org.apache.zeppelin.notebook.repo.S3NotebookRepo instead. If S3 is used to store the notebooks, it is necessary to use the following folder structure http://git-wip-us.apache.org/repos/asf/ambari/blob/a679281f/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index 2142bb4..ba73d10 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -20,25 +20,25 @@ limitations under the License. import glob import os -from resource_management.core.base import Fail + +from resource_management.core import shell, sudo +from resource_management.core.logger import Logger from resource_management.core.resources import Directory from resource_management.core.resources.system import Execute, File from resource_management.core.source import InlineTemplate -from resource_management.core import sudo -from resource_management.core.logger import Logger -from resource_management.core.source import StaticFile from resource_management.libraries import XmlConfig +from resource_management.libraries.functions import StackFeature +from resource_management.libraries.functions import get_kinit_path +from resource_management.libraries.functions import stack_select from resource_management.libraries.functions.check_process_status import check_process_status +from resource_management.libraries.functions.default import default from resource_management.libraries.functions.format import format -from resource_management.libraries.functions import stack_select -from resource_management.libraries.functions import StackFeature -from resource_management.libraries.functions.decorator import retry from resource_management.libraries.functions.stack_features import check_stack_feature from resource_management.libraries.functions.version import format_stack_version from resource_management.libraries.script.script import Script -class Master(Script): +class Master(Script): def install(self, env): import params env.set_params(params) @@ -185,6 +185,45 @@ class Master(Script): group=params.zeppelin_group, mode=0644) + def check_and_copy_notebook_in_hdfs(self, params): +if params.config['configurations']['zeppelin-config']['zeppelin.notebook.dir'].startswith("/"): + notebook_directory = params.config['configurations']['zeppelin-config']['zeppelin.notebook.dir'] +else: + notebook_directory = "/user/"
ambari git commit: AMBARI-21569.Users randomly getting "HDFS020 Could not write file" exceptions while running query from Hive View
Repository: ambari Updated Branches: refs/heads/branch-2.5 589d96763 -> 9ba009b5a AMBARI-21569.Users randomly getting "HDFS020 Could not write file" exceptions while running query from Hive View Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9ba009b5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9ba009b5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9ba009b5 Branch: refs/heads/branch-2.5 Commit: 9ba009b5a69b640e68db3c92aaf11792ab8d Parents: 589d967 Author: Venkata SairamAuthored: Wed Aug 23 15:58:01 2017 +0530 Committer: Venkata Sairam Committed: Wed Aug 23 16:00:35 2017 +0530 -- .../hive20/src/main/resources/ui/yarn.lock | 2 +- .../apache/ambari/view/utils/hdfs/HdfsApi.java | 18 +-- .../apache/ambari/view/utils/hdfs/HdfsUtil.java | 23 +++- 3 files changed, 34 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/9ba009b5/contrib/views/hive20/src/main/resources/ui/yarn.lock -- diff --git a/contrib/views/hive20/src/main/resources/ui/yarn.lock b/contrib/views/hive20/src/main/resources/ui/yarn.lock index 477a15c..607cf81 100644 --- a/contrib/views/hive20/src/main/resources/ui/yarn.lock +++ b/contrib/views/hive20/src/main/resources/ui/yarn.lock @@ -569,7 +569,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-block-scoping@^6.23.0: +babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576; dependencies: http://git-wip-us.apache.org/repos/asf/ambari/blob/9ba009b5/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java -- diff --git a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java index 90fa483..5bce7ba 100644 --- a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java +++ b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java @@ -386,7 +386,20 @@ public class HdfsApi { * @throws IOException * @throws InterruptedException */ - public T execute(PrivilegedExceptionAction action) + public T execute(PrivilegedExceptionAction action) throws IOException, InterruptedException { +return this.execute(action, false); + } + + + /** + * Executes action on HDFS using doAs + * @param action strategy object + * @param result type + * @return result of operation + * @throws IOException + * @throws InterruptedException + */ + public T execute(PrivilegedExceptionAction action, boolean alwaysRetry) throws IOException, InterruptedException { T result = null; @@ -401,7 +414,7 @@ public class HdfsApi { result = ugi.doAs(action); succeeded = true; } catch (IOException ex) { -if (!ex.getMessage().contains("Cannot obtain block length for")) { +if (!alwaysRetry && !ex.getMessage().contains("Cannot obtain block length for")) { throw ex; } if (tryNumber >= 3) { @@ -409,6 +422,7 @@ public class HdfsApi { } LOG.info("HDFS threw 'IOException: Cannot obtain block length' exception. " + "Retrying... Try #" + (tryNumber + 1)); +LOG.error("Retrying: " + ex.getMessage(),ex); Thread.sleep(1000); //retry after 1 second } } while (!succeeded); http://git-wip-us.apache.org/repos/asf/ambari/blob/9ba009b5/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java -- diff --git a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java index 0670f1a..39958c3 100644 --- a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java +++ b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java @@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Map; +import java.security.PrivilegedExceptionAction; public class HdfsUtil { private final static Logger LOG = @@ -38,19 +39,29 @@ public class HdfsUtil { * @param
ambari git commit: AMBARI-21569.Users randomly getting "HDFS020 Could not write file" exceptions while running query from Hive View
Repository: ambari Updated Branches: refs/heads/trunk d804f4451 -> 0a2eccd09 AMBARI-21569.Users randomly getting "HDFS020 Could not write file" exceptions while running query from Hive View Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a2eccd0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a2eccd0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a2eccd0 Branch: refs/heads/trunk Commit: 0a2eccd09aa7ec6bc4389603a2668f27d2d79900 Parents: d804f44 Author: Venkata SairamAuthored: Wed Aug 23 15:58:01 2017 +0530 Committer: Venkata Sairam Committed: Wed Aug 23 15:59:02 2017 +0530 -- .../hive20/src/main/resources/ui/yarn.lock | 2 +- .../apache/ambari/view/utils/hdfs/HdfsApi.java | 18 +-- .../apache/ambari/view/utils/hdfs/HdfsUtil.java | 23 +++- 3 files changed, 34 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/0a2eccd0/contrib/views/hive20/src/main/resources/ui/yarn.lock -- diff --git a/contrib/views/hive20/src/main/resources/ui/yarn.lock b/contrib/views/hive20/src/main/resources/ui/yarn.lock index 477a15c..607cf81 100644 --- a/contrib/views/hive20/src/main/resources/ui/yarn.lock +++ b/contrib/views/hive20/src/main/resources/ui/yarn.lock @@ -569,7 +569,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-block-scoping@^6.23.0: +babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz#76c295dc3a4741b1665adfd3167215dcff32a576; dependencies: http://git-wip-us.apache.org/repos/asf/ambari/blob/0a2eccd0/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java -- diff --git a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java index 90fa483..5bce7ba 100644 --- a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java +++ b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsApi.java @@ -386,7 +386,20 @@ public class HdfsApi { * @throws IOException * @throws InterruptedException */ - public T execute(PrivilegedExceptionAction action) + public T execute(PrivilegedExceptionAction action) throws IOException, InterruptedException { +return this.execute(action, false); + } + + + /** + * Executes action on HDFS using doAs + * @param action strategy object + * @param result type + * @return result of operation + * @throws IOException + * @throws InterruptedException + */ + public T execute(PrivilegedExceptionAction action, boolean alwaysRetry) throws IOException, InterruptedException { T result = null; @@ -401,7 +414,7 @@ public class HdfsApi { result = ugi.doAs(action); succeeded = true; } catch (IOException ex) { -if (!ex.getMessage().contains("Cannot obtain block length for")) { +if (!alwaysRetry && !ex.getMessage().contains("Cannot obtain block length for")) { throw ex; } if (tryNumber >= 3) { @@ -409,6 +422,7 @@ public class HdfsApi { } LOG.info("HDFS threw 'IOException: Cannot obtain block length' exception. " + "Retrying... Try #" + (tryNumber + 1)); +LOG.error("Retrying: " + ex.getMessage(),ex); Thread.sleep(1000); //retry after 1 second } } while (!succeeded); http://git-wip-us.apache.org/repos/asf/ambari/blob/0a2eccd0/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java -- diff --git a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java index 0670f1a..39958c3 100644 --- a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java +++ b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/HdfsUtil.java @@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Map; +import java.security.PrivilegedExceptionAction; public class HdfsUtil { private final static Logger LOG = @@ -38,19 +39,29 @@ public class HdfsUtil { * @param filePath path to
ambari git commit: AMBARI-21586.Apply zeppelin.server.kerberos.principal related changes to 0.6.0.3.0(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 8dfdf5ec2 -> 6f9f87c66 AMBARI-21586.Apply zeppelin.server.kerberos.principal related changes to 0.6.0.3.0(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6f9f87c6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f9f87c6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f9f87c6 Branch: refs/heads/trunk Commit: 6f9f87c663e1d5bd7cef5078e2a222700873c195 Parents: 8dfdf5e Author: Venkata SairamAuthored: Tue Aug 22 17:01:24 2017 +0530 Committer: Venkata Sairam Committed: Tue Aug 22 17:01:24 2017 +0530 -- .../ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/6f9f87c6/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml index 1edd991..b393def 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml @@ -91,9 +91,13 @@ export ZEPPELIN_PID_DIR={{zeppelin_pid_dir}} # export ZEPPELIN_NOTEBOOK_ONE_WAY_SYNC # If there are multiple notebook storages, should we treat the first one as the only source of truth? # export ZEPPELIN_NOTEBOOK_PUBLIC # Make notebook public by default when created, private otherwise export ZEPPELIN_INTP_CLASSPATH_OVERRIDES="{{external_dependency_conf}}" - Spark interpreter configuration +## Kerberos ticket refresh setting +## +export KINIT_FAIL_THRESHOLD=5 +export KERBEROS_REFRESH_INTERVAL=1d + ## Use provided spark installation ## ## defining SPARK_HOME makes Zeppelin run spark interpreter process using spark-submit ## @@ -165,6 +169,7 @@ export HADOOP_CONF_DIR=/etc/hadoop/conf Kerberos principal name for the Zeppelin. +KERBEROS_PRINCIPAL
ambari git commit: AMBARI-21585.Remove environment variables from zeppelin-env.sh(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.6 d2ca468cc -> 790d52d2c AMBARI-21585.Remove environment variables from zeppelin-env.sh(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/790d52d2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/790d52d2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/790d52d2 Branch: refs/heads/branch-2.6 Commit: 790d52d2c005b92f87627dee63a2ed988773e4ae Parents: d2ca468 Author: Venkata SairamAuthored: Tue Aug 22 16:59:02 2017 +0530 Committer: Venkata Sairam Committed: Tue Aug 22 16:59:02 2017 +0530 -- .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/790d52d2/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml index 80ac2bb..7f0d9e4 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml @@ -66,7 +66,6 @@ export JAVA_HOME={{java64_home}} export MASTER=yarn-client export SPARK_YARN_JAR={{spark_jar}} # export ZEPPELIN_JAVA_OPTS # Additional jvm options. for example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16" -export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory={{executor_mem}} -Dspark.executor.instances={{executor_instances}} -Dspark.yarn.queue={{spark_queue}}" # export ZEPPELIN_MEM # Zeppelin jvm mem options Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m # export ZEPPELIN_INTP_MEM# zeppelin interpreter process jvm mem options. Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m # export ZEPPELIN_INTP_JAVA_OPTS # zeppelin interpreter process jvm options. @@ -101,7 +100,7 @@ export KERBEROS_REFRESH_INTERVAL=1d ## defining SPARK_HOME makes Zeppelin run spark interpreter process using spark-submit ## # export SPARK_HOME # (required) When it is defined, load it instead of Zeppelin embedded Spark libraries -#export SPARK_HOME={{spark_home}} +# export SPARK_HOME={{spark_home}} # export SPARK_SUBMIT_OPTIONS # (optional) extra options to pass to spark submit. eg) "--driver-memory 512M --executor-memory 1G". # export SPARK_APP_NAME # (optional) The name of spark application. @@ -117,8 +116,6 @@ export HADOOP_CONF_DIR=/etc/hadoop/conf # export PYSPARK_PYTHON # path to the python command. must be the same path on the driver(Zeppelin) and all workers. # export PYTHONPATH -export PYTHONPATH="${SPARK_HOME}/python:${SPARK_HOME}/python/lib/py4j-0.8.2.1-src.zip" -export SPARK_YARN_USER_ENV="PYTHONPATH=${PYTHONPATH}" ## Spark interpreter options ## ##
ambari git commit: AMBARI-21585.Remove environment variables from zeppelin-env.sh(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk d260c8926 -> 8dfdf5ec2 AMBARI-21585.Remove environment variables from zeppelin-env.sh(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8dfdf5ec Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8dfdf5ec Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8dfdf5ec Branch: refs/heads/trunk Commit: 8dfdf5ec275849597884508ad1bc1b5846d007cf Parents: d260c89 Author: Venkata SairamAuthored: Tue Aug 22 16:48:39 2017 +0530 Committer: Venkata Sairam Committed: Tue Aug 22 16:48:39 2017 +0530 -- .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml | 5 + .../ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml | 6 +- 2 files changed, 2 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/8dfdf5ec/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml index 80ac2bb..7f0d9e4 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml @@ -66,7 +66,6 @@ export JAVA_HOME={{java64_home}} export MASTER=yarn-client export SPARK_YARN_JAR={{spark_jar}} # export ZEPPELIN_JAVA_OPTS # Additional jvm options. for example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16" -export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory={{executor_mem}} -Dspark.executor.instances={{executor_instances}} -Dspark.yarn.queue={{spark_queue}}" # export ZEPPELIN_MEM # Zeppelin jvm mem options Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m # export ZEPPELIN_INTP_MEM# zeppelin interpreter process jvm mem options. Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m # export ZEPPELIN_INTP_JAVA_OPTS # zeppelin interpreter process jvm options. @@ -101,7 +100,7 @@ export KERBEROS_REFRESH_INTERVAL=1d ## defining SPARK_HOME makes Zeppelin run spark interpreter process using spark-submit ## # export SPARK_HOME # (required) When it is defined, load it instead of Zeppelin embedded Spark libraries -#export SPARK_HOME={{spark_home}} +# export SPARK_HOME={{spark_home}} # export SPARK_SUBMIT_OPTIONS # (optional) extra options to pass to spark submit. eg) "--driver-memory 512M --executor-memory 1G". # export SPARK_APP_NAME # (optional) The name of spark application. @@ -117,8 +116,6 @@ export HADOOP_CONF_DIR=/etc/hadoop/conf # export PYSPARK_PYTHON # path to the python command. must be the same path on the driver(Zeppelin) and all workers. # export PYTHONPATH -export PYTHONPATH="${SPARK_HOME}/python:${SPARK_HOME}/python/lib/py4j-0.8.2.1-src.zip" -export SPARK_YARN_USER_ENV="PYTHONPATH=${PYTHONPATH}" ## Spark interpreter options ## ## http://git-wip-us.apache.org/repos/asf/ambari/blob/8dfdf5ec/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml index 7bd597f..1edd991 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.3.0/configuration/zeppelin-env.xml @@ -68,7 +68,6 @@ export JAVA_HOME={{java64_home}} export MASTER=yarn-client export SPARK_YARN_JAR={{spark_jar}} # export ZEPPELIN_JAVA_OPTS # Additional jvm options. for example, export ZEPPELIN_JAVA_OPTS="-Dspark.executor.memory=8g -Dspark.cores.max=16" -export ZEPPELIN_JAVA_OPTS="-Dhdp.version={{full_stack_version}} -Dspark.executor.memory={{executor_mem}} -Dspark.executor.instances={{executor_instances}} -Dspark.yarn.queue={{spark_queue}}" # export ZEPPELIN_MEM # Zeppelin jvm mem options Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m # export ZEPPELIN_INTP_MEM# zeppelin interpreter process jvm mem options. Default -Xms1024m -Xmx1024m -XX:MaxPermSize=512m
ambari git commit: AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in Zeppelin(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 4fa581afb -> 2b50a560c AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in Zeppelin(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b50a560 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b50a560 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b50a560 Branch: refs/heads/branch-2.5 Commit: 2b50a560c34a278b67352b699e698a1cfd050406 Parents: 4fa581a Author: Venkata SairamAuthored: Mon Aug 21 14:03:58 2017 +0530 Committer: Venkata Sairam Committed: Mon Aug 21 14:09:53 2017 +0530 -- .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml| 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/2b50a560/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml index 971e4af..742f5be 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml @@ -61,6 +61,12 @@ sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager securityManager.cacheManager = $cacheManager +cookie = org.apache.shiro.web.servlet.SimpleCookie +cookie.name = JSESSIONID +cookie.secure = true +cookie.httpOnly = true +sessionManager.sessionIdCookie = $cookie + securityManager.sessionManager = $sessionManager # 86,400,000 milliseconds = 24 hour securityManager.sessionManager.globalSessionTimeout = 8640
ambari git commit: AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in Zeppelin(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 705a62be2 -> 6fb371957 AMBARI-21675.Add Secure Flag to Cookie / JSESSIONID in Zeppelin(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6fb37195 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6fb37195 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6fb37195 Branch: refs/heads/trunk Commit: 6fb371957ad5612e3a6b2c639dec559aacf5a15d Parents: 705a62b Author: Venkata SairamAuthored: Mon Aug 21 14:03:58 2017 +0530 Committer: Venkata Sairam Committed: Mon Aug 21 14:03:58 2017 +0530 -- .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml| 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/6fb37195/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml index 971e4af..742f5be 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-shiro-ini.xml @@ -61,6 +61,12 @@ sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager securityManager.cacheManager = $cacheManager +cookie = org.apache.shiro.web.servlet.SimpleCookie +cookie.name = JSESSIONID +cookie.secure = true +cookie.httpOnly = true +sessionManager.sessionIdCookie = $cookie + securityManager.sessionManager = $sessionManager # 86,400,000 milliseconds = 24 hour securityManager.sessionManager.globalSessionTimeout = 8640
ambari git commit: AMBARI-21473. Zeppelin does not start and returns: params.zookeeper_znode_parent not in interpreter['properties']['phoenix.url']: KeyError: 'phoenix.url'(Prabhjyot Singh via Venkata
Repository: ambari Updated Branches: refs/heads/branch-2.5 9ac42d0c7 -> 837b0bdff AMBARI-21473. Zeppelin does not start and returns: params.zookeeper_znode_parent not in interpreter['properties']['phoenix.url']: KeyError: 'phoenix.url'(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/837b0bdf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/837b0bdf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/837b0bdf Branch: refs/heads/branch-2.5 Commit: 837b0bdff6cc38c7c2ffe548bb012ac84b5bca7b Parents: 9ac42d0 Author: Venkata SairamAuthored: Wed Jul 19 14:27:31 2017 +0530 Committer: Venkata Sairam Committed: Wed Jul 19 14:39:10 2017 +0530 -- .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py| 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/837b0bdf/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index 0013ab0..ba46dc8 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -295,6 +295,7 @@ class Master(Script): interpreter['properties']['zeppelin.jdbc.keytab.location'] = params.zeppelin_kerberos_keytab if params.zookeeper_znode_parent \ and params.hbase_zookeeper_quorum \ + and 'phoenix.url' in interpreter['properties'] \ and params.zookeeper_znode_parent not in interpreter['properties']['phoenix.url']: interpreter['properties']['phoenix.url'] = "jdbc:phoenix:" + \ params.hbase_zookeeper_quorum + ':' + \
ambari git commit: AMBARI-21473. Zeppelin does not start and returns: params.zookeeper_znode_parent not in interpreter['properties']['phoenix.url']: KeyError: 'phoenix.url'(Prabhjyot Singh via Venkata
Repository: ambari Updated Branches: refs/heads/trunk 8de651738 -> 56f05f099 AMBARI-21473. Zeppelin does not start and returns: params.zookeeper_znode_parent not in interpreter['properties']['phoenix.url']: KeyError: 'phoenix.url'(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/56f05f09 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/56f05f09 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/56f05f09 Branch: refs/heads/trunk Commit: 56f05f099aae18d11f849266d14bccf36ae79ad0 Parents: 8de6517 Author: Venkata SairamAuthored: Wed Jul 19 14:27:31 2017 +0530 Committer: Venkata Sairam Committed: Wed Jul 19 14:27:31 2017 +0530 -- .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py| 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/56f05f09/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index 0013ab0..ba46dc8 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -295,6 +295,7 @@ class Master(Script): interpreter['properties']['zeppelin.jdbc.keytab.location'] = params.zeppelin_kerberos_keytab if params.zookeeper_znode_parent \ and params.hbase_zookeeper_quorum \ + and 'phoenix.url' in interpreter['properties'] \ and params.zookeeper_znode_parent not in interpreter['properties']['phoenix.url']: interpreter['properties']['phoenix.url'] = "jdbc:phoenix:" + \ params.hbase_zookeeper_quorum + ':' + \
ambari git commit: AMBARI-21426. Apply ZEPPELIN-2698 related changes in Ambari(prabhjyotsingh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 afea7bb72 -> bc06736ef AMBARI-21426. Apply ZEPPELIN-2698 related changes in Ambari(prabhjyotsingh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc06736e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc06736e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc06736e Branch: refs/heads/branch-2.5 Commit: bc06736ef6bcc170a9ebba22f98e834b9c148d6b Parents: afea7bb Author: Venkata SairamAuthored: Fri Jul 14 12:35:26 2017 +0530 Committer: Venkata Sairam Committed: Fri Jul 14 12:41:18 2017 +0530 -- .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/bc06736e/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml index 4032b2c..80ac2bb 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml @@ -95,7 +95,7 @@ export ZEPPELIN_INTP_CLASSPATH_OVERRIDES="{{external_dependency_conf}}" ## Kerberos ticket refresh setting ## export KINIT_FAIL_THRESHOLD=5 -export LAUNCH_KERBEROS_REFRESH_INTERVAL=1d +export KERBEROS_REFRESH_INTERVAL=1d ## Use provided spark installation ## ## defining SPARK_HOME makes Zeppelin run spark interpreter process using spark-submit
ambari git commit: AMBARI-21354.Apply KerberosInterpreter related changes in Ambari(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 9a17ca78d -> 979a07b5c AMBARI-21354.Apply KerberosInterpreter related changes in Ambari(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/979a07b5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/979a07b5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/979a07b5 Branch: refs/heads/trunk Commit: 979a07b5c82aa831405768019253e8292c9f771e Parents: 9a17ca7 Author: Venkata SairamAuthored: Mon Jul 3 12:54:01 2017 +0530 Committer: Venkata Sairam Committed: Mon Jul 3 12:55:08 2017 +0530 -- .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/979a07b5/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml index bdef319..4032b2c 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml @@ -92,6 +92,11 @@ export ZEPPELIN_PID_DIR={{zeppelin_pid_dir}} export ZEPPELIN_INTP_CLASSPATH_OVERRIDES="{{external_dependency_conf}}" Spark interpreter configuration +## Kerberos ticket refresh setting +## +export KINIT_FAIL_THRESHOLD=5 +export LAUNCH_KERBEROS_REFRESH_INTERVAL=1d + ## Use provided spark installation ## ## defining SPARK_HOME makes Zeppelin run spark interpreter process using spark-submit ##
ambari git commit: AMBARI-21354.Apply KerberosInterpreter related changes in Ambari(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 5e60ea646 -> b51be77aa AMBARI-21354.Apply KerberosInterpreter related changes in Ambari(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b51be77a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b51be77a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b51be77a Branch: refs/heads/branch-2.5 Commit: b51be77aa04d7bfab8a350f5c2a1c84bde56b61d Parents: 5e60ea6 Author: Venkata SairamAuthored: Mon Jul 3 12:54:01 2017 +0530 Committer: Venkata Sairam Committed: Mon Jul 3 12:54:01 2017 +0530 -- .../ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b51be77a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml index bdef319..4032b2c 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/configuration/zeppelin-env.xml @@ -92,6 +92,11 @@ export ZEPPELIN_PID_DIR={{zeppelin_pid_dir}} export ZEPPELIN_INTP_CLASSPATH_OVERRIDES="{{external_dependency_conf}}" Spark interpreter configuration +## Kerberos ticket refresh setting +## +export KINIT_FAIL_THRESHOLD=5 +export LAUNCH_KERBEROS_REFRESH_INTERVAL=1d + ## Use provided spark installation ## ## defining SPARK_HOME makes Zeppelin run spark interpreter process using spark-submit ##
ambari git commit: AMBARI-21352.Workflow Manager view build failure(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 f0136c478 -> 18b1035c2 AMBARI-21352.Workflow Manager view build failure(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/18b1035c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18b1035c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18b1035c Branch: refs/heads/branch-2.5 Commit: 18b1035c20c18194d0602e2a81ac69db2b50197f Parents: f0136c4 Author: Venkata SairamAuthored: Wed Jun 28 14:56:09 2017 +0530 Committer: Venkata Sairam Committed: Wed Jun 28 14:57:53 2017 +0530 -- contrib/views/wfmanager/src/main/resources/ui/bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/18b1035c/contrib/views/wfmanager/src/main/resources/ui/bower.json -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/bower.json b/contrib/views/wfmanager/src/main/resources/ui/bower.json index 3f9de44..9812fa6 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/bower.json +++ b/contrib/views/wfmanager/src/main/resources/ui/bower.json @@ -21,7 +21,7 @@ "abdmob/x2js": "~1.2.0", "datatables": "~1.10.11", "vkBeautify": "https://github.com/vkiryukhin/vkBeautify.git;, -"cytoscape": "2.7.20", +"cytoscape": "2.7.18", "cytoscape-dagre": "~1.3.0", "cytoscape-panzoom": "~2.4.0", "codemirror": "~5.15.0",
ambari git commit: AMBARI-21352.Workflow Manager view build failure(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 5e50042a7 -> aac9fe6e2 AMBARI-21352.Workflow Manager view build failure(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aac9fe6e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aac9fe6e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aac9fe6e Branch: refs/heads/trunk Commit: aac9fe6e2e358b4ad1a1cfb0b86c3231897e38f1 Parents: 5e50042 Author: Venkata SairamAuthored: Wed Jun 28 14:56:09 2017 +0530 Committer: Venkata Sairam Committed: Wed Jun 28 14:56:09 2017 +0530 -- contrib/views/wfmanager/src/main/resources/ui/bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/aac9fe6e/contrib/views/wfmanager/src/main/resources/ui/bower.json -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/bower.json b/contrib/views/wfmanager/src/main/resources/ui/bower.json index 3f9de44..9812fa6 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/bower.json +++ b/contrib/views/wfmanager/src/main/resources/ui/bower.json @@ -21,7 +21,7 @@ "abdmob/x2js": "~1.2.0", "datatables": "~1.10.11", "vkBeautify": "https://github.com/vkiryukhin/vkBeautify.git;, -"cytoscape": "2.7.20", +"cytoscape": "2.7.18", "cytoscape-dagre": "~1.3.0", "cytoscape-panzoom": "~2.4.0", "codemirror": "~5.15.0",
ambari git commit: AMBARI-21352.Workflow Manager view build failure(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 dd250992a -> b4e1c8889 AMBARI-21352.Workflow Manager view build failure(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b4e1c888 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b4e1c888 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b4e1c888 Branch: refs/heads/branch-2.5 Commit: b4e1c8889735700bf1284ed4f0b28ba73300bb7c Parents: dd25099 Author: Venkata SairamAuthored: Tue Jun 27 15:53:12 2017 +0530 Committer: Venkata Sairam Committed: Tue Jun 27 15:54:31 2017 +0530 -- contrib/views/wfmanager/src/main/resources/ui/bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b4e1c888/contrib/views/wfmanager/src/main/resources/ui/bower.json -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/bower.json b/contrib/views/wfmanager/src/main/resources/ui/bower.json index 06fc3e3..3f9de44 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/bower.json +++ b/contrib/views/wfmanager/src/main/resources/ui/bower.json @@ -21,11 +21,11 @@ "abdmob/x2js": "~1.2.0", "datatables": "~1.10.11", "vkBeautify": "https://github.com/vkiryukhin/vkBeautify.git;, -"cytoscape": "~2.7.7", +"cytoscape": "2.7.20", "cytoscape-dagre": "~1.3.0", "cytoscape-panzoom": "~2.4.0", "codemirror": "~5.15.0", "fuse.js": "~2.5.0", -"jsog":"1.0.7" +"jsog": "1.0.7" } }
ambari git commit: AMBARI-21352.Workflow Manager view build failure(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk b1a154358 -> 1e2959086 AMBARI-21352.Workflow Manager view build failure(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1e295908 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e295908 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e295908 Branch: refs/heads/trunk Commit: 1e2959086fa2151888f7c1cfddaf3c6a2cedb25f Parents: b1a1543 Author: Venkata SairamAuthored: Tue Jun 27 15:53:12 2017 +0530 Committer: Venkata Sairam Committed: Tue Jun 27 15:53:12 2017 +0530 -- contrib/views/wfmanager/src/main/resources/ui/bower.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/1e295908/contrib/views/wfmanager/src/main/resources/ui/bower.json -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/bower.json b/contrib/views/wfmanager/src/main/resources/ui/bower.json index 06fc3e3..3f9de44 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/bower.json +++ b/contrib/views/wfmanager/src/main/resources/ui/bower.json @@ -21,11 +21,11 @@ "abdmob/x2js": "~1.2.0", "datatables": "~1.10.11", "vkBeautify": "https://github.com/vkiryukhin/vkBeautify.git;, -"cytoscape": "~2.7.7", +"cytoscape": "2.7.20", "cytoscape-dagre": "~1.3.0", "cytoscape-panzoom": "~2.4.0", "codemirror": "~5.15.0", "fuse.js": "~2.5.0", -"jsog":"1.0.7" +"jsog": "1.0.7" } }
ambari git commit: AMBARI-21388.Styling Issues with newly implemented workflow manager file browser(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 c96f254ec -> 4b5e2137e AMBARI-21388.Styling Issues with newly implemented workflow manager file browser(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b5e2137 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b5e2137 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b5e2137 Branch: refs/heads/branch-2.5 Commit: 4b5e2137e5363c3ac01692c2b62d29ab5d23acde Parents: c96f254 Author: Venkata SairamAuthored: Tue Jun 27 14:58:59 2017 +0530 Committer: Venkata Sairam Committed: Tue Jun 27 15:00:20 2017 +0530 -- .../src/main/resources/ui/app/styles/app.less | 4 +- .../hdfs-directory-viewer/addon/styles/app.css | 1 + .../wfmanager/src/main/resources/ui/yarn.lock | 68 +++- 3 files changed, 54 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5e2137/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less index 597e2e8..9a35aca 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less +++ b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less @@ -1060,8 +1060,8 @@ input:invalid { width: 100%; } .hdfs-browse{ - height: 500px; - max-height: 500px; + height: 350px; + max-height: 350px; overflow: scroll; } #wf_title{ http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5e2137/contrib/views/wfmanager/src/main/resources/ui/externaladdons/hdfs-directory-viewer/addon/styles/app.css -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/externaladdons/hdfs-directory-viewer/addon/styles/app.css b/contrib/views/wfmanager/src/main/resources/ui/externaladdons/hdfs-directory-viewer/addon/styles/app.css index b46fa34..e0b4463 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/externaladdons/hdfs-directory-viewer/addon/styles/app.css +++ b/contrib/views/wfmanager/src/main/resources/ui/externaladdons/hdfs-directory-viewer/addon/styles/app.css @@ -83,6 +83,7 @@ width:500px; position:relative; overflow:auto; + float:left; } .directory-viewer .padding-left-10px { padding-left: 10px; http://git-wip-us.apache.org/repos/asf/ambari/blob/4b5e2137/contrib/views/wfmanager/src/main/resources/ui/yarn.lock -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/yarn.lock b/contrib/views/wfmanager/src/main/resources/ui/yarn.lock index e9ad6cc..f3602c9 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/yarn.lock +++ b/contrib/views/wfmanager/src/main/resources/ui/yarn.lock @@ -66,10 +66,6 @@ amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5; -ansi-regex@*, ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df; - ansi-regex@^0.2.0, ansi-regex@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9; @@ -78,6 +74,10 @@ ansi-regex@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d; +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df; + ansi-styles@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de; @@ -,6 +,19 @@ broccoli-file-creator@^1.0.0, broccoli-file-creator@^1.0.1: rsvp "~3.0.6" symlink-or-copy "^1.0.1" +broccoli-filter@^0.1.6: + version "0.1.14" + resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-0.1.14.tgz#23cae3891ff9ebb7b4d7db00c6dcf03535daf7ad; + dependencies: +broccoli-kitchen-sink-helpers "^0.2.6" +broccoli-writer "^0.1.1" +mkdirp "^0.3.5" +promise-map-series "^0.2.1" +quick-temp "^0.1.2" +rsvp "^3.0.16" +symlink-or-copy "^1.0.1" +walk-sync "^0.1.3" + broccoli-filter@^1.2.2, broccoli-filter@^1.2.3: version "1.2.4" resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.2.4.tgz#409afb94b9a3a6da9fac8134e91e205f40cc7330; @@ -1159,7 +1172,7 @@
ambari git commit: AMBARI-21388.Styling Issues with newly implemented workflow manager file browser(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 9833bc182 -> b1a154358 AMBARI-21388.Styling Issues with newly implemented workflow manager file browser(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1a15435 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1a15435 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1a15435 Branch: refs/heads/trunk Commit: b1a154358078b02a4d84bbf865ff0209c1912e87 Parents: 9833bc1 Author: Venkata SairamAuthored: Tue Jun 27 14:58:59 2017 +0530 Committer: Venkata Sairam Committed: Tue Jun 27 14:59:25 2017 +0530 -- .../src/main/resources/ui/app/styles/app.less | 4 +- .../hdfs-directory-viewer/addon/styles/app.css | 1 + .../wfmanager/src/main/resources/ui/yarn.lock | 68 +++- 3 files changed, 54 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b1a15435/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less index 597e2e8..9a35aca 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less +++ b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less @@ -1060,8 +1060,8 @@ input:invalid { width: 100%; } .hdfs-browse{ - height: 500px; - max-height: 500px; + height: 350px; + max-height: 350px; overflow: scroll; } #wf_title{ http://git-wip-us.apache.org/repos/asf/ambari/blob/b1a15435/contrib/views/wfmanager/src/main/resources/ui/externaladdons/hdfs-directory-viewer/addon/styles/app.css -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/externaladdons/hdfs-directory-viewer/addon/styles/app.css b/contrib/views/wfmanager/src/main/resources/ui/externaladdons/hdfs-directory-viewer/addon/styles/app.css index b46fa34..e0b4463 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/externaladdons/hdfs-directory-viewer/addon/styles/app.css +++ b/contrib/views/wfmanager/src/main/resources/ui/externaladdons/hdfs-directory-viewer/addon/styles/app.css @@ -83,6 +83,7 @@ width:500px; position:relative; overflow:auto; + float:left; } .directory-viewer .padding-left-10px { padding-left: 10px; http://git-wip-us.apache.org/repos/asf/ambari/blob/b1a15435/contrib/views/wfmanager/src/main/resources/ui/yarn.lock -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/yarn.lock b/contrib/views/wfmanager/src/main/resources/ui/yarn.lock index e9ad6cc..f3602c9 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/yarn.lock +++ b/contrib/views/wfmanager/src/main/resources/ui/yarn.lock @@ -66,10 +66,6 @@ amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5; -ansi-regex@*, ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df; - ansi-regex@^0.2.0, ansi-regex@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9; @@ -78,6 +74,10 @@ ansi-regex@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-1.1.1.tgz#41c847194646375e6a1a5d10c3ca054ef9fc980d; +ansi-regex@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df; + ansi-styles@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de; @@ -,6 +,19 @@ broccoli-file-creator@^1.0.0, broccoli-file-creator@^1.0.1: rsvp "~3.0.6" symlink-or-copy "^1.0.1" +broccoli-filter@^0.1.6: + version "0.1.14" + resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-0.1.14.tgz#23cae3891ff9ebb7b4d7db00c6dcf03535daf7ad; + dependencies: +broccoli-kitchen-sink-helpers "^0.2.6" +broccoli-writer "^0.1.1" +mkdirp "^0.3.5" +promise-map-series "^0.2.1" +quick-temp "^0.1.2" +rsvp "^3.0.16" +symlink-or-copy "^1.0.1" +walk-sync "^0.1.3" + broccoli-filter@^1.2.2, broccoli-filter@^1.2.3: version "1.2.4" resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.2.4.tgz#409afb94b9a3a6da9fac8134e91e205f40cc7330; @@ -1159,7 +1172,7 @@
ambari git commit: AMBARI-21306.zeppelin jdbc interpreter gives error for 'doAs'(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 9369c1081 -> 98b2b9124 AMBARI-21306.zeppelin jdbc interpreter gives error for 'doAs'(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98b2b912 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98b2b912 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98b2b912 Branch: refs/heads/branch-2.5 Commit: 98b2b91241824820c0e9791b481156593b10fc38 Parents: 9369c10 Author: Venkata SairamAuthored: Mon Jun 26 12:31:26 2017 +0530 Committer: Venkata Sairam Committed: Mon Jun 26 12:33:26 2017 +0530 -- .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/98b2b912/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index 8b5f821..0013ab0 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -366,7 +366,7 @@ class Master(Script): interpreter['properties'][hive_interactive_properties_key + '.driver'] = 'org.apache.hive.jdbc.HiveDriver' interpreter['properties'][hive_interactive_properties_key + '.user'] = 'hive' interpreter['properties'][hive_interactive_properties_key + '.password'] = '' - interpreter['properties'][hive_interactive_properties_key + '.property'] = 'hive.server2.proxy.user' + interpreter['properties'][hive_interactive_properties_key + '.proxy.user.property'] = 'hive.server2.proxy.user' if params.hive_server2_support_dynamic_service_discovery: interpreter['properties'][hive_interactive_properties_key + '.url'] = 'jdbc:hive2://' + \ params.hive_zookeeper_quorum + \
ambari git commit: AMBARI-21306.zeppelin jdbc interpreter gives error for 'doAs'(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 8da634c70 -> 23cc628f4 AMBARI-21306.zeppelin jdbc interpreter gives error for 'doAs'(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/23cc628f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23cc628f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23cc628f Branch: refs/heads/trunk Commit: 23cc628f4827913869da4917a9bd7b9c0c1abf73 Parents: 8da634c Author: Venkata SairamAuthored: Mon Jun 26 12:31:26 2017 +0530 Committer: Venkata Sairam Committed: Mon Jun 26 12:31:26 2017 +0530 -- .../common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/23cc628f/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index 8b5f821..0013ab0 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -366,7 +366,7 @@ class Master(Script): interpreter['properties'][hive_interactive_properties_key + '.driver'] = 'org.apache.hive.jdbc.HiveDriver' interpreter['properties'][hive_interactive_properties_key + '.user'] = 'hive' interpreter['properties'][hive_interactive_properties_key + '.password'] = '' - interpreter['properties'][hive_interactive_properties_key + '.property'] = 'hive.server2.proxy.user' + interpreter['properties'][hive_interactive_properties_key + '.proxy.user.property'] = 'hive.server2.proxy.user' if params.hive_server2_support_dynamic_service_discovery: interpreter['properties'][hive_interactive_properties_key + '.url'] = 'jdbc:hive2://' + \ params.hive_zookeeper_quorum + \
ambari git commit: AMBARI-21304.Zeppelin should have a preconfigured %jdbc(spark) interpreter(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 802e8c6dd -> 9369c1081 AMBARI-21304.Zeppelin should have a preconfigured %jdbc(spark) interpreter(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9369c108 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9369c108 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9369c108 Branch: refs/heads/branch-2.5 Commit: 9369c1081c1b713dd2e3231743ac37176f1af152 Parents: 802e8c6 Author: Venkata SairamAuthored: Mon Jun 26 12:23:43 2017 +0530 Committer: Venkata Sairam Committed: Mon Jun 26 12:24:52 2017 +0530 -- .../0.6.0.2.5/package/scripts/master.py | 19 .../0.6.0.2.5/package/scripts/params.py | 23 2 files changed, 42 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/9369c108/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index 75ca6a5..8b5f821 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -377,6 +377,25 @@ class Master(Script): params.hive_server_interactive_hosts + \ ':' + params.hive_server_port +if params.spark_thrift_server_hosts: + interpreter['properties']['spark.driver'] = 'org.apache.hive.jdbc.HiveDriver' + interpreter['properties']['spark.user'] = 'hive' + interpreter['properties']['spark.password'] = '' + interpreter['properties']['spark.proxy.user.property'] = 'hive.server2.proxy.user' + interpreter['properties']['spark.url'] = 'jdbc:hive2://' + \ + params.spark_thrift_server_hosts + ':' + params.spark_hive_thrift_port + '/' + if params.spark_hive_principal: +interpreter['properties']['spark.url'] += ';principal=' + params.spark_hive_principal + +if params.spark2_thrift_server_hosts: + interpreter['properties']['spark2.driver'] = 'org.apache.hive.jdbc.HiveDriver' + interpreter['properties']['spark2.user'] = 'hive' + interpreter['properties']['spark2.password'] = '' + interpreter['properties']['spark2.proxy.user.property'] = 'hive.server2.proxy.user' + interpreter['properties']['spark2.url'] = 'jdbc:hive2://' + \ + params.spark2_thrift_server_hosts + ':' + params.spark2_hive_thrift_port + '/' + if params.spark_hive_principal: +interpreter['properties']['spark2.url'] += ';principal=' + params.spark2_hive_principal if params.zookeeper_znode_parent \ and params.hbase_zookeeper_quorum: http://git-wip-us.apache.org/repos/asf/ambari/blob/9369c108/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py index fe3bbfb..3e6825b 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py @@ -152,6 +152,29 @@ if 'hive_server_interactive_hosts' in master_configs and len(master_configs['hiv hive_zookeeper_quorum = config['configurations']['hive-site']['hive.zookeeper.quorum'] hive_server2_support_dynamic_service_discovery = config['configurations']['hive-site']['hive.server2.support.dynamic.service.discovery'] +spark_thrift_server_hosts = None +spark_hive_thrift_port = None +spark_hive_principal = None +if 'spark_thriftserver_hosts' in master_configs and len(master_configs['spark_thriftserver_hosts']) != 0: + spark_thrift_server_hosts = str(master_configs['spark_thriftserver_hosts'][0]) + if config['configurations']['spark-hive-site-override']: +spark_hive_thrift_port = config['configurations']['spark-hive-site-override']['hive.server2.thrift.port'] + if config['configurations']['spark-thrift-sparkconf'] and \ + 'spark.sql.hive.hiveserver2.jdbc.url.principal' in
ambari git commit: AMBARI-21304.Zeppelin should have a preconfigured %jdbc(spark) interpreter(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 16dc40562 -> 8da634c70 AMBARI-21304.Zeppelin should have a preconfigured %jdbc(spark) interpreter(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8da634c7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8da634c7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8da634c7 Branch: refs/heads/trunk Commit: 8da634c70042e6bbd99a93dd08211021798875a7 Parents: 16dc405 Author: Venkata SairamAuthored: Mon Jun 26 12:23:43 2017 +0530 Committer: Venkata Sairam Committed: Mon Jun 26 12:23:43 2017 +0530 -- .../0.6.0.2.5/package/scripts/master.py | 19 .../0.6.0.2.5/package/scripts/params.py | 23 2 files changed, 42 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/8da634c7/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py index 75ca6a5..8b5f821 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/master.py @@ -377,6 +377,25 @@ class Master(Script): params.hive_server_interactive_hosts + \ ':' + params.hive_server_port +if params.spark_thrift_server_hosts: + interpreter['properties']['spark.driver'] = 'org.apache.hive.jdbc.HiveDriver' + interpreter['properties']['spark.user'] = 'hive' + interpreter['properties']['spark.password'] = '' + interpreter['properties']['spark.proxy.user.property'] = 'hive.server2.proxy.user' + interpreter['properties']['spark.url'] = 'jdbc:hive2://' + \ + params.spark_thrift_server_hosts + ':' + params.spark_hive_thrift_port + '/' + if params.spark_hive_principal: +interpreter['properties']['spark.url'] += ';principal=' + params.spark_hive_principal + +if params.spark2_thrift_server_hosts: + interpreter['properties']['spark2.driver'] = 'org.apache.hive.jdbc.HiveDriver' + interpreter['properties']['spark2.user'] = 'hive' + interpreter['properties']['spark2.password'] = '' + interpreter['properties']['spark2.proxy.user.property'] = 'hive.server2.proxy.user' + interpreter['properties']['spark2.url'] = 'jdbc:hive2://' + \ + params.spark2_thrift_server_hosts + ':' + params.spark2_hive_thrift_port + '/' + if params.spark_hive_principal: +interpreter['properties']['spark2.url'] += ';principal=' + params.spark2_hive_principal if params.zookeeper_znode_parent \ and params.hbase_zookeeper_quorum: http://git-wip-us.apache.org/repos/asf/ambari/blob/8da634c7/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py index 2340df9..f1ecbb1 100644 --- a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/params.py @@ -152,6 +152,29 @@ if 'hive_server_interactive_hosts' in master_configs and len(master_configs['hiv hive_zookeeper_quorum = config['configurations']['hive-site']['hive.zookeeper.quorum'] hive_server2_support_dynamic_service_discovery = config['configurations']['hive-site']['hive.server2.support.dynamic.service.discovery'] +spark_thrift_server_hosts = None +spark_hive_thrift_port = None +spark_hive_principal = None +if 'spark_thriftserver_hosts' in master_configs and len(master_configs['spark_thriftserver_hosts']) != 0: + spark_thrift_server_hosts = str(master_configs['spark_thriftserver_hosts'][0]) + if config['configurations']['spark-hive-site-override']: +spark_hive_thrift_port = config['configurations']['spark-hive-site-override']['hive.server2.thrift.port'] + if config['configurations']['spark-thrift-sparkconf'] and \ + 'spark.sql.hive.hiveserver2.jdbc.url.principal' in
[24/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/sinon-1.13.0.js -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/sinon-1.13.0.js b/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/sinon-1.13.0.js deleted file mode 100644 index 31ab75e..000 --- a/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/sinon-1.13.0.js +++ /dev/null @@ -1,5830 +0,0 @@ -/** - * Sinon.JS 1.13.0, 2015/03/05 - * - * @author Christian Johansen (christ...@cjohansen.no) - * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS - * - * (The BSD License) - * - * Copyright (c) 2010-2014, Christian Johansen, christ...@cjohansen.no - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of Christian Johansen nor the names of his contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -(function (root, factory) { - if (typeof define === 'function' && define.amd) { -define('sinon', [], function () { - return (root.sinon = factory()); -}); - } else if (typeof exports === 'object') { -module.exports = factory(); - } else { -root.sinon = factory(); - } -}(this, function () { - var samsam, formatio; - (function () { -function define(mod, deps, fn) { - if (mod == "samsam") { -samsam = deps(); - } else if (typeof deps === "function" && mod.length === 0) { -lolex = deps(); - } else if (typeof fn === "function") { -formatio = fn(samsam); - } -} -define.amd = {}; -((typeof define === "function" && define.amd && function (m) { define("samsam", m); }) || - (typeof module === "object" && - function (m) { module.exports = m(); }) || // Node - function (m) { this.samsam = m(); } // Browser globals -)(function () { -var o = Object.prototype; -var div = typeof document !== "undefined" && document.createElement("div"); - -function isNaN(value) { -// Unlike global isNaN, this avoids type coercion -// typeof check avoids IE host object issues, hat tip to -// lodash -var val = value; // JsLint thinks value !== value is "weird" -return typeof value === "number" && value !== val; -} - -function getClass(value) { -// Returns the internal [[Class]] by calling Object.prototype.toString -// with the provided value as this. Return value is a string, naming the -// internal class, e.g. "Array" -return o.toString.call(value).split(/[ \]]/)[1]; -} - -/** - * @name samsam.isArguments - * @param Object object - * - * Returns ``true`` if ``object`` is an ``arguments`` object, - * ``false`` otherwise. - */ -function isArguments(object) { -if (getClass(object) === 'Arguments') { return true; } -if (typeof object !== "object" || typeof object.length !== "number" || -getClass(object) === "Array") { -return false; -} -if (typeof object.callee == "function") { return true; } -try { -object[object.length] = 6; -delete object[object.length]; -} catch (e) { -return true; -} -return false; -} - -/** - * @name samsam.isElement - * @param Object object - * - *
[03/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/styles/bootstrap.css -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/styles/bootstrap.css b/contrib/views/slider/src/main/resources/ui/vendor/styles/bootstrap.css deleted file mode 100644 index 5c6f23d..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/styles/bootstrap.css +++ /dev/null @@ -1,5785 +0,0 @@ -/*! - * Bootstrap v3.1.1 (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */ - -/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ -html { -font-family: sans-serif; --webkit-text-size-adjust: 100%; --ms-text-size-adjust: 100%; -} -body { -margin: 0; -} -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -main, -nav, -section, -summary { -display: block; -} -audio, -canvas, -progress, -video { -display: inline-block; -vertical-align: baseline; -} -audio:not([controls]) { -display: none; -height: 0; -} -[hidden], -template { -display: none; -} -a { -background: transparent; -} -a:active, -a:hover { -outline: 0; -} -abbr[title] { -border-bottom: 1px dotted; -} -b, -strong { -font-weight: bold; -} -dfn { -font-style: italic; -} -h1 { -margin: .67em 0; -font-size: 2em; -} -mark { -color: #000; -background: #ff0; -} -small { -font-size: 80%; -} -sub, -sup { -position: relative; -font-size: 75%; -line-height: 0; -vertical-align: baseline; -} -sup { -top: -.5em; -} -sub { -bottom: -.25em; -} -img { -border: 0; -} -svg:not(:root) { -overflow: hidden; -} -figure { -margin: 1em 40px; -} -hr { -height: 0; --moz-box-sizing: content-box; -box-sizing: content-box; -} -pre { -overflow: auto; -} -code, -kbd, -pre, -samp { -font-family: monospace, monospace; -font-size: 1em; -} -button, -input, -optgroup, -select, -textarea { -margin: 0; -font: inherit; -color: inherit; -} -button { -overflow: visible; -} -button, -select { -text-transform: none; -} -button, -html input[type="button"], -input[type="reset"], -input[type="submit"] { --webkit-appearance: button; -cursor: pointer; -} -button[disabled], -html input[disabled] { -cursor: default; -} -button::-moz-focus-inner, -input::-moz-focus-inner { -padding: 0; -border: 0; -} -input { -line-height: normal; -} -input[type="checkbox"], -input[type="radio"] { -box-sizing: border-box; -padding: 0; -} -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { -height: auto; -} -input[type="search"] { --webkit-box-sizing: content-box; --moz-box-sizing: content-box; -box-sizing: content-box; --webkit-appearance: textfield; -} -input[type="search"]::-webkit-search-cancel-button, -input[type="search"]::-webkit-search-decoration { --webkit-appearance: none; -} -fieldset { -padding: .35em .625em .75em; -margin: 0 2px; -border: 1px solid #c0c0c0; -} -legend { -padding: 0; -border: 0; -} -textarea { -overflow: auto; -} -optgroup { -font-weight: bold; -} -table { -border-spacing: 0; -border-collapse: collapse; -} -td, -th { -padding: 0; -} -@media print { -* { -color: #000 !important; -text-shadow: none !important; -background: transparent !important; -box-shadow: none !important; -} -a, -a:visited { -text-decoration: underline; -} -a[href]:after { -content: " (" attr(href) ")"; -} -abbr[title]:after { -content: " (" attr(title) ")"; -} -a[href^="javascript:"]:after, -a[href^="#"]:after { -content: ""; -} -pre, -blockquote { -border: 1px solid #999; - -page-break-inside: avoid; -} -thead { -display: table-header-group; -} -tr, -img { -page-break-inside: avoid; -} -img { -max-width: 100% !important; -} -p, -h2, -h3 { -orphans: 3; -widows: 3; -} -h2, -h3 { -page-break-after: avoid; -} -select { -background: #fff !important; -} -.navbar { -display: none; -} -.table td, -.table th { -background-color: #fff !important; -} -.btn > .caret, -.dropup > .btn > .caret { -border-top-color: #000 !important; -} -.label { -border: 1px solid #000; -} -.table { -border-collapse: collapse !important; -} -.table-bordered th, -.table-bordered td { -border: 1px solid #ddd !important; -} -} -* { --webkit-box-sizing: border-box; --moz-box-sizing: border-box; -box-sizing: border-box; -} -*:before, -*:after { -
[27/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.svg -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.svg b/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.svg deleted file mode 100644 index 2edb4ec..000 --- a/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.svg +++ /dev/null @@ -1,399 +0,0 @@ - -http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd; > -http://www.w3.org/2000/svg;> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[01/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 8f06a5b01 -> ec8deeba2 http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/styles/jquery-ui-bootstrap/jquery-ui-1.8.16.custom.css -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/styles/jquery-ui-bootstrap/jquery-ui-1.8.16.custom.css b/contrib/views/slider/src/main/resources/ui/vendor/styles/jquery-ui-bootstrap/jquery-ui-1.8.16.custom.css deleted file mode 100644 index ad18ce7..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/styles/jquery-ui-bootstrap/jquery-ui-1.8.16.custom.css +++ /dev/null @@ -1,1320 +0,0 @@ -/*! - * jQuery UI Bootstrap (0.22) - * http://addyosmani.github.com/jquery-ui-bootstrap - * - * Copyright 2012, Addy Osmani - * Dual licensed under the MIT or GPL Version 2 licenses. - * - * Portions copyright jQuery UI & Twitter Bootstrap - */ - - -/* Layout helpers ---*/ -.ui-helper-hidden { display: none; } -.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); } -.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } -.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -.ui-helper-clearfix { display: inline-block; } -/* required comment for clearfix to work in Opera \*/ -* html .ui-helper-clearfix { height:1%; } -.ui-helper-clearfix { display:block; } -/* end clearfix */ -.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } - - -/* Interaction Cues ---*/ -.ui-state-disabled { cursor: default !important; } - - -/* Icons ---*/ - -/* states and images */ -.ui-icon { display: block; text-indent: -9px; overflow: hidden; background-repeat: no-repeat; } - - -/* Misc visuals ---*/ - -/* Overlays */ -.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } - - -/* - * jQuery UI CSS Framework 1.8.16 - * - * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * http://docs.jquery.com/UI/Theming/API - * - * To view and modify this theme, visit http://jqueryui.com/themeroller/?ctl=themeroller - */ - - -/* Component containers ---*/ -.ui-widget { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size:13px; } -.ui-widget .ui-widget { font-size: 1em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 1em; } -.ui-widget-content { border: 1px solid #aa; background: #ff url(../img/jquery-ui-bootstrap/ui-bg_glass_75_ff_1x400.png) 50% 50% repeat-x; color: #404040; } -.ui-widget-content a { color: #404040; } -.ui-widget-header { - font-weight:bold; - border-color: #0064cd #0064cd #003f81; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - border:1px solid #666; - - } -.ui-widget-header a { color: #22; } - -/* Interaction states ---*/ -.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { - - background-color: #e6e6e6; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ff), color-stop(25%, #ff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ff, #ff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ff, #ff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ff, #ff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ff, #ff 25%, #e6e6e6); - background-image: linear-gradient(#ff, #ff 25%, #e6e6e6); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff', endColorstr='#e6e6e6', GradientType=0); - - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - - color: #333; - font-size: 13px; - line-height: normal; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -webkit-transition: 0.1s linear background-image; - -moz-transition: 0.1s linear background-image; - -ms-transition: 0.1s linear background-image; - -o-transition: 0.1s linear background-image; - transition: 0.1s linear background-image; - overflow: visible; - - } - - -.ui-state-default a, .ui-state-default
[17/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_apps_controller_test.js -- diff --git a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_apps_controller_test.js b/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_apps_controller_test.js deleted file mode 100644 index 3462d22..000 --- a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_apps_controller_test.js +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -moduleFor('controller:sliderApps', 'App.SliderAppsController', { - - setup: function () { -sinon.stub(Bootstrap.ModalManager, 'open', Em.K); - }, - - teardown: function () { -Bootstrap.ModalManager.open.restore(); - } - -}); - -test('showUnavailableAppsPopup', function () { - - var cases = [ - { -message: 'message', -result: 'message', -title: 'errorMessage property should be set' - }, - { -result: Em.I18n.t('slider.apps.undefined.issue'), -title: 'default error message' - } -], -controller = this.subject({ - errorMessage: null -}); - - cases.forEach(function (item) { - -Em.run(function () { - controller.showUnavailableAppsPopup(item.message); -}); - -equal(controller.get('errorMessage'), item.result, item.title); - - }); - -}); http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js -- diff --git a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js b/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js deleted file mode 100644 index e31d266..000 --- a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js +++ /dev/null @@ -1,140 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -moduleFor('controller:slider', 'App.SliderController', { - - setup: function () { -App.setProperties({ - metricsHost: null, - metricsPort: null, - metricsLibPath: null -}); -Ember.run(App, App.advanceReadiness); - }, - - teardown: function () { -App.reset(); - } - -}); - -var properties = [ - Em.Object.create({ -viewConfigName: 'site.global.metric_collector_lib', -value: 'file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar' - }), - Em.Object.create({ -viewConfigName: 'site.global.metric_collector_host', -value: 'h2' - }), - Em.Object.create({ -viewConfigName: 'site.global.metric_collector_port', -value: '6188' - }) -]; - -test('getViewDisplayParametersSuccessCallback', function () { - - var sliderController = this.subject({}); - Em.run(function () { -sliderController.getViewDisplayParametersSuccessCallback({ - "ViewInstanceInfo" : { -"description" : "description s1", -"label" : "display s1", -"instance_data": { - "java.home": "/usr/jdk64/jdk1.7.0_45", - "slider.user": "admin" -} - } -}) - }); - equal(App.get('label'), 'display s1', 'valid label is set'); - equal(App.get('description'), 'description
[16/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/bs-button.min.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/bs-button.min.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/bs-button.min.js deleted file mode 100644 index cac67e5..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/bs-button.min.js +++ /dev/null @@ -1 +0,0 @@ -+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d)};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.is("input")?"val":"html",e=c.data();a+="Text",e.resetText||c.data("resetText",c[d]()),c[d](e[a]||this.options[a]),setTimeout(function(){"loadingText"==a?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.closest('[data-toggle="buttons"]');if(a.length){var b=this.$element.find("input").prop("checked",!this.$element.hasClass("active")).trigger("change");"radio"===b.prop("type")&(".active").removeClass("active")}this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof c&e||d.data("bs.button",e=new b(this,f)),"toggle"==c?e.toggle():c&(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=functio n(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(window.jQuery),function(){Bootstrap.BsButtonComponent=Ember.Component.extend(Bootstrap.TypeSupport,Bootstrap.SizeSupport,{layoutName:"components/bs-button",tagName:"button",classNames:["btn"],classNameBindings:["blockClass"],classTypePrefix:"btn",clickedParam:null,block:null,attributeBindings:["disabled","dismiss:data-dismiss","_type:type","style"],_type:"button",bubbles:!0,allowedProperties:["title","type","size","block","disabled","clicked","dismiss","class"],icon_active:void 0,icon_inactive:void 0},{init:function(){var a,b,c,d,e,f,g;if(this._super(),null!=this.get("content")&&"instance"===Ember.typeOf(this.get("content")))for(b=this.get("content"),f=this.get("allowedProperties"),d=0,e=f.length;e>d;d++)c=f[d],null!=b[c]&(c,b[c]);else null==this.get("title")& ("title",this.get("content"));g=[];for(a in this)null!=a.match(/^data-[\w-]*$/)&(this.attributeBindings.pushObject(a));return g},blockClass:function(){return this.block?""+this.classTypePrefix+"-block":null}.property("block").cacheable(),click:function(a){return this.get("bubbles")||a.stopPropagation(),this.sendAction("clicked",this.get("clickedParam"))},loadingChanged:function(){var a;return a=null!==this.get("loading")?this.get("loading"):"reset",Ember.$("#"+this.elementId).button(a)}.observes("loading"),icon:function(){return this.get("isActive")?this.get("icon_active"):this.get("icon_inactive")}.property("isActive")}),Ember.Handlebars.helper("bs-button",Bootstrap.BsButtonComponent)}.call(this),function(){Bootstrap.BsBtnGroup=Bootstrap.ItemsView.extend(Bootstrap.SizeSupport,Bootstrap.ItemsSelection,{classTypePrefix:["btn-group"],classNames:["btn-group"],classNameBindings:["vertical:btn-group-vertical"],itemViewClass:Bootstrap.BsButtonComponent.extend(Bootstrap.ItemValue,Bo otstrap.ItemSelection,{init:function(){return this._super(),this.set("icon_active",this.get("parentView.icon_active")),this.set("icon_inactive",this.get("parentView.icon_inactive"))}})}),Ember.Handlebars.helper("bs-btn-group",Bootstrap.BsBtnGroup)}.call(this),function(){Bootstrap.BsBtnToolbarComponent=Ember.Component.extend({layoutName:"components/bs-btn-toolbar",classNames:["btn-toolbar"]}),Ember.Handlebars.helper("bs-btn-toolbar",Bootstrap.BsBtnToolbarComponent)}.call(this),this.Ember=this.Ember||{},this.Ember.TEMPLATES=this.Ember.TEMPLATES||{},this.Ember.TEMPLATES["components/bs-button"]=Ember.Handlebars.template(function(a,b,c,d,e){function f(a,b){var d,e,f,g,h="";return b.buffer.push("\n\n"),h}this.compilerInfo=[4,">= 1.0.0"],c=this.merge(c,Embe r.Handlebars.helpers),e=e||{};var g,h,i,j="",k=c.helperMissing,l=this.escapeExpression,m=this;return
[05/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/production/ember-data.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/production/ember-data.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/production/ember-data.js deleted file mode 100644 index d6a58cb..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/production/ember-data.js +++ /dev/null @@ -1,10626 +0,0 @@ -/*! - * @overview Ember Data - * @copyright Copyright 2011-2014 Tilde Inc. and contributors. - *Portions Copyright 2011 LivingSocial Inc. - * @license Licensed under MIT license (see license.js) - * @version 1.0.0-beta.7+canary.238bb5ce - */ - - -(function() { -var define, requireModule; - -(function() { - var registry = {}, seen = {}; - - define = function(name, deps, callback) { -registry[name] = { deps: deps, callback: callback }; - }; - - requireModule = function(name) { -if (seen[name]) { return seen[name]; } -seen[name] = {}; - -var mod, deps, callback, reified , exports; - -mod = registry[name]; - -if (!mod) { - throw new Error("Module '" + name + "' not found."); -} - -deps = mod.deps; -callback = mod.callback; -reified = []; -exports; - -for (var i=0, l=deps.length; i0; i--) { -var proxyPair = proxyPairs[i - 1], -deprecated = proxyPair['deprecated'], -valid = proxyPair['valid']; - -this.registerDeprecation(deprecated, valid); - } -}; - -DS.ContainerProxy = ContainerProxy; - -})(); - - - -(function() { -var get = Ember.get, set = Ember.set, isNone = Ember.isNone; - -// Simple dispatcher to support overriding the aliased -// method in subclasses. -function aliasMethod(methodName) { - return function() { -return this[methodName].apply(this, arguments); - }; -} - -/** - In Ember Data a Serializer is used to serialize and deserialize - records when they are transferred in and out of an external source. - This process involves normalizing property names, transforming - attribute values and serializing relationships. - - For maximum performance Ember Data recommends you use the - [RESTSerializer](DS.RESTSerializer.html) or one of its subclasses. - - `JSONSerializer` is useful for simpler or legacy backends that may - not support the http://jsonapi.org/ spec. - - @class JSONSerializer - @namespace DS -*/ -DS.JSONSerializer = Ember.Object.extend({ - /** -The primaryKey is used when serializing and deserializing -data. Ember Data always uses the `id` property to store the id of -the record. The external source may not always follow this -convention. In these cases it is useful to override the -primaryKey property to match the primaryKey of your external -store. - -Example - -```javascript -
[23/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/sinon-qunit-1.0.0.js -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/sinon-qunit-1.0.0.js b/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/sinon-qunit-1.0.0.js deleted file mode 100644 index c26232f..000 --- a/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/sinon-qunit-1.0.0.js +++ /dev/null @@ -1,62 +0,0 @@ -/** - * sinon-qunit 1.0.0, 2010/12/09 - * - * @author Christian Johansen (christ...@cjohansen.no) - * - * (The BSD License) - * - * Copyright (c) 2010-2011, Christian Johansen, christ...@cjohansen.no - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of Christian Johansen nor the names of his contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/*global sinon, QUnit, test*/ -sinon.assert.fail = function (msg) { -QUnit.ok(false, msg); -}; - -sinon.assert.pass = function (assertion) { -QUnit.ok(true, assertion); -}; - -sinon.config = { -injectIntoThis: true, -injectInto: null, -properties: ["spy", "stub", "mock", "clock", "sandbox"], -useFakeTimers: true, -useFakeServer: false -}; - -(function (global) { -var qTest = QUnit.test; - -QUnit.test = global.test = function (testName, expected, callback, async) { -if (arguments.length === 2) { -callback = expected; -expected = null; -} - -return qTest(testName, expected, sinon.test(callback), async); -}; -}(this)); http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/tests.js -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/tests.js b/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/tests.js deleted file mode 100644 index b830f0f..000 --- a/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/tests.js +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -var folderOrder = [ - 'test' -]; - -folderOrder.forEach(function(folder) { - window.require.list().filter(function(module) { -return new RegExp('^' + folder + '/').test(module); - }).forEach(function(module) { - require(module); -}); -}); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/stylesheets/qunit.css -- diff --git
[08/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/tv4.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/tv4.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/tv4.js deleted file mode 100644 index b530ab3..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/tv4.js +++ /dev/null @@ -1,1605 +0,0 @@ -/* - Author: Geraint Luff and others - Year: 2013 - - This code is released into the "public domain" by its author(s). Anybody may use, alter and distribute the code without restriction. The author makes no guarantees, and takes no liability of any kind for use of this code. - - If you find a bug or make an improvement, it would be courteous to let the author know, but it is not compulsory. - */ -(function (global, factory) { - if (typeof define === 'function' && define.amd) { -// AMD. Register as an anonymous module. -define([], factory); - } else if (typeof module !== 'undefined' && module.exports){ -// CommonJS. Define export. -module.exports = factory(); - } else { -// Browser globals -global.tv4 = factory(); - } -}(this, function () { - -// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys?redirectlocale=en-US=JavaScript%2FReference%2FGlobal_Objects%2FObject%2Fkeys - if (!Object.keys) { -Object.keys = (function () { - var hasOwnProperty = Object.prototype.hasOwnProperty, -hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'), -dontEnums = [ - 'toString', - 'toLocaleString', - 'valueOf', - 'hasOwnProperty', - 'isPrototypeOf', - 'propertyIsEnumerable', - 'constructor' -], -dontEnumsLength = dontEnums.length; - - return function (obj) { -if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) { - throw new TypeError('Object.keys called on non-object'); -} - -var result = []; - -for (var prop in obj) { - if (hasOwnProperty.call(obj, prop)) { -result.push(prop); - } -} - -if (hasDontEnumBug) { - for (var i=0; i < dontEnumsLength; i++) { -if (hasOwnProperty.call(obj, dontEnums[i])) { - result.push(dontEnums[i]); -} - } -} -return result; - }; -})(); - } -// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/create - if (!Object.create) { -Object.create = (function(){ - function F(){} - - return function(o){ -if (arguments.length !== 1) { - throw new Error('Object.create implementation only accepts one parameter.'); -} -F.prototype = o; -return new F(); - }; -})(); - } -// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray?redirectlocale=en-US=JavaScript%2FReference%2FGlobal_Objects%2FArray%2FisArray - if(!Array.isArray) { -Array.isArray = function (vArg) { - return Object.prototype.toString.call(vArg) === "[object Array]"; -}; - } -// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf?redirectlocale=en-US=JavaScript%2FReference%2FGlobal_Objects%2FArray%2FindexOf - if (!Array.prototype.indexOf) { -Array.prototype.indexOf = function (searchElement /*, fromIndex */ ) { - if (this === null) { -throw new TypeError(); - } - var t = Object(this); - var len = t.length >>> 0; - - if (len === 0) { -return -1; - } - var n = 0; - if (arguments.length > 1) { -n = Number(arguments[1]); -if (n !== n) { // shortcut for verifying if it's NaN - n = 0; -} else if (n !== 0 && n !== Infinity && n !== -Infinity) { - n = (n > 0 || -1) * Math.floor(Math.abs(n)); -} - } - if (n >= len) { -return -1; - } - var k = n >= 0 ? n : Math.max(len - Math.abs(n), 0); - for (; k < len; k++) { -if (k in t && t[k] === searchElement) { - return k; -} - } - return -1; -}; - } - -// Grungey Object.isFrozen hack - if (!Object.isFrozen) { -Object.isFrozen = function (obj) { - var key = "tv4_test_frozen_key"; - while (obj.hasOwnProperty(key)) { -key += Math.random(); - } - try { -obj[key] = true; -delete obj[key]; -return false; - } catch (e) { -return true; - } -}; - } -// Based on: https://github.com/geraintluff/uri-templates, but with all the de-substitution stuff removed - - var uriTemplateGlobalModifiers = { -"+": true, -"#": true, -".": true, -"/": true, -";":
[30/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/data/apptypes/all_fields.json -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/data/apptypes/all_fields.json b/contrib/views/slider/src/main/resources/ui/app/assets/data/apptypes/all_fields.json deleted file mode 100644 index 19e3479..000 --- a/contrib/views/slider/src/main/resources/ui/app/assets/data/apptypes/all_fields.json +++ /dev/null @@ -1,642 +0,0 @@ -{ - "href" : "http://c6401:8080/api/v1/views/SLIDER/versions/1.0.0/instances/SLIDER_1/apptypes?fields=*;, - "items" : [ -{ - "href" : "http://c6401:8080/api/v1/views/SLIDER/versions/1.0.0/instances/SLIDER_1/apptypes/ACCUMULO;, - "id" : "ACCUMULO", - "instance_name" : "SLIDER_1", - "typeComponents" : [ -{ - "id" : "ACCUMULO_MASTER", - "name" : "ACCUMULO_MASTER", - "category" : "MASTER", - "displayName" : "ACCUMULO_MASTER", - "priority" : 1, - "instanceCount" : 0, - "maxInstanceCount" : 0, - "yarnMemory" : 1024, - "yarnCpuCores" : 1 -}, -{ - "id" : "ACCUMULO_MONITOR", - "name" : "ACCUMULO_MONITOR", - "category" : "MASTER", - "displayName" : "ACCUMULO_MONITOR", - "priority" : 3, - "instanceCount" : 0, - "maxInstanceCount" : 0, - "yarnMemory" : 1024, - "yarnCpuCores" : 1 -}, -{ - "id" : "ACCUMULO_GC", - "name" : "ACCUMULO_GC", - "category" : "MASTER", - "displayName" : "ACCUMULO_GC", - "priority" : 4, - "instanceCount" : 0, - "maxInstanceCount" : 0, - "yarnMemory" : 1024, - "yarnCpuCores" : 1 -}, -{ - "id" : "ACCUMULO_TRACER", - "name" : "ACCUMULO_TRACER", - "category" : "MASTER", - "displayName" : "ACCUMULO_TRACER", - "priority" : 5, - "instanceCount" : 0, - "maxInstanceCount" : 0, - "yarnMemory" : 1024, - "yarnCpuCores" : 1 -}, -{ - "id" : "ACCUMULO_TSERVER", - "name" : "ACCUMULO_TSERVER", - "category" : "SLAVE", - "displayName" : "ACCUMULO_TSERVER", - "priority" : 2, - "instanceCount" : 0, - "maxInstanceCount" : 0, - "yarnMemory" : 1024, - "yarnCpuCores" : 1 -} - ], - "typeDescription" : "The Apache Accumulo sorted, distributed key/value store is a robust,\nscalable, high performance data storage system that features cell-based\naccess control and customizable server-side processing. It is based on\nGoogle's BigTable design and is built on top of Apache Hadoop,\nZookeeper, and Thrift.\nRequirements:\n 1. Ensure parent dir for path (accumulo-site/instance.dfs.dir) is accessible to the App owner.", - "typeName" : "ACCUMULO", - "typePackageFileName" : "accumulo_v151.zip", - "typeVersion" : "1.5.1", - "version" : "1.0.0", - "view_name" : "SLIDER", - "typeConfigs" : { -"agent.conf" : "/slider/agent/conf/agent.ini", -"application.def" : "/slider/accumulo_v151.zip", -"config_types" : "accumulo-site", -"java_home" : "/usr/jdk64/jdk1.7.0_45", -"package_list" : "files/accumulo-1.5.1-bin.tar.gz", -"site.accumulo-site.gc.port.client" : "0", -"site.accumulo-site.general.classpaths" : "$ACCUMULO_HOME/lib/accumulo-server.jar,\n$ACCUMULO_HOME/lib/accumulo-core.jar,\n$ACCUMULO_HOME/lib/accumulo-start.jar,\n$ACCUMULO_HOME/lib/accumulo-fate.jar,\n$ACCUMULO_HOME/lib/accumulo-proxy.jar,\n$ACCUMULO_HOME/lib/[^.].*.jar,\n$ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n$HADOOP_CONF_DIR,\n$HADOOP_PREFIX/[^.].*.jar,\n$HADOOP_PREFIX/lib/[^.].*.jar,\n$HADOOP_PREFIX/share/hadoop/common/.*.jar,\n$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,\n$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,\n$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,\n$HADOOP_PREFIX/share/hadoop/yarn/.*.jar,\n/usr/lib/hadoop/.*.jar,\n/usr/lib/hadoop/lib/.*.jar,\n/usr/lib/hadoop-hdfs/.*.jar,\n/usr/lib/hadoop-mapreduce/.*.jar,\n/usr/lib/hadoop-yarn/.*.jar,", -"site.accumulo-site.instance.dfs.dir" : "/apps/accumulo/data", -"site.accumulo-site.instance.secret" : "DEFAULT", -"site.accumulo-site.instance.zookeeper.host" : "${ZK_HOST}", -"site.accumulo-site.master.port.client" : "0", -"site.accumulo-site.monitor.port.client" : "${ACCUMULO_MONITOR.ALLOCATED_PORT}", -"site.accumulo-site.monitor.port.log4j" : "0", -"site.accumulo-site.trace.port.client" : "0", -"site.accumulo-site.trace.token.property.password" : "secret", -"site.accumulo-site.trace.user" : "root", -
[18/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/test/integration/processes/create_new_app_test.js -- diff --git a/contrib/views/slider/src/main/resources/ui/test/integration/processes/create_new_app_test.js b/contrib/views/slider/src/main/resources/ui/test/integration/processes/create_new_app_test.js deleted file mode 100644 index 5be4d5b..000 --- a/contrib/views/slider/src/main/resources/ui/test/integration/processes/create_new_app_test.js +++ /dev/null @@ -1,358 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -var appTypes = { - items: [ -{ - "id": "HBASE", - "instance_name": "SLIDER_1", - "typeComponents": [ -{ - "id": "HBASE_MASTER", - "name": "HBASE_MASTER", - "displayName": "HBASE_MASTER", - "instanceCount": 1, - "maxInstanceCount": 2, - "yarnMemory": 1024, - "yarnCpuCores": 1 -}, -{ - "id": "HBASE_REGIONSERVER", - "name": "HBASE_REGIONSERVER", - "category": "SLAVE", - "displayName": "HBASE_REGIONSERVER", - "priority": 2, - "instanceCount": 2, - "maxInstanceCount": 0, - "yarnMemory": 1024, - "yarnCpuCores": 1 -} - ], - "typeDescription": "Apache HBase is the Hadoop database, a distributed, scalable, big data store.\nRequirements:\n1. Ensure parent dir for path (hbase-site/hbase.rootdir) is accessible to the App owner.\n2. Ensure ZK root (hbase-site/zookeeper.znode.parent) is unique for the App instance.", - "typeName": "HBASE", - "typePackageFileName": "hbase_v096.zip", - "typeVersion": "0.96.0.2.1.1", - "version": "1.0.0", - "view_name": "SLIDER", - "typeConfigs": { -"agent.conf": "/slider/agent/conf/agent.ini", -"application.def": "/slider/hbase_v096.zip", -"config_types": "core-site,hdfs-site,hbase-site", -"java_home": "/usr/jdk64/jdk1.7.0_45", -"package_list": "files/hbase-0.96.1-hadoop2-bin.tar.gz", -"site.core-site.fs.defaultFS": "${NN_URI}", -"site.global.app_install_dir": "${AGENT_WORK_ROOT}/app/install", -"site.global.metric_collector_host": "${NN_HOST}", -"site.global.metric_collector_port": "6118", -"site.global.metric_collector_lib": "file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar", -"site.global.hbase_master_heapsize": "1024m", -"site.global.hbase_regionserver_heapsize": "1024m", -"site.global.security_enabled": "false", -"site.global.user_group": "hadoop", -"site.hbase-site.hbase.client.keyvalue.maxsize": "10485760", -"site.hbase-site.hbase.client.scanner.caching": "100", -"site.hbase-site.zookeeper.znode.parent": "/hbase-unsecure", -"site.hdfs-site.dfs.namenode.https-address": "${NN_HOST}:50470" - } -} - ] -}; - -var selectors = { -buttonNext: 'button.next-btn', -buttonBack: '.btn-area button.btn:eq(1)', -step2: { - content: '#step2 table tbody' -}, -step3: { - addPropertyButton: '#createAppWizard .add-property' -} - }, - newApp = { -name: 'new_app', -type: 'HBASE', -includeFilePatterns: 'includeFilePatterns1', -excludeFilePatterns: 'excludeFilePatterns1', -frequency: '1', -queueName: 'queueName1', -specialLabel: 'specialLabel1', -selectedYarnLabel: 'selectedYarnLabel1', -components: { - HBASE_MASTER: 4, - HBASE_REGIONSERVER: 5 -}, -yarnLabel: 'SOME LABEL', -categoriesCount: 6, -newConfig: { - name: 'new_property', - value: 'new_value' -} - }; - -QUnit.module('integration/processes - Create New App', { - - setup: function () { - -sinon.config.useFakeTimers = false; - -$.mockjax({ - type: 'GET', - url: '*', - status: '200', - dataType: 'json', - responseText: {} -}); - -Em.run(App, App.advanceReadiness); -Em.run(function () { - App.set('viewEnabled', true); // Important! -
[10/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/moment.min.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/moment.min.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/moment.min.js deleted file mode 100644 index d301ddb..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/moment.min.js +++ /dev/null @@ -1,7 +0,0 @@ -//! moment.js -//! version : 2.13.0 -//! authors : Tim Wood, Iskren Chernev, Moment.js contributors -//! license : MIT -//! momentjs.com -!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&?define(b):a.moment=b()}(this,function(){"use strict";function a(){return fd.apply(null,arguments)}function b(a){fd=a}function c(a){return a instanceof Array||"[object Array]"===Object.prototype.toString.call(a)}function d(a){return a instanceof Date||"[object Date]"===Object.prototype.toString.call(a)}function e(a,b){var c,d=[];for(c=0;c0)for(c in hd)d=hd[c],e=b[d],m(e)||(a[d]=e);return a}function o(b){n(this,b),this._d=new Date(null!=b._d?b._d.getTime():NaN ),id===!1&&(id=!0,a.updateOffset(this),id=!1)}function p(a){return a instanceof o||null!=a&!=a._isAMomentObject}function q(a){return 0>a?Math.ceil(a):Math.floor(a)}function r(a){var b=+a,c=0;return 0!==b&(b)&&(c=q(b)),c}function s(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&[d]!==b[d]||!c&(a[d])!==r(b[d]))&++;return g+f}function t(b){a.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&("Deprecation warning: "+b)}function u(b,c){var d=!0;return g(function(){return null!=a.deprecationHandler&(null,b),d&&(t(b+"\nArguments: "+Array.prototype.slice.call(arguments).join(", ")+"\n"+(new Error).stack),d=!1),c.apply(this,arguments)},c)}function v(b,c){null!=a.deprecationHandler&(b,c),jd[b]||(t(c),jd[b]=!0)}function w(a){return a instanceof Function||"[object Function]"===Object.prototype.toString.call(a)}function x(a){return"[object Object]" ===Object.prototype.toString.call(a)}function y(a){var b,c;for(c in a)b=a[c],w(b)?this[c]=b:this["_"+c]=b;this._config=a,this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)}function z(a,b){var c,d=g({},a);for(c in b)f(b,c)&&(x(a[c])&(b[c])?(d[c]={},g(d[c],a[c]),g(d[c],b[c])):null!=b[c]?d[c]=b[c]:delete d[c]);return d}function A(a){null!=a&(a)}function B(a){return a?a.toLowerCase().replace("_","-"):a}function C(a){for(var b,c,d,e,f=0;f 0;){if(d=D(e.slice(0,b).join("-")))return d;if(c&>=b&(e,c,!0)>=b-1)break;b--}f++}return null}function D(a){var b=null;if(!nd[a]&&"undefined"!=typeof module&&)try{b=ld._abbr,require("./locale/"+a),E(b)}catch(c){}return nd[a]}function E(a,b){var c;return a&&(c=m(b)?H(a):F(a,b),c&&(ld=c)),ld._abbr}function F(a,b){return null!==b?(b.abbr=a,null!=nd[a]?(v("defineLocaleOverride","use moment.updateLoca le(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale"),b=z(nd[a]._config,b)):null!=b.parentLocale&&(null!=nd[b.parentLocale]?b=z(nd[b.parentLocale]._config,b):v("parentLocaleUndefined","specified parentLocale is not defined yet")),nd[a]=new A(b),E(a),nd[a]):(delete nd[a],null)}function G(a,b){if(null!=b){var
[33/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/clients/AmbariServiceInfo.java -- diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/clients/AmbariServiceInfo.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/clients/AmbariServiceInfo.java deleted file mode 100644 index 9d2fb31..000 --- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/clients/AmbariServiceInfo.java +++ /dev/null @@ -1,51 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ambari.view.slider.clients; - -public class AmbariServiceInfo { - - private String id; - private boolean started; - private boolean maintenanceMode; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isStarted() { - return started; - } - - public void setStarted(boolean started) { - this.started = started; - } - - public boolean isMaintenanceMode() { - return maintenanceMode; - } - - public void setMaintenanceMode(boolean maintenanceMode) { - this.maintenanceMode = maintenanceMode; - } - -} http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppTypesResource.java -- diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppTypesResource.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppTypesResource.java deleted file mode 100644 index fa2a71c..000 --- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppTypesResource.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ambari.view.slider.rest; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - -import org.apache.ambari.view.ViewResourceHandler; - -import com.google.inject.Inject; - -public class SliderAppTypesResource { - - @Inject - ViewResourceHandler resourceHandler; - - @GET - @Produces({ MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON }) - public Response getApps(@Context HttpHeaders headers, @Context UriInfo uri) { - return resourceHandler.handleRequest(headers, uri, null); - } - - @GET - @Path("{appTypeId}") - @Produces({ MediaType.TEXT_PLAIN, MediaType.APPLICATION_JSON }) - public Response getApp(@Context HttpHeaders headers, @Context UriInfo uri, - @PathParam("appTypeId") String appTypeId) { - return resourceHandler.handleRequest(headers, uri, appTypeId); - } - -} http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java -- diff --git
[13/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/handlebars.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/handlebars.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/handlebars.js deleted file mode 100644 index 96f3e03..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/handlebars.js +++ /dev/null @@ -1,2746 +0,0 @@ -/*! - - handlebars v1.3.0 - -Copyright (C) 2011 by Yehuda Katz - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -@license -*/ -/* exported Handlebars */ -var Handlebars = (function() { -// handlebars/safe-string.js -var __module4__ = (function() { - "use strict"; - var __exports__; - // Build out our basic SafeString type - function SafeString(string) { -this.string = string; - } - - SafeString.prototype.toString = function() { -return "" + this.string; - }; - - __exports__ = SafeString; - return __exports__; -})(); - -// handlebars/utils.js -var __module3__ = (function(__dependency1__) { - "use strict"; - var __exports__ = {}; - /*jshint -W004 */ - var SafeString = __dependency1__; - - var escape = { -"&": "", -"<": "", -">": "", -'"': "", -"'": "", -"`": "" - }; - - var badChars = /[&<>"'`]/g; - var possible = /[&<>"'`]/; - - function escapeChar(chr) { -return escape[chr] || ""; - } - - function extend(obj, value) { -for(var key in value) { - if(Object.prototype.hasOwnProperty.call(value, key)) { -obj[key] = value[key]; - } -} - } - - __exports__.extend = extend;var toString = Object.prototype.toString; - __exports__.toString = toString; - // Sourced from lodash - // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt - var isFunction = function(value) { -return typeof value === 'function'; - }; - // fallback for older versions of Chrome and Safari - if (isFunction(/x/)) { -isFunction = function(value) { - return typeof value === 'function' && toString.call(value) === '[object Function]'; -}; - } - var isFunction; - __exports__.isFunction = isFunction; - var isArray = Array.isArray || function(value) { -return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false; - }; - __exports__.isArray = isArray; - - function escapeExpression(string) { -// don't escape SafeStrings, since they're already safe -if (string instanceof SafeString) { - return string.toString(); -} else if (!string && string !== 0) { - return ""; -} - -// Force a string conversion as this will be done by the append regardless and -// the regex test will do this transparently behind the scenes, causing issues if -// an object's to string has escaped characters in it. -string = "" + string; - -if(!possible.test(string)) { return string; } -return string.replace(badChars, escapeChar); - } - - __exports__.escapeExpression = escapeExpression;function isEmpty(value) { -if (!value && value !== 0) { - return true; -} else if (isArray(value) && value.length === 0) { - return true; -} else { - return false; -} - } - - __exports__.isEmpty = isEmpty; - return __exports__; -})(__module4__); - -// handlebars/exception.js -var __module5__ = (function() { - "use strict"; - var __exports__; - - var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack']; - - function Exception(message, node) { -var line; -if (node && node.firstLine) { - line = node.firstLine; - - message += ' - ' + line + ':' + node.firstColumn; -} - -var tmp = Error.prototype.constructor.call(this, message); - -// Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work. -for (var idx = 0; idx <
[35/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec8deeba Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec8deeba Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec8deeba Branch: refs/heads/trunk Commit: ec8deeba201bfceb646d6d4a6e0e6fb97e9bc102 Parents: 8f06a5b Author: Venkata SairamAuthored: Fri Jun 23 12:31:45 2017 +0530 Committer: Venkata Sairam Committed: Fri Jun 23 12:31:45 2017 +0530 -- contrib/views/pom.xml | 1 - contrib/views/slider/docs/index.md | 164 - contrib/views/slider/gzip-content.cmd |17 - contrib/views/slider/gzip-content.ps1 |81 - contrib/views/slider/pom.xml| 463 - .../apache/ambari/view/slider/AlertField.java |62 - .../apache/ambari/view/slider/AlertState.java |40 - .../ambari/view/slider/MetricsHolder.java |44 - .../apache/ambari/view/slider/SliderApp.java| 198 - .../ambari/view/slider/SliderAppComponent.java |62 - .../ambari/view/slider/SliderAppType.java | 107 - .../view/slider/SliderAppTypeComponent.java | 103 - .../slider/SliderAppTypesResourceProvider.java |94 - .../ambari/view/slider/SliderAppsAlerts.java| 127 - .../view/slider/SliderAppsConfiguration.java|52 - .../view/slider/SliderAppsResourceProvider.java | 124 - .../view/slider/SliderAppsViewController.java | 112 - .../slider/SliderAppsViewControllerImpl.java| 1510 - .../apache/ambari/view/slider/TemporalInfo.java |48 - .../apache/ambari/view/slider/ViewStatus.java |72 - .../view/slider/clients/AmbariClient.java |58 - .../view/slider/clients/AmbariCluster.java |52 - .../view/slider/clients/AmbariClusterInfo.java |40 - .../slider/clients/AmbariHostComponent.java |49 - .../view/slider/clients/AmbariHostInfo.java |32 - .../view/slider/clients/AmbariService.java |36 - .../view/slider/clients/AmbariServiceInfo.java |51 - .../slider/rest/SliderAppTypesResource.java |54 - .../view/slider/rest/SliderAppsResource.java| 163 - .../view/slider/rest/ViewStatusResource.java|40 - .../slider/rest/client/AmbariHttpClient.java| 233 - .../view/slider/rest/client/BaseHttpClient.java | 157 - .../slider/rest/client/JMXMetricHolder.java |50 - .../ambari/view/slider/rest/client/Metric.java | 158 - .../slider/rest/client/SliderAppJmxHelper.java | 205 - .../rest/client/SliderAppMasterClient.java | 324 - .../rest/client/SliderAppMetricsHelper.java | 159 - .../view/slider/rest/client/TimelineMetric.java | 172 - .../slider/rest/client/TimelineMetrics.java | 101 - .../rest/client/URLStreamProviderBasicAuth.java | 105 - .../slider/src/main/resources/slider.properties |19 - .../slider/src/main/resources/ui/.gitignore |31 - .../views/slider/src/main/resources/ui/LICENSE |21 - .../slider/src/main/resources/ui/README.md | 122 - .../src/main/resources/ui/app/assets/404.html | 175 - .../app/assets/apple-touch-icon-precomposed.png | Bin 1226 -> 0 bytes .../resources/ui/app/assets/crossdomain.xml |31 - .../resources/ui/app/assets/data/apps/apps.json | 1320 - .../ui/app/assets/data/apptypes/all_fields.json | 642 - .../ui/app/assets/data/metrics/metric.json | 946 - .../ui/app/assets/data/metrics/metric2.json | 3838 -- .../ui/app/assets/data/metrics/metric3.json | 1856 - .../ui/app/assets/data/metrics/metric4.json | 968 - .../ui/app/assets/data/resource/empty_json.json | 1 - .../data/resource/slider-properties-2.json | 9 - .../assets/data/resource/slider-properties.json | 148 - .../app/assets/data/resource/status_false.json | 8 - .../app/assets/data/resource/status_true.json | 5 - .../main/resources/ui/app/assets/favicon.ico| Bin 766 -> 0 bytes .../ui/app/assets/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes .../ui/app/assets/font/fontawesome-webfont.svg | 399 - .../ui/app/assets/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes .../ui/app/assets/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes .../resources/ui/app/assets/images/.gitkeep | 0 .../ui-bg_flat_0_aa_40x100.png | Bin 180 -> 0 bytes .../ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 0 bytes .../ui-bg_glass_65_ff_1x400.png | Bin 105 -> 0 bytes .../ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 0 bytes .../ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 0 bytes .../ui-bg_glass_75_ff_1x400.png | Bin 107 -> 0 bytes
[21/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/styles/app.less -- diff --git a/contrib/views/slider/src/main/resources/ui/app/styles/app.less b/contrib/views/slider/src/main/resources/ui/app/styles/app.less deleted file mode 100644 index a8eecc8..000 --- a/contrib/views/slider/src/main/resources/ui/app/styles/app.less +++ /dev/null @@ -1,303 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -@import-once 'common.less'; - -.app-page { - .wrap-tabs { -margin-top: 30px; - } - .quick-links-wrapper { -.nav-pills.move { - float: right; - width:135px; - &>li { -position: absolute; - } -} -.dropdown-submenu { - &> a:after { -border-left-color: #333; - } -} -.nav li.dropdown.open { - .dropdown-toggle{ -color: #005580; -background-color: #ee; -border-color: #ee; --webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); --moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - } - a:hover .caret { -border-top-color: #005580; -border-bottom-color: #005580; - } - .caret { -border-top-color: #005580; -border-bottom-color: #005580; - } -} - } -} - -.app_summary { - padding-left: 0; - table { -&.no-borders { - td { -border-width: 0; - } -} -td:nth-child(2) span{ - word-break: break-all; -} - } - .panel-heading { -font-weight: 700; - } - .panel-summary { -min-height: 400px; -td:first-child { - text-align: right; -} - } - .panel-components { -.status { - display: inline-block; - width: 25px; -} -.icon-ok-sign { - color: #5ab400; -} -.icon-warning-sign { - color: #ff; -} -.panel-body { - overflow-y: auto; -} - } - .panel-link { -margin-top: -5px; -margin-right: -7px; - } - .column-left { -padding-left: 0; - } - .column-right { -padding-right: 0; - } -} - -.chart-container { - cursor: default; - - position: relative; - margin: 20px 15px 0px 15px; - - .chart { -position: relative; -z-index: 1; - } - .chart-y-axis { -position: absolute; -top: 0; -bottom: 0px; -width: 100px; -z-index: 2; -margin-top: 15px; - } - .chart-x-axis { -position: absolute; -top: 180px; -left: 35%; -width: 30%; -z-index: 2; - } - .x_tick { -margin-top: 5px; -.title { - padding: 0 2px 0 2px; - opacity: 1 !important; - top: 148px; -} - } - svg { -g { - g:nth-child(1) { -display: none; - } -} - } - text { -font-weight: 700; -opacity: 1 !important; - } - .chart-legend { -font-family: 'Courier New'; -position: absolute; -top: 180px; -z-index: 3; - } - .rickshaw_legend { -background-color: #999 !important; -li:hover { - background-color: #999 !important; -} - } - .rickshaw_legend:empty { -padding: 0; - } - .rickshaw_graph { -.x_tick { - .title { -bottom: -6px; -opacity: 0.75; - } -} - } - .chart-overlay { -position: absolute; -top: 0; -bottom: 0; -width: 100%; -z-index: 5; - } - .chart-title { -text-align: center; -margin-top: 20px; - } -} - -.app_configs { - a.accordion-toggle { -display: block; - } - .panel-heading{ -.icon{ - width: 24px; -} - } - .row { -.table-row(); -textarea { - height: 200px; - padding-left: 5px; - padding-right: 5px; - resize: none; -} -textarea[disabled] { - cursor: not-allowed; - background-color: #ee; -} -input[disabled] { - cursor: not-allowed; - background-color: #ee; -} -.property-name { - word-wrap: break-word; -} - } -} - -.app-alerts { - overflow-y: auto; - ul { -padding-left: 0; -
[11/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/jquery.timeago.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/jquery.timeago.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/jquery.timeago.js deleted file mode 100644 index 90e9553..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/jquery.timeago.js +++ /dev/null @@ -1,214 +0,0 @@ -/** - * Timeago is a jQuery plugin that makes it easy to support automatically - * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). - * - * @name timeago - * @version 1.4.1 - * @requires jQuery v1.2.3+ - * @author Ryan McGeary - * @license MIT License - http://www.opensource.org/licenses/mit-license.php - * - * For usage and examples, visit: - * http://timeago.yarp.com/ - * - * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) - */ - -(function (factory) { - if (typeof define === 'function' && define.amd) { -// AMD. Register as an anonymous module. -define(['jquery'], factory); - } else { -// Browser globals -factory(jQuery); - } -}(function ($) { - $.timeago = function(timestamp) { -if (timestamp instanceof Date) { - return inWords(timestamp); -} else if (typeof timestamp === "string") { - return inWords($.timeago.parse(timestamp)); -} else if (typeof timestamp === "number") { - return inWords(new Date(timestamp)); -} else { - return inWords($.timeago.datetime(timestamp)); -} - }; - var $t = $.timeago; - - $.extend($.timeago, { -settings: { - refreshMillis: 6, - allowPast: true, - allowFuture: false, - localeTitle: false, - cutoff: 0, - strings: { -prefixAgo: null, -prefixFromNow: null, -suffixAgo: "ago", -suffixFromNow: "from now", -inPast: 'any moment now', -seconds: "less than a minute", -minute: "about a minute", -minutes: "%d minutes", -hour: "about an hour", -hours: "about %d hours", -day: "a day", -days: "%d days", -month: "about a month", -months: "%d months", -year: "about a year", -years: "%d years", -wordSeparator: " ", -numbers: [] - } -}, - -inWords: function(distanceMillis) { - if(!this.settings.allowPast && ! this.settings.allowFuture) { -throw 'timeago allowPast and allowFuture settings can not both be set to false.'; - } - - var $l = this.settings.strings; - var prefix = $l.prefixAgo; - var suffix = $l.suffixAgo; - if (this.settings.allowFuture) { -if (distanceMillis < 0) { - prefix = $l.prefixFromNow; - suffix = $l.suffixFromNow; -} - } - - if(!this.settings.allowPast && distanceMillis >= 0) { -return this.settings.strings.inPast; - } - - var seconds = Math.abs(distanceMillis) / 1000; - var minutes = seconds / 60; - var hours = minutes / 60; - var days = hours / 24; - var years = days / 365; - - function substitute(stringOrFunction, number) { -var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; -var value = ($l.numbers && $l.numbers[number]) || number; -return string.replace(/%d/i, value); - } - - var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || -seconds < 90 && substitute($l.minute, 1) || -minutes < 45 && substitute($l.minutes, Math.round(minutes)) || -minutes < 90 && substitute($l.hour, 1) || -hours < 24 && substitute($l.hours, Math.round(hours)) || -hours < 42 && substitute($l.day, 1) || -days < 30 && substitute($l.days, Math.round(days)) || -days < 45 && substitute($l.month, 1) || -days < 365 && substitute($l.months, Math.round(days / 30)) || -years < 1.5 && substitute($l.year, 1) || -substitute($l.years, Math.round(years)); - - var separator = $l.wordSeparator || ""; - if ($l.wordSeparator === undefined) { separator = " "; } - return $.trim([prefix, words, suffix].join(separator)); -}, - -parse: function(iso8601) { - var s = $.trim(iso8601); - s = s.replace(/\.\d+/,""); // remove milliseconds - s = s.replace(/-/,"/").replace(/-/,"/"); - s = s.replace(/T/," ").replace(/Z/," UTC"); - s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 - s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900 - return new Date(s); -}, -datetime: function(elem) { - var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); - return $t.parse(iso8601); -}, -isTime: function(elem) { - // jQuery's `is()`
[12/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/jquery.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/jquery.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/jquery.js deleted file mode 100755 index ebc6c18..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/jquery.js +++ /dev/null @@ -1,8829 +0,0 @@ -/*! - * jQuery JavaScript Library v2.0.3 - * http://jquery.com/ - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * - * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2013-07-03T13:30Z - */ -(function( window, undefined ) { - -// Can't do this because several apps including ASP.NET trace -// the stack via arguments.caller.callee and Firefox dies if -// you try to trace through "use strict" call chains. (#13335) -// Support: Firefox 18+ -//"use strict"; -var - // A central reference to the root jQuery(document) - rootjQuery, - - // The deferred used on DOM ready - readyList, - - // Support: IE9 - // For `typeof xmlNode.method` instead of `xmlNode.method !== undefined` - core_strundefined = typeof undefined, - - // Use the correct document accordingly with window argument (sandbox) - location = window.location, - document = window.document, - docElem = document.documentElement, - - // Map over jQuery in case of overwrite - _jQuery = window.jQuery, - - // Map over the $ in case of overwrite - _$ = window.$, - - // [[Class]] -> type pairs - class2type = {}, - - // List of deleted data cache ids, so we can reuse them - core_deletedIds = [], - - core_version = "2.0.3", - - // Save a reference to some core methods - core_concat = core_deletedIds.concat, - core_push = core_deletedIds.push, - core_slice = core_deletedIds.slice, - core_indexOf = core_deletedIds.indexOf, - core_toString = class2type.toString, - core_hasOwn = class2type.hasOwnProperty, - core_trim = core_version.trim, - - // Define a local copy of jQuery - jQuery = function( selector, context ) { - // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.fn.init( selector, context, rootjQuery ); - }, - - // Used for matching numbers - core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source, - - // Used for splitting on whitespace - core_rnotwhite = /\S+/g, - - // A simple way to check for HTML strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - // Strict HTML recognition (#11290: must start with <) - rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, - - // Match a standalone tag - rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/, - - // Matches dashed string for camelizing - rmsPrefix = /^-ms-/, - rdashAlpha = /-([\da-z])/gi, - - // Used by jQuery.camelCase as callback to replace() - fcamelCase = function( all, letter ) { - return letter.toUpperCase(); - }, - - // The ready event handler and self cleanup method - completed = function() { - document.removeEventListener( "DOMContentLoaded", completed, false ); - window.removeEventListener( "load", completed, false ); - jQuery.ready(); - }; - -jQuery.fn = jQuery.prototype = { - // The current version of jQuery being used - jquery: core_version, - - constructor: jQuery, - init: function( selector, context, rootjQuery ) { - var match, elem; - - // HANDLE: $(""), $(null), $(undefined), $(false) - if ( !selector ) { - return this; - } - - // Handle HTML strings - if ( typeof selector === "string" ) { - if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) { - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; - - } else { - match = rquickExpr.exec( selector ); - } - - // Match html or make sure no context is specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) { - context = context instanceof jQuery ? context[0] : context; - -
[26/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.ttf -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.ttf b/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.ttf deleted file mode 100644 index d365924..000 Binary files a/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.ttf and /dev/null differ http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.woff -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.woff b/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.woff deleted file mode 100644 index b9bd17e..000 Binary files a/contrib/views/slider/src/main/resources/ui/app/assets/font/fontawesome-webfont.woff and /dev/null differ http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/images/.gitkeep -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/images/.gitkeep b/contrib/views/slider/src/main/resources/ui/app/assets/images/.gitkeep deleted file mode 100644 index e69de29..000 http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png deleted file mode 100644 index 5b5dab2..000 Binary files a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_flat_0_aa_40x100.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png deleted file mode 100644 index ad3d634..000 Binary files a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_55_fbf9ee_1x400.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png deleted file mode 100644 index 42ccba2..000 Binary files a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_65_ff_1x400.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png deleted file mode 100644 index 5a46b47..000 Binary files a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_dadada_1x400.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_e6e6e6_1x400.png -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_e6e6e6_1x400.png b/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_e6e6e6_1x400.png deleted file mode 100644 index 86c2baa..000 Binary files a/contrib/views/slider/src/main/resources/ui/app/assets/img/jquery-ui-bootstrap/ui-bg_glass_75_e6e6e6_1x400.png and /dev/null differ
[22/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js -- diff --git a/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js b/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js deleted file mode 100644 index bfb976d..000 --- a/contrib/views/slider/src/main/resources/ui/app/helpers/ajax.js +++ /dev/null @@ -1,388 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Config for each ajax-request - * - * Fields example: - * mock - testMode url - * real - real url (without API prefix) - * type - request type (also may be defined in the format method) - * format - function for processing ajax params after default formatRequest. May be called with one or two parameters (data, opt). Return ajax-params object - * schema - basic validation schema (tv4) for response (optional) - * - * @type {Object} - */ -var urls = { - - 'slider.getViewParams': { -real: '?fields=ViewInstanceInfo', -mock: '/data/resource/slider-properties.json', -headers: { - Accept: "text/plain; charset=utf-8", - "Content-Type": "text/plain; charset=utf-8" -}, -schema: { - required: ['ViewInstanceInfo'], - properties: { -ViewInstanceInfo: { - required: ['properties', 'description', 'label'] -} - } -} - }, - - 'slider.getViewParams.v2': { -real: 'resources/status', -mock: '/data/resource/slider-properties-2.json', -headers: { - "Accept": "application/json; charset=utf-8", - "Content-Type": "text/plain; charset=utf-8" -}, -schema: { - required: ['version', 'validations', 'parameters'], - properties: { -validations: { - type: 'array' -}, -parameters: { - type : 'object' -} - } -} - }, - - 'mapper.applicationTypes': { -real: 'apptypes?fields=*', -mock: '/data/apptypes/all_fields.json', -headers: { - Accept: "text/plain; charset=utf-8", - "Content-Type": "text/plain; charset=utf-8" -}, -schema: { - required: ['items'], - properties: { -items: { - type: 'array', - items: { -required: ['id', 'typeComponents', 'typeConfigs'], -properties: { - typeConfigs: { -type: 'object' - }, - typeComponents: { -type: 'array', -items: { - required: ['id', 'name', 'category', 'displayName'] -} - } -} - } -} - } -} - }, - - 'mapper.applicationApps': { -real: '?fields=apps/*', -mock: '/data/apps/apps.json', -headers: { - Accept: "text/plain; charset=utf-8", - "Content-Type": "text/plain; charset=utf-8" -}, -'format': function() { - return { -timeout: 2 - }; -}, -schema: { - required: ['items'], - properties: { -items: { - type: 'array', - items: { -required: ['id', 'description', 'diagnostics', 'name', 'user', 'state', 'type', 'components', 'configs'], -alerts: { - type: 'object', - detail: { -type: 'array' - } -} - } -} - } -} - }, - - 'mapper.applicationStatus': { -real: 'resources/status', -mock: '/data/resource/status_true.json' - }, - - 'saveInitialValues': { -real: '', -mock: '/data/resource/empty_json.json', -headers: { - "Content-Type": "text/plain; charset=utf-8" -}, -format: function (data) { - return { -type: 'PUT', -data: JSON.stringify(data.data), -dataType: 'text' - } -} - }, - - 'validateAppName': { -real: 'apps?validateAppName={name}', -mock: '/data/resource/empty_json.json', -format: function () { - return { -dataType: 'text', -showErrorPopup: true - } -} - }, - - 'createNewApp': { -real: 'apps', -mock: '/data/resource/empty_json.json', -
[34/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java -- diff --git a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java deleted file mode 100644 index 30bc2b0..000 --- a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java +++ /dev/null @@ -1,1510 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ambari.view.slider; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.UndeclaredThrowableException; -import java.net.URI; -import java.security.PrivilegedExceptionAction; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.regex.Pattern; -import java.util.zip.ZipEntry; -import java.util.zip.ZipException; - -import org.apache.ambari.view.ViewContext; -import org.apache.ambari.view.slider.ViewStatus.Validation; -import org.apache.ambari.view.slider.clients.AmbariCluster; -import org.apache.ambari.view.slider.clients.AmbariClusterInfo; -import org.apache.ambari.view.slider.clients.AmbariHostComponent; -import org.apache.ambari.view.slider.clients.AmbariService; -import org.apache.ambari.view.slider.clients.AmbariServiceInfo; -import org.apache.ambari.view.slider.rest.client.AmbariHttpClient; -import org.apache.ambari.view.slider.rest.client.Metric; -import org.apache.ambari.view.slider.rest.client.SliderAppMasterClient; -import org.apache.ambari.view.slider.rest.client.SliderAppMasterClient.SliderAppMasterData; -import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; -import org.apache.commons.compress.archivers.zip.ZipFile; -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.filefilter.RegexFileFilter; -import org.apache.commons.lang.StringUtils; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hdfs.HdfsConfiguration; -import org.apache.hadoop.security.UserGroupInformation; -import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.ApplicationReport; -import org.apache.hadoop.yarn.api.records.YarnApplicationState; -import org.apache.hadoop.yarn.conf.YarnConfiguration; -import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; -import org.apache.hadoop.yarn.exceptions.YarnException; -import org.apache.slider.api.ClusterDescription; -import org.apache.slider.client.SliderClient; -import org.apache.slider.common.params.ActionCreateArgs; -import org.apache.slider.common.params.ActionFlexArgs; -import org.apache.slider.common.params.ActionFreezeArgs; -import org.apache.slider.common.params.ActionInstallKeytabArgs; -import org.apache.slider.common.params.ActionInstallPackageArgs; -import org.apache.slider.common.params.ActionThawArgs; -import org.apache.slider.common.tools.SliderUtils; -import org.apache.slider.core.exceptions.SliderException; -import org.apache.slider.core.exceptions.UnknownApplicationInstanceException; -import org.apache.slider.core.main.LauncherExitCodes; -import org.apache.slider.providers.agent.application.metadata.Application; -import org.apache.slider.providers.agent.application.metadata.Component; -import org.apache.slider.providers.agent.application.metadata.Metainfo; -import org.apache.slider.providers.agent.application.metadata.MetainfoParser; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; - -import com.google.gson.GsonBuilder; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.gson.JsonPrimitive;
[14/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/ember-i18n-1.4.1.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/ember-i18n-1.4.1.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/ember-i18n-1.4.1.js deleted file mode 100644 index b7a612c..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/ember-i18n-1.4.1.js +++ /dev/null @@ -1,199 +0,0 @@ -/* -Copyright (C) 2011 by James A. Rosen; Zendesk, Inc. - - Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ -(function(window) { - var I18n, assert, findTemplate, get, set, isBinding, lookupKey, pluralForm; - - get = Ember.Handlebars.get || Ember.Handlebars.getPath || Ember.getPath; - set = Ember.set; - - function warn(msg) { Ember.Logger.warn(msg); } - - if (typeof CLDR !== "undefined" && CLDR !== null) pluralForm = CLDR.pluralForm; - - if (pluralForm == null) { -warn("CLDR.pluralForm not found. Em.I18n will not support count-based inflection."); - } - - lookupKey = function(key, hash) { -var firstKey, idx, remainingKeys; - -if (hash[key] != null) { return hash[key]; } - -if ((idx = key.indexOf('.')) !== -1) { - firstKey = key.substr(0, idx); - remainingKeys = key.substr(idx + 1); - hash = hash[firstKey]; - if (hash) { return lookupKey(remainingKeys, hash); } -} - }; - - assert = Ember.assert != null ? Ember.assert : window.ember_assert; - - findTemplate = function(key, setOnMissing) { -assert("You must provide a translation key string, not %@".fmt(key), typeof key === 'string'); -var result = lookupKey(key, I18n.translations); - -if (setOnMissing) { - if (result == null) { -result = I18n.translations[key] = I18n.compile("Missing translation: " + key); -warn("Missing translation: " + key); - } -} - -if ((result != null) && !jQuery.isFunction(result)) { - result = I18n.translations[key] = I18n.compile(result); -} - -return result; - }; - - function eachTranslatedAttribute(object, fn) { -var isTranslatedAttribute = /(.+)Translation$/, - isTranslatedAttributeMatch; - -for (var key in object) { - isTranslatedAttributeMatch = key.match(isTranslatedAttribute); - if (isTranslatedAttributeMatch) { -fn.call(object, isTranslatedAttributeMatch[1], I18n.t(object[key])); - } -} - } - - I18n = { -compile: Handlebars.compile, - -translations: {}, - -template: function(key, count) { - var interpolatedKey, result, suffix; - if ((count != null) && (pluralForm != null)) { -suffix = pluralForm(count); -interpolatedKey = "%@.%@".fmt(key, suffix); -result = findTemplate(interpolatedKey, false); - } - return result != null ? result : result = findTemplate(key, true); -}, - -t: function(key, context) { - var template; - if (context == null) context = {}; - template = I18n.template(key, context.count); - return template(context); -}, - -TranslateableProperties: Em.Mixin.create({ - init: function() { -var result = this._super.apply(this, arguments); -eachTranslatedAttribute(this, function(attribute, translation) { - set(this, attribute, translation); -}); -return result; - } -}), - -TranslateableAttributes: Em.Mixin.create({ - didInsertElement: function() { -var result = this._super.apply(this, arguments); -eachTranslatedAttribute(this, function(attribute, translation) { - this.$().attr(attribute, translation); -}); -return result; - } -}) - }; - - Ember.I18n = I18n; - - isBinding = /(.+)Binding$/; - - // CRUFT: in v2, which requires Ember 1.0+, Ember.uuid will always be - //available, so this function can be
[02/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/styles/cubism.css -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/styles/cubism.css b/contrib/views/slider/src/main/resources/ui/vendor/styles/cubism.css deleted file mode 100644 index b572148..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/styles/cubism.css +++ /dev/null @@ -1,82 +0,0 @@ -/* - * D3 visualization components - * Styles for Dag viewer and Sankey diagram - */ -.wfdag { - width: 100%; -} - -#dag_viewer .axis path, -#dag_viewer .axis line { - fill: none; - stroke: #000; - shape-rendering: crispEdges; -} - -#dag_viewer line.link, -#dag_viewer path.link { - fill: none; - stroke: #666; - stroke-width: 2.5px; -} - -#dag_viewer line.link.finished, -#dag_viewer path.link.finished { - stroke: #444; -} - -#dag_viewer marker#finished { - fill: #444; -} - -#dag_viewer marker#circle { - fill: #666; - stroke: none; -} - -#dag_viewer line.source.mark, -#dag_viewer line.target.mark { - stroke: #666; - stroke-width: 2.5px; -} - -#dag_viewer rect { - fill: #ccc; - stroke: #333; - stroke-width: 1px; -} - -#dag_viewer rect.finished { - fill: green; - fill-opacity: 0.8; -} - -#dag_viewer text.joblabel { - pointer-events: none; - text-anchor: middle; -} - -#dag_viewer text.axislabel { - pointer-events: none; - text-anchor: middle; -} - -#dag_viewer text.shadow { - stroke: #fff; - stroke-width: 3px; - stroke-opacity: .8; -} - -.map, .shuffle, .reduce { - fill-opacity: 0.8; - stroke-width: 2px; -} - -.allmap, .allshuffle, .allreduce { - fill: none; - stroke-width: 2px; -} - -.y.axis { - font-size: 10px; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/styles/font-awesome-ie7.css -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/styles/font-awesome-ie7.css b/contrib/views/slider/src/main/resources/ui/vendor/styles/font-awesome-ie7.css deleted file mode 100644 index 17f0776..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/styles/font-awesome-ie7.css +++ /dev/null @@ -1,1203 +0,0 @@ -/*! - * Font Awesome 3.2.1 - * the iconic font designed for Bootstrap - * -- - * The full suite of pictographic icons, examples, and documentation can be - * found at http://fontawesome.io. Stay up to date on Twitter at - * http://twitter.com/fontawesome. - * - * License - * -- - * - The Font Awesome font is licensed under SIL OFL 1.1 - - *http://scripts.sil.org/OFL - * - Font Awesome CSS, LESS, and SASS files are licensed under MIT License - - *http://opensource.org/licenses/mit-license.html - * - Font Awesome documentation licensed under CC BY 3.0 - - *http://creativecommons.org/licenses/by/3.0/ - * - Attribution is no longer required in Font Awesome 3.0, but much appreciated: - *"Font Awesome by Dave Gandy - http://fontawesome.io; - * - * Author - Dave Gandy - * -- - * Email: d...@fontawesome.io - * Twitter: http://twitter.com/davegandy - * Work: Lead Product Designer @ Kyruus - http://kyruus.com - */ -.icon-large { - font-size: 1.em; - margin-top: -4px; - padding-top: 3px; - margin-bottom: -4px; - padding-bottom: 3px; - vertical-align: middle; -} -.nav [class^="icon-"], -.nav [class*=" icon-"] { - vertical-align: inherit; - margin-top: -4px; - padding-top: 3px; - margin-bottom: -4px; - padding-bottom: 3px; -} -.nav [class^="icon-"].icon-large, -.nav [class*=" icon-"].icon-large { - vertical-align: -25%; -} -.nav-pills [class^="icon-"].icon-large, -.nav-tabs [class^="icon-"].icon-large, -.nav-pills [class*=" icon-"].icon-large, -.nav-tabs [class*=" icon-"].icon-large { - line-height: .75em; - margin-top: -7px; - padding-top: 5px; - margin-bottom: -5px; - padding-bottom: 4px; -} -.btn [class^="icon-"].pull-left, -.btn [class*=" icon-"].pull-left, -.btn [class^="icon-"].pull-right, -.btn [class*=" icon-"].pull-right { - vertical-align: inherit; -} -.btn [class^="icon-"].icon-large, -.btn [class*=" icon-"].icon-large { - margin-top: -0.5em; -} -a [class^="icon-"], -a [class*=" icon-"] { - cursor: pointer; -} -.icon-glass { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-music { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-search { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-envelope-alt { - *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ''); -} -.icon-heart { - *zoom: expression(
[06/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/development/ember.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/development/ember.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/development/ember.js deleted file mode 100644 index beaa452..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/development/ember.js +++ /dev/null @@ -1,43235 +0,0 @@ -/*! - * @overview Ember - JavaScript Application Framework - * @copyright Copyright 2011-2014 Tilde Inc. and contributors - *Portions Copyright 2006-2011 Strobe Inc. - *Portions Copyright 2008-2011 Apple Inc. All rights reserved. - * @license Licensed under MIT license - *See https://raw.github.com/emberjs/ember.js/master/LICENSE - * @version 1.5.1+pre.ff8c6bbb - */ - - -(function() { -/*global __fail__*/ - -/** -Ember Debug - -@module ember -@submodule ember-debug -*/ - -/** -@class Ember -*/ - -if ('undefined' === typeof Ember) { - Ember = {}; - - if ('undefined' !== typeof window) { -window.Em = window.Ember = Em = Ember; - } -} - -// This needs to be kept in sync with the logic in -// `packages/ember-metal/lib/core.js`. -// -// This is duplicated here to ensure that `Ember.ENV` -// is setup even if `Ember` is not loaded yet. -if (Ember.ENV) { - // do nothing if Ember.ENV is already setup -} else if ('undefined' !== typeof EmberENV) { - Ember.ENV = EmberENV; -} else if('undefined' !== typeof ENV) { - Ember.ENV = ENV; -} else { - Ember.ENV = {}; -} - -if (!('MANDATORY_SETTER' in Ember.ENV)) { - Ember.ENV.MANDATORY_SETTER = true; // default to true for debug dist -} - -/** - Define an assertion that will throw an exception if the condition is not - met. Ember build tools will remove any calls to `Ember.assert()` when - doing a production build. Example: - - ```javascript - // Test for truthiness - Ember.assert('Must pass a valid object', obj); - // Fail unconditionally - Ember.assert('This code path should never be run') - ``` - - @method assert - @param {String} desc A description of the assertion. This will become -the text of the Error thrown if the assertion fails. - @param {Boolean} test Must be truthy for the assertion to pass. If -falsy, an exception will be thrown. -*/ -Ember.assert = function(desc, test) { - if (!test) { -throw new Ember.Error("Assertion Failed: " + desc); - } -}; - - -/** - Display a warning with the provided message. Ember build tools will - remove any calls to `Ember.warn()` when doing a production build. - - @method warn - @param {String} message A warning to display. - @param {Boolean} test An optional boolean. If falsy, the warning -will be displayed. -*/ -Ember.warn = function(message, test) { - if (!test) { -Ember.Logger.warn("WARNING: "+message); -if ('trace' in Ember.Logger) Ember.Logger.trace(); - } -}; - -/** - Display a debug notice. Ember build tools will remove any calls to - `Ember.debug()` when doing a production build. - - ```javascript - Ember.debug("I'm a debug notice!"); - ``` - - @method debug - @param {String} message A debug message to display. -*/ -Ember.debug = function(message) { - Ember.Logger.debug("DEBUG: "+message); -}; - -/** - Display a deprecation warning with the provided message and a stack trace - (Chrome and Firefox only). Ember build tools will remove any calls to - `Ember.deprecate()` when doing a production build. - - @method deprecate - @param {String} message A description of the deprecation. - @param {Boolean} test An optional boolean. If falsy, the deprecation -will be displayed. -*/ -Ember.deprecate = function(message, test) { - if (test) { return; } - - if (Ember.ENV.RAISE_ON_DEPRECATION) { throw new Ember.Error(message); } - - var error; - - // When using new Error, we can't do the arguments check for Chrome. Alternatives are welcome - try { __fail__.fail(); } catch (e) { error = e; } - - if (Ember.LOG_STACKTRACE_ON_DEPRECATION && error.stack) { -var stack, stackStr = ''; -if (error['arguments']) { - // Chrome - stack = error.stack.replace(/^\s+at\s+/gm, ''). - replace(/^([^\(]+?)([\n$])/gm, '{anonymous}($1)$2'). - replace(/^Object.\s*\(([^\)]+)\)/gm, '{anonymous}($1)').split('\n'); - stack.shift(); -} else { - // Firefox - stack = error.stack.replace(/(?:\n@:0)?\s+$/m, ''). - replace(/^\(/gm, '{anonymous}(').split('\n'); -} - -stackStr = "\n" + stack.slice(2).join("\n"); -message = message + stackStr; - } - - Ember.Logger.warn("DEPRECATION: "+message); -}; - - - -/** - Alias an old, deprecated method with its new counterpart. - - Display a deprecation warning with the provided message and a stack trace - (Chrome and Firefox only)
[32/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/README.md -- diff --git a/contrib/views/slider/src/main/resources/ui/README.md b/contrib/views/slider/src/main/resources/ui/README.md deleted file mode 100755 index 60ab1378b..000 --- a/contrib/views/slider/src/main/resources/ui/README.md +++ /dev/null @@ -1,122 +0,0 @@ -# Brunch with Ember Reloaded - -![build status](https://travis-ci.org/gcollazo/brunch-with-ember-reloaded.png) - -A [Brunch](http://brunch.io) skeleton for creating ambitious web applications using [Ember.js](http://emberjs.com). Based on the official Ember [Starter Kit](https://github.com/emberjs/starter-kit/archive/master.zip). - -## Demo - -I built a demo app using this skeleton, based on the [Building an App with Ember.js](http://www.youtube.com/watch?v=Ga99hMi7wfY) video by [Tom Dale](http://twitter.com/tomdale). - -**Demo**: [ember-bloggr](http://dev.gcollazo.com/ember-bloggr) - -**Source**: [https://github.com/gcollazo/ember-bloggr](https://github.com/gcollazo/ember-bloggr) - -## Versions -- [Ember 1.5.1+pre.ff8c6bbb](http://emberjs.com) -- [Ember Data 1.0.0-beta.7+canary.238bb5ce](https://github.com/emberjs/data) -- [Handlebars 1.3.0](http://handlebarsjs.com) -- [jQuery v2.0.3](http://jquery.com) -- [HTML5 Boilerplate v4.3.0](http://html5boilerplate.com) - -## Other versions of this skeleton - -- [ES6](https://github.com/gcollazo/brunch-with-ember-reloaded/tree/es6): Experimental version using ES6 module syntax. -- [CoffeeScript](https://github.com/gcollazo/brunch-with-ember-reloaded/tree/coffeescript) - - -## Getting started - -Before using brunch-with-ember-reloaded you will need to install [Brunch](http://brunch.io/). - -``` -brunch new gh:gcollazo/brunch-with-ember-reloaded -cd -brunch watch -s -``` -Open [http://localhost:](http://localhost:) on your browser. - -## Generators - -This skeleton makes use of [scaffolt](https://github.com/paulmillr/scaffolt#readme) generators to help you create common files quicker. To use first install scaffolt globally with `npm install -g scaffolt`. Then you can use the following command to generate files. - -``` -scaffolt model âapp/models/Name.js -scaffolt view âapp/views/NameView.js -scaffolt controller âapp/controllers/NameController.js -scaffolt arraycontrollerâapp/controllers/NamesController.js -scaffolt route âapp/routes/NameRoute.js -scaffolt template âapp/templatesname.hbs -scaffolt component âapp/components/NameComponent.js - app/templates/components/name.hbs -``` - -There are more commands you can do with scaffolt and also instruction on how to create your own generators, so make sure you check out the [docs](https://github.com/paulmillr/scaffolt#readme). - -## Testing - -To run you will need [Karma](https://github.com/karma-runner) you will need to install [phantomjs](https://github.com/ariya/phantomjs). If you want to run your tests on other browsers consult the Karma docs. - -``` -brew update && brew install phantomjs -``` - -To run tests continiously as you write code and tests (for now) you must open two terminal windows. - -``` -brunch watch -s -``` - -``` -karma start -``` - -## Building for production -This skeleton supports the production versions of ember and ember-data. Just build using the --production flags. - -``` -brunch build --production -``` - -You can also have modules load only when you are on a specific environment (production / development). Just add the modules you want loaded to the corresponging subdirectory of the `envs` top level directory. All modules will be imported by the module `'config/env'`. - -```js -var myEnvVars = require('config/env'); -myEnvVars.envFileName.property; -``` - - -## Updating Ember - -To updated ember.js, ember-data.js and handlebars.js to the latest stable versions, just run this command on the project root. - -``` -npm run update:ember -``` - -## Updating Skeleton - -This command will replace `package.json`, `README.md`, `config.js`, `karma.conf.js` and the `generators` directory with the latest version from the GitHub repository. - -``` -npm run update:skeleton -npm install -``` -If you want to update an older version of the skeleton which doesn't have support for the update:skeleton command you can get the `setup.js` by running: - -``` -curl https://raw.github.com/gcollazo/brunch-with-ember-reloaded/master/setup.js > setup.js -node setup.js update:skeleton -``` - -## License - -All of brunch-with-ember-reloaded is licensed under the MIT license. - -Copyright (c) 2013 Giovanni Collazo - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without
[07/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/development/ember-data.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/development/ember-data.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/development/ember-data.js deleted file mode 100644 index 0fb494a..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/development/ember-data.js +++ /dev/null @@ -1,10620 +0,0 @@ -/*! - * @overview Ember Data - * @copyright Copyright 2011-2014 Tilde Inc. and contributors. - *Portions Copyright 2011 LivingSocial Inc. - * @license Licensed under MIT license (see license.js) - * @version 1.0.0-beta.7+canary.238bb5ce - */ - - -(function() { -var define, requireModule; - -(function() { - var registry = {}, seen = {}; - - define = function(name, deps, callback) { -registry[name] = { deps: deps, callback: callback }; - }; - - requireModule = function(name) { -if (seen[name]) { return seen[name]; } -seen[name] = {}; - -var mod, deps, callback, reified , exports; - -mod = registry[name]; - -if (!mod) { - throw new Error("Module '" + name + "' not found."); -} - -deps = mod.deps; -callback = mod.callback; -reified = []; -exports; - -for (var i=0, l=deps.length; i0; i--) { -var proxyPair = proxyPairs[i - 1], -deprecated = proxyPair['deprecated'], -valid = proxyPair['valid']; - -this.registerDeprecation(deprecated, valid); - } -}; - -DS.ContainerProxy = ContainerProxy; - -})(); - - - -(function() { -var get = Ember.get, set = Ember.set, isNone = Ember.isNone; - -// Simple dispatcher to support overriding the aliased -// method in subclasses. -function aliasMethod(methodName) { - return function() { -return this[methodName].apply(this, arguments); - }; -} - -/** - In Ember Data a Serializer is used to serialize and deserialize - records when they are transferred in and out of an external source. - This process involves normalizing property names, transforming - attribute values and serializing relationships. - - For maximum performance Ember Data recommends you use the - [RESTSerializer](DS.RESTSerializer.html) or one of its subclasses. - - `JSONSerializer` is useful for simpler or legacy backends that may - not support the http://jsonapi.org/ spec. - - @class JSONSerializer - @namespace DS -*/ -DS.JSONSerializer = Ember.Object.extend({ - /** -The primaryKey is used when serializing and deserializing -data. Ember Data always uses the `id` property to store the id of -the record. The external source may not always follow this -convention. In these cases it is useful to override the -primaryKey property to match the primaryKey of your external -store. - -Example - -```javascript -
[29/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/data/metrics/metric2.json -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/data/metrics/metric2.json b/contrib/views/slider/src/main/resources/ui/app/assets/data/metrics/metric2.json deleted file mode 100644 index c382dd8..000 --- a/contrib/views/slider/src/main/resources/ui/app/assets/data/metrics/metric2.json +++ /dev/null @@ -1,3838 +0,0 @@ -{ - "metrics" : { -"jvm" : { - "threadsBlocked" : [ -[ - 0.0, - 1401359115 -], -[ - 0.0, - 1401359130 -], -[ - 0.0, - 1401359145 -], -[ - 0.0, - 1401359160 -], -[ - 0.0, - 1401359175 -], -[ - 0.0, - 1401359190 -], -[ - 0.0, - 1401359205 -], -[ - 0.0, - 1401359220 -], -[ - 0.0, - 1401359235 -], -[ - 0.0, - 1401359250 -], -[ - 0.0, - 1401359265 -], -[ - 0.0, - 1401359280 -], -[ - 0.0, - 1401359295 -], -[ - 0.0, - 1401359310 -], -[ - 0.0, - 1401359325 -], -[ - 0.0, - 1401359340 -], -[ - 0.0, - 1401359355 -], -[ - 0.0, - 1401359370 -], -[ - 0.0, - 1401359385 -], -[ - 0.0, - 1401359400 -], -[ - 0.0, - 1401359415 -], -[ - 0.0, - 1401359430 -], -[ - 0.0, - 1401359445 -], -[ - 0.0, - 1401359460 -], -[ - 0.0, - 1401359475 -], -[ - 0.0, - 1401359490 -], -[ - 0.0, - 1401359505 -], -[ - 0.0, - 1401359520 -], -[ - 0.0, - 1401359535 -], -[ - 0.0, - 1401359550 -], -[ - 0.0, - 1401359565 -], -[ - 0.0, - 1401359580 -], -[ - 0.0, - 1401359595 -], -[ - 0.0, - 1401359610 -], -[ - 0.0, - 1401359625 -], -[ - 0.0, - 1401359640 -], -[ - 0.0, - 1401359655 -], -[ - 0.0, - 1401359670 -], -[ - 0.0, - 1401359685 -], -[ - 0.0, - 1401359700 -], -[ - 0.0, - 1401359715 -], -[ - 0.0, - 1401359730 -], -[ - 0.0, - 1401359745 -], -[ - 0.0, - 1401359760 -], -[ - 0.0, - 1401359775 -], -[ - 0.0, - 1401359790 -], -[ - 0.0, - 1401359805 -], -[ - 0.0, - 1401359820 -], -[ - 0.0, - 1401359835 -], -[ - 0.0, - 1401359850 -], -[ - 0.0, - 1401359865 -], -[ - 0.0, - 1401359880 -], -[ - 0.0, - 1401359895 -], -[ - 0.0, - 1401359910 -], -[ - 0.0, - 1401359925 -], -[ - 0.0, - 1401359940 -], -[ - 0.0, - 1401359955 -], -[ - 0.0, - 1401359970 -], -[ - 0.0, - 1401359985 -], -[ - 0.0, - 140136 -], -[ - 0.0, - 1401360015 -], -[ - 0.0, - 1401360030 -], -[ - 0.0, - 1401360045 -], -[ - 0.0, - 1401360060 -], -[ - 0.0, - 1401360075 -], -[ - 0.0, - 1401360090 -], -[ - 0.0, - 1401360105 -], -[ - 0.0, - 1401360120 -], -[ - 0.0, - 1401360135 -], -[ - 0.0, - 1401360150 -], -[ - 0.0, - 1401360165 -], -[ - 0.0, -
[15/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/d3.v2.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/d3.v2.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/d3.v2.js deleted file mode 100644 index 714656b..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/d3.v2.js +++ /dev/null @@ -1,7033 +0,0 @@ -(function() { - function d3_class(ctor, properties) { -try { - for (var key in properties) { -Object.defineProperty(ctor.prototype, key, { - value: properties[key], - enumerable: false -}); - } -} catch (e) { - ctor.prototype = properties; -} - } - function d3_arrayCopy(pseudoarray) { -var i = -1, n = pseudoarray.length, array = []; -while (++i < n) array.push(pseudoarray[i]); -return array; - } - function d3_arraySlice(pseudoarray) { -return Array.prototype.slice.call(pseudoarray); - } - function d3_Map() {} - function d3_identity(d) { -return d; - } - function d3_this() { -return this; - } - function d3_true() { -return true; - } - function d3_functor(v) { -return typeof v === "function" ? v : function() { - return v; -}; - } - function d3_rebind(target, source, method) { -return function() { - var value = method.apply(source, arguments); - return arguments.length ? target : value; -}; - } - function d3_number(x) { -return x != null && !isNaN(x); - } - function d3_zipLength(d) { -return d.length; - } - function d3_splitter(d) { -return d == null; - } - function d3_collapse(s) { -return s.trim().replace(/\s+/g, " "); - } - function d3_range_integerScale(x) { -var k = 1; -while (x * k % 1) k *= 10; -return k; - } - function d3_dispatch() {} - function d3_dispatch_event(dispatch) { -function event() { - var z = listeners, i = -1, n = z.length, l; - while (++i < n) if (l = z[i].on) l.apply(this, arguments); - return dispatch; -} -var listeners = [], listenerByName = new d3_Map; -event.on = function(name, listener) { - var l = listenerByName.get(name), i; - if (arguments.length < 2) return l && l.on; - if (l) { -l.on = null; -listeners = listeners.slice(0, i = listeners.indexOf(l)).concat(listeners.slice(i + 1)); -listenerByName.remove(name); - } - if (listener) listeners.push(listenerByName.set(name, { -on: listener - })); - return dispatch; -}; -return event; - } - function d3_format_precision(x, p) { -return p - (x ? 1 + Math.floor(Math.log(x + Math.pow(10, 1 + Math.floor(Math.log(x) / Math.LN10) - p)) / Math.LN10) : 1); - } - function d3_format_typeDefault(x) { -return x + ""; - } - function d3_format_group(value) { -var i = value.lastIndexOf("."), f = i >= 0 ? value.substring(i) : (i = value.length, ""), t = []; -while (i > 0) t.push(value.substring(i -= 3, i + 3)); -return t.reverse().join(",") + f; - } - function d3_formatPrefix(d, i) { -var k = Math.pow(10, Math.abs(8 - i) * 3); -return { - scale: i > 8 ? function(d) { -return d / k; - } : function(d) { -return d * k; - }, - symbol: d -}; - } - function d3_ease_clamp(f) { -return function(t) { - return t <= 0 ? 0 : t >= 1 ? 1 : f(t); -}; - } - function d3_ease_reverse(f) { -return function(t) { - return 1 - f(1 - t); -}; - } - function d3_ease_reflect(f) { -return function(t) { - return .5 * (t < .5 ? f(2 * t) : 2 - f(2 - 2 * t)); -}; - } - function d3_ease_identity(t) { -return t; - } - function d3_ease_poly(e) { -return function(t) { - return Math.pow(t, e); -}; - } - function d3_ease_sin(t) { -return 1 - Math.cos(t * Math.PI / 2); - } - function d3_ease_exp(t) { -return Math.pow(2, 10 * (t - 1)); - } - function d3_ease_circle(t) { -return 1 - Math.sqrt(1 - t * t); - } - function d3_ease_elastic(a, p) { -var s; -if (arguments.length < 2) p = .45; -if (arguments.length < 1) { - a = 1; - s = p / 4; -} else s = p / (2 * Math.PI) * Math.asin(1 / a); -return function(t) { - return 1 + a * Math.pow(2, 10 * -t) * Math.sin((t - s) * 2 * Math.PI / p); -}; - } - function d3_ease_back(s) { -if (!s) s = 1.70158; -return function(t) { - return t * t * ((s + 1) * t - s); -}; - } - function d3_ease_bounce(t) { -return t < 1 / 2.75 ? 7.5625 * t * t : t < 2 / 2.75 ? 7.5625 * (t -= 1.5 / 2.75) * t + .75 : t < 2.5 / 2.75 ? 7.5625 * (t -= 2.25 / 2.75) * t + .9375 : 7.5625 * (t -= 2.625 / 2.75) * t + .984375; - } - function d3_eventCancel() { -d3.event.stopPropagation(); -d3.event.preventDefault(); - } - function d3_eventSource()
[28/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/data/metrics/metric3.json -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/data/metrics/metric3.json b/contrib/views/slider/src/main/resources/ui/app/assets/data/metrics/metric3.json deleted file mode 100644 index e1bc296..000 --- a/contrib/views/slider/src/main/resources/ui/app/assets/data/metrics/metric3.json +++ /dev/null @@ -1,1856 +0,0 @@ -{ - "metrics" : { -"dfs" : { - "namenode" : { -"CreateFileOps" : [ - [ -0.0, -1401359340 - ], - [ -0.0, -1401359355 - ], - [ -0.0, -1401359370 - ], - [ -0.0, -1401359385 - ], - [ -0.0, -1401359400 - ], - [ -0.0, -1401359415 - ], - [ -0.0, -1401359430 - ], - [ -0.0, -1401359445 - ], - [ -0.0, -1401359460 - ], - [ -0.0, -1401359475 - ], - [ -0.0, -1401359490 - ], - [ -0.0, -1401359505 - ], - [ -0.0, -1401359520 - ], - [ -0.0, -1401359535 - ], - [ -0.0, -1401359550 - ], - [ -0.0, -1401359565 - ], - [ -0.0, -1401359580 - ], - [ -0.0, -1401359595 - ], - [ -0.0, -1401359610 - ], - [ -0.0, -1401359625 - ], - [ -0.0, -1401359640 - ], - [ -0.0, -1401359655 - ], - [ -0.0, -1401359670 - ], - [ -0.0, -1401359685 - ], - [ -0.0, -1401359700 - ], - [ -0.0, -1401359715 - ], - [ -0.0, -1401359730 - ], - [ -0.0, -1401359745 - ], - [ -0.0, -1401359760 - ], - [ -0.0, -1401359775 - ], - [ -0.0, -1401359790 - ], - [ -0.0, -1401359805 - ], - [ -0.0, -1401359820 - ], - [ -0.0, -1401359835 - ], - [ -0.0, -1401359850 - ], - [ -0.0, -1401359865 - ], - [ -0.0, -1401359880 - ], - [ -0.0, -1401359895 - ], - [ -0.0, -1401359910 - ], - [ -0.0, -1401359925 - ], - [ -0.0, -1401359940 - ], - [ -0.0, -1401359955 - ], - [ -0.0, -1401359970 - ], - [ -0.0, -1401359985 - ], - [ -0.0, -140136 - ], - [ -0.0, -1401360015 - ], - [ -0.0, -1401360030 - ], - [ -0.0, -1401360045 - ], - [ -0.0, -1401360060 - ], - [ -0.0, -1401360075 - ], - [ -0.0, -1401360090 - ], - [ -0.0, -1401360105 - ], - [ -0.0, -1401360120 - ], - [ -0.0, -1401360135 - ], - [ -0.0, -1401360150 - ], - [ -0.0, -1401360165 - ], - [ -0.0, -1401360180 - ], - [ -0.0, -1401360195 - ], - [ -0.0, -1401360210 - ], - [ -0.0, -1401360225 - ], - [ -0.0, -1401360240 - ], - [ -0.0, -1401360255 - ], - [ -0.0, -1401360270 - ], -
[09/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/rickshaw.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/rickshaw.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/rickshaw.js deleted file mode 100644 index 6beb828..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/common/rickshaw.js +++ /dev/null @@ -1,2659 +0,0 @@ -var Rickshaw = { - - namespace: function(namespace, obj) { - - var parts = namespace.split('.'); - - var parent = Rickshaw; - - for(var i = 1, length = parts.length; i < length; i++) { - currentPart = parts[i]; - parent[currentPart] = parent[currentPart] || {}; - parent = parent[currentPart]; - } - return parent; - }, - - keys: function(obj) { - var keys = []; - for (var key in obj) keys.push(key); - return keys; - }, - - extend: function(destination, source) { - - for (var property in source) { - destination[property] = source[property]; - } - return destination; - } -}; - -if (typeof module !== 'undefined' && module.exports) { - var d3 = require('d3'); - module.exports = Rickshaw; -} - -/* Adapted from https://github.com/Jakobo/PTClass */ - -/* -Copyright (c) 2005-2010 Sam Stephenson - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ -/* Based on Alex Arnell's inheritance implementation. */ -/** section: Language - * class Class - * - * Manages Prototype's class-based OOP system. - * - * Refer to Prototype's web site for a [tutorial on classes and - * inheritance](http://prototypejs.org/learn/class-inheritance). -**/ -(function(globalContext) { -/* */ -/* Import from object.js*/ -/* */ -var _toString = Object.prototype.toString, -NULL_TYPE = 'Null', -UNDEFINED_TYPE = 'Undefined', -BOOLEAN_TYPE = 'Boolean', -NUMBER_TYPE = 'Number', -STRING_TYPE = 'String', -OBJECT_TYPE = 'Object', -FUNCTION_CLASS = '[object Function]'; -function isFunction(object) { - return _toString.call(object) === FUNCTION_CLASS; -} -function extend(destination, source) { - for (var property in source) if (source.hasOwnProperty(property)) // modify protect primitive slaughter -destination[property] = source[property]; - return destination; -} -function keys(object) { - if (Type(object) !== OBJECT_TYPE) { throw new TypeError(); } - var results = []; - for (var property in object) { -if (object.hasOwnProperty(property)) { - results.push(property); -} - } - return results; -} -function Type(o) { - switch(o) { -case null: return NULL_TYPE; -case (void 0): return UNDEFINED_TYPE; - } - var type = typeof o; - switch(type) { -case 'boolean': return BOOLEAN_TYPE; -case 'number': return NUMBER_TYPE; -case 'string': return STRING_TYPE; - } - return OBJECT_TYPE; -} -function isUndefined(object) { - return typeof object === "undefined"; -} -/* */ -/* Import from Function.js */ -/* */ -var slice = Array.prototype.slice; -function argumentNames(fn) { - var names = fn.toString().match(/^[\s\(]*function[^(]*\(([^)]*)\)/)[1] -.replace(/\/\/.*?[\r\n]|\/\*(?:.|[\r\n])*?\*\//g, '') -.replace(/\s+/g, '').split(','); - return names.length == 1 && !names[0] ? [] : names; -} -function wrap(fn, wrapper) { - var __method = fn; - return function() { -var a = update([bind(__method, this)], arguments); -return wrapper.apply(this, a); - } -} -function update(array, args) { - var arrayLength = array.length, length = args.length; - while (length--) array[arrayLength + length] = args[length]; - return array; -}
[25/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/qunit.js -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/qunit.js b/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/qunit.js deleted file mode 100644 index 474cfe5..000 --- a/contrib/views/slider/src/main/resources/ui/app/assets/javascripts/qunit.js +++ /dev/null @@ -1,2495 +0,0 @@ -/*! - * QUnit 1.15.0 - * http://qunitjs.com/ - * - * Copyright 2014 jQuery Foundation and other contributors - * Released under the MIT license - * http://jquery.org/license - * - * Date: 2014-08-08T16:00Z - */ - -(function( window ) { - -var QUnit, - config, - onErrorFnPrev, - fileName = ( sourceFromStacktrace( 0 ) || "" ).replace( /(:\d+)+\)?/, "" ).replace( /.+\//, "" ), - toString = Object.prototype.toString, - hasOwn = Object.prototype.hasOwnProperty, - // Keep a local reference to Date (GH-283) - Date = window.Date, - now = Date.now || function() { - return new Date().getTime(); - }, - setTimeout = window.setTimeout, - clearTimeout = window.clearTimeout, - defined = { - document: typeof window.document !== "undefined", - setTimeout: typeof window.setTimeout !== "undefined", - sessionStorage: (function() { - var x = "qunit-test-string"; - try { - sessionStorage.setItem( x, x ); - sessionStorage.removeItem( x ); - return true; - } catch ( e ) { - return false; - } - }()) - }, - /** -* Provides a normalized error string, correcting an issue -* with IE 7 (and prior) where Error.prototype.toString is -* not properly implemented -* -* Based on http://es5.github.com/#x15.11.4.4 -* -* @param {String|Error} error -* @return {String} error message -*/ - errorString = function( error ) { - var name, message, - errorString = error.toString(); - if ( errorString.substring( 0, 7 ) === "[object" ) { - name = error.name ? error.name.toString() : "Error"; - message = error.message ? error.message.toString() : ""; - if ( name && message ) { - return name + ": " + message; - } else if ( name ) { - return name; - } else if ( message ) { - return message; - } else { - return "Error"; - } - } else { - return errorString; - } - }, - /** -* Makes a clone of an object using only Array or Object as base, -* and copies over the own enumerable properties. -* -* @param {Object} obj -* @return {Object} New object with only the own properties (recursively). -*/ - objectValues = function( obj ) { - var key, val, - vals = QUnit.is( "array", obj ) ? [] : {}; - for ( key in obj ) { - if ( hasOwn.call( obj, key ) ) { - val = obj[ key ]; - vals[ key ] = val === Object( val ) ? objectValues( val ) : val; - } - } - return vals; - }; - -// Root QUnit object. -// `QUnit` initialized at top of scope -QUnit = { - - // call on start of module test to prepend name to all tests - module: function( name, testEnvironment ) { - config.currentModule = name; - config.currentModuleTestEnvironment = testEnvironment; - config.modules[ name ] = true; - }, - - asyncTest: function( testName, expected, callback ) { - if ( arguments.length === 2 ) { - callback = expected; - expected = null; - } - - QUnit.test( testName, expected, callback, true ); - }, - - test: function( testName, expected, callback, async ) { - var test; - - if ( arguments.length === 2 ) { - callback = expected; - expected = null; - } - - test = new Test({ - testName: testName, - expected: expected, - async: async, - callback: callback, - module:
[31/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json -- diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json b/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json deleted file mode 100644 index 23423d8..000 --- a/contrib/views/slider/src/main/resources/ui/app/assets/data/apps/apps.json +++ /dev/null @@ -1,1320 +0,0 @@ -{ - "href" : "http://c6401:8080/api/v1/views/SLIDER/versions/1.0.0/instances/SLIDER_1/apps/?fields=*&_=1409569396360;, - "items" : [ -{ - "href" : "http://c6401:8080/api/v1/views/SLIDER/versions/1.0.0/instances/SLIDER_1/apps/1409333994422_5;, - "appVersion" : "0.98.4-hadoop2", - "description" : "apache hbase is the hadoop database, a distributed, scalable, big data store", - "diagnostics" : "", - "endTime" : 0, - "id" : "1409333994422_5", - "instance_name" : "SLIDER_1", - "metrics" : null, - "name" : "h4", - "startTime" : 1409348496653, - "state" : "FROZEN", - "type" : "hbase", - "user" : "yarn", - "version" : "1.0.0", - "view_name" : "SLIDER", - "yarnId" : "application_1409333994422_0005", - "supportedMetrics" : [ -"firstMetric", -"secondMetric" - ], - "alerts" : { -"detail" : [ - { -"description" : "alert1", -"host_name" : "Ñ6402.ambari.apache.org", -"last_status" : "CRITICAL", -"last_status_time" : 1409689349, -"service_name" : "HBASE", -"status" : "OK", -"status_time" : 1409703869, -"output" : "Connection refused", -"actual_status" : "CRITICAL" - }, - { -"description" : "alert2", -"host_name" : "Ñ6402.ambari.apache.org", -"last_status" : "OK", -"last_status_time" : 1409334745, -"service_name" : "HBASE", -"status" : "WARNING", -"status_time" : 1409703865, -"output" : "TCP OK - 0.001 second response time on port 9083", -"actual_status" : "OK" - }, - { -"description" : "NameNode edit logs directory status on dev01.hortonworks.com", -"host_name" : "dev01.hortonworks.com", -"last_status" : "WARNING", -"last_status_time" : 1389788011, -"service_name" : "HBASE", -"status" : "CRITICAL", -"status_time" : 1389793171, -"output" : "WARNING: NameNode directory status not available via http://dev01.hortonworks.com:50070/jmx url, code 0" - }, - { -"description" : "NameNode host CPU utilization on dev01.hortonworks.com", -"host_name" : "dev01.hortonworks.com", -"last_status" : "OK", -"last_status_time" : 1389636534, -"service_name" : "HBASE", -"status" : "PASSIVE", -"status_time" : 1389793060, -"output" : "1 CPU, load 19.0% 200% : OK" - }, - { -"description" : "App Timeline Server Web UI", -"host_name" : "dev01.hortonworks.com", -"last_status" : "WARNING", -"last_status_time" : 1389636534, -"service_name" : "HBASE", -"status" : "UNKNOWN", -"status_time" : 1389793060, -"output" : "1 CPU, load 19.0% 200% : OK" - } -], -"summary" : { - "CRITICAL" : 1, - "OK" : 1, - "PASSIVE" : 0, - "WARNING" : 0 -} - }, - "components" : { -"HBASE_MASTER" : { - "componentName" : "HBASE_MASTER", - "instanceCount" : 2, - "activeContainers" : { -"container_1409333994422_0005_01_02" : { - "released" : "false", - "startTime" : "1409348511279", - "createTime" : "1409348510529", - "environment" : "[AGENT_WORK_ROOT=\"$PWD\", HADOOP_USER_NAME=\"yarn\", AGENT_LOG_ROOT=\"$LOG_DIRS\", PYTHONPATH=\"./infra/agent/slider-agent/\", SLIDER_PASSPHRASE=\"DEV\"]", - "host" : "Ñ6402.ambari.apache.org", - "name" : "container_1409333994422_0005_01_02", - "command" : "python ./infra/agent/slider-agent/agent/main.py --label container_1409333994422_0005_01_02___HBASE_MASTER --zk-quorum Ñ6401.ambari.apache.org:2181 --zk-reg-path /registry/org-apache-slider/h4 ; ", - "state" : "3", - "role" : "HBASE_MASTER", - "exitCode" : "0", - "diagnostics" : "", - "roleId" : "1" -}, -"container_1409333994422_0005_01_03" : { - "released" : "false", - "startTime" : "1409348511279", -
[20/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/summary.hbs -- diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/summary.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/summary.hbs deleted file mode 100644 index 28597dc..000 --- a/contrib/views/slider/src/main/resources/ui/app/templates/slider_app/summary.hbs +++ /dev/null @@ -1,135 +0,0 @@ -{{! -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -}} - - - - -{{#bs-panel heading="Summary" class="panel-summary"}} - - - - {{t common.status}} - {{controller.model.displayStatus}} - - - {{t common.type}} - {{controller.appType}} - - - {{t common.yarn.app.id}} - {{controller.model.yarnId}} - - - {{t common.started}} - {{formatWordBreak controller.model.startedToLocalTime}} - - - {{t common.finished}} - {{formatWordBreak controller.model.endedToLocalTime}} - - - {{t common.diagnostics}} - {{formatWordBreak controller.model.diagnostics devider="."}} - - {{#each controller.model.jmx}} - -{{humanize key}} -{{formatWordBreak value}} - - {{/each}} - - -{{/bs-panel}} - - - - -{{t common.status}} - - - - - - {{#if controller.model.doNotShowComponentsAndAlerts}} - - {{t sliderApp.alerts.no.status}} - - {{else}} -{{#each controller.model.alerts}} - {{#view view.AlertView contentBinding="this"}} - - - - - - - -{{title}} -{{message}} - - - - - {{/view}} -{{/each}} - {{/if}} - - - -{{#bs-panel heading="Components" class="panel-components"}} - - - {{#if controller.model.doNotShowComponentsAndAlerts}} - -{{t sliderApp.summary.no.components}} - - {{else}} -{{#each controller.model.components}} - - {{componentName}} - - -{{#if url}} - {{host}} -{{else}} - {{host}} -{{/if}} - - -{{/each}} - {{/if}} - - -{{/bs-panel}} - - - -{{#if controller.model.showMetrics}} - - - {{t common.metrics}} - - - -{{#each graph in view.graphs}} - {{view graph.view}} -{{/each}} - - - -{{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs -- diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs deleted file mode 100644 index d4631e8..000 --- a/contrib/views/slider/src/main/resources/ui/app/templates/slider_apps.hbs +++ /dev/null @@ -1,87 +0,0 @@ -{{! -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the
[04/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/vendor/scripts/production/ember.js -- diff --git a/contrib/views/slider/src/main/resources/ui/vendor/scripts/production/ember.js b/contrib/views/slider/src/main/resources/ui/vendor/scripts/production/ember.js deleted file mode 100644 index 043755d..000 --- a/contrib/views/slider/src/main/resources/ui/vendor/scripts/production/ember.js +++ /dev/null @@ -1,41620 +0,0 @@ -/*! - * @overview Ember - JavaScript Application Framework - * @copyright Copyright 2011-2014 Tilde Inc. and contributors - *Portions Copyright 2006-2011 Strobe Inc. - *Portions Copyright 2008-2011 Apple Inc. All rights reserved. - * @license Licensed under MIT license - *See https://raw.github.com/emberjs/ember.js/master/LICENSE - * @version 1.5.1+pre.ff8c6bbb - */ - - -(function() { -var define, requireModule, require, requirejs; - -(function() { - var registry = {}, seen = {}; - - define = function(name, deps, callback) { -registry[name] = { deps: deps, callback: callback }; - }; - - requirejs = require = requireModule = function(name) { - requirejs._eak_seen = registry; - -if (seen[name]) { return seen[name]; } -seen[name] = {}; - -if (!registry[name]) { - throw new Error("Could not find module " + name); -} - -var mod = registry[name], -deps = mod.deps, -callback = mod.callback, -reified = [], -exports; - -for (var i=0, l=deps.length; i
[19/35] ambari git commit: AMBARI-21330.Remove slider view from Ambari-3.0.0(Venkata Sairam)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step2_view.js -- diff --git a/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step2_view.js b/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step2_view.js deleted file mode 100644 index bdf718f..000 --- a/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step2_view.js +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -App.CreateAppWizardStep2View = Ember.View.extend({ - - /** - * Message shown in the checkbox popover - * @type {string} - */ - checkBoxPopover: Em.I18n.t('wizard.step2.table.popoverCheckbox'), - - /** - * Message shown in the label-input popover - * @type {string} - */ - yarnLabelPopover: Em.I18n.t('wizard.step2.table.popoverLabel') - -}); http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step3_view.js -- diff --git a/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step3_view.js b/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step3_view.js deleted file mode 100644 index 5d3bd57..000 --- a/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step3_view.js +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -App.CreateAppWizardStep3View = Ember.View.extend(App.WithPanels, { - - didInsertElement: function () { -this.get('controller').loadStep(); -this.addCarets(); - } -}); http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step4_view.js -- diff --git a/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step4_view.js b/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step4_view.js deleted file mode 100644 index 9034001..000 --- a/contrib/views/slider/src/main/resources/ui/app/views/createAppWizard/step4_view.js +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -App.CreateAppWizardStep4View = Ember.View.extend({ - - didInsertElement: function () { -this.get('controller').loadStep(); - } -}); http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8deeba/contrib/views/slider/src/main/resources/ui/app/views/create_app_wizard_view.js
ambari git commit: AMBARI-21084.Files view on IE 11- On Concatenating files or downloading, the concatenated or downloaded file occupies the entire UI.(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 462a3e8b4 -> 75cb56ef7 AMBARI-21084.Files view on IE 11- On Concatenating files or downloading, the concatenated or downloaded file occupies the entire UI.(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/75cb56ef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75cb56ef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75cb56ef Branch: refs/heads/branch-2.5 Commit: 75cb56ef7384ef733d4338e221ce3675f7241b3a Parents: 462a3e8 Author: Venkata SairamAuthored: Fri Jun 23 11:54:32 2017 +0530 Committer: Venkata Sairam Committed: Fri Jun 23 11:54:32 2017 +0530 -- .../java/org/apache/ambari/view/filebrowser/DownloadService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/75cb56ef/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/DownloadService.java -- diff --git a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/DownloadService.java b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/DownloadService.java index 7a1c7a1..81ac40d 100644 --- a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/DownloadService.java +++ b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/DownloadService.java @@ -113,7 +113,7 @@ public class DownloadService extends HdfsService { ResponseBuilder result = Response.ok(fs); if (download) { result.header("Content-Disposition", - "inline; filename=\"" + status.getPath().getName() + "\"").type(MediaType.APPLICATION_OCTET_STREAM); + "attachment; filename=\"" + status.getPath().getName() + "\"").type(MediaType.APPLICATION_OCTET_STREAM); } else { FileNameMap fileNameMap = URLConnection.getFileNameMap(); String mimeType = fileNameMap.getContentTypeFor(status.getPath().getName()); @@ -277,7 +277,7 @@ public class DownloadService extends HdfsService { }; ResponseBuilder response = Response.ok(result); if (request.download) { -response.header("Content-Disposition", "inline; filename=\"concatResult.txt\"").type(MediaType.APPLICATION_OCTET_STREAM); +response.header("Content-Disposition", "attachment; filename=\"concatResult.txt\"").type(MediaType.APPLICATION_OCTET_STREAM); } else { response.header("Content-Disposition", "filename=\"concatResult.txt\"").type(MediaType.TEXT_PLAIN); }
ambari git commit: AMBARI-21323.Hive view 2.0-UI issues on IE11 +Win 7(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 4cbd9d7d0 -> 5c59a8a9b AMBARI-21323.Hive view 2.0-UI issues on IE11 +Win 7(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5c59a8a9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5c59a8a9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5c59a8a9 Branch: refs/heads/branch-2.5 Commit: 5c59a8a9b79ee343c9107fa7feb03473d0b3f81f Parents: 4cbd9d7 Author: Venkata SairamAuthored: Fri Jun 23 08:15:57 2017 +0530 Committer: Venkata Sairam Committed: Fri Jun 23 08:20:19 2017 +0530 -- contrib/views/hive20/src/main/resources/ui/app/styles/app.scss | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/5c59a8a9/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss -- diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss index 83fac86..522b2d3 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss +++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss @@ -835,6 +835,7 @@ ul.dropdown-menu { } .break-word{ + display: inline-block; word-break: break-all; }
ambari git commit: AMBARI-21323.Hive view 2.0-UI issues on IE11 +Win 7(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 845eb86c2 -> 6fe7cc283 AMBARI-21323.Hive view 2.0-UI issues on IE11 +Win 7(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6fe7cc28 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6fe7cc28 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6fe7cc28 Branch: refs/heads/trunk Commit: 6fe7cc283957de8e13d1073322a6176895ff289b Parents: 845eb86 Author: Venkata SairamAuthored: Fri Jun 23 08:15:57 2017 +0530 Committer: Venkata Sairam Committed: Fri Jun 23 08:16:21 2017 +0530 -- contrib/views/hive20/src/main/resources/ui/app/styles/app.scss | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/6fe7cc28/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss -- diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss index 83fac86..522b2d3 100644 --- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss +++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss @@ -835,6 +835,7 @@ ul.dropdown-menu { } .break-word{ + display: inline-block; word-break: break-all; }
ambari git commit: AMBARI-21292.Convert Slider View to use yarn package manager(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.4 a7d452567 -> 3282cf800 AMBARI-21292.Convert Slider View to use yarn package manager(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3282cf80 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3282cf80 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3282cf80 Branch: refs/heads/branch-2.4 Commit: 3282cf8007ce510d0167f90c6fec245e30c36de6 Parents: a7d4525 Author: Venkata SairamAuthored: Thu Jun 22 09:16:58 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 14:56:19 2017 +0530 -- .../slider/src/main/resources/ui/package.json| 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/3282cf80/contrib/views/slider/src/main/resources/ui/package.json -- diff --git a/contrib/views/slider/src/main/resources/ui/package.json b/contrib/views/slider/src/main/resources/ui/package.json index f9f8793..7658ae7 100755 --- a/contrib/views/slider/src/main/resources/ui/package.json +++ b/contrib/views/slider/src/main/resources/ui/package.json @@ -20,18 +20,19 @@ "update:skeleton": "node setup.js update:skeleton" }, "dependencies": { -"javascript-brunch": "~1.7.0", -"less-brunch":">= 1.0 < 1.5", -"css-brunch": "~1.7.0", -"stylus-brunch": "~1.7.0", -"uglify-js-brunch": "~1.7.0", -"clean-css-brunch": "~1.7.0", -"ember-handlebars-brunch": "git://github.com/fuseelements/ember-handlebars-brunch#fix/ember-1.3.0" +"clean-css-brunch": ">= 1.0 < 1.8", +"coffee-script-brunch": ">= 1.0 < 1.8", +"css-brunch": ">= 1.0 < 1.8", +"ember-handlebars-brunch": "git://github.com/fuseelements/ember-handlebars-brunch#fix/ember-1.3.0", +"handlebars": "^4.0.10", +"javascript-brunch": ">= 1.0 < 1.8", +"stylus-brunch": ">= 1.0 < 1.8", +"uglify-js-brunch": ">= 1.0 < 1.8" }, "devDependencies": { -"phantomjs": "^1.9.2", "karma": "*", +"karma-phantomjs-launcher": "~0.1.2", "karma-qunit": "*", -"karma-phantomjs-launcher": "~0.1.2" +"phantomjs": "^1.9.2" } }
ambari git commit: AMBARI-21264.Integrate new hdfs-file browser in WFD(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 7d584109e -> 291625d46 AMBARI-21264.Integrate new hdfs-file browser in WFD(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/291625d4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/291625d4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/291625d4 Branch: refs/heads/branch-2.5 Commit: 291625d46bd068824b89e0676881315ed68376c7 Parents: 7d58410 Author: Venkata SairamAuthored: Thu Jun 22 09:35:30 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 09:36:20 2017 +0530 -- .../resources/ui/app/components/hdfs-browser.js | 8 +- .../ui/app/services/workspace-manager.js| 5 + .../src/main/resources/ui/app/styles/app.less | 3 +- .../app/templates/components/hdfs-browser.hbs | 16 +- .../main/resources/ui/app/utils/hdfsviewer.js | 3 + .../wfmanager/src/main/resources/ui/bower.json | 1 - .../addon/components/directory-viewer.js| 325 +-- .../hdfs-directory-viewer/addon/styles/app.css | 189 +++ .../templates/components/directory-viewer.hbs | 146 + .../addon/utils/viewer-config.js| 3 + .../hdfs-directory-viewer/bower.json| 1 - .../hdfs-directory-viewer/index.js | 3 - .../hdfs-directory-viewer/package.json | 5 +- .../src/main/resources/ui/package.json | 3 +- 14 files changed, 582 insertions(+), 129 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/291625d4/contrib/views/wfmanager/src/main/resources/ui/app/components/hdfs-browser.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/hdfs-browser.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/hdfs-browser.js index 0194f13..b1fb29a 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/hdfs-browser.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/hdfs-browser.js @@ -20,6 +20,7 @@ import HdfsViewerConfig from '../utils/hdfsviewer'; export default Ember.Component.extend({ config: HdfsViewerConfig.create(), uploaderService : Ember.inject.service('hdfs-file-uploader'), + userInfo : Ember.inject.service('workspace-manager'), initialize:function(){ var self=this; self.$("#filediv").modal("show"); @@ -27,8 +28,12 @@ export default Ember.Component.extend({ self.sendAction('closeWorkflowSubmitConfigs'); self.sendAction("closeFileBrowser"); }); - }.on('didInsertElement'), + setUserData : function() { +this.set("homeDirectory", "/user/"+this.get("userInfo").getUserName()); +this.set("selectedPath", "/user/"+this.get("userInfo").getUserName()); +this.set("filePath", "/user/"+this.get("userInfo").getUserName()); + }.on("init"), selectFileType: "all",//can be all/file/folder selectedPath:"", isDirectory:false, @@ -81,6 +86,7 @@ export default Ember.Component.extend({ }, viewerSelectedPath(data) { this.set("selectedPath",data.path); + this.set("filePath",data.path); this.set("isDirectory",data.isDirectory); this.set("alertMessage",null); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/291625d4/contrib/views/wfmanager/src/main/resources/ui/app/services/workspace-manager.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/services/workspace-manager.js b/contrib/views/wfmanager/src/main/resources/ui/app/services/workspace-manager.js index 8636fd5..4ac5ae1 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/services/workspace-manager.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/services/workspace-manager.js @@ -21,6 +21,7 @@ export default Ember.Service.extend({ tabsInfo : {}, workInProgress : {}, userInfo : Ember.inject.service('user-info'), + userName : null, setLastActiveTab(tabId){ this.get("userInfo").getUserData().then(function(data){ localStorage.setItem(data+"-lastActiveTab", tabId); @@ -38,6 +39,7 @@ export default Ember.Service.extend({ restoreTabs(){ var deferred = Ember.RSVP.defer(); this.get("userInfo").getUserData().then(function(data){ +this.set("userName", data); var tabs = localStorage.getItem(data+'-tabsInfo'); deferred.resolve(JSON.parse(tabs)); }.bind(this)).catch(function(e){ @@ -87,5 +89,8 @@ export default Ember.Service.extend({ }.bind(this)).catch(function(e){ console.error(e); }); + }, + getUserName(){ + return this.get("userName"); } });
ambari git commit: AMBARI-21264.Integrate new hdfs-file browser in WFD(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 7335bf7e2 -> b53cf918f AMBARI-21264.Integrate new hdfs-file browser in WFD(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b53cf918 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b53cf918 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b53cf918 Branch: refs/heads/trunk Commit: b53cf918fc27d55a11fae25af9c4eba6dcee26fb Parents: 7335bf7 Author: Venkata SairamAuthored: Thu Jun 22 09:35:30 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 09:35:30 2017 +0530 -- .../resources/ui/app/components/hdfs-browser.js | 8 +- .../ui/app/services/workspace-manager.js| 5 + .../src/main/resources/ui/app/styles/app.less | 3 +- .../app/templates/components/hdfs-browser.hbs | 16 +- .../main/resources/ui/app/utils/hdfsviewer.js | 3 + .../wfmanager/src/main/resources/ui/bower.json | 1 - .../addon/components/directory-viewer.js| 325 +-- .../hdfs-directory-viewer/addon/styles/app.css | 189 +++ .../templates/components/directory-viewer.hbs | 146 + .../addon/utils/viewer-config.js| 3 + .../hdfs-directory-viewer/bower.json| 1 - .../hdfs-directory-viewer/index.js | 3 - .../hdfs-directory-viewer/package.json | 5 +- .../src/main/resources/ui/package.json | 3 +- 14 files changed, 582 insertions(+), 129 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b53cf918/contrib/views/wfmanager/src/main/resources/ui/app/components/hdfs-browser.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/hdfs-browser.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/hdfs-browser.js index 0194f13..b1fb29a 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/hdfs-browser.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/hdfs-browser.js @@ -20,6 +20,7 @@ import HdfsViewerConfig from '../utils/hdfsviewer'; export default Ember.Component.extend({ config: HdfsViewerConfig.create(), uploaderService : Ember.inject.service('hdfs-file-uploader'), + userInfo : Ember.inject.service('workspace-manager'), initialize:function(){ var self=this; self.$("#filediv").modal("show"); @@ -27,8 +28,12 @@ export default Ember.Component.extend({ self.sendAction('closeWorkflowSubmitConfigs'); self.sendAction("closeFileBrowser"); }); - }.on('didInsertElement'), + setUserData : function() { +this.set("homeDirectory", "/user/"+this.get("userInfo").getUserName()); +this.set("selectedPath", "/user/"+this.get("userInfo").getUserName()); +this.set("filePath", "/user/"+this.get("userInfo").getUserName()); + }.on("init"), selectFileType: "all",//can be all/file/folder selectedPath:"", isDirectory:false, @@ -81,6 +86,7 @@ export default Ember.Component.extend({ }, viewerSelectedPath(data) { this.set("selectedPath",data.path); + this.set("filePath",data.path); this.set("isDirectory",data.isDirectory); this.set("alertMessage",null); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/b53cf918/contrib/views/wfmanager/src/main/resources/ui/app/services/workspace-manager.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/services/workspace-manager.js b/contrib/views/wfmanager/src/main/resources/ui/app/services/workspace-manager.js index 8636fd5..4ac5ae1 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/services/workspace-manager.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/services/workspace-manager.js @@ -21,6 +21,7 @@ export default Ember.Service.extend({ tabsInfo : {}, workInProgress : {}, userInfo : Ember.inject.service('user-info'), + userName : null, setLastActiveTab(tabId){ this.get("userInfo").getUserData().then(function(data){ localStorage.setItem(data+"-lastActiveTab", tabId); @@ -38,6 +39,7 @@ export default Ember.Service.extend({ restoreTabs(){ var deferred = Ember.RSVP.defer(); this.get("userInfo").getUserData().then(function(data){ +this.set("userName", data); var tabs = localStorage.getItem(data+'-tabsInfo'); deferred.resolve(JSON.parse(tabs)); }.bind(this)).catch(function(e){ @@ -87,5 +89,8 @@ export default Ember.Service.extend({ }.bind(this)).catch(function(e){ console.error(e); }); + }, + getUserName(){ + return this.get("userName"); } });
ambari git commit: AMBARI-21255.Remove YARN client mode option from WFM(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 c4605d255 -> 7d584109e AMBARI-21255.Remove YARN client mode option from WFM(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d584109 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d584109 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d584109 Branch: refs/heads/branch-2.5 Commit: 7d584109e935bf9585d896bb6f82be88c5334e4b Parents: c4605d2 Author: Venkata SairamAuthored: Thu Jun 22 09:29:01 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 09:30:02 2017 +0530 -- .../ui/app/components/flow-designer.js | 27 .../ui/app/domain/actionjob_hanlder.js | 3 +++ .../app/templates/components/flow-designer.hbs | 9 ++- .../app/templates/components/spark-action.hbs | 7 - .../main/resources/ui/app/utils/constants.js| 2 +- 5 files changed, 45 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/7d584109/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js index 1cfe755..2c77b5b 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js @@ -364,6 +364,8 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { }); }, importWorkflowFromString(data){ +this.showSparkMasterFieldError(data); + var wfObject=this.get("workflowImporter").importWorkflow(data); this.set("errors", wfObject.errors); if (wfObject.workflow === null) { @@ -385,6 +387,7 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { } }, importWorkflowFromJSON(data){ +this.showSparkMasterFieldError(data); var workflowImporter=WorkflowJsonImporter.create({}); var workflow=workflowImporter.importWorkflow(data); this.resetDesigner(); @@ -393,6 +396,27 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { this.rerender(); this.doValidation(); }, + migrateActionObjectToCollection(data) { +if(Ember.isArray(data)) { + return data; +} else { + let ArrayData = []; + ArrayData.push(data); + return ArrayData; +} + }, + showSparkMasterFieldError(data) { +let x2js = new X2JS(); +let actionSettingsObj = x2js.xml_str2json(data); +let sparkActionList, sparkActionArray = []; +if(actionSettingsObj["workflow-app"] && actionSettingsObj["workflow-app"].action) { + sparkActionList = actionSettingsObj["workflow-app"].action; + sparkActionArray = this.migrateActionObjectToCollection(sparkActionList); + if(sparkActionArray.findBy('spark') && this.migrateActionObjectToCollection(sparkActionArray.findBy('spark')).find(function(item){return item.spark.master === "yarn-client"})) { +this.set('isSparkUnSupportedPropsAvailable', true); + } +} + }, getWorkflowFromHdfs(filePath){ var url = Ember.ENV.API_URL + "/readWorkflow?workflowPath="+filePath+'=WORKFLOW'; var deferred = Ember.RSVP.defer(); @@ -1234,6 +1258,9 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { self.set("data", data); self.set("isAssetImporting", false); }); +}, +closeInfo(flag) { + this.set(flag, false); } } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/7d584109/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js index c9dc751..9bc19ba 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js @@ -243,6 +243,9 @@ var SparkActionJobHandler=ActionJobHandler.extend({ ]; }, handleImport(actionNode,json){ +if(json.master === "yarn-client") { + json.master = "yarn-cluster"; + } this._super(actionNode,json); } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/7d584109/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs -- diff --git
ambari git commit: AMBARI-21255.Remove YARN client mode option from WFM(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 9c6932286 -> 7335bf7e2 AMBARI-21255.Remove YARN client mode option from WFM(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7335bf7e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7335bf7e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7335bf7e Branch: refs/heads/trunk Commit: 7335bf7e2e08da032524009ce3ad2a6b1c2430aa Parents: 9c69322 Author: Venkata SairamAuthored: Thu Jun 22 09:29:01 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 09:29:01 2017 +0530 -- .../ui/app/components/flow-designer.js | 27 .../ui/app/domain/actionjob_hanlder.js | 3 +++ .../app/templates/components/flow-designer.hbs | 9 ++- .../app/templates/components/spark-action.hbs | 7 - .../main/resources/ui/app/utils/constants.js| 2 +- 5 files changed, 45 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/7335bf7e/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js index 1cfe755..2c77b5b 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js @@ -364,6 +364,8 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { }); }, importWorkflowFromString(data){ +this.showSparkMasterFieldError(data); + var wfObject=this.get("workflowImporter").importWorkflow(data); this.set("errors", wfObject.errors); if (wfObject.workflow === null) { @@ -385,6 +387,7 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { } }, importWorkflowFromJSON(data){ +this.showSparkMasterFieldError(data); var workflowImporter=WorkflowJsonImporter.create({}); var workflow=workflowImporter.importWorkflow(data); this.resetDesigner(); @@ -393,6 +396,27 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { this.rerender(); this.doValidation(); }, + migrateActionObjectToCollection(data) { +if(Ember.isArray(data)) { + return data; +} else { + let ArrayData = []; + ArrayData.push(data); + return ArrayData; +} + }, + showSparkMasterFieldError(data) { +let x2js = new X2JS(); +let actionSettingsObj = x2js.xml_str2json(data); +let sparkActionList, sparkActionArray = []; +if(actionSettingsObj["workflow-app"] && actionSettingsObj["workflow-app"].action) { + sparkActionList = actionSettingsObj["workflow-app"].action; + sparkActionArray = this.migrateActionObjectToCollection(sparkActionList); + if(sparkActionArray.findBy('spark') && this.migrateActionObjectToCollection(sparkActionArray.findBy('spark')).find(function(item){return item.spark.master === "yarn-client"})) { +this.set('isSparkUnSupportedPropsAvailable', true); + } +} + }, getWorkflowFromHdfs(filePath){ var url = Ember.ENV.API_URL + "/readWorkflow?workflowPath="+filePath+'=WORKFLOW'; var deferred = Ember.RSVP.defer(); @@ -1234,6 +1258,9 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { self.set("data", data); self.set("isAssetImporting", false); }); +}, +closeInfo(flag) { + this.set(flag, false); } } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/7335bf7e/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js index c9dc751..9bc19ba 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js @@ -243,6 +243,9 @@ var SparkActionJobHandler=ActionJobHandler.extend({ ]; }, handleImport(actionNode,json){ +if(json.master === "yarn-client") { + json.master = "yarn-cluster"; + } this._super(actionNode,json); } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/7335bf7e/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs -- diff --git
ambari git commit: AMBARI-21266.Workflow submission fails when action node names contain white space(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 33955935d -> c4605d255 AMBARI-21266.Workflow submission fails when action node names contain white space(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c4605d25 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c4605d25 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c4605d25 Branch: refs/heads/branch-2.5 Commit: c4605d25586bea3e131f6d847ba0efbe1aceb64c Parents: 3395593 Author: Venkata SairamAuthored: Thu Jun 22 09:25:17 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 09:26:14 2017 +0530 -- .../src/main/resources/ui/app/domain/workflow-xml-generator.js| 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c4605d25/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-xml-generator.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-xml-generator.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-xml-generator.js index a6e1eeb..4d63cbd 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-xml-generator.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-xml-generator.js @@ -115,6 +115,9 @@ var WorkflowGenerator= Ember.Object.extend({ if (jobHandler){ jobHandler.setContext(this.workflowContext); +if(/\s/g.test(node.name)) { + this.workflowContext.addError({node : node, message : "Action name cannot contain white space."}); +} if (!self.ignoreErrors && !node.get("domain")){ this.workflowContext.addError({node : node, message : "Action Properties are empty"}); }else{
ambari git commit: AMBARI-21266.Workflow submission fails when action node names contain white space(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 1f70d0627 -> 9c6932286 AMBARI-21266.Workflow submission fails when action node names contain white space(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c693228 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c693228 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c693228 Branch: refs/heads/trunk Commit: 9c6932286fd3860627a6c41ab997293b0caef5a1 Parents: 1f70d06 Author: Venkata SairamAuthored: Thu Jun 22 09:25:17 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 09:25:17 2017 +0530 -- .../src/main/resources/ui/app/domain/workflow-xml-generator.js| 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/9c693228/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-xml-generator.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-xml-generator.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-xml-generator.js index a6e1eeb..4d63cbd 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-xml-generator.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/workflow-xml-generator.js @@ -115,6 +115,9 @@ var WorkflowGenerator= Ember.Object.extend({ if (jobHandler){ jobHandler.setContext(this.workflowContext); +if(/\s/g.test(node.name)) { + this.workflowContext.addError({node : node, message : "Action name cannot contain white space."}); +} if (!self.ignoreErrors && !node.get("domain")){ this.workflowContext.addError({node : node, message : "Action Properties are empty"}); }else{
ambari git commit: AMBARI-21252.Namenode variable should be auto populated for FS action node(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 dbd78a794 -> 33955935d AMBARI-21252.Namenode variable should be auto populated for FS action node(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33955935 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33955935 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33955935 Branch: refs/heads/branch-2.5 Commit: 33955935d26777ac47225b8dd69d0513ed101354 Parents: dbd78a7 Author: Venkata SairamAuthored: Thu Jun 22 09:21:36 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 09:22:46 2017 +0530 -- .../views/wfmanager/src/main/resources/ui/app/utils/constants.js| 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/33955935/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js b/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js index bf858d8..3989fc2 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js @@ -45,6 +45,7 @@ export default Ember.Object.create({ {name : "map-reduce",supportsSchema : false, currentVersion:''}, {name : "sub-workflow",supportsSchema : false, currentVersion:''}, {name : "distcp",supportsSchema : true, currentVersion:''}, +{name : "fs",supportsSchema : true, currentVersion:''}, {name : "ssh",supportsSchema : false, currentVersion:''}, {name : "email",supportsSchema : true, currentVersion:''} ]),
ambari git commit: AMBARI-21252.Namenode variable should be auto populated for FS action node(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 6cda103e2 -> 1f70d0627 AMBARI-21252.Namenode variable should be auto populated for FS action node(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f70d062 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f70d062 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f70d062 Branch: refs/heads/trunk Commit: 1f70d06277cb68a87ef861e48f7f2d0b0bbf7e03 Parents: 6cda103 Author: Venkata SairamAuthored: Thu Jun 22 09:21:36 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 09:21:36 2017 +0530 -- .../views/wfmanager/src/main/resources/ui/app/utils/constants.js| 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/1f70d062/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js -- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js b/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js index bf858d8..3989fc2 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/utils/constants.js @@ -45,6 +45,7 @@ export default Ember.Object.create({ {name : "map-reduce",supportsSchema : false, currentVersion:''}, {name : "sub-workflow",supportsSchema : false, currentVersion:''}, {name : "distcp",supportsSchema : true, currentVersion:''}, +{name : "fs",supportsSchema : true, currentVersion:''}, {name : "ssh",supportsSchema : false, currentVersion:''}, {name : "email",supportsSchema : true, currentVersion:''} ]),
ambari git commit: AMBARI-21292.Convert Slider View to use yarn package manager(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 7cc6701bb -> dbd78a794 AMBARI-21292.Convert Slider View to use yarn package manager(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dbd78a79 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dbd78a79 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dbd78a79 Branch: refs/heads/branch-2.5 Commit: dbd78a79421cca8f3c52e28b93a3b0399f693eeb Parents: 7cc6701 Author: Venkata SairamAuthored: Thu Jun 22 09:16:58 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 09:18:02 2017 +0530 -- .../slider/src/main/resources/ui/package.json| 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/dbd78a79/contrib/views/slider/src/main/resources/ui/package.json -- diff --git a/contrib/views/slider/src/main/resources/ui/package.json b/contrib/views/slider/src/main/resources/ui/package.json index f9f8793..7658ae7 100755 --- a/contrib/views/slider/src/main/resources/ui/package.json +++ b/contrib/views/slider/src/main/resources/ui/package.json @@ -20,18 +20,19 @@ "update:skeleton": "node setup.js update:skeleton" }, "dependencies": { -"javascript-brunch": "~1.7.0", -"less-brunch":">= 1.0 < 1.5", -"css-brunch": "~1.7.0", -"stylus-brunch": "~1.7.0", -"uglify-js-brunch": "~1.7.0", -"clean-css-brunch": "~1.7.0", -"ember-handlebars-brunch": "git://github.com/fuseelements/ember-handlebars-brunch#fix/ember-1.3.0" +"clean-css-brunch": ">= 1.0 < 1.8", +"coffee-script-brunch": ">= 1.0 < 1.8", +"css-brunch": ">= 1.0 < 1.8", +"ember-handlebars-brunch": "git://github.com/fuseelements/ember-handlebars-brunch#fix/ember-1.3.0", +"handlebars": "^4.0.10", +"javascript-brunch": ">= 1.0 < 1.8", +"stylus-brunch": ">= 1.0 < 1.8", +"uglify-js-brunch": ">= 1.0 < 1.8" }, "devDependencies": { -"phantomjs": "^1.9.2", "karma": "*", +"karma-phantomjs-launcher": "~0.1.2", "karma-qunit": "*", -"karma-phantomjs-launcher": "~0.1.2" +"phantomjs": "^1.9.2" } }
ambari git commit: AMBARI-21292.Convert Slider View to use yarn package manager(Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 23760e71a -> 6cda103e2 AMBARI-21292.Convert Slider View to use yarn package manager(Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6cda103e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6cda103e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6cda103e Branch: refs/heads/trunk Commit: 6cda103e26885233f27b82ab3af8ef099428c53f Parents: 23760e7 Author: Venkata SairamAuthored: Thu Jun 22 09:16:58 2017 +0530 Committer: Venkata Sairam Committed: Thu Jun 22 09:16:58 2017 +0530 -- .../slider/src/main/resources/ui/package.json| 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/6cda103e/contrib/views/slider/src/main/resources/ui/package.json -- diff --git a/contrib/views/slider/src/main/resources/ui/package.json b/contrib/views/slider/src/main/resources/ui/package.json index f9f8793..7658ae7 100755 --- a/contrib/views/slider/src/main/resources/ui/package.json +++ b/contrib/views/slider/src/main/resources/ui/package.json @@ -20,18 +20,19 @@ "update:skeleton": "node setup.js update:skeleton" }, "dependencies": { -"javascript-brunch": "~1.7.0", -"less-brunch":">= 1.0 < 1.5", -"css-brunch": "~1.7.0", -"stylus-brunch": "~1.7.0", -"uglify-js-brunch": "~1.7.0", -"clean-css-brunch": "~1.7.0", -"ember-handlebars-brunch": "git://github.com/fuseelements/ember-handlebars-brunch#fix/ember-1.3.0" +"clean-css-brunch": ">= 1.0 < 1.8", +"coffee-script-brunch": ">= 1.0 < 1.8", +"css-brunch": ">= 1.0 < 1.8", +"ember-handlebars-brunch": "git://github.com/fuseelements/ember-handlebars-brunch#fix/ember-1.3.0", +"handlebars": "^4.0.10", +"javascript-brunch": ">= 1.0 < 1.8", +"stylus-brunch": ">= 1.0 < 1.8", +"uglify-js-brunch": ">= 1.0 < 1.8" }, "devDependencies": { -"phantomjs": "^1.9.2", "karma": "*", +"karma-phantomjs-launcher": "~0.1.2", "karma-qunit": "*", -"karma-phantomjs-launcher": "~0.1.2" +"phantomjs": "^1.9.2" } }
ambari git commit: AMBARI-21251-Update Zeppelin version on Ambari from 0.7.0 to 0.7.2(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 b201accc6 -> 8cfdf91b9 AMBARI-21251-Update Zeppelin version on Ambari from 0.7.0 to 0.7.2(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8cfdf91b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8cfdf91b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8cfdf91b Branch: refs/heads/branch-2.5 Commit: 8cfdf91b95c9ef80fdc3d74dfc946f32e44016cd Parents: b201acc Author: Venkata SairamAuthored: Fri Jun 16 12:03:37 2017 +0530 Committer: Venkata Sairam Committed: Fri Jun 16 12:03:37 2017 +0530 -- .../main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/8cfdf91b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml index 2e2996b..d4292c8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml @@ -21,7 +21,7 @@ ZEPPELIN - 0.7.0 + 0.7.2
ambari git commit: AMBARI-21251-Update Zeppelin version on Ambari from 0.7.0 to 0.7.2(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 43a88e79a -> c52faea36 AMBARI-21251-Update Zeppelin version on Ambari from 0.7.0 to 0.7.2(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c52faea3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c52faea3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c52faea3 Branch: refs/heads/trunk Commit: c52faea36d7eca29cab23a3fccd1afdf00b4c85d Parents: 43a88e7 Author: Venkata SairamAuthored: Fri Jun 16 11:52:26 2017 +0530 Committer: Venkata Sairam Committed: Fri Jun 16 11:52:26 2017 +0530 -- .../main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml | 2 +- .../main/resources/stacks/HDP/3.0/services/ZEPPELIN/metainfo.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c52faea3/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml index 2e2996b..d4292c8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/ZEPPELIN/metainfo.xml @@ -21,7 +21,7 @@ ZEPPELIN - 0.7.0 + 0.7.2 http://git-wip-us.apache.org/repos/asf/ambari/blob/c52faea3/ambari-server/src/main/resources/stacks/HDP/3.0/services/ZEPPELIN/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/3.0/services/ZEPPELIN/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/3.0/services/ZEPPELIN/metainfo.xml index 5e6c6b6..f810d1a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/3.0/services/ZEPPELIN/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/HDP/3.0/services/ZEPPELIN/metainfo.xml @@ -20,7 +20,7 @@ ZEPPELIN -0.6.0.3.0 +0.7.2.3.0 common-services/ZEPPELIN/0.6.0.3.0
ambari git commit: AMBARI-21243.Improve Zeppelin startup time(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/branch-2.5 5d511d858 -> b201accc6 AMBARI-21243.Improve Zeppelin startup time(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b201accc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b201accc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b201accc Branch: refs/heads/branch-2.5 Commit: b201accc602b39342a83b7c7292e248d8b60aff6 Parents: 5d511d8 Author: Venkata SairamAuthored: Fri Jun 16 11:47:31 2017 +0530 Committer: Venkata Sairam Committed: Fri Jun 16 11:49:19 2017 +0530 -- .../scripts/interpreter_json_template.py| 361 +++ .../0.6.0.2.5/package/scripts/master.py | 17 +- 2 files changed, 368 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b201accc/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/interpreter_json_template.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/interpreter_json_template.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/interpreter_json_template.py new file mode 100644 index 000..6a98919 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/interpreter_json_template.py @@ -0,0 +1,361 @@ +#!/usr/bin/env python +""" +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +""" + +template = ''' +{ + "interpreterSettings": { +"2CKEKWY8Z": { + "id": "2CKEKWY8Z", + "name": "angular", + "group": "angular", + "properties": {}, + "status": "READY", + "interpreterGroup": [ +{ + "name": "angular", + "class": "org.apache.zeppelin.angular.AngularInterpreter", + "defaultInterpreter": false, + "editor": { +"editOnDblClick": true + } +} + ], + "dependencies": [], + "option": { +"remote": true, +"port": -1, +"perNote": "shared", +"perUser": "shared", +"isExistingProcess": false, +"setPermission": false, +"users": [], +"isUserImpersonate": false + } +}, +"2CKX8WPU1": { + "id": "2CKX8WPU1", + "name": "spark", + "group": "spark", + "properties": { +"spark.executor.memory": "512m", +"args": "", +"zeppelin.spark.printREPLOutput": "true", +"spark.cores.max": "", +"zeppelin.dep.additionalRemoteRepository": "spark-packages,http://dl.bintray.com/spark-packages/maven,false;;, +"zeppelin.spark.sql.stacktrace": "false", +"zeppelin.spark.importImplicit": "true", +"zeppelin.spark.concurrentSQL": "false", +"zeppelin.spark.useHiveContext": "true", +"zeppelin.pyspark.python": "python", +"zeppelin.dep.localrepo": "local-repo", +"zeppelin.R.knitr": "true", +"zeppelin.spark.maxResult": "1000", +"master": "yarn-client", +"spark.app.name": "Zeppelin", +"zeppelin.R.image.width": "100%", +"zeppelin.R.render.options": "out.format \u003d \u0027html\u0027, comment \u003d NA, echo \u003d FALSE, results \u003d \u0027asis\u0027, message \u003d F, warning \u003d F", +"zeppelin.R.cmd": "R" + }, + "status": "READY", + "interpreterGroup": [ +{ + "name": "spark", + "class": "org.apache.zeppelin.spark.SparkInterpreter", + "defaultInterpreter": true, + "editor": { +"language": "scala" + } +}, +{ + "name": "sql", + "class": "org.apache.zeppelin.spark.SparkSqlInterpreter", + "defaultInterpreter": false, + "editor": { +"language": "sql" + } +}, +{ + "name": "dep", + "class":
ambari git commit: AMBARI-21243.Improve Zeppelin startup time(Prabhjyot Singh via Venkata Sairam)
Repository: ambari Updated Branches: refs/heads/trunk 8873e9928 -> 43a88e79a AMBARI-21243.Improve Zeppelin startup time(Prabhjyot Singh via Venkata Sairam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/43a88e79 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/43a88e79 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/43a88e79 Branch: refs/heads/trunk Commit: 43a88e79aca9a4dfa708aaae0797a8fb8bf297c3 Parents: 8873e99 Author: Venkata SairamAuthored: Fri Jun 16 11:47:31 2017 +0530 Committer: Venkata Sairam Committed: Fri Jun 16 11:48:09 2017 +0530 -- .../scripts/interpreter_json_template.py| 361 +++ .../0.6.0.2.5/package/scripts/master.py | 17 +- 2 files changed, 368 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/43a88e79/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/interpreter_json_template.py -- diff --git a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/interpreter_json_template.py b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/interpreter_json_template.py new file mode 100644 index 000..6a98919 --- /dev/null +++ b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.6.0.2.5/package/scripts/interpreter_json_template.py @@ -0,0 +1,361 @@ +#!/usr/bin/env python +""" +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +""" + +template = ''' +{ + "interpreterSettings": { +"2CKEKWY8Z": { + "id": "2CKEKWY8Z", + "name": "angular", + "group": "angular", + "properties": {}, + "status": "READY", + "interpreterGroup": [ +{ + "name": "angular", + "class": "org.apache.zeppelin.angular.AngularInterpreter", + "defaultInterpreter": false, + "editor": { +"editOnDblClick": true + } +} + ], + "dependencies": [], + "option": { +"remote": true, +"port": -1, +"perNote": "shared", +"perUser": "shared", +"isExistingProcess": false, +"setPermission": false, +"users": [], +"isUserImpersonate": false + } +}, +"2CKX8WPU1": { + "id": "2CKX8WPU1", + "name": "spark", + "group": "spark", + "properties": { +"spark.executor.memory": "512m", +"args": "", +"zeppelin.spark.printREPLOutput": "true", +"spark.cores.max": "", +"zeppelin.dep.additionalRemoteRepository": "spark-packages,http://dl.bintray.com/spark-packages/maven,false;;, +"zeppelin.spark.sql.stacktrace": "false", +"zeppelin.spark.importImplicit": "true", +"zeppelin.spark.concurrentSQL": "false", +"zeppelin.spark.useHiveContext": "true", +"zeppelin.pyspark.python": "python", +"zeppelin.dep.localrepo": "local-repo", +"zeppelin.R.knitr": "true", +"zeppelin.spark.maxResult": "1000", +"master": "yarn-client", +"spark.app.name": "Zeppelin", +"zeppelin.R.image.width": "100%", +"zeppelin.R.render.options": "out.format \u003d \u0027html\u0027, comment \u003d NA, echo \u003d FALSE, results \u003d \u0027asis\u0027, message \u003d F, warning \u003d F", +"zeppelin.R.cmd": "R" + }, + "status": "READY", + "interpreterGroup": [ +{ + "name": "spark", + "class": "org.apache.zeppelin.spark.SparkInterpreter", + "defaultInterpreter": true, + "editor": { +"language": "scala" + } +}, +{ + "name": "sql", + "class": "org.apache.zeppelin.spark.SparkSqlInterpreter", + "defaultInterpreter": false, + "editor": { +"language": "sql" + } +}, +{ + "name": "dep", + "class":