diff --git a/.gitignore b/.gitignore index ee9c73c..326d9f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -SOURCES/pcp-6.2.0.src.tar.gz +SOURCES/pcp-6.2.2.src.tar.gz +SOURCES/redhat-issues-RHEL-40718-java-bytecode-update.patch +SOURCES/redhat-issues-RHEL-50693-hacluster-metrics-update.patch diff --git a/.pcp.metadata b/.pcp.metadata index 2dc0110..de4878a 100644 --- a/.pcp.metadata +++ b/.pcp.metadata @@ -1 +1,3 @@ -617d0e505af5f253080effb6701e089fc02e7379 SOURCES/pcp-6.2.0.src.tar.gz +65095a4cddfad3ec6e119ea127050ea68ff8676d SOURCES/pcp-6.2.2.src.tar.gz +bf187559a4c2960a692c385b38cab9fd62c81b94 SOURCES/redhat-issues-RHEL-40718-java-bytecode-update.patch +e9a7873944492e28e2f9c5fd0c9bfac12ef7596e SOURCES/redhat-issues-RHEL-50693-hacluster-metrics-update.patch diff --git a/SOURCES/redhat-issues-39159-39132-32983-39293.patch b/SOURCES/redhat-issues-39159-39132-32983-39293.patch new file mode 100644 index 0000000..5758e2e --- /dev/null +++ b/SOURCES/redhat-issues-39159-39132-32983-39293.patch @@ -0,0 +1,372 @@ +commit 6cefac3c6560487abad80498240545e6835e503f +Author: lmchilton +Date: Wed Jun 19 10:19:04 2024 +0200 + + Updated pcp2openmetrics tool to fix issues: RHEL-39159, RHEL-39132, RHEL-32983, RHEL-39293. + Added command line option to exclude # PCP 5 comment line + Updated output to follow openmetrics format to include _total metric name ending + Omitted blank line after each metric output to adhere to prometheus openmetrics parser + Added # EOF line to end of text dump to adhere to prometheus openmetrics + parser + Updated relevent qa for pcp2openmetric changes (1131 & 1827) + Updated pcp2openmetrics man page and fixed style errors(2) + +diff --git a/qa/1131 b/qa/1131 +index 413da6fe3..aa1e554fe 100755 +--- a/qa/1131 ++++ b/qa/1131 +@@ -62,9 +62,10 @@ pcp2json -a $A -H -I -Z UTC+0 -x "" | _archive_filter + echo "---" + pcp2json -a $A -H -I -z -X -b GB -P 2 -F $tmp.outfile "" + echo "---" +-pcp2openmetrics -s1 -H -z hinv.ncpu | _filter_pcp2openmetrics ++pcp2openmetrics -s1 -z hinv.ncpu | _filter_pcp2openmetrics ++echo "---" ++pcp2openmetrics -s2 -x hinv.ncpu | _filter_pcp2openmetrics + echo "---" +- + + cat $tmp.outfile | _archive_filter + which json_verify > /dev/null 2>&1 +diff --git a/qa/1131.out b/qa/1131.out +index 098d698a6..90cb9eaa2 100644 +--- a/qa/1131.out ++++ b/qa/1131.out +@@ -2267,13 +2267,18 @@ QA output created by 1131 + } + --- + --- +- +- ++# EOF + # HELP hinv_ncpu number of CPUs in the system + # PCP5 hinv_ncpu 60.0.32 u32 PM_INDOM_NULL discrete + # TYPE hinv_ncpu gauge + hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MACHINEID",userid="USERID",agent="linux"} NCPU + --- ++# EOF ++# HELP hinv_ncpu number of CPUs in the system ++# TYPE hinv_ncpu gauge ++hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MACHINEID",userid="USERID",agent="linux"} NCPU ++hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MACHINEID",userid="USERID",agent="linux"} NCPU ++--- + { + "@pcp": { + "@hosts": [ +diff --git a/qa/1827 b/qa/1827 +index 47ee66d54..ebeaad460 100755 +--- a/qa/1827 ++++ b/qa/1827 +@@ -63,12 +63,20 @@ $PCP_PYTHON_PROG $here/src/pythonserver.py $port >$tmp.python.out 2>&1 & + pid=$! + sleep 2 # let server start up + ++echo "---" + echo "pcp2openmetrics invocation" | tee -a $here/$seq.full + pcp2openmetrics -s1 -u http://localhost:$port hinv.ncpu >$tmp.openmetrics.out 2>$tmp.openmetrics.err + + echo "pcp2openmetrics HTTP POST (sorted):" + _filter_pcp2openmetrics_http <$tmp.python.out + ++cat /dev/null > $tmp.python.out ++ ++echo "---" ++echo "testing -x option" | tee -a $here/$seq.full ++pcp2openmetrics -s1 -x -u http://localhost:$port hinv.ncpu >$tmp.openmetrics2.out 2>$tmp.openmetrics2.err ++_filter_pcp2openmetrics_http <$tmp.python.out ++ + # terminate pythonserver.py now + pmsignal $pid >/dev/null 2>&1 + +diff --git a/qa/1827.out b/qa/1827.out +index e786d8607..191ebcfa8 100644 +--- a/qa/1827.out ++++ b/qa/1827.out +@@ -1,4 +1,5 @@ + QA output created by 1827 ++--- + pcp2openmetrics invocation + pcp2openmetrics HTTP POST (sorted): + +@@ -21,3 +22,22 @@ INFO:root:Starting httpd... + Path: / + User-Agent: python-requests VERSION + hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MACHINEID",userid="USERID",agent="linux"} N (cpus) ++--- ++testing -x option ++ ++ ++ ++ ++ ++# HELP hinv_ncpu number of CPUs in the system ++# TYPE hinv_ncpu gauge ++Accept: */* ++Body: ++Content-Length: SIZE ++Content-Type: application/openmetrics-text ++Headers: ++Host: localhost:PORT ++INFO:root:POST request, ++Path: / ++User-Agent: python-requests VERSION ++hinv_ncpu{domainname="DOMAINID",groupid="GROUPID",hostname="HOST",machineid="MACHINEID",userid="USERID",agent="linux"} N (cpus) +diff --git a/src/pcp2openmetrics/pcp2openmetrics.1 b/src/pcp2openmetrics/pcp2openmetrics.1 +index 84e81e7af..41e4e2f9c 100644 +--- a/src/pcp2openmetrics/pcp2openmetrics.1 ++++ b/src/pcp2openmetrics/pcp2openmetrics.1 +@@ -181,6 +181,13 @@ Maximum time (in seconds) when sending a HTTP POST. + Corresponding command line option is \fB\-o\fP. + Defaults to \fB2.5\fP seconds. + .RE ++.PP ++no-comment (boolean) ++.RS 4 ++Omit # PCP5 comment line. Omits header for some metric ++data such as type, instance domain, and semantics. ++Corresponding command line option is \fB\-x\fP. ++Defaults to \fBno\fP. + .SH OPTIONS + The available command line options are: + .TP 5 +@@ -343,9 +350,6 @@ on + .IR host , + rather than from the default localhost. + .TP +-\fB\-H\fR, \fB\-\-no\-header\fR +-Do not print any headers. +-.TP + \fB\-i\fR \fIinstances\fR, \fB\-\-instances\fR=\fIinstances\fR + Retrieve and report only the specified metric + .IR instances . +@@ -605,8 +609,8 @@ and + \fB\-V\fR, \fB\-\-version\fR + Display version number and exit. + .TP +-\fB\-x\fR, \fB\-\-with\-extended\fR +-Write extended information. ++\fB\-x\fR, \fB\-no\-comment\fR ++Omit # PCP5 comment line + .TP + \fB\-X\fR, \fB\-\-with\-everything\fR + Write everything known about metrics, including PCP internal IDs. +diff --git a/src/pcp2openmetrics/pcp2openmetrics.py b/src/pcp2openmetrics/pcp2openmetrics.py +index 51b3326d7..d5a3346fe 100755 +--- a/src/pcp2openmetrics/pcp2openmetrics.py ++++ b/src/pcp2openmetrics/pcp2openmetrics.py +@@ -50,24 +50,24 @@ class PCP2OPENMETRICS(object): + self.opts = self.options() + + # Configuration directives +- self.keys = ('source', 'output', 'derived', 'header', 'globals', +- 'samples', 'interval', 'type', 'precision', 'daemonize', ++ self.keys = ('source', 'output', 'derived', 'globals', ++ 'samples', 'interval', 'precision', 'daemonize', + 'timefmt', 'everything', + 'count_scale', 'space_scale', 'time_scale', 'version', + 'count_scale_force', 'space_scale_force', 'time_scale_force', +- 'type_prefer', 'precision_force', 'limit_filter', 'limit_filter_force', ++ 'precision_force', 'limit_filter', 'limit_filter_force', + 'live_filter', 'rank', 'invert_filter', 'predicate', 'names_change', + 'speclocal', 'instances', 'ignore_incompat', 'ignore_unknown', + 'omit_flat', 'include_labels', 'url', 'http_user', 'http_pass', +- 'http_timeout') ++ 'http_timeout', 'no_comment') + + # Ignored for pmrep(1) compatibility + self.keys_ignore = ( +- 'timestamp', 'unitinfo', 'colxrow', 'separate_header', 'fixed_header', ++ 'timestamp','header', 'unitinfo', 'colxrow', 'separate_header', 'fixed_header', + 'delay', 'width', 'delimiter', 'extcsv', 'width_force', + 'extheader', 'repeat_header', 'interpol', + 'dynamic_header', 'overall_rank', 'overall_rank_alt', 'sort_metric', +- 'instinfo', 'include_texts') ++ 'instinfo', 'include_texts', 'type', 'type_prefer') + + # The order of preference for options (as present): + # 1 - command line options +@@ -79,13 +79,12 @@ class PCP2OPENMETRICS(object): + self.output = None # For pmrep conf file compat only + self.speclocal = None + self.derived = None +- self.header = 1 + self.globals = 1 + self.samples = None # forever + self.interval = pmapi.timeval(10) # 10 sec + self.opts.pmSetOptionInterval(str(10)) # 10 sec + self.delay = 0 +- self.type = 0 ++ self.type = 1 + self.type_prefer = self.type + self.ignore_incompat = 0 + self.ignore_unknown = 0 +@@ -118,6 +117,8 @@ class PCP2OPENMETRICS(object): + self.http_user = None + self.http_pass = None + self.http_timeout = TIMEOUT ++ self.no_comment = False ++ self.header_flag = True + + # Internal + self.runtime = -1 +@@ -146,7 +147,7 @@ class PCP2OPENMETRICS(object): + opts = pmapi.pmOptions() + opts.pmSetOptionCallback(self.option) + opts.pmSetOverrideCallback(self.option_override) +- opts.pmSetShortOptions("a:h:LK:c:Ce:D:V?HGA:S:T:O:s:t:rRIi:jJ:4:58:9:nN:vmP:0:q:b:y:Q:B:Y:F:f:Z:zXo:p:U:u:") ++ opts.pmSetShortOptions("a:h:LK:c:Ce:D:V?GA:S:T:O:s:t:Ii:jJ:4:58:9:nN:vmP:0:q:b:y:Q:B:Y:F:f:Z:zXo:p:U:u:x") + opts.pmSetShortUsage("[option...] metricspec [...]") + + opts.pmSetLongOptionHeader("General options") +@@ -166,7 +167,6 @@ class PCP2OPENMETRICS(object): + opts.pmSetLongOptionHelp() # -?/--help + + opts.pmSetLongOptionHeader("Reporting options") +- opts.pmSetLongOption("no-header", 0, "H", "", "omit headers") + opts.pmSetLongOption("no-globals", 0, "G", "", "omit global metrics") + opts.pmSetLongOptionAlign() # -A/--align + opts.pmSetLongOptionStart() # -S/--start +@@ -176,8 +176,6 @@ class PCP2OPENMETRICS(object): + opts.pmSetLongOptionInterval() # -t/--interval + opts.pmSetLongOptionTimeZone() # -Z/--timezone + opts.pmSetLongOptionHostZone() # -z/--hostzone +- opts.pmSetLongOption("raw", 0, "r", "", "output raw counter values (no rate conversion)") +- opts.pmSetLongOption("raw-prefer", 0, "R", "", "prefer output raw counter values (no rate conversion)") + opts.pmSetLongOption("ignore-incompat", 0, "I", "", "ignore incompatible instances (default: abort)") + opts.pmSetLongOption("ignore-unknown", 0, "5", "", "ignore unknown metrics (default: abort)") + opts.pmSetLongOption("names-change", 1, "4", "ACTION", "update/ignore/abort on PMNS change (default: ignore)") +@@ -201,6 +199,7 @@ class PCP2OPENMETRICS(object): + opts.pmSetLongOption("time-scale-force", 1, "Y", "SCALE", "forced time unit") + + opts.pmSetLongOption("with-everything", 0, "X", "", "write everything, incl. internal IDs") ++ opts.pmSetLongOption("no-comment", 0, "x", "", "omit comment lines") + + opts.pmSetLongOption("url", 1, "u", "URL", "URL of endpoint to receive HTTP POST") + opts.pmSetLongOption("http-timeout", 1, "o", "SECONDS", "timeout when sending HTTP POST") +@@ -238,14 +237,8 @@ class PCP2OPENMETRICS(object): + self.derived = ";" + optarg + else: + self.derived = self.derived + ";" + optarg +- elif opt == 'H': +- self.header = 0 + elif opt == 'G': + self.globals = 0 +- elif opt == 'r': +- self.type = 1 +- elif opt == 'R': +- self.type_prefer = 1 + elif opt == 'I': + self.ignore_incompat = 1 + elif opt == '5': +@@ -298,6 +291,8 @@ class PCP2OPENMETRICS(object): + self.time_scale_force = optarg + elif opt == 'X': + self.everything = 1 ++ elif opt == 'x': ++ self.no_comment = True + elif opt == 'u': + self.url = optarg + elif opt == 'o': +@@ -319,6 +314,7 @@ class PCP2OPENMETRICS(object): + + if pmapi.c_api.pmSetContextOptions(self.context.ctx, self.opts.mode, self.opts.delta): + raise pmapi.pmUsageErr() ++ self.context.pmNewZone("UTC") + + def validate_config(self): + """ Validate configuration options """ +@@ -346,11 +342,6 @@ class PCP2OPENMETRICS(object): + # Common preparations + self.context.prepare_execute(self.opts, False, self.interpol, self.interval) + +- # Headers +- if self.header == 1: +- self.header = 0 +- self.write_header() +- + # Just checking + if self.check == 1: + return +@@ -394,29 +385,12 @@ class PCP2OPENMETRICS(object): + + self.write_openmetrics(tstamp) + +- def write_header(self): +- """ Write info header """ +- output = self.outfile if self.outfile else "stdout" +- if self.context.type == PM_CONTEXT_ARCHIVE: +- sys.stdout.write('"# Writing %d archived metrics to %s..." }\n{ "//": "(Ctrl-C to stop)" }\n' % (len(self.metrics), output)) +- return +- +- sys.stdout.write('# "Waiting for %d metrics to be written to %s' % (len(self.metrics), output)) +- if self.runtime != -1: +- sys.stdout.write('\n # "%s samples(s) with %.1f sec interval ~ %d sec runtime." }\n' % (self.samples, float(self.interval), self.runtime)) +- elif self.samples: +- duration = (self.samples - 1) * float(self.interval) +- sys.stdout.write('\n # "%s samples(s) with %.1f sec interval ~ %d sec runtime." }\n' % (self.samples, float(self.interval), duration)) +- else: +- sys.stdout.write('...\n# "(Ctrl-C to stop)" }\n') +- + def write_openmetrics(self, timestamp): + """ Write results in openmetrics format """ + if timestamp is None: + # Silent goodbye, close in finalize() + return + +- self.context.pmNewZone("UTC") + ts = self.context.datetime_to_secs(self.pmfg_ts(), PM_TIME_SEC) + + if self.prev_ts is None: +@@ -500,11 +474,12 @@ class PCP2OPENMETRICS(object): + help_dict = {} + help_dict[metric] = context.pmLookupText(pmid[0]) + +- if self.context.type == PM_CONTEXT_ARCHIVE: +- body += "\nMetric %s details (last fetch: %d)\n:" % (metric, ts) +- body += '# PCP5 %s %s %s %s %s %s\n' % (openmetrics_name(metric), pmIDStr, get_type_string(desc), pmIndomStr, semantics, units) +- body += '# HELP %s %s\n' % (openmetrics_name(metric), help_dict[metric]) +- body += '# TYPE %s %s\n' % (openmetrics_name(metric), openmetrics_type(desc)) ++ if self.header_flag is True: ++ 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 + + for inst, name, value in results[metric]: + if isinstance(value, float): +@@ -515,10 +490,16 @@ class PCP2OPENMETRICS(object): + value = format(value, fmt) + else: + str(value) ++ ++ if openmetrics_type(desc) == "counter": ++ openmetrics_name_end = openmetrics_name(metric) + "_total" ++ else: ++ openmetrics_name_end = openmetrics_name(metric) ++ + if self.context.type == PM_CONTEXT_ARCHIVE: +- body += '%s%s %s %s\n' % (openmetrics_name(metric), openmetrics_labels(inst, name, desc, labels), value, ts) ++ body += '%s%s %s %s\n' % (openmetrics_name_end, openmetrics_labels(inst, name, desc, labels), value, ts) + else: +- body += '%s%s %s\n' % (openmetrics_name(metric), openmetrics_labels(inst, name, desc, labels), value) ++ body += '%s%s %s\n' % (openmetrics_name_end, openmetrics_labels(inst, name, desc, labels), value) + + if self.url: + auth = None +@@ -537,13 +518,13 @@ class PCP2OPENMETRICS(object): + elif self.outfile: + self.writer.write(body) + else: +- print(body) ++ sys.stdout.write(body) + + def finalize(self): + """ Finalize and clean up """ + if self.writer: + try: +- self.writer.write("\n") ++ self.writer.write("# EOF\n") + self.writer.flush() + except IOError as write_error: + if write_error.errno != errno.EPIPE: diff --git a/SOURCES/redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch b/SOURCES/redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch new file mode 100644 index 0000000..3b610f8 --- /dev/null +++ b/SOURCES/redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch @@ -0,0 +1,12 @@ +diff -Naurp pcp-6.2.2.orig/tmpfiles.init.setup.in pcp-6.2.2/tmpfiles.init.setup.in +--- pcp-6.2.2.orig/tmpfiles.init.setup.in 2024-05-07 10:37:04.000000000 +1000 ++++ pcp-6.2.2/tmpfiles.init.setup.in 2024-05-16 09:18:49.200282601 +1000 +@@ -3,7 +3,7 @@ + # Type Path Mode User Group Age Argument + D PCP_RUN_DIR 0775 PCP_USER PCP_GROUP - - + d PCP_LOG_DIR 0775 PCP_USER PCP_GROUP - - +-d PCP_LOG_DIR/pmcd 0775 root root - - ++d PCP_LOG_DIR/pmcd 0755 root root - - + d PCP_LOG_DIR/pmfind 0775 PCP_USER PCP_GROUP - - + d PCP_LOG_DIR/pmie 0775 PCP_USER PCP_GROUP - - + d PCP_LOG_DIR/pmlogger 0775 PCP_USER PCP_GROUP - - diff --git a/SOURCES/revert-time64_t-i386.patch b/SOURCES/revert-time64_t-i386.patch new file mode 100644 index 0000000..e5dc160 --- /dev/null +++ b/SOURCES/revert-time64_t-i386.patch @@ -0,0 +1,186 @@ +diff -Naurp pcp-6.2.2.orig/configure pcp-6.2.2/configure +--- pcp-6.2.2.orig/configure 2024-05-08 09:18:25.000000000 +1000 ++++ pcp-6.2.2/configure 2024-06-10 13:07:44.487533040 +1000 +@@ -4885,12 +4885,12 @@ then : + PCFLAGS="$PCFLAGS -Wno-array-bounds" + fi + fi +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking sizeof time_t" >&5 +-printf %s "checking sizeof time_t... " >&6; } ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking sizeof off_t" >&5 ++printf %s "checking sizeof off_t... " >&6; } + cat <conftest.c + #include +-#include +-int main() { printf("%d", (int)sizeof(time_t)); return 0; } ++#include ++int main() { printf("%d", (int)sizeof(off_t)); return 0; } + End-of-File + (eval $ac_compile) 2>&5 + (eval $ac_link) 2>&5 +@@ -4900,25 +4900,7 @@ rm -rf conftest conftest.* + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 + printf "%s\n" "$ans" >&6; } + if test "$ans" = 4; then +- PCFLAGS="$PCFLAGS -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64" +-else +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking sizeof off_t" >&5 +-printf %s "checking sizeof off_t... " >&6; } +- cat <conftest.c +-#include +-#include +-int main() { printf("%d", (int)sizeof(off_t)); return 0; } +-End-of-File +- (eval $ac_compile) 2>&5 +- (eval $ac_link) 2>&5 +- ans=`./conftest` +- echo "./conftest -> \"$ans\"" >&5 +- rm -rf conftest conftest.* +- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 +-printf "%s\n" "$ans" >&6; } +- if test "$ans" = 4; then +- PCFLAGS="$PCFLAGS -D_FILE_OFFSET_BITS=64" +- fi ++ PCFLAGS="$PCFLAGS -D_FILE_OFFSET_BITS=64" + fi + + +diff -Naurp pcp-6.2.2.orig/configure.ac pcp-6.2.2/configure.ac +--- pcp-6.2.2.orig/configure.ac 2024-05-08 09:18:25.000000000 +1000 ++++ pcp-6.2.2/configure.ac 2024-06-10 13:07:42.552530243 +1000 +@@ -438,13 +438,12 @@ if ! echo "$CFLAGS" | grep -- -Wno-array + then + AS_IF([test "x$cc_is_gcc" = xyes ],[PCFLAGS="$PCFLAGS -Wno-array-bounds"]) + fi +-dnl we also need to worry about time_t ... we need it to be 64-bits for Y2038; +-dnl _FILE_OFFSET_BITS and _TIME_BITS must be set together for the 32-bit case. +-AC_MSG_CHECKING([sizeof time_t]) ++dnl and we need to worry about off_t ... we need it to be 64-bits for V3 archives ++AC_MSG_CHECKING([sizeof off_t]) + cat <conftest.c + #include +-#include +-int main() { printf("%d", (int)sizeof(time_t)); return 0; } ++#include ++int main() { printf("%d", (int)sizeof(off_t)); return 0; } + End-of-File + (eval $ac_compile) 2>&5 + (eval $ac_link) 2>&5 +@@ -453,25 +452,7 @@ echo "./conftest -> \"$ans\"" >&5 + rm -rf conftest conftest.* + AC_MSG_RESULT($ans) + if test "$ans" = 4; then +- PCFLAGS="$PCFLAGS -D_FILE_OFFSET_BITS=64 -D_TIME_BITS=64" +-else +- dnl we may need to check off_t ... we need it to be 64-bits for V3 archives +- dnl this check is optional only because it may be set already (just prior). +- AC_MSG_CHECKING([sizeof off_t]) +- cat <conftest.c +-#include +-#include +-int main() { printf("%d", (int)sizeof(off_t)); return 0; } +-End-of-File +- (eval $ac_compile) 2>&5 +- (eval $ac_link) 2>&5 +- ans=`./conftest` +- echo "./conftest -> \"$ans\"" >&5 +- rm -rf conftest conftest.* +- AC_MSG_RESULT($ans) +- if test "$ans" = 4; then +- PCFLAGS="$PCFLAGS -D_FILE_OFFSET_BITS=64" +- fi ++ PCFLAGS="$PCFLAGS -D_FILE_OFFSET_BITS=64" + fi + AC_SUBST(PCFLAGS) + AC_SUBST(PLDFLAGS) +diff -Naurp pcp-6.2.2.orig/src/perl/LogImport/Makefile.PL pcp-6.2.2/src/perl/LogImport/Makefile.PL +--- pcp-6.2.2.orig/src/perl/LogImport/Makefile.PL 2024-05-08 09:18:25.000000000 +1000 ++++ pcp-6.2.2/src/perl/LogImport/Makefile.PL 2024-06-10 13:07:42.553530244 +1000 +@@ -37,7 +37,7 @@ WriteMakefile( + OPTIMIZE => '-g', + XSPROTOARG => '-noprototypes', + OBJECT => 'LogImport.o', +- DEFINE => '-DPERLIO_NOT_STDIO=0 -DPCP_VERSION -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64', ++ DEFINE => '-DPERLIO_NOT_STDIO=0 -DPCP_VERSION', + LDFROM => $ldfrom, + LDDLFLAGS => $lddlflags, + CCCDLFLAGS => $cccdlflags, +diff -Naurp pcp-6.2.2.orig/src/perl/MMV/Makefile.PL pcp-6.2.2/src/perl/MMV/Makefile.PL +--- pcp-6.2.2.orig/src/perl/MMV/Makefile.PL 2024-05-08 09:18:25.000000000 +1000 ++++ pcp-6.2.2/src/perl/MMV/Makefile.PL 2024-06-10 13:07:42.553530244 +1000 +@@ -37,7 +37,7 @@ WriteMakefile( + OPTIMIZE => '-g', + XSPROTOARG => '-noprototypes', + OBJECT => 'MMV.o', +- DEFINE => '-DPERLIO_NOT_STDIO=0 -DPCP_VERSION -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64', ++ DEFINE => '-DPERLIO_NOT_STDIO=0 -DPCP_VERSION', + LDFROM => $ldfrom, + LDDLFLAGS => $lddlflags, + CCCDLFLAGS => $cccdlflags, +diff -Naurp pcp-6.2.2.orig/src/perl/PMDA/Makefile.PL pcp-6.2.2/src/perl/PMDA/Makefile.PL +--- pcp-6.2.2.orig/src/perl/PMDA/Makefile.PL 2024-05-08 09:18:25.000000000 +1000 ++++ pcp-6.2.2/src/perl/PMDA/Makefile.PL 2024-06-10 13:07:42.553530244 +1000 +@@ -54,7 +54,7 @@ WriteMakefile( + OPTIMIZE => '-g', + XSPROTOARG => '-noprototypes', + OBJECT => 'local.o PMDA.o', +- DEFINE => '-DPERLIO_NOT_STDIO=0 -DPCP_VERSION -D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64', ++ DEFINE => '-DPERLIO_NOT_STDIO=0 -DPCP_VERSION', + LDFROM => $ldfrom, + LDDLFLAGS => $lddlflags, + CCCDLFLAGS => $cccdlflags, +diff -Naurp pcp-6.2.2.orig/src/python/pmapi.c pcp-6.2.2/src/python/pmapi.c +--- pcp-6.2.2.orig/src/python/pmapi.c 2024-05-08 09:18:25.000000000 +1000 ++++ pcp-6.2.2/src/python/pmapi.c 2024-06-10 13:07:42.554530246 +1000 +@@ -24,8 +24,6 @@ + ** ** + \**************************************************************************/ + #define PY_SSIZE_T_CLEAN +-#define _FILE_OFFSET_BITS 64 +-#define _TIME_BITS 64 + #include + #define PMAPI_VERSION 3 + #include +diff -Naurp pcp-6.2.2.orig/src/python/pmda.c pcp-6.2.2/src/python/pmda.c +--- pcp-6.2.2.orig/src/python/pmda.c 2024-05-08 09:18:25.000000000 +1000 ++++ pcp-6.2.2/src/python/pmda.c 2024-06-10 13:07:42.554530246 +1000 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2013-2015,2017-2021,2024 Red Hat. ++ * Copyright (C) 2013-2015,2017-2021 Red Hat. + * + * This file is part of the "pcp" module, the python interfaces for the + * Performance Co-Pilot toolkit. +@@ -21,8 +21,6 @@ + * python PMDAs via the pmda.py module, using ctypes. + */ + #define PY_SSIZE_T_CLEAN +-#define _FILE_OFFSET_BITS 64 +-#define _TIME_BITS 64 + #include + #include + #include +diff -Naurp pcp-6.2.2.orig/src/python/pmgui.c pcp-6.2.2/src/python/pmgui.c +--- pcp-6.2.2.orig/src/python/pmgui.c 2024-05-08 09:18:25.000000000 +1000 ++++ pcp-6.2.2/src/python/pmgui.c 2024-06-10 13:07:42.554530246 +1000 +@@ -23,8 +23,6 @@ + ** ** + \**************************************************************************/ + #define PY_SSIZE_T_CLEAN +-#define _FILE_OFFSET_BITS 64 +-#define _TIME_BITS 64 + #include + #include + #include +diff -Naurp pcp-6.2.2.orig/src/python/pmi.c pcp-6.2.2/src/python/pmi.c +--- pcp-6.2.2.orig/src/python/pmi.c 2024-05-08 09:18:25.000000000 +1000 ++++ pcp-6.2.2/src/python/pmi.c 2024-06-10 13:07:42.554530246 +1000 +@@ -23,8 +23,6 @@ + ** ** + \**************************************************************************/ + #define PY_SSIZE_T_CLEAN +-#define _FILE_OFFSET_BITS 64 +-#define _TIME_BITS 64 + #include + #include + #include diff --git a/SPECS/pcp.spec b/SPECS/pcp.spec index 4f068c1..0b14d44 100644 --- a/SPECS/pcp.spec +++ b/SPECS/pcp.spec @@ -1,13 +1,19 @@ Name: pcp -Version: 6.2.0 -Release: 1%{?dist} +Version: 6.2.2 +Release: 6%{?dist} Summary: System-level performance monitoring and performance management License: GPL-2.0-or-later AND LGPL-2.1-or-later AND CC-BY-3.0 URL: https://pcp.io Source0: https://github.com/performancecopilot/pcp/releases/pcp-%{version}.src.tar.gz +# Keep xx-default-archive-version.patch for the life of RHEL9 Patch1: redhat-issues-RHEL-2317-default-archive-version.patch +Patch2: redhat-issues-RHEL-30198-pmcd-logdir-tmpfiles.patch +Patch3: revert-time64_t-i386.patch +Patch4: redhat-issues-39159-39132-32983-39293.patch +Patch5: redhat-issues-RHEL-40718-java-bytecode-update.patch +Patch6: redhat-issues-RHEL-50693-hacluster-metrics-update.patch %if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 ExcludeArch: %{ix86} @@ -23,11 +29,13 @@ ExcludeArch: %{ix86} %global __python2 python %endif -# UsrMerge was completed in EL 7, however the latest 'hostname' package in EL 7 contains "Provides: /bin/hostname" +# UsrMerge was completed in EL 7, however the latest 'hostname' package in EL 7 contains "Provides: /bin/hostname". Likewise for /bin/ps from procps[-ng] packages. %if 0%{?rhel} >= 8 || 0%{?fedora} >= 17 %global _hostname_executable /usr/bin/hostname +%global _ps_executable /usr/bin/ps %else %global _hostname_executable /bin/hostname +%global _ps_executable /bin/ps %endif %global disable_perl 0 @@ -106,7 +114,7 @@ ExcludeArch: %{ix86} # support for pmdabpf, check bcc.spec for supported architectures of libbpf-tools %if 0%{?fedora} >= 37 || 0%{?rhel} > 8 -%ifarch x86_64 %{power64} aarch64 +%ifarch x86_64 %{power64} aarch64 s390x %global disable_bpf 0 %else %global disable_bpf 1 @@ -206,13 +214,9 @@ ExcludeArch: %{ix86} %global disable_noarch 1 %endif -# build pcp2arrow whenever possible (no RHEL or 32 bit x86 Fedora python3-arrow) -%if 0%{?fedora} >= 36 -%ifarch %{ix86} x86_64 -%global disable_arrow 1 -%else +# build pcp2arrow (no python3-arrow on RHEL or 32-bit Fedora) +%if 0%{?fedora} >= 40 %global disable_arrow 0 -%endif %else %global disable_arrow 1 %endif @@ -301,6 +305,7 @@ BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) perl(JSON) BuildRequires: perl(Time::HiRes) perl(Digest::MD5) BuildRequires: perl(XML::LibXML) perl(File::Slurp) BuildRequires: %{_hostname_executable} +BuildRequires: %{_ps_executable} %if !%{disable_systemd} BuildRequires: systemd-devel %endif @@ -317,7 +322,7 @@ BuildRequires: qt5-qtsvg-devel # Utilities used indirectly e.g. by scripts we install Requires: bash xz gawk sed grep coreutils diffutils findutils -Requires: which %{_hostname_executable} +Requires: which %{_hostname_executable} %{_ps_executable} Requires: pcp-libs = %{version}-%{release} %if !%{disable_selinux} @@ -575,9 +580,11 @@ 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 +Requires: pcp-pmda-lmsensors pcp-pmda-netcheck pcp-pmda-rabbitmq pcp-pmda-uwsgi Requires: pcp-pmda-openvswitch %endif %if !%{disable_mongodb} @@ -865,6 +872,24 @@ Requires: %{__python2}-pcp = %{version}-%{release} Performance Co-Pilot (PCP) front-end tools for exporting metric values in JSON format. +# +# pcp-export-pcp2openmetrics +# +%package export-pcp2openmetrics +License: GPL-2.0-or-later +Summary: Performance Co-Pilot tools for exporting PCP metrics in OpenMetrics format +URL: https://pcp.io +Requires: pcp-libs >= %{version}-%{release} +%if !%{disable_python3} +Requires: python3-pcp = %{version}-%{release} +%else +Requires: %{__python2}-pcp = %{version}-%{release} +%endif + +%description export-pcp2openmetrics +Performance Co-Pilot (PCP) front-end tools for exporting metric values +in OpenMetrics (https://openmetrics.io/) format. + # # pcp-export-pcp2spark # @@ -1780,6 +1805,24 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about RabbitMQ message queues. #end pcp-pmda-rabbitmq +# +# pcp-pmda-uwsgi +# +%package pmda-uwsgi +License: GPL-2.0-or-later +Summary: Performance Co-Pilot (PCP) metrics from uWSGI servers +URL: https://pcp.io +Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} +%if !%{disable_python3} +Requires: python3-pcp +%else +Requires: %{__python2}-pcp +%endif +%description pmda-uwsgi +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting metrics from uWSGI servers. +#end pcp-pmda-uwsgi + # # pcp-pmda-lio # @@ -2488,7 +2531,7 @@ sed -i '/.a$/d' pcp-devel-files sed -i '/\/man\//d' pcp-devel-files sed -i '/\/include\//d' pcp-devel-files -%ifarch x86_64 ppc64 ppc64le aarch64 s390x +%ifarch x86_64 ppc64 ppc64le aarch64 s390x riscv64 sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-libs-files sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-devel-files sed -i -e 's/usr\/lib\//usr\/lib64\//' pcp-libs-devel-files @@ -2537,11 +2580,11 @@ basic_manifest() { # Likewise, for the pcp-pmda and pcp-testsuite subpackages. # total_manifest | keep 'tutorials|/html/|pcp-doc|man.*\.[1-9].*' | cull 'out' >pcp-doc-files -total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault.h' >pcp-testsuite-files +total_manifest | keep 'testsuite|pcpqa|etc/systemd/system|libpcp_fault|pcp/fault.h|pmcheck/pmda-sample' >pcp-testsuite-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' \ @@ -2561,6 +2604,7 @@ basic_manifest | keep 'pcp2influxdb' >pcp-export-pcp2influxdb-files 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 'pcp2spark' >pcp-export-pcp2spark-files basic_manifest | keep 'pcp2xml' >pcp-export-pcp2xml-files basic_manifest | keep 'pcp2zabbix' >pcp-export-pcp2zabbix-files @@ -2638,6 +2682,7 @@ basic_manifest | keep '(etc/pcp|pmdas)/summary(/|$)' >pcp-pmda-summary-files basic_manifest | keep '(etc/pcp|pmdas)/systemd(/|$)' >pcp-pmda-systemd-files basic_manifest | keep '(etc/pcp|pmdas)/trace(/|$)' >pcp-pmda-trace-files basic_manifest | keep '(etc/pcp|pmdas)/unbound(/|$)' >pcp-pmda-unbound-files +basic_manifest | keep '(etc/pcp|pmdas)/uwsgi(/|$)' >pcp-pmda-uwsgi-files basic_manifest | keep '(etc/pcp|pmdas)/weblog(/|$)' >pcp-pmda-weblog-files basic_manifest | keep '(etc/pcp|pmdas)/zimbra(/|$)' >pcp-pmda-zimbra-files basic_manifest | keep '(etc/pcp|pmdas)/zswap(/|$)' >pcp-pmda-zswap-files @@ -2663,7 +2708,7 @@ for pmda_package in \ rabbitmq redis resctrl roomtemp rpm rsyslog \ samba sendmail shping slurm smart snmp \ sockets statsd summary systemd \ - unbound \ + unbound uwsgi \ trace \ weblog \ zimbra zswap ; \ @@ -2679,7 +2724,7 @@ done for export_package in \ pcp2arrow pcp2elasticsearch pcp2graphite pcp2influxdb pcp2json \ - pcp2spark pcp2xlsx pcp2xml pcp2zabbix zabbix-agent ; \ + pcp2openmetrics pcp2spark pcp2xlsx pcp2xml pcp2zabbix zabbix-agent ; \ do \ export_packages="$export_packages pcp-export-$export_package"; \ done @@ -2892,6 +2937,9 @@ exit 0 %preun pmda-rabbitmq %{pmda_remove "$1" "rabbitmq"} +%preun pmda-uwsgi +%{pmda_remove "$1" "uwsgi"} + %if !%{disable_snmp} %preun pmda-snmp %{pmda_remove "$1" "snmp"} @@ -3367,10 +3415,14 @@ fi %files pmda-rabbitmq -f pcp-pmda-rabbitmq-files.rpm +%files pmda-uwsgi -f pcp-pmda-uwsgi-files.rpm + %files export-pcp2graphite -f pcp-export-pcp2graphite-files.rpm %files export-pcp2json -f pcp-export-pcp2json-files.rpm +%files export-pcp2openmetrics -f pcp-export-pcp2openmetrics-files.rpm + %files export-pcp2spark -f pcp-export-pcp2spark-files.rpm %files export-pcp2xml -f pcp-export-pcp2xml-files.rpm @@ -3492,6 +3544,41 @@ fi %files zeroconf -f pcp-zeroconf-files.rpm %changelog +* Wed Aug 7 2024 Nathan Scott - 6.2.2-6 +- Update hacluster PMDA for pacemaker 2.1.6 crm_mon (RHEL-50693) + +* Thu Aug 1 2024 Nathan Scott - 6.2.2-5 +- Add rpm dependency on package providing ps(1) tool (RHEL-39491) +- Update Java bytecode in pcp-testasuite package (RHEL-40718) + +* Sun Jul 7 2024 Lauren Chilton - 6.2.2-4 +- Removed excess headers for pcp2openmetrics tool (RHEL-39159) +- Fix pcp2openmetrics '-s' option (RHEL-39132) +- Fix pcp2openmetrics timestamps in archive mode (RHEL-32983) +- Fix pcp2openmetrics output to adhere to prometheus parser (RHEL-39293) + +* Mon Jun 10 2024 Nathan Scott - 6.2.2-3 +- Revert time64_t related changes breaking i386 (RHEL-30198) + +* Thu May 16 2024 Nathan Scott - 6.2.2-2 +- Adjust tmpfiles.d permissions for pmcd logdir (RHEL-30198) + +* Wed May 15 2024 Nathan Scott - 6.2.2-1 +- Rebase to latest stable version of PCP (RHEL-30198) +- Fix pcp2openmetrics on s390x reading from an archive (RHEL-32407) +- Fix pcp2openmetrics -F output file option (RHEL-32674) +- Fix pmlogdump version reporting (RHEL-32381) +- Add timestamps for pcp2openmetrics archive option (RHEL-32369) +- Add new metrics to monitor VMware balloon usage (RHEL-32198) + +* Wed Apr 10 2024 Nathan Scott - 6.2.1-1 +- Rebase to latest stable version of PCP (RHEL-30198) +- Disable pmproxy(1) RESP proxying by default (RHEL-30720) +- Add pmcheck(1) utility to check installation (RHEL-25497) + +* Wed Mar 20 2024 Nathan Scott - 6.2.0-2 +- Fix python sub-package year day range issue (RHEL-25543) + * Mon Feb 12 2024 Nathan Scott - 6.2.0-1 - Rebase to latest stable version of PCP (RHEL-2317)