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 2016/02/24 16:08:12 UTC
[25/50] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1809161e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1809161e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1809161e
Branch: refs/heads/trunk
Commit: 1809161eb5914c7905745911cecea4d9da7a3f26
Parents: 2a9f49c 96bdecf
Author: Nate Cole <nc...@hortonworks.com>
Authored: Thu Feb 11 08:46:52 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Thu Feb 11 08:46:52 2016 -0500
----------------------------------------------------------------------
.../main/python/ambari_agent/RecoveryManager.py | 41 ++---
.../test/python/ambari_agent/TestActionQueue.py | 2 +-
.../python/ambari_agent/TestRecoveryManager.py | 88 +++++-----
.../src/main/python/ambari_commons/os_check.py | 73 ++++++---
.../ambari_commons/resources/os_family.json | 137 ++++++++--------
.../libraries/functions/package_conditions.py | 7 +-
ambari-funtest/pom.xml | 5 -
.../2.1.1/services/AMBARI_METRICS/metainfo.xml | 2 +-
ambari-metrics/ambari-metrics-grafana/README.md | 20 +++
.../ambari-metrics/datasource.js | 127 +++++++--------
.../ambari-metrics/partials/query.editor.html | 6 +-
ambari-metrics/ambari-metrics-grafana/pom.xml | 16 +-
.../screenshots/20-templating.png | Bin 0 -> 694376 bytes
.../timeline/HBaseTimelineMetricStore.java | 18 ++-
.../metrics/timeline/PhoenixHBaseAccessor.java | 21 ++-
.../timeline/TimelineMetricConfiguration.java | 10 ++
ambari-metrics/pom.xml | 1 -
ambari-project/pom.xml | 2 +-
ambari-server/pom.xml | 5 -
.../ambari/server/agent/HeartBeatHandler.java | 39 ++++-
.../ambari/server/agent/RecoveryConfig.java | 18 +--
.../dispatchers/AlertScriptDispatcher.java | 18 ++-
.../services/AlertNoticeDispatchService.java | 2 +-
.../state/services/CachedAlertFlushService.java | 2 +-
.../server/state/stack/JsonOsFamilyRoot.java | 38 +++++
.../ambari/server/state/stack/OsFamily.java | 8 +-
.../server/upgrade/UpgradeCatalog222.java | 116 ++++++++++++-
.../1.6.1.2.2.0/configuration/accumulo-site.xml | 2 +
.../0.1.0/configuration/ams-site.xml | 37 +++--
.../AMBARI_METRICS/0.1.0/metainfo.xml | 2 +
.../0.1.0/package/scripts/metrics_collector.py | 4 +-
.../0.1.0/package/scripts/metrics_grafana.py | 5 +-
.../package/scripts/metrics_grafana_util.py | 6 +-
.../0.1.0/package/scripts/metrics_monitor.py | 2 +-
.../metrics_grafana_datasource.json.j2 | 2 +-
.../configuration/application-properties.xml | 1 +
.../configuration/falcon-startup.properties.xml | 1 +
.../common-services/HAWQ/2.0.0/metainfo.xml | 10 ++
.../2.0.0/package/scripts/hawq_constants.py | 1 +
.../HAWQ/2.0.0/package/scripts/hawqstandby.py | 6 +-
.../0.96.0.2.0/configuration/hbase-site.xml | 1 +
.../HDFS/2.1.0.2.0/configuration/core-site.xml | 1 +
.../HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 3 +
.../HIVE/0.12.0.2.0/configuration/hive-site.xml | 3 +
.../0.12.0.2.0/configuration/webhcat-site.xml | 1 +
.../0.8.1.2.2/configuration/kafka-broker.xml | 2 +
.../ranger-knox-plugin-properties.xml | 1 +
.../4.0.0.2.0/configuration/oozie-site.xml | 1 +
.../4.2.0.2.3/configuration/oozie-site.xml | 1 +
.../RANGER/0.4.0/configuration/ranger-env.xml | 1 +
.../0.5.0.2.3/configuration/kms-site.xml | 1 +
.../0.9.1.2.1/configuration/storm-site.xml | 1 +
.../configuration-mapred/mapred-site.xml | 2 +
.../YARN/2.1.0.2.0/configuration/yarn-site.xml | 8 +
.../stacks/HDP/2.0.6/services/stack_advisor.py | 5 +-
.../services/HIVE/configuration/hive-site.xml | 2 +
.../services/OOZIE/configuration/oozie-site.xml | 1 +
.../services/YARN/configuration/yarn-site.xml | 3 +
.../resources/stacks/HDP/2.2/repos/repoinfo.xml | 12 --
.../ranger-hbase-plugin-properties.xml | 1 +
.../ranger-hdfs-plugin-properties.xml | 4 +-
.../services/HIVE/configuration/hive-env.xml | 20 ---
.../services/HIVE/configuration/hive-site.xml | 18 +--
.../ranger-hive-plugin-properties.xml | 1 +
.../ranger-storm-plugin-properties.xml | 1 +
.../services/YARN/configuration/yarn-site.xml | 2 +
.../stacks/HDP/2.2/services/stack_advisor.py | 13 +-
.../resources/stacks/HDP/2.3/repos/repoinfo.xml | 12 --
.../KAFKA/configuration/kafka-broker.xml | 1 +
.../ranger-kafka-plugin-properties.xml | 1 +
.../RANGER/configuration/ranger-env.xml | 2 +
.../services/STORM/configuration/storm-site.xml | 2 +
.../resources/stacks/HDP/2.4/repos/repoinfo.xml | 12 --
.../services/HIVE/configuration/hive-env.xml | 20 ---
.../services/HIVE/configuration/hive-site.xml | 8 -
.../stacks/HDPWIN/2.2/services/stack_advisor.py | 13 +-
.../server/agent/TestHeartbeatHandler.java | 78 ++++++++-
.../dispatchers/AlertScriptDispatcherTest.java | 61 +++++++
.../server/upgrade/UpgradeCatalog222Test.java | 21 ++-
ambari-server/src/test/python/TestOSCheck.py | 37 +++--
.../2.1/configs/hive-metastore-upgrade.json | 3 +-
.../stacks/2.2/common/test_stack_advisor.py | 17 +-
.../2.3/common/services-sparkts-hive.json | 47 ------
.../stacks/2.3/common/test_stack_advisor.py | 5 +-
.../main/admin/service_auto_start.js | 161 ++++++++++++++++++-
.../manage_alert_notifications_controller.js | 74 ++++-----
ambari-web/app/messages.js | 1 +
.../app/mixins/common/widgets/widget_mixin.js | 49 +++++-
ambari-web/app/routes/main.js | 13 +-
ambari-web/app/styles/application.less | 10 ++
.../templates/main/admin/service_auto_start.hbs | 46 +++++-
.../service_auto_start/component_auto_start.hbs | 19 +++
.../app/templates/main/host/log_metrics.hbs | 26 +++
ambari-web/app/templates/main/host/summary.hbs | 24 ++-
ambari-web/app/utils/ajax/ajax.js | 21 +++
ambari-web/app/utils/ember_reopen.js | 46 ++++++
ambari-web/app/views.js | 2 +
ambari-web/app/views/common/chart/pie.js | 11 +-
.../views/common/widget/graph_widget_view.js | 4 +-
.../app/views/main/admin/service_auto_start.js | 14 +-
.../service_auto_start/component_auto_start.js | 57 +++++++
.../views/main/dashboard/cluster_metrics/cpu.js | 10 +-
ambari-web/app/views/main/host/log_metrics.js | 141 ++++++++++++++++
ambari-web/app/views/main/host/logs_view.js | 12 ++
...anage_alert_notifications_controller_test.js | 121 ++++++--------
.../test/mixins/common/widget_mixin_test.js | 124 ++++++++++++++
ambari-web/test/utils/ember_reopen_test.js | 57 +++++++
.../views/common/log_file_search_view_test.js | 3 +-
108 files changed, 1732 insertions(+), 665 deletions(-)
----------------------------------------------------------------------