Repository: ambari Updated Branches: refs/heads/branch-feature-logsearch-ui 320b0e0c6 -> f3c103926
AMBARI-21747 Log Search UI: implement histogram filtering by all possible criterias. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f3c10392 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f3c10392 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f3c10392 Branch: refs/heads/branch-feature-logsearch-ui Commit: f3c1039269c61ca43b35374f65aa1eff78a27c60 Parents: 320b0e0 Author: ababiichuk <ababiic...@hortonworks.com> Authored: Thu Aug 17 19:52:44 2017 +0300 Committer: ababiichuk <ababiic...@hortonworks.com> Committed: Thu Aug 17 19:52:44 2017 +0300 ---------------------------------------------------------------------- .../queries/service-logs-histogram-query-params.class.ts | 3 +++ .../src/app/classes/queries/service-logs-query-params.class.ts | 1 - .../app/components/logs-container/logs-container.component.ts | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f3c10392/ambari-logsearch/ambari-logsearch-web-new/src/app/classes/queries/service-logs-histogram-query-params.class.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web-new/src/app/classes/queries/service-logs-histogram-query-params.class.ts b/ambari-logsearch/ambari-logsearch-web-new/src/app/classes/queries/service-logs-histogram-query-params.class.ts index 5402214..87e82f6 100644 --- a/ambari-logsearch/ambari-logsearch-web-new/src/app/classes/queries/service-logs-histogram-query-params.class.ts +++ b/ambari-logsearch/ambari-logsearch-web-new/src/app/classes/queries/service-logs-histogram-query-params.class.ts @@ -63,4 +63,7 @@ export class ServiceLogsHistogramQueryParams extends QueryParams { from: string; to: string; unit?: string; + clusters?: string; + iMessage?: string; + level?: string; } http://git-wip-us.apache.org/repos/asf/ambari/blob/f3c10392/ambari-logsearch/ambari-logsearch-web-new/src/app/classes/queries/service-logs-query-params.class.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web-new/src/app/classes/queries/service-logs-query-params.class.ts b/ambari-logsearch/ambari-logsearch-web-new/src/app/classes/queries/service-logs-query-params.class.ts index 125b237..c88ec46 100644 --- a/ambari-logsearch/ambari-logsearch-web-new/src/app/classes/queries/service-logs-query-params.class.ts +++ b/ambari-logsearch/ambari-logsearch-web-new/src/app/classes/queries/service-logs-query-params.class.ts @@ -21,7 +21,6 @@ import {AuditLogsQueryParams} from '@app/classes/queries/audit-logs-query-params export class ServiceLogsQueryParams extends AuditLogsQueryParams { level?: string; host_name?: string; - mustBe?: string; file_name?: string; bundle_id?: string; hostList?: string; http://git-wip-us.apache.org/repos/asf/ambari/blob/f3c10392/ambari-logsearch/ambari-logsearch-web-new/src/app/components/logs-container/logs-container.component.ts ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-web-new/src/app/components/logs-container/logs-container.component.ts b/ambari-logsearch/ambari-logsearch-web-new/src/app/components/logs-container/logs-container.component.ts index 57a147c..c77fa5c 100644 --- a/ambari-logsearch/ambari-logsearch-web-new/src/app/components/logs-container/logs-container.component.ts +++ b/ambari-logsearch/ambari-logsearch-web-new/src/app/components/logs-container/logs-container.component.ts @@ -114,7 +114,11 @@ export class LogsContainerComponent implements OnInit { }; private readonly histogramFilters = { - timeRange: ['to', 'from'] + clusters: ['clusters'], + text: ['iMessage'], + timeRange: ['to', 'from'], + components: ['mustBe'], + levels: ['level'] }; private readonly logsTypeMap = {