diff --git a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/ReplicationMetricESDAO.java b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/ReplicationMetricESDAO.java index 1f604cc0..fbd874f2 100644 --- a/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/ReplicationMetricESDAO.java +++ b/km-persistence/src/main/java/com/xiaojukeji/know/streaming/km/persistence/es/dao/ReplicationMetricESDAO.java @@ -61,7 +61,7 @@ public class ReplicationMetricESDAO extends BaseMetricESDAO { String aggDsl = buildAggsDSL(metrics, aggType); String dsl = dslLoaderUtil.getFormatDslByFileName( - DslsConstant.GET_REPLICATION_AGG_SINGLE_METRICS, clusterPhyId, topic, brokerId, partitionId, startTime, endTime, aggDsl); + DslsConstant.GET_REPLICATION_AGG_SINGLE_METRICS, clusterPhyId, brokerId,topic, partitionId, startTime, endTime, aggDsl); return esOpClient.performRequestWithRouting(String.valueOf(brokerId), realIndex, dsl, s -> handleSingleESQueryResponse(s, metrics, aggType), 3); diff --git a/km-persistence/src/main/resources/dsl/ReplicationMetricESDAO/getAggSingleReplicationMetrics b/km-persistence/src/main/resources/dsl/ReplicationMetricESDAO/getAggSingleReplicationMetrics index f01e0259..59e4abca 100644 --- a/km-persistence/src/main/resources/dsl/ReplicationMetricESDAO/getAggSingleReplicationMetrics +++ b/km-persistence/src/main/resources/dsl/ReplicationMetricESDAO/getAggSingleReplicationMetrics @@ -1,34 +1,48 @@ { - "size": 0, - "query": { - "bool": { - "must": [ - { - "term": { - "clusterPhyId": { - "value": %d - } - } - }, - { - "term": { - "brokerId": { - "value": %d - } - } - }, - { - "range": { - "timestamp": { - "gte": %d, - "lte": %d - } - } + "size":0, + "query":{ + "bool":{ + "must":[ + { + "term":{ + "clusterPhyId":{ + "value":%d + } + } + }, + { + "term":{ + "brokerId":{ + "value":%d + } + } + }, + { + "term":{ + "topic":{ + "value":"%s" + } + } + }, + { + "term":{ + "partitionId":{ + "value":%d + } + } + }, + { + "range":{ + "timestamp":{ + "gte":%d, + "lte":%d + } + } + } + ] } - ] - } - }, - "aggs": { - %s + }, + "aggs":{ + %s } } \ No newline at end of file