瀏覽代碼

AMBARI-22037 Log Search UI: host filter should be performed using hostList parameter. (ababiichuk)

ababiichuk 8 年之前
父節點
當前提交
d966298748

+ 0 - 2
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;
   start_time?: string;
   end_time?: string;
   end_time?: string;
   clusters?: string;
   clusters?: string;
-  iMessage?: string;
-  eMessage?: string;
   mustBe?: string;
   mustBe?: string;
   mustNot?: string;
   mustNot?: string;
   includeQuery?: string;
   includeQuery?: string;

+ 0 - 1
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;
   to: string;
   unit?: string;
   unit?: string;
   clusters?: string;
   clusters?: string;
-  iMessage?: string;
   level?: string;
   level?: string;
   includeQuery?: string;
   includeQuery?: string;
   excludeQuery?: string;
   excludeQuery?: string;

+ 0 - 1
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 {
 export class ServiceLogsQueryParams extends AuditLogsQueryParams {
   level?: string;
   level?: string;
-  host_name?: string;
   file_name?: string;
   file_name?: string;
   bundle_id?: string;
   bundle_id?: string;
   hostList?: string;
   hostList?: string;

+ 0 - 4
ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts

@@ -66,10 +66,6 @@ export class FilteringService {
       options: [],
       options: [],
       defaultValue: ''
       defaultValue: ''
     },
     },
-    text: {
-      label: 'filter.message',
-      defaultValue: ''
-    },
     timeRange: {
     timeRange: {
       options: [
       options: [
         [
         [

+ 2 - 3
ambari-logsearch/ambari-logsearch-web/src/app/services/logs-container.service.ts

@@ -43,11 +43,10 @@ export class LogsContainerService {
 
 
   private readonly listFilters = {
   private readonly listFilters = {
     clusters: ['clusters'],
     clusters: ['clusters'],
-    text: ['iMessage'],
     timeRange: ['end_time', 'start_time'],
     timeRange: ['end_time', 'start_time'],
     components: ['mustBe'],
     components: ['mustBe'],
     levels: ['level'],
     levels: ['level'],
-    hosts: ['host_name'],
+    hosts: ['hostList'],
     sorting: ['sortType', 'sortBy'],
     sorting: ['sortType', 'sortBy'],
     pageSize: ['pageSize'],
     pageSize: ['pageSize'],
     page: ['page'],
     page: ['page'],
@@ -56,10 +55,10 @@ export class LogsContainerService {
 
 
   private readonly histogramFilters = {
   private readonly histogramFilters = {
     clusters: ['clusters'],
     clusters: ['clusters'],
-    text: ['iMessage'],
     timeRange: ['to', 'from'],
     timeRange: ['to', 'from'],
     components: ['mustBe'],
     components: ['mustBe'],
     levels: ['level'],
     levels: ['level'],
+    hosts: ['hostList'],
     query: ['includeQuery', 'excludeQuery']
     query: ['includeQuery', 'excludeQuery']
   };
   };
 
 

+ 1 - 1
ambari-logsearch/ambari-logsearch-web/src/app/services/mock-api-data.service.ts

@@ -60,7 +60,7 @@ export class mockApiDataService implements InMemoryDbService {
           key: 'logtime',
           key: 'logtime',
           filterFunction: (value, filterValue) => value < moment(filterValue).valueOf()
           filterFunction: (value, filterValue) => value < moment(filterValue).valueOf()
         },
         },
-        host_name: {
+        hostList: {
           key: 'host',
           key: 'host',
           isValuesList: true
           isValuesList: true
         }
         }

+ 0 - 1
ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json

@@ -18,7 +18,6 @@
   "filter.all": "All",
   "filter.all": "All",
 
 
   "filter.clusters": "Clusters",
   "filter.clusters": "Clusters",
-  "filter.message": "Message:",
   "filter.components": "Components",
   "filter.components": "Components",
   "filter.levels": "Levels",
   "filter.levels": "Levels",
   "filter.capture": "Capture",
   "filter.capture": "Capture",