innov
/
nightingale1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Merge branch 'master' of github.com:didi/nightingale

This commit is contained in:
710leo 2020-04-16 15:38:51 +08:00
parent 0b2d4d6d19 a3d956f780
commit b50b85f367
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pub/index-b7ceea40b07d28a3e0c9.css → pub/index-5b1dc2bce20c53085703.css
View File

4
pub/index-b7ceea40b07d28a3e0c9.js → pub/index-5b1dc2bce20c53085703.js
View File

File diff suppressed because one or more lines are too long

1
pub/index-5b1dc2bce20c53085703.js.map Normal file
View File

@ -0,0 +1 @@
{"version":3,"file":"index-5b1dc2bce20c53085703.js","sources":["webpack:///index-5b1dc2bce20c53085703.js"],"mappings":"AAAA;;;;;;;AAuhZA","sourceRoot":""}

1
pub/index-b7ceea40b07d28a3e0c9.js.map
View File

@ -1 +0,0 @@
{"version":3,"file":"index-b7ceea40b07d28a3e0c9.js","sources":["webpack:///index-b7ceea40b07d28a3e0c9.js"],"mappings":"AAAA;;;;;;;AAuhZA","sourceRoot":""}

2
pub/index.html
View File

@ -1 +1 @@
<!doctype html><html><head><meta charset="UTF-8"><title>Nightingale</title><link rel="shortcut icon" href="/favicon.ico"><link href="/index-b7ceea40b07d28a3e0c9.css" rel="stylesheet"></head><body><div id="react-content"></div><script src="/lib-033bee8514de110e36ef.dll.js"></script><script src="/index-b7ceea40b07d28a3e0c9.js"></script></body></html> <!doctype html><html><head><meta charset="UTF-8"><title>Nightingale</title><link rel="shortcut icon" href="/favicon.ico"><link href="/index-5b1dc2bce20c53085703.css" rel="stylesheet"></head><body><div id="react-content"></div><script src="/lib-033bee8514de110e36ef.dll.js"></script><script src="/index-5b1dc2bce20c53085703.js"></script></body></html>

5
src/modules/judge/judge/nodata.go
View File

@ -45,6 +45,7 @@ func nodataJudge() {
Endpoint: endpoint, Endpoint: endpoint,
Metric: stra.Exprs[0].Metric, Metric: stra.Exprs[0].Metric,
Tags: "", Tags: "",
TagsMap: map[string]string{},
DsType: "GAUGE", DsType: "GAUGE",
} }
@ -56,7 +57,8 @@ func nodataJudge() {
for _, data := range respData { for _, data := range respData {
var metric, tag string var metric, tag string
arr := strings.Split(data.Counter, "/") // 兼容格式disk.bytes.free/mount=/data/docker/overlay2/xxx/merged
arr := strings.SplitN(data.Counter, "/", 2)
if len(arr) == 2 { if len(arr) == 2 {
metric = arr[0] metric = arr[0]
tag = arr[1] tag = arr[1]
@ -71,6 +73,7 @@ func nodataJudge() {
Endpoint: data.Endpoint, Endpoint: data.Endpoint,
Metric: metric, Metric: metric,
Tags: tag, Tags: tag,
TagsMap: dataobj.DictedTagstring(tag),
DsType: data.DsType, DsType: data.DsType,
Step: data.Step, Step: data.Step,
} }

2
web/src/components/Graph/services.tsx
View File

@ -46,7 +46,7 @@ export function fetchMetrics(selectedEndpoint: Endpoints, endpoints: Endpoints)
endpoints: selectedEndpoint, endpoints: selectedEndpoint,
}), }),
}, false).then((data) => { }, false).then((data) => {
return _.chain(data.metrics).flattenDeep().union().sortBy((o) => { return _.chain(data.metrics).compact().flattenDeep().union().sortBy((o) => {
return _.lowerCase(o); return _.lowerCase(o);
}).value(); }).value();
}); });