Merge branch 'main' of https://github.com/performancecopilot/pcp

build/rpm/pcp.spec.in

@@ -332,6 +332,8 @@ Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shpin
 Requires: pcp-pmda-lustrecomm pcp-pmda-docker pcp-pmda-smart pcp-pmda-farm
 Requires: pcp-pmda-hacluster pcp-pmda-sockets pcp-pmda-podman
 %if "@have_python@" == "true"
+Requires: pcp-geolocate pcp-export-pcp2openmetrics pcp-export-pcp2json
+Requires: pcp-export-pcp2spark pcp-export-pcp2xml pcp-export-pcp2zabbix
 Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
 Requires: pcp-pmda-haproxy pcp-pmda-nfsclient pcp-pmda-lmsensors
 Requires: pcp-pmda-netcheck pcp-pmda-rabbitmq pcp-pmda-uwsgi
@@ -2398,7 +2400,7 @@ total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault
 total_manifest | keep 'tutorials|/html/|pcp-doc|man.*\.[1-9].*' | cull 'out' >pcp-doc-files
 basic_manifest | keep "$PCP_GUI|pcp-gui|applications|pixmaps|hicolor" | cull 'pmtime.h' >pcp-gui-files
 basic_manifest | keep 'selinux' | cull 'tmp|testsuite' >pcp-selinux-files
-basic_manifest | keep 'zeroconf|daily[-_]report|/sa$' >pcp-zeroconf-files
+basic_manifest | keep 'zeroconf|daily[-_]report|/sa$' | cull 'pmcheck' >pcp-zeroconf-files
 basic_manifest | grep -E -e 'pmiostat|pmrep|dstat|htop|pcp2csv' \
    -e 'pcp-atop|pcp-dmcache|pcp-dstat|pcp-free' \
    -e 'pcp-htop|pcp-ipcs|pcp-iostat|pcp-lvmcache|pcp-mpstat' \

build/rpm/redhat.spec

@@ -568,6 +568,8 @@ Requires: pcp-pmda-bpf
 Requires: pcp-pmda-bpftrace
 %endif
 %if !%{disable_python2} || !%{disable_python3}
+Requires: pcp-geolocate pcp-export-pcp2openmetrics pcp-export-pcp2json
+Requires: pcp-export-pcp2spark pcp-export-pcp2xml pcp-export-pcp2zabbix
 Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
 Requires: pcp-pmda-libvirt pcp-pmda-lio pcp-pmda-openmetrics pcp-pmda-haproxy
 Requires: pcp-pmda-lmsensors pcp-pmda-netcheck pcp-pmda-rabbitmq pcp-pmda-uwsgi
@@ -2570,7 +2572,7 @@ total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault
 
 basic_manifest | keep "$PCP_GUI|pcp-gui|applications|pixmaps|hicolor" | cull 'pmtime.h' >pcp-gui-files
 basic_manifest | keep 'selinux' | cull 'tmp|testsuite' >pcp-selinux-files
-basic_manifest | keep 'zeroconf|daily[-_]report|/sa$' >pcp-zeroconf-files
+basic_manifest | keep 'zeroconf|daily[-_]report|/sa$' | cull 'pmcheck' >pcp-zeroconf-files
 basic_manifest | grep -E -e 'pmiostat|pmrep|dstat|htop|pcp2csv' \
    -e 'pcp-atop|pcp-dmcache|pcp-dstat|pcp-free' \
    -e 'pcp-htop|pcp-ipcs|pcp-iostat|pcp-lvmcache|pcp-mpstat' \

qa/1100

@@ -91,6 +91,9 @@ _check_completion_bash()
   cmds="$(grep '  pcp2.*)' $bash_comp | tr -d ')')"
   cmds="$cmds $(grep '  pm.*)' $bash_comp | tr -d ')')"
   for cmd in $cmds; do
+    # Handle aliases
+    str="  $cmd"
+    [ "$cmd" = "pmlogdump|pmdumplog" ] && cmd=pmdumplog && str="  pmlogdump|pmdumplog"
     which $cmd > /dev/null 2>&1 || continue
     $skip_pcp2elasticsearch && [ "$cmd" = pcp2elasticsearch ] && continue
     $skip_pcp2graphite && [ "$cmd" = pcp2graphite ] && continue
@@ -104,7 +107,7 @@ _check_completion_bash()
     $skip_pmdumptext && [ "$cmd" = pmdumptext ] && continue
     $skip_pmrep && [ "$cmd" = pmrep ] && continue
     $skip_pmseries && [ "$cmd" = pmseries ] && continue
