Merge branches 'resctrl-x86-only', 'redact-geolocate-labels', 'new-me…

…m-metrics' and 'fix-pmproxy-compressed-json'

build/rpm/GNUmakefile

@@ -89,6 +89,7 @@ pcp.spec: pcp.spec.in
 	    -e's|@pmda_activemq@|$(PMDA_ACTIVEMQ)|g' \
 	    -e's|@pmda_bind2@|$(PMDA_BIND2)|g' \
 	    -e's|@pmda_nutcracker@|$(PMDA_NUTCRACKER)|g' \
+	    -e's|@pmda_resctrl@|$(PMDA_RESCTRL)|g' \
 	    -e's|@pcp2xlsx@|$(HAVE_PYTHON_OPENPYXL)|g' \
 	    -e's|@pcp2influxdb@|$(HAVE_PYTHON_INFLUXDB)|g' \
 	    -e's|@pcp2elasticsearch@|$(HAVE_PYTHON_REQUESTS)|g' \

build/rpm/pcp.spec.in

@@ -325,7 +325,7 @@ Requires: pcp-pmda-memcache pcp-pmda-named pcp-pmda-netfilter pcp-pmda-news
 Requires: pcp-pmda-redis pcp-pmda-samba pcp-pmda-slurm pcp-pmda-zimbra
 %endif
 Requires: pcp-pmda-apache pcp-pmda-bash pcp-pmda-cisco pcp-pmda-dm pcp-pmda-gfs2
-Requires: pcp-pmda-logger pcp-pmda-mailq pcp-pmda-mounts pcp-pmda-resctrl
+Requires: pcp-pmda-logger pcp-pmda-mailq pcp-pmda-mounts
 Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping
 Requires: pcp-pmda-lustrecomm pcp-pmda-docker pcp-pmda-smart pcp-pmda-farm
 Requires: pcp-pmda-hacluster pcp-pmda-sockets pcp-pmda-podman
@@ -394,6 +394,9 @@ Requires: pcp-pmda-elasticsearch
 %if "@pmda_postfix@" == "true"
 Requires: pcp-pmda-postfix
 %endif
+%if "@pmda_resctrl@" == "true"
+Requires: pcp-pmda-resctrl
+%endif
 Requires: pcp-system-tools
 %if "@enable_qt@" == "true"
 Requires: pcp-gui
@@ -2043,6 +2046,7 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
 collecting metrics about Nvidia GPUs.
 # end pcp-pmda-nvidia-gpu
 
+%if "@pmda_resctrl@" == "true"
 #
 # pcp-pmda-resctrl
 #
@@ -2055,6 +2059,7 @@ Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
 This package contains the PCP Performance Metric Domain Agent (PMDA) for
 collecting metrics from the Linux kernel resource control functionality.
 #end pcp-pmda-resctrl
+%endif
 
 #
 # pcp-pmda-roomtemp
@@ -2894,8 +2899,10 @@ done
 %preun pmda-nvidia-gpu
 %{pmda_remove "$1" "nvidia"}
 
+%if "@pmda_resctrl@" == "true"
 %preun pmda-resctrl
 %{pmda_remove "$1" "resctrl"}
+%endif
 
 %preun pmda-roomtemp
 %{pmda_remove "$1" "roomtemp"}
@@ -3232,7 +3239,9 @@ fi
 
 %files pmda-nvidia-gpu -f pcp-pmda-nvidia-files.rpm
 
+%if "@pmda_resctrl@" == "true"
 %files pmda-resctrl -f pcp-pmda-resctrl-files.rpm
+%endif
 
 %files pmda-roomtemp -f pcp-pmda-roomtemp-files.rpm
 

build/rpm/redhat.spec

@@ -48,6 +48,13 @@ ExcludeArch: %{ix86}
 %endif
 %endif
 
+# Resource Control kernel feature is on recent Intel/AMD processors only
+%ifarch x86_64
+%global disable_resctrl 0
+%else
+%global disable_resctrl 1
+%endif
+
 # libchan, libhdr_histogram and pmdastatsd
 %if 0%{?fedora} >= 29 || 0%{?rhel} > 7
 %global disable_statsd 0
