You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2017/09/26 22:26:09 UTC
[10/50] [abbrv] ambari git commit: AMBARI-22037 Log Search UI: host
filter should be performed using hostList parameter. (ababiichuk)
AMBARI-22037 Log Search UI: host filter should be performed using hostList parameter. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d9662987
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d9662987
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d9662987
Branch: refs/heads/branch-3.0-ams
Commit: d9662987483c8e0d347c59f02e8e459427a90749
Parents: d221ab7
Author: ababiichuk <ab...@hortonworks.com>
Authored: Fri Sep 22 12:00:33 2017 +0300
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Fri Sep 22 12:00:33 2017 +0300
----------------------------------------------------------------------
.../src/app/classes/queries/audit-logs-query-params.class.ts | 2 --
.../queries/service-logs-histogram-query-params.class.ts | 1 -
.../src/app/classes/queries/service-logs-query-params.class.ts | 1 -
.../ambari-logsearch-web/src/app/services/filtering.service.ts | 4 ----
.../src/app/services/logs-container.service.ts | 5 ++---
.../src/app/services/mock-api-data.service.ts | 2 +-
ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json | 1 -
7 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
index ef8cf28..d179376 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
@@ -39,8 +39,6 @@ export class AuditLogsQueryParams extends QueryParams {
start_time?: string;
end_time?: string;
clusters?: string;
- iMessage?: string;
- eMessage?: string;
mustBe?: string;
mustNot?: string;
includeQuery?: string;
http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-histogram-query-params.class.ts
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-histogram-query-params.class.ts b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-histogram-query-params.class.ts
index 572af03..2e2113f 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-histogram-query-params.class.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-histogram-query-params.class.ts
@@ -64,7 +64,6 @@ export class ServiceLogsHistogramQueryParams extends QueryParams {
to: string;
unit?: string;
clusters?: string;
- iMessage?: string;
level?: string;
includeQuery?: string;
excludeQuery?: string;
http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-query-params.class.ts
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-query-params.class.ts b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-query-params.class.ts
index c88ec46..864b689 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-query-params.class.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-query-params.class.ts
@@ -20,7 +20,6 @@ import {AuditLogsQueryParams} from '@app/classes/queries/audit-logs-query-params
export class ServiceLogsQueryParams extends AuditLogsQueryParams {
level?: string;
- host_name?: string;
file_name?: string;
bundle_id?: string;
hostList?: string;
http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/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 718149e..627dc27 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
@@ -66,10 +66,6 @@ export class FilteringService {
options: [],
defaultValue: ''
},
- text: {
- label: 'filter.message',
- defaultValue: ''
- },
timeRange: {
options: [
[
http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/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 a90d099..26d1b6b 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
@@ -43,11 +43,10 @@ export class LogsContainerService {
private readonly listFilters = {
clusters: ['clusters'],
- text: ['iMessage'],
timeRange: ['end_time', 'start_time'],
components: ['mustBe'],
levels: ['level'],
- hosts: ['host_name'],
+ hosts: ['hostList'],
sorting: ['sortType', 'sortBy'],
pageSize: ['pageSize'],
page: ['page'],
@@ -56,10 +55,10 @@ export class LogsContainerService {
private readonly histogramFilters = {
clusters: ['clusters'],
- text: ['iMessage'],
timeRange: ['to', 'from'],
components: ['mustBe'],
levels: ['level'],
+ hosts: ['hostList'],
query: ['includeQuery', 'excludeQuery']
};
http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/ambari-logsearch/ambari-logsearch-web/src/app/services/mock-api-data.service.ts
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/services/mock-api-data.service.ts b/ambari-logsearch/ambari-logsearch-web/src/app/services/mock-api-data.service.ts
index ec89d9f..937fae1 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/services/mock-api-data.service.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/services/mock-api-data.service.ts
@@ -60,7 +60,7 @@ export class mockApiDataService implements InMemoryDbService {
key: 'logtime',
filterFunction: (value, filterValue) => value < moment(filterValue).valueOf()
},
- host_name: {
+ hostList: {
key: 'host',
isValuesList: true
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
----------------------------------------------------------------------
diff --git a/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json b/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
index e3f4c69..1235a80 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
+++ b/ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json
@@ -18,7 +18,6 @@
"filter.all": "All",
"filter.clusters": "Clusters",
- "filter.message": "Message:",
"filter.components": "Components",
"filter.levels": "Levels",
"filter.capture": "Capture",