From 7d82a90ed20f0a37c0aaee67150ba6e3759b3b7c Mon Sep 17 00:00:00 2001 From: Dan Bason Date: Thu, 30 Jun 2022 13:26:51 +1200 Subject: [PATCH] Update data model for new index template --- .../Breakdowns/components/Basic/Basic.tsx | 10 +++---- public/utils/requests.ts | 26 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/public/components/Breakdowns/components/Basic/Basic.tsx b/public/components/Breakdowns/components/Basic/Basic.tsx index b6fffd8c5..ef8b7901b 100644 --- a/public/components/Breakdowns/components/Basic/Basic.tsx +++ b/public/components/Breakdowns/components/Basic/Basic.tsx @@ -16,16 +16,16 @@ export function createColumns(type, range, clusterId, showNormalSparkline, showA const from = range.start.format(); const to = range.end.format(); const value = row.name; - const clusterQuery = clusterId !== 'all' ? `('$state':(store:appState),meta:(alias:!n,disabled:!f,key:cluster_id.keyword,negate:!f,params:(query:'${clusterId}'),type:phrase),query:(match_phrase:(cluster_id.keyword:'${clusterId}'))),` : ''; + const clusterQuery = clusterId !== 'all' ? `('$state':(store:appState),meta:(alias:!n,disabled:!f,key:cluster_id,negate:!f,params:(query:'${clusterId}'),type:phrase),query:(match_phrase:(cluster_id:'${clusterId}'))),` : ''; switch (type) { case 'pod': - return `_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'${from}',to:'${to}'))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,key:kubernetes.pod_name,negate:!f,params:(query:${value}),type:phrase),query:(match_phrase:(kubernetes.pod_name:${value}))),${clusterQuery}('$state':(store:appState),meta:(alias:!n,disabled:!f,key:anomaly_level.keyword,negate:!f,params:(query:${severity}),type:phrase),query:(match_phrase:(anomaly_level.keyword:${severity})))),interval:auto,query:(language:kuery,query:''),sort:!())`; + return `_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'${from}',to:'${to}'))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,key:kubernetes.pod_name,negate:!f,params:(query:${value}),type:phrase),query:(match_phrase:(kubernetes.pod_name:${value}))),${clusterQuery}('$state':(store:appState),meta:(alias:!n,disabled:!f,key:anomaly_level,negate:!f,params:(query:${severity}),type:phrase),query:(match_phrase:(anomaly_level:${severity})))),interval:auto,query:(language:kuery,query:''),sort:!())`; case 'controlPlane': - return `_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'${from}',to:'${to}'))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,key:log_type,negate:!f,params:(query:controlplane),type:phrase),query:(match_phrase:(log_type:controlplane))),${clusterQuery}('$state':(store:appState),meta:(alias:!n,disabled:!f,key:kubernetes_component,negate:!f,params:(query:${value}),type:phrase),query:(match_phrase:(kubernetes_component:${value}))),('$state':(store:appState),meta:(alias:!n,disabled:!f,key:anomaly_level.keyword,negate:!f,params:(query:${severity}),type:phrase),query:(match_phrase:(anomaly_level.keyword:${severity})))),interval:auto,query:(language:kuery,query:''),sort:!())`; + return `_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'${from}',to:'${to}'))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,key:log_type,negate:!f,params:(query:controlplane),type:phrase),query:(match_phrase:(log_type:controlplane))),${clusterQuery}('$state':(store:appState),meta:(alias:!n,disabled:!f,key:kubernetes_component,negate:!f,params:(query:${value}),type:phrase),query:(match_phrase:(kubernetes_component:${value}))),('$state':(store:appState),meta:(alias:!n,disabled:!f,key:anomaly_level,negate:!f,params:(query:${severity}),type:phrase),query:(match_phrase:(anomaly_level:${severity})))),interval:auto,query:(language:kuery,query:''),sort:!())`; case 'namespace': - return `_g=(filters:(),refreshInterval:(pause:!t,value:0),time:(from:'${from}',to:'${to}'))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,key:kubernetes.namespace_name,negate:!f,params:(query:${value}),type:phrase),query:(match_phrase:(kubernetes.namespace_name:${value}))),${clusterQuery}('$state':(store:appState),meta:(alias:!n,disabled:!f,key:anomaly_level.keyword,negate:!f,params:(query:${severity}),type:phrase),query:(match_phrase:(anomaly_level.keyword:${severity})))),interval:auto,query:(language:kuery,query:''),sort:!())`; + return `_g=(filters:(),refreshInterval:(pause:!t,value:0),time:(from:'${from}',to:'${to}'))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,key:kubernetes.namespace_name,negate:!f,params:(query:${value}),type:phrase),query:(match_phrase:(kubernetes.namespace_name:${value}))),${clusterQuery}('$state':(store:appState),meta:(alias:!n,disabled:!f,key:anomaly_level,negate:!f,params:(query:${severity}),type:phrase),query:(match_phrase:(anomaly_level:${severity})))),interval:auto,query:(language:kuery,query:''),sort:!())`; case 'rancher': - return `_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'${from}',to:'${to}'))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,key:kubernetes.pod_name,negate:!f,params:(query:${value}),type:phrase),query:(match_phrase:(kubernetes.pod_name:${value}))),${clusterQuery}('$state':(store:appState),meta:(alias:!n,disabled:!f,key:anomaly_level.keyword,negate:!f,params:(query:${severity}),type:phrase),query:(match_phrase:(anomaly_level.keyword:${severity}))),('$state':(store:appState),meta:(alias:!n,disabled:!f,key:log_type.keyword,negate:!f,params:(query:rancher),type:phrase),query:(match_phrase:(log_type.keyword:rancher)))),interval:auto,query:(language:kuery,query:''),sort:!())` + return `_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'${from}',to:'${to}'))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,key:kubernetes.pod_name,negate:!f,params:(query:${value}),type:phrase),query:(match_phrase:(kubernetes.pod_name:${value}))),${clusterQuery}('$state':(store:appState),meta:(alias:!n,disabled:!f,key:anomaly_level,negate:!f,params:(query:${severity}),type:phrase),query:(match_phrase:(anomaly_level:${severity}))),('$state':(store:appState),meta:(alias:!n,disabled:!f,key:log_type,negate:!f,params:(query:rancher),type:phrase),query:(match_phrase:(log_type:rancher)))),interval:auto,query:(language:kuery,query:''),sort:!())` default: return ''; } diff --git a/public/utils/requests.ts b/public/utils/requests.ts index 5fc4ab418..c0197f090 100644 --- a/public/utils/requests.ts +++ b/public/utils/requests.ts @@ -71,7 +71,7 @@ export async function getClusterIds() { "size": 0, "aggs" : { "clusters" : { - "terms" : { "field" : "cluster_id.keyword" } + "terms" : { "field" : "cluster_id" } } } }); @@ -147,7 +147,7 @@ export function getLogTypeQuery() { "size": 0, "aggs" : { "log_type" : { - "terms" : { "field" : "log_type.keyword", "size" : 500 } + "terms" : { "field" : "log_type", "size" : 500 } } } }; @@ -262,11 +262,11 @@ function must(clusterId, logType?: LogType) { const musts = []; if (clusterId !== 'all') { - musts.push({match: {"cluster_id.keyword": clusterId}}); + musts.push({match: {"cluster_id": clusterId}}); } if (logType) { - musts.push({match: {"log_type.keyword": logType}}) + musts.push({match: {"log_type": logType}}) } return musts; @@ -283,7 +283,7 @@ function getInsightsQuery(range: Range, granularity: Granularity, clusterId: str "aggs": { "granularity_results": { "date_histogram": { "field": "time", "fixed_interval": granularity }, - "aggs": { "anomaly_level": { "terms": { "field": "anomaly_level.keyword" } } }, + "aggs": { "anomaly_level": { "terms": { "field": "anomaly_level" } } }, } }, } @@ -357,12 +357,12 @@ function getControlPlaneBreakdownQuery(range: Range, clusterId: string) { }, "aggs": { "cluster_id": { - "terms": {"field": "cluster_id.keyword"}, + "terms": {"field": "cluster_id"}, "aggs": { "component_name": { "terms": {"field": "kubernetes_component.keyword"}, "aggs": { - "anomaly_level": {"terms": {"field": "anomaly_level.keyword"}} + "anomaly_level": {"terms": {"field": "anomaly_level"}} }, } } @@ -381,12 +381,12 @@ function getRancherBreakdownQuery(range: Range, clusterId: string) { }, "aggs": { "cluster_id": { - "terms": {"field": "cluster_id.keyword"}, + "terms": {"field": "cluster_id"}, "aggs": { "pod_name": { "terms": {"field": "kubernetes.pod_name.keyword"}, "aggs": { - "anomaly_level": {"terms": {"field": "anomaly_level.keyword"}} + "anomaly_level": {"terms": {"field": "anomaly_level"}} }, } } @@ -407,12 +407,12 @@ function getNamespaceBreakdownQuery(range: Range, clusterId: string) { "bucket": { "composite": { "size": 1000, - "sources": [{"cluster_id": {"terms": {"field":"cluster_id.keyword"}}}, {"namespace_name": {"terms": {"field":"kubernetes.namespace_name.keyword"}}}, {"anomaly_level": {"terms": {"field": "anomaly_level.keyword"}}}], + "sources": [{"cluster_id": {"terms": {"field":"cluster_id"}}}, {"namespace_name": {"terms": {"field":"kubernetes.namespace_name.keyword"}}}, {"anomaly_level": {"terms": {"field": "anomaly_level"}}}], }, "aggs": { "sparkLine": { "date_histogram": { "field": "time", "fixed_interval": "10m" }, - "aggs": { "anomaly_level": { "terms": { "field": "anomaly_level.keyword" } } }, + "aggs": { "anomaly_level": { "terms": { "field": "anomaly_level" } } }, } } } @@ -433,12 +433,12 @@ function getPodBreakdownQuery(range: Range, clusterId: string) { "bucket": { "composite": { "size": 1000, - "sources": [{"cluster_id": {"terms": {"field":"cluster_id.keyword"}}}, {"namespace_name": {"terms": {"field":"kubernetes.namespace_name.keyword"}}}, {"pod_name": {"terms": {"field": "kubernetes.pod_name.keyword"}}}, {"anomaly_level": {"terms": {"field": "anomaly_level.keyword"}}}], + "sources": [{"cluster_id": {"terms": {"field":"cluster_id"}}}, {"namespace_name": {"terms": {"field":"kubernetes.namespace_name.keyword"}}}, {"pod_name": {"terms": {"field": "kubernetes.pod_name.keyword"}}}, {"anomaly_level": {"terms": {"field": "anomaly_level"}}}], }, "aggs": { "sparkLine": { "date_histogram": { "field": "time", "fixed_interval": "10m" }, - "aggs": { "anomaly_level": { "terms": { "field": "anomaly_level.keyword" } } }, + "aggs": { "anomaly_level": { "terms": { "field": "anomaly_level" } } }, } } }