You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2017/05/31 20:12:56 UTC
[25/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/ace89b7b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ace89b7b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ace89b7b
Branch: refs/heads/trunk
Commit: ace89b7bbe39cf18f4ee7540acb6258833d54b76
Parents: c413278 2e27f66
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Thu May 18 09:51:09 2017 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Thu May 18 09:51:09 2017 -0400
----------------------------------------------------------------------
.../resources/ui/admin-web/app/views/main.html | 50 +-
ambari-infra/ambari-infra-assembly/pom.xml | 6 +-
ambari-infra/ambari-infra-manager/README.md | 6 +
ambari-infra/ambari-infra-manager/build.xml | 1 +
.../ambari-infra-manager/docker/Dockerfile | 52 +++
.../ambari-infra-manager/docker/bin/start.sh | 21 +
.../docker/infra-manager-docker.sh | 85 ++++
.../src/main/resources/infra-manager-env.sh | 18 +
.../src/main/resources/infraManager.sh | 2 +-
.../ambari-logsearch-config-api/pom.xml | 2 +-
.../config/api/InputConfigMonitor.java | 4 +-
.../config/api/LogLevelFilterMonitor.java | 44 ++
.../logsearch/config/api/LogSearchConfig.java | 57 ++-
.../model/loglevelfilter/LogLevelFilter.java | 79 ++++
.../model/loglevelfilter/LogLevelFilterMap.java | 33 ++
.../config/api/LogSearchConfigClass1.java | 21 +-
.../config/api/LogSearchConfigClass2.java | 21 +-
.../ambari-logsearch-config-zookeeper/pom.xml | 4 +
.../config/zookeeper/LogSearchConfigZK.java | 191 +++++---
.../org/apache/ambari/logfeeder/LogFeeder.java | 6 +-
.../logfeeder/input/InputConfigUploader.java | 2 +-
.../logfeeder/logconfig/FilterLogData.java | 87 ----
.../logfeeder/logconfig/LogConfigFetcher.java | 168 -------
.../logfeeder/logconfig/LogConfigHandler.java | 213 ---------
.../logfeeder/logconfig/LogFeederFilter.java | 90 ----
.../logconfig/LogFeederFilterWrapper.java | 55 ---
.../logfeeder/loglevelfilter/FilterLogData.java | 73 +++
.../loglevelfilter/LogLevelFilterHandler.java | 157 +++++++
.../logfeeder/metrics/LogFeederAMSClient.java | 12 +-
.../ambari/logfeeder/output/OutputManager.java | 2 +-
.../ambari/logfeeder/util/LogFeederUtil.java | 19 -
.../logconfig/LogConfigHandlerTest.java | 90 ++--
.../src/test/resources/logfeeder.properties | 3 +-
.../configurer/LogfeederFilterConfigurer.java | 66 ---
.../ambari/logsearch/dao/UserConfigSolrDao.java | 79 ----
.../ambari/logsearch/doc/DocConstants.java | 10 +-
.../logsearch/manager/ShipperConfigManager.java | 45 +-
.../logsearch/manager/UserConfigManager.java | 24 -
.../model/common/LSServerLogLevelFilter.java | 100 ++++
.../model/common/LSServerLogLevelFilterMap.java | 65 +++
.../model/common/LogFeederDataMap.java | 50 --
.../model/common/LogfeederFilterData.java | 87 ----
.../logsearch/rest/ShipperConfigResource.java | 43 +-
.../logsearch/rest/UserConfigResource.java | 18 -
.../webapp/templates/common/Header_tmpl.html | 5 +-
ambari-metrics/ambari-metrics-assembly/pom.xml | 20 +
.../src/main/assembly/monitor-windows.xml | 7 +
.../src/main/assembly/monitor.xml | 9 +-
.../timeline/AbstractTimelineMetricsSink.java | 24 +-
.../sink/timeline/AggregationResult.java | 60 +++
.../metrics2/sink/timeline/MetricAggregate.java | 110 +++++
.../sink/timeline/MetricClusterAggregate.java | 73 +++
.../sink/timeline/MetricHostAggregate.java | 81 ++++
.../metrics2/sink/timeline/TimelineMetric.java | 6 +-
.../TimelineMetricWithAggregatedValues.java | 65 +++
.../AbstractTimelineMetricSinkTest.java | 10 +
.../availability/MetricCollectorHATest.java | 10 +
.../cache/HandleConnectExceptionTest.java | 10 +
.../sink/flume/FlumeTimelineMetricsSink.java | 16 +
.../timeline/HadoopTimelineMetricsSink.java | 20 +-
.../conf/unix/log4j.properties | 31 ++
.../conf/windows/log4j.properties | 29 ++
.../ambari-metrics-host-aggregator/pom.xml | 120 +++++
.../AbstractMetricPublisherThread.java | 134 ++++++
.../aggregator/AggregatedMetricsPublisher.java | 101 ++++
.../host/aggregator/AggregatorApplication.java | 180 ++++++++
.../host/aggregator/AggregatorWebService.java | 56 +++
.../host/aggregator/RawMetricsPublisher.java | 60 +++
.../host/aggregator/TimelineMetricsHolder.java | 98 ++++
.../conf/unix/ambari-metrics-monitor | 2 +-
.../src/main/python/core/aggregator.py | 110 +++++
.../src/main/python/core/config_reader.py | 35 +-
.../src/main/python/core/controller.py | 28 ++
.../src/main/python/core/emitter.py | 8 +-
.../src/main/python/core/stop_handler.py | 3 +-
.../src/main/python/main.py | 6 +-
.../kafka/KafkaTimelineMetricsReporter.java | 17 +
.../storm/StormTimelineMetricsReporter.java | 14 +
.../sink/storm/StormTimelineMetricsSink.java | 14 +
.../storm/StormTimelineMetricsReporter.java | 16 +
.../sink/storm/StormTimelineMetricsSink.java | 16 +
.../timeline/HBaseTimelineMetricStore.java | 29 +-
.../metrics/timeline/PhoenixHBaseAccessor.java | 4 +-
.../timeline/TimelineMetricConfiguration.java | 2 +
.../metrics/timeline/TimelineMetricStore.java | 2 +
.../timeline/TimelineMetricsAggregatorSink.java | 4 +-
.../timeline/aggregators/MetricAggregate.java | 110 -----
.../aggregators/MetricClusterAggregate.java | 73 ---
.../aggregators/MetricHostAggregate.java | 81 ----
.../TimelineMetricAppAggregator.java | 1 +
.../TimelineMetricClusterAggregator.java | 2 +
.../TimelineMetricClusterAggregatorSecond.java | 1 +
.../TimelineMetricHostAggregator.java | 1 +
.../aggregators/TimelineMetricReadHelper.java | 2 +
.../webapp/TimelineWebServices.java | 31 ++
.../timeline/ITPhoenixHBaseAccessor.java | 4 +-
.../metrics/timeline/MetricTestHelper.java | 2 +-
.../timeline/PhoenixHBaseAccessorTest.java | 4 +-
.../timeline/TestMetricHostAggregate.java | 8 +-
.../timeline/TestTimelineMetricStore.java | 6 +
.../TimelineMetricsAggregatorMemorySink.java | 4 +-
.../aggregators/ITClusterAggregator.java | 4 +-
.../aggregators/ITMetricAggregator.java | 13 +-
...melineMetricClusterAggregatorSecondTest.java | 1 +
ambari-metrics/pom.xml | 1 +
.../system/impl/AmbariMetricSinkImpl.java | 10 +
.../server/upgrade/UpgradeCatalog251.java | 47 +-
.../server/upgrade/UpgradeCatalog300.java | 15 +
ambari-server/src/main/python/ambari-server.py | 299 +++++++-----
.../main/python/ambari_server/setupMpacks.py | 7 +-
.../1.6.1.2.2.0/package/scripts/params.py | 2 +
.../hadoop-metrics2-accumulo.properties.j2 | 3 +
.../0.1.0/configuration/ams-env.xml | 8 +
.../0.1.0/configuration/ams-site.xml | 11 +
.../AMBARI_METRICS/0.1.0/metainfo.xml | 3 +
.../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 30 ++
.../0.1.0/package/scripts/params.py | 5 +
.../hadoop-metrics2-hbase.properties.j2 | 3 +
.../package/templates/metric_monitor.ini.j2 | 7 +
.../FLUME/1.4.0.2.0/package/scripts/params.py | 3 +
.../templates/flume-metrics2.properties.j2 | 2 +
.../0.96.0.2.0/package/scripts/params_linux.py | 3 +
...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 2 +
...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 2 +
.../hadoop-metrics2.properties.xml | 2 +
.../0.12.0.2.0/package/scripts/params_linux.py | 2 +
.../hadoop-metrics2-hivemetastore.properties.j2 | 2 +
.../hadoop-metrics2-hiveserver2.properties.j2 | 2 +
.../templates/hadoop-metrics2-llapdaemon.j2 | 2 +
.../hadoop-metrics2-llaptaskscheduler.j2 | 2 +
.../2.1.0.3.0/package/scripts/params_linux.py | 3 +
.../hadoop-metrics2-hivemetastore.properties.j2 | 2 +
.../hadoop-metrics2-hiveserver2.properties.j2 | 2 +
.../templates/hadoop-metrics2-llapdaemon.j2 | 2 +
.../hadoop-metrics2-llaptaskscheduler.j2 | 2 +
.../KAFKA/0.8.1/configuration/kafka-broker.xml | 11 +
.../KAFKA/0.8.1/package/scripts/params.py | 3 +
.../common-services/KNOX/0.5.0.3.0/alerts.json | 32 ++
.../0.5.0.3.0/configuration/admin-topology.xml | 97 ++++
.../0.5.0.3.0/configuration/gateway-log4j.xml | 110 +++++
.../0.5.0.3.0/configuration/gateway-site.xml | 71 +++
.../KNOX/0.5.0.3.0/configuration/knox-env.xml | 83 ++++
.../configuration/knoxsso-topology.xml | 126 +++++
.../KNOX/0.5.0.3.0/configuration/ldap-log4j.xml | 93 ++++
.../configuration/ranger-knox-audit.xml | 132 ++++++
.../ranger-knox-plugin-properties.xml | 132 ++++++
.../configuration/ranger-knox-policymgr-ssl.xml | 66 +++
.../configuration/ranger-knox-security.xml | 64 +++
.../KNOX/0.5.0.3.0/configuration/topology.xml | 174 +++++++
.../KNOX/0.5.0.3.0/configuration/users-ldif.xml | 140 ++++++
.../KNOX/0.5.0.3.0/kerberos.json | 81 ++++
.../common-services/KNOX/0.5.0.3.0/metainfo.xml | 109 +++++
.../package/files/validateKnoxStatus.py | 43 ++
.../KNOX/0.5.0.3.0/package/scripts/knox.py | 192 ++++++++
.../0.5.0.3.0/package/scripts/knox_gateway.py | 220 +++++++++
.../KNOX/0.5.0.3.0/package/scripts/knox_ldap.py | 59 +++
.../KNOX/0.5.0.3.0/package/scripts/params.py | 29 ++
.../0.5.0.3.0/package/scripts/params_linux.py | 457 +++++++++++++++++++
.../0.5.0.3.0/package/scripts/params_windows.py | 71 +++
.../0.5.0.3.0/package/scripts/service_check.py | 96 ++++
.../package/scripts/setup_ranger_knox.py | 121 +++++
.../0.5.0.3.0/package/scripts/status_params.py | 59 +++
.../KNOX/0.5.0.3.0/package/scripts/upgrade.py | 118 +++++
.../package/templates/input.config-knox.json.j2 | 60 +++
.../package/templates/krb5JAASLogin.conf.j2 | 30 ++
.../KNOX/0.5.0.3.0/role_command_order.json | 7 +
.../KNOX/0.5.0.3.0/service_advisor.py | 253 ++++++++++
.../configuration/logfeeder-properties.xml | 10 +
.../configuration/logsearch-properties.xml | 10 -
.../LOGSEARCH/0.5.0/themes/theme.json | 4 +-
.../scripts/alerts/alert_spark_livy_port.py | 8 +-
.../SPARK/1.2.1/package/scripts/params.py | 1 +
.../1.2.1/package/scripts/service_check.py | 2 +-
.../scripts/alerts/alert_spark2_livy_port.py | 8 +-
.../SPARK2/2.0.0/package/scripts/params.py | 1 +
.../2.0.0/package/scripts/service_check.py | 2 +-
.../sqoop-atlas-application.properties.xml | 47 ++
.../SQOOP/1.4.4.3.0/configuration/sqoop-env.xml | 87 ++++
.../1.4.4.3.0/configuration/sqoop-site.xml | 38 ++
.../SQOOP/1.4.4.3.0/kerberos.json | 20 +
.../SQOOP/1.4.4.3.0/metainfo.xml | 115 +++++
.../SQOOP/1.4.4.3.0/package/scripts/__init__.py | 19 +
.../SQOOP/1.4.4.3.0/package/scripts/params.py | 27 ++
.../1.4.4.3.0/package/scripts/params_linux.py | 135 ++++++
.../1.4.4.3.0/package/scripts/params_windows.py | 30 ++
.../1.4.4.3.0/package/scripts/service_check.py | 62 +++
.../SQOOP/1.4.4.3.0/package/scripts/sqoop.py | 124 +++++
.../1.4.4.3.0/package/scripts/sqoop_client.py | 66 +++
.../SQOOP/1.4.4.3.0/role_command_order.json | 6 +
.../SQOOP/1.4.4.3.0/service_advisor.py | 197 ++++++++
.../STORM/0.9.1/package/scripts/params_linux.py | 2 +
.../0.9.1/package/templates/config.yaml.j2 | 2 +
.../templates/storm-metrics2.properties.j2 | 2 +
.../2.0.6/hooks/before-START/scripts/params.py | 3 +
.../templates/hadoop-metrics2.properties.j2 | 2 +
.../stacks/HDP/2.3/services/stack_advisor.py | 2 +-
.../hadoop-metrics2.properties.xml | 2 +
.../3.0/hooks/before-START/scripts/params.py | 2 +
.../templates/hadoop-metrics2.properties.j2 | 2 +
.../stacks/HDP/3.0/services/KNOX/metainfo.xml | 27 ++
.../stacks/HDP/3.0/services/SQOOP/metainfo.xml | 27 ++
.../system/impl/TestAmbariMetricsSinkImpl.java | 10 +
.../server/upgrade/UpgradeCatalog251Test.java | 92 ++++
.../server/upgrade/UpgradeCatalog300Test.java | 29 ++
.../src/test/python/TestAmbariServer.py | 409 +++++++++--------
ambari-web/app/app.js | 7 +
ambari-web/app/controllers/installer.js | 15 -
.../journalNode/step1_controller.js | 2 +-
.../main/admin/stack_and_upgrade_controller.js | 9 +-
.../service/manage_config_groups_controller.js | 89 +++-
ambari-web/app/controllers/wizard.js | 44 +-
.../wizard/step7/assign_master_controller.js | 16 +-
.../app/controllers/wizard/step7_controller.js | 1 +
.../app/controllers/wizard/step8_controller.js | 167 ++++++-
ambari-web/app/messages.js | 3 +-
.../app/mixins/common/configs/configs_saver.js | 32 +-
.../mixins/wizard/assign_master_components.js | 77 +++-
.../app/mixins/wizard/wizardHostsLoading.js | 6 +-
ambari-web/app/routes/add_service_routes.js | 1 +
ambari-web/app/routes/installer.js | 1 +
ambari-web/app/templates/wizard/step8.hbs | 5 +
ambari-web/app/utils/ajax/ajax.js | 8 +-
.../common/assign_master_components_view.js | 4 +
.../app/views/main/service/reassign_view.js | 4 -
ambari-web/test/controllers/installer_test.js | 12 -
.../journalNode/step1_controller_test.js | 4 +-
.../admin/stack_and_upgrade_controller_test.js | 6 +
.../main/service/add_controller_test.js | 54 +--
.../test/controllers/wizard/step5_test.js | 86 ++--
.../test/controllers/wizard/step8_test.js | 132 ++++--
ambari-web/test/controllers/wizard_test.js | 30 +-
.../mixins/common/configs/configs_saver_test.js | 13 +
.../resourceManager/wizard_view_test.js | 18 +-
.../views/main/service/reassign_view_test.js | 12 -
.../2.0/hooks/before-START/scripts/params.py | 2 +
.../resources/ui/hive-web/app/routes/splash.js | 2 +-
236 files changed, 8509 insertions(+), 2064 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ace89b7b/ambari-server/src/main/python/ambari-server.py
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ace89b7b/ambari-server/src/test/python/TestAmbariServer.py
----------------------------------------------------------------------