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/13d806b8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/13d806b8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/13d806b8 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 13d806b85d50f10f00140aea5c590f9b86832cfc Parents: e3d5344 94795d9 Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Thu Apr 27 15:15:35 2017 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Thu Apr 27 15:15:35 2017 -0400 ---------------------------------------------------------------------- .../libraries/script/script.py | 6 +- .../configurer/SolrCollectionConfigurer.java | 6 +- .../ambari/logsearch/dao/AuditSolrDao.java | 2 +- .../logsearch/dao/ServiceLogsSolrDao.java | 2 +- .../ambari/logsearch/dao/UserConfigSolrDao.java | 2 +- .../handler/AbstractSolrConfigHandler.java | 6 ++ .../handler/UploadConfigurationHandler.java | 60 +++++++++--- .../timeline/AbstractTimelineMetricsSink.java | 2 + .../sink/flume/FlumeTimelineMetricsSink.java | 10 +- .../timeline/HadoopTimelineMetricsSink.java | 9 +- .../timeline/HadoopTimelineMetricsSinkTest.java | 14 ++- .../main/python/core/application_metric_map.py | 7 +- .../src/main/python/core/config_reader.py | 6 ++ .../src/main/python/core/emitter.py | 4 +- .../kafka/KafkaTimelineMetricsReporter.java | 10 ++ .../kafka/KafkaTimelineMetricsReporterTest.java | 4 + .../storm/StormTimelineMetricsReporter.java | 7 ++ .../sink/storm/StormTimelineMetricsSink.java | 7 ++ .../storm/StormTimelineMetricsReporter.java | 8 +- .../sink/storm/StormTimelineMetricsSink.java | 8 +- .../timeline/HBaseTimelineMetricStore.java | 48 +++++++++- .../metrics/timeline/PhoenixHBaseAccessor.java | 4 +- .../metrics/timeline/TimelineMetricStore.java | 2 +- .../webapp/TimelineWebServices.java | 8 +- .../timeline/TestTimelineMetricStore.java | 2 +- .../ambari/server/bootstrap/BSRunner.java | 9 +- .../internal/ClientConfigResourceProvider.java | 41 ++++----- .../system/impl/AmbariMetricSinkImpl.java | 36 +++++--- .../1.6.1.2.2.0/package/scripts/params.py | 15 ++- .../hadoop-metrics2-accumulo.properties.j2 | 2 + .../0.1.0/package/scripts/infra_solr.py | 6 +- .../0.1.0/package/scripts/params.py | 1 + .../0.1.0/package/scripts/status_params.py | 6 ++ .../0.1.0/package/scripts/params.py | 13 ++- .../hadoop-metrics2-hbase.properties.j2 | 2 + .../package/templates/metric_monitor.ini.j2 | 2 + .../FLUME/1.4.0.2.0/package/scripts/params.py | 21 +++-- .../templates/flume-metrics2.properties.j2 | 3 + .../0.96.0.2.0/package/scripts/params_linux.py | 14 ++- ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 2 + ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 3 +- .../hadoop-metrics2.properties.xml | 2 + .../0.12.0.2.0/package/scripts/params_linux.py | 17 +++- .../hadoop-metrics2-hivemetastore.properties.j2 | 2 + .../hadoop-metrics2-hiveserver2.properties.j2 | 2 + .../templates/hadoop-metrics2-llapdaemon.j2 | 4 +- .../hadoop-metrics2-llaptaskscheduler.j2 | 4 +- .../2.1.0.3.0/package/scripts/params_linux.py | 16 +++- .../hadoop-metrics2-hivemetastore.properties.j2 | 2 + .../hadoop-metrics2-hiveserver2.properties.j2 | 2 + .../templates/hadoop-metrics2-llapdaemon.j2 | 4 +- .../hadoop-metrics2-llaptaskscheduler.j2 | 4 +- .../KAFKA/0.8.1/configuration/kafka-broker.xml | 10 ++ .../KAFKA/0.8.1/package/scripts/params.py | 15 ++- .../0.5.0.2.2/configuration/gateway-site.xml | 2 +- .../STORM/0.9.1/package/scripts/params_linux.py | 12 ++- .../0.9.1/package/templates/config.yaml.j2 | 3 + .../templates/storm-metrics2.properties.j2 | 2 + .../2.0.6/hooks/before-START/scripts/params.py | 13 ++- .../templates/hadoop-metrics2.properties.j2 | 2 + .../hadoop-metrics2.properties.xml | 2 + .../3.0/hooks/before-START/scripts/params.py | 14 ++- .../templates/hadoop-metrics2.properties.j2 | 2 + .../stacks/2.0.6/HDFS/test_hdfs_client.py | 10 +- .../python/stacks/2.0.6/configs/default.json | 4 +- .../stacks/2.4/AMBARI_INFRA/test_infra_solr.py | 3 + .../common/host_progress_popup_body_view.js | 20 ++-- ambari-web/yarn.lock | 65 +++++-------- .../resources/ui/app/components/udf-item.js | 1 + .../src/main/resources/ui/app/styles/app.scss | 23 ++++- .../app/templates/components/jobs-browser.hbs | 6 +- .../components/notification-message.hbs | 2 +- .../templates/components/table-rename-form.hbs | 2 +- .../templates/components/table-statistics.hbs | 12 +-- .../ui/app/templates/components/udf-edit.hbs | 66 ++++++++----- .../ui/app/templates/components/udf-item.hbs | 10 +- .../ui/app/templates/components/udf-new.hbs | 97 ++++++++++++-------- .../resources/ui/app/templates/databases.hbs | 2 +- .../ui/app/templates/queries/query.hbs | 16 ++-- .../resources/ui/app/templates/savedqueries.hbs | 64 +++++++------ .../main/resources/ui/app/templates/udfs.hbs | 37 +++++--- .../ui/app/utils/hive-explainer/renderer.js | 3 +- .../view/utils/hdfs/ConfigurationBuilder.java | 3 +- .../ui/app/templates/components/job-row.hbs | 4 +- .../app/templates/components/search-table.hbs | 2 +- 85 files changed, 691 insertions(+), 317 deletions(-) ----------------------------------------------------------------------