floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: adapter node metrics query with `cluster_id ` or `cluster uuid` (#28)

This commit is contained in:
silenceqi 2024-12-13 15:12:24 +08:00 committed by GitHub
parent 5a02966f2d
commit 9cb54a3381
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/elastic/api/cluster_overview.go
View File

@ -565,6 +565,17 @@ func (h *APIHandler) GetClusterNodes(w http.ResponseWriter, req *http.Request, p
}, },
}, },
}, },
{
"bool": util.MapStr{
"minimum_should_match": 1,
"should": []util.MapStr{
{
"term": util.MapStr{
"metadata.labels.cluster_id": util.MapStr{
"value": id,
},
},
},
{ {
"term": util.MapStr{ "term": util.MapStr{
"metadata.labels.cluster_uuid": util.MapStr{ "metadata.labels.cluster_uuid": util.MapStr{
@ -572,6 +583,9 @@ func (h *APIHandler) GetClusterNodes(w http.ResponseWriter, req *http.Request, p
}, },
}, },
}, },
},
},
},
{ {
"term": util.MapStr{ "term": util.MapStr{
"metadata.name": util.MapStr{ "metadata.name": util.MapStr{

14
modules/elastic/api/node_metrics.go
View File

@ -116,6 +116,17 @@ func (h *APIHandler) getNodeMetrics(ctx context.Context, clusterID string, bucke
} }
var must = []util.MapStr{ var must = []util.MapStr{
{
"bool": util.MapStr{
"minimum_should_match": 1,
"should": []util.MapStr{
{
"term": util.MapStr{
"metadata.labels.cluster_id": util.MapStr{
"value": clusterID,
},
},
},
{ {
"term": util.MapStr{ "term": util.MapStr{
"metadata.labels.cluster_uuid": util.MapStr{ "metadata.labels.cluster_uuid": util.MapStr{
@ -123,6 +134,9 @@ func (h *APIHandler) getNodeMetrics(ctx context.Context, clusterID string, bucke
}, },
}, },
}, },
},
},
},
{ {
"term": util.MapStr{ "term": util.MapStr{
"metadata.category": util.MapStr{ "metadata.category": util.MapStr{