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/09/30 16:01:38 UTC
[14/14] 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/806723e0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/806723e0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/806723e0
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 806723e0efdf8e2e677c18e0989e53e446a1669f
Parents: 71c4c17 324107d
Author: Nate Cole <nc...@hortonworks.com>
Authored: Fri Sep 30 12:00:44 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Sep 30 12:00:44 2016 -0400
----------------------------------------------------------------------
.../ambari/logfeeder/LogFeederAMSClient.java | 9 +-
.../logsearch/solr/metrics/SolrAmsClient.java | 9 +-
.../timeline/AbstractTimelineMetricsSink.java | 59 +-
.../availability/MetricCollectorHATest.java | 22 +-
.../cache/HandleConnectExceptionTest.java | 12 +-
.../sink/flume/FlumeTimelineMetricsSink.java | 14 +-
.../timeline/HadoopTimelineMetricsSink.java | 27 +-
.../timeline/HadoopTimelineMetricsSinkTest.java | 12 +-
.../kafka/KafkaTimelineMetricsReporter.java | 14 +-
.../storm/StormTimelineMetricsReporter.java | 14 +-
.../sink/storm/StormTimelineMetricsSink.java | 15 +-
.../storm/StormTimelineMetricsReporter.java | 13 +-
.../sink/storm/StormTimelineMetricsSink.java | 15 +-
.../system/impl/AmbariMetricSinkImpl.java | 12 +-
.../org/apache/ambari/server/state/Alert.java | 7 +-
.../1.6.1.2.2.0/package/scripts/params.py | 5 -
.../hadoop-metrics2-accumulo.properties.j2 | 12 +-
.../default/grafana-ams-hbase-home.json | 2558 +++++
.../default/grafana-ams-hbase-misc.json | 1680 ++++
.../grafana-ams-hbase-regionservers.json | 9063 ++++++++++++++++++
.../hadoop-metrics2-hbase.properties.j2 | 14 +-
.../FLUME/1.4.0.2.0/package/scripts/flume.py | 1 +
.../FLUME/1.4.0.2.0/package/scripts/params.py | 7 -
.../templates/flume-metrics2.properties.j2 | 2 +-
.../0.96.0.2.0/package/scripts/params_linux.py | 12 -
...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 15 +-
...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 15 +-
.../hadoop-metrics2.properties.xml | 18 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 5 -
.../hadoop-metrics2-hivemetastore.properties.j2 | 3 +-
.../hadoop-metrics2-hiveserver2.properties.j2 | 4 +-
.../templates/hadoop-metrics2-llapdaemon.j2 | 3 +-
.../hadoop-metrics2-llaptaskscheduler.j2 | 3 +-
.../KAFKA/0.8.1/configuration/kafka-broker.xml | 2 +-
.../KAFKA/0.8.1/package/scripts/kafka.py | 2 +-
.../KAFKA/0.8.1/package/scripts/params.py | 7 -
.../common-services/KAFKA/0.9.0/widgets.json | 18 +-
.../STORM/0.9.1/package/scripts/params_linux.py | 11 -
.../0.9.1/package/templates/config.yaml.j2 | 6 +-
.../templates/storm-metrics2.properties.j2 | 2 +-
.../2.0.6/hooks/before-START/scripts/params.py | 7 -
.../templates/hadoop-metrics2.properties.j2 | 18 +-
.../stacks/HDP/2.0.6/services/stack_advisor.py | 10 +-
.../ConfigGroupResourceProviderTest.java | 229 +-
.../apache/ambari/server/state/AlertTest.java | 53 +
.../service/manage_config_groups_controller.js | 2 +-
.../configs/config_recommendation_parser.js | 2 +-
ambari-web/app/utils/hosts.js | 2 +-
.../configs/service_configs_by_category_view.js | 535 +-
.../config_recommendation_parser_test.js | 4 +-
.../service_configs_by_category_view_test.js | 7 +-
51 files changed, 14054 insertions(+), 537 deletions(-)
----------------------------------------------------------------------