Refactor. Add Subcluster get metric list helper routine.

internal/tagger/classifyJob.go

@@ -124,7 +124,6 @@ func (t *JobClassTagger) prepareRule(b []byte, fns string) {
 	}
 	log.Infof("prepareRule() > processing %s with %d requirements and %d variables", fns, len(ri.requirements), len(ri.variables))
 
-	delete(t.rules, rule.Tag)
 	t.rules[rule.Tag] = ri
 }
 
@@ -139,8 +138,24 @@ func (t *JobClassTagger) EventCallback() {
 		log.Fatal(err)
 	}
 
+	if util.CheckFileExists(t.cfgPath + "/parameters.json") {
+		log.Info("Merge parameters")
+		b, err := os.ReadFile(t.cfgPath + "/parameters.json")
+		if err != nil {
+			log.Warnf("prepareRule() > open file error: %v", err)
+		}
+
+		var paramTmp map[string]any
+		if err := json.NewDecoder(bytes.NewReader(b)).Decode(&paramTmp); err != nil {
+			log.Warn("Error while decoding parameters.json")
+		}
+
+		maps.Copy(t.parameters, paramTmp)
+	}
+
 	for _, fn := range files {
 		fns := fn.Name()
+		if fns != "parameters.json" {
 			log.Debugf("Process: %s", fns)
 			filename := fmt.Sprintf("%s/%s", t.cfgPath, fns)
 			b, err := os.ReadFile(filename)
@@ -151,6 +166,7 @@ func (t *JobClassTagger) EventCallback() {
 			t.prepareRule(b, fns)
 		}
 	}
+}
 
 func (t *JobClassTagger) initParameters() error {
 	log.Info("Initialize parameters")
@@ -220,6 +236,8 @@ func (t *JobClassTagger) Match(job *schema.Job) {
 		env := make(map[string]any)
 		maps.Copy(env, ri.env)
 		log.Infof("Try to match rule %s for job %d", tag, job.JobID)
+
+		// Initialize environment
 		env["job"] = map[string]any{
 			"exclusive": job.Exclusive,
 			"duration":  job.Duration,

pkg/archive/clusterConfig.go

@@ -69,16 +69,18 @@ func initClusterConfig() error {
 
 			for _, sc := range cluster.SubClusters {
 				newMetric := &schema.MetricConfig{
-					Unit:          mc.Unit,
-					Energy:        mc.Energy,
+					Metric: schema.Metric{
 						Name:    mc.Name,
-					Scope:         mc.Scope,
-					Aggregation:   mc.Aggregation,
+						Unit:    mc.Unit,
 						Peak:    mc.Peak,
+						Normal:  mc.Normal,
 						Caution: mc.Caution,
 						Alert:   mc.Alert,
+					},
+					Energy:        mc.Energy,
+					Scope:         mc.Scope,
+					Aggregation:   mc.Aggregation,
 					Timestep:      mc.Timestep,
-					Normal:        mc.Normal,
 					LowerIsBetter: mc.LowerIsBetter,
 				}
 
@@ -167,6 +169,45 @@ func GetSubCluster(cluster, subcluster string) (*schema.SubCluster, error) {
 	return nil, fmt.Errorf("subcluster '%v' not found for cluster '%v', or cluster '%v' not configured", subcluster, cluster, cluster)
 }
 
+func GetMetricConfigSubCluster(cluster, subcluster string) map[string]*schema.Metric {
+	metrics := make(map[string]*schema.Metric)
+
+	for _, c := range Clusters {
+		if c.Name == cluster {
+			for _, m := range c.MetricConfig {
+				for _, s := range m.SubClusters {
+					if s.Name == subcluster {
+						metrics[m.Name] = &schema.Metric{
+							Name:    m.Name,
+							Unit:    s.Unit,
+							Peak:    s.Peak,
+							Normal:  s.Normal,
+							Caution: s.Caution,
+							Alert:   s.Alert,
+						}
+						break
+					}
+				}
+
+				_, ok := metrics[m.Name]
+				if !ok {
+					metrics[m.Name] = &schema.Metric{
+						Name:    m.Name,
+						Unit:    m.Unit,
+						Peak:    m.Peak,
+						Normal:  m.Normal,
+						Caution: m.Caution,
+						Alert:   m.Alert,
+					}
+				}
+			}
+			break
+		}
+	}
+
+	return metrics
+}
+
 func GetMetricConfig(cluster, metric string) *schema.MetricConfig {
 	for _, c := range Clusters {
 		if c.Name == cluster {

pkg/archive/nodelist.go

@@ -61,7 +61,7 @@ func (nl *NodeList) PrintList() []string {
 }
 
 func (nl *NodeList) NodeCount() int {
-	var out int = 0
+	out := 0
 	for _, term := range *nl {
 		if len(term) == 1 { // If only String-Part in Term: Single Node Name -> add one
 			out += 1
@@ -160,7 +160,7 @@ func (nle NLExprIntRange) limits() []map[string]int {
 	m["start"] = int(nle.start)
 	m["end"] = int(nle.end)
 	m["digits"] = int(nle.digits)
-	if nle.zeroPadded == true {
+	if nle.zeroPadded {
 		m["zeroPadded"] = 1
 	} else {
 		m["zeroPadded"] = 0
@@ -183,14 +183,15 @@ func ParseNodeList(raw string) (NodeList, error) {
 	rawterms := []string{}
 	prevterm := 0
 	for i := 0; i < len(raw); i++ {
-		if raw[i] == '[' {
+		switch raw[i] {
+		case '[':
 			for i < len(raw) && raw[i] != ']' {
 				i++
 			}
 			if i == len(raw) {
 				return nil, fmt.Errorf("ARCHIVE/NODELIST > unclosed '['")
 			}
-		} else if raw[i] == ',' {
+		case ',':
 			rawterms = append(rawterms, raw[prevterm:i])
 			prevterm = i + 1
 		}

pkg/schema/cluster.go

@@ -45,31 +45,31 @@ type SubCluster struct {
 	ThreadsPerCore  int            `json:"threadsPerCore"`
 }
 
-type SubClusterConfig struct {
+type Metric struct {
 	Name    string  `json:"name"`
-	Footprint     string  `json:"footprint,omitempty"`
-	Energy        string  `json:"energy"`
+	Unit    Unit    `json:"unit"`
 	Peak    float64 `json:"peak"`
 	Normal  float64 `json:"normal"`
 	Caution float64 `json:"caution"`
 	Alert   float64 `json:"alert"`
+}
+
+type SubClusterConfig struct {
+	Metric
+	Footprint     string `json:"footprint,omitempty"`
+	Energy        string `json:"energy"`
 	Remove        bool   `json:"remove"`
 	LowerIsBetter bool   `json:"lowerIsBetter"`
 }
 
 type MetricConfig struct {
-	Unit          Unit                `json:"unit"`
+	Metric
 	Energy        string              `json:"energy"`
-	Name          string              `json:"name"`
 	Scope         MetricScope         `json:"scope"`
 	Aggregation   string              `json:"aggregation"`
 	Footprint     string              `json:"footprint,omitempty"`
 	SubClusters   []*SubClusterConfig `json:"subClusters,omitempty"`
-	Peak          float64             `json:"peak"`
-	Caution       float64             `json:"caution"`
-	Alert         float64             `json:"alert"`
 	Timestep      int                 `json:"timestep"`
-	Normal        float64             `json:"normal"`
 	LowerIsBetter bool                `json:"lowerIsBetter"`
 }