Skip to content

CP-44533 Add running vCPU and running domain of host into rrdd #5307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 4, 2024
Merged

CP-44533 Add running vCPU and running domain of host into rrdd #5307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions ocaml/xcp-rrdd/bin/rrdd/xcp_rrdd.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,11 @@ let dss_loadavg () =
)
]

let count_running_domain domains =
List.fold_left
(fun count (dom, _, _) -> if dom.Xenctrl.running then count + 1 else count)
0 domains

let dss_hostload xc domains =
let physinfo = Xenctrl.physinfo xc in
let pcpus = physinfo.Xenctrl.nr_cpus in
Expand All @@ -379,6 +384,8 @@ let dss_hostload xc domains =
)
0 domains
in
let running_domains = count_running_domain domains in

let load_per_cpu = float_of_int load /. float_of_int pcpus in
[
( Rrd.Host
Expand All @@ -390,6 +397,18 @@ let dss_hostload xc domains =
~value:(Rrd.VT_Float load_per_cpu) ~min:0.0 ~ty:Rrd.Gauge ~default:true
()
)
; ( Rrd.Host
, Ds.ds_make ~name:"running_vcpus" ~units:"(vcpus)"
~description:"The total number of running vCPU per host"
~value:(Rrd.VT_Int64 (Int64.of_int load))
~min:0.0 ~ty:Rrd.Gauge ~default:true ()
)
; ( Rrd.Host
, Ds.ds_make ~name:"running_domains" ~units:"(domains)"
~description:"The total number of running domain per host"
~value:(Rrd.VT_Int64 (Int64.of_int running_domains))
~min:0.0 ~ty:Rrd.Gauge ~default:true ()
)
]

(*****************************************************)
Expand Down Expand Up @@ -579,11 +598,7 @@ let scan path =

let mem_available () =
let* size, kb = scan "/proc/meminfo" in
match kb with
| "kB" ->
ok Int64.(mul size 1024L)
| _ ->
res_error "unexpected unit: %s" kb
match kb with "kB" -> ok size | _ -> res_error "unexpected unit: %s" kb

let dss_mem_vms doms =
List.fold_left
Expand Down