AMBARI-18310. Refactor logsearch portal side code (oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cc429d48 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cc429d48 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cc429d48 Branch: refs/heads/branch-feature-AMBARI-18634 Commit: cc429d48d9fde589266e462d37bdb9b6969308a0 Parents: 35a8c0e Author: oleewere <[email protected]> Authored: Mon Sep 5 18:27:20 2016 +0200 Committer: oleewere <[email protected]> Committed: Sat Nov 5 16:05:13 2016 +0100 ---------------------------------------------------------------------- .../ambari-logsearch-portal/pom.xml | 2 +- .../ambari-logsearch-portal/production/build.js | 28 - .../ambari-logsearch-portal/production/r.js | 32140 ----------------- .../configsets/audit_logs/conf/managed-schema | 1 - .../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 | 1 - .../ambari/logsearch/common/ConfigHelper.java | 34 +- .../logsearch/common/ExternalServerClient.java | 17 +- .../logsearch/common/LogSearchConstants.java | 58 +- .../apache/ambari/logsearch/common/Marker.java | 29 + .../ambari/logsearch/common/PropertyMapper.java | 59 + .../ambari/logsearch/common/SearchCriteria.java | 304 - .../ambari/logsearch/conf/ApiDocConfig.java | 59 + .../logsearch/conf/ApplicationConfig.java | 84 + .../ambari/logsearch/conf/AuthConfig.java | 87 + .../logsearch/conf/SolrAuditLogConfig.java | 181 + .../ambari/logsearch/conf/SolrColumnConfig.java | 36 + .../ambari/logsearch/conf/SolrConfig.java | 50 + .../logsearch/conf/SolrConnectionConfig.java | 49 + .../logsearch/conf/SolrKerberosConfig.java | 48 + .../logsearch/conf/SolrServiceLogConfig.java | 144 + .../ambari/logsearch/conf/SolrUserConfig.java | 104 + .../ambari/logsearch/dao/AuditSolrDao.java | 29 +- .../logsearch/dao/ServiceLogsSolrDao.java | 21 +- .../ambari/logsearch/dao/SolrDaoBase.java | 19 +- .../ambari/logsearch/dao/UserConfigSolrDao.java | 32 +- .../apache/ambari/logsearch/dao/UserDao.java | 10 +- .../ambari/logsearch/doc/DocConstants.java | 26 +- .../logsearch/graph/GraphDataGenerator.java | 81 +- .../logsearch/graph/GraphDataGeneratorBase.java | 34 +- .../logsearch/manager/AuditLogsManager.java | 597 + .../ambari/logsearch/manager/AuditMgr.java | 630 - .../logsearch/manager/JsonManagerBase.java | 69 + .../logsearch/manager/LogFileManager.java | 155 + .../ambari/logsearch/manager/LogFileMgr.java | 145 - .../ambari/logsearch/manager/LogsMgr.java | 1896 - .../ambari/logsearch/manager/ManagerBase.java | 221 + .../ambari/logsearch/manager/MgrBase.java | 256 - .../ambari/logsearch/manager/PublicManager.java | 48 + .../ambari/logsearch/manager/PublicMgr.java | 46 - .../logsearch/manager/ServiceLogsManager.java | 1917 + .../logsearch/manager/SessionManager.java | 76 + .../ambari/logsearch/manager/SessionMgr.java | 76 - .../logsearch/manager/UserConfigManager.java | 276 + .../ambari/logsearch/manager/UserConfigMgr.java | 276 - .../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/LogFileParamDefinition.java | 45 + .../request/LogFileTailParamDefinition.java | 32 + .../model/request/LogParamDefinition.java | 68 + .../request/LogTruncatedParamDefinition.java | 44 + .../model/request/QueryParamDefinition.java | 32 + .../logsearch/model/request/SearchRequest.java | 25 + .../request/ServiceLogFileParamDefinition.java | 38 + .../request/ServiceLogParamDefinition.java | 80 + .../ServiceLogSearchParamDefinition.java | 50 + .../model/request/UnitParamDefinition.java | 33 + .../request/UserConfigParamDefinition.java | 44 + .../model/request/UtcOffsetParamDefinition.java | 32 + .../model/request/impl/AnyGraphRequest.java | 109 + .../request/impl/AuditBarGraphRequest.java | 40 + .../model/request/impl/AuditLogRequest.java | 40 + .../model/request/impl/BaseAuditLogRequest.java | 53 + .../model/request/impl/BaseLogRequest.java | 118 + .../request/impl/BaseServiceLogRequest.java | 186 + .../model/request/impl/CommonSearchRequest.java | 119 + .../request/impl/FieldAuditBarGraphRequest.java | 40 + .../request/impl/FieldAuditLogRequest.java | 41 + .../model/request/impl/LogFileRequest.java | 67 + .../model/request/impl/LogFileTailRequest.java | 40 + .../model/request/impl/QueryRequest.java | 40 + .../request/impl/ServiceAnyGraphRequest.java | 109 + .../impl/ServiceExtremeDatesRequest.java | 41 + .../model/request/impl/ServiceGraphRequest.java | 40 + .../request/impl/ServiceLogExportRequest.java | 54 + .../request/impl/ServiceLogFileRequest.java | 54 + .../model/request/impl/ServiceLogRequest.java | 93 + .../impl/ServiceLogTruncatedRequest.java | 66 + .../model/request/impl/SimpleQueryRequest.java | 42 + .../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 | 113 + .../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 + .../ambari/logsearch/query/QueryGeneration.java | 18 +- .../logsearch/query/QueryGenerationBase.java | 12 +- .../AbstractCommonAuditLogRequestConverter.java | 48 + .../AbstractCommonSearchRequestConverter.java | 53 + ...bstractCommonServiceLogRequestConverter.java | 56 + .../converter/AnyGraphRequestConverter.java | 39 + .../AuditBarGraphRequestConverter.java | 34 + .../converter/AuditLogRequestConverter.java | 34 + .../converter/BaseAuditLogRequestConverter.java | 33 + .../BaseServiceLogRequestConverter.java | 32 + .../FieldAuditLogRequestConverter.java | 34 + .../FieldBarGraphRequestConverter.java | 35 + .../converter/LogFileRequestConverter.java | 37 + .../converter/LogFileTailRequestConverter.java | 38 + .../ServiceAnyGraphRequestConverter.java | 39 + .../ServiceExtremeDatesRequestConverter.java | 35 + .../converter/ServiceGraphRequestConverter.java | 36 + .../ServiceLogExportRequestConverter.java | 38 + .../ServiceLogFileRequestConverter.java | 36 + .../converter/ServiceLogRequestConverter.java | 41 + .../ServiceLogTruncatedRequestConverter.java | 38 + .../converter/SimpleQueryRequestConverter.java | 34 + .../converter/UserConfigRequestConverter.java | 38 + .../converter/UserExportRequestConverter.java | 35 + .../query/model/AnyGraphSearchCriteria.java | 25 + .../model/AuditBarGraphSearchCriteria.java | 25 + .../query/model/AuditLogSearchCriteria.java | 25 + .../query/model/CommonSearchCriteria.java | 100 + .../model/FieldAuditBarGraphSearchCriteria.java | 25 + .../model/FieldAuditLogSearchCriteria.java | 25 + .../query/model/LogFileSearchCriteria.java | 25 + .../query/model/LogFileTailSearchCriteria.java | 25 + .../logsearch/query/model/SearchCriteria.java | 136 + .../model/ServiceAnyGraphSearchCriteria.java | 25 + .../model/ServiceExtremeDatesCriteria.java | 25 + .../query/model/ServiceGraphSearchCriteria.java | 25 + .../model/ServiceLogExportSearchCriteria.java | 25 + .../model/ServiceLogFileSearchCriteria.java | 25 + .../query/model/ServiceLogSearchCriteria.java | 25 + .../ServiceLogTruncatedSearchCriteria.java | 25 + .../query/model/UserConfigSearchCriteria.java | 25 + .../query/model/UserExportSearchCriteria.java | 25 + .../ambari/logsearch/rest/AuditLogsREST.java | 283 - .../logsearch/rest/AuditLogsResource.java | 157 + .../ambari/logsearch/rest/LogFileREST.java | 84 - .../ambari/logsearch/rest/LogFileResource.java | 69 + .../ambari/logsearch/rest/PublicREST.java | 48 - .../ambari/logsearch/rest/PublicResource.java | 48 + .../ambari/logsearch/rest/ServiceLogsREST.java | 574 - .../logsearch/rest/ServiceLogsResource.java | 238 + .../ambari/logsearch/rest/UserConfigREST.java | 128 - .../logsearch/rest/UserConfigResource.java | 116 + .../ambari/logsearch/service/UserService.java | 5 +- .../logsearch/solr/model/SolrAuditLogData.java | 339 + .../logsearch/solr/model/SolrCommonLogData.java | 248 + .../solr/model/SolrComponentTypeLogData.java | 38 + .../logsearch/solr/model/SolrHostLogData.java | 38 + .../solr/model/SolrServiceLogData.java | 118 + .../apache/ambari/logsearch/util/BizUtil.java | 40 +- .../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 - .../apache/ambari/logsearch/view/VLogFile.java | 56 - .../ambari/logsearch/view/VLogFileList.java | 70 - .../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 - .../ambari/logsearch/view/VSolrLogList.java | 67 - .../apache/ambari/logsearch/view/VString.java | 52 - .../ambari/logsearch/view/VSummaryCount.java | 66 - .../logsearch/view/VSummaryCountList.java | 37 - ...LogsearchSecurityContextFormationFilter.java | 10 +- .../LogsearchAuthenticationProvider.java | 15 +- ...rchExternalServerAuthenticationProvider.java | 18 +- .../LogsearchFileAuthenticationProvider.java | 5 +- .../src/main/scripts/add_config_set.sh | 43 - .../src/main/scripts/create_collections.sh | 37 - .../main/webapp/META-INF/applicationContext.xml | 69 - .../META-INF/security-applicationContext.xml | 1 + .../src/main/webapp/WEB-INF/web.xml | 27 +- .../scripts/model_bases/VUserFilterBase.js | 2 +- .../views/dashboard/ComponentListView.js | 2 +- .../scripts/views/graphs/GraphLayoutView.js | 2 +- .../src/main/webapp/templates/graphs/backup.js | 2 +- .../ambari/logsearch/dao/AuditSolrDaoTest.java | 37 +- .../logsearch/dao/ServiceLogsSolrDaoTest.java | 37 +- .../ambari/logsearch/dao/SolrDaoBaseTest.java | 73 +- .../logsearch/dao/UserConfigSolrDaoTest.java | 56 +- .../ambari/logsearch/dao/UserDaoTest.java | 58 - .../src/test/resources/applicationContext.xml | 53 - 209 files changed, 11313 insertions(+), 38775 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cc429d48/ambari-logsearch/ambari-logsearch-portal/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/pom.xml b/ambari-logsearch/ambari-logsearch-portal/pom.xml index b36c9bb..ebba82c 100755 --- a/ambari-logsearch/ambari-logsearch-portal/pom.xml +++ b/ambari-logsearch/ambari-logsearch-portal/pom.xml @@ -548,7 +548,7 @@ </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId> - <artifactId>jersey-media-moxy</artifactId> + <artifactId>jersey-media-json-jackson</artifactId> <version>${jersey.version}</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ambari/blob/cc429d48/ambari-logsearch/ambari-logsearch-portal/production/build.js ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/production/build.js b/ambari-logsearch/ambari-logsearch-portal/production/build.js deleted file mode 100644 index afeea67..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/production/build.js +++ /dev/null @@ -1,28 +0,0 @@ -/** -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - -{ - appDir: "../src/main/webapp", - baseUrl: "scripts", - dir: "../target/webapp-build", - modules: [ - { - name: "Init" - } - ] -}
