Merge branch 'dev' of github.com:ClusterCockpit/cc-backend into dev

internal/api/nats.go

@@ -260,7 +260,10 @@ func (api *NatsAPI) handleNodeState(subject string, data []byte) {
 			JobsRunning:     node.JobsRunning,
 		}
 
-		repo.UpdateNodeState(node.Hostname, req.Cluster, &nodeState)
+		if err := repo.UpdateNodeState(node.Hostname, req.Cluster, &nodeState); err != nil {
+			cclog.Errorf("NATS %s: updating node state for %s on %s failed: %v",
+				subject, node.Hostname, req.Cluster, err)
+		}
 	}
 
 	cclog.Debugf("NATS %s: updated %d node states for cluster %s", subject, len(req.Nodes), req.Cluster)

internal/metricdata/cc-metric-store.go

@@ -770,21 +770,25 @@ func (ccms *CCMetricStore) LoadNodeData(
 		}
 
 		mc := archive.GetMetricConfig(cluster, metric)
-		hostdata[metric] = append(hostdata[metric], &schema.JobMetric{
-			Unit:     mc.Unit,
-			Timestep: mc.Timestep,
-			Series: []schema.Series{
-				{
-					Hostname: query.Hostname,
-					Data:     qdata.Data,
-					Statistics: schema.MetricStatistics{
-						Avg: float64(qdata.Avg),
-						Min: float64(qdata.Min),
-						Max: float64(qdata.Max),
+		if mc != nil {
+			hostdata[metric] = append(hostdata[metric], &schema.JobMetric{
+				Unit:     mc.Unit,
+				Timestep: mc.Timestep,
+				Series: []schema.Series{
+					{
+						Hostname: query.Hostname,
+						Data:     qdata.Data,
+						Statistics: schema.MetricStatistics{
+							Avg: float64(qdata.Avg),
+							Min: float64(qdata.Min),
+							Max: float64(qdata.Max),
+						},
 					},
 				},
-			},
-		})
+			})
+		} else {
+			cclog.Warnf("Metric '%s' not configured for cluster '%s': Skipped in LoadNodeData() Return!", metric, cluster)
+		}
 	}
 
 	if len(errors) != 0 {