Skip to content

Commit

Permalink
pmdalibvirt: remove support for the ancient RHEL 5 era "oldapi"
Browse files Browse the repository at this point in the history
  • Loading branch information
@myllynen
myllynen committed Apr 10, 2024
1 parent c16b92b commit d2602db
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 140 deletions.
1 change: 0 additions & 1 deletion qa/1041
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ pmdalibvirt_install()

cat <<EOF >$tmp.config
[pmda]
#oldapi = False
user = root
uri = qemu:///system
EOF
Expand Down
16 changes: 3 additions & 13 deletions src/pmdas/libvirt/connect
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env pmpython
#
# Copyright (C) 2016-2017 Marko Myllynen <myllynen@redhat.com>
# Copyright (C) 2016-2024 Marko Myllynen <myllynen@redhat.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -31,7 +31,6 @@ conffile += '/libvirt/libvirt.conf'
user = 'root'
uri = 'qemu:///system'
backing = False
oldapi = False

# Python < 3.2 compat
if sys.version_info[0] >= 3 and sys.version_info[1] >= 2:
Expand All @@ -50,15 +49,13 @@ if config.has_section('pmda'):
config.get('pmda', opt) == '1':
backing = True
elif opt == 'oldapi':
if config.get('pmda', opt) == 'True' or \
config.get('pmda', opt) == '1':
oldapi = True
sys.stdout.write("Ignoring obsolete directive '%s' in %s." % (opt, conffile))
else:
sys.stderr.write("Invalid directive '%s' in %s.\n" % (opt, conffile))
sys.exit(1)

if len(sys.argv) > 1 and (sys.argv[1] == '-c' or sys.argv[1] == '--config'):
sys.stdout.write("user=%s\nuri=%s\nbacking=%s\noldapi=%s\n" % (user, uri, backing, oldapi))
sys.stdout.write("user=%s\nuri=%s\nbacking=%s\n" % (user, uri, backing))
sys.exit(0)

try:
Expand All @@ -78,10 +75,3 @@ except Exception as e:
sys.stdout.write("Connection as %s to %s ok.\n" % (user, uri))

sys.stdout.write("Block dev backing stats: %s.\n" % backing)

