diff --git a/redhat-bugzilla-2219731-hacluster-metrics.patch b/redhat-bugzilla-2219731-hacluster-metrics.patch
index 28ca844..51629f0 100644
--- a/redhat-bugzilla-2219731-hacluster-metrics.patch
+++ b/redhat-bugzilla-2219731-hacluster-metrics.patch
@@ -1,6 +1,6 @@
 diff -Naurp pcp-5.3.7.orig/qa/1897.out pcp-5.3.7/qa/1897.out
---- pcp-5.3.7.orig/qa/1897.out	2021-09-30 12:56:49.000000000 +1000
-+++ pcp-5.3.7/qa/1897.out	2023-07-05 14:08:48.576224340 +1000
+--- pcp-5.3.7.orig/qa/1897.out	2023-07-10 16:51:15.049365731 +1000
++++ pcp-5.3.7/qa/1897.out	2023-07-10 16:52:18.069511419 +1000
 @@ -376,12 +376,12 @@ is given as label metadata values for th
      inst [2 or "node-2:test_clone_state"] value 1
      inst [3 or "node-2:test_site"] value 1
@@ -651,8 +651,8 @@ diff -Naurp pcp-5.3.7.orig/qa/1897.out pcp-5.3.7/qa/1897.out
  LEAK SUMMARY:
  definitely lost: 0 bytes in 0 blocks
 diff -Naurp pcp-5.3.7.orig/qa/hacluster/GNUmakefile pcp-5.3.7/qa/hacluster/GNUmakefile
---- pcp-5.3.7.orig/qa/hacluster/GNUmakefile	2021-02-17 15:27:41.000000000 +1100
-+++ pcp-5.3.7/qa/hacluster/GNUmakefile	2023-07-05 14:08:41.096213777 +1000
+--- pcp-5.3.7.orig/qa/hacluster/GNUmakefile	2023-07-10 16:51:15.069365777 +1000
++++ pcp-5.3.7/qa/hacluster/GNUmakefile	2023-07-10 16:52:18.069511419 +1000
 @@ -8,7 +8,7 @@ default setup default_pcp:
  
  install install_pcp: $(ROOTFILES)
@@ -662,9 +662,29 @@ diff -Naurp pcp-5.3.7.orig/qa/hacluster/GNUmakefile pcp-5.3.7/qa/hacluster/GNUma
  	$(INSTALL) -m 644 -f GNUmakefile.install $(TESTDIR)/GNUmakefile
  
  include $(BUILDRULES)
