test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-04 20:57:38 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #887 from GLYASAI/master

Browse Source 
Bug Fix: The metrics of component is incomplete
This commit is contained in:
barnettZQG 2020-11-27 04:35:54 -06:00 committed by GitHub
commit ba47f4fd94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
api/client/prometheus/prometheus.go
View File

@ -153,16 +153,18 @@ func (p prometheus) GetAppMetadata(namespace, appID string) []Metadata {
}
func (p prometheus) GetComponentMetadata(namespace, componentID string) []Metadata {
ctx, cancel := context.WithTimeout(context.Background(), 15 * time.Second)
defer cancel()
var meta []Metadata
// Filter metrics available to members of this namespace
matchTarget := fmt.Sprintf("{namespace=\"%s\",service_id=\"%s\"}", namespace, componentID)
items, err := p.client.TargetsMetadata(context.Background(), matchTarget, "", "")
items, err := p.client.TargetsMetadata(ctx, matchTarget, "", "")
if err != nil {
logrus.Error(err)
return meta
}
// Deduplication
set := make(map[string]bool)
for _, item := range items {
@ -176,6 +178,28 @@ func (p prometheus) GetComponentMetadata(namespace, componentID string) []Metada
})
}
}
commonItems, err := p.client.TargetsMetadata(ctx, "{job=~\"gateway|cadvisor\"}", "", "")
if err != nil {
logrus.Error(err)
return meta
}
for _, item := range commonItems {
if !strings.HasPrefix(item.Metric, "container") && !strings.HasPrefix(item.Metric, "gateway") {
continue
}
_, ok := set[item.Metric]
if !ok {
set[item.Metric] = true
meta = append(meta, Metadata{
Metric: item.Metric,
Type: string(item.Type),
Help: item.Help,
})
}
}
return meta
}