Skip to content

Addition of pcp2opentelemetry tool #2219

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion build/rpm/pcp.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,20 @@ Requires: python3-pcp = @package_version@
Performance Co-Pilot (PCP) front-end tools for exporting metric values
in OpenMetrics (https://openmetrics.io/) format.

#
# pcp-export-pcp2opentelemetry
#
%package export-pcp2opentelemetry
License: GPL-2.0-or-later
Summary: Performance Co-Pilot tools for exporting PCP metrics in OpenTelemetry format
URL: https://pcp.io
Requires: pcp-libs >= @package_version@
Requires: python3-pcp = @package_version@

%description export-pcp2opentelemetry
Performance Co-Pilot (PCP) front-end tools for exporting metric values
in OpenTelemetry (https://opentelemetry.io/) format.

#
# pcp-export-pcp2spark
#
Expand Down Expand Up @@ -2206,6 +2220,7 @@ basic_manifest | keep 'pcp2xlsx' >pcp-export-pcp2xlsx-files
basic_manifest | keep 'pcp2graphite' >pcp-export-pcp2graphite-files
basic_manifest | keep 'pcp2json' >pcp-export-pcp2json-files
basic_manifest | keep 'pcp2openmetrics' >pcp-export-pcp2openmetrics-files
basic_manifest | keep 'pcp2opentelemetry' >pcp-export-pcp2opentelemetry-files
basic_manifest | keep 'pcp2spark' >pcp-export-pcp2spark-files
basic_manifest | keep 'pcp2xml' >pcp-export-pcp2xml-files
basic_manifest | keep 'pcp2zabbix' >pcp-export-pcp2zabbix-files
Expand Down Expand Up @@ -2328,7 +2343,8 @@ done

for export_package in \
pcp2arrow pcp2elasticsearch pcp2graphite pcp2influxdb pcp2json \
pcp2openmetrics pcp2spark pcp2xlsx pcp2xml pcp2zabbix zabbix-agent ; \
pcp2openmetrics pcp2opentelemetry pcp2spark pcp2xlsx pcp2xml \
pcp2zabbix zabbix-agent; \
do \
export_packages="$export_packages pcp-export-$export_package"; \
done
Expand Down Expand Up @@ -3071,6 +3087,8 @@ fi

%files export-pcp2openmetrics -f pcp-export-pcp2openmetrics-files.rpm

%files export-pcp2opentelemetry -f pcp-export-pcp2opentelemetry-files.rpm

%files export-pcp2spark -f pcp-export-pcp2spark-files.rpm

%files export-pcp2xml -f pcp-export-pcp2xml-files.rpm
Expand Down
21 changes: 20 additions & 1 deletion build/rpm/redhat.spec
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,21 @@ Requires: python3-pcp = %{version}-%{release}
Performance Co-Pilot (PCP) front-end tools for exporting metric values
in OpenMetrics (https://openmetrics.io/) format.

#
# pcp-export-pcp2opentelemetry
#
%package export-pcp2opentelemetry
License: GPL-2.0-or-later
Summary: Performance Co-Pilot tools for exporting PCP metrics in OpenTelemetry format
URL: https://pcp.io
Requires: pcp-libs >= %{version}-%{release}
%if !%{disable_python3}
Requires: python3-pcp = %{version}-%{release}

%description export-pcp2opentelemetry
Performance Co-Pilot (PCP) front-end tools for exporting metric values
in OpenTelemetry (https://opentelemetry.io/) format.

#
# pcp-export-pcp2spark
#
Expand Down Expand Up @@ -2416,6 +2431,7 @@ basic_manifest | keep 'pcp2xlsx' >pcp-export-pcp2xlsx-files
basic_manifest | keep 'pcp2graphite' >pcp-export-pcp2graphite-files
basic_manifest | keep 'pcp2json' >pcp-export-pcp2json-files
basic_manifest | keep 'pcp2openmetrics' >pcp-export-pcp2openmetrics-files
basic_manifest | keep 'pcp2opentelemetry' >pcp-export-pcp2opentelemetry-files
basic_manifest | keep 'pcp2spark' >pcp-export-pcp2spark-files
basic_manifest | keep 'pcp2xml' >pcp-export-pcp2xml-files
basic_manifest | keep 'pcp2zabbix' >pcp-export-pcp2zabbix-files
Expand Down Expand Up @@ -2539,7 +2555,8 @@ done

for export_package in \
pcp2arrow pcp2elasticsearch pcp2graphite pcp2influxdb pcp2json \
pcp2openmetrics pcp2spark pcp2xlsx pcp2xml pcp2zabbix zabbix-agent ; \
pcp2openmetrics pcp2spark pcp2xlsx pcp2xml pcp2opentelemetry \
pcp2zabbix zabbix-agent ; \
do \
export_packages="$export_packages pcp-export-$export_package"; \
done
Expand Down Expand Up @@ -3261,6 +3278,8 @@ fi

%files export-pcp2openmetrics -f pcp-export-pcp2openmetrics-files.rpm

%files export-pcp2opentelemetry -f pcp-export-pcp2opentelemetry-files.rpm

%files export-pcp2spark -f pcp-export-pcp2spark-files.rpm

%files export-pcp2xml -f pcp-export-pcp2xml-files.rpm
Expand Down
19 changes: 18 additions & 1 deletion qa/1131
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
# PCP QA Test No. 1131
# Exercise pcp2json and pcp2openmetrics.
# Exercise pcp2json, pcp2openmetrics, and pcp2opentelemetry.
#
# Copyright (c) 2017 Red Hat.
#
Expand Down Expand Up @@ -51,6 +51,21 @@ _filter_pcp2openmetrics()
| LC_COLLATE=POSIX sort
}

_filter_pcp2opentelemetry()
{
tee -a $here/$seq.full \
| col -b \
| sed \
-e '/\"asDouble\":/ s/[0-9][0-9]*/NCPU/' \
-e 's/\"'$machineid'\"/MACHINEID/' \
-e 's/\"'$hostname'\"/HOSTNAME/' \
-e 's/\"'$domainid'\"/DOMAINID/' \
-e 's/\"agent\": .*/\"agent\": \"'$OSTYPE'\"/' \
-e 's/\"startTimeUnixNano\": .*/\"startTimeUnixNano\": TIME/' \
-e 's/\"userid\": .*/\"userid\": USERID/' \
-e 's/\"userid\": .*/\"userid\": GROUPID/'
}

# real QA test starts here
echo "---"
pcp2json -a $A -H -I -z "" | _archive_filter
Expand All @@ -65,6 +80,8 @@ pcp2openmetrics -s1 -z hinv.ncpu | _filter_pcp2openmetrics
echo "---"
pcp2openmetrics -s2 -x hinv.ncpu | _filter_pcp2openmetrics
echo "---"
pcp2opentelemetry -s1 -H -z hinv.ncpu | _filter_pcp2opentelemetry
echo "---"

cat $tmp.outfile | _archive_filter
which json_verify > /dev/null 2>&1
Expand Down
Loading
Loading