You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2017/05/23 09:53:48 UTC

[50/50] [abbrv] ambari git commit: Merge remote-tracking branch 'origin/trunk' into ambari-rest-api-explorer

Merge remote-tracking branch 'origin/trunk' into ambari-rest-api-explorer


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/651bdcbd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/651bdcbd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/651bdcbd

Branch: refs/heads/ambari-rest-api-explorer
Commit: 651bdcbdf86c8addace33b1f9bac066633296106
Parents: 51fc3cf 7c92953
Author: Attila Doroszlai <ad...@hortonworks.com>
Authored: Tue May 23 11:52:00 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Tue May 23 11:52:00 2017 +0200

----------------------------------------------------------------------
 .../clusters/ClustersManageAccessCtrl.js        |    2 +-
 .../stackVersions/StackVersionsCreateCtrl.js    |   19 +
 .../stackVersions/StackVersionsEditCtrl.js      |  102 +-
 .../ui/admin-web/app/scripts/i18n.config.js     |    2 +-
 .../ui/admin-web/app/scripts/services/Stack.js  |    3 +-
 .../resources/ui/admin-web/app/views/main.html  |   50 +-
 .../views/stackVersions/stackVersionPage.html   |    3 +-
 .../ui/admin-web/app/views/users/create.html    |    2 +-
 ambari-agent/conf/unix/install-helper.sh        |    3 +-
 ambari-agent/pom.xml                            |    1 +
 .../src/main/python/ambari_agent/ActionQueue.py |    9 +-
 .../main/python/ambari_agent/AmbariConfig.py    |   83 +-
 .../src/main/python/ambari_agent/Controller.py  |   18 +-
 .../ambari_agent/CustomServiceOrchestrator.py   |   38 +-
 .../src/main/python/ambari_agent/Hardware.py    |    2 +
 .../src/main/python/ambari_agent/HostInfo.py    |   15 +-
 .../src/main/python/ambari_agent/NetUtil.py     |    5 +-
 .../ambari_agent/StatusCommandsExecutor.py      |  279 +-
 .../python/ambari_agent/alerts/web_alert.py     |    5 +-
 .../src/main/python/ambari_agent/hostname.py    |    8 +
 ambari-agent/src/packages/tarball/all.xml       |   11 +-
 .../test/python/ambari_agent/TestActionQueue.py |   13 +-
 .../test/python/ambari_agent/TestController.py  |   14 +
 .../TestCustomServiceOrchestrator.py            |   51 -
 .../test/python/ambari_agent/TestHardware.py    |    4 +-
 .../src/test/python/ambari_agent/TestShell.py   |    2 +-
 .../python/resource_management/TestScript.py    |   56 +-
 .../main/python/ambari_commons/inet_utils.py    |   43 +-
 .../src/main/python/ambari_commons/network.py   |   20 +-
 .../libraries/functions/conf_select.py          |   13 +-
 .../libraries/functions/curl_krb_request.py     |   17 +-
 .../libraries/functions/decorator.py            |   23 +-
 .../libraries/functions/jmx.py                  |    7 +-
 .../libraries/functions/namenode_ha_utils.py    |    6 +-
 .../functions/setup_ranger_plugin_xml.py        |   26 +-
 .../libraries/functions/version_select_util.py  |   40 +
 .../libraries/script/script.py                  |  171 +-
 .../HIVE/package/scripts/mysql_service.py       |    5 +
 ambari-infra/.gitignore                         |    6 +
 ambari-infra/ambari-infra-assembly/pom.xml      |   91 +
 .../src/main/package/deb/manager/control        |   22 +
 .../src/main/package/deb/manager/postinst       |   15 +
 .../src/main/package/deb/manager/postrm         |   15 +
 .../src/main/package/deb/manager/preinst        |   15 +
 .../src/main/package/deb/manager/prerm          |   15 +
 ambari-infra/ambari-infra-manager/README.md     |   31 +
 ambari-infra/ambari-infra-manager/build.xml     |   54 +
 .../ambari-infra-manager/docker/Dockerfile      |   52 +
 .../ambari-infra-manager/docker/bin/start.sh    |   21 +
 .../docker/infra-manager-docker.sh              |   85 +
 ambari-infra/ambari-infra-manager/pom.xml       |  431 ++
 .../org/apache/ambari/infra/InfraManager.java   |  186 +
 .../infra/common/InfraManagerConstants.java     |   29 +
 .../infra/conf/InfraManagerApiDocConfig.java    |   54 +
 .../ambari/infra/conf/InfraManagerConfig.java   |   36 +
 .../conf/batch/InfraManagerBatchConfig.java     |  282 +
 .../infra/job/dummy/DummyItemProcessor.java     |   36 +
 .../ambari/infra/job/dummy/DummyItemWriter.java |   36 +
 .../ambari/infra/job/dummy/DummyObject.java     |   40 +
 .../apache/ambari/infra/manager/JobManager.java |  274 +
 .../infra/model/ExecutionContextResponse.java   |   40 +
 .../ambari/infra/model/JobDetailsResponse.java  |   53 +
 .../model/JobExecutionDetailsResponse.java      |   49 +
 .../infra/model/JobExecutionInfoResponse.java   |  141 +
 .../ambari/infra/model/JobExecutionRequest.java |   46 +
 .../infra/model/JobExecutionRestartRequest.java |   52 +
 .../infra/model/JobExecutionStopRequest.java    |   50 +
 .../infra/model/JobInstanceDetailsResponse.java |   54 +
 .../infra/model/JobInstanceStartRequest.java    |   49 +
 .../ambari/infra/model/JobOperationParams.java  |   31 +
 .../apache/ambari/infra/model/JobRequest.java   |   37 +
 .../apache/ambari/infra/model/PageRequest.java  |   49 +
 .../model/StepExecutionContextResponse.java     |   58 +
 .../infra/model/StepExecutionInfoResponse.java  |  115 +
 .../model/StepExecutionProgressResponse.java    |   53 +
 .../infra/model/StepExecutionRequest.java       |   49 +
 .../infra/model/wrapper/JobExecutionData.java   |  118 +
 .../infra/model/wrapper/StepExecutionData.java  |  133 +
 .../ambari/infra/rest/JobExceptionMapper.java   |  110 +
 .../apache/ambari/infra/rest/JobResource.java   |  191 +
 .../src/main/resources/dummy/dummy.txt          |    3 +
 .../src/main/resources/infra-manager-env.sh     |   18 +
 .../src/main/resources/infra-manager.properties |   18 +
 .../src/main/resources/infraManager.sh          |   20 +
 .../src/main/resources/log4j.xml                |   31 +
 .../src/main/resources/swagger/swagger.html     |  115 +
 .../src/main/resources/webapp/index.html        |   24 +
 .../infra/solr/AmbariSolrCloudClient.java       |    4 +-
 .../src/main/resources/solrCloudCli.sh          |    2 +-
 ambari-infra/pom.xml                            |    1 +
 ambari-logsearch/README.md                      |    9 +-
 .../ambari-logsearch-config-api/.gitignore      |    1 +
 .../ambari-logsearch-config-api/pom.xml         |   49 +
 .../config/api/InputConfigMonitor.java          |   50 +
 .../config/api/LogLevelFilterMonitor.java       |   44 +
 .../logsearch/config/api/LogSearchConfig.java   |  132 +
 .../config/api/LogSearchConfigFactory.java      |   68 +
 .../api/model/inputconfig/Conditions.java       |   24 +
 .../config/api/model/inputconfig/Fields.java    |   26 +
 .../api/model/inputconfig/FilterDescriptor.java |   39 +
 .../model/inputconfig/FilterGrokDescriptor.java |   28 +
 .../model/inputconfig/FilterJsonDescriptor.java |   23 +
 .../inputconfig/FilterKeyValueDescriptor.java   |   28 +
 .../api/model/inputconfig/InputConfig.java      |   28 +
 .../api/model/inputconfig/InputDescriptor.java  |   54 +
 .../inputconfig/InputFileBaseDescriptor.java    |   28 +
 .../model/inputconfig/InputFileDescriptor.java  |   23 +
 .../inputconfig/InputS3FileDescriptor.java      |   26 +
 .../model/inputconfig/MapDateDescriptor.java    |   26 +
 .../inputconfig/MapFieldCopyDescriptor.java     |   24 +
 .../model/inputconfig/MapFieldDescriptor.java   |   24 +
 .../inputconfig/MapFieldNameDescriptor.java     |   24 +
 .../inputconfig/MapFieldValueDescriptor.java    |   26 +
 .../api/model/inputconfig/PostMapValues.java    |   26 +
 .../model/loglevelfilter/LogLevelFilter.java    |   79 +
 .../model/loglevelfilter/LogLevelFilterMap.java |   33 +
 .../config/api/LogSearchConfigClass1.java       |   73 +
 .../config/api/LogSearchConfigClass2.java       |   73 +
 .../config/api/LogSearchConfigFactoryTest.java  |   58 +
 .../config/api/NonLogSearchConfigClass.java     |   23 +
 .../src/test/resources/log4j.xml                |   34 +
 .../.gitignore                                  |    1 +
 .../ambari-logsearch-config-zookeeper/pom.xml   |   84 +
 .../config/zookeeper/LogSearchConfigZK.java     |  362 +
 .../model/inputconfig/impl/ConditionsImpl.java  |   37 +
 .../model/inputconfig/impl/FieldsImpl.java      |   39 +
 .../model/inputconfig/impl/FilterAdapter.java   |   42 +
 .../inputconfig/impl/FilterDescriptorImpl.java  |  113 +
 .../impl/FilterGrokDescriptorImpl.java          |   66 +
 .../impl/FilterJsonDescriptorImpl.java          |   25 +
 .../impl/FilterKeyValueDescriptorImpl.java      |   63 +
 .../model/inputconfig/impl/InputAdapter.java    |   58 +
 .../model/inputconfig/impl/InputConfigGson.java |   46 +
 .../model/inputconfig/impl/InputConfigImpl.java |   54 +
 .../inputconfig/impl/InputDescriptorImpl.java   |  204 +
 .../impl/InputFileBaseDescriptorImpl.java       |   66 +
 .../impl/InputFileDescriptorImpl.java           |   25 +
 .../impl/InputS3FileDescriptorImpl.java         |   53 +
 .../inputconfig/impl/MapDateDescriptorImpl.java |   58 +
 .../impl/MapFieldCopyDescriptorImpl.java        |   45 +
 .../impl/MapFieldNameDescriptorImpl.java        |   45 +
 .../impl/MapFieldValueDescriptorImpl.java       |   58 +
 .../inputconfig/impl/PostMapValuesAdapter.java  |   99 +
 .../inputconfig/impl/PostMapValuesImpl.java     |   40 +
 ambari-logsearch/ambari-logsearch-it/pom.xml    |  204 +-
 .../logsearch/domain/StoryDataRegistry.java     |   43 +-
 .../logsearch/steps/AbstractLogSearchSteps.java |  161 +
 .../logsearch/steps/LogSearchDockerSteps.java   |  197 +-
 .../logsearch/steps/LogSearchUISteps.java       |  212 +
 .../ambari/logsearch/steps/SolrSteps.java       |    4 +-
 .../logsearch/story/LogSearchApiQueryStory.java |   22 -
 .../story/LogSearchBackendStories.java          |   75 +
 .../ambari/logsearch/story/LogSearchStory.java  |   60 -
 .../logsearch/story/LogSearchStoryLocator.java  |   97 +
 .../logsearch/story/LogSearchUIStories.java     |   92 +
 .../logsearch/story/LogfeederParsingStory.java  |   22 -
 .../ambari/logsearch/web/AbstractPage.java      |   63 +
 .../org/apache/ambari/logsearch/web/Home.java   |   39 +
 .../story/log_search_api_query_story.story      |   17 -
 .../story/logfeeder_parsing_story.story         |   20 -
 .../stories/backend/log_search_api_tests.story  |   17 +
 .../backend/logfeeder_parsing_tests.story       |   20 +
 .../resources/stories/selenium/login.ui.story   |   20 +
 .../ambari-logsearch-logfeeder/pom.xml          |   66 +-
 .../org/apache/ambari/logfeeder/LogFeeder.java  |  386 +-
 .../ambari/logfeeder/common/ConfigBlock.java    |  107 +-
 .../ambari/logfeeder/common/ConfigHandler.java  |  420 ++
 .../ambari/logfeeder/common/ConfigItem.java     |   97 +
 .../apache/ambari/logfeeder/filter/Filter.java  |   53 +-
 .../ambari/logfeeder/filter/FilterGrok.java     |   11 +-
 .../ambari/logfeeder/filter/FilterJSON.java     |    3 -
 .../ambari/logfeeder/filter/FilterKeyValue.java |   12 +-
 .../logfeeder/input/AbstractInputFile.java      |   16 +-
 .../apache/ambari/logfeeder/input/Input.java    |  112 +-
 .../logfeeder/input/InputConfigUploader.java    |   94 +
 .../ambari/logfeeder/input/InputFile.java       |    6 +-
 .../ambari/logfeeder/input/InputManager.java    |  304 +-
 .../ambari/logfeeder/input/InputS3File.java     |    5 +-
 .../ambari/logfeeder/input/InputSimulate.java   |   41 +-
 .../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 +
 .../apache/ambari/logfeeder/mapper/Mapper.java  |    4 +-
 .../ambari/logfeeder/mapper/MapperDate.java     |   15 +-
 .../logfeeder/mapper/MapperFieldCopy.java       |   13 +-
 .../logfeeder/mapper/MapperFieldName.java       |   14 +-
 .../logfeeder/mapper/MapperFieldValue.java      |   14 +-
 .../logfeeder/metrics/LogFeederAMSClient.java   |   12 +-
 .../apache/ambari/logfeeder/output/Output.java  |    3 -
 .../logfeeder/output/OutputLineFilter.java      |    2 +-
 .../ambari/logfeeder/output/OutputManager.java  |   19 +-
 .../ambari/logfeeder/output/OutputS3File.java   |   96 +-
 .../ambari/logfeeder/util/LogFeederUtil.java    |   73 +-
 .../apache/ambari/logfeeder/util/SSLUtil.java   |    5 +-
 .../src/main/resources/log4j.xml                |    6 +-
 .../ambari/logfeeder/filter/FilterGrokTest.java |   37 +-
 .../ambari/logfeeder/filter/FilterJSONTest.java |   14 +-
 .../logfeeder/filter/FilterKeyValueTest.java    |   41 +-
 .../ambari/logfeeder/input/InputFileTest.java   |   25 +-
 .../logfeeder/input/InputManagerTest.java       |   70 +-
 .../logconfig/LogConfigHandlerTest.java         |  108 +-
 .../ambari/logfeeder/mapper/MapperDateTest.java |   44 +-
 .../logfeeder/mapper/MapperFieldCopyTest.java   |   19 +-
 .../logfeeder/mapper/MapperFieldNameTest.java   |   19 +-
 .../logfeeder/mapper/MapperFieldValueTest.java  |   29 +-
 .../logfeeder/output/OutputLineFilterTest.java  |   22 +-
 .../logfeeder/output/OutputManagerTest.java     |   21 +-
 .../logfeeder/output/OutputS3FileTest.java      |   17 +-
 .../src/test/resources/logfeeder.properties     |    3 +-
 .../ambari-logsearch-server/pom.xml             |   18 +-
 .../org/apache/ambari/logsearch/LogSearch.java  |    1 +
 .../ambari/logsearch/common/MessageEnums.java   |    3 +-
 .../logsearch/common/PropertiesHelper.java      |    3 +
 .../ambari/logsearch/conf/SecurityConfig.java   |   15 +
 .../conf/global/LogSearchConfigState.java       |   35 +
 .../ambari/logsearch/configurer/Configurer.java |   23 +
 .../configurer/LogSearchConfigConfigurer.java   |   69 +
 .../configurer/LogfeederFilterConfigurer.java   |   66 -
 .../configurer/SolrAuditAliasConfigurer.java    |    2 +-
 .../configurer/SolrCollectionConfigurer.java    |   12 +-
 .../logsearch/configurer/SolrConfigurer.java    |   23 -
 .../ambari/logsearch/dao/AuditSolrDao.java      |    2 +-
 .../logsearch/dao/ServiceLogsSolrDao.java       |    2 +-
 .../ambari/logsearch/dao/UserConfigSolrDao.java |   81 +-
 .../ambari/logsearch/doc/DocConstants.java      |   12 +-
 .../handler/AbstractSolrConfigHandler.java      |  122 +
 .../logsearch/handler/UpgradeSchemaHandler.java |  139 +
 .../handler/UploadConfigurationHandler.java     |  164 +-
 .../logsearch/manager/AuditLogsManager.java     |    5 +
 .../ambari/logsearch/manager/ManagerBase.java   |   30 +
 .../logsearch/manager/ServiceLogsManager.java   |    5 +
 .../logsearch/manager/ShipperConfigManager.java |  108 +
 .../logsearch/manager/UserConfigManager.java    |   24 -
 .../model/common/LSServerConditions.java        |   41 +
 .../logsearch/model/common/LSServerFields.java  |   43 +
 .../logsearch/model/common/LSServerFilter.java  |  130 +
 .../model/common/LSServerFilterGrok.java        |   73 +
 .../model/common/LSServerFilterJson.java        |   31 +
 .../model/common/LSServerFilterKeyValue.java    |   71 +
 .../logsearch/model/common/LSServerInput.java   |  149 +
 .../model/common/LSServerInputConfig.java       |   87 +
 .../model/common/LSServerInputFile.java         |   31 +
 .../model/common/LSServerInputFileBase.java     |   72 +
 .../model/common/LSServerInputS3File.java       |   59 +
 .../model/common/LSServerLogLevelFilter.java    |  100 +
 .../model/common/LSServerLogLevelFilterMap.java |   65 +
 .../logsearch/model/common/LSServerMapDate.java |   61 +
 .../model/common/LSServerMapField.java          |   30 +
 .../model/common/LSServerMapFieldCopy.java      |   49 +
 .../model/common/LSServerMapFieldName.java      |   49 +
 .../model/common/LSServerMapFieldValue.java     |   61 +
 .../model/common/LSServerPostMapValues.java     |   63 +
 .../common/LSServerPostMapValuesSerializer.java |   39 +
 .../model/common/LogFeederDataMap.java          |   50 -
 .../model/common/LogfeederFilterData.java       |   87 -
 .../logsearch/rest/AuditLogsResource.java       |   10 +
 .../logsearch/rest/ServiceLogsResource.java     |   11 +
 .../logsearch/rest/ShipperConfigResource.java   |  108 +
 .../logsearch/rest/UserConfigResource.java      |   18 -
 .../web/filters/LogSearchConfigStateFilter.java |  102 +
 ...rchExternalServerAuthenticationProvider.java |    5 +-
 .../ambari-logsearch-web/.gitignore             |    1 +
 .../webapp/templates/common/Header_tmpl.html    |    5 +-
 ambari-logsearch/docker/Dockerfile              |   17 +-
 ambari-logsearch/docker/bin/start.sh            |    8 +
 ambari-logsearch/docker/logsearch-docker.sh     |   18 +-
 .../test-config/logfeeder/logfeeder.properties  |   13 +-
 .../test-config/logsearch/logsearch.properties  |    6 +-
 ambari-logsearch/pom.xml                        |    2 +
 ambari-metrics/ambari-metrics-assembly/pom.xml  |   20 +
 .../src/main/assembly/monitor-windows.xml       |    7 +
 .../src/main/assembly/monitor.xml               |    9 +-
 .../timeline/AbstractTimelineMetricsSink.java   |   26 +-
 .../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    |   26 +-
 .../ambari-metrics/datasource.js                |  162 +-
 .../ambari-metrics/partials/query.editor.html   |   14 +-
 .../ambari-metrics/queryCtrl.js                 |    9 +-
 .../timeline/HadoopTimelineMetricsSink.java     |   27 +-
 .../timeline/HadoopTimelineMetricsSinkTest.java |   14 +-
 .../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 +
 .../main/python/core/application_metric_map.py  |    7 +-
 .../src/main/python/core/config_reader.py       |   41 +-
 .../src/main/python/core/controller.py          |   28 +
 .../src/main/python/core/emitter.py             |   12 +-
 .../src/main/python/core/stop_handler.py        |    3 +-
 .../src/main/python/main.py                     |    6 +-
 .../kafka/KafkaTimelineMetricsReporter.java     |   27 +
 .../kafka/KafkaTimelineMetricsReporterTest.java |    4 +
 .../storm/StormTimelineMetricsReporter.java     |   23 +
 .../sink/storm/StormTimelineMetricsSink.java    |   21 +
 .../ambari-metrics-storm-sink/pom.xml           |    2 +-
 .../storm/StormTimelineMetricsReporter.java     |   22 +
 .../sink/storm/StormTimelineMetricsSink.java    |   22 +
 .../ambari-metrics-timelineservice/pom.xml      |    2 +-
 .../timeline/HBaseTimelineMetricStore.java      |   78 +-
 .../metrics/timeline/PhoenixHBaseAccessor.java  |  112 +-
 .../timeline/TimelineMetricConfiguration.java   |    2 +
 .../metrics/timeline/TimelineMetricStore.java   |   10 +
 .../timeline/TimelineMetricsAggregatorSink.java |    4 +-
 .../timeline/aggregators/MetricAggregate.java   |  110 -
 .../aggregators/MetricClusterAggregate.java     |   73 -
 .../aggregators/MetricHostAggregate.java        |   81 -
 .../TimelineMetricAppAggregator.java            |    1 +
 .../TimelineMetricClusterAggregator.java        |   13 +-
 .../TimelineMetricClusterAggregatorSecond.java  |    2 +
 .../TimelineMetricHostAggregator.java           |    1 +
 .../aggregators/TimelineMetricReadHelper.java   |    2 +
 .../TimelineMetricMetadataManager.java          |   38 +
 .../discovery/TimelineMetricMetadataSync.java   |   57 +
 .../timeline/query/PhoenixTransactSQL.java      |   12 +
 .../webapp/TimelineWebServices.java             |   49 +
 .../timeline/ITPhoenixHBaseAccessor.java        |    4 +-
 .../metrics/timeline/MetricTestHelper.java      |    2 +-
 .../timeline/PhoenixHBaseAccessorTest.java      |    4 +-
 .../timeline/TestMetricHostAggregate.java       |    8 +-
 .../timeline/TestTimelineMetricStore.java       |   11 +
 .../TimelineMetricsAggregatorMemorySink.java    |    4 +-
 .../aggregators/ITClusterAggregator.java        |   12 +-
 .../aggregators/ITMetricAggregator.java         |   13 +-
 ...melineMetricClusterAggregatorSecondTest.java |    1 +
 .../timeline/discovery/TestMetadataManager.java |    8 +
 .../timeline/discovery/TestMetadataSync.java    |   12 +
 ambari-metrics/pom.xml                          |    1 +
 ambari-server/conf/unix/install-helper.sh       |   19 +-
 ambari-server/pom.xml                           |   16 +-
 ambari-server/src/main/assemblies/server.xml    |    7 +
 .../ambari/annotations/TransactionalLock.java   |    6 +-
 .../server/actionmanager/ActionDBAccessor.java  |   50 +-
 .../actionmanager/ActionDBAccessorImpl.java     |    5 +-
 .../server/actionmanager/ActionManager.java     |    4 +-
 .../server/actionmanager/ActionScheduler.java   |   25 +-
 .../server/actionmanager/HostRoleCommand.java   |   10 +
 .../ambari/server/actionmanager/Request.java    |   18 +-
 .../server/actionmanager/RequestFactory.java    |    4 +-
 .../ambari/server/actionmanager/Stage.java      |   16 +-
 .../server/actionmanager/StageFactory.java      |    1 -
 .../server/actionmanager/StageFactoryImpl.java  |    4 +-
 .../ambari/server/agent/ComponentStatus.java    |   28 +-
 .../ambari/server/agent/ExecutionCommand.java   |    2 +-
 .../ambari/server/agent/HeartBeatResponse.java  |    3 -
 .../ambari/server/agent/HeartbeatProcessor.java |   20 -
 .../ambari/server/alerts/AlertRunnable.java     |   27 +
 .../alerts/AmbariPerformanceRunnable.java       |    4 +-
 .../alerts/ComponentVersionAlertRunnable.java   |  195 +
 .../server/api/handlers/RequestHandler.java     |    2 +-
 .../api/predicate/expressions/Expression.java   |   14 +-
 .../predicate/operators/LogicalOperator.java    |    2 +-
 .../api/predicate/operators/Operator.java       |    8 +-
 .../predicate/operators/RelationalOperator.java |    2 +-
 .../ambari/server/api/query/JpaSortBuilder.java |    2 +-
 .../apache/ambari/server/api/query/Query.java   |   18 +-
 .../server/api/query/render/Renderer.java       |   12 +-
 .../api/resources/BaseResourceDefinition.java   |    3 +-
 .../RequestScheduleResourceDefinition.java      |    6 +-
 .../server/api/resources/ResourceInstance.java  |   12 +-
 .../api/resources/ResourceInstanceFactory.java  |    2 +-
 .../server/api/rest/BootStrapResource.java      |    2 +-
 .../api/services/AlertDefinitionService.java    |    3 -
 .../api/services/ResultPostProcessor.java       |    2 +-
 .../server/api/services/ResultStatus.java       |    4 +-
 .../api/services/parsers/RequestBodyParser.java |   12 +-
 .../persistence/PersistenceManager.java         |    6 +-
 .../StackAdvisorBlueprintProcessor.java         |   67 +-
 .../stackadvisor/StackAdvisorRequest.java       |    2 +-
 .../commands/StackAdvisorCommandType.java       |    2 +-
 .../apache/ambari/server/api/util/TreeNode.java |   28 +-
 .../ambari/server/bootstrap/BSRunner.java       |    9 +-
 .../server/checks/AbstractCheckDescriptor.java  |   25 +
 .../checks/DatabaseConsistencyCheckHelper.java  |  196 +-
 .../server/checks/RangerSSLConfigCheck.java     |    1 -
 .../ambari/server/checks/ServicesUpCheck.java   |    2 -
 .../ambari/server/checks/UpgradeCheckGroup.java |    2 +-
 .../server/configuration/Configuration.java     |   81 +-
 .../AmbariCustomCommandExecutionHelper.java     |   27 +-
 .../controller/AmbariManagementController.java  |   12 +-
 .../AmbariManagementControllerImpl.java         |   82 +-
 .../controller/AmbariManagementHelper.java      |  175 +
 .../ambari/server/controller/AmbariServer.java  |    9 +-
 .../server/controller/KerberosHelper.java       |    2 +-
 .../server/controller/KerberosHelperImpl.java   |   51 +-
 .../controller/MaintenanceStateHelper.java      |    4 +-
 .../server/controller/RequestRequest.java       |   11 +
 .../controller/ServiceComponentResponse.java    |   37 +-
 .../gsinstaller/ClusterDefinition.java          |  434 --
 .../gsinstaller/GSInstallerClusterProvider.java |   71 -
 .../GSInstallerComponentProvider.java           |   88 -
 .../GSInstallerHostComponentProvider.java       |   99 -
 .../gsinstaller/GSInstallerHostProvider.java    |   86 -
 .../gsinstaller/GSInstallerNoOpProvider.java    |   60 -
 .../gsinstaller/GSInstallerProviderModule.java  |   93 -
 .../GSInstallerResourceProvider.java            |  234 -
 .../gsinstaller/GSInstallerServiceProvider.java |   82 -
 .../gsinstaller/GSInstallerStateProvider.java   |   35 -
 .../internal/AbstractProviderModule.java        |    2 +-
 .../internal/AbstractResourceProvider.java      |    2 +-
 .../internal/ArtifactResourceProvider.java      |   20 +-
 .../BlueprintConfigurationProcessor.java        |  145 +-
 .../internal/ClientConfigResourceProvider.java  |   41 +-
 .../ClusterStackVersionResourceProvider.java    |  153 +-
 .../internal/ComponentResourceProvider.java     |   11 +-
 .../internal/ExportBlueprintRequest.java        |    6 -
 .../internal/HostResourceProvider.java          |    4 +-
 .../HostStackVersionResourceProvider.java       |    9 +-
 .../internal/JobResourceProvider.java           |    8 +-
 .../internal/ObservableResourceProvider.java    |    4 +-
 .../internal/ProvisionClusterRequest.java       |   21 +-
 .../internal/RequestResourceProvider.java       |   96 +-
 .../internal/RequestStageContainer.java         |   11 +-
 .../internal/ResourceProviderObserver.java      |    2 +-
 .../internal/ScaleClusterRequest.java           |    7 -
 .../internal/StageResourceProvider.java         |   89 +-
 .../internal/TaskAttemptResourceProvider.java   |   10 +-
 .../internal/TaskResourceProvider.java          |    3 +
 .../internal/UpgradeResourceProvider.java       |   72 +-
 .../VersionDefinitionResourceProvider.java      |    5 +-
 .../internal/WidgetLayoutResourceProvider.java  |    2 +-
 .../internal/WidgetResourceProvider.java        |    2 +-
 .../internal/WorkflowResourceProvider.java      |    8 +-
 .../server/controller/ivory/IvoryService.java   |   34 +-
 .../controller/jdbc/ConnectionFactory.java      |    2 +-
 .../server/controller/jmx/JMXHostProvider.java  |   10 +-
 .../logging/LogSearchDataRetrievalService.java  |   75 +-
 .../logging/LoggingRequestHelper.java           |    8 +-
 .../logging/LoggingRequestHelperImpl.java       |    6 +
 .../controller/metrics/MetricHostProvider.java  |   10 +-
 .../metrics/MetricsPaddingMethod.java           |    2 +-
 .../metrics/MetricsServiceProvider.java         |    4 +-
 .../controller/predicate/BasePredicate.java     |    2 +-
 .../controller/predicate/PredicateVisitor.java  |   10 +-
 .../predicate/PredicateVisitorAcceptor.java     |    2 +-
 .../spi/ExtendedResourceProvider.java           |    2 +-
 .../server/controller/spi/PageRequest.java      |   10 +-
 .../server/controller/spi/PageResponse.java     |   10 +-
 .../ambari/server/controller/spi/Predicate.java |    2 +-
 .../server/controller/spi/PropertyProvider.java |    4 +-
 .../server/controller/spi/ProviderModule.java   |    4 +-
 .../server/controller/spi/QueryResponse.java    |    8 +-
 .../server/controller/spi/RequestStatus.java    |    8 +-
 .../spi/ResourcePredicateEvaluator.java         |    2 +-
 .../ambari/server/controller/spi/Schema.java    |    4 +-
 .../server/controller/spi/SchemaFactory.java    |    2 +-
 .../server/controller/spi/SortRequest.java      |    6 +-
 .../controller/utilities/StreamProvider.java    |    4 +-
 .../events/AlertDefinitionDisabledEvent.java    |    2 +-
 .../EntityManagerCacheInvalidationEvent.java    |    5 -
 .../alerts/AlertMaintenanceModeListener.java    |   60 +-
 .../listeners/alerts/AlertReceivedListener.java |    2 +-
 .../listeners/upgrade/StackVersionListener.java |   20 +-
 .../server/hooks/users/UserHookService.java     |    3 +-
 .../system/impl/AmbariMetricSinkImpl.java       |   47 +-
 .../server/notifications/DispatchCallback.java  |    4 +-
 .../apache/ambari/server/orm/DBAccessor.java    |   33 +-
 .../ambari/server/orm/DBAccessorImpl.java       |   49 +
 .../server/orm/JPATableGenerationStrategy.java  |    2 +-
 .../orm/cache/ConfigGroupHostMapping.java       |   16 +-
 .../server/orm/cache/HostConfigMapping.java     |   32 +-
 .../ambari/server/orm/dao/ExtensionDAO.java     |    2 +-
 .../ambari/server/orm/dao/ExtensionLinkDAO.java |   39 +-
 .../server/orm/dao/HostComponentStateDAO.java   |   20 +
 .../server/orm/dao/HostRoleCommandDAO.java      |   18 +-
 .../ambari/server/orm/dao/RequestDAO.java       |  264 +-
 .../dao/ServiceComponentDesiredStateDAO.java    |   24 +
 .../server/orm/dao/TopologyHostTaskDAO.java     |   11 +
 .../orm/dao/TopologyLogicalRequestDAO.java      |   12 +
 .../server/orm/dao/TopologyLogicalTaskDAO.java  |   12 +
 .../ambari/server/orm/dao/UpgradeDAO.java       |   30 +-
 .../orm/entities/AlertDefinitionEntity.java     |    2 +-
 .../orm/entities/BlueprintConfiguration.java    |   16 +-
 .../orm/entities/ClusterConfigEntity.java       |   11 +
 .../orm/entities/ExecutionCommandEntity.java    |    5 +
 .../orm/entities/ExtensionLinkEntity.java       |    1 +
 .../orm/entities/HostComponentStateEntity.java  |    7 +-
 .../orm/entities/HostRoleCommandEntity.java     |   27 +-
 .../server/orm/entities/PrivilegeEntity.java    |   10 +
 .../orm/entities/RepositoryVersionEntity.java   |    6 +-
 .../server/orm/entities/RequestEntity.java      |   25 +
 .../entities/RequestOperationLevelEntity.java   |    4 +-
 .../entities/RequestResourceFilterEntity.java   |    5 +
 .../orm/entities/RoleSuccessCriteriaEntity.java |    5 +
 .../ServiceComponentDesiredStateEntity.java     |   19 +
 .../entities/ServiceComponentVersionEntity.java |   26 +-
 .../ambari/server/orm/entities/StageEntity.java |   24 +-
 .../server/orm/entities/StageEntity_.java       |    4 -
 .../orm/entities/TopologyHostRequestEntity.java |    5 +
 .../orm/entities/TopologyHostTaskEntity.java    |   15 +-
 .../entities/TopologyLogicalRequestEntity.java  |    5 +
 .../orm/entities/TopologyLogicalTaskEntity.java |   30 +-
 .../server/orm/entities/UpgradeEntity.java      |    7 +-
 .../server/orm/entities/UpgradeGroupEntity.java |    2 +-
 .../server/orm/entities/UpgradeItemEntity.java  |    5 +
 .../ambari/server/orm/entities/UserEntity.java  |    5 +-
 .../ambari/server/orm/entities/ViewEntity.java  |    9 +
 .../server/orm/entities/ViewInstanceEntity.java |    9 +
 .../server/orm/entities/ViewURLEntity.java      |    1 -
 .../server/orm/helpers/dbms/DbmsHelper.java     |   22 +-
 .../orm/helpers/dbms/GenericDbmsHelper.java     |    8 +
 .../server/orm/helpers/dbms/MySqlHelper.java    |   12 +
 .../server/orm/helpers/dbms/OracleHelper.java   |   12 +
 .../server/orm/helpers/dbms/PostgresHelper.java |   12 +
 .../ambari/server/scheduler/ExecutionJob.java   |   10 +-
 .../server/scheduler/ExecutionScheduler.java    |   16 +-
 .../ambari/server/security/SecurityHelper.java  |    4 +-
 .../AmbariPamAuthenticationProvider.java        |   25 +-
 .../authorization/LdapServerProperties.java     |    4 +-
 .../security/authorization/ResourceType.java    |    2 +-
 .../server/security/authorization/UserName.java |   76 +
 .../server/security/authorization/Users.java    |    4 +-
 .../security/encryption/MasterKeyService.java   |    4 +-
 .../kerberos/KerberosConfigDataFile.java        |   14 +-
 .../kerberos/KerberosIdentityDataFile.java      |   24 +-
 .../upgrades/AbstractUpgradeServerAction.java   |   74 +
 .../upgrades/ComponentVersionCheckAction.java   |    2 +-
 .../upgrades/FinalizeUpgradeAction.java         |   41 +-
 .../FixCapacitySchedulerOrderingPolicy.java     |    5 +
 .../upgrades/UpdateDesiredStackAction.java      |   14 +-
 .../ambari/server/stack/ConfigurationInfo.java  |    6 +-
 .../ambari/server/stack/ExtensionModule.java    |    2 +
 .../stack/QuickLinksConfigurationModule.java    |    2 +-
 .../server/stack/StackDefinitionModule.java     |   16 +-
 .../ambari/server/stack/StackDirectory.java     |    4 +
 .../ambari/server/stack/StackManager.java       |   79 +-
 .../apache/ambari/server/stack/StackModule.java |    6 +-
 .../apache/ambari/server/stack/ThemeModule.java |    2 +-
 .../apache/ambari/server/stack/Validable.java   |   10 +-
 .../ambari/server/stageplanner/RoleGraph.java   |    2 +-
 .../apache/ambari/server/state/AlertState.java  |    4 +
 .../org/apache/ambari/server/state/Cluster.java |   54 +-
 .../server/state/CommandScriptDefinition.java   |    2 +-
 .../org/apache/ambari/server/state/Config.java  |   22 +-
 .../apache/ambari/server/state/ConfigImpl.java  |    2 +-
 .../server/state/CustomCommandDefinition.java   |    5 +
 .../ambari/server/state/ExtensionInfo.java      |   26 +-
 .../ambari/server/state/HostHealthStatus.java   |    2 +-
 .../ambari/server/state/ServiceComponent.java   |   15 +
 .../server/state/ServiceComponentImpl.java      |  166 +-
 .../apache/ambari/server/state/ServiceImpl.java |    2 +-
 .../apache/ambari/server/state/StackInfo.java   |   27 +-
 .../ambari/server/state/UpgradeContext.java     |    9 +
 .../ambari/server/state/UpgradeHelper.java      |    4 +-
 .../server/state/ValueAttributesInfo.java       |    2 +-
 .../ambari/server/state/action/Action.java      |   14 +-
 .../server/state/alert/AlertDefinitionHash.java |    2 -
 .../server/state/cluster/ClusterImpl.java       |  225 +-
 .../server/state/cluster/ClustersImpl.java      |    4 -
 .../server/state/configgroup/ConfigGroup.java   |   32 +-
 .../state/configgroup/ConfigGroupFactory.java   |   15 +-
 .../state/configgroup/ConfigGroupImpl.java      |    8 -
 .../server/state/fsm/MultipleArcTransition.java |    2 +-
 .../server/state/fsm/SingleArcTransition.java   |    2 +-
 .../ambari/server/state/fsm/StateMachine.java   |    6 +-
 .../server/state/fsm/StateMachineFactory.java   |    4 +-
 .../kerberos/AbstractKerberosDescriptor.java    |    2 +-
 .../state/repository/VersionDefinitionXml.java  |   24 +-
 .../state/scheduler/RequestExecution.java       |   56 +-
 .../state/services/MetricsRetrievalService.java |    6 +-
 .../state/stack/ExtensionMetainfoXml.java       |   11 +
 .../state/stack/upgrade/ClusterGrouping.java    |   31 +-
 .../upgrade/ConfigUpgradeChangeDefinition.java  |    3 +-
 .../server/state/stack/upgrade/Grouping.java    |    2 +-
 .../state/stack/upgrade/HostOrderGrouping.java  |    1 -
 .../state/stack/upgrade/StageWrapper.java       |   65 +
 .../ambari/server/state/stack/upgrade/Task.java |    6 +
 .../server/state/stack/upgrade/TaskWrapper.java |   33 +-
 .../state/stack/upgrade/TaskWrapperBuilder.java |    5 +-
 .../state/stack/upgrade/UpgradeFunction.java    |    2 +-
 .../ambari/server/topology/AmbariContext.java   |    3 +
 .../ambari/server/topology/Blueprint.java       |   42 +-
 .../server/topology/BlueprintFactory.java       |    2 +-
 .../ambari/server/topology/BlueprintImpl.java   |   15 +
 .../server/topology/BlueprintValidator.java     |    4 +-
 .../server/topology/BlueprintValidatorImpl.java |   88 +-
 .../topology/ClusterConfigurationRequest.java   |   67 +-
 .../ambari/server/topology/ClusterTopology.java |    2 +
 .../server/topology/ClusterTopologyImpl.java    |   37 +-
 .../ambari/server/topology/HostGroup.java       |   28 +-
 .../ambari/server/topology/LogicalRequest.java  |   38 +-
 .../ambari/server/topology/PersistedState.java  |    7 +
 .../server/topology/PersistedStateImpl.java     |   15 +-
 .../ambari/server/topology/TopologyManager.java |   99 +-
 .../ambari/server/topology/TopologyRequest.java |   22 +-
 .../server/topology/TopologyRequestFactory.java |    2 +-
 .../server/topology/TopologyValidator.java      |    2 +-
 .../server/topology/tasks/TopologyTask.java     |    4 +-
 .../validators/ChainedTopologyValidator.java    |   58 +
 .../validators/HiveServiceValidator.java        |    2 +-
 .../RequiredConfigPropertiesValidator.java      |  188 +
 .../validators/RequiredPasswordValidator.java   |    6 +-
 .../validators/StackConfigTypeValidator.java    |   64 +
 .../validators/TopologyValidatorFactory.java    |   35 +
 .../validators/TopologyValidatorService.java    |   52 +
 .../server/upgrade/AbstractUpgradeCatalog.java  |    5 +-
 .../server/upgrade/SchemaUpgradeHelper.java     |    2 +
 .../server/upgrade/UpgradeCatalog212.java       |    3 -
 .../server/upgrade/UpgradeCatalog250.java       |  100 +-
 .../server/upgrade/UpgradeCatalog251.java       |  169 +
 .../server/upgrade/UpgradeCatalog252.java       |   94 +
 .../server/upgrade/UpgradeCatalog300.java       |   80 +-
 .../apache/ambari/server/utils/StageUtils.java  |    8 +-
 .../server/view/ViewInstanceHandlerList.java    |    4 +-
 .../view/ViewInstanceOperationHandler.java      |   96 +
 .../apache/ambari/server/view/ViewRegistry.java |   57 +-
 .../view/persistence/SchemaManagerFactory.java  |    2 +-
 .../src/main/package/rpm/postinstall.sh         |   18 -
 ambari-server/src/main/python/ambari-server.py  |  307 +-
 .../src/main/python/ambari_server/dbCleanup.py  |   37 +-
 .../python/ambari_server/resourceFilesKeeper.py |   11 +-
 .../python/ambari_server/serverConfiguration.py |    1 +
 .../main/python/ambari_server/serverUpgrade.py  |   31 +-
 .../main/python/ambari_server/setupMpacks.py    |   47 +-
 .../src/main/python/azuredb_create_generator.py |   85 +
 ambari-server/src/main/resources/.gitignore     |    1 +
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |    7 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |    7 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |    7 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |    7 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |    7 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |    7 +-
 ambari-server/src/main/resources/alerts.json    |   12 +
 .../configuration/accumulo-logsearch-conf.xml   |  124 -
 .../package/scripts/accumulo_script.py          |   50 -
 .../1.6.1.2.2.0/package/scripts/params.py       |   17 +-
 .../hadoop-metrics2-accumulo.properties.j2      |    3 +
 .../templates/input.config-accumulo.json.j2     |   92 +
 .../configuration/infra-logsearch-conf.xml      |   80 -
 .../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 +
 .../templates/input.config-ambari-infra.json.j2 |   48 +
 .../0.1.0/configuration/ams-env.xml             |    8 +
 .../0.1.0/configuration/ams-logsearch-conf.xml  |  201 -
 .../0.1.0/configuration/ams-site.xml            |   11 +
 .../AMBARI_METRICS/0.1.0/metainfo.xml           |    3 +
 .../HDP/grafana-hbase-misc.json                 |   18 +-
 .../HDP/grafana-hbase-regionservers.json        |   17 +-
 .../HDP/grafana-hdfs-datanodes.json             |   18 +-
 .../HDP/grafana-hdfs-home.json                  |   18 +-
 .../HDP/grafana-hdfs-namenodes.json             |   18 +-
 .../HDP/grafana-hdfs-topn.json                  |   18 +-
 .../HDP/grafana-hive-hivemetastore.json         |   18 +-
 .../HDP/grafana-hive-hiverserver2.json          |   18 +-
 .../HDP/grafana-kafka-hosts.json                |   18 +-
 .../HDP/grafana-llapdaemon-daemons.json         |   17 +-
 .../HDP/grafana-llapdaemon-heatmaps.json        |   17 +-
 .../HDP/grafana-solr-cores-dashboard.json       |   18 +-
 .../HDP/grafana-solr-hosts-dashboard.json       |   18 +-
 .../HDP/grafana-yarn-nodemanagers.json          |   18 +-
 .../HDP/grafana-yarn-resourcemanagers.json      |   18 +-
 .../default/grafana-ambari-server-database.json |   19 +-
 .../default/grafana-ambari-server-topn.json     |   18 +-
 .../default/grafana-ambari-server.json          |   18 +-
 .../default/grafana-ams-hbase-misc.json         |   18 +-
 .../grafana-ams-hbase-regionservers.json        |   17 +-
 .../default/grafana-system-servers.json         |   18 +-
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py |   30 +
 .../0.1.0/package/scripts/metrics_collector.py  |   66 +-
 .../package/scripts/metrics_grafana_util.py     |   37 +-
 .../0.1.0/package/scripts/params.py             |   18 +-
 .../0.1.0/package/scripts/service_check.py      |   22 +-
 .../hadoop-metrics2-hbase.properties.j2         |    3 +
 .../input.config-ambari-metrics.json.j2         |  169 +
 .../package/templates/metric_monitor.ini.j2     |    9 +
 .../configuration/atlas-logsearch-conf.xml      |   80 -
 .../ATLAS/0.1.0.2.3/package/scripts/metadata.py |   14 +-
 .../package/scripts/metadata_server.py          |   78 -
 .../ATLAS/0.1.0.2.3/package/scripts/params.py   |    3 +
 .../templates/input.config-atlas.json.j2        |   48 +
 .../configuration/application-properties.xml    |   10 +-
 .../ATLAS/0.7.0.2.5/role_command_order.json     |    2 +-
 .../common-services/ATLAS/0.7.0.3.0/alerts.json |   39 +
 .../configuration/application-properties.xml    |  546 ++
 .../ATLAS/0.7.0.3.0/configuration/atlas-env.xml |  182 +
 .../0.7.0.3.0/configuration/atlas-log4j.xml     |  170 +
 .../configuration/atlas-solrconfig.xml          |  641 ++
 .../configuration/ranger-atlas-audit.xml        |  141 +
 .../ranger-atlas-plugin-properties.xml          |  132 +
 .../ranger-atlas-policymgr-ssl.xml              |   73 +
 .../configuration/ranger-atlas-security.xml     |   77 +
 .../ATLAS/0.7.0.3.0/kerberos.json               |  100 +
 .../ATLAS/0.7.0.3.0/metainfo.xml                |  190 +
 .../0.7.0.3.0/package/scripts/atlas_client.py   |   57 +
 .../ATLAS/0.7.0.3.0/package/scripts/metadata.py |  243 +
 .../package/scripts/metadata_server.py          |  187 +
 .../ATLAS/0.7.0.3.0/package/scripts/params.py   |  417 ++
 .../0.7.0.3.0/package/scripts/service_check.py  |   55 +
 .../package/scripts/setup_ranger_atlas.py       |   70 +
 .../0.7.0.3.0/package/scripts/status_params.py  |   60 +
 .../package/templates/atlas_hbase_setup.rb.j2   |   42 +
 .../package/templates/atlas_jaas.conf.j2        |   26 +
 .../package/templates/atlas_kafka_acl.sh.j2     |   41 +
 .../templates/input.config-atlas.json.j2        |   48 +
 .../package/templates/kafka_jaas.conf.j2        |   41 +
 .../ATLAS/0.7.0.3.0/quicklinks/quicklinks.json  |   36 +
 .../ATLAS/0.7.0.3.0/role_command_order.json     |    7 +
 .../ATLAS/0.7.0.3.0/service_advisor.py          |  441 ++
 .../ATLAS/0.7.0.3.0/themes/theme.json           |  619 ++
 .../ATLAS/0.7.0.3.0/themes/theme_version_2.json |  845 +++
 .../configuration/falcon-logsearch-conf.xml     |   80 -
 .../0.5.0.2.1/package/scripts/falcon_client.py  |   10 -
 .../0.5.0.2.1/package/scripts/falcon_server.py  |   59 -
 .../templates/input.config-falcon.json.j2       |   48 +
 .../configuration/flume-logsearch-conf.xml      |   80 -
 .../FLUME/1.4.0.2.0/package/scripts/params.py   |   24 +-
 .../templates/flume-metrics2.properties.j2      |    2 +
 .../templates/input.config-flume.json.j2        |   53 +
 .../configuration/hbase-logsearch-conf.xml      |  111 -
 .../0.96.0.2.0/package/scripts/hbase_master.py  |   49 -
 .../package/scripts/hbase_regionserver.py       |   49 -
 .../0.96.0.2.0/package/scripts/params_linux.py  |   17 +-
 .../package/scripts/phoenix_queryserver.py      |    6 +-
 ...-metrics2-hbase.properties-GANGLIA-MASTER.j2 |    2 +
 ...doop-metrics2-hbase.properties-GANGLIA-RS.j2 |    3 +-
 .../templates/input.config-hbase.json.j2        |   79 +
 .../common-services/HBASE/2.0.0.3.0/alerts.json |  127 +
 .../HBASE/2.0.0.3.0/configuration/hbase-env.xml |  279 +
 .../2.0.0.3.0/configuration/hbase-log4j.xml     |  188 +
 .../2.0.0.3.0/configuration/hbase-policy.xml    |   53 +
 .../2.0.0.3.0/configuration/hbase-site.xml      |  774 ++
 .../configuration/ranger-hbase-audit.xml        |  132 +
 .../ranger-hbase-plugin-properties.xml          |  135 +
 .../ranger-hbase-policymgr-ssl.xml              |   66 +
 .../configuration/ranger-hbase-security.xml     |   74 +
 .../HBASE/2.0.0.3.0/kerberos.json               |  160 +
 .../HBASE/2.0.0.3.0/metainfo.xml                |  232 +
 .../HBASE/2.0.0.3.0/metrics.json                | 4733 +++++++++++++
 .../2.0.0.3.0/package/files/draining_servers.rb |  164 +
 .../package/files/hbase-smoke-cleanup.sh        |   23 +
 .../2.0.0.3.0/package/files/hbaseSmokeVerify.sh |   34 +
 .../HBASE/2.0.0.3.0/package/scripts/__init__.py |   19 +
 .../2.0.0.3.0/package/scripts/functions.py      |   54 +
 .../HBASE/2.0.0.3.0/package/scripts/hbase.py    |  230 +
 .../2.0.0.3.0/package/scripts/hbase_client.py   |   81 +
 .../package/scripts/hbase_decommission.py       |   94 +
 .../2.0.0.3.0/package/scripts/hbase_master.py   |  163 +
 .../package/scripts/hbase_regionserver.py       |  174 +
 .../2.0.0.3.0/package/scripts/hbase_service.py  |   66 +
 .../2.0.0.3.0/package/scripts/hbase_upgrade.py  |   42 +
 .../HBASE/2.0.0.3.0/package/scripts/params.py   |   28 +
 .../2.0.0.3.0/package/scripts/params_linux.py   |  426 ++
 .../2.0.0.3.0/package/scripts/params_windows.py |   43 +
 .../package/scripts/phoenix_queryserver.py      |   92 +
 .../package/scripts/phoenix_service.py          |   56 +
 .../2.0.0.3.0/package/scripts/service_check.py  |   99 +
 .../package/scripts/setup_ranger_hbase.py       |  106 +
 .../2.0.0.3.0/package/scripts/status_params.py  |   68 +
 .../HBASE/2.0.0.3.0/package/scripts/upgrade.py  |  106 +
 .../package/templates/hbase-smoke.sh.j2         |   44 +
 .../2.0.0.3.0/package/templates/hbase.conf.j2   |   35 +
 .../package/templates/hbase_client_jaas.conf.j2 |   23 +
 .../templates/hbase_grant_permissions.j2        |   39 +
 .../package/templates/hbase_master_jaas.conf.j2 |   26 +
 .../templates/hbase_queryserver_jaas.conf.j2    |   26 +
 .../templates/hbase_regionserver_jaas.conf.j2   |   26 +
 .../templates/input.config-hbase.json.j2        |   79 +
 .../package/templates/regionservers.j2          |   20 +
 .../HBASE/2.0.0.3.0/quicklinks/quicklinks.json  |   97 +
 .../HBASE/2.0.0.3.0/role_command_order.json     |   10 +
 .../HBASE/2.0.0.3.0/service_advisor.py          |  675 ++
 .../HBASE/2.0.0.3.0/themes/theme.json           |  407 ++
 .../HBASE/2.0.0.3.0/widgets.json                |  510 ++
 .../configuration/hdfs-logsearch-conf.xml       |  248 -
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |    6 +-
 .../package/alerts/alert_metrics_deviation.py   |   10 +-
 .../HDFS/2.1.0.2.0/package/scripts/datanode.py  |  103 +-
 .../package/scripts/datanode_upgrade.py         |   38 +-
 .../2.1.0.2.0/package/scripts/hdfs_client.py    |   45 -
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |   11 +-
 .../2.1.0.2.0/package/scripts/journalnode.py    |   57 -
 .../HDFS/2.1.0.2.0/package/scripts/namenode.py  |   57 -
 .../2.1.0.2.0/package/scripts/nfsgateway.py     |   58 -
 .../HDFS/2.1.0.2.0/package/scripts/params.py    |    2 +-
 .../2.1.0.2.0/package/scripts/params_linux.py   |    2 +
 .../HDFS/2.1.0.2.0/package/scripts/snamenode.py |   60 -
 .../HDFS/2.1.0.2.0/package/scripts/utils.py     |    5 +-
 .../2.1.0.2.0/package/scripts/zkfc_slave.py     |   43 -
 .../package/templates/input.config-hdfs.json.j2 |  216 +
 .../HDFS/3.0.0.3.0/configuration/hadoop-env.xml |  200 +-
 .../hadoop-metrics2.properties.xml              |    2 +
 .../HDFS/3.0.0.3.0/configuration/hdfs-log4j.xml |  382 +-
 .../common-services/HDFS/3.0.0.3.0/metainfo.xml |   10 +-
 .../HDFS/3.0.0.3.0/package/scripts/datanode.py  |   58 -
 .../3.0.0.3.0/package/scripts/hdfs_client.py    |   45 -
 .../3.0.0.3.0/package/scripts/journalnode.py    |   57 -
 .../HDFS/3.0.0.3.0/package/scripts/namenode.py  |   57 -
 .../3.0.0.3.0/package/scripts/nfsgateway.py     |   58 -
 .../HDFS/3.0.0.3.0/package/scripts/snamenode.py |   60 -
 .../3.0.0.3.0/package/scripts/zkfc_slave.py     |   43 -
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |    3 +-
 .../configuration/hive-logsearch-conf.xml       |  117 -
 .../package/alerts/alert_llap_app_status.py     |    4 +-
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |   25 +-
 .../package/scripts/hive_metastore.py           |   55 +-
 .../0.12.0.2.0/package/scripts/hive_server.py   |   61 -
 .../package/scripts/hive_server_interactive.py  |   64 -
 .../0.12.0.2.0/package/scripts/params_linux.py  |   28 +-
 .../package/scripts/setup_ranger_hive.py        |   58 +
 .../package/scripts/webhcat_server.py           |   67 -
 .../hadoop-metrics2-hivemetastore.properties.j2 |    2 +
 .../hadoop-metrics2-hiveserver2.properties.j2   |    2 +
 .../templates/hadoop-metrics2-llapdaemon.j2     |    4 +-
 .../hadoop-metrics2-llaptaskscheduler.j2        |    4 +-
 .../package/templates/input.config-hive.json.j2 |   85 +
 .../HIVE/2.1.0.3.0/configuration/hcat-env.xml   |   48 +-
 .../HIVE/2.1.0.3.0/configuration/hive-env.xml   |   80 +-
 .../configuration/hive-interactive-env.xml      |   63 +-
 .../common-services/HIVE/2.1.0.3.0/metainfo.xml |   11 +-
 .../package/alerts/alert_llap_app_status.py     |    4 +-
 .../2.1.0.3.0/package/scripts/hive_metastore.py |   55 +-
 .../2.1.0.3.0/package/scripts/hive_server.py    |   61 -
 .../package/scripts/hive_server_interactive.py  |   64 -
 .../2.1.0.3.0/package/scripts/params_linux.py   |   28 +-
 .../package/scripts/setup_ranger_hive.py        |   58 +
 .../2.1.0.3.0/package/scripts/webhcat_server.py |   67 -
 .../hadoop-metrics2-hivemetastore.properties.j2 |    2 +
 .../hadoop-metrics2-hiveserver2.properties.j2   |    2 +
 .../templates/hadoop-metrics2-llapdaemon.j2     |    4 +-
 .../hadoop-metrics2-llaptaskscheduler.j2        |    4 +-
 .../HIVE/2.1.0.3.0/service_advisor.py           |    7 +
 .../KAFKA/0.10.0.3.0/alerts.json                |   32 +
 .../0.10.0.3.0/configuration/kafka-broker.xml   |  559 ++
 .../0.10.0.3.0/configuration/kafka-env.xml      |  111 +
 .../0.10.0.3.0/configuration/kafka-log4j.xml    |  170 +
 .../configuration/kafka_client_jaas_conf.xml    |   41 +
 .../configuration/kafka_jaas_conf.xml           |   59 +
 .../configuration/ranger-kafka-audit.xml        |  130 +
 .../ranger-kafka-plugin-properties.xml          |  148 +
 .../ranger-kafka-policymgr-ssl.xml              |   66 +
 .../configuration/ranger-kafka-security.xml     |   64 +
 .../KAFKA/0.10.0.3.0/kerberos.json              |   76 +
 .../KAFKA/0.10.0.3.0/metainfo.xml               |  109 +
 .../KAFKA/0.10.0.3.0/metrics.json               |  239 +
 .../KAFKA/0.10.0.3.0/package/scripts/kafka.py   |  276 +
 .../0.10.0.3.0/package/scripts/kafka_broker.py  |  151 +
 .../KAFKA/0.10.0.3.0/package/scripts/params.py  |  341 +
 .../0.10.0.3.0/package/scripts/service_check.py |   70 +
 .../package/scripts/setup_ranger_kafka.py       |   90 +
 .../0.10.0.3.0/package/scripts/status_params.py |   26 +
 .../KAFKA/0.10.0.3.0/package/scripts/upgrade.py |   78 +
 .../KAFKA/0.10.0.3.0/package/scripts/utils.py   |   38 +
 .../templates/input.config-kafka.json.j2        |   92 +
 .../0.10.0.3.0/package/templates/kafka.conf.j2  |   35 +
 .../package/templates/kafka_client_jaas.conf.j2 |   29 +
 .../package/templates/kafka_jaas.conf.j2        |   41 +
 .../package/templates/tools-log4j.properties.j2 |   21 +
 .../KAFKA/0.10.0.3.0/role_command_order.json    |    7 +
 .../KAFKA/0.10.0.3.0/service_advisor.py         |  363 +
 .../KAFKA/0.10.0.3.0/widgets.json               |  182 +
 .../KAFKA/0.8.1/configuration/kafka-broker.xml  |   23 +-
 .../configuration/kafka-logsearch-conf.xml      |  124 -
 .../KAFKA/0.8.1/package/scripts/kafka_broker.py |    6 +
 .../KAFKA/0.8.1/package/scripts/params.py       |   18 +-
 .../0.8.1/package/scripts/service_check.py      |   15 +-
 .../templates/input.config-kafka.json.j2        |   92 +
 .../KAFKA/0.9.0/configuration/kafka-broker.xml  |    2 +-
 .../package/scripts/kerberos_client.py          |   21 -
 .../0.5.0.2.2/configuration/gateway-site.xml    |    2 +-
 .../configuration/knox-logsearch-conf.xml       |   93 -
 .../0.5.0.2.2/package/scripts/knox_gateway.py   |   61 -
 .../package/templates/input.config-knox.json.j2 |   60 +
 .../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-ambari-config.xml   |    1 +
 .../logfeeder-custom-logsearch-conf.xml         |   46 -
 .../configuration/logfeeder-properties.xml      |   10 +
 .../logsearch-common-properties.xml             |   23 +
 .../configuration/logsearch-properties.xml      |   10 -
 .../scripts/logsearch_config_aggregator.py      |   77 -
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |   57 +-
 .../0.5.0/package/scripts/service_check.py      |    9 +-
 .../0.5.0/package/scripts/setup_logfeeder.py    |   15 +-
 .../templates/HadoopServiceConfig.json.j2       |  545 +-
 .../templates/input.config-logsearch.json.j2    |    6 +-
 .../LOGSEARCH/0.5.0/themes/theme.json           |    4 +-
 .../configuration/oozie-logsearch-conf.xml      |   80 -
 .../4.0.0.2.0/package/scripts/oozie_server.py   |   63 -
 .../templates/input.config-oozie.json.j2        |   48 +
 .../common-services/OOZIE/4.2.0.3.0/alerts.json |   45 +
 .../OOZIE/4.2.0.3.0/configuration/oozie-env.xml |  255 +
 .../4.2.0.3.0/configuration/oozie-log4j.xml     |  149 +
 .../4.2.0.3.0/configuration/oozie-site.xml      |  254 +
 .../OOZIE/4.2.0.3.0/kerberos.json               |   70 +
 .../OOZIE/4.2.0.3.0/metainfo.xml                |  203 +
 .../package/alerts/alert_check_oozie_server.py  |  244 +
 .../4.2.0.3.0/package/files/oozieSmoke2.sh      |   84 +
 .../files/prepareOozieHdfsDirectories.sh        |   42 +
 .../4.2.0.3.0/package/files/wrap_ooziedb.sh     |   31 +
 .../scripts/check_oozie_server_status.py        |   38 +
 .../OOZIE/4.2.0.3.0/package/scripts/oozie.py    |  516 ++
 .../4.2.0.3.0/package/scripts/oozie_client.py   |   78 +
 .../4.2.0.3.0/package/scripts/oozie_server.py   |  163 +
 .../package/scripts/oozie_server_upgrade.py     |  237 +
 .../4.2.0.3.0/package/scripts/oozie_service.py  |  188 +
 .../OOZIE/4.2.0.3.0/package/scripts/params.py   |   39 +
 .../4.2.0.3.0/package/scripts/params_linux.py   |  374 +
 .../4.2.0.3.0/package/scripts/params_windows.py |   34 +
 .../4.2.0.3.0/package/scripts/service_check.py  |  140 +
 .../4.2.0.3.0/package/scripts/status_params.py  |   65 +
 .../package/templates/adminusers.txt.j2         |   28 +
 .../templates/input.config-oozie.json.j2        |   48 +
 .../package/templates/oozie-log4j.properties.j2 |   93 +
 .../4.2.0.3.0/package/templates/oozie.conf.j2   |   35 +
 .../package/templates/zkmigrator_jaas.conf.j2   |   26 +
 .../OOZIE/4.2.0.3.0/quicklinks/quicklinks.json  |   45 +
 .../OOZIE/4.2.0.3.0/role_command_order.json     |    9 +
 .../OOZIE/4.2.0.3.0/themes/theme.json           |  116 +
 .../configuration/ranger-logsearch-conf.xml     |  111 -
 .../0.4.0/package/scripts/setup_ranger_xml.py   |  119 +-
 .../templates/input.config-ranger.json.j2       |   79 +
 .../RANGER/0.5.0/role_command_order.json        |    2 +-
 .../RANGER/0.7.0.3.0/alerts.json                |   76 +
 .../0.7.0.3.0/configuration/admin-log4j.xml     |  132 +
 .../configuration/admin-properties.xml          |  163 +
 .../configuration/atlas-tagsync-ssl.xml         |   72 +
 .../configuration/ranger-admin-site.xml         |  785 +++
 .../0.7.0.3.0/configuration/ranger-env.xml      |  513 ++
 .../0.7.0.3.0/configuration/ranger-site.xml     |   30 +
 .../configuration/ranger-solr-configuration.xml |   59 +
 .../ranger-tagsync-policymgr-ssl.xml            |   72 +
 .../configuration/ranger-tagsync-site.xml       |  206 +
 .../configuration/ranger-ugsync-site.xml        |  574 ++
 .../tagsync-application-properties.xml          |   62 +
 .../0.7.0.3.0/configuration/tagsync-log4j.xml   |   90 +
 .../0.7.0.3.0/configuration/usersync-log4j.xml  |   89 +
 .../configuration/usersync-properties.xml       |   32 +
 .../RANGER/0.7.0.3.0/kerberos.json              |  153 +
 .../RANGER/0.7.0.3.0/metainfo.xml               |  189 +
 .../alerts/alert_ranger_admin_passwd_check.py   |  195 +
 .../RANGER/0.7.0.3.0/package/scripts/params.py  |  448 ++
 .../0.7.0.3.0/package/scripts/ranger_admin.py   |  217 +
 .../0.7.0.3.0/package/scripts/ranger_service.py |   69 +
 .../0.7.0.3.0/package/scripts/ranger_tagsync.py |  139 +
 .../package/scripts/ranger_usersync.py          |  124 +
 .../0.7.0.3.0/package/scripts/service_check.py  |   49 +
 .../0.7.0.3.0/package/scripts/setup_ranger.py   |  153 +
 .../package/scripts/setup_ranger_xml.py         |  853 +++
 .../0.7.0.3.0/package/scripts/status_params.py  |   39 +
 .../RANGER/0.7.0.3.0/package/scripts/upgrade.py |   31 +
 .../templates/input.config-ranger.json.j2       |   79 +
 .../package/templates/ranger_admin_pam.j2       |   22 +
 .../package/templates/ranger_remote_pam.j2      |   22 +
 .../package/templates/ranger_solr_jaas_conf.j2  |   26 +
 .../properties/ranger-solrconfig.xml.j2         | 1874 +++++
 .../RANGER/0.7.0.3.0/quicklinks/quicklinks.json |   41 +
 .../RANGER/0.7.0.3.0/role_command_order.json    |    9 +
 .../RANGER/0.7.0.3.0/service_advisor.py         |  793 +++
 .../0.7.0.3.0/themes/theme_version_1.json       |  722 ++
 .../0.7.0.3.0/themes/theme_version_2.json       | 1470 ++++
 .../0.7.0.3.0/themes/theme_version_3.json       |  692 ++
 .../0.7.0.3.0/themes/theme_version_5.json       |   48 +
 .../RANGER/0.7.0/configuration/ranger-env.xml   |   22 +
 .../0.7.0/properties/ranger-solrconfig.xml.j2   |    9 +-
 .../RANGER/0.7.0/themes/theme_version_5.json    |   26 +
 .../configuration/ranger-kms-logsearch-conf.xml |   80 -
 .../RANGER_KMS/0.5.0.2.3/metainfo.xml           |    9 +
 .../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py |   20 +
 .../0.5.0.2.3/package/scripts/params.py         |   34 +-
 .../templates/input.config-ranger-kms.json.j2   |   48 +
 .../0.5.0.2.3/role_command_order.json           |    2 +-
 .../RANGER_KMS/0.5.0.3.0/alerts.json            |   32 +
 .../0.5.0.3.0/configuration/dbks-site.xml       |  206 +
 .../0.5.0.3.0/configuration/kms-env.xml         |  116 +
 .../0.5.0.3.0/configuration/kms-log4j.xml       |  120 +
 .../0.5.0.3.0/configuration/kms-properties.xml  |  166 +
 .../0.5.0.3.0/configuration/kms-site.xml        |  133 +
 .../configuration/ranger-kms-audit.xml          |  124 +
 .../configuration/ranger-kms-policymgr-ssl.xml  |   68 +
 .../configuration/ranger-kms-security.xml       |   64 +
 .../0.5.0.3.0/configuration/ranger-kms-site.xml |  104 +
 .../RANGER_KMS/0.5.0.3.0/kerberos.json          |   84 +
 .../RANGER_KMS/0.5.0.3.0/metainfo.xml           |  115 +
 .../RANGER_KMS/0.5.0.3.0/package/scripts/kms.py |  677 ++
 .../0.5.0.3.0/package/scripts/kms_server.py     |  117 +
 .../0.5.0.3.0/package/scripts/kms_service.py    |   58 +
 .../0.5.0.3.0/package/scripts/params.py         |  331 +
 .../0.5.0.3.0/package/scripts/service_check.py  |   41 +
 .../0.5.0.3.0/package/scripts/status_params.py  |   36 +
 .../0.5.0.3.0/package/scripts/upgrade.py        |   30 +
 .../templates/input.config-ranger-kms.json.j2   |   48 +
 .../0.5.0.3.0/role_command_order.json           |    7 +
 .../RANGER_KMS/0.5.0.3.0/service_advisor.py     |  281 +
 .../0.5.0.3.0/themes/theme_version_1.json       |  303 +
 .../0.5.0.3.0/themes/theme_version_2.json       |  124 +
 .../common-services/SPARK/1.2.1/alerts.json     |   48 +
 .../configuration/spark-logsearch-conf.xml      |   98 -
 .../scripts/alerts/alert_spark_livy_port.py     |  148 +
 .../scripts/alerts/alert_spark_thrift_port.py   |  151 +
 .../SPARK/1.2.1/package/scripts/params.py       |    3 +-
 .../1.2.1/package/scripts/service_check.py      |    2 +-
 .../templates/input.config-spark.json.j2        |   66 +
 .../SPARK/1.2.1/quicklinks/quicklinks.json      |    1 +
 .../common-services/SPARK/2.2.0/metainfo.xml    |   13 +-
 .../2.2.0/package/scripts/job_history_server.py |  108 +
 .../SPARK/2.2.0/package/scripts/livy_server.py  |  151 +
 .../SPARK/2.2.0/package/scripts/livy_service.py |   48 +
 .../SPARK/2.2.0/package/scripts/params.py       |  268 +
 .../2.2.0/package/scripts/service_check.py      |   62 +
 .../SPARK/2.2.0/package/scripts/setup_livy.py   |   88 +
 .../SPARK/2.2.0/package/scripts/setup_spark.py  |  116 +
 .../SPARK/2.2.0/package/scripts/spark_client.py |   62 +
 .../2.2.0/package/scripts/spark_service.py      |  146 +
 .../package/scripts/spark_thrift_server.py      |   91 +
 .../2.2.0/package/scripts/status_params.py      |   45 +
 .../SPARK/2.2.0/scripts/job_history_server.py   |  106 -
 .../SPARK/2.2.0/scripts/livy_server.py          |  149 -
 .../SPARK/2.2.0/scripts/livy_service.py         |   48 -
 .../SPARK/2.2.0/scripts/params.py               |  266 -
 .../SPARK/2.2.0/scripts/service_check.py        |   62 -
 .../SPARK/2.2.0/scripts/setup_livy.py           |   88 -
 .../SPARK/2.2.0/scripts/setup_spark.py          |  116 -
 .../SPARK/2.2.0/scripts/spark_client.py         |   60 -
 .../SPARK/2.2.0/scripts/spark_service.py        |  145 -
 .../SPARK/2.2.0/scripts/spark_thrift_server.py  |   89 -
 .../SPARK/2.2.0/scripts/status_params.py        |   45 -
 .../common-services/SPARK2/2.0.0/alerts.json    |   48 +
 .../configuration/spark2-logsearch-conf.xml     |   98 -
 .../scripts/alerts/alert_spark2_livy_port.py    |  148 +
 .../scripts/alerts/alert_spark2_thrift_port.py  |  152 +
 .../SPARK2/2.0.0/package/scripts/params.py      |    3 +-
 .../2.0.0/package/scripts/service_check.py      |    2 +-
 .../templates/input.config-spark2.json.j2       |   66 +
 .../SPARK2/2.0.0/quicklinks/quicklinks.json     |    1 +
 .../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/configuration/storm-env.xml     |   11 +
 .../configuration/storm-logsearch-conf.xml      |  110 -
 .../STORM/0.9.1/package/scripts/drpc_server.py  |   52 -
 .../STORM/0.9.1/package/scripts/nimbus.py       |   45 -
 .../STORM/0.9.1/package/scripts/pacemaker.py    |   52 -
 .../STORM/0.9.1/package/scripts/params_linux.py |   14 +-
 .../STORM/0.9.1/package/scripts/ui_server.py    |   53 -
 .../0.9.1/package/templates/config.yaml.j2      |    2 +
 .../templates/input.config-storm.json.j2        |   78 +
 .../templates/storm-metrics2.properties.j2      |    2 +
 .../0.9.1/package/templates/storm_jaas.conf.j2  |    8 +
 .../common-services/STORM/1.0.1.3.0/alerts.json |  145 +
 .../configuration/ranger-storm-audit.xml        |  133 +
 .../ranger-storm-plugin-properties.xml          |  121 +
 .../ranger-storm-policymgr-ssl.xml              |   70 +
 .../configuration/ranger-storm-security.xml     |   67 +
 .../storm-atlas-application.properties.xml      |   31 +
 .../configuration/storm-cluster-log4j.xml       |  133 +
 .../STORM/1.0.1.3.0/configuration/storm-env.xml |  165 +
 .../1.0.1.3.0/configuration/storm-site.xml      | 1002 +++
 .../configuration/storm-worker-log4j.xml        |  189 +
 .../STORM/1.0.1.3.0/kerberos.json               |  134 +
 .../STORM/1.0.1.3.0/metainfo.xml                |  179 +
 .../STORM/1.0.1.3.0/metrics.json                | 1202 ++++
 .../alerts/check_supervisor_process_win.py      |   50 +
 .../STORM/1.0.1.3.0/package/files/wordCount.jar |  Bin 0 -> 690588 bytes
 .../1.0.1.3.0/package/scripts/drpc_server.py    |   91 +
 .../STORM/1.0.1.3.0/package/scripts/nimbus.py   |  116 +
 .../1.0.1.3.0/package/scripts/nimbus_prod.py    |   81 +
 .../1.0.1.3.0/package/scripts/pacemaker.py      |   90 +
 .../STORM/1.0.1.3.0/package/scripts/params.py   |   28 +
 .../1.0.1.3.0/package/scripts/params_linux.py   |  424 ++
 .../1.0.1.3.0/package/scripts/params_windows.py |   60 +
 .../STORM/1.0.1.3.0/package/scripts/rest_api.py |   85 +
 .../STORM/1.0.1.3.0/package/scripts/service.py  |   95 +
 .../1.0.1.3.0/package/scripts/service_check.py  |   79 +
 .../package/scripts/setup_ranger_storm.py       |  133 +
 .../1.0.1.3.0/package/scripts/status_params.py  |   83 +
 .../STORM/1.0.1.3.0/package/scripts/storm.py    |  182 +
 .../1.0.1.3.0/package/scripts/storm_upgrade.py  |  177 +
 .../package/scripts/storm_yaml_utils.py         |   53 +
 .../1.0.1.3.0/package/scripts/supervisor.py     |  117 +
 .../package/scripts/supervisor_prod.py          |   84 +
 .../package/scripts/supervisord_service.py      |   33 +
 .../1.0.1.3.0/package/scripts/ui_server.py      |  137 +
 .../package/templates/client_jaas.conf.j2       |   33 +
 .../1.0.1.3.0/package/templates/config.yaml.j2  |   72 +
 .../templates/input.config-storm.json.j2        |   78 +
 .../templates/storm-metrics2.properties.j2      |   32 +
 .../1.0.1.3.0/package/templates/storm.conf.j2   |   35 +
 .../package/templates/storm_jaas.conf.j2        |   65 +
 .../package/templates/worker-launcher.cfg.j2    |   19 +
 .../STORM/1.0.1.3.0/quicklinks/quicklinks.json  |   45 +
 .../STORM/1.0.1.3.0/role_command_order.json     |   13 +
 .../STORM/1.0.1.3.0/service_advisor.py          |  387 +
 .../STORM/1.0.1.3.0/widgets.json                |  127 +
 .../STORM/1.1.0/configuration/storm-site.xml    |   44 +
 .../common-services/STORM/1.1.0/kerberos.json   |  138 +
 .../common-services/STORM/1.1.0/metainfo.xml    |   44 +
 .../mapred-logsearch-conf.xml                   |   80 -
 .../configuration/yarn-logsearch-conf.xml       |  104 -
 .../scripts/application_timeline_server.py      |   61 -
 .../2.1.0.2.0/package/scripts/historyserver.py  |   56 -
 .../2.1.0.2.0/package/scripts/nodemanager.py    |   60 -
 .../package/scripts/resourcemanager.py          |   60 -
 .../YARN/2.1.0.2.0/package/scripts/yarn.py      |   36 +-
 .../templates/input.config-mapreduce2.json.j2   |   48 +
 .../package/templates/input.config-yarn.json.j2 |   72 +
 .../YARN/3.0.0.3.0/configuration/yarn-env.xml   |  206 +-
 .../YARN/3.0.0.3.0/configuration/yarn-log4j.xml |  126 +-
 .../YARN/3.0.0.3.0/configuration/yarn-site.xml  |   19 +-
 .../common-services/YARN/3.0.0.3.0/metainfo.xml |    4 +-
 .../scripts/application_timeline_server.py      |   61 -
 .../3.0.0.3.0/package/scripts/historyserver.py  |   56 -
 .../3.0.0.3.0/package/scripts/nodemanager.py    |   60 -
 .../package/scripts/resourcemanager.py          |   60 -
 .../YARN/3.0.0.3.0/package/scripts/yarn.py      |   36 +-
 .../YARN/3.0.0.3.0/service_advisor.py           |  108 +
 .../configuration/zeppelin-logsearch-conf.xml   |   80 -
 .../0.6.0.2.5/package/scripts/master.py         |    6 +
 .../templates/input.config-zeppelin.json.j2     |   48 +
 .../3.4.5/configuration/zookeeper-log4j.xml     |    2 +-
 .../configuration/zookeeper-logsearch-conf.xml  |   76 -
 .../3.4.5/package/scripts/zookeeper_server.py   |   51 -
 .../templates/input.config-zookeeper.json.j2    |   46 +
 .../custom_actions/scripts/install_packages.py  |    2 +-
 .../custom_actions/scripts/ru_execute_tasks.py  |    2 +
 .../src/main/resources/properties.json          |   10 +-
 .../scripts/check_ambari_permissions.py         |   25 +-
 .../scripts/relocate_host_components.py         |  489 --
 .../0.8/services/HDFS/package/scripts/params.py |    2 +-
 .../HIVE/package/scripts/mysql_service.py       |    5 +-
 .../HIVE/package/scripts/postgresql_service.py  |    5 +-
 .../2.0.6/hooks/after-INSTALL/scripts/params.py |   14 +
 .../scripts/shared_initialization.py            |   17 +
 .../before-ANY/scripts/shared_initialization.py |    4 +-
 .../2.0.6/hooks/before-START/scripts/params.py  |   16 +-
 .../templates/hadoop-metrics2.properties.j2     |    2 +
 .../HDP/2.0.6/properties/stack_features.json    |   21 +
 .../stacks/HDP/2.1/services/stack_advisor.py    |   11 +-
 .../services/YARN/configuration/yarn-site.xml   |    8 +-
 .../stacks/HDP/2.2/services/stack_advisor.py    |   61 +-
 .../stacks/HDP/2.3/role_command_order.json      |    4 +-
 .../stacks/HDP/2.3/services/stack_advisor.py    |   35 +-
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |   31 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml |   75 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml |   73 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |   77 +-
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   77 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml     |    8 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml     |    5 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml     |    6 +-
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |    6 +-
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |   31 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml |   73 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |   77 +-
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   79 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml     |    8 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml     |    4 +-
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |    4 +-
 .../services/ATLAS/configuration/atlas-env.xml  |    2 +-
 .../stacks/HDP/2.5/services/stack_advisor.py    |   28 +
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  302 +-
 .../HDP/2.5/upgrades/host-upgrade-2.5.xml       |   50 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml |   87 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  125 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml     |   10 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |    8 +-
 .../services/ATLAS/configuration/atlas-env.xml  |   41 +
 .../hadoop-metrics2.properties.xml              |    2 +
 .../configuration/hive-interactive-site.xml     |   11 +-
 .../HIVE/configuration/tez-interactive-site.xml |   37 +
 .../stacks/HDP/2.6/services/STORM/metainfo.xml  |    4 +
 .../services/YARN/configuration/yarn-env.xml    |   18 +
 .../services/YARN/configuration/yarn-site.xml   |   22 +
 .../stacks/HDP/2.6/services/stack_advisor.py    |  122 +-
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  |   30 +
 .../HDP/2.6/upgrades/host-upgrade-2.6.xml       |   48 +-
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |   87 +-
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |    9 +-
 .../before-ANY/scripts/shared_initialization.py |    4 +-
 .../3.0/hooks/before-START/scripts/params.py    |   16 +-
 .../templates/hadoop-metrics2.properties.j2     |    2 +
 .../stacks/HDP/3.0/services/ATLAS/metainfo.xml  |   27 +
 .../stacks/HDP/3.0/services/HBASE/metainfo.xml  |   26 +
 .../services/HDFS/configuration/hadoop-env.xml  |    2 +-
 .../stacks/HDP/3.0/services/KAFKA/metainfo.xml  |   27 +
 .../stacks/HDP/3.0/services/KNOX/metainfo.xml   |   27 +
 .../stacks/HDP/3.0/services/OOZIE/metainfo.xml  |   27 +
 .../stacks/HDP/3.0/services/RANGER/metainfo.xml |   27 +
 .../HDP/3.0/services/RANGER_KMS/metainfo.xml    |   27 +
 .../stacks/HDP/3.0/services/SQOOP/metainfo.xml  |   27 +
 .../stacks/HDP/3.0/services/STORM/metainfo.xml  |   27 +
 .../YARN/configuration-mapred/mapred-env.xml    |    2 +-
 .../YARN/configuration-mapred/mapred-site.xml   |   12 +-
 .../configuration/hbase-logsearch-conf.xml      |  111 -
 .../templates/input.config-hbase.json.j2        |   79 +
 .../configuration/hdfs-logsearch-conf.xml       |  248 -
 .../package/templates/input.config-hdfs.json.j2 |  216 +
 .../KERBEROS/package/scripts/kerberos_client.py |   21 -
 .../src/main/resources/upgrade-pack.xsd         |    1 +
 .../src/main/sh/azuredb_create_generator.sh     |   26 +
 .../ExecutionCommandWrapperTest.java            |    4 +-
 .../ambari/server/actionmanager/StageTest.java  |    2 +-
 .../actionmanager/TestActionDBAccessorImpl.java |   34 +-
 .../server/actionmanager/TestActionManager.java |   44 +-
 .../actionmanager/TestActionScheduler.java      |   43 +-
 .../ambari/server/actionmanager/TestStage.java  |    5 +-
 .../server/agent/HeartbeatProcessorTest.java    |   11 +-
 .../server/agent/HeartbeatTestHelper.java       |    4 +-
 .../server/agent/TestHeartbeatHandler.java      |   17 +-
 .../ComponentVersionAlertRunnableTest.java      |  362 +
 .../server/api/query/JpaSortBuilderTest.java    |    4 -
 .../render/ClusterBlueprintRendererTest.java    |   38 +-
 .../resources/BaseResourceDefinitionTest.java   |    2 +-
 .../server/api/services/AmbariMetaInfoTest.java |   14 +-
 .../StackAdvisorBlueprintProcessorTest.java     |   10 +-
 .../checks/AbstractCheckDescriptorTest.java     |   87 +-
 .../DatabaseConsistencyCheckHelperTest.java     |   73 +-
 ...duce2JobHistoryStatePreservingCheckTest.java |   15 +
 .../checks/ServiceCheckValidityCheckTest.java   |    1 -
 .../ServicesNamenodeTruncateCheckTest.java      |   17 +
 .../AmbariManagementControllerImplTest.java     |    6 +-
 .../AmbariManagementControllerTest.java         |   27 +-
 .../server/controller/KerberosHelperTest.java   |  105 +-
 .../GSInstallerClusterProviderTest.java         |  104 -
 .../GSInstallerComponentProviderTest.java       |  102 -
 .../GSInstallerHostComponentProviderTest.java   |  149 -
 .../GSInstallerHostProviderTest.java            |  153 -
 .../GSInstallerNoOpProviderTest.java            |   46 -
 .../GSInstallerServiceProviderTest.java         |  166 -
 .../TestGSInstallerStateProvider.java           |   36 -
 .../AbstractJDBCResourceProviderTest.java       |    2 +-
 .../BlueprintConfigurationProcessorTest.java    |  720 +-
 .../internal/CalculatedStatusTest.java          |    2 +-
 ...ClusterStackVersionResourceProviderTest.java |  284 +-
 .../internal/ComponentResourceProviderTest.java |   28 +-
 .../internal/HostResourceProviderTest.java      |    5 +-
 .../internal/ProvisionClusterRequestTest.java   |   32 -
 .../controller/internal/RequestImplTest.java    |    4 +-
 .../internal/RequestResourceProviderTest.java   |   68 +-
 .../internal/RequestStageContainerTest.java     |    2 +-
 .../internal/ScaleClusterRequestTest.java       |    6 -
 .../internal/TaskResourceProviderTest.java      |    8 +
 .../internal/UpgradeResourceProviderTest.java   |   66 +-
 .../LogSearchDataRetrievalServiceTest.java      |  248 +-
 .../logging/LoggingRequestHelperImplTest.java   |    9 +
 .../credentialapi/CredentialUtilTest.java       |    1 -
 .../apache/ambari/server/events/EventsTest.java |    4 -
 .../AlertMaintenanceModeListenerTest.java       |    4 +
 .../HostVersionOutOfSyncListenerTest.java       |   42 +-
 .../server/hooks/users/UserHookServiceTest.java |    4 +-
 .../metadata/AgentAlertDefinitionsTest.java     |    2 +-
 .../system/impl/TestAmbariMetricsSinkImpl.java  |   10 +
 .../apache/ambari/server/orm/OrmTestHelper.java |   13 +-
 .../server/orm/dao/HostRoleCommandDAOTest.java  |    2 -
 .../ambari/server/orm/dao/UserDAOTest.java      |    3 +-
 .../orm/entities/HostRoleCommandEntityTest.java |   49 +
 .../server/security/SecurityHelperImplTest.java |    3 +-
 ...ariAuthorizationProviderDisableUserTest.java |    2 +-
 .../AmbariLocalUserProviderTest.java            |    2 +-
 .../AmbariPamAuthenticationProviderTest.java    |   47 +-
 .../AmbariUserAuthenticationFilterTest.java     |    2 +-
 .../security/authorization/UserNameTest.java    |   70 +
 .../security/authorization/UsersTest.java       |    2 +-
 .../ldap/AmbariLdapDataPopulatorTest.java       |    3 +-
 .../serveraction/ServerActionExecutorTest.java  |    9 +-
 .../ComponentVersionCheckActionTest.java        |   69 +-
 .../QuickLinksConfigurationModuleTest.java      |   10 +
 .../stack/StackManagerCommonServicesTest.java   |    4 +-
 .../server/stack/StackManagerExtensionTest.java |   73 +-
 .../server/stack/StackManagerMiscTest.java      |   13 +-
 .../ambari/server/stack/StackManagerMock.java   |    5 +-
 .../ambari/server/stack/StackManagerTest.java   |   33 +-
 .../ambari/server/stack/ThemeModuleTest.java    |   12 +-
 .../server/stageplanner/TestStagePlanner.java   |    2 +-
 .../server/state/ServiceComponentTest.java      |   72 +
 .../ambari/server/state/UpgradeHelperTest.java  |   36 +-
 .../state/alerts/AlertDefinitionHashTest.java   |    2 +-
 .../state/alerts/AlertEventPublisherTest.java   |    3 -
 .../state/alerts/InitialAlertEventTest.java     |    3 -
 .../state/cluster/AlertDataManagerTest.java     |    4 +-
 .../cluster/ClusterEffectiveVersionTest.java    |    2 +
 .../server/state/cluster/ClusterTest.java       |   62 +-
 ...omponentHostConcurrentWriteDeadlockTest.java |    4 -
 .../server/topology/BlueprintImplTest.java      |   13 -
 .../ClusterConfigurationRequestTest.java        |   18 +-
 .../ClusterDeployWithStartOnlyTest.java         |   38 +-
 ...InstallWithoutStartOnComponentLevelTest.java |   34 +-
 .../ClusterInstallWithoutStartTest.java         |   38 +-
 .../topology/ClusterTopologyImplTest.java       |   57 +-
 .../server/topology/LogicalRequestTest.java     |   64 +
 .../topology/RequiredPasswordValidatorTest.java |  113 +-
 .../server/topology/TopologyManagerTest.java    |   14 +-
 .../validators/HiveServiceValidatorTest.java    |    3 +
 .../RequiredConfigPropertiesValidatorTest.java  |  302 +
 .../StackConfigTypeValidatorTest.java           |  126 +
 .../ambari/server/upgrade/SectionDDL.java       |    4 +-
 .../server/upgrade/UpgradeCatalog212Test.java   |   34 +-
 .../server/upgrade/UpgradeCatalog240Test.java   |    3 +-
 .../server/upgrade/UpgradeCatalog250Test.java   |   28 +-
 .../server/upgrade/UpgradeCatalog251Test.java   |  263 +
 .../server/upgrade/UpgradeCatalog252Test.java   |  166 +
 .../server/upgrade/UpgradeCatalog300Test.java   |  139 +
 .../ambari/server/utils/StageUtilsTest.java     |    2 +-
 .../view/ViewInstanceOperationHandlerTest.java  |  105 +
 .../ambari/server/view/ViewRegistryTest.java    |   38 +-
 .../src/test/python/TestAmbariServer.py         |  409 +-
 ambari-server/src/test/python/TestMpacks.py     |   17 +-
 .../src/test/python/TestResourceFilesKeeper.py  |   29 +-
 .../stacks/2.0.6/HBASE/test_hbase_master.py     |  102 -
 .../2.0.6/HBASE/test_hbase_regionserver.py      |  104 -
 .../python/stacks/2.0.6/HDFS/test_datanode.py   |  177 +-
 .../stacks/2.0.6/HDFS/test_hdfs_client.py       |  110 +-
 .../stacks/2.0.6/HDFS/test_journalnode.py       |  114 -
 .../python/stacks/2.0.6/HDFS/test_namenode.py   |  114 -
 .../python/stacks/2.0.6/HDFS/test_nfsgateway.py |  116 -
 .../python/stacks/2.0.6/HDFS/test_snamenode.py  |  117 +-
 .../test/python/stacks/2.0.6/HDFS/test_zkfc.py  |  102 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |  112 -
 .../stacks/2.0.6/HIVE/test_webhcat_server.py    |  116 -
 .../stacks/2.0.6/OOZIE/test_oozie_server.py     |  113 -
 .../stacks/2.0.6/YARN/test_historyserver.py     |  304 +-
 .../stacks/2.0.6/YARN/test_nodemanager.py       |  305 +-
 .../stacks/2.0.6/YARN/test_resourcemanager.py   |  160 +-
 .../2.0.6/ZOOKEEPER/test_zookeeper_server.py    |  103 -
 .../python/stacks/2.0.6/configs/default.json    |    4 +-
 .../hooks/after-INSTALL/test_after_install.py   |   25 +-
 .../stacks/2.1/FALCON/test_falcon_client.py     |   24 -
 .../stacks/2.1/FALCON/test_falcon_server.py     |  109 -
 .../stacks/2.1/HIVE/test_hive_metastore.py      |  120 +-
 .../stacks/2.1/STORM/test_storm_drpc_server.py  |  104 -
 .../stacks/2.1/STORM/test_storm_nimbus.py       |  103 -
 .../stacks/2.1/STORM/test_storm_ui_server.py    |   82 -
 .../stacks/2.1/YARN/test_apptimelineserver.py   |  150 +-
 .../stacks/2.1/common/test_stack_advisor.py     |    7 +-
 .../python/stacks/2.2/KNOX/test_knox_gateway.py |  102 -
 .../test/python/stacks/2.3/YARN/test_ats_1_5.py |   98 +-
 .../stacks/2.4/AMBARI_INFRA/test_infra_solr.py  |    3 +
 .../stacks/2.4/LOGSEARCH/test_logfeeder.py      |   29 +-
 .../stacks/2.4/LOGSEARCH/test_logsearch.py      |    4 +-
 .../test/python/stacks/2.4/configs/default.json |    3 +
 .../stacks/2.5/ATLAS/test_atlas_server.py       |   42 -
 .../stacks/2.5/RANGER_KMS/test_kms_server.py    |  111 +-
 .../stacks/2.5/common/test_stack_advisor.py     |  415 ++
 .../stacks/2.5/configs/ranger-kms-secured.json  |    2 +-
 .../stacks/2.6/common/test_stack_advisor.py     |  461 +-
 ambari-server/src/test/python/unitTests.py      |    2 +-
 .../resources/extensions/EXT/0.1/metainfo.xml   |    2 +-
 .../resources/extensions/EXT/0.2/metainfo.xml   |    3 +-
 .../resources/extensions/EXT/0.3/metainfo.xml   |   32 +
 .../EXT/0.3/services/OOZIE2/metainfo.xml        |  118 +
 .../services/OOZIE2/themes/broken_theme.json    |    3 +
 .../stacks/HDP/2.1.1/upgrades/upgrade_test.xml  |    2 +-
 .../HDP/2.2.0/upgrades/upgrade_test_checks.xml  |   21 +-
 .../stacks_with_extensions/HDP/0.3/metainfo.xml |   22 +
 .../HDP/0.3/repos/repoinfo.xml                  |   63 +
 .../HDP/0.3/services/HBASE/metainfo.xml         |   26 +
 .../0.3/services/HDFS/configuration/global.xml  |  145 +
 .../services/HDFS/configuration/hadoop-env.xml  |  223 +
 .../services/HDFS/configuration/hbase-site.xml  |  137 +
 .../services/HDFS/configuration/hdfs-log4j.xml  |  199 +
 .../services/HDFS/configuration/hdfs-site.xml   |  396 ++
 .../HDP/0.3/services/HDFS/metainfo.xml          |   30 +
 .../0.3/services/HDFS/package/dummy-script.py   |   20 +
 .../HDP/0.3/services/HIVE/metainfo.xml          |   26 +
 .../HDP/0.3/services/MAPREDUCE/metainfo.xml     |   23 +
 .../HDP/0.3/services/ZOOKEEPER/metainfo.xml     |   26 +
 ambari-web/app/app.js                           |   13 +
 .../global/background_operations_controller.js  |   12 +-
 ambari-web/app/controllers/installer.js         |   29 +-
 .../journalNode/step1_controller.js             |    2 +-
 .../main/admin/stack_and_upgrade_controller.js  |    5 +
 .../manage_alert_notifications_controller.js    |   28 +-
 .../controllers/main/service/add_controller.js  |    3 +
 .../controllers/main/service/info/summary.js    |    2 +-
 .../service/manage_config_groups_controller.js  |   89 +-
 ambari-web/app/controllers/wizard.js            |   44 +-
 .../app/controllers/wizard/step1_controller.js  |    7 +
 .../wizard/step7/assign_master_controller.js    |  291 +-
 .../app/controllers/wizard/step7_controller.js  |    1 +
 .../app/controllers/wizard/step8_controller.js  |  167 +-
 .../app/controllers/wizard/step9_controller.js  |    2 +-
 ambari-web/app/mappers/stack_mapper.js          |    1 +
 ambari-web/app/messages.js                      |   11 +-
 .../app/mixins/common/configs/configs_saver.js  |   32 +-
 .../mixins/wizard/assign_master_components.js   |   77 +-
 .../app/mixins/wizard/wizardHostsLoading.js     |    6 +-
 ambari-web/app/models/stack.js                  |    1 +
 ambari-web/app/routes/add_service_routes.js     |    1 +
 ambari-web/app/routes/installer.js              |    1 +
 ambari-web/app/routes/main.js                   |    2 +-
 ambari-web/app/styles/alerts.less               |   19 +-
 ambari-web/app/styles/application.less          |   17 +-
 ambari-web/app/styles/bootstrap_overrides.less  |    5 +
 .../app/styles/theme/bootstrap-ambari.css       |   75 +-
 ambari-web/app/styles/top-nav.less              |    2 +-
 ambari-web/app/styles/wizard.less               |    3 +
 .../stack_upgrade/stack_upgrade_wizard.hbs      |   24 +-
 .../admin/stack_upgrade/upgrade_version_box.hbs |    3 +
 ambari-web/app/templates/main/alerts.hbs        |   16 +-
 .../main/alerts/create_alert_notification.hbs   |   12 +
 ambari-web/app/templates/wizard/step1.hbs       |    6 +-
 ambari-web/app/templates/wizard/step10.hbs      |    2 +-
 ambari-web/app/templates/wizard/step3.hbs       |    2 +-
 .../wizard/step3/step3_host_warnings_popup.hbs  |    4 +-
 ambari-web/app/templates/wizard/step4.hbs       |   20 +-
 ambari-web/app/templates/wizard/step6.hbs       |    4 +-
 ambari-web/app/templates/wizard/step7.hbs       |    4 +-
 ambari-web/app/templates/wizard/step8.hbs       |    9 +-
 ambari-web/app/templates/wizard/step9.hbs       |    2 +-
 ambari-web/app/utils/ajax/ajax.js               |   19 +-
 ambari-web/app/utils/helper.js                  |    7 +-
 ambari-web/app/utils/host_progress_popup.js     |    2 +-
 .../common/assign_master_components_view.js     |    4 +
 .../widgets/slider_config_widget_view.js        |   17 +-
 .../common/host_progress_popup_body_view.js     |   20 +-
 .../app/views/common/quick_view_link_view.js    |   24 +-
 ambari-web/app/views/main/admin.js              |    2 +-
 .../stack_upgrade/upgrade_version_box_view.js   |    2 +
 ambari-web/app/views/main/menu.js               |    2 +-
 ambari-web/app/views/main/service/item.js       |    6 +-
 .../app/views/main/service/reassign_view.js     |    4 -
 ambari-web/app/views/wizard/step4_view.js       |    7 +-
 .../views/wizard/step9/hostLogPopupBody_view.js |    2 +-
 ambari-web/pom.xml                              |   20 +-
 .../global/background_operations_test.js        |  179 +-
 ambari-web/test/controllers/installer_test.js   |   12 -
 .../journalNode/step1_controller_test.js        |    4 +-
 ...anage_alert_notifications_controller_test.js |  165 +-
 .../main/service/add_controller_test.js         |   54 +-
 .../test/controllers/wizard/step5_test.js       |   86 +-
 .../step7/assign_master_controller_test.js      |  794 ++-
 .../test/controllers/wizard/step8_test.js       |  132 +-
 ambari-web/test/controllers/wizard_test.js      |   30 +-
 .../mixins/common/configs/configs_saver_test.js |   13 +
 ambari-web/test/utils/helper_test.js            |    5 +
 .../widgets/slider_config_widget_view_test.js   |   23 +-
 .../test/views/common/quick_link_view_test.js   |    2 +-
 .../resourceManager/wizard_view_test.js         |   18 +-
 .../views/main/service/reassign_view_test.js    |   12 -
 ambari-web/yarn.lock                            | 4153 +++++++++++
 .../2.0/hooks/before-START/scripts/params.py    |    2 +
 contrib/views/capacity-scheduler/pom.xml        |   32 +-
 .../ui/app/components/capacityInput.js          |    2 +
 .../src/main/resources/ui/yarn.lock             | 1374 ++++
 contrib/views/files/pom.xml                     |   18 +-
 .../view/filebrowser/DownloadService.java       |    4 +-
 .../files/src/main/resources/ui/package.json    |    2 +-
 .../views/files/src/main/resources/ui/yarn.lock | 6041 ++++++++++++++++
 contrib/views/hawq/pom.xml                      |   20 +-
 .../views/hawq/src/main/resources/ui/yarn.lock  | 6665 ++++++++++++++++++
 contrib/views/hive-next/pom.xml                 |   18 +-
 .../ambari/view/hive2/actor/HiveActor.java      |   32 +-
 .../ambari/view/hive2/actor/JdbcConnector.java  |    8 +-
 .../view/hive2/actor/OperationController.java   |    2 +-
 .../view/hive2/resources/files/FileService.java |    8 +-
 .../view/hive2/resources/jobs/JobService.java   |    9 +-
 .../src/main/resources/ui/hive-web/Brocfile.js  |    1 +
 .../ui/hive-web/app/controllers/index.js        |    2 +-
 .../resources/ui/hive-web/app/routes/splash.js  |    2 +-
 .../src/main/resources/ui/hive-web/bower.json   |    3 +-
 .../src/main/resources/ui/hive-web/package.json |    9 +-
 .../ui/hive-web/vendor/browser-pollyfills.js    |  213 +
 .../src/main/resources/ui/hive-web/yarn.lock    | 5066 +++++++++++++
 contrib/views/hive20/pom.xml                    |   18 +-
 .../ambari/view/hive20/actor/HiveActor.java     |   32 +-
 .../ambari/view/hive20/actor/JdbcConnector.java |    6 -
 .../view/hive20/actor/OperationController.java  |    2 +-
 .../view/hive20/internal/dto/TableStats.java    |   24 +-
 .../internal/parsers/TableMetaParserImpl.java   |    8 +-
 .../generators/InsertFromQueryGenerator.java    |   41 +-
 .../view/hive20/resources/jobs/JobService.java  |   16 +-
 .../resources/system/ranger/RangerService.java  |   26 +-
 .../uploads/query/InsertFromQueryInput.java     |   24 +-
 .../resources/ui/app/adapters/application.js    |    2 +-
 .../src/main/resources/ui/app/adapters/job.js   |    2 +-
 .../resources/ui/app/components/create-table.js |   32 +-
 .../resources/ui/app/components/jobs-browser.js |   18 +-
 .../resources/ui/app/components/setting-list.js |    9 +
 .../resources/ui/app/components/udf-item.js     |    1 +
 .../ui/app/controllers/savedqueries.js          |   24 +
 .../main/resources/ui/app/controllers/udfs.js   |    2 +
 .../routes/databases/database/tables/table.js   |   22 +-
 .../databases/database/tables/upload-table.js   |   16 +-
 .../resources/ui/app/routes/savedqueries.js     |   11 +-
 .../src/main/resources/ui/app/routes/udfs.js    |   10 +-
 .../resources/ui/app/services/auto-refresh.js   |    1 +
 .../src/main/resources/ui/app/styles/app.scss   |   38 +-
 .../app/templates/components/create-table.hbs   |    4 +-
 .../ui/app/templates/components/edit-table.hbs  |    5 -
 .../app/templates/components/jobs-browser.hbs   |   42 +-
 .../components/notification-message.hbs         |    2 +-
 .../app/templates/components/setting-list.hbs   |    8 +-
 .../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 +-
 .../app/templates/components/visual-explain.hbs |    7 +-
 .../resources/ui/app/templates/databases.hbs    |    2 +-
 .../databases/database/tables/table.hbs         |   19 +-
 .../ui/app/templates/queries/query.hbs          |   16 +-
 .../resources/ui/app/templates/savedqueries.hbs |   82 +-
 .../main/resources/ui/app/templates/udfs.hbs    |   49 +-
 .../ui/app/utils/hive-explainer/processor.js    |   13 +-
 .../ui/app/utils/hive-explainer/renderer.js     |  230 +-
 .../ui/app/utils/hive-explainer/transformer.js  |   11 +-
 .../hive20/src/main/resources/ui/package.json   |    2 +-
 .../hive20/src/main/resources/ui/yarn.lock      | 6032 ++++++++++++++++
 contrib/views/hueambarimigration/pom.xml        |   18 +-
 .../ui/hueambarimigration-view/package.json     |    2 +-
 .../ui/hueambarimigration-view/yarn.lock        | 5553 +++++++++++++++
 contrib/views/jobs/pom.xml                      |   18 +-
 .../views/jobs/src/main/resources/ui/yarn.lock  | 2537 +++++++
 contrib/views/pig/pom.xml                       |   22 +-
 .../pig/src/main/resources/ui/pig-web/yarn.lock | 2376 +++++++
 contrib/views/pom.xml                           |    1 +
 .../org/apache/ambari/storm/ProxyServlet.java   |   12 +-
 .../ambari/storm/StormDetailsServlet.java       |   81 +
 .../storm/src/main/resources/WEB-INF/web.xml    |    8 +
 .../resources/scripts/components/SearchLogs.jsx |   38 +-
 .../src/main/resources/scripts/router/Router.js |    6 +-
 .../src/main/resources/scripts/utils/Utils.js   |   25 -
 contrib/views/storm/src/main/resources/view.xml |    8 +-
 .../view/utils/hdfs/ConfigurationBuilder.java   |    3 +-
 contrib/views/wfmanager/pom.xml                 |   18 +-
 .../ui/app/components/bundle-config.js          |    3 +-
 .../resources/ui/app/components/coord-config.js |    3 +-
 .../ui/app/components/distcp-action.js          |   15 +-
 .../resources/ui/app/components/drafts-wf.js    |    3 +-
 .../ui/app/components/flow-designer.js          |    1 -
 .../resources/ui/app/components/job-details.js  |   30 +-
 .../ui/app/components/recent-projects.js        |   11 +-
 .../ui/app/components/search-create-new-bar.js  |   21 +-
 .../ui/app/domain/jsplumb-flow-renderer.js      |  194 -
 .../resources/ui/app/domain/layout-manager1.js  |   88 -
 .../resources/ui/app/domain/layout-manager2.js  |   87 -
 .../resources/ui/app/routes/design/jobtab.js    |    2 +-
 .../src/main/resources/ui/app/styles/app.less   |   11 +
 .../app/templates/components/bundle-config.hbs  |    2 +-
 .../app/templates/components/coord-config.hbs   |    2 +-
 .../templates/components/coord-job-details.hbs  |   66 +-
 .../app/templates/components/distcp-action.hbs  |    7 +-
 .../ui/app/templates/components/drafts-wf.hbs   |    6 +-
 .../app/templates/components/flow-designer.hbs  |    2 +-
 .../app/templates/components/hdfs-browser.hbs   |   44 +-
 .../ui/app/templates/components/job-row.hbs     |    4 +-
 .../components/search-create-new-bar.hbs        |    4 +
 .../app/templates/components/search-table.hbs   |    2 +-
 .../components/workflow-job-details.hbs         |    6 +
 .../wfmanager/src/main/resources/ui/bower.json  |    1 -
 .../src/main/resources/ui/ember-cli-build.js    |    2 +-
 .../wfmanager/src/main/resources/ui/yarn.lock   | 5629 +++++++++++++++
 .../config-utils/diff_stack_properties.py       |  154 +
 dev-support/test-patch.sh                       |    9 +-
 docs/pom.xml                                    |   12 +
 pom.xml                                         |    1 +
 1603 files changed, 132226 insertions(+), 22139 deletions(-)
----------------------------------------------------------------------