+diff -Naurp pcp-5.3.7.orig/qa/hacluster/hacluster-root-002.tgz pcp-5.3.7/qa/hacluster/hacluster-root-002.tgz
+--- pcp-5.3.7.orig/qa/hacluster/hacluster-root-002.tgz	1970-01-01 10:00:00.000000000 +1000
++++ pcp-5.3.7/qa/hacluster/hacluster-root-002.tgz	2023-07-10 16:53:58.649743937 +1000
+@@ -0,0 +1,15 @@
++‹      í[[sÛ6Îkô+°ôC“©©-Ùµ*íŒ»[o›¤½íôI‘ Äš$X´¢™þøý@R”,ÇM×IÓ-ÏdlÎçN¥ß÷zO>0ô'£ýœŒúÍß<‡ÃQà<ìôO¼“'lô¡#(”æ9cO2qËSuÿ¾‡žÿE¡û_r?†Dþ,á=îÿ¨oîß;ñíýØ¾?šó ‰Ò®Z>*wÞÿp8Ôþ?êáþG}ïø	ë?"÷ÂßüþþÑ+TÞ›GiO¤·lÎÕ²Óñ¹f“ÉÅë¯;Xóód
++®‹\Ì”ÐSç¨;8îz»åqp-ÜU¤—S'ã¾HøÈÝ£î©ÃD&}¬ž8,-’Y‘ÑN5uú366+Ÿã3ˆ¸1WÚ]å‘Ö":×Ë‚ý»H™ç±A<Œ†Ìë{G³x\™G‹ó¥ˆOÝTbP?óãH¤`³²æúA¡DŽ#Rj‡-ù­p-d^$Sgß-Š(˜:žóÏc_¦a´(r®#™Ò
++­AvÝ.Ð’õœY–ËLäzM
++b„†dšƒ’Ò9Ï\™åTçp2½Íx”ß¿×5®¸ö—\@‰<Sgg7P`5ä±Nï}°CÞ[‘+ü]¡n®”x½î ;rO»ÐñÌsùQ8žœÃÓáûÑ*•äFi˜ãšóÂ'[ªèÞ÷´äÁ—¹TëÔÿc$‰Ä.!»V¢‡Mêj÷û‘PZ¦°{W¤|‹ ¢rgùßQ*Ku3Gþº"qw½¤-R™7ˆLzûì³´æÞ®9OÈT}–>æÈ³,á¦·õînôölôª“^ý$J¹/TõŒðQªë¥\ù³@„¼ˆõ†«Dh>ãZçÑ¼ÀÝºó"Š·BéVgîñ¶ÝJGþM”
++¥*õî}Tj¸)wo‡—JÎ]¾¡éÝ`2AÖÑ…jè}F+ïR#CÈô}+xÌ—‡­2ÁŸù±çÅ¢Œ´gPjª"mÜúI‘ÌaìL¼Í„¯EP¯Ô’Ù3¢»šöš:pc<õÅî&+›ÛÜ»}Õ·[¦VYiÿ`k­T{™qšÞÓÛC~s5û$¨ŸÆyrW,Îv­’0a½iÀV«û/n¿£|7x‹<tqƒ?ûâÿÓÅMz•÷M¨âýg‡*?»û“`§þ/s­ë‡-eü8}ÀCýŸwìmêÿ£cÔÿÇ£ã~[ÿx þÿNú<f&Á_ž³Á!3î™É\³›TèÎw—¯¾¥'}VYç)‚üé”NQ8Ñxø=ü¢óÔúÛ¸óô)¡Š‚ñ&¼ÆOc"²”Jï{îŸ"{¦&ÞýõÁ=þoËËG
++øÿ f²ñÿõÿ'GÃaëÿðÿŒ ‚	ež˜êµãÞÎ9kÃeÛý»ç_˜þ½Bˆvä6
++DŽS•ÍÍn¥Öî:¯¨SØÂè™5„šfèè¼‰ÒÅÎZ÷ÔÐØæèg¡:küÈcdº(k,Fl^¼Î7Ñb‰v±®¿ÆX»–²ÞdöY!›üë|óÅŽPF¦’]öô×2?‹cÖé¼4…ZFÙïa–½2‘Ó"&QýñC n#_°W¨Ð:MnîþùêkT­ì™‰ÊÏ7‡¼ym|þËÁNüG)ÈGÿ>ÿ½Ñqcþ{LõßÐ¼ÿiãÿ‡‡ç¿Ö"X9Ü	ÚQi=÷˜Z«Y˜Ë¤1f:/4ÅEš"`;Œf½å@˜ºpä·ì–¹b4öNÙçýÁ¸ß·mãDIÂóuÙÌ™Ãô:Û3œøEžSïøH1B™1°m»÷°5Ódû†.vCîY5-¶“è­f5Ú­ñÞ¤!!ÓaÝÉˆ£ñQßN´·ŽøKž.öÙ‚7Ùw§Ýûfã½ÆÄBÍªyÒ[ZP¢!!ë±[ÕKïÛÖwX)3Ù4æH7öïúÊ‘c9Åd;ÑJU°•$hñýjüZivw¼YÏ5YBóAàI}á&dƒKËÌåq\õTó‘!O:•…v<:¦¸ãÀD"èJ¯ÝP¤>,ÓDÌ×fGe{½†ñ5ç£vè¹oØcç@v¾SIDóŽ`¾nðd>Ï _ÅõrC¼z-i ÖêÏEêÇ‚×Ç–‚Çôòe‘»ßûžF-ÈÕæPUÀÀD+#§©7ll tZsÙÖéÊ™Sï]ŠØxÎ_UöÃïÕCc¸m‡‚Ëv—¯{fÆdcè'9gÚÎÿj|ýþ1º{òÿhˆÚ Êÿ'Ç'ÈÿhÿmþÿppÀ®aÍcxbóîàó¹}u1fŽÓ9è°«¯Îgç?^¾¸`
++Þ…z½Ìöø[RBbèRàO&ƒQ[[b‰PŠ/Ð|0ø9mL(Ë¼Ë.ÃÛš6'ïÀÉSÄÁ2®—‡§ó¥Ã8W"ãè’p’xÚ°4“ZˆµP©Ü’aMÄqþ§¥ Ë9±`ó‘ .RÅ›…}?CˆÀ÷g/.^ž}{ñfJH6Db¸ö3¯øZšô|‹¢}b5g4¤ÈÌ4£¤eítÙ•Ðš¤×ˆÄ™cÐQµsMz‹c¹2ÊÄ‹$
++Y¤ÙŠ+dJMuÎm$¯¥1aðZñÜ+f“0ðD©YJ âWR	yu}öæúåëó‹iÉ÷Ž2YÏªFä[B’–·µjR'ã!Âˆe³²ôfÓHí$j±B›‹H,P\
++l°k’>Áá9òˆðÉdò5	¹Fèeeh23H…xlp)ÉB”Kd1ôC ‹4ŒØ]<'}“‰1RJoÄP?¦r…Rd!”N,[r%jNðÌÐ÷9vèí#¥
++a*@våºÀRÂý%½4Æhù8„œ"IŠ²Òas’ÉèAhÒ¯È/Õe^’‚;cáV#ìJ¢,B±>X,QæånãÖñÌ5nô	ä%©KWäI;/E‡8À¸‚’°¤?Ã¨Íh#ŒekÅCs•ÀC8+ÚDuŒµªÖÆŽ‘²²œbŸD"U…j¬e~r33\Ïþ%£F__á
++VÜ:¼¶ÎAj¡1
++éƒQý”Às`ƒHÂÜ‰ï”cµþ¢äßb­ "_,µùb‡QvÀ3½q½"«*@Ü?d¡ZÂ8­¡Sè1ýV„¸%*¬»ìÙµ=wEh®„oýw«L‚ç°žV²­XÖp‹œ,8“ð¤Cøƒß<*ˆM„ÔÖŒõæˆ"¯\ôüâ»³Ÿ­£Náww…ìbr¯úzˆuÑòC­Ë`mã¯µJs&-âøîÃV;û)DÂ± âé§³ëßœ¿þEáé6ÑûÇÈ0õB™™~eø‡æjò«Ê}A:¤ìñÔ¼_”o¿uR·@9ƒ^ÕÇôS7œ2T5"ºH¥q=&¦Pi†hî%õ×_–‘ñÓ0V™hDã…O‘)„šÖˆB<0ÁøVd7§CUi°îJÝ)‡¦Å–µË2´Qt´”ž©çTjÂœ‰Gª±Ž(ÒaŽ®^\]r„r)‹8 Æˆ‘Çù_‹¨ôæ@h”µ@dpPiR¸»ÇùjuW¾a¾¾d#†L]´z7Œ¾å€F–3ƒ%âÈ8H3•<[æp}ùòâõ®§£w›©"ª/m4·UÆ™o»E‹Ä[á4}EÀJ7†f›’”ø57aÞEáqôy@WÆMÂÈrI7Fº#ûá£"µ‰AÛÇ€Y½®µùÊÕ•’\nx%ª¾Dwè–Å	ØÅçy”š2•Q3?Y†ŸeûÍÏ¹ZE’ý&Ã°kÍâ²¶’Û92%£Et[ªÀ¦8D³µb%ÓeÔjš¼&‚ñ04&Pª5ŽnkxÈjº‡U6E„6;Ò&â²“n#^pLÅR›d}†2>ITP˜±•ˆcS…Ô£ÃV© Þpg²×úÊ€
++1Æži››¨ªa‘Ši’BH"X>¯L­´°ÙÙ‹ëË×¯¦MCzÀæJ;ó
++d›j@aây£d))½þþújÚi”šŸZïö°Ýÿù<0çQ'À~ÿ½aýýï>õ#oäµýßÇ€æ¿ŸâÈ¢…G„;óŸG~÷ci¼‡ÿ›ÿÿ1l¿ÿÿ‘ õÿZh¡…Zh¡…Zh¡…Zh¡…Zh¡…Zh¡…ÿ/ø/ƒ¸VH P  
+\ No newline at end of file
 diff -Naurp pcp-5.3.7.orig/src/pmdas/hacluster/help pcp-5.3.7/src/pmdas/hacluster/help
---- pcp-5.3.7.orig/src/pmdas/hacluster/help	2021-07-13 09:34:38.000000000 +1000
-+++ pcp-5.3.7/src/pmdas/hacluster/help	2023-07-05 14:05:16.565924954 +1000
+--- pcp-5.3.7.orig/src/pmdas/hacluster/help	2023-07-10 16:51:15.069365777 +1000
++++ pcp-5.3.7/src/pmdas/hacluster/help	2023-07-10 16:52:18.069511419 +1000
 @@ -103,9 +103,9 @@ of 1 confirms the node status as shutdow
  Whether the expected_up status is reported by the node in the cluster, a
  value of 1 confirms the node status as expected_up.
@@ -679,8 +699,8 @@ diff -Naurp pcp-5.3.7.orig/src/pmdas/hacluster/help pcp-5.3.7/src/pmdas/hacluste
  @ ha_cluster.pacemaker.resources.agent The name of the resource agent for this resource
  The name given for the resource agent for the given resource instance in the 
 diff -Naurp pcp-5.3.7.orig/src/pmdas/hacluster/pacemaker.c pcp-5.3.7/src/pmdas/hacluster/pacemaker.c
---- pcp-5.3.7.orig/src/pmdas/hacluster/pacemaker.c	2021-07-13 09:34:38.000000000 +1000
-+++ pcp-5.3.7/src/pmdas/hacluster/pacemaker.c	2023-07-05 14:08:35.526205912 +1000
+--- pcp-5.3.7.orig/src/pmdas/hacluster/pacemaker.c	2023-07-10 16:51:15.069365777 +1000
++++ pcp-5.3.7/src/pmdas/hacluster/pacemaker.c	2023-07-10 16:52:18.069511419 +1000
 @@ -534,18 +534,33 @@ hacluster_refresh_pacemaker_nodes(const
  
  		/* Collect our node names */