-    comps=$(grep -A 1 "  $cmd)" $bash_comp | tail -n 1 | sed -e 's,all_args=",,' -e 's,",,')
+    comps=$(grep -A 1 "$str)" $bash_comp | tail -n 1 | sed -e 's,all_args=",,' -e 's,",,')
     # Need $tmp.err and PCP_STDERR for pmchart ...
     #
     rm -f $tmp.err

qa/1491

@@ -72,6 +72,7 @@ s/inactive/OK/
 s/could be activated/OK/
 s/cannot be activated/OK/
 s/  No systemd unit file installed//
+s/  systemd.s postgresql.service unit is not installed//
 s/not currently available .*/metrics from postgresql/
 }' \
 	-e '/^pmda-redis /{

qa/1543.out

@@ -928,16 +928,16 @@ Series checked (indom)
 # PCP5 sample.long.one 29.0.10 32 PM_INDOM_NULL instant none
 # HELP sample_long_one 1 as a 32-bit integer
 # TYPE sample_long_one gauge
-sample_long_one{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME"} 1
+sample_long_one{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",domainname="DOMAINNAME",machineid="MACHINEID"} 1
 == scrape two metrics ==
 # PCP5 sample.long.one 29.0.10 32 PM_INDOM_NULL instant none
 # HELP sample_long_one 1 as a 32-bit integer
 # TYPE sample_long_one gauge
-sample_long_one{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME"} 1
+sample_long_one{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",domainname="DOMAINNAME",machineid="MACHINEID"} 1
 # PCP5 sample.long.ten 29.0.11 32 PM_INDOM_NULL instant none
 # HELP sample_long_ten 10 as a 32-bit integer
 # TYPE sample_long_ten gauge
-sample_long_ten{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME"} 10
+sample_long_ten{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",domainname="DOMAINNAME",machineid="MACHINEID"} 10
 == scrape bad metric name ==
 {
     "context": "CONTEXT"
@@ -948,82 +948,82 @@ sample_long_ten{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME
 # PCP5 sample.long.one 29.0.10 32 PM_INDOM_NULL instant none
 # HELP sample_long_one 1 as a 32-bit integer
 # TYPE sample_long_one gauge
-sample_long_one{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME"} 1
+sample_long_one{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",domainname="DOMAINNAME",machineid="MACHINEID"} 1
 # PCP5 sample.long.ten 29.0.11 32 PM_INDOM_NULL instant none
 # HELP sample_long_ten 10 as a 32-bit integer
 # TYPE sample_long_ten gauge
-sample_long_ten{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME"} 10
+sample_long_ten{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",domainname="DOMAINNAME",machineid="MACHINEID"} 10
 # PCP5 sample.long.hundred 29.0.12 32 PM_INDOM_NULL instant none
 # HELP sample_long_hundred 100 as a 32-bit integer
 # TYPE sample_long_hundred gauge
-sample_long_hundred{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME"} 100
+sample_long_hundred{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",domainname="DOMAINNAME",machineid="MACHINEID"} 100
 # PCP5 sample.long.million 29.0.13 32 PM_INDOM_NULL instant none
 # HELP sample_long_million 1000000 as a 32-bit integer
 # TYPE sample_long_million gauge
-sample_long_million{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME"} 1000000
+sample_long_million{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",domainname="DOMAINNAME",machineid="MACHINEID"} 1000000
 # PCP5 sample.long.write_me 29.0.14 32 PM_INDOM_NULL instant none
 # HELP sample_long_write_me a 32-bit integer that can be modified
 # TYPE sample_long_write_me gauge
-sample_long_write_me{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME",changed="true"} 24
+sample_long_write_me{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",domainname="DOMAINNAME",machineid="MACHINEID",changed="true"} 24
 # PCP5 sample.dupnames.five.long_bin 29.0.103 32 29.2 instant none
 # HELP sample_dupnames_five_long_bin like sample.bin but type 32
 # TYPE sample_dupnames_five_long_bin gauge
-sample_dupnames_five_long_bin{hostname="HOSTNAME",instid="100",instname="bin-100",domainname="DOMAINNAME",machineid="MACHINEID",bin="100"} 100
-sample_dupnames_five_long_bin{hostname="HOSTNAME",instid="200",instname="bin-200",domainname="DOMAINNAME",machineid="MACHINEID",bin="200"} 200
-sample_dupnames_five_long_bin{hostname="HOSTNAME",instid="300",instname="bin-300",domainname="DOMAINNAME",machineid="MACHINEID",bin="300"} 300
-sample_dupnames_five_long_bin{hostname="HOSTNAME",instid="400",instname="bin-400",domainname="DOMAINNAME",machineid="MACHINEID",bin="400"} 400
-sample_dupnames_five_long_bin{hostname="HOSTNAME",instid="500",instname="bin-500",domainname="DOMAINNAME",machineid="MACHINEID",bin="500"} 500
-sample_dupnames_five_long_bin{hostname="HOSTNAME",instid="600",instname="bin-600",domainname="DOMAINNAME",machineid="MACHINEID",bin="600"} 600
-sample_dupnames_five_long_bin{hostname="HOSTNAME",instid="700",instname="bin-700",domainname="DOMAINNAME",machineid="MACHINEID",bin="700"} 700
-sample_dupnames_five_long_bin{hostname="HOSTNAME",instid="800",instname="bin-800",domainname="DOMAINNAME",machineid="MACHINEID",bin="800"} 800
-sample_dupnames_five_long_bin{hostname="HOSTNAME",instid="900",instname="bin-900",domainname="DOMAINNAME",machineid="MACHINEID",bin="900"} 900
+sample_dupnames_five_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-100",instid="100",domainname="DOMAINNAME",machineid="MACHINEID",bin="100"} 100
+sample_dupnames_five_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-200",instid="200",domainname="DOMAINNAME",machineid="MACHINEID",bin="200"} 200
+sample_dupnames_five_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-300",instid="300",domainname="DOMAINNAME",machineid="MACHINEID",bin="300"} 300
+sample_dupnames_five_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-400",instid="400",domainname="DOMAINNAME",machineid="MACHINEID",bin="400"} 400
+sample_dupnames_five_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-500",instid="500",domainname="DOMAINNAME",machineid="MACHINEID",bin="500"} 500
+sample_dupnames_five_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-600",instid="600",domainname="DOMAINNAME",machineid="MACHINEID",bin="600"} 600
+sample_dupnames_five_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-700",instid="700",domainname="DOMAINNAME",machineid="MACHINEID",bin="700"} 700
+sample_dupnames_five_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-800",instid="800",domainname="DOMAINNAME",machineid="MACHINEID",bin="800"} 800
+sample_dupnames_five_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-900",instid="900",domainname="DOMAINNAME",machineid="MACHINEID",bin="900"} 900
 # PCP5 sample.long.bin 29.0.103 32 29.2 instant none
 # HELP sample_long_bin like sample.bin but type 32
 # TYPE sample_long_bin gauge
-sample_long_bin{hostname="HOSTNAME",instid="100",instname="bin-100",domainname="DOMAINNAME",machineid="MACHINEID",bin="100"} 100
-sample_long_bin{hostname="HOSTNAME",instid="200",instname="bin-200",domainname="DOMAINNAME",machineid="MACHINEID",bin="200"} 200
-sample_long_bin{hostname="HOSTNAME",instid="300",instname="bin-300",domainname="DOMAINNAME",machineid="MACHINEID",bin="300"} 300
-sample_long_bin{hostname="HOSTNAME",instid="400",instname="bin-400",domainname="DOMAINNAME",machineid="MACHINEID",bin="400"} 400
-sample_long_bin{hostname="HOSTNAME",instid="500",instname="bin-500",domainname="DOMAINNAME",machineid="MACHINEID",bin="500"} 500
-sample_long_bin{hostname="HOSTNAME",instid="600",instname="bin-600",domainname="DOMAINNAME",machineid="MACHINEID",bin="600"} 600
-sample_long_bin{hostname="HOSTNAME",instid="700",instname="bin-700",domainname="DOMAINNAME",machineid="MACHINEID",bin="700"} 700
-sample_long_bin{hostname="HOSTNAME",instid="800",instname="bin-800",domainname="DOMAINNAME",machineid="MACHINEID",bin="800"} 800
-sample_long_bin{hostname="HOSTNAME",instid="900",instname="bin-900",domainname="DOMAINNAME",machineid="MACHINEID",bin="900"} 900
+sample_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-100",instid="100",domainname="DOMAINNAME",machineid="MACHINEID",bin="100"} 100
+sample_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-200",instid="200",domainname="DOMAINNAME",machineid="MACHINEID",bin="200"} 200
+sample_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-300",instid="300",domainname="DOMAINNAME",machineid="MACHINEID",bin="300"} 300
+sample_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-400",instid="400",domainname="DOMAINNAME",machineid="MACHINEID",bin="400"} 400
+sample_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-500",instid="500",domainname="DOMAINNAME",machineid="MACHINEID",bin="500"} 500
+sample_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-600",instid="600",domainname="DOMAINNAME",machineid="MACHINEID",bin="600"} 600
+sample_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-700",instid="700",domainname="DOMAINNAME",machineid="MACHINEID",bin="700"} 700
+sample_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-800",instid="800",domainname="DOMAINNAME",machineid="MACHINEID",bin="800"} 800
+sample_long_bin{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-900",instid="900",domainname="DOMAINNAME",machineid="MACHINEID",bin="900"} 900
 # PCP5 sample.long.bin_ctr 29.0.104 32 29.2 counter Kbyte
 # HELP sample_long_bin_ctr like sample.bin but type 32, SEM_COUNTER and SPACE_KBYTE
 # TYPE sample_long_bin_ctr counter
-sample_long_bin_ctr{hostname="HOSTNAME",instid="100",instname="bin-100",domainname="DOMAINNAME",machineid="MACHINEID",bin="100"} 100
-sample_long_bin_ctr{hostname="HOSTNAME",instid="200",instname="bin-200",domainname="DOMAINNAME",machineid="MACHINEID",bin="200"} 200
-sample_long_bin_ctr{hostname="HOSTNAME",instid="300",instname="bin-300",domainname="DOMAINNAME",machineid="MACHINEID",bin="300"} 300
-sample_long_bin_ctr{hostname="HOSTNAME",instid="400",instname="bin-400",domainname="DOMAINNAME",machineid="MACHINEID",bin="400"} 400
-sample_long_bin_ctr{hostname="HOSTNAME",instid="500",instname="bin-500",domainname="DOMAINNAME",machineid="MACHINEID",bin="500"} 500
-sample_long_bin_ctr{hostname="HOSTNAME",instid="600",instname="bin-600",domainname="DOMAINNAME",machineid="MACHINEID",bin="600"} 600
-sample_long_bin_ctr{hostname="HOSTNAME",instid="700",instname="bin-700",domainname="DOMAINNAME",machineid="MACHINEID",bin="700"} 700
-sample_long_bin_ctr{hostname="HOSTNAME",instid="800",instname="bin-800",domainname="DOMAINNAME",machineid="MACHINEID",bin="800"} 800
-sample_long_bin_ctr{hostname="HOSTNAME",instid="900",instname="bin-900",domainname="DOMAINNAME",machineid="MACHINEID",bin="900"} 900
+sample_long_bin_ctr{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-100",instid="100",domainname="DOMAINNAME",machineid="MACHINEID",bin="100"} 100
+sample_long_bin_ctr{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-200",instid="200",domainname="DOMAINNAME",machineid="MACHINEID",bin="200"} 200
+sample_long_bin_ctr{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-300",instid="300",domainname="DOMAINNAME",machineid="MACHINEID",bin="300"} 300
+sample_long_bin_ctr{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-400",instid="400",domainname="DOMAINNAME",machineid="MACHINEID",bin="400"} 400
+sample_long_bin_ctr{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-500",instid="500",domainname="DOMAINNAME",machineid="MACHINEID",bin="500"} 500
+sample_long_bin_ctr{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-600",instid="600",domainname="DOMAINNAME",machineid="MACHINEID",bin="600"} 600
+sample_long_bin_ctr{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-700",instid="700",domainname="DOMAINNAME",machineid="MACHINEID",bin="700"} 700
+sample_long_bin_ctr{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-800",instid="800",domainname="DOMAINNAME",machineid="MACHINEID",bin="800"} 800
+sample_long_bin_ctr{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",instname="bin-900",instid="900",domainname="DOMAINNAME",machineid="MACHINEID",bin="900"} 900
 == scrape metric instances ==
 # PCP5 sample.dupnames.four.colour 29.0.5 32 29.1 instant none
 # HELP sample_dupnames_four_colour Metrics with a "saw-tooth" trend over time
 # TYPE sample_dupnames_four_colour gauge
-sample_dupnames_four_colour{model="RGB",hostname="HOSTNAME",instid="0",instname="red",domainname="DOMAINNAME",machineid="MACHINEID"} 143
-sample_dupnames_four_colour{model="RGB",hostname="HOSTNAME",instid="1",instname="green",domainname="DOMAINNAME",machineid="MACHINEID"} 244
-sample_dupnames_four_colour{model="RGB",hostname="HOSTNAME",instid="2",instname="blue",domainname="DOMAINNAME",machineid="MACHINEID"} 345
+sample_dupnames_four_colour{role="testing",agent="sample",model="RGB",cluster="zero",hostname="HOSTNAME",instname="red",instid="0",domainname="DOMAINNAME",machineid="MACHINEID"} 143
+sample_dupnames_four_colour{role="testing",agent="sample",model="RGB",cluster="zero",hostname="HOSTNAME",instname="green",instid="1",domainname="DOMAINNAME",machineid="MACHINEID"} 244
+sample_dupnames_four_colour{role="testing",agent="sample",model="RGB",cluster="zero",hostname="HOSTNAME",instname="blue",instid="2",domainname="DOMAINNAME",machineid="MACHINEID"} 345
 # PCP5 sample.colour 29.0.5 32 29.1 instant none
 # HELP sample_colour Metrics with a "saw-tooth" trend over time
 # TYPE sample_colour gauge
-sample_colour{model="RGB",hostname="HOSTNAME",instid="0",instname="red",domainname="DOMAINNAME",machineid="MACHINEID"} 143
-sample_colour{model="RGB",hostname="HOSTNAME",instid="1",instname="green",domainname="DOMAINNAME",machineid="MACHINEID"} 244
-sample_colour{model="RGB",hostname="HOSTNAME",instid="2",instname="blue",domainname="DOMAINNAME",machineid="MACHINEID"} 345
+sample_colour{role="testing",agent="sample",model="RGB",cluster="zero",hostname="HOSTNAME",instname="red",instid="0",domainname="DOMAINNAME",machineid="MACHINEID"} 143
+sample_colour{role="testing",agent="sample",model="RGB",cluster="zero",hostname="HOSTNAME",instname="green",instid="1",domainname="DOMAINNAME",machineid="MACHINEID"} 244
+sample_colour{role="testing",agent="sample",model="RGB",cluster="zero",hostname="HOSTNAME",instname="blue",instid="2",domainname="DOMAINNAME",machineid="MACHINEID"} 345
 == small curl compression command ==
 # PCP5 sample.long.one 29.0.10 32 PM_INDOM_NULL instant none
 # HELP sample_long_one 1 as a 32-bit integer
 # TYPE sample_long_one gauge
-sample_long_one{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME"} 1
+sample_long_one{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",domainname="DOMAINNAME",machineid="MACHINEID"} 1
 == large curl compression command ==
 # PCP5 sample.control 29.0.0 32 PM_INDOM_NULL instant none
 # HELP sample_control A control variable for the "sample" PMDA
 # TYPE sample_control gauge
-sample_control{hostname="HOSTNAME",machineid="MACHINEID",domainname="DOMAINNAME"} 0
+sample_control{role="testing",agent="sample",hostname="HOSTNAME",cluster="zero",domainname="DOMAINNAME",machineid="MACHINEID"} 0
 # PCP5 sample.dupnames.pid_daemon 29.0.1 u32 PM_INDOM_NULL instant none
 # HELP sample_dupnames_pid_daemon Process id of PMDA daemon
 # TYPE sample_dupnames_pid_daemon gauge

qa/1727

@@ -46,6 +46,7 @@ _cleanup()
 _filter_openmetrics_labels()
 {
     sed \
+    -e "s;$PCP_PMDAS_DIR;PCP_PMDAS_DIR;g" \
     -e 's;machineid="[a-z0-9]*";machineid=MACHINEID;g' \
     -e 's;hostname="[a-zA-Z0-9_\.\-]*";hostname=HOSTNAME;g' \
     -e 's;hostname:[a-zA-Z0-9_\.\-]*";hostname:HOSTNAME";g' \

qa/1727.out

@@ -6,7 +6,7 @@ QA output created by 1727
 # PCP5 openmetrics.duplicate_instname_label.somemetric NUMERIC_PMID double NUMERIC_INDOM instant none
 # HELP openmetrics_duplicate_instname_label_somemetric metric to test duplicate instname labels
 # TYPE openmetrics_duplicate_instname_label_somemetric gauge
-openmetrics_duplicate_instname_label_somemetric{hostname=HOSTNAME,instid="0",instname="0 hostname:HOSTNAME",domainname=DOMAINNAME,machineid=MACHINEID,source="duplicate_instname_label"} 1234
+openmetrics_duplicate_instname_label_somemetric{script="PCP_PMDAS_DIR/openmetrics/config.d/duplicate_instname_label.sh",agent="openmetrics",hostname=HOSTNAME,instid="0",instname="0 hostname:HOSTNAME",domainname=DOMAINNAME,machineid=MACHINEID,source="duplicate_instname_label"} 1234
 
 === verify metric name validity using pminfo