Fix count of allocated/idle cores in metrics

CHANGELOG.md

@@ -28,6 +28,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Add `metrics` > `restrict` parameter for the agent.
   - Add `ui` > `templates`, `message_template`, `message_login` parameters for
     the gateway.
+  - Select `alloc_cpus` and `alloc_idle_cpus` nodes fields on `slurmrestd`
+    `/slurm/*/nodes` and `/slurm/*/node/<node>` endpoints.
   - Introduce service message template.
 - show-conf: Introduce `slurm-web-show-conf` utility to dump current
   configuration settings of gateway and agent components with their origin,

conf/vendor/agent.yml

@@ -148,6 +148,8 @@ filters:
     - state
     - reason
     - partitions
+    - alloc_cpus
+    - alloc_idle_cpus
     doc: |
       List of nodes fields selected in slurmrestd API, all other fields are
       filtered out.
@@ -169,6 +171,7 @@ filters:
     - reason
     - partitions
     - alloc_cpus
+    - alloc_idle_cpus
     - alloc_memory
     doc: |
       List of invidual node fields selected in slurmrestd API, all other fields

docs/modules/conf/examples/agent.ini

@@ -208,6 +208,8 @@ ctldjob=
 # - state
 # - reason
 # - partitions
+# - alloc_cpus
+# - alloc_idle_cpus
 nodes=
   name
   cpus
@@ -217,6 +219,8 @@ nodes=
   state
   reason
   partitions
+  alloc_cpus
+  alloc_idle_cpus
 
 # List of invidual node fields selected in slurmrestd API, all other fields
 # are filtered out.
@@ -236,6 +240,7 @@ nodes=
 # - reason
 # - partitions
 # - alloc_cpus
+# - alloc_idle_cpus
 # - alloc_memory
 node=
   name
@@ -252,6 +257,7 @@ node=
   reason
   partitions
   alloc_cpus
+  alloc_idle_cpus
   alloc_memory
 
 # List of partitions fields selected in slurmrestd API, all other fields are

docs/modules/conf/partials/conf-agent.adoc

@@ -340,6 +340,10 @@ filtered out.
 
 * `partitions`
 
+* `alloc_cpus`
+
+* `alloc_idle_cpus`
+
 
 |-
 
@@ -383,6 +387,8 @@ are filtered out.
 
 * `alloc_cpus`
 
+* `alloc_idle_cpus`
+
 * `alloc_memory`
 
 

slurmweb/slurmrestd/__init__.py

@@ -145,7 +145,6 @@ def nodes_cores_states(self):
         }
         cores_states = {
             "idle": 0,
-            "mixed": 0,
             "allocated": 0,
             "down": 0,
             "drain": 0,
@@ -157,7 +156,9 @@ def nodes_cores_states(self):
             cores = node["cpus"]
             if "MIXED" in node["state"]:
                 nodes_states["mixed"] += 1
-                cores_states["mixed"] += cores
+                # Look at number of actually allocated/idle cores
+                cores_states["allocated"] += node["alloc_cpus"]
+                cores_states["idle"] += node["alloc_idle_cpus"]
             elif "ALLOCATED" in node["state"]:
                 nodes_states["allocated"] += 1
                 cores_states["allocated"] += cores