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

build/ci/platforms/centos7-container.yml

@@ -11,7 +11,8 @@ container:
     RUN sed -i -e 's/#baseurl=/baseurl=/g' /etc/yum.repos.d/CentOS-Base.repo
     RUN sed -i -e 's,http://mirror.centos.org/centos/$releasever,https://vault.centos.org/7.9.2009,g' /etc/yum.repos.d/CentOS-Base.repo
     RUN yum install -y sudo
-    RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm # libuv-devel
+    RUN yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/l/libuv-1.44.2-1.el7.x86_64.rpm 
+    RUN yum install -y https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/l/libuv-devel-1.44.2-1.el7.x86_64.rpm
     RUN useradd --create-home pcpbuild
     RUN echo 'pcpbuild ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/pcpbuild
     CMD ["/usr/sbin/init"]

qa/1897.out

@@ -132,8 +132,8 @@ ha_cluster.drbd.connections.all PMID: 155.18.0 [DRBD Peer disk information]
     Data Type: 32-bit unsigned int  InDom: 155.16 0x26c00010
     Semantics: instant  Units: count
 Help:
-Value is 1 if a drbd peer connection exists. The details of the corresponding DRBD peer
-connection is given as label metadata values for this metric.
+Value is 1 if a DRBD peer connection exists. Details of the corresponding
+DRBD peer connection are given as label metadata values for this metric.
     inst [0 or "drbd1:1"] value 1
 
 ha_cluster.drbd.connections.peer_disk_state PMID: 155.11.4 [Peer disk state]
@@ -238,8 +238,8 @@ ha_cluster.drbd.resources.all PMID: 155.17.0 [DRBD resource information]
     Data Type: 32-bit unsigned int  InDom: 155.15 0x26c0000f
     Semantics: instant  Units: count
 Help:
-Value is 1 if a drbd resource exists. The details of the corresponding drbd resource
-is given as label metadata values for this metric.
+Value is 1 if a DRBD resource exists. Details of the corresponding DRBD
+resource are given as label metadata values for this metric.
     inst [0 or "drbd1:0"] value 1
 
 ha_cluster.drbd.resources.disk_state PMID: 155.10.3 [Disk state]
@@ -819,8 +819,8 @@ ha_cluster.drbd.connections.all PMID: 155.18.0 [DRBD Peer disk information]
     Data Type: 32-bit unsigned int  InDom: 155.16 0x26c00010
     Semantics: instant  Units: count
 Help:
-Value is 1 if a drbd peer connection exists. The details of the corresponding DRBD peer
-connection is given as label metadata values for this metric.
+Value is 1 if a DRBD peer connection exists. Details of the corresponding
+DRBD peer connection are given as label metadata values for this metric.
 No value(s) available!
 
 ha_cluster.drbd.connections.peer_disk_state PMID: 155.11.4 [Peer disk state]
@@ -925,8 +925,8 @@ ha_cluster.drbd.resources.all PMID: 155.17.0 [DRBD resource information]
     Data Type: 32-bit unsigned int  InDom: 155.15 0x26c0000f
     Semantics: instant  Units: count
 Help:
-Value is 1 if a drbd resource exists. The details of the corresponding drbd resource
-is given as label metadata values for this metric.
+Value is 1 if a DRBD resource exists. Details of the corresponding DRBD
+resource are given as label metadata values for this metric.
 No value(s) available!
 
 ha_cluster.drbd.resources.disk_state PMID: 155.10.3 [Disk state]
@@ -1445,8 +1445,8 @@ ha_cluster.drbd.connections.all PMID: 155.18.0 [DRBD Peer disk information]
     Data Type: 32-bit unsigned int  InDom: 155.16 0x26c00010
     Semantics: instant  Units: count
 Help:
-Value is 1 if a drbd peer connection exists. The details of the corresponding DRBD peer
-connection is given as label metadata values for this metric.
+Value is 1 if a DRBD peer connection exists. Details of the corresponding
+DRBD peer connection are given as label metadata values for this metric.
 No value(s) available!
 
 ha_cluster.drbd.connections.peer_disk_state PMID: 155.11.4 [Peer disk state]
@@ -1551,8 +1551,8 @@ ha_cluster.drbd.resources.all PMID: 155.17.0 [DRBD resource information]
     Data Type: 32-bit unsigned int  InDom: 155.15 0x26c0000f
     Semantics: instant  Units: count
 Help:
-Value is 1 if a drbd resource exists. The details of the corresponding drbd resource
-is given as label metadata values for this metric.
+Value is 1 if a DRBD resource exists. Details of the corresponding DRBD
+resource are given as label metadata values for this metric.
 No value(s) available!
 
 ha_cluster.drbd.resources.disk_state PMID: 155.10.3 [Disk state]

src/pcp/htop/GNUmakefile

@@ -15,14 +15,14 @@
 TOPDIR = ../../..
 include $(TOPDIR)/src/include/builddefs
 
-COPYRIGHT = "(C) 2004-2019 Hisham Muhammad. (C) 2020-2023 htop dev team."
+COPYRIGHT = "(C) 2004-2019 Hisham Muhammad. (C) 2020-2024 htop dev team."
 
 CMDTARGET = pcp-htop
 DISTARGET = $(PCP_BINADM_DIR)/$(CMDTARGET)
 LLDLIBS = $(PCPLIB) $(LIB_FOR_NCURSESW) $(LIB_FOR_MATH) $(LIB_FOR_BACKTRACE)
 NCURSES_CFLAGS = -DHAVE_LIBNCURSESW=$(HAVE_NCURSESW)
 LCFLAGS = $(NCURSES_CFLAGS) $(C99_CFLAGS) -Ipcp -I.
-LCFLAGS += -DNDEBUG -DVERSION=\"$(PCP_VERSION)\"
+LCFLAGS += -DNDEBUG -DVERSION=\"$(PCP_VERSION)\" -DHTOP_PCP=1
 LCFLAGS += -DSYSCONFDIR=\"$(PCP_SYSCONF_DIR)\" -DCONFIGDIR=\"/.pcp\"
 LCFLAGS += -DCOPYRIGHT=\"$(COPYRIGHT)\" -DPACKAGE=\"$(CMDTARGET)\"
 LCFLAGS += -D_XOPEN_SOURCE_EXTENDED -DMAJOR_IN_SYSMACROS=1