newapi = False
if 'domainListGetStats' in dir(conn):
newapi = True
else:
oldapi = True
sys.stdout.write("Using new API: %s (available: %s).\n" % (not oldapi, newapi))
1 change: 0 additions & 1 deletion src/pmdas/libvirt/libvirt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
user = root
uri = qemu:///system
backing = True
oldapi = False
6 changes: 2 additions & 4 deletions src/pmdas/libvirt/pmdalibvirt.1
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'\"macro stdmacro
.\"
.\" Copyright (C) 2016 Marko Myllynen <myllynen@redhat.com>
.\" Copyright (C) 2016,2024 Marko Myllynen <myllynen@redhat.com>
.\"
.\" This program is free software; you can redistribute it and/or modify it
.\" under the terms of the GNU General Public License as published by the
Expand Down Expand Up @@ -42,12 +42,10 @@ user
uri
.IP \(bu
backing
.IP \(bu
oldapi
.RE
.PD
.PP
By default, \fBroot\fP, \fBqemu:///system\fP, \fBFalse\fP, and \fBFalse\fP
By default, \fBroot\fP, \fBqemu:///system\fP, and \fBFalse\fP
are used as values for these options, respectively.
.PP
The backing setting can be used to expand block device information to
Expand Down
139 changes: 18 additions & 121 deletions src/pmdas/libvirt/pmdalibvirt.python
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env pmpython
#
# Copyright (C) 2016-2018 Marko Myllynen <myllynen@redhat.com>
# Copyright (C) 2016-2024 Marko Myllynen <myllynen@redhat.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -64,19 +64,12 @@ class LibvirtPMDA(PMDA):
self.user = DEFAULT_USER
self.uri = DEFAULT_URI
self.backing = False
self.oldapi = False
self.read_config()
self.set_user(self.user)

self.doms = []
self.connect_pmcd()
self.conn = self.connect_libvirt()
if 'domainListGetStats' not in dir(self.conn):
self.oldapi = True

if self.oldapi:
if not os.environ.get('PCP_PYTHON_DOMAIN') and not os.environ.get('PCP_PYTHON_PMNS'):
self.log("Using old libvirt API, some metrics are unavailable.")

units_none = pmUnits(0, 0, 0, 0, 0, 0)
units_count = pmUnits(0, 0, 1, 0, 0, PM_COUNT_ONE)
Expand Down Expand Up @@ -399,9 +392,7 @@ class LibvirtPMDA(PMDA):
config.get('pmda', opt) == '1':
self.backing = True
elif opt == 'oldapi':
if config.get('pmda', opt) == 'True' or \
config.get('pmda', opt) == '1':
self.oldapi = True
self.log("Ignoring obsolete directive '%s' in %s." % (opt, conffile))
else:
self.err("Invalid directive '%s' in %s." % (opt, conffile))
sys.exit(1)
Expand Down Expand Up @@ -489,50 +480,22 @@ class LibvirtPMDA(PMDA):
if not self.doms:
return

flags = None
if not self.oldapi:
flags = libvirt.VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE
flags = libvirt.VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE

if cluster == self.vm_cpustats_cluster:
try:
self.vm_cpustats_res = []
if not self.oldapi:
stats = libvirt.VIR_DOMAIN_STATS_CPU_TOTAL
self.vm_cpustats_res = self.conn.domainListGetStats(self.doms, stats, flags)
else:
for dom in self.doms:
stats = dom.getCPUStats(True, 0)[0]
res = {}
for key in stats:
k = key.replace("_time", "")
k = k.replace("cpu", "time")
res['cpu.' + k] = stats[key]
self.vm_cpustats_res.append([dom, res])
stats = libvirt.VIR_DOMAIN_STATS_CPU_TOTAL
self.vm_cpustats_res = self.conn.domainListGetStats(self.doms, stats, flags)
except libvirt.libvirtError as error:
self.log("Failed to get domain cpu stats: %s" % error)
return

if cluster == self.vm_vcpustats_cluster:
try:
self.vm_vcpustats_res = []
if not self.oldapi:
stats = libvirt.VIR_DOMAIN_STATS_VCPU
self.vm_vcpustats_res = self.conn.domainListGetStats(self.doms, stats, flags)
else:
for dom in self.doms:
stats = dom.vcpus()[0]
res = {}
count = len(stats)
res['vcpu.current'] = count
res['vcpu.maximum'] = int(etree.fromstring(dom.XMLDesc(0)).xpath("/domain/vcpu")[0].text)
for nr in range(count):
nrstr = str(nr)
for i in range(len(stats[nr])):
if i == 1:
res['vcpu.' + nrstr + '.state'] = stats[nr][i]
elif i == 2:
res['vcpu.' + nrstr + '.time'] = stats[nr][i]
self.vm_vcpustats_res.append([dom, res])
stats = libvirt.VIR_DOMAIN_STATS_VCPU
self.vm_vcpustats_res = self.conn.domainListGetStats(self.doms, stats, flags)

insts = {}
for dom in self.doms:
Expand All @@ -559,53 +522,19 @@ class LibvirtPMDA(PMDA):
if cluster == self.vm_balloonstats_cluster:
try:
self.vm_balloonstats_res = []
if not self.oldapi:
stats = libvirt.VIR_DOMAIN_STATS_BALLOON
self.vm_balloonstats_res = self.conn.domainListGetStats(self.doms, stats, flags)
stats = libvirt.VIR_DOMAIN_STATS_BALLOON
self.vm_balloonstats_res = self.conn.domainListGetStats(self.doms, stats, flags)
except libvirt.libvirtError as error:
self.log("Failed to get domain balloon stats: %s" % error)
return

if cluster == self.vm_blockstats_cluster:
try:
self.vm_blockstats_res = []
if not self.oldapi:
stats = libvirt.VIR_DOMAIN_STATS_BLOCK
if self.backing:
flags |= libvirt.VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING
self.vm_blockstats_res = self.conn.domainListGetStats(self.doms, stats, flags)
else:
for dom in self.doms:
doc = etree.fromstring(dom.XMLDesc(0))
count = len(doc.xpath("/domain/devices/disk"))
res = {}
res['block.count'] = count
for nr in range(count):
src = doc.xpath("/domain/devices/disk")[nr].find('source')
if src is None:
continue
path = None
for path in 'file', 'block', 'dir', 'network', 'volume':
try:
key = src.keys().index(path)
path = src.values()[key]
break
except Exception:
pass
if not path:
continue
nrstr = str(nr)
stats = dom.blockStats(path)
for i in range(len(stats)):
if i == 0:
res['block.' + nrstr + '.rd.reqs'] = stats[i]
elif i == 1:
res['block.' + nrstr + '.rd.bytes'] = stats[i]
elif i == 2:
res['block.' + nrstr + '.wr.reqs'] = stats[i]
elif i == 3:
res['block.' + nrstr + '.wr.bytes'] = stats[i]
self.vm_blockstats_res.append([dom, res])
stats = libvirt.VIR_DOMAIN_STATS_BLOCK
if self.backing:
flags |= libvirt.VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING
self.vm_blockstats_res = self.conn.domainListGetStats(self.doms, stats, flags)

insts = {}
for dom in self.doms:
Expand All @@ -623,40 +552,9 @@ class LibvirtPMDA(PMDA):
if cluster == self.vm_netstats_cluster:
try:
self.vm_netstats_res = []
if not self.oldapi:
stats = libvirt.VIR_DOMAIN_STATS_INTERFACE
self.vm_netstats_res = self.conn.domainListGetStats(self.doms, stats, flags)
else:
for dom in self.doms:
doc = etree.fromstring(dom.XMLDesc(0))
count = len(doc.xpath("/domain/devices/interface"))
res = {}
res['net.count'] = count
for nr in range(count):
name = doc.xpath("/domain/devices/interface")[nr].find('target')
if name is None:
continue
name = name.values()[0]
nrstr = str(nr)
stats = dom.interfaceStats(name)
for i in range(len(stats)):
if i == 0:
res['net.' + nrstr + '.rx.bytes'] = stats[i]
elif i == 1:
res['net.' + nrstr + '.rx.pkts'] = stats[i]
elif i == 2:
res['net.' + nrstr + '.rx.errs'] = stats[i]
elif i == 3:
res['net.' + nrstr + '.rx.drop'] = stats[i]
elif i == 4:
res['net.' + nrstr + '.tx.bytes'] = stats[i]
elif i == 5:
res['net.' + nrstr + '.tx.pkts'] = stats[i]
elif i == 6:
res['net.' + nrstr + '.tx.errs'] = stats[i]
elif i == 7:
res['net.' + nrstr + '.tx.drop'] = stats[i]
self.vm_netstats_res.append([dom, res])
stats = libvirt.VIR_DOMAIN_STATS_INTERFACE
self.vm_netstats_res = self.conn.domainListGetStats(self.doms, stats, flags)

insts = {}
for dom in self.doms:
for res in self.vm_netstats_res:
Expand All @@ -673,9 +571,8 @@ class LibvirtPMDA(PMDA):
if cluster == self.vm_perfstats_cluster:
try:
self.vm_perfstats_res = []
if not self.oldapi:
stats = libvirt.VIR_DOMAIN_STATS_PERF
self.vm_perfstats_res = self.conn.domainListGetStats(self.doms, stats, flags)
stats = libvirt.VIR_DOMAIN_STATS_PERF
self.vm_perfstats_res = self.conn.domainListGetStats(self.doms, stats, flags)
except libvirt.libvirtError as error:
self.log("Failed to get domain perf stats: %s" % error)
return
Expand Down

0 comments on commit d2602db

Please sign in to comment.