http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts index 1481583..2c8ecd7 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/filter-button/filter-button.component.ts @@ -18,7 +18,7 @@ import {Component, Input, forwardRef} from '@angular/core'; import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms'; -import {ListItem} from "@app/classes/list-item.class"; +import {ListItem} from "@app/classes/list-item"; import {ComponentActionsService} from '@app/services/component-actions.service'; import {UtilsService} from '@app/services/utils.service'; import {MenuButtonComponent} from '@app/components/menu-button/menu-button.component';
http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.ts index c345c81..5eef03e 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.ts @@ -20,8 +20,8 @@ import {Component} from '@angular/core'; import {FormGroup} from '@angular/forms'; import {Subject} from 'rxjs/Subject'; import {TranslateService} from '@ngx-translate/core'; -import {ListItem} from '@app/classes/list-item.class'; -import {CommonEntry} from '@app/models/common-entry.model'; +import {ListItem} from '@app/classes/list-item'; +import {CommonEntry} from '@app/classes/models/common-entry'; import {FilteringService} from '@app/services/filtering.service'; import {LogsContainerService} from '@app/services/logs-container.service'; import {AppStateService} from '@app/services/storage/app-state.service'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/components/log-context/log-context.component.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/log-context/log-context.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/log-context/log-context.component.ts index 467de98..c0411e5 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/log-context/log-context.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/log-context/log-context.component.ts @@ -21,8 +21,8 @@ import 'rxjs/add/operator/map'; import {LogsContainerService} from '@app/services/logs-container.service'; import {ServiceLogsTruncatedService} from '@app/services/storage/service-logs-truncated.service'; import {AppStateService} from '@app/services/storage/app-state.service'; -import {ServiceLog} from '@app/models/service-log.model'; -import {ServiceLogContextEntry} from '@app/classes/service-log-context-entry.class'; +import {ServiceLog} from '@app/classes/models/service-log'; +import {ServiceLogContextEntry} from '@app/classes/service-log-context-entry'; @Component({ selector: 'log-context', http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.ts index 7345288..63fafb6 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-container/logs-container.component.ts @@ -24,11 +24,11 @@ import {FilteringService} from '@app/services/filtering.service'; import {LogsContainerService} from '@app/services/logs-container.service'; import {ServiceLogsHistogramDataService} from '@app/services/storage/service-logs-histogram-data.service'; import {AppStateService} from '@app/services/storage/app-state.service'; -import {AuditLog} from '@app/models/audit-log.model'; -import {ServiceLog} from '@app/models/service-log.model'; -import {LogField} from '@app/models/log-field.model'; -import {ActiveServiceLogEntry} from '@app/classes/active-service-log-entry.class'; -import {HistogramOptions} from '@app/classes/histogram-options.class'; +import {AuditLog} from '@app/classes/models/audit-log'; +import {ServiceLog} from '@app/classes/models/service-log'; +import {LogField} from '@app/classes/models/log-field'; +import {ActiveServiceLogEntry} from '@app/classes/active-service-log-entry'; +import {HistogramOptions} from '@app/classes/histogram-options'; @Component({ selector: 'logs-container', http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts index c94b967..2462a61 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts @@ -21,8 +21,8 @@ import 'rxjs/add/operator/map'; import {AppStateService} from '@app/services/storage/app-state.service'; import {FilteringService} from '@app/services/filtering.service'; import {UtilsService} from '@app/services/utils.service'; -import {AuditLog} from '@app/models/audit-log.model'; -import {ServiceLog} from '@app/models/service-log.model'; +import {AuditLog} from '@app/classes/models/audit-log'; +import {ServiceLog} from '@app/classes/models/service-log'; @Component({ selector: 'logs-list', http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.ts index 32fe1cf..ad86a74 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/main-container/main-container.component.ts @@ -21,9 +21,9 @@ import {HttpClientService} from '@app/services/http-client.service'; import {AppStateService} from '@app/services/storage/app-state.service'; import {AuditLogsFieldsService} from '@app/services/storage/audit-logs-fields.service'; import {ServiceLogsFieldsService} from '@app/services/storage/service-logs-fields.service'; -import {AuditLogField} from '@app/models/audit-log-field.model'; -import {ServiceLogField} from '@app/models/service-log-field.model'; -import {ActiveServiceLogEntry} from '@app/classes/active-service-log-entry.class'; +import {AuditLogField} from '@app/classes/models/audit-log-field'; +import {ServiceLogField} from '@app/classes/models/service-log-field'; +import {ActiveServiceLogEntry} from '@app/classes/active-service-log-entry'; @Component({ selector: 'main-container', http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.ts index 7e347e6..3bac984 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.ts @@ -17,7 +17,7 @@ */ import {Component, Input, ViewChild, ElementRef} from '@angular/core'; -import {ListItem} from '@app/classes/list-item.class'; +import {ListItem} from '@app/classes/list-item'; import {ComponentActionsService} from '@app/services/component-actions.service'; import * as $ from 'jquery'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts index e547a62..5520310 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts @@ -19,7 +19,7 @@ import {Component, OnInit, OnDestroy, Input, ViewChild, ElementRef, forwardRef} from '@angular/core'; import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms'; import {Subject} from 'rxjs/Subject'; -import {CommonEntry} from '@app/models/common-entry.model'; +import {CommonEntry} from '@app/classes/models/common-entry'; import {UtilsService} from '@app/services/utils.service'; @Component({ http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/components/time-histogram/time-histogram.component.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/time-histogram/time-histogram.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/time-histogram/time-histogram.component.ts index c3ec388..e255166 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/time-histogram/time-histogram.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/time-histogram/time-histogram.component.ts @@ -21,7 +21,7 @@ import {ContainerElement, Selection} from 'd3'; import * as d3 from 'd3'; import * as moment from 'moment-timezone'; import {AppSettingsService} from '@app/services/storage/app-settings.service'; -import {HistogramStyleOptions, HistogramOptions} from '@app/classes/histogram-options.class'; +import {HistogramStyleOptions, HistogramOptions} from '@app/classes/histogram-options'; @Component({ selector: 'time-histogram', http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/app-settings.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/app-settings.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/app-settings.model.ts deleted file mode 100644 index 11821a3..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/app-settings.model.ts +++ /dev/null @@ -1,27 +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. - */ - -import * as moment from 'moment-timezone'; - -export interface AppSettings { - timeZone: string; -} - -export const defaultSettings: AppSettings = { - timeZone: moment.tz.guess() -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/app-state.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/app-state.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/app-state.model.ts deleted file mode 100644 index 267bf15..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/app-state.model.ts +++ /dev/null @@ -1,43 +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. - */ - -import {ActiveServiceLogEntry} from '@app/classes/active-service-log-entry.class'; - -export interface AppState { - isAuthorized: boolean; - isInitialLoading: boolean; - isLoginInProgress: boolean; - isAuditLogsSet: boolean; - isServiceLogsSet: boolean; - activeLogsType?: string; - isServiceLogsFileView: boolean; - isServiceLogContextView: boolean; - activeLog: ActiveServiceLogEntry | null; -} - -export const initialState: AppState = { - isAuthorized: false, - isInitialLoading: false, - isLoginInProgress: false, - isAuditLogsSet: false, - isServiceLogsSet: false, - activeLogsType: 'serviceLogs', // TODO implement setting the parameter depending on user's navigation - isServiceLogsFileView: false, - isServiceLogContextView: false, - activeLog: null -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/audit-log-field.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/audit-log-field.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/audit-log-field.model.ts deleted file mode 100644 index 96372a1..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/audit-log-field.model.ts +++ /dev/null @@ -1,225 +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. - */ - -import {LogField} from '@app/models/log-field.model'; - -const columnsNamesMap = { - access: { - displayName: 'logs.accessType', - isDisplayed: true - }, - action: { - displayName: 'logs.action' - }, - agent: { - displayName: 'logs.agent' - }, - agentHost: { - displayName: 'logs.agentHost' - }, - authType: { - displayName: 'logs.authType' - }, - bundle_id: { - displayName: 'logs.bundleId' - }, - case_id: { - displayName: 'logs.caseId' - }, - cliIP: { - displayName: 'logs.clientIp', - isDisplayed: true - }, - cliType: { - displayName: 'logs.clientType' - }, - cluster: { - displayName: 'logs.cluster' - }, - dst: { - displayName: 'logs.dst' - }, - evtTime: { - displayName: 'logs.eventTime', - isDisplayed: true - }, - file: { - displayName: 'logs.file' - }, - host: { - displayName: 'logs.host' - }, - id: { - displayName: 'logs.id' - }, - ip: { - displayName: 'logs.ip' - }, - level: { - displayName: 'logs.level' - }, - log_message: { - displayName: 'logs.message' - }, - logType: { - displayName: 'logs.logType' - }, - logfile_line_number: { - displayName: 'logs.logfileLineNumber' - }, - logger_name: { - displayName: 'logs.loggerName' - }, - logtime: { - displayName: 'logs.logTime' - }, - path: { - displayName: 'logs.path' - }, - perm: { - displayName: 'logs.perm' - }, - policy: { - displayName: 'logs.policy' - }, - proxyUsers: { - displayName: 'logs.proxyUsers' - }, - reason: { - displayName: 'logs.reason' - }, - repo: { - displayName: 'logs.repo', - isDisplayed: true - }, - repoType: { - displayName: 'logs.repoType' - }, - req_caller_id: { - displayName: 'logs.reqCallerId' - }, - reqContext: { - displayName: 'logs.reqContext' - }, - reqData: { - displayName: 'logs.reqData' - }, - req_self_id: { - displayName: 'logs.reqSelfId' - }, - resType: { - displayName: 'logs.resType' - }, - resource: { - displayName: 'logs.resource', - isDisplayed: true - }, - result: { - displayName: 'logs.result', - isDisplayed: true - }, - sess: { - displayName: 'logs.session' - }, - text: { - displayName: 'logs.text' - }, - type: { - displayName: 'logs.type' - }, - ugi: { - displayName: 'logs.ugi' - }, - reqUser: { - displayName: 'logs.user', - isDisplayed: true - }, - ws_base_url: { - displayName: 'logs.baseUrl' - }, - ws_command: { - displayName: 'logs.command' - }, - ws_component: { - displayName: 'logs.component' - }, - ws_details: { - displayName: 'logs.details' - }, - ws_display_name: { - displayName: 'logs.displayName' - }, - ws_os: { - displayName: 'logs.os' - }, - ws_repo_id: { - displayName: 'logs.repoId' - }, - ws_repo_version: { - displayName: 'logs.repoVersion' - }, - ws_repositories: { - displayName: 'logs.repositories' - }, - ws_request_id: { - displayName: 'logs.requestId' - }, - ws_result_status: { - displayName: 'logs.resultStatus' - }, - ws_roles: { - displayName: 'logs.roles' - }, - ws_stack_version: { - displayName: 'logs.stackVersion' - }, - ws_stack: { - displayName: 'logs.stack' - }, - ws_status: { - displayName: 'logs.status' - }, - ws_task_id: { - displayName: 'logs.taskId' - }, - ws_version_note: { - displayName: 'logs.versionNote' - }, - ws_version_number: { - displayName: 'logs.versionNumber' - }, - tags: { - isAvailable: false - }, - tags_str: { - isAvailable: false - }, - seq_num: { - isAvailable: false - } -}; - -export class AuditLogField extends LogField { - constructor(name: string) { - super(name); - const preset = columnsNamesMap[this.name]; - if (preset) { - Object.assign(this, preset); - } - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/audit-log.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/audit-log.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/audit-log.model.ts deleted file mode 100644 index 2b34cd6..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/audit-log.model.ts +++ /dev/null @@ -1,46 +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. - */ - -import {Log} from '@app/models/log.model'; - -export interface AuditLog extends Log { - policy?: string; - reason?: string; - result: number; - text?: string; - tags?: string[]; - resource?: string; - sess?: string; - access?: string; - logType: string; - tags_str?: string; - resType?: string; - reqUser: string; - reqData?: string; - repoType: number; - repo: string; - proxyUsers?: string[]; - evtTime: string; - enforcer: string; - reqContext?: string; - cliType?: string; - cliIP?: string; - agent?: string; - agentHost?: string; - action?: string; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/bar-graph.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/bar-graph.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/bar-graph.model.ts deleted file mode 100644 index 6c9a049..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/bar-graph.model.ts +++ /dev/null @@ -1,24 +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. - */ - -import {CommonEntry} from '@app/models/common-entry.model'; - -export interface BarGraph { - dataCount: CommonEntry[]; - name: string; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/common-entry.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/common-entry.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/common-entry.model.ts deleted file mode 100644 index dad82ab..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/common-entry.model.ts +++ /dev/null @@ -1,22 +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. - */ - -export interface CommonEntry { - name: string; - value: string; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/count.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/count.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/count.model.ts deleted file mode 100644 index 02fc41c..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/count.model.ts +++ /dev/null @@ -1,22 +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. - */ - -export interface Count { - name: string; - count: number; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/filter.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/filter.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/filter.model.ts deleted file mode 100644 index c7ff662..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/filter.model.ts +++ /dev/null @@ -1,25 +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. - */ - -export interface Filter { - label: string; - hosts: string[]; - defaultLevels: string[]; - overrideLevels: string[]; - expiryTime: string; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/graph.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/graph.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/graph.model.ts deleted file mode 100644 index be31f19..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/graph.model.ts +++ /dev/null @@ -1,23 +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. - */ - -export interface Graph { - name: string; - count: string; - dataList?: Graph[]; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/log-field.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/log-field.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/log-field.model.ts deleted file mode 100644 index 0e738ab..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/log-field.model.ts +++ /dev/null @@ -1,27 +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. - */ - -export class LogField { - constructor(name: string) { - this.name = name; - } - name: string; - displayName: string = this.name; - isDisplayed: boolean = false; - isAvailable: boolean = true; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/log.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/log.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/log.model.ts deleted file mode 100644 index c598e41..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/log.model.ts +++ /dev/null @@ -1,38 +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. - */ - -export interface Log { - type: string; - _version_: number; - id: string; - file?: string; - seq_num: number; - bundle_id?: string; - case_id?: string; - log_message: string; - logfile_line_number: number; - line_number?: number; - message_md5: string; - cluster: string; - event_count: number; - event_md5: string; - event_dur_ms: number; - _ttl_: string; - _expire_at_: number; - _router_field_?: number; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/node.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/node.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/node.model.ts deleted file mode 100644 index b01421e..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/node.model.ts +++ /dev/null @@ -1,30 +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. - */ - -import {CommonEntry} from '@app/models/common-entry.model'; - -export interface Node { - name: string; - type?: string; - value: string; - isParent: boolean; - isRoot: boolean; - childs?: Node[]; - logLevelCount?: CommonEntry[]; - vNodeList?: CommonEntry[]; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/service-log-field.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/service-log-field.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/service-log-field.model.ts deleted file mode 100644 index 081eecf..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/service-log-field.model.ts +++ /dev/null @@ -1,107 +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. - */ - -import {LogField} from '@app/models/log-field.model'; - -const columnsNamesMap = { - log_message: { - displayName: 'logs.message', - isDisplayed: true - }, - bundle_id: { - displayName: 'logs.bundleId' - }, - case_id: { - displayName: 'logs.caseId' - }, - cluster: { - displayName: 'logs.cluster' - }, - event_count: { - displayName: 'logs.eventCount' - }, - file: { - displayName: 'logs.file' - }, - host: { - displayName: 'logs.host' - }, - id: { - displayName: 'logs.id' - }, - ip: { - displayName: 'logs.ip' - }, - level: { - displayName: 'logs.level', - isDisplayed: true - }, - line_number: { - displayName: 'logs.lineNumber' - }, - logtype: { - displayName: 'logs.logType' - }, - logfile_line_number: { - displayName: 'logs.logfileLineNumber' - }, - logger_name: { - displayName: 'logs.loggerName' - }, - logtime: { - isDisplayed: true - }, - method: { - displayName: 'logs.method' - }, - path: { - displayName: 'logs.path' - }, - rowtype: { - displayName: 'logs.rowType' - }, - thread_name: { - displayName: 'logs.threadName' - }, - type: { - displayName: 'logs.type', - isDisplayed: true - }, - tags: { - isAvailable: false - }, - text: { - isAvailable: false - }, - message: { - isAvailable: false - }, - seq_num: { - isAvailable: false - } -}; - -export class ServiceLogField extends LogField { - constructor(name: string) { - super(name); - const preset = columnsNamesMap[this.name]; - if (preset) { - Object.assign(this, preset); - } - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/service-log.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/service-log.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/service-log.model.ts deleted file mode 100644 index ee27343..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/service-log.model.ts +++ /dev/null @@ -1,27 +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. - */ - -import {Log} from '@app/models/log.model'; - -export interface ServiceLog extends Log { - path: string; - host: string; - level: string; - logtime: number; - ip: string; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/solr-collection-state.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/solr-collection-state.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/solr-collection-state.model.ts deleted file mode 100644 index 0824dda..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/solr-collection-state.model.ts +++ /dev/null @@ -1,23 +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. - */ - -export interface SolrCollectionState { - znodeReady: boolean; - configurationUploaded: boolean; - solrCollectionReady: boolean; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/store.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/store.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/store.model.ts deleted file mode 100644 index 518e7cd..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/store.model.ts +++ /dev/null @@ -1,180 +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. - */ - -import {Observable} from 'rxjs/Observable'; -import {Store, Action} from '@ngrx/store'; -import {AppSettings} from '@app/models/app-settings.model'; -import {AppState} from '@app/models/app-state.model'; -import {AuditLog} from '@app/models/audit-log.model'; -import {ServiceLog} from '@app/models/service-log.model'; -import {BarGraph} from '@app/models/bar-graph.model'; -import {Graph} from '@app/models/graph.model'; -import {Node} from '@app/models/node.model'; -import {UserConfig} from '@app/models/user-config.model'; -import {Filter} from '@app/models/filter.model'; -import {AuditLogField} from '@app/models/audit-log-field.model'; -import {ServiceLogField} from '@app/models/service-log-field.model'; - -export const storeActions = { - 'ARRAY.ADD': 'ADD', - 'ARRAY.ADD.START': 'ADD_TO_START', - 'ARRAY.DELETE.PRIMITIVE': 'DELETE_PRIMITIVE', - 'ARRAY.DELETE.OBJECT': 'DELETE_OBJECT', - 'ARRAY.CLEAR': 'CLEAR', - 'ARRAY.MAP': 'MAP', - - 'OBJECT.SET': 'SET' -}; - -export interface AppStore { - appSettings: AppSettings; - appState: AppState; - auditLogs: AuditLog[]; - serviceLogs: ServiceLog[]; - serviceLogsHistogramData: BarGraph[]; - serviceLogsTruncated: ServiceLog[]; - graphs: Graph[]; - hosts: Node[]; - userConfigs: UserConfig[]; - filters: Filter[]; - clusters: string[]; - components: Node[]; - serviceLogsFields: ServiceLogField[]; - auditLogsFields: AuditLogField[]; -} - -export class ModelService { - - constructor(modelName: string, store: Store<AppStore>) { - this.modelName = modelName; - this.store = store; - } - - protected modelName: string; - - protected store: Store<AppStore>; - - getAll(): Observable<any> { - return this.store.select(this.modelName); - } - -} - -export class CollectionModelService extends ModelService { - - addInstance(instance: any): void { - this.addInstances([instance]); - } - - addInstances(instances: any[]): void { - this.store.dispatch({ - type: `${storeActions['ARRAY.ADD']}_${this.modelName}`, - payload: instances - }); - } - - addInstancesToStart(instances: any[]): void { - this.store.dispatch({ - type: `${storeActions['ARRAY.ADD.START']}_${this.modelName}`, - payload: instances - }); - } - - deleteObjectInstance(instance: any): void { - this.store.dispatch({ - type: `${storeActions['ARRAY.DELETE.OBJECT']}_${this.modelName}`, - payload: instance - }); - } - - deletePrimitiveInstance(instance: any): void { - this.store.dispatch({ - type: `${storeActions['ARRAY.DELETE.PRIMITIVE']}_${this.modelName}`, - payload: instance - }); - } - - clear(): void { - this.store.dispatch({ - type: `${storeActions['ARRAY.CLEAR']}_${this.modelName}` - }); - } - - mapCollection(modifier: (item: any) => {}): void { - this.store.dispatch({ - type: `${storeActions['ARRAY.MAP']}_${this.modelName}`, - payload: { - modifier: modifier - } - }); - } - -} - -export class ObjectModelService extends ModelService { - - getParameter(key: string): Observable<any> { - return this.store.select(this.modelName, key); - } - - setParameter(key: string, value: any): void { - let payload = {}; - payload[key] = value; - this.setParameters(payload); - } - - setParameters(params: any): void { - this.store.dispatch({ - type: `${storeActions['OBJECT.SET']}_${this.modelName}`, - payload: params - }); - } - -} - -export function getCollectionReducer(modelName: string, defaultState: any = []): any { - return (state: any = defaultState, action: Action) => { - switch (action.type) { - case `${storeActions['ARRAY.ADD']}_${modelName}`: - return [...state, ...action.payload]; - case `${storeActions['ARRAY.ADD.START']}_${modelName}`: - return [...action.payload, ...state]; - case `${storeActions['ARRAY.DELETE.OBJECT']}_${modelName}`: - return state.filter(instance => instance.id !== action.payload.id); - case `${storeActions['ARRAY.DELETE.PRIMITIVE']}_${modelName}`: - return state.filter(item => item !== action.payload); - case `${storeActions['ARRAY.CLEAR']}_${modelName}`: - return []; - case `${storeActions['ARRAY.MAP']}_${modelName}`: - return state.map(action.payload.modifier); - default: - return state; - } - }; -} - -export function getObjectReducer(modelName: string, defaultState: any = {}) { - return (state: any = defaultState, action: Action): any => { - switch (action.type) { - case `${storeActions['OBJECT.SET']}_${modelName}`: - return Object.assign({}, state, action.payload); - default: - return state; - } - }; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/models/user-config.model.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/models/user-config.model.ts b/ambari-logsearch/ambari-logsearch-web/src/app/models/user-config.model.ts deleted file mode 100644 index f52761c..0000000 --- a/ambari-logsearch/ambari-logsearch-web/src/app/models/user-config.model.ts +++ /dev/null @@ -1,26 +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. - */ - -export interface UserConfig { - id: string; - userName: string; - filtername: string; - values: string; - shareNameList: string[]; - rowType: string; -} http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/component-actions.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/component-actions.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/component-actions.service.ts index b3ff0b0..19b873c 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/component-actions.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/component-actions.service.ts @@ -19,10 +19,10 @@ import {Injectable} from '@angular/core'; import {AppSettingsService} from '@app/services/storage/app-settings.service'; import {AppStateService} from '@app/services/storage/app-state.service'; -import {CollectionModelService} from '@app/models/store.model'; +import {CollectionModelService} from '@app/classes/models/store'; import {FilteringService} from '@app/services/filtering.service'; import {LogsContainerService} from '@app/services/logs-container.service'; -import {ServiceLog} from '@app/models/service-log.model'; +import {ServiceLog} from '@app/classes/models/service-log'; @Injectable() export class ComponentActionsService { http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.spec.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.spec.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.spec.ts index c4db041..5d79902 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.spec.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.spec.ts @@ -24,8 +24,8 @@ import {ComponentsService, components} from '@app/services/storage/components.se import {HostsService, hosts} from '@app/services/storage/hosts.service'; import {UtilsService} from '@app/services/utils.service'; import {HttpClientService} from '@app/services/http-client.service'; -import {ListItem} from '@app/classes/list-item.class'; -import {Node} from '@app/models/node.model'; +import {ListItem} from '@app/classes/list-item'; +import {Node} from '@app/classes/models/node'; import {FilteringService} from './filtering.service'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts index 7fe6517..9e3a7d2 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts @@ -24,8 +24,8 @@ import {Observable} from 'rxjs/Observable'; import 'rxjs/add/observable/timer'; import 'rxjs/add/operator/takeUntil'; import * as moment from 'moment-timezone'; -import {ListItem} from '@app/classes/list-item.class'; -import {Node} from '@app/models/node.model'; +import {ListItem} from '@app/classes/list-item'; +import {Node} from '@app/classes/models/node'; import {AppSettingsService} from '@app/services/storage/app-settings.service'; import {ClustersService} from '@app/services/storage/clusters.service'; import {ComponentsService} from '@app/services/storage/components.service'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts index 495f706..9b61bf6 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/http-client.service.ts @@ -20,10 +20,10 @@ import {Injectable} from '@angular/core'; import {Observable} from 'rxjs/Observable'; import 'rxjs/add/operator/first'; import {Http, XHRBackend, Request, RequestOptions, RequestOptionsArgs, Response, Headers, URLSearchParams} from '@angular/http'; -import {AuditLogsQueryParams} from '@app/classes/queries/audit-logs-query-params.class'; -import {ServiceLogsQueryParams} from '@app/classes/queries/service-logs-query-params.class'; -import {ServiceLogsHistogramQueryParams} from '@app/classes/queries/service-logs-histogram-query-params.class'; -import {ServiceLogsTruncatedQueryParams} from '@app/classes/queries/service-logs-truncated-query-params.class'; +import {AuditLogsQueryParams} from '@app/classes/queries/audit-logs-query-params'; +import {ServiceLogsQueryParams} from '@app/classes/queries/service-logs-query-params'; +import {ServiceLogsHistogramQueryParams} from '@app/classes/queries/service-logs-histogram-query-params'; +import {ServiceLogsTruncatedQueryParams} from '@app/classes/queries/service-logs-truncated-query-params'; import {AppStateService} from '@app/services/storage/app-state.service'; @Injectable() http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/logs-container.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/logs-container.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/logs-container.service.ts index 14e9ad4..0319262 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/logs-container.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/logs-container.service.ts @@ -26,7 +26,7 @@ import {ServiceLogsFieldsService} from '@app/services/storage/service-logs-field import {ServiceLogsHistogramDataService} from '@app/services/storage/service-logs-histogram-data.service'; import {ServiceLogsTruncatedService} from '@app/services/storage/service-logs-truncated.service'; import {AppStateService} from '@app/services/storage/app-state.service'; -import {ActiveServiceLogEntry} from '@app/classes/active-service-log-entry.class'; +import {ActiveServiceLogEntry} from '@app/classes/active-service-log-entry'; @Injectable() export class LogsContainerService { http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/app-settings.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/app-settings.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/app-settings.service.ts index 6de9988..cec2656 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/app-settings.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/app-settings.service.ts @@ -18,8 +18,8 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {defaultSettings} from '@app/models/app-settings.model'; -import {AppStore, ObjectModelService, getObjectReducer} from '@app/models/store.model'; +import {defaultSettings} from '@app/classes/models/app-settings'; +import {AppStore, ObjectModelService, getObjectReducer} from '@app/classes/models/store'; export const modelName = 'appSettings'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/app-state.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/app-state.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/app-state.service.ts index d77d80f..df773fc 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/app-state.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/app-state.service.ts @@ -18,8 +18,8 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {initialState} from '@app/models/app-state.model'; -import {AppStore, ObjectModelService, getObjectReducer} from '@app/models/store.model'; +import {initialState} from '@app/classes/models/app-state'; +import {AppStore, ObjectModelService, getObjectReducer} from '@app/classes/models/store'; export const modelName = 'appState'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs-fields.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs-fields.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs-fields.service.ts index bb8c661..0950de6 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs-fields.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs-fields.service.ts @@ -18,7 +18,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'auditLogsFields'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs.service.ts index bc33bd9..a467fc9 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/audit-logs.service.ts @@ -18,7 +18,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'auditLogs'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/clusters.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/clusters.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/clusters.service.ts index f21a8f9..35a07be 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/clusters.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/clusters.service.ts @@ -18,7 +18,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'clusters'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/components.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/components.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/components.service.ts index 6b2a0ba..1432f6a 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/components.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/components.service.ts @@ -18,7 +18,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'components'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/filters.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/filters.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/filters.service.ts index b850006..493e2e6 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/filters.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/filters.service.ts @@ -19,7 +19,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'filters'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/graphs.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/graphs.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/graphs.service.ts index e541444..8a5bb2b 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/graphs.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/graphs.service.ts @@ -19,7 +19,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'graphs'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/hosts.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/hosts.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/hosts.service.ts index 0cb0a74..acf7dda 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/hosts.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/hosts.service.ts @@ -18,7 +18,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'hosts'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-fields.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-fields.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-fields.service.ts index 0082cd6..1440d8d 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-fields.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-fields.service.ts @@ -18,7 +18,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'serviceLogsFields'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-histogram-data.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-histogram-data.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-histogram-data.service.ts index e680777..91ee94a 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-histogram-data.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-histogram-data.service.ts @@ -18,7 +18,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'serviceLogsHistogramData'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-truncated.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-truncated.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-truncated.service.ts index f8fe0f7..53b73ba 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-truncated.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs-truncated.service.ts @@ -18,7 +18,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'serviceLogsTruncated'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs.service.ts index f0ff0d7..0f4fa35 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/service-logs.service.ts @@ -18,7 +18,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'serviceLogs'; http://git-wip-us.apache.org/repos/asf/ambari/blob/b4966c10/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/user-configs.service.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/user-configs.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/user-configs.service.ts index 1596e78..3b6bb15 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/user-configs.service.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/storage/user-configs.service.ts @@ -19,7 +19,7 @@ import {Injectable} from '@angular/core'; import {Store} from '@ngrx/store'; -import {AppStore, CollectionModelService, getCollectionReducer} from '@app/models/store.model'; +import {AppStore, CollectionModelService, getCollectionReducer} from '@app/classes/models/store'; export const modelName = 'userConfigs';