[21/21] ambari git commit: Merge branch 'branch-2.6' into branch-feature-AMBARI-21450
Merge branch 'branch-2.6' into branch-feature-AMBARI-21450 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99484dcc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99484dcc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99484dcc Branch: refs/heads/branch-2.6 Commit: 99484dccd21395cd1dc0ce0cf71ccebce83b0c86 Parents: ba15d80 4cc8976 Author: Jonathan Hurley Authored: Thu Aug 17 14:30:54 2017 -0400 Committer: Jonathan Hurley Committed: Thu Aug 17 14:30:54 2017 -0400 -- .../python/ambari_agent/alerts/base_alert.py| 15 +- .../python/ambari_agent/alerts/web_alert.py |4 + .../src/test/python/ambari_agent/TestAlerts.py | 19 +- .../resource_management/TestPackagesAnalyzer.py | 141 ++ .../libraries/functions/packages_analyzer.py| 356 + .../libraries/script/script.py |1 + ambari-project/pom.xml |1 + ambari-server/pom.xml |2 +- .../apache/ambari/server/orm/DBAccessor.java| 36 +- .../ambari/server/orm/DBAccessorImpl.java | 90 +- .../server/orm/helpers/dbms/DbmsHelper.java | 20 - .../orm/helpers/dbms/GenericDbmsHelper.java | 11 - .../server/orm/helpers/dbms/H2Helper.java | 13 - .../server/orm/helpers/dbms/MySqlHelper.java| 13 - .../server/orm/helpers/dbms/OracleHelper.java | 12 - .../server/orm/helpers/dbms/PostgresHelper.java | 12 - .../ambari/server/state/alert/AlertUri.java | 16 + .../ambari/server/topology/AmbariContext.java | 39 +- .../server/upgrade/UpgradeCatalog260.java | 169 +-- .../main/resources/Ambari-DDL-Derby-CREATE.sql |8 +- .../main/resources/Ambari-DDL-MySQL-CREATE.sql |5 +- .../main/resources/Ambari-DDL-Oracle-CREATE.sql |5 +- .../resources/Ambari-DDL-Postgres-CREATE.sql|2 +- .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |5 +- .../resources/Ambari-DDL-SQLServer-CREATE.sql | 12 +- .../STORM/1.1.0/configuration/storm-env.xml | 54 + .../STORM/1.1.0/configuration/storm-site.xml| 48 - .../2.1.0.2.0/package/scripts/params_linux.py |5 +- .../YARN/2.1.0.2.0/package/scripts/yarn.py | 14 +- .../4.2.5/upgrades/config-upgrade.xml |4 + .../upgrades/nonrolling-upgrade-to-hdp-2.6.xml |4 + .../stacks/HDP/2.3/upgrades/config-upgrade.xml |7 + .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |4 + .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |1 + .../stacks/HDP/2.4/upgrades/config-upgrade.xml |7 + .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |4 + .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |2 + .../stacks/HDP/2.5/upgrades/config-upgrade.xml |7 + .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |4 + .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |1 + .../stacks/HDP/2.6/services/stack_advisor.py| 87 +- .../stacks/HDP/2.6/upgrades/config-upgrade.xml |6 + .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |4 + .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml |1 + .../src/main/resources/stacks/stack_advisor.py | 18 + .../ambari/server/orm/DBAccessorImplTest.java | 88 ++ .../apache/ambari/server/orm/db/DDLTests.java | 39 +- .../server/testing/DBInconsistencyTests.java| 20 +- .../server/topology/AmbariContextTest.java | 92 +- .../server/upgrade/UpgradeCatalog260Test.java | 468 +++ .../stacks/2.0.6/YARN/test_resourcemanager.py | 160 ++- .../default_yarn_include_file_dont_manage.json | 1260 ++ .../default_yarn_include_file_manage.json | 1260 ++ .../secured_yarn_include_file_dont_manage.json | 1078 +++ .../secured_yarn_include_file_manage.json | 1078 +++ ambari-web/app/controllers/installer.js |3 - ambari-web/app/mappers/hosts_mapper.js |2 + .../app/mixins/common/widgets/widget_mixin.js |2 +- ambari-web/app/models/host.js |2 + ambari-web/app/views/main/host.js | 10 + .../YARN/package/scripts/params_linux.py|5 +- .../2.0/services/YARN/package/scripts/yarn.py | 16 +- pom.xml |2 +- 63 files changed, 6537 insertions(+), 337 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/99484dcc/ambari-common/src/main/python/resource_management/libraries/script/script.py --
[21/21] ambari git commit: Merge branch 'branch-2.6' into branch-feature-AMBARI-21450
Merge branch 'branch-2.6' into branch-feature-AMBARI-21450 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5efb92dc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5efb92dc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5efb92dc Branch: refs/heads/branch-feature-AMBARI-21450 Commit: 5efb92dc1c27724b8c247d6bd28d003084173297 Parents: e33a274 0ea9e97 Author: Jonathan Hurley Authored: Wed Aug 9 11:13:52 2017 -0400 Committer: Jonathan Hurley Committed: Wed Aug 9 11:13:52 2017 -0400 -- .../AmbariCustomCommandExecutionHelper.java | 11 +- .../AmbariManagementControllerImpl.java |4 +- .../DRUID/0.9.2/package/scripts/druid.py|6 + .../DRUID/0.9.2/package/scripts/params.py | 13 + .../scripts/alerts/alert_spark_thrift_port.py |5 +- .../scripts/alerts/alert_spark2_thrift_port.py |5 +- .../4.2.5/upgrades/config-upgrade.xml | 11 + .../upgrades/nonrolling-upgrade-to-hdp-2.6.xml |4 + .../4.2/services/AMBARI_METRICS/alerts.json | 158 -- .../AMBARI_METRICS/configuration/ams-env.xml| 114 - .../configuration/ams-grafana-env.xml | 93 - .../configuration/ams-grafana-ini.xml | 320 --- .../configuration/ams-hbase-env.xml | 245 -- .../configuration/ams-hbase-log4j.xml | 147 -- .../configuration/ams-hbase-policy.xml | 56 - .../configuration/ams-hbase-security-site.xml | 167 -- .../configuration/ams-hbase-site.xml| 489 .../AMBARI_METRICS/configuration/ams-log4j.xml | 66 - .../AMBARI_METRICS/configuration/ams-site.xml | 723 - .../configuration/ams-ssl-client.xml| 51 - .../configuration/ams-ssl-server.xml| 80 - .../4.2/services/AMBARI_METRICS/kerberos.json | 122 - .../4.2/services/AMBARI_METRICS/metainfo.xml| 156 +- .../4.2/services/AMBARI_METRICS/metrics.json| 2472 -- .../alerts/alert_ambari_metrics_monitor.py | 104 - .../package/files/hbaseSmokeVerify.sh | 34 - .../files/service-metrics/AMBARI_METRICS.txt| 245 -- .../package/files/service-metrics/FLUME.txt | 17 - .../package/files/service-metrics/HBASE.txt | 588 - .../package/files/service-metrics/HDFS.txt | 277 -- .../package/files/service-metrics/HOST.txt | 37 - .../package/files/service-metrics/KAFKA.txt | 190 -- .../package/files/service-metrics/STORM.txt |7 - .../package/files/service-metrics/YARN.txt | 178 -- .../AMBARI_METRICS/package/scripts/__init__.py | 19 - .../AMBARI_METRICS/package/scripts/ams.py | 388 --- .../package/scripts/ams_service.py | 103 - .../AMBARI_METRICS/package/scripts/functions.py | 51 - .../AMBARI_METRICS/package/scripts/hbase.py | 267 -- .../package/scripts/hbase_master.py | 70 - .../package/scripts/hbase_regionserver.py | 66 - .../package/scripts/hbase_service.py| 53 - .../package/scripts/metrics_collector.py| 133 - .../package/scripts/metrics_monitor.py | 59 - .../AMBARI_METRICS/package/scripts/params.py| 257 -- .../package/scripts/params_linux.py | 50 - .../package/scripts/params_windows.py | 53 - .../package/scripts/service_check.py| 166 -- .../package/scripts/service_mapping.py | 22 - .../package/scripts/split_points.py | 236 -- .../AMBARI_METRICS/package/scripts/status.py| 46 - .../package/scripts/status_params.py| 39 - .../package/templates/ams.conf.j2 | 35 - .../templates/ams_collector_jaas.conf.j2| 26 - .../templates/ams_zookeeper_jaas.conf.j2| 26 - .../hadoop-metrics2-hbase.properties.j2 | 63 - .../package/templates/hbase_client_jaas.conf.j2 | 23 - .../templates/hbase_grant_permissions.j2| 39 - .../package/templates/hbase_master_jaas.conf.j2 | 26 - .../templates/hbase_regionserver_jaas.conf.j2 | 26 - .../package/templates/metric_groups.conf.j2 | 37 - .../package/templates/metric_monitor.ini.j2 | 31 - .../package/templates/regionservers.j2 | 20 - .../package/templates/smoketest_metrics.json.j2 | 15 - .../BigInsights/4.2/services/HDFS/widgets.json | 209 +- .../BigInsights/4.2/upgrades/config-upgrade.xml | 11 + .../upgrades/nonrolling-upgrade-to-hdp-2.6.xml |4 + .../2.0.6/hooks/before-START/scripts/params.py | 10 +- .../HDP/2.6/services/SPARK2/kerberos.json |2 +- .../AmbariManagementControllerTest.java |4 +- .../main/host/bulk_operations_controller.js |2 +- ambari-web/app/controllers/main/host/details.js | 69 + .../mixins/common/table_server_view_mixin.js|2 +- ambari-web/app/utils/helper.js | 11 +-
