Merge branch 'dev' into 275_add_tag_scope

web/frontend/src/Job.root.svelte

@@ -75,7 +75,7 @@
             duration, numNodes, numHWThreads, numAcc,
             SMT, exclusive, partition, subCluster, arrayJobId,
             monitoringStatus, state, walltime,
-            tags { id, type, name, scope },
+            tags { id, type, name },
             resources { hostname, hwthreads, accelerators },
             metaData,
             userData { name, email },

web/frontend/src/generic/helper/JobFootprint.svelte

@@ -67,62 +67,74 @@
   export let height = "310px";
 
   const footprintData = job?.footprint?.map((jf) => {
-    // Unit
     const fmc = getContext("getMetricConfig")(job.cluster, job.subCluster, jf.name);
-    const unit = (fmc?.unit?.prefix ? fmc.unit.prefix : "") + (fmc?.unit?.base ? fmc.unit.base : "")
+    if (fmc) {
+      // Unit
+      const unit = (fmc?.unit?.prefix ? fmc.unit.prefix : "") + (fmc?.unit?.base ? fmc.unit.base : "")
 
-    // Threshold / -Differences
-    const fmt = findJobThresholds(job, fmc);
-    if (jf.name === "flops_any") fmt.peak = round(fmt.peak * 0.85, 0);
+      // Threshold / -Differences
+      const fmt = findJobThresholds(job, fmc);
+      if (jf.name === "flops_any") fmt.peak = round(fmt.peak * 0.85, 0);
 
-    // Define basic data -> Value: Use as Provided
-    const fmBase = {
-      name: jf.name + ' (' + jf.stat + ')',
-      avg: jf.value,
-      unit: unit,
-      max: fmt.peak,
-      dir: fmc.lowerIsBetter
-    };
+      // Define basic data -> Value: Use as Provided
+      const fmBase = {
+        name: jf.name + ' (' + jf.stat + ')',
+        avg: jf.value,
+        unit: unit,
+        max: fmt.peak,
+        dir: fmc.lowerIsBetter
+      };
 
-    if (evalFootprint(jf.value, fmt, fmc.lowerIsBetter, "alert")) {
+      if (evalFootprint(jf.value, fmt, fmc.lowerIsBetter, "alert")) {
+        return {
+          ...fmBase,
+          color: "danger",
+          message: `Metric average way ${fmc.lowerIsBetter ? "above" : "below"} expected normal thresholds.`,
+          impact: 3
+        };
+      } else if (evalFootprint(jf.value, fmt, fmc.lowerIsBetter, "caution")) {
+        return {
+          ...fmBase,
+          color: "warning",
+          message: `Metric average ${fmc.lowerIsBetter ? "above" : "below"} expected normal thresholds.`,
+          impact: 2,
+        };
+      } else if (evalFootprint(jf.value, fmt, fmc.lowerIsBetter, "normal")) {
+        return {
+          ...fmBase,
+          color: "success",
+          message: "Metric average within expected thresholds.",
+          impact: 1,
+        };
+      } else if (evalFootprint(jf.value, fmt, fmc.lowerIsBetter, "peak")) {
+        return {
+          ...fmBase,
+          color: "info",
+          message:
+            "Metric average above expected normal thresholds: Check for artifacts recommended.",
+          impact: 0,
+        };
+      } else {
+        return {
+          ...fmBase,
+          color: "secondary",
+          message:
+            "Metric average above expected peak threshold: Check for artifacts!",
+          impact: -1,
+        };
+      }
+    } else { // No matching metric config: display as single value
       return {
-        ...fmBase,
-        color: "danger",
-        message: `Metric average way ${fmc.lowerIsBetter ? "above" : "below"} expected normal thresholds.`,
-        impact: 3
-      };
-    } else if (evalFootprint(jf.value, fmt, fmc.lowerIsBetter, "caution")) {
-      return {
-        ...fmBase,
-        color: "warning",
-        message: `Metric average ${fmc.lowerIsBetter ? "above" : "below"} expected normal thresholds.`,
-        impact: 2,
-      };
-    } else if (evalFootprint(jf.value, fmt, fmc.lowerIsBetter, "normal")) {
-      return {
-        ...fmBase,
-        color: "success",
-        message: "Metric average within expected thresholds.",
-        impact: 1,
-      };
-    } else if (evalFootprint(jf.value, fmt, fmc.lowerIsBetter, "peak")) {
-      return {
-        ...fmBase,
-        color: "info",
+        name: jf.name + ' (' + jf.stat + ')',
+        avg: jf.value,
         message:
-          "Metric average above expected normal thresholds: Check for artifacts recommended.",
-        impact: 0,
-      };
-    } else {
-      return {
-        ...fmBase,
-        color: "secondary",
-        message:
-          "Metric average above expected peak threshold: Check for artifacts!",
-        impact: -1,
+          `No config for metric ${jf.name} found.`,
+        impact: 4,
       };
     }
-  });
+  }).sort(function (a, b) { // Sort by impact value primarily, within impact sort name alphabetically
+    return a.impact - b.impact || ((a.name > b.name) ? 1 : ((b.name > a.name) ? -1 : 0));
+  });;
 
   function evalFootprint(mean, thresholds, lowerIsBetter, level) {
     // Handle Metrics in which less value is better
@@ -159,37 +171,76 @@
   {/if}
   <CardBody>
     {#each footprintData as fpd, index}
-      <div class="mb-1 d-flex justify-content-between">
-        <div>&nbsp;<b>{fpd.name}</b></div>
-        <!-- For symmetry, see below ...-->
-        <div
-          class="cursor-help d-inline-flex"
-          id={`footprint-${job.jobId}-${index}`}
-        >
-          <div class="mx-1">
-            <!-- Alerts Only -->
-            {#if fpd.impact === 3 || fpd.impact === -1}
-              <Icon name="exclamation-triangle-fill" class="text-danger" />
-            {:else if fpd.impact === 2}
-              <Icon name="exclamation-triangle" class="text-warning" />
-            {/if}
-            <!-- Emoji for all states-->
-            {#if fpd.impact === 3}
-              <Icon name="emoji-frown" class="text-danger" />
-            {:else if fpd.impact === 2}
-              <Icon name="emoji-neutral" class="text-warning" />
-            {:else if fpd.impact === 1}
-              <Icon name="emoji-smile" class="text-success" />
-            {:else if fpd.impact === 0}
-              <Icon name="emoji-laughing" class="text-info" />
-            {:else if fpd.impact === -1}
-              <Icon name="emoji-dizzy" class="text-danger" />
-            {/if}
+      {#if fpd.impact !== 4}
+        <div class="mb-1 d-flex justify-content-between">
+          <div>&nbsp;<b>{fpd.name}</b></div>
+          <!-- For symmetry, see below ...-->
+          <div
+            class="cursor-help d-inline-flex"
+            id={`footprint-${job.jobId}-${index}`}
+          >
+            <div class="mx-1">
+              <!-- Alerts Only -->
+              {#if fpd.impact === 3 || fpd.impact === -1}
+                <Icon name="exclamation-triangle-fill" class="text-danger" />
+              {:else if fpd.impact === 2}
+                <Icon name="exclamation-triangle" class="text-warning" />
+              {/if}
+              <!-- Emoji for all states-->
+              {#if fpd.impact === 3}
+                <Icon name="emoji-frown" class="text-danger" />
+              {:else if fpd.impact === 2}
+                <Icon name="emoji-neutral" class="text-warning" />
+              {:else if fpd.impact === 1}
+                <Icon name="emoji-smile" class="text-success" />
+              {:else if fpd.impact === 0}
+                <Icon name="emoji-laughing" class="text-info" />
+              {:else if fpd.impact === -1}
+                <Icon name="emoji-dizzy" class="text-danger" />
+              {/if}
+            </div>
+            <div>
+              <!-- Print Values -->
+              {fpd.avg} / {fpd.max}
+              {fpd.unit} &nbsp; <!-- To increase margin to tooltip: No other way manageable ... -->
+            </div>
           </div>
+          <Tooltip
+            target={`footprint-${job.jobId}-${index}`}
+            placement="right"
+            offset={[0, 20]}>{fpd.message}</Tooltip
+          >
+        </div>
+        <Row cols={12} class="{(footprintData.length == (index + 1)) ? 'mb-0' : 'mb-2'}">
+          {#if fpd.dir}
+            <Col xs="1">
+              <Icon name="caret-left-fill" />
+            </Col>
+          {/if}
+          <Col xs="11" class="align-content-center">
+            <Progress value={fpd.avg} max={fpd.max} color={fpd.color} />
+          </Col>
+          {#if !fpd.dir}
+          <Col xs="1">
+            <Icon name="caret-right-fill" />
+          </Col>
+          {/if}
+        </Row>
+      {:else}
+        <div class="mb-1 d-flex justify-content-between">
           <div>
-            <!-- Print Values -->
-            {fpd.avg} / {fpd.max}
-            {fpd.unit} &nbsp; <!-- To increase margin to tooltip: No other way manageable ... -->
+            &nbsp;<b>{fpd.name}</b>
+          </div>
+          <div
+            class="cursor-help d-inline-flex"
+            id={`footprint-${job.jobId}-${index}`}
+          >
+            <div class="mx-1">
+              <Icon name="info-circle"/>
+            </div>
+            <div>
+              {fpd.avg}&nbsp;
+            </div>
           </div>
         </div>
         <Tooltip
@@ -197,22 +248,7 @@
           placement="right"
           offset={[0, 20]}>{fpd.message}</Tooltip
         >
-      </div>
-      <Row cols={12} class="{(footprintData.length == (index + 1)) ? 'mb-0' : 'mb-2'}">
-        {#if fpd.dir}
-          <Col xs="1">
-            <Icon name="caret-left-fill" />
-          </Col>
-        {/if}
-        <Col xs="11" class="align-content-center">
-          <Progress value={fpd.avg} max={fpd.max} color={fpd.color} />
-        </Col>
-        {#if !fpd.dir}
-        <Col xs="1">
-          <Icon name="caret-right-fill" />
-        </Col>
-        {/if}
-      </Row>
+      {/if}
     {/each}
     {#if job?.metaData?.message}
       <hr class="mt-1 mb-2" />

web/frontend/src/generic/utils.js

@@ -301,7 +301,7 @@ export function stickyHeader(datatableHeaderSelector, updatePading) {
     onDestroy(() => document.removeEventListener("scroll", onscroll));
 }
 
-export function checkMetricDisabled(m, c, s) { //[m]etric, [c]luster, [s]ubcluster
+export function checkMetricDisabled(m, c, s) { // [m]etric, [c]luster, [s]ubcluster
     const metrics = getContext("globalMetrics");
     const result = metrics?.find((gm) => gm.name === m)?.availability?.find((av) => av.cluster === c)?.subClusters?.includes(s)
     return !result
@@ -309,23 +309,22 @@ export function checkMetricDisabled(m, c, s) { //[m]etric, [c]luster, [s]ubclust
 
 export function getStatsItems() {
     // console.time('stats')
-    // console.log('getStatsItems ...')
     const globalMetrics = getContext("globalMetrics")
     const result = globalMetrics.map((gm) => {
         if (gm?.footprint) {
-            // Footprint contains suffix naming the used stat-type
             // console.time('deep')
-            // console.log('Deep Config for', gm.name)
             const mc = getMetricConfigDeep(gm.name, null, null)
             // console.timeEnd('deep')
-            return {
-                field: gm.name + '_' + gm.footprint,
-                text: gm.name + ' (' + gm.footprint + ')',
-                metric: gm.name,
-                from: 0,
-                to: mc.peak,
-                peak: mc.peak,
-                enabled: false
+            if (mc) {
+                return {
+                    field: gm.name + '_' + gm.footprint,
+                    text: gm.name + ' (' + gm.footprint + ')',
+                    metric: gm.name,
+                    from: 0,
+                    to: mc.peak,
+                    peak: mc.peak,
+                    enabled: false
+                }
             }
         }
         return null
@@ -336,11 +335,9 @@ export function getStatsItems() {
 
 export function getSortItems() {
     //console.time('sort')
-    //console.log('getSortItems ...')
     const globalMetrics = getContext("globalMetrics")
     const result = globalMetrics.map((gm) => {
         if (gm?.footprint) {
-            // Footprint contains suffix naming the used stat-type
             return { 
                 field: gm.name + '_' + gm.footprint,
                 type: 'foot',
@@ -357,21 +354,22 @@ export function getSortItems() {
 function getMetricConfigDeep(metric, cluster, subCluster) {
     const clusters = getContext("clusters");
     if (cluster != null) {
-        let c = clusters.find((c) => c.name == cluster);
+        const c = clusters.find((c) => c.name == cluster);
         if (subCluster != null) {
-            let sc = c.subClusters.find((sc) => sc.name == subCluster);
+            const sc = c.subClusters.find((sc) => sc.name == subCluster);
             return sc.metricConfig.find((mc) => mc.name == metric)
         } else {
             let result;
             for (let sc of c.subClusters) {
                 const mc = sc.metricConfig.find((mc) => mc.name == metric)
-                if (result) { // If lowerIsBetter: Peak is still maximum value, no special case required
+                if (result && mc) { // update result; If lowerIsBetter: Peak is still maximum value, no special case required
                     result.alert = (mc.alert > result.alert) ? mc.alert : result.alert
                     result.caution = (mc.caution > result.caution) ? mc.caution : result.caution
                     result.normal = (mc.normal > result.normal) ? mc.normal : result.normal
                     result.peak = (mc.peak > result.peak) ? mc.peak : result.peak
-                } else {
-                    if (mc) result = {...mc};
+                } else if (mc) {
+                    // start new result
+                    result = {...mc};
                 }
             }
             return result
@@ -381,13 +379,14 @@ function getMetricConfigDeep(metric, cluster, subCluster) {
         for (let c of clusters) {
             for (let sc of c.subClusters) {
                 const mc = sc.metricConfig.find((mc) => mc.name == metric)
-                if (result) { // If lowerIsBetter: Peak is still maximum value, no special case required
+                if (result && mc) { // update result; If lowerIsBetter: Peak is still maximum value, no special case required
                     result.alert = (mc.alert > result.alert) ? mc.alert : result.alert
                     result.caution = (mc.caution > result.caution) ? mc.caution : result.caution
                     result.normal = (mc.normal > result.normal) ? mc.normal : result.normal
                     result.peak = (mc.peak > result.peak) ? mc.peak : result.peak
-                } else {
-                    if (mc) result = {...mc};
+                } else if (mc) {
+                    // Start new result
+                    result = {...mc};
                 }
             }
         }