@@ -531,7 +538,7 @@ Requires: pcp-pmda-memcache pcp-pmda-mysql pcp-pmda-named pcp-pmda-netfilter pcp
 Requires: pcp-pmda-nginx pcp-pmda-nfsclient pcp-pmda-pdns pcp-pmda-postfix pcp-pmda-postgresql pcp-pmda-oracle
 Requires: pcp-pmda-samba pcp-pmda-slurm pcp-pmda-zimbra
 Requires: pcp-pmda-dm pcp-pmda-apache
-Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-mailq pcp-pmda-mounts pcp-pmda-resctrl
+Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-mailq pcp-pmda-mounts
 Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping pcp-pmda-smart pcp-pmda-farm
 Requires: pcp-pmda-hacluster pcp-pmda-lustrecomm pcp-pmda-logger pcp-pmda-denki pcp-pmda-docker pcp-pmda-bind2
 Requires: pcp-pmda-sockets pcp-pmda-podman
@@ -568,6 +575,9 @@ Requires: pcp-pmda-snmp
 %if !%{disable_json}
 Requires: pcp-pmda-json
 %endif
+%if !%{disable_resctrl}
+Requires: pcp-pmda-resctrl
+%endif
 Requires: pcp-pmda-summary pcp-pmda-trace pcp-pmda-weblog
 Requires: pcp-system-tools
 %if !%{disable_qt}
@@ -2047,6 +2057,7 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
 collecting metrics about Nvidia GPUs.
 # end pcp-pmda-nvidia-gpu
 
+%if !%{disable_resctrl}
 #
 # pcp-pmda-resctrl
 #
@@ -2059,6 +2070,7 @@ Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
 This package contains the PCP Performance Metric Domain Agent (PMDA) for
 collecting metrics from the Linux kernel resource control functionality.
 #end pcp-pmda-resctrl
+%endif
 
 #
 # pcp-pmda-roomtemp
@@ -3010,8 +3022,10 @@ exit 0
 %preun pmda-nvidia-gpu
 %{pmda_remove "$1" "nvidia"}
 
+%if !%{disable_resctrl}
 %preun pmda-resctrl
 %{pmda_remove "$1" "resctrl"}
+%endif
 
 %preun pmda-roomtemp
 %{pmda_remove "$1" "roomtemp"}
@@ -3369,7 +3383,9 @@ fi
 
 %files pmda-nvidia-gpu -f pcp-pmda-nvidia-files.rpm
 
+%if !%{disable_resctrl}
 %files pmda-resctrl -f pcp-pmda-resctrl-files.rpm
+%endif
 
 %files pmda-roomtemp -f pcp-pmda-roomtemp-files.rpm
 

configure

@@ -830,6 +830,7 @@ enable_qt
 qt_version
 qt_release
 QMAKE
+PMDA_RESCTRL
 PMDA_LIBVIRT
 PMDA_MSSQL
 PMDA_OPENMETRICS
@@ -3832,8 +3833,7 @@ then
 printf "%s\n" "#define IS_DARWIN 1" >>confdefs.h
 
     target_distro=macosx
-    target_machine=`uname -m`
-    export CFLAGS="-fPIC -no-cpp-precomp -fno-strict-aliasing -arch $target_machine"
+    export CFLAGS="-fPIC -no-cpp-precomp -fno-strict-aliasing -arch $target_cpu"
     pcp_platform_paths='/usr/local/bin:/opt/homebrew/bin'
     pcp_ps_all_flags="-axw -o user,pid,ppid,cpu,stime,tty,time,command"
 elif test $target_os = mingw
@@ -5288,11 +5288,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
 printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_11+y}
+if test ${ac_cv_prog_cxx_cxx11+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_11=no
+  ac_cv_prog_cxx_cxx11=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -5334,11 +5334,11 @@ if test x$ac_prog_cxx_stdcxx = xno
 then :
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
 printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_98+y}
+if test ${ac_cv_prog_cxx_cxx98+y}
 then :
   printf %s "(cached) " >&6
 else $as_nop
