ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2026-08-31 00:47:15 +02:00
Code Issues Packages Releases Activity

Merge branch 'feat/565-add-metric-tooltip' into metric-store-tickets

Browse Source 
Resolve conflicts in the generated GraphQL code by regenerating it against
the merged schema. cc-lib v2.13.0 adds Tooltip to schema.MetricConfig and
schema.GlobalMetricListItem, so gqlgen now binds the tooltip field directly
and the hand-written globalMetricListItem/metricConfig resolvers introduced
on the tooltip branch are no longer needed.

Also migrate to the cc-lib v2.13.0 metric container types, which changed
from bare maps to structs carrying array-valued metric groups:

  schema.JobData          map -> {Metrics, Groups}
  schema.ScopedJobStats   map -> {Metrics, Groups}
  job.Statistics          map -> schema.JobStatisticsSet{Metrics, Groups}

Callers index .Metrics, return the zero struct instead of nil, and
deepCopy/DecodeJobStats now also carry the Groups payload through.
archive.GetStatistics returns the full JobStatisticsSet so group
statistics survive the round trip.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
moebiusband
2026-08-27 10:22:22 +02:00
co-authored by Claude Opus 5
parent e59ee99474 d28849d8d7
commit 4cfbecd818
35 changed files with 411 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/archive/archive.go
+7 -7
View File
@@ -299,7 +299,7 @@ func LoadAveragesFromArchive(
}
for i, m := range metrics {
if stat, ok := metaFile.Statistics[m]; ok {
if stat, ok := metaFile.Statistics.Metrics[m]; ok {
data[i] = append(data[i], schema.Float(stat.Avg))
} else {
data[i] = append(data[i], schema.NaN)
@@ -323,7 +323,7 @@ func LoadStatsFromArchive(
}
for _, m := range metrics {
stat, ok := metaFile.Statistics[m]
stat, ok := metaFile.Statistics.Metrics[m]
if !ok {
data[m] = schema.MetricStatistics{Min: 0.0, Avg: 0.0, Max: 0.0}
continue
@@ -349,19 +349,19 @@ func LoadScopedStatsFromArchive(
data, err := ar.LoadJobStats(job)
if err != nil {
cclog.Errorf("Error while loading job stats from archiveBackend: %s", err.Error())
return nil, err
return schema.ScopedJobStats{}, err
}
return data, nil
}
// GetStatistics returns all metric statistics for a job.
// Returns a map of metric names to their job-level statistics.
func GetStatistics(job *schema.Job) (map[string]schema.JobStatistics, error) {
// GetStatistics returns all metric statistics for a job, including the
// array-valued statistics groups (e.g. filesystems).
func GetStatistics(job *schema.Job) (schema.JobStatisticsSet, error) {
metaFile, err := ar.LoadJobMeta(job)
if err != nil {
cclog.Errorf("Error while loading job metadata from archiveBackend: %s", err.Error())
return nil, err
return schema.JobStatisticsSet{}, err
}
return metaFile.Statistics, nil