Commit a3794ac3 authored by akhuziy's avatar akhuziy
Browse files

added proc_read_sum and proc_write_sum seqs for pdf output

parent b81917e4
......@@ -21,10 +21,14 @@ class ProcData:
cpu_usage = None
seq_cpu_usage = None
seq_mem_rss_sum = None
seq_write_sum = None
seq_read_sum = None
def __init__(self):
self.seq_cpu_usage = SeqVals()
self.seq_mem_rss_sum = SeqVals()
self.seq_write_sum = SeqVals()
self.seq_read_sum = SeqVals()
class AllocCUData:
node_id = None
......
......@@ -75,6 +75,8 @@ def get_aggregator(job_id, type="text"):
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.proc.seq_write_sum = SeqVals(data["seq_delta"], data["seq"][node_id]["proc_write_sum"])
new_node.proc.seq_read_sum = SeqVals(data["seq_delta"], data["seq"][node_id]["proc_read_sum"])
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]
......
......@@ -143,6 +143,18 @@ metrics_seq = {
"query": QType.SUM_PER_NODE,
"measurement": conf.measurements["proc"],
},
"proc_write_sum": {
"dbname": "write_bytes",
"type": MType.FLT,
"query": QType.SUM_PER_NODE,
"measurement": conf.measurements["proc"],
},
"proc_read_sum": {
"dbname": "read_bytes",
"type": MType.FLT,
"query": QType.SUM_PER_NODE,
"measurement": conf.measurements["proc"],
},
"node_cpu_usage_avg": {
"dbname": "usage_user",
"type": MType.FLT,
......
......@@ -107,6 +107,16 @@ class OutputSchemes:
"path": "proc.seq_mem_rss_sum",
"scheme": "std"
},
"proc_write_sum": {
"type": "seq",
"path": "proc.seq_write_sum",
"scheme": "std"
},
"proc_read_sum": {
"type": "seq",
"path": "proc.seq_read_sum",
"scheme": "std"
},
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment