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-2.6 Commit: 5efb92dc1c27724b8c247d6bd28d003084173297 Parents: e33a274 0ea9e97 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Wed Aug 9 11:13:52 2017 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> 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 +- .../views/common/configs/config_history_flow.js | 4 +- .../views/main/dashboard/config_history_view.js | 2 +- ambari-web/test/utils/helper_test.js | 5 + 77 files changed, 302 insertions(+), 9673 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5efb92dc/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5efb92dc/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5efb92dc/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5efb92dc/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5efb92dc/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5efb92dc/ambari-web/test/utils/helper_test.js ----------------------------------------------------------------------
