mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2024-12-27 05:49:04 +01:00
Update frontend; Remove debug logging
This commit is contained in:
parent
3e7b89aebb
commit
4f431d0236
2
frontend
2
frontend
@ -1 +1 @@
|
|||||||
Subproject commit d453af71cd90b222ddd54cf0821977c2fb722699
|
Subproject commit 147241160cea5e239998fd20a7897ec9694f3bce
|
@ -217,6 +217,12 @@ func (r *queryResolver) NodeMetrics(ctx context.Context, cluster string, partiti
|
|||||||
partition = new(string)
|
partition = new(string)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if metrics == nil {
|
||||||
|
for _, mc := range config.GetClusterConfig(cluster).MetricConfig {
|
||||||
|
metrics = append(metrics, mc.Name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
data, err := metricdata.LoadNodeData(cluster, *partition, metrics, nodes, scopes, from, to, ctx)
|
data, err := metricdata.LoadNodeData(cluster, *partition, metrics, nodes, scopes, from, to, ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -6,7 +6,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
@ -467,7 +466,6 @@ func (ccms *CCMetricStore) LoadNodeData(cluster, partition string, metrics, node
|
|||||||
|
|
||||||
if nodes == nil {
|
if nodes == nil {
|
||||||
for _, metric := range metrics {
|
for _, metric := range metrics {
|
||||||
log.Printf("local-name: %s, remote-name: %s, renamings: %#v", metric, ccms.toRemoteName(metric), ccms.here2there)
|
|
||||||
req.ForAllNodes = append(req.ForAllNodes, ccms.toRemoteName(metric))
|
req.ForAllNodes = append(req.ForAllNodes, ccms.toRemoteName(metric))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -496,8 +494,6 @@ func (ccms *CCMetricStore) LoadNodeData(cluster, partition string, metrics, node
|
|||||||
query = req.Queries[i]
|
query = req.Queries[i]
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Printf("results for %#v: %#v\n", query, res)
|
|
||||||
|
|
||||||
metric := ccms.toLocalName(query.Metric)
|
metric := ccms.toLocalName(query.Metric)
|
||||||
qdata := res[0]
|
qdata := res[0]
|
||||||
if qdata.Error != nil {
|
if qdata.Error != nil {
|
||||||
|
@ -122,6 +122,7 @@ var programConfig ProgramConfig = ProgramConfig{
|
|||||||
"plot_view_showPolarplot": true,
|
"plot_view_showPolarplot": true,
|
||||||
"plot_view_showRoofline": true,
|
"plot_view_showRoofline": true,
|
||||||
"plot_view_showStatTable": true,
|
"plot_view_showStatTable": true,
|
||||||
|
"system_view_selectedMetric": "cpu_load",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user