-  ac_cv_prog_cxx_98=no
+  ac_cv_prog_cxx_cxx98=no
 ac_save_CXX=$CXX
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9555,6 +9555,19 @@ if $pmda_libvirt; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes
 printf "%s\n" "yes" >&6; }; else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
 printf "%s\n" "no" >&6; }; fi
 
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the resctrl PMDA should be included" >&5
+printf %s "checking if the resctrl PMDA should be included... " >&6; }
+pmda_resctrl=false
+if test "$target_cpu" = "x86_64" -o "$target_cpu" = "amd64"
+then
+    pmda_resctrl=true
+fi
+PMDA_RESCTRL=$pmda_resctrl
+
+if $pmda_resctrl; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }; else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }; fi
+
 qmake=$QMAKE
 enable_qt=false
 qt_release=release

configure.ac

@@ -1,5 +1,5 @@
 dnl
-dnl Copyright (c) 2012-2022 Red Hat.
+dnl Copyright (c) 2012-2023 Red Hat.
 dnl Copyright (c) 2008 Aconex.  All Rights Reserved.
 dnl Copyright (c) 2000-2004,2008 Silicon Graphics, Inc.  All Rights Reserved.
 dnl
@@ -267,8 +267,7 @@ elif test $target_os = darwin
 then
     AC_DEFINE(IS_DARWIN, [1], [Platform is Darwin (Mac OS X)])
     target_distro=macosx
-    target_machine=`uname -m`
-    export CFLAGS="-fPIC -no-cpp-precomp -fno-strict-aliasing -arch $target_machine"
+    export CFLAGS="-fPIC -no-cpp-precomp -fno-strict-aliasing -arch $target_cpu"
     pcp_platform_paths='/usr/local/bin:/opt/homebrew/bin'
     pcp_ps_all_flags="-axw -o user,pid,ppid,cpu,stime,tty,time,command"
 elif test $target_os = mingw
@@ -1482,6 +1481,15 @@ fi
 AC_SUBST(PMDA_LIBVIRT, $pmda_libvirt)
 if $pmda_libvirt; then AC_MSG_RESULT(yes); else AC_MSG_RESULT(no); fi
 
+AC_MSG_CHECKING([if the resctrl PMDA should be included])
+pmda_resctrl=false
+if test "$target_cpu" = "x86_64" -o "$target_cpu" = "amd64"
+then
+    pmda_resctrl=true
+fi
+AC_SUBST(PMDA_RESCTRL, $pmda_resctrl)
+if $pmda_resctrl; then AC_MSG_RESULT(yes); else AC_MSG_RESULT(no); fi
+
 qmake=$QMAKE
 enable_qt=false
 qt_release=release

qa/1689.out

@@ -165,6 +165,30 @@ pmproxy.discover.throttled_changed_callbacks PMID: 4.5.18 [filesystem changed ca
 Help:
 Number of filesystem change callbacks that were ignored due to throttling
 
+pmproxy.http.compressed.bytes PMID: 4.3.4 [Count of compressed bytes sent]
+    Data Type: 64-bit unsigned int  InDom: PM_INDOM_NULL 0xffffffff
+    Semantics: counter  Units: byte
+Help:
+Total number of compressed bytes sent
+
+pmproxy.http.compressed.count PMID: 4.3.1 [Count of compressed transfers]
+    Data Type: 64-bit unsigned int  InDom: PM_INDOM_NULL 0xffffffff
+    Semantics: counter  Units: count
+Help:
+Number of compressed HTTP transfers
+
+pmproxy.http.uncompressed.bytes PMID: 4.3.3 [Count of uncompressed bytes sent]
+    Data Type: 64-bit unsigned int  InDom: PM_INDOM_NULL 0xffffffff
+    Semantics: counter  Units: byte
+Help:
+Total number of uncompressed bytes sent
+
+pmproxy.http.uncompressed.count PMID: 4.3.2 [Count of uncompresed transfers]
+    Data Type: 64-bit unsigned int  InDom: PM_INDOM_NULL 0xffffffff
+    Semantics: counter  Units: count
+Help:
+Number of uncompressed HTTP transfers
+
 pmproxy.map.context.size PMID: 4.1.6 [context map dictionary size]
     Data Type: 32-bit unsigned int  InDom: PM_INDOM_NULL 0xffffffff
     Semantics: instant  Units: none