You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/04/27 20:20:22 UTC
[35/50] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-12556
Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/353cd9df
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/353cd9df
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/353cd9df
Branch: refs/heads/trunk
Commit: 353cd9dfd0132356305902fa0d58980eb4749a84
Parents: 4527aa1 9d38b66
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Mon Mar 6 13:36:01 2017 -0500
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Mon Mar 6 13:36:01 2017 -0500
----------------------------------------------------------------------
.../resources/ui/admin-web/app/styles/main.css | 38 +-
.../app/views/ambariViews/listTable.html | 2 +-
.../app/views/ambariViews/listUrls.html | 2 +-
.../metrics/loadsimulator/LoadRunner.java | 13 +-
.../loadsimulator/MetricsLoadSimulator.java | 2 +
.../metrics/loadsimulator/data/AppID.java | 4 +-
.../timeline/TimelineMetricConfiguration.java | 3 +
.../metrics/timeline/TimelineMetricsFilter.java | 31 +-
.../main/resources/metrics_def/AMS-HBASE.dat | 257 +++-
.../src/main/resources/metrics_def/DATANODE.dat | 262 ++--
.../resources/metrics_def/FLUME_HANDLER.dat | 57 +-
.../resources/metrics_def/HIVEMETASTORE.dat | 181 +++
.../main/resources/metrics_def/HIVESERVER2.dat | 117 ++
.../src/main/resources/metrics_def/HOST.dat | 31 +
.../src/main/resources/metrics_def/NAMENODE.dat | 335 ++++-
.../main/resources/metrics_def/NODEMANAGER.dat | 16 +
.../resources/metrics_def/RESOURCEMANAGER.dat | 247 ++--
.../jmetertest/AMSJMeterLoadTest.java | 34 +-
.../timeline/TimelineMetricsFilterTest.java | 70 +
.../src/test/resources/loadsimulator/README | 2 +-
.../loadsimulator/ams-jmeter.properties | 8 +-
.../resources/test_data/metric_whitelist.dat | 2 +
.../internal/AbstractProviderModule.java | 21 +-
.../dispatchers/AlertScriptDispatcher.java | 7 +-
.../services/AlertNoticeDispatchService.java | 8 +
.../server/upgrade/UpgradeCatalog250.java | 57 +
.../package/files/service-metrics/FLUME.txt | 14 +-
.../package/files/service-metrics/HDFS.txt | 157 ++-
.../package/files/service-metrics/HIVE.txt | 181 +++
.../package/files/service-metrics/HOST.txt | 36 +-
.../package/files/service-metrics/KAFKA.txt | 1244 +++++++++++++++---
.../0.9.2/configuration/druid-superset-env.xml | 4 +-
.../0.5.0.2.1/configuration/falcon-env.xml | 2 +-
.../HBASE/0.96.0.2.0/alerts.json | 4 +-
.../2.1.0.2.0/package/scripts/hdfs_rebalance.py | 32 +-
.../HDFS/2.1.0.2.0/package/scripts/namenode.py | 14 +-
.../3.0.0.3.0/package/scripts/hdfs_rebalance.py | 28 +-
.../HDFS/3.0.0.3.0/package/scripts/namenode.py | 14 +-
.../HIVE/0.12.0.2.0/configuration/hive-env.xml | 2 +-
.../package/scripts/hive_interactive.py | 7 +
.../SQOOP/1.4.4.2.0/configuration/sqoop-env.xml | 2 +-
.../STORM/0.10.0/configuration/storm-env.xml | 2 +-
.../STORM/0.9.1/package/scripts/params_linux.py | 2 +
.../STORM/0.9.1/package/scripts/storm.py | 7 +
.../YARN/2.1.0.2.0/configuration/yarn-site.xml | 2 +-
.../0.6.0.2.5/configuration/zeppelin-env.xml | 2 +-
.../0.6.0.2.5/package/scripts/master.py | 36 +-
.../0.6.0.2.5/package/scripts/params.py | 8 +
.../services/YARN/configuration/yarn-site.xml | 2 +-
.../services/YARN/configuration/yarn-site.xml | 2 +-
.../services/YARN/configuration/yarn-site.xml | 2 +-
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 5 +
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 6 +
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 +
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 5 +
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 6 +
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 +
.../configuration/application-properties.xml | 42 +
.../services/HIVE/configuration/hive-log4j2.xml | 2 +-
.../HIVE/configuration/llap-cli-log4j2.xml | 2 +-
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 10 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml | 6 +
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 12 +
.../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 6 +
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 2 +
.../configuration/application-properties.xml | 3 +-
.../HIVE/configuration/tez-interactive-site.xml | 8 +
.../services/YARN/configuration/yarn-site.xml | 28 +
.../internal/JMXHostProviderTest.java | 33 +
.../dispatchers/AlertScriptDispatcherTest.java | 28 +-
.../server/upgrade/UpgradeCatalog250Test.java | 1077 ++++++++-------
.../python/stacks/2.0.6/HDFS/test_namenode.py | 19 +-
.../stacks/2.0.6/common/test_stack_advisor.py | 8 +-
.../python/stacks/2.1/STORM/test_storm_base.py | 12 +
.../stacks/2.2/common/test_stack_advisor.py | 26 +-
.../stacks/2.5/HIVE/test_hive_server_int.py | 15 +-
.../stacks/2.5/ZEPPELIN/test_zeppelin_master.py | 26 +-
.../2.5/configs/hsi_default_for_restart.json | 1 +
ambari-web/app/assets/test/tests.js | 1 +
ambari-web/app/routes/main.js | 78 ++
ambari-web/app/routes/view.js | 5 +
ambari-web/app/routes/views.js | 7 +
ambari-web/app/styles/common.less | 4 +-
ambari-web/app/styles/log_file_search.less | 3 -
ambari-web/app/templates/application.hbs | 8 +-
ambari-web/app/templates/common/breadcrumbs.hbs | 24 +
.../templates/common/host_progress_popup.hbs | 8 +-
ambari-web/app/views.js | 1 +
ambari-web/app/views/application.js | 106 +-
ambari-web/app/views/common/breadcrumbs_view.js | 190 +++
.../common/host_progress_popup_body_view.js | 19 +-
ambari-web/app/views/common/modal_popup.js | 11 +-
.../test/controllers/main/service/item_test.js | 19 +-
.../test/views/common/breadcrumbs_view_test.js | 37 +
.../ui/app/components/visual-explain.js | 11 +-
.../resources/ui/app/routes/queries/query.js | 1 +
.../ui/app/utils/hive-explainer/fallback.js | 3 +-
.../ui/app/utils/hive-explainer/index.js | 5 +-
.../ui/app/utils/hive-explainer/processor.js | 1 -
.../ui/app/utils/hive-explainer/renderer.js | 18 +-
.../ui/app/utils/hive-explainer/transformer.js | 75 +-
.../ui/app/components/bundle-config.js | 17 -
.../resources/ui/app/components/coord-config.js | 17 -
.../ui/app/components/flow-designer.js | 13 -
.../resources/ui/app/components/job-config.js | 2 -
.../main/resources/ui/app/components/save-wf.js | 2 -
.../app/templates/components/bundle-config.hbs | 11 +-
.../app/templates/components/coord-config.hbs | 11 +-
.../app/templates/components/flow-designer.hbs | 15 +-
109 files changed, 4263 insertions(+), 1463 deletions(-)
----------------------------------------------------------------------