ClusterCockpit/cc-metric-store
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-metric-store.git synced 2024-11-10 05:07:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix NaN too null conversion and restore duration

Browse Source
This commit is contained in:
Lou Knauer 2022-01-31 16:34:42 +01:00
parent 371afe5ab5
commit 407e650745
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -129,7 +129,7 @@ JWT="eyJ0eXAiOiJKV1QiLCJhbGciOiJFZERTQSJ9.eyJ1c2VyIjoiYWRtaW4iLCJyb2xlcyI6WyJST0
# If the collector and store and nats-server have been running for at least 60 seconds on the same host, you may run: # If the collector and store and nats-server have been running for at least 60 seconds on the same host, you may run:
curl -H "Authorization: Bearer $JWT" -D - "http://localhost:8080/api/query" -d "{ \"cluster\": \"testcluster\", \"from\": $(expr $(date +%s) - 60), \"to\": $(date +%s), \"queries\": [{ curl -H "Authorization: Bearer $JWT" -D - "http://localhost:8080/api/query" -d "{ \"cluster\": \"testcluster\", \"from\": $(expr $(date +%s) - 60), \"to\": $(date +%s), \"queries\": [{
\"metric\": \"load_one\", \"metric\": \"load_one\",
\"hostname\": \"$(hostname)\" \"host\": \"$(hostname)\"
}] }" }] }"
# ... # ...

11
float.go
View File

@ -46,11 +46,16 @@ type FloatArray []Float
func (fa FloatArray) MarshalJSON() ([]byte, error) { func (fa FloatArray) MarshalJSON() ([]byte, error) {
buf := make([]byte, 0, 2+len(fa)*8) buf := make([]byte, 0, 2+len(fa)*8)
buf = append(buf, '[') buf = append(buf, '[')
if len(fa) > 0 { for i := 0; i < len(fa); i++ {
buf = strconv.AppendFloat(buf, float64(fa[0]), 'f', 1, 32) if i != 0 {
for i := 1; i < len(fa); i++ {
buf = append(buf, ',') buf = append(buf, ',')
}
if fa[i].IsNaN() {
buf = append(buf, `null`...)
} else {
buf = strconv.AppendFloat(buf, float64(fa[i]), 'f', 1, 32) buf = strconv.AppendFloat(buf, float64(fa[i]), 'f', 1, 32)
} }
} }
buf = append(buf, ']') buf = append(buf, ']')

2
metric-store.go
View File

@ -157,7 +157,7 @@ func main() {
log.Fatal(err) log.Fatal(err)
} }
restoreFrom := startupTime.Add(d) restoreFrom := startupTime.Add(-d)
log.Printf("Loading checkpoints newer than %s\n", restoreFrom.Format(time.RFC3339)) log.Printf("Loading checkpoints newer than %s\n", restoreFrom.Format(time.RFC3339))
files, err := memoryStore.FromCheckpoint(conf.Checkpoints.RootDir, restoreFrom.Unix()) files, err := memoryStore.FromCheckpoint(conf.Checkpoints.RootDir, restoreFrom.Unix())
if err != nil { if err != nil {

2
selector.go
View File

@ -114,5 +114,5 @@ func (l *level) findBuffers(selector Selector, offset int, f func(b *buffer) err
return nil return nil
} }
panic("impossible") return nil
} }