Skip to content

pcp2openmetrics: resolves RHEL-138467 #2448

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
natoscott merged 1 commit into from
Jan 22, 2026
+19 −4
Merged

pcp2openmetrics: resolves RHEL-138467 #2448

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions qa/1131
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ signal=$PCP_BINADM_DIR/pmsignal
trap "_cleanup; exit \$status" 0 1 2 3 15

A="$here/archives/rep"
A1="$here/archives/20180606"
hostname=`hostname`
machineid=`_machine_id`
domainid=`_domain_name`
Expand Down Expand Up @@ -98,6 +99,8 @@ pcp2openmetrics -s1 -z hinv.ncpu | _filter_pcp2openmetrics
echo "---"
pcp2openmetrics -s2 -x hinv.ncpu | _filter_pcp2openmetrics
echo "---"
pcp2openmetrics -s2 -a $A1 hinv.ncpu disk.partitions.write | _archive_filter
echo "---"
pcp2opentelemetry -s1 -H -z hinv.ncpu | _filter_pcp2opentelemetry
echo "---"

Expand Down
12 changes: 12 additions & 0 deletions qa/1131.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2279,6 +2279,18 @@ hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MAC
hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MACHINEID",userid="USERID",agent="AGENT"} NCPU
hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MACHINEID",userid="USERID",agent="AGENT"} NCPU
---
# PCP5 hinv_ncpu 60.0.32 u32 PM_INDOM_NULL discrete
# TYPE hinv_ncpu gauge
# HELP hinv_ncpu number of CPUs in the system
hinv_ncpu{domainname="localdomain",groupid="999",hostname="vm01",machineid="3a6b3d7f3b7559c538a5934a24866658",userid="999",agent="linux"} 1 1528207821.599573
# PCP5 disk_partitions_write 60.10.1 u32 60.10 counter count
# TYPE disk_partitions_write counter
# HELP disk_partitions_write write operations metric for storage partitions
disk_partitions_write_total{domainname="localdomain",groupid="999",hostname="vm01",machineid="3a6b3d7f3b7559c538a5934a24866658",userid="999",instname="sda1",instid="1",agent="linux",device_type="block",indom_name="per partition"} 88156 1528207821.599573
disk_partitions_write_total{domainname="localdomain",groupid="999",hostname="vm01",machineid="3a6b3d7f3b7559c538a5934a24866658",userid="999",instname="sda2",instid="2",agent="linux",device_type="block",indom_name="per partition"} 0 1528207821.599573
disk_partitions_write_total{domainname="localdomain",groupid="999",hostname="vm01",machineid="3a6b3d7f3b7559c538a5934a24866658",userid="999",instname="sda5",instid="3",agent="linux",device_type="block",indom_name="per partition"} 2293 1528207821.599573
# EOF
---
{
"resourceMetrics": [
{
Expand Down
8 changes: 4 additions & 4 deletions src/pcp2openmetrics/pcp2openmetrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def __init__(self):
self.precision = 3 # .3f
self.precision_force = None
self.timefmt = TIMEFMT
self.interpol = 0
self.interpol = 1
self.count_scale = None
self.count_scale_force = None
self.space_scale = None
Expand All @@ -121,7 +121,7 @@ def __init__(self):
self.http_pass = None
self.http_timeout = TIMEOUT
self.no_comment = False
self.header_flag = True
self.headers = []

# Internal
self.runtime = -1
Expand Down Expand Up @@ -476,12 +476,12 @@ def openmetrics_labels(inst, name, desc, labels):
help_dict = {}
help_dict[metric] = context.pmLookupText(pmid[0])

if self.header_flag is True:
if metric not in self.headers:
if self.no_comment is False:
body += '# PCP5 %s %s %s %s %s %s\n' % (openmetrics_name(metric), pmIDStr, get_type_string(desc), pmIndomStr, semantics, units)
body += '# TYPE %s %s\n' % (openmetrics_name(metric), openmetrics_type(desc))
body += '# HELP %s %s\n' % (openmetrics_name(metric), help_dict[metric])
self.header_flag = False
self.headers.append(metric)

for inst, name, value in results[metric]:
if isinstance(value, float):
Expand Down
Loading