Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 50445200BA5 for ; Wed, 19 Oct 2016 18:08:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4F3A6160B0C; Wed, 19 Oct 2016 16:08:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 83BE6160ADC for ; Wed, 19 Oct 2016 18:08:16 +0200 (CEST) Received: (qmail 82029 invoked by uid 500); 19 Oct 2016 16:08:15 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 81570 invoked by uid 99); 19 Oct 2016 16:08:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Oct 2016 16:08:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8F437E69AC; Wed, 19 Oct 2016 16:08:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jonathanhurley@apache.org To: commits@ambari.apache.org Date: Wed, 19 Oct 2016 16:08:20 -0000 Message-Id: In-Reply-To: <63ca8c346cf3422d931d3d742e18d9fc@git.apache.org> References: <63ca8c346cf3422d931d3d742e18d9fc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/32] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-18456 archived-at: Wed, 19 Oct 2016 16:08:17 -0000 Merge branch 'trunk' into branch-feature-AMBARI-18456 Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aee49b67 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aee49b67 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aee49b67 Branch: refs/heads/trunk Commit: aee49b67f5daf558e0dfa2091bb97c2619e3c097 Parents: d53c9e2 f2bcbbe Author: Jonathan Hurley Authored: Mon Oct 3 14:04:20 2016 -0400 Committer: Jonathan Hurley Committed: Mon Oct 3 14:04:20 2016 -0400 ---------------------------------------------------------------------- .../ui/admin-web/app/views/groups/edit.html | 4 +- ambari-agent/conf/unix/ambari-agent.ini | 1 + .../src/main/python/ambari_agent/ActionQueue.py | 22 +- .../src/main/python/ambari_agent/HostCleanup.py | 6 +- .../ambari_agent/PythonReflectiveExecutor.py | 25 +- .../test/python/ambari_agent/TestActionQueue.py | 3 +- .../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 +- .../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 +- .../app/views/common/chart/linear_time.js | 2 +- .../configs/service_configs_by_category_view.js | 535 +- .../config_recommendation_parser_test.js | 4 +- .../service_configs_by_category_view_test.js | 7 +- 57 files changed, 13991 insertions(+), 434 deletions(-) ----------------------------------------------------------------------