Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/83f54c2b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/83f54c2b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/83f54c2b Branch: refs/heads/branch-dev-patch-upgrade Commit: 83f54c2b9825ef0182328515878aceb98dfc10fc Parents: 10cea2c 4066b7e Author: Nate Cole <nc...@hortonworks.com> Authored: Mon Nov 7 15:50:49 2016 -0500 Committer: Nate Cole <nc...@hortonworks.com> Committed: Mon Nov 7 15:50:49 2016 -0500 ---------------------------------------------------------------------- .../src/main/python/ambari_agent/HostInfo.py | 23 +- .../test/python/ambari_agent/TestHostInfo.py | 26 +- .../libraries/functions/curl_krb_request.py | 4 +- ambari-logsearch/README.md | 11 +- .../ambari-logsearch-appender/pom.xml | 1 - .../logsearch/appender/LogsearchConversion.java | 57 +- .../ambari/logsearch/appender/Output.java | 91 + .../apache/ambari/logsearch/appender/VBase.java | 63 - .../ambari/logsearch/appender/VOutput.java | 88 - ambari-logsearch/ambari-logsearch-it/pom.xml | 136 + .../logsearch/domain/StoryDataRegistry.java | 110 + .../logsearch/steps/LogSearchApiSteps.java | 95 + .../logsearch/steps/LogSearchDockerSteps.java | 244 + .../ambari/logsearch/steps/SolrSteps.java | 47 + .../logsearch/story/LogSearchApiQueryStory.java | 22 + .../ambari/logsearch/story/LogSearchStory.java | 60 + .../logsearch/story/LogfeederParsingStory.java | 22 + .../src/test/resources/log4j.properties | 16 + .../story/log_search_api_query_story.story | 17 + .../story/logfeeder_parsing_story.story | 20 + .../service-log-level-counts-values.json | 33 + .../test-output/service-log-schema.json | 24 + .../org/apache/ambari/logfeeder/AliasUtil.java | 99 - .../apache/ambari/logfeeder/ConfigBlock.java | 260 - .../org/apache/ambari/logfeeder/InputMgr.java | 451 - .../org/apache/ambari/logfeeder/LogFeeder.java | 592 +- .../ambari/logfeeder/LogFeederAMSClient.java | 87 - .../apache/ambari/logfeeder/LogFeederUtil.java | 556 - .../apache/ambari/logfeeder/MetricCount.java | 31 - .../org/apache/ambari/logfeeder/MetricsMgr.java | 177 - .../org/apache/ambari/logfeeder/MurmurHash.java | 163 - .../org/apache/ambari/logfeeder/OutputMgr.java | 257 - .../ambari/logfeeder/common/ConfigBlock.java | 246 + .../logfeeder/common/LogFeederConstants.java | 39 + .../logfeeder/common/LogfeederException.java | 31 + .../logfeeder/exception/LogfeederException.java | 31 - .../apache/ambari/logfeeder/filter/Filter.java | 61 +- .../ambari/logfeeder/filter/FilterGrok.java | 98 +- .../ambari/logfeeder/filter/FilterJSON.java | 12 +- .../ambari/logfeeder/filter/FilterKeyValue.java | 118 +- .../logfeeder/input/AbstractInputFile.java | 319 + .../apache/ambari/logfeeder/input/Input.java | 318 +- .../ambari/logfeeder/input/InputFile.java | 503 +- .../ambari/logfeeder/input/InputManager.java | 379 + .../ambari/logfeeder/input/InputMarker.java | 17 +- .../ambari/logfeeder/input/InputS3File.java | 426 +- .../ambari/logfeeder/input/InputSimulate.java | 42 +- .../logfeeder/input/reader/GZIPReader.java | 23 +- .../input/reader/LogsearchReaderFactory.java | 8 +- .../logconfig/FetchConfigFromSolr.java | 194 - .../logfeeder/logconfig/FilterLogData.java | 87 + .../logfeeder/logconfig/LogConfigFetcher.java | 168 + .../logfeeder/logconfig/LogConfigHandler.java | 189 + .../logfeeder/logconfig/LogFeederConstants.java | 33 - .../logfeeder/logconfig/LogFeederFilter.java | 90 + .../logconfig/LogFeederFilterWrapper.java | 55 + .../logfeeder/logconfig/LogfeederScheduler.java | 59 - .../logconfig/filter/ApplyLogFilter.java | 62 - .../logconfig/filter/DefaultDataFilter.java | 49 - .../logconfig/filter/FilterLogData.java | 53 - .../apache/ambari/logfeeder/mapper/Mapper.java | 14 +- .../ambari/logfeeder/mapper/MapperDate.java | 74 +- .../logfeeder/mapper/MapperFieldCopy.java | 58 + .../logfeeder/mapper/MapperFieldName.java | 22 +- .../logfeeder/mapper/MapperFieldValue.java | 33 +- .../logfeeder/metrics/LogFeederAMSClient.java | 88 + .../ambari/logfeeder/metrics/MetricData.java | 46 + .../logfeeder/metrics/MetricsManager.java | 168 + .../apache/ambari/logfeeder/output/Output.java | 17 +- .../ambari/logfeeder/output/OutputData.java | 8 +- .../ambari/logfeeder/output/OutputDevNull.java | 7 +- .../ambari/logfeeder/output/OutputFile.java | 44 +- .../ambari/logfeeder/output/OutputHDFSFile.java | 72 +- .../ambari/logfeeder/output/OutputKafka.java | 60 +- .../ambari/logfeeder/output/OutputManager.java | 250 + .../ambari/logfeeder/output/OutputS3File.java | 45 +- .../ambari/logfeeder/output/OutputSolr.java | 65 +- .../logfeeder/output/S3LogPathResolver.java | 8 +- .../logfeeder/output/S3OutputConfiguration.java | 9 +- .../ambari/logfeeder/output/S3Uploader.java | 68 +- .../logfeeder/output/spool/LogSpooler.java | 23 +- .../output/spool/LogSpoolerContext.java | 2 +- .../output/spool/LogSpoolerException.java | 2 +- .../output/spool/RolloverCondition.java | 2 +- .../logfeeder/output/spool/RolloverHandler.java | 2 +- .../org/apache/ambari/logfeeder/s3/AWSUtil.java | 84 - .../org/apache/ambari/logfeeder/s3/S3Util.java | 186 - .../apache/ambari/logfeeder/util/AWSUtil.java | 42 + .../apache/ambari/logfeeder/util/AliasUtil.java | 118 + .../ambari/logfeeder/util/CompressionUtil.java | 15 +- .../apache/ambari/logfeeder/util/DateUtil.java | 41 +- .../apache/ambari/logfeeder/util/FileUtil.java | 66 +- .../ambari/logfeeder/util/LogFeederUtil.java | 330 + .../logfeeder/util/LogfeederHDFSUtil.java | 58 +- .../ambari/logfeeder/util/MurmurHash.java | 163 + .../ambari/logfeeder/util/PlaceholderUtil.java | 32 +- .../apache/ambari/logfeeder/util/S3Util.java | 155 + .../apache/ambari/logfeeder/util/SolrUtil.java | 187 - .../ambari/logfeeder/view/VLogfeederFilter.java | 90 - .../logfeeder/view/VLogfeederFilterWrapper.java | 55 - .../src/main/resources/alias_config.json | 3 + .../src/main/scripts/run.sh | 4 +- .../org/apache/ambari/logfeeder/AppTest.java | 116 - .../ambari/logfeeder/filter/FilterGrokTest.java | 55 +- .../ambari/logfeeder/filter/FilterJSONTest.java | 43 +- .../logfeeder/filter/FilterKeyValueTest.java | 57 +- .../ambari/logfeeder/input/InputFileTest.java | 25 +- .../logfeeder/input/InputManagerTest.java | 241 + .../logconfig/LogConfigHandlerTest.java | 150 + .../ambari/logfeeder/mapper/MapperDateTest.java | 71 +- .../logfeeder/mapper/MapperFieldCopyTest.java | 71 + .../logfeeder/mapper/MapperFieldNameTest.java | 2 +- .../logfeeder/mapper/MapperFieldValueTest.java | 2 +- .../logfeeder/metrics/MetrcisManagerTest.java | 128 + .../logfeeder/output/OutputKafkaTest.java | 5 +- .../logfeeder/output/OutputManagerTest.java | 258 + .../logfeeder/output/OutputS3FileTest.java | 17 +- .../ambari/logfeeder/output/OutputSolrTest.java | 5 +- .../logfeeder/output/S3LogPathResolverTest.java | 5 +- .../ambari/logfeeder/output/S3UploaderTest.java | 42 +- .../logfeeder/output/spool/LogSpoolerTest.java | 2 +- .../apache/ambari/logfeeder/s3/AWSUtilTest.java | 27 - .../apache/ambari/logfeeder/s3/S3UtilTest.java | 38 - .../logfeeder/util/PlaceholderUtilTest.java | 20 +- .../ambari/logfeeder/util/S3UtilTest.java | 40 + .../src/test/resources/logfeeder.properties | 20 + .../ambari-logsearch-portal/pom.xml | 137 +- .../ambari-logsearch-portal/production/build.js | 28 - .../ambari-logsearch-portal/production/r.js | 32140 ----------------- .../configsets/audit_logs/conf/managed-schema | 6 +- .../configsets/hadoop_logs/conf/managed-schema | 24 - .../src/main/dev/solrcloud/README.md | 35 - .../src/main/dev/solrcloud/reset_collections.sh | 28 - .../src/main/dev/solrcloud/restart_solr.sh | 37 - .../src/main/dev/solrcloud/update_config.sh | 49 - .../org/apache/ambari/logsearch/LogSearch.java | 119 +- .../logsearch/common/ExternalServerClient.java | 76 + .../common/HadoopServiceConfigHelper.java | 80 + .../logsearch/common/LogSearchConstants.java | 122 +- .../logsearch/common/LogSearchContext.java | 62 + .../apache/ambari/logsearch/common/LogType.java | 34 + .../logsearch/common/LogsearchContextUtil.java | 60 - .../logsearch/common/ManageStartEndTime.java | 60 +- .../apache/ambari/logsearch/common/Marker.java | 29 + .../ambari/logsearch/common/MessageData.java | 165 + .../ambari/logsearch/common/MessageEnums.java | 53 +- .../logsearch/common/PropertiesHelper.java | 137 + .../ambari/logsearch/common/RequestContext.java | 143 - .../ambari/logsearch/common/SearchCriteria.java | 335 - .../logsearch/common/UserSessionInfo.java | 46 - .../ambari/logsearch/common/VResponse.java | 164 + .../logsearch/common/XMLPropertiesHelper.java | 79 + .../ambari/logsearch/conf/ApiDocConfig.java | 59 + .../logsearch/conf/ApplicationConfig.java | 58 + .../ambari/logsearch/conf/AuthPropsConfig.java | 97 + .../ambari/logsearch/conf/SecurityConfig.java | 112 + .../logsearch/conf/SolrAuditLogPropsConfig.java | 142 + .../ambari/logsearch/conf/SolrConfig.java | 111 + .../conf/SolrConnectionPropsConfig.java | 49 + .../logsearch/conf/SolrKerberosConfig.java | 48 + .../ambari/logsearch/conf/SolrPropsConfig.java | 49 + .../conf/SolrServiceLogPropsConfig.java | 94 + .../logsearch/conf/SolrUserPropsConfig.java | 116 + .../AbstractAuditLogRequestQueryConverter.java | 59 + .../converter/AbstractConverterAware.java | 47 + .../AbstractDateRangeFacetQueryConverter.java | 55 + .../AbstractLogRequestFacetQueryConverter.java | 86 + .../AbstractLogRequestQueryConverter.java | 39 + .../AbstractOperationHolderConverter.java | 166 + .../AbstractSearchRequestQueryConverter.java | 49 + ...AbstractServiceLogRequestQueryConverter.java | 44 + .../AuditBarGraphRequestQueryConverter.java | 46 + .../AuditComponentsRequestQueryConverter.java | 53 + .../AuditLogRequestQueryConverter.java | 44 + .../AuditServiceLoadRequestQueryConverter.java | 53 + .../BaseServiceLogRequestQueryConverter.java | 84 + .../FieldAuditLogRequestQueryConverter.java | 54 + ...ServiceLogAnyGraphRequestQueryConverter.java | 52 + ...eLogComponentLevelRequestQueryConverter.java | 66 + ...eLogComponentRequestFacetQueryConverter.java | 68 + ...rviceLogLevelCountRequestQueryConverter.java | 52 + ...eLogLevelDateRangeRequestQueryConverter.java | 61 + ...erviceLogTreeRequestFacetQueryConverter.java | 69 + ...erviceLogTruncatedRequestQueryConverter.java | 95 + .../StringFieldFacetQueryConverter.java | 44 + .../UserConfigRequestQueryConverter.java | 71 + .../UserExportRequestQueryConverter.java | 55 + .../ambari/logsearch/dao/AuditSolrDao.java | 88 +- .../logsearch/dao/ServiceLogsSolrDao.java | 65 +- .../ambari/logsearch/dao/SolrAliasDao.java | 121 + .../ambari/logsearch/dao/SolrCollectionDao.java | 259 + .../ambari/logsearch/dao/SolrDaoBase.java | 673 +- .../logsearch/dao/SolrSchemaFieldDao.java | 237 + .../ambari/logsearch/dao/UserConfigSolrDao.java | 239 +- .../apache/ambari/logsearch/dao/UserDao.java | 157 +- .../logsearch/dao/UserInfoAttributes.java | 28 - .../ambari/logsearch/doc/DocConstants.java | 116 + .../logsearch/graph/GraphDataGenerator.java | 701 +- .../logsearch/graph/GraphDataGeneratorBase.java | 280 - .../logsearch/manager/AuditLogsManager.java | 199 + .../ambari/logsearch/manager/AuditMgr.java | 806 - .../logsearch/manager/JsonManagerBase.java | 69 + .../ambari/logsearch/manager/LogFileMgr.java | 166 - .../ambari/logsearch/manager/LogsMgr.java | 1967 - .../ambari/logsearch/manager/ManagerBase.java | 96 + .../ambari/logsearch/manager/MgrBase.java | 283 - .../ambari/logsearch/manager/PublicManager.java | 48 + .../ambari/logsearch/manager/PublicMgr.java | 46 - .../logsearch/manager/ServiceLogsManager.java | 585 + .../logsearch/manager/SessionManager.java | 77 + .../ambari/logsearch/manager/SessionMgr.java | 90 - .../logsearch/manager/UserConfigManager.java | 250 + .../ambari/logsearch/manager/UserConfigMgr.java | 326 - .../model/common/LogFeederDataMap.java | 50 + .../model/common/LogfeederFilterData.java | 87 + .../model/request/AnyGraphParamDefinition.java | 44 + .../model/request/BundleIdParamDefinition.java | 32 + .../request/CommonSearchParamDefinition.java | 69 + .../model/request/DateRangeParamDefinition.java | 38 + .../model/request/FieldParamDefinition.java | 32 + .../model/request/FormatParamDefinition.java | 32 + .../model/request/LastPageParamDefinition.java | 31 + .../model/request/LogParamDefinition.java | 62 + .../request/LogTruncatedParamDefinition.java | 44 + .../logsearch/model/request/SearchRequest.java | 25 + .../request/ServiceLogParamDefinition.java | 50 + .../ServiceLogSearchParamDefinition.java | 50 + .../model/request/TopParamDefinition.java | 31 + .../model/request/UnitParamDefinition.java | 33 + .../request/UserConfigParamDefinition.java | 44 + .../model/request/UtcOffsetParamDefinition.java | 32 + .../request/impl/AuditBarGraphRequest.java | 40 + .../request/impl/AuditComponentRequest.java | 25 + .../model/request/impl/AuditLogRequest.java | 40 + .../request/impl/AuditServiceLoadRequest.java | 25 + .../model/request/impl/BaseLogRequest.java | 132 + .../request/impl/BaseServiceLogRequest.java | 95 + .../model/request/impl/CommonSearchRequest.java | 126 + .../request/impl/FieldAuditBarGraphRequest.java | 40 + .../request/impl/FieldAuditLogRequest.java | 55 + .../request/impl/ServiceAnyGraphRequest.java | 83 + .../model/request/impl/ServiceGraphRequest.java | 40 + .../impl/ServiceLogAggregatedInfoRequest.java | 25 + .../impl/ServiceLogComponentHostRequest.java | 25 + .../impl/ServiceLogComponentLevelRequest.java | 25 + .../request/impl/ServiceLogExportRequest.java | 54 + .../impl/ServiceLogHostComponentRequest.java | 39 + .../impl/ServiceLogLevelCountRequest.java | 25 + .../model/request/impl/ServiceLogRequest.java | 93 + .../impl/ServiceLogTruncatedRequest.java | 66 + .../model/request/impl/UserConfigRequest.java | 66 + .../model/request/impl/UserExportRequest.java | 40 + .../logsearch/model/response/AuditLogData.java | 149 + .../model/response/AuditLogResponse.java | 48 + .../logsearch/model/response/BarGraphData.java | 53 + .../response/BarGraphDataListResponse.java | 42 + .../logsearch/model/response/CommonLogData.java | 118 + .../model/response/ComponentTypeLogData.java | 32 + .../logsearch/model/response/CountData.java | 50 + .../model/response/CountDataListResponse.java | 48 + .../logsearch/model/response/GraphData.java | 64 + .../model/response/GraphDataListResponse.java | 39 + .../model/response/GroupListResponse.java | 48 + .../logsearch/model/response/HostLogData.java | 30 + .../logsearch/model/response/LogData.java | 25 + .../logsearch/model/response/LogFileData.java | 48 + .../model/response/LogFileDataListResponse.java | 48 + .../model/response/LogListResponse.java | 27 + .../model/response/LogSearchResponse.java | 22 + .../logsearch/model/response/NameValueData.java | 62 + .../response/NameValueDataListResponse.java | 49 + .../logsearch/model/response/NodeData.java | 111 + .../model/response/NodeListResponse.java | 50 + .../model/response/SearchResponse.java | 110 + .../model/response/ServiceLogData.java | 63 + .../model/response/ServiceLogResponse.java | 48 + .../logsearch/model/response/TemplateData.java | 36 + .../model/response/UserConfigData.java | 108 + .../response/UserConfigDataListResponse.java | 55 + .../ambari/logsearch/query/QueryGeneration.java | 439 - .../logsearch/query/QueryGenerationBase.java | 469 - .../logsearch/rest/AuditLogsResource.java | 111 + .../apache/ambari/logsearch/rest/AuditREST.java | 167 - .../ambari/logsearch/rest/DashboardREST.java | 290 - .../ambari/logsearch/rest/LogFileREST.java | 63 - .../ambari/logsearch/rest/PublicREST.java | 42 - .../ambari/logsearch/rest/PublicResource.java | 48 + .../logsearch/rest/ServiceLogsResource.java | 196 + .../ambari/logsearch/rest/UserConfigREST.java | 114 - .../logsearch/rest/UserConfigResource.java | 115 + .../context/LogsearchContextHolder.java | 41 - .../context/LogsearchSecurityContext.java | 55 - .../ambari/logsearch/service/UserService.java | 5 +- .../ambari/logsearch/solr/SolrConstants.java | 113 + .../logsearch/solr/metrics/SolrAmsClient.java | 74 - .../logsearch/solr/metrics/SolrJmxAdapter.java | 134 - .../solr/metrics/SolrMetricsLoader.java | 198 - .../logsearch/solr/model/SolrAuditLogData.java | 341 + .../logsearch/solr/model/SolrCommonLogData.java | 292 + .../solr/model/SolrComponentTypeLogData.java | 40 + .../logsearch/solr/model/SolrHostLogData.java | 40 + .../solr/model/SolrServiceLogData.java | 120 + .../apache/ambari/logsearch/util/BizUtil.java | 296 - .../ambari/logsearch/util/CommonUtil.java | 51 +- .../ambari/logsearch/util/ConfigUtil.java | 162 - .../apache/ambari/logsearch/util/DateUtil.java | 166 +- .../ambari/logsearch/util/DownloadUtil.java | 176 + .../logsearch/util/ExternalServerClient.java | 211 - .../apache/ambari/logsearch/util/FileUtil.java | 119 +- .../apache/ambari/logsearch/util/JSONUtil.java | 157 +- .../util/LogsearchPropertiesConfiguration.java | 89 - .../ambari/logsearch/util/PropertiesUtil.java | 184 - .../apache/ambari/logsearch/util/QueryBase.java | 138 - .../ambari/logsearch/util/RESTErrorUtil.java | 22 +- .../apache/ambari/logsearch/util/SSLUtil.java | 107 + .../apache/ambari/logsearch/util/SolrUtil.java | 390 +- .../ambari/logsearch/util/StringUtil.java | 33 - .../logsearch/util/XMLPropertiesUtil.java | 85 - .../ambari/logsearch/view/VBarDataList.java | 46 - .../ambari/logsearch/view/VBarGraphData.java | 50 - .../apache/ambari/logsearch/view/VCount.java | 62 - .../ambari/logsearch/view/VCountList.java | 68 - .../ambari/logsearch/view/VGraphData.java | 79 - .../ambari/logsearch/view/VGraphInfo.java | 62 - .../ambari/logsearch/view/VGroupList.java | 66 - .../org/apache/ambari/logsearch/view/VHost.java | 44 - .../org/apache/ambari/logsearch/view/VList.java | 243 - .../apache/ambari/logsearch/view/VLogFile.java | 56 - .../ambari/logsearch/view/VLogFileList.java | 70 - .../ambari/logsearch/view/VLogfeederFilter.java | 91 - .../logsearch/view/VLogfeederFilterWrapper.java | 55 - .../apache/ambari/logsearch/view/VMessage.java | 165 - .../ambari/logsearch/view/VNameValue.java | 123 - .../ambari/logsearch/view/VNameValueList.java | 78 - .../org/apache/ambari/logsearch/view/VNode.java | 122 - .../apache/ambari/logsearch/view/VNodeList.java | 55 - .../apache/ambari/logsearch/view/VResponse.java | 164 - .../ambari/logsearch/view/VSolrLogList.java | 67 - .../apache/ambari/logsearch/view/VString.java | 52 - .../apache/ambari/logsearch/view/VSummary.java | 103 - .../ambari/logsearch/view/VSummaryCount.java | 66 - .../logsearch/view/VSummaryCountList.java | 37 - .../ambari/logsearch/view/VUserConfig.java | 104 - .../ambari/logsearch/view/VUserConfigList.java | 70 - .../LogsearchAuthFailureHandler.java | 11 +- .../LogsearchLogoutSuccessHandler.java | 2 +- .../LogsearchAuthenticationEntryPoint.java | 10 +- .../LogsearchKRBAuthenticationFilter.java | 38 +- ...LogsearchSecurityContextFormationFilter.java | 37 +- ...rchUsernamePasswordAuthenticationFilter.java | 2 + .../web/listeners/SpringEventListener.java | 32 - .../logsearch/web/security/LdapProperties.java | 2 +- .../ambari/logsearch/web/security/LdapUtil.java | 8 +- ...LogsearchAbstractAuthenticationProvider.java | 38 +- .../LogsearchAuthenticationProvider.java | 117 +- ...rchExternalServerAuthenticationProvider.java | 152 +- .../LogsearchFileAuthenticationProvider.java | 43 +- .../LogsearchLdapAuthenticationProvider.java | 26 +- .../LogsearchLdapBindAuthenticator.java | 64 +- .../LogsearchSimpleAuthenticationProvider.java | 43 +- .../src/main/resources/HadoopServiceConfig.json | 15 +- .../src/main/resources/default.properties | 22 - .../src/main/resources/log4j.xml | 6 +- .../main/resources/templates/audit_log_txt.ftl | 42 + .../resources/templates/service_log_txt.ftl | 36 + .../src/main/scripts/add_config_set.sh | 43 - .../src/main/scripts/create_collections.sh | 37 - .../src/main/scripts/run.sh | 2 +- .../main/webapp/META-INF/applicationContext.xml | 53 - .../META-INF/security-applicationContext.xml | 81 - .../src/main/webapp/WEB-INF/web.xml | 72 - .../daterangepicker/css/daterangepicker.css | 555 +- .../other/daterangepicker/js/daterangepicker.js | 552 +- .../src/main/webapp/login.html | 28 +- .../src/main/webapp/scripts/App.js | 8 +- .../collection_bases/VAuditLogListBase.js | 18 +- .../collection_bases/VEventHistoryListBase.js | 14 +- .../scripts/collection_bases/VGroupListBase.js | 16 +- .../collection_bases/VLogLevelListBase.js | 2 +- .../scripts/collection_bases/VLogListBase.js | 29 +- .../collection_bases/VNameValueListBase.js | 14 +- .../scripts/collection_bases/VNodeListBase.js | 4 +- .../scripts/collections/BaseCollection.js | 1 - .../scripts/collections/SchemaFieldList.js | 29 + .../src/main/webapp/scripts/mgrs/SessionMgr.js | 137 - .../webapp/scripts/model_bases/VAuditLogBase.js | 2 +- .../scripts/model_bases/VCommonModelBase.js | 2 +- .../scripts/model_bases/VEventHistoryBase.js | 2 +- .../scripts/model_bases/VGraphInfoBase.js | 2 +- .../webapp/scripts/model_bases/VLogLevelBase.js | 2 +- .../scripts/model_bases/VUserFilterBase.js | 2 +- .../src/main/webapp/scripts/utils/Globals.js | 158 +- .../src/main/webapp/scripts/utils/ViewUtils.js | 423 +- .../scripts/views/audit/AuditAggregatedView.js | 6 +- .../scripts/views/audit/AuditTabLayoutView.js | 872 +- .../scripts/views/common/CustomBackgrid.js | 1 - .../scripts/views/common/DatePickerLayout.js | 23 +- .../main/webapp/scripts/views/common/Header.js | 10 +- .../webapp/scripts/views/common/ProfileBar.js | 3 +- .../dashboard/BubbleGraphTableLayoutView.js | 194 +- .../views/dashboard/ComponentListView.js | 10 +- .../scripts/views/dashboard/ComponentsView.js | 2 +- .../scripts/views/dashboard/DashboardView.js | 16 +- .../views/dashboard/GridTableLayoutView.js | 2 +- .../scripts/views/dashboard/HostListView.js | 4 +- .../webapp/scripts/views/dashboard/HostsView.js | 2 +- .../scripts/views/dashboard/LogLevelBoxView.js | 5 +- .../scripts/views/dashboard/LogLevelView.js | 1 + .../scripts/views/dashboard/MainLayoutView.js | 65 +- .../scripts/views/dialog/DetailLogFileView.js | 4 +- .../dialog/GlobalExclusionCompositeView.js | 2 +- .../views/filter/CreateLogfeederFilterView.js | 103 +- .../scripts/views/graphs/GraphLayoutView.js | 18 +- .../scripts/views/graphs/GridGraphLayoutView.js | 5 +- .../scripts/views/tabs/ComparisonLayoutView.js | 6 +- .../webapp/scripts/views/tabs/ComparisonView.js | 17 +- .../views/tabs/HierarchyTabLayoutView.js | 889 +- .../webapp/scripts/views/tabs/LogFileView.js | 188 +- .../main/webapp/scripts/views/tabs/TreeView.js | 6 +- .../scripts/views/tabs/VisualSearchView.js | 437 +- .../troubleshoot/TroubleShootLayoutView.js | 13 +- .../src/main/webapp/static/schema_fields.json | 90 + .../src/main/webapp/styles/style.css | 55 +- .../dashboard/LogLevelBoxView_tmpl.html | 17 +- .../dashboard/MainLayoutView_tmpl.html | 121 - .../filter/CreateLogfeederFilter_tmpl.html | 1 + .../src/main/webapp/templates/graphs/backup.js | 12 +- .../main/webapp/templates/helpers/Helpers.js | 43 +- .../webapp/templates/tabs/LogFileView_tmpl.html | 50 +- .../common/LogSearchContextUtilTest.java | 51 + .../common/ManageStartEndTimeTest.java | 35 + .../converter/AbstractRequestConverterTest.java | 42 + .../AuditBarGraphRequestQueryConverterTest.java | 62 + ...AuditComponentRequestQueryConverterTest.java | 66 + .../converter/AuditLogRequestConverterTest.java | 64 + ...ditServiceLoadRequestQueryConverterTest.java | 61 + ...BaseServiceLogRequestQueryConverterTest.java | 72 + .../FieldAuditLogRequestQueryConverterTest.java | 61 + .../ServiceLogAnyGraphRequestConverterTest.java | 62 + ...ComponentLevelRequestQueryConverterTest.java | 65 + ...ComponentRequestFacetQueryConverterTest.java | 67 + ...eLogLevelCountRequestQueryConverterTest.java | 62 + ...LevelDateRangeRequestQueryConverterTest.java | 68 + ...ceLogTreeRequestFacetQueryConverterTest.java | 65 + ...ceLogTruncatedRequestQueryConverterTest.java | 64 + .../StringFieldFacetQueryConverterTest.java | 48 + .../UserConfigRequestQueryConverterTest.java | 54 + .../UserExportRequestQueryConverterTest.java | 63 + .../LogsearchAuthenticationProviderTest.java | 205 + ...xternalServerAuthenticationProviderTest.java | 185 + ...LogsearchFileAuthenticationProviderTest.java | 231 + ...LogsearchLdapAuthenticationProviderTest.java | 61 + ...gsearchSimpleAuthenticationProviderTest.java | 118 + .../src/test/resources/HadoopServiceConfig.json | 17 + .../src/test/resources/logsearch.properties | 33 + .../src/test/resources/user_pass.json | 8 + .../commands/AbstractStateFileZkCommand.java | 2 +- ambari-logsearch/docker/.gitignore | 2 +- ambari-logsearch/docker/Dockerfile | 14 +- ambari-logsearch/docker/bin/start.sh | 57 +- ambari-logsearch/docker/logsearch-docker.sh | 6 +- .../test-config/logfeeder/logfeeder-env.sh | 13 +- .../test-config/logfeeder/logfeeder.properties | 8 +- .../shipper-conf/input.config-ambari.json | 585 + .../shipper-conf/input.config-hdfs.json | 172 + .../shipper-conf/input.config-secure_log.json | 31 + .../input.config-system_message.json | 31 + .../test-config/logsearch/logsearch-env.sh | 12 +- .../logsearch/logsearch-https.properties | 55 + .../test-config/logsearch/logsearch.properties | 6 +- .../docker/test-config/solr/solr-env-ssl.sh | 101 + .../docker/test-config/solr/solr-env.sh | 4 +- .../test-logs/ambari-server/ambari-audit.log | 390 + .../docker/test-logs/hdfs-audit/hdfs-audit.log | 4 + .../docker/test-logs/secure_log/secure-log.txt | 11 + .../test-logs/system_message/message_logs.txt | 17 + ambari-logsearch/pom.xml | 2 + .../ambari/server/controller/AmbariServer.java | 1 + .../logging/LogLevelQueryResponse.java | 2 + .../controller/logging/LogQueryResponse.java | 2 + .../logging/LogSearchDataRetrievalService.java | 124 +- .../logging/LoggingRequestHelperImpl.java | 4 +- .../ambari/server/stack/ServiceModule.java | 8 + .../server/state/CredentialStoreInfo.java | 11 + .../apache/ambari/server/state/ServiceInfo.java | 18 + .../server/upgrade/UpgradeCatalog240.java | 20 +- .../configuration/accumulo-logsearch-conf.xml | 124 + .../package/scripts/accumulo_service.py | 5 +- .../configuration/infra-logsearch-conf.xml | 80 + .../0.1.0/properties/infra-solr-env.sh.j2 | 4 +- .../0.1.0/configuration/ams-logsearch-conf.xml | 201 + .../configuration/atlas-logsearch-conf.xml | 80 + .../configuration/falcon-logsearch-conf.xml | 80 + .../configuration/flume-logsearch-conf.xml | 80 + .../configuration/hbase-logsearch-conf.xml | 111 + .../configuration/hdfs-logsearch-conf.xml | 248 + .../2.1.0.2.0/package/scripts/zkfc_slave.py | 18 +- .../configuration/hive-logsearch-conf.xml | 117 + .../configuration/kafka-logsearch-conf.xml | 124 + .../configuration/knox-logsearch-conf.xml | 93 + .../0.5.0/configuration/logfeeder-grok.xml | 49 + .../0.5.0/configuration/logfeeder-log4j.xml | 1 - .../configuration/logfeeder-system_log-env.xml | 59 + .../configuration/logsearch-properties.xml | 27 +- .../LOGSEARCH/0.5.0/metainfo.xml | 1 + .../0.5.0/package/scripts/logfeeder.py | 1 - .../0.5.0/package/scripts/logsearch.py | 1 - .../scripts/logsearch_config_aggregator.py | 67 + .../LOGSEARCH/0.5.0/package/scripts/params.py | 205 +- .../0.5.0/package/scripts/setup_logfeeder.py | 30 +- .../0.5.0/package/scripts/setup_logsearch.py | 24 +- .../templates/HadoopServiceConfig.json.j2 | 579 +- .../0.5.0/package/templates/grok-patterns.j2 | 148 - .../templates/input.config-accumulo.json.j2 | 105 - .../templates/input.config-ambari.json.j2 | 370 +- .../package/templates/input.config-ams.json.j2 | 191 - .../templates/input.config-atlas.json.j2 | 55 - .../templates/input.config-falcon.json.j2 | 55 - .../templates/input.config-flume.json.j2 | 56 - .../templates/input.config-hbase.json.j2 | 91 - .../package/templates/input.config-hdfs.json.j2 | 251 - .../package/templates/input.config-hive.json.j2 | 97 - .../package/templates/input.config-hst.json.j2 | 4 +- .../templates/input.config-infra.json.j2 | 56 - .../templates/input.config-kafka.json.j2 | 105 - .../package/templates/input.config-knox.json.j2 | 68 - .../package/templates/input.config-nifi.json.j2 | 9 +- .../templates/input.config-oozie.json.j2 | 56 - .../templates/input.config-ranger.json.j2 | 122 - .../templates/input.config-spark.json.j2 | 72 - .../templates/input.config-spark2.json.j2 | 66 - .../templates/input.config-storm.json.j2 | 86 - .../package/templates/input.config-yarn.json.j2 | 86 - .../templates/input.config-zeppelin.json.j2 | 56 - .../templates/input.config-zookeeper.json.j2 | 56 - .../package/templates/logfeeder.properties.j2 | 32 - .../package/templates/logsearch.properties.j2 | 72 - .../logfeeder-default_grok_patterns.j2 | 148 + .../0.5.0/properties/logsearch-env.sh.j2 | 2 +- .../LOGSEARCH/0.5.0/properties/secure_log.json | 31 + .../0.5.0/properties/system_messages.json | 31 + .../configuration/oozie-logsearch-conf.xml | 80 + .../configuration/ranger-logsearch-conf.xml | 111 + .../configuration/ranger-kms-logsearch-conf.xml | 80 + .../configuration/spark-logsearch-conf.xml | 98 + .../configuration/spark2-logsearch-conf.xml | 92 + .../configuration/storm-logsearch-conf.xml | 110 + .../mapred-logsearch-conf.xml | 80 + .../configuration/yarn-logsearch-conf.xml | 104 + .../2.1.0.2.0/package/scripts/service_check.py | 4 +- .../configuration/zeppelin-logsearch-conf.xml | 80 + .../3.4.5/configuration/zookeeper-log4j.xml | 4 +- .../configuration/zookeeper-logsearch-conf.xml | 76 + .../3.4.5/package/scripts/params_windows.py | 2 +- .../3.4.5/package/scripts/zookeeper.py | 2 +- .../package/files/alert_webhcat_server.py | 4 +- .../templates/hadoop-metrics2.properties.j2 | 2 - .../LogSearchDataRetrievalServiceTest.java | 209 +- .../ambari/server/stack/ServiceModuleTest.java | 36 + .../server/upgrade/UpgradeCatalog240Test.java | 6 + .../2.0.6/YARN/test_yarn_service_check.py | 9 +- .../2.0.6/ZOOKEEPER/test_zookeeper_client.py | 4 +- .../2.0.6/ZOOKEEPER/test_zookeeper_server.py | 8 +- .../stacks/2.4/LOGSEARCH/test_logfeeder.py | 21 +- .../stacks/2.4/LOGSEARCH/test_logsearch.py | 31 +- .../test/python/stacks/2.4/configs/default.json | 27 +- ambari-web/app/assets/test/tests.js | 1 + .../app/controllers/global/update_controller.js | 19 +- ambari-web/app/controllers/main/host.js | 3 +- ambari-web/app/controllers/main/host/details.js | 39 +- ambari-web/app/data/HDP2/site_properties.js | 37 +- ambari-web/app/messages.js | 13 + ambari-web/app/models/alerts/alert_config.js | 2 +- ambari-web/app/styles/alerts.less | 16 +- ambari-web/app/styles/application.less | 57 - ambari-web/app/styles/config_history_flow.less | 17 +- .../app/styles/theme/bootstrap-ambari.css | 18 +- .../common/configs/config_history_flow.hbs | 54 +- .../templates/common/configs/overrideWindow.hbs | 92 +- .../common/configs/service_version_box.hbs | 12 +- .../templates/common/host_progress_popup.hbs | 8 +- .../common/modal_popups/alerts_popup.hbs | 8 +- ambari-web/app/templates/common/pagination.hbs | 33 + .../admin/stack_upgrade/upgrade_history.hbs | 110 +- ambari-web/app/templates/main/alerts.hbs | 20 +- .../alerts/add_definition_to_group_popup.hbs | 21 +- .../alerts/configs/alert_config_parameter.hbs | 2 +- .../alerts/configs/alert_config_threshold.hbs | 6 +- .../main/alerts/definition_details.hbs | 21 +- .../templates/main/dashboard/config_history.hbs | 22 +- ambari-web/app/templates/main/host.hbs | 25 +- .../app/templates/main/host/host_alerts.hbs | 22 +- ambari-web/app/templates/main/host/logs.hbs | 21 +- .../app/templates/main/host/stack_versions.hbs | 21 +- .../main/service/all_services_actions.hbs | 94 +- ambari-web/app/templates/wizard/step3.hbs | 29 +- ambari-web/app/templates/wizard/step6.hbs | 16 +- ambari-web/app/templates/wizard/step9.hbs | 107 +- ambari-web/app/utils/ajax/ajax.js | 5 +- ambari-web/app/views.js | 1 + .../configs/service_configs_by_category_view.js | 5 +- ambari-web/app/views/common/pagination_view.js | 81 + ambari-web/app/views/common/table_view.js | 100 +- ambari-web/app/views/main/host.js | 16 +- .../test/views/common/pagination_view_test.js | 74 + ambari-web/test/views/main/host_test.js | 26 +- .../hive2/resources/uploads/UploadService.java | 21 +- .../ui/hive-web/app/controllers/upload-table.js | 10 +- .../ui/hive-web/app/templates/upload-table.hbs | 5 + .../hive/resources/uploads/UploadService.java | 27 +- .../ui/hive-web/app/controllers/upload-table.js | 11 +- .../ui/hive-web/app/templates/upload-table.hbs | 7 +- .../resources/upload/OpenCSVParserTest.java | 20 + .../view/hive/resources/upload/OpenCSVTest.java | 17 +- docs/pom.xml | 12 + 615 files changed, 28816 insertions(+), 57019 deletions(-) ----------------------------------------------------------------------
