cpu usage percentage for nodes calculated as 100 - cpu_usage_idle

db/influx/influxdb_wrapper.py

@@ -74,7 +74,9 @@ def get_aggregator(job_id, type="ascii"):
         if type == "pdf":
             new_node.proc.seq_cpu_usage = SeqVals(data["seq_delta"], data["seq"][node_id]["proc_cpu_usage_sum"])
             new_node.proc.seq_mem_rss_sum = SeqVals(data["seq_delta"], data["seq"][node_id]["proc_mem_rss_sum"])
-            new_node.seq_cpu_usage = SeqVals(data["seq_delta"], data["seq"][node_id]["node_cpu_usage_avg"])
+            new_node.seq_cpu_usage = SeqVals(data["seq_delta"], data["seq"][node_id]["node_cpu_idle_avg"])
+            new_node.seq_cpu_usage.seq = [None if x is None else (100 - x) for x in new_node.seq_cpu_usage.seq]
+
             new_node.seq_load = SeqVals(data["seq_delta"], data["seq"][node_id]["node_load_avg"])
 
         aggr.nodes.append(new_node)

db/influx/metrics.py

@@ -148,6 +148,12 @@ metrics_seq = {
         "query": QType.AVG_OF_NODE,
         "measurement": conf.measurements["cpu"],
     },
+    "node_cpu_idle_avg": {
+        "dbname": "usage_idle",
+        "type": MType.FLT,
+        "query": QType.AVG_OF_NODE,
+        "measurement": conf.measurements["cpu"],
+    },
     "node_load_avg": {
         "dbname": "load1",
         "type": MType.FLT,