@cryptotaxi247 / netdata-1 / commits / 1dc6ecb36

Fix issues with IBM libs plugin. (#21120)

* Use the correct component name for the IBM plugin libs. The mismatch was preventing the files from being included in the package. * Fix IBM libs file list for RPM packages.

Austin S. Hemmelgarn committed Oct 9, 2025 at 09:06 UTC 1dc6ecb3633c97a0c6d244c19e35f58ddf23cec8
2 files changed +95 -62
netdata.spec.in
+94 -61
@@ -949,6 +949,8 @@ fi
949 %{_libdir}/%{name}/ibm-mqclient/bin/amqcgskv32
950 %{_libdir}/%{name}/ibm-mqclient/bin/amqcgskv64
951 %{_libdir}/%{name}/ibm-mqclient/bin/amqjrever
952 +%{_libdir}/%{name}/ibm-mqclient/bin/amqltmcc
953 +%{_libdir}/%{name}/ibm-mqclient/bin/amqltmcc64
954 %{_libdir}/%{name}/ibm-mqclient/bin/crtmqenv
955 %{_libdir}/%{name}/ibm-mqclient/bin/dmpmqcfg
956 %{_libdir}/%{name}/ibm-mqclient/bin/dmpmqmsg
@@ -970,6 +972,7 @@ fi
972 %{_libdir}/%{name}/ibm-mqclient/bin/runmqicred
973 %{_libdir}/%{name}/ibm-mqclient/bin/runmqras
974 %{_libdir}/%{name}/ibm-mqclient/bin/runmqsc
975 +%{_libdir}/%{name}/ibm-mqclient/bin/runmqtmc
976 %{_libdir}/%{name}/ibm-mqclient/bin/runp11cred
977 %{_libdir}/%{name}/ibm-mqclient/bin/setmqenv
978 %{_libdir}/%{name}/ibm-mqclient/bin/strmqtrc
@@ -980,7 +983,23 @@ fi
983 %{_libdir}/%{name}/ibm-mqclient/gskit8/bin/gsk8ver_64
984 %{_libdir}/%{name}/ibm-mqclient/gskit8/bin/private_verifyinstall
985 %{_libdir}/%{name}/ibm-mqclient/gskit8/bin/private_verifyinstall_64
986 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/C/icc/icclib/libicclib084.so
987 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/N/icc/icclib/libicclib085.so
988 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8acmeidup.so
989 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8cms.so
990 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8dbfl.so
991 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8drld.so
992 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8iccs.so
993 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8kicc.so
994 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8km.so
995 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8km2.so
996 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8ldap.so
997 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8p11.so
998 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8ssl.so
999 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8sys.so
1000 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8valn.so
1001 %{_libdir}/%{name}/ibm-mqclient/gskit8/lib64/C/icc/icclib/libicclib084.so
1002 +%{_libdir}/%{name}/ibm-mqclient/gskit8/lib64/N/icc/icclib/libicclib085.so
1003 %{_libdir}/%{name}/ibm-mqclient/gskit8/lib64/libgsk8acmeidup_64.so
1004 %{_libdir}/%{name}/ibm-mqclient/gskit8/lib64/libgsk8cms_64.so
1005 %{_libdir}/%{name}/ibm-mqclient/gskit8/lib64/libgsk8dbfl_64.so
@@ -994,22 +1013,6 @@ fi
1013 %{_libdir}/%{name}/ibm-mqclient/gskit8/lib64/libgsk8ssl_64.so
1014 %{_libdir}/%{name}/ibm-mqclient/gskit8/lib64/libgsk8sys_64.so
1015 %{_libdir}/%{name}/ibm-mqclient/gskit8/lib64/libgsk8valn_64.so
997 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib64/N/icc/icclib/libicclib085.so
998 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/C/icc/icclib/libicclib084.so
999 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8acmeidup.so
1000 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8cms.so
1001 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8dbfl.so
1002 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8drld.so
1003 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8iccs.so
1004 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8kicc.so
1005 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8km2.so
1006 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8km.so
1007 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8ldap.so
1008 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8p11.so
1009 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8ssl.so
1010 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8sys.so
1011 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/libgsk8valn.so
1012 -%{_libdir}/%{name}/ibm-mqclient/gskit8/lib/N/icc/icclib/libicclib085.so
1016 %{_libdir}/%{name}/ibm-mqclient/gskit8/private_checkinstall
1017 %{_libdir}/%{name}/ibm-mqclient/gskit8/private_postinstall
1018 %defattr(0640,root,netdata,0640)
@@ -1025,7 +1028,6 @@ fi
1028 %{_libdir}/%{name}/ibm-mqclient/gskit8/ReadMe.txt
1029 %{_libdir}/%{name}/ibm-mqclient/java/lib/com.ibm.mq.tools.ras.jar
1030 %{_libdir}/%{name}/ibm-mqclient/lap/LAPApp.jar
1028 -%{_libdir}/%{name}/ibm-mqclient/lap/licenses/icon.gif
1031 %{_libdir}/%{name}/ibm-mqclient/lap/licenses/LA_cs
1032 %{_libdir}/%{name}/ibm-mqclient/lap/licenses/LA_de
1033 %{_libdir}/%{name}/ibm-mqclient/lap/licenses/LA_el
@@ -1064,38 +1066,16 @@ fi
1066 %{_libdir}/%{name}/ibm-mqclient/lap/licenses/LI_tr
1067 %{_libdir}/%{name}/ibm-mqclient/lap/licenses/LI_zh
1068 %{_libdir}/%{name}/ibm-mqclient/lap/licenses/LI_zh_TW
1069 +%{_libdir}/%{name}/ibm-mqclient/lap/licenses/icon.gif
1070 %{_libdir}/%{name}/ibm-mqclient/lap/licenses/logo.gif
1071 %{_libdir}/%{name}/ibm-mqclient/lap/licenses/non_ibm_license
1072 %{_libdir}/%{name}/ibm-mqclient/lap/licenses/notices
1070 -%defattr(0750,root,netdata,0750)
1071 -%{_libdir}/%{name}/ibm-mqclient/lib64/libcurl.so
1072 -%{_libdir}/%{name}/ibm-mqclient/lib64/libedit.so
1073 -%{_libdir}/%{name}/ibm-mqclient/lib64/libimqb23gl_r.so
1074 -%{_libdir}/%{name}/ibm-mqclient/lib64/libimqb23gl_r.so.4.1
1075 -%{_libdir}/%{name}/ibm-mqclient/lib64/libimqb23gl.so
1076 -%{_libdir}/%{name}/ibm-mqclient/lib64/libimqb23gl.so.4.1
1077 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqecs_r.so
1078 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqecs.so
1079 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqe_r.so
1080 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqe.so
1081 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqjx_r.so
1082 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqjxx_r.so
1083 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqmcs_r.so
1084 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqmcs.so
1085 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqm_r.so
1086 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqm.so
1087 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqmzse.so
1088 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqxzu_r.so
1089 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqxzu.so
1090 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqz_r.so
1091 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqzsd_r.so
1092 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqzsd.so
1093 -%{_libdir}/%{name}/ibm-mqclient/lib64/libmqz.so
1094 -%defattr(0640,root,netdata,0640)
1073 +%{_libdir}/%{name}/ibm-mqclient/lib/amqczsc
1074 +%{_libdir}/%{name}/ibm-mqclient/lib/amqczscg
1075 %{_libdir}/%{name}/ibm-mqclient/lib/amqtrc.fmt
1076 %{_libdir}/%{name}/ibm-mqclient/lib/ccdt_schema.json
1097 -%{_libdir}/%{name}/ibm-mqclient/lib/ccsid_part2.tbl
1077 %{_libdir}/%{name}/ibm-mqclient/lib/ccsid.tbl
1078 +%{_libdir}/%{name}/ibm-mqclient/lib/ccsid_part2.tbl
1079 %{_libdir}/%{name}/ibm-mqclient/lib/iconv/002501B5.tbl
1080 %{_libdir}/%{name}/ibm-mqclient/lib/iconv/002501F4.tbl
1081 %{_libdir}/%{name}/ibm-mqclient/lib/iconv/00250333.tbl
@@ -2954,30 +2934,81 @@ fi
2934 %{_libdir}/%{name}/ibm-mqclient/lib/iconv/F20424E4.tbl
2935 %defattr(0750,root,netdata,0750)
2936 %{_libdir}/%{name}/ibm-mqclient/lib/libcurl.so
2957 -%{_libdir}/%{name}/ibm-mqclient/lib/libimqb23gl_r.so
2958 -%{_libdir}/%{name}/ibm-mqclient/lib/libimqb23gl_r.so.4.1
2959 -%{_libdir}/%{name}/ibm-mqclient/lib/libimqb23gl.so
2937 %{_libdir}/%{name}/ibm-mqclient/lib/libimqb23gl.so.4.1
2961 -%{_libdir}/%{name}/ibm-mqclient/lib/libmqecs_r.so
2962 -%{_libdir}/%{name}/ibm-mqclient/lib/libmqecs.so
2963 -%{_libdir}/%{name}/ibm-mqclient/lib/libmqe_r.so
2938 +%{_libdir}/%{name}/ibm-mqclient/lib/libimqb23gl_r.so.4.1
2939 +%{_libdir}/%{name}/ibm-mqclient/lib/libimqc23gl.so.4.1
2940 +%{_libdir}/%{name}/ibm-mqclient/lib/libimqc23gl_r.so.4.1
2941 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqccics_r.a
2942 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqcxa.so
2943 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqcxa_r.so
2944 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqdc.so
2945 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqdc_r.so
2946 %{_libdir}/%{name}/ibm-mqclient/lib/libmqe.so
2947 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqe_r.so
2948 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqecs.so
2949 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqecs_r.so
2950 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqic.so
2951 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqic_r.so
2952 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqicb.so
2953 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqicb_r.so
2954 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqiz.so
2955 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqiz_r.so
2956 %{_libdir}/%{name}/ibm-mqclient/lib/libmqjx_r.so
2957 %{_libdir}/%{name}/ibm-mqclient/lib/libmqjxx_r.so
2967 -%{_libdir}/%{name}/ibm-mqclient/lib/libmqmcs_r.so
2968 -%{_libdir}/%{name}/ibm-mqclient/lib/libmqmcs.so
2969 -%{_libdir}/%{name}/ibm-mqclient/lib/libmqm_r.so
2958 %{_libdir}/%{name}/ibm-mqclient/lib/libmqm.so
2959 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqm_r.so
2960 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqmcs.so
2961 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqmcs_r.so
2962 %{_libdir}/%{name}/ibm-mqclient/lib/libmqmzse.so
2972 -%{_libdir}/%{name}/ibm-mqclient/lib/libmqxzu_r.so
2963 %{_libdir}/%{name}/ibm-mqclient/lib/libmqxzu.so
2964 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqxzu_r.so
2965 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqz.so
2966 %{_libdir}/%{name}/ibm-mqclient/lib/libmqz_r.so
2975 -%{_libdir}/%{name}/ibm-mqclient/lib/libmqzsd_r.so
2967 %{_libdir}/%{name}/ibm-mqclient/lib/libmqzsd.so
2977 -%{_libdir}/%{name}/ibm-mqclient/lib/libmqz.so
2968 +%{_libdir}/%{name}/ibm-mqclient/lib/libmqzsd_r.so
2969 +%{_libdir}/%{name}/ibm-mqclient/lib64/amqczsc
2970 +%{_libdir}/%{name}/ibm-mqclient/lib64/amqczscg
2971 +%{_libdir}/%{name}/ibm-mqclient/lib64/amqmdnetstd.dll
2972 +%{_libdir}/%{name}/ibm-mqclient/lib64/amqmxmsstd.dll
2973 +%{_libdir}/%{name}/ibm-mqclient/lib64/libcurl.so
2974 +%{_libdir}/%{name}/ibm-mqclient/lib64/libedit.so
2975 +%{_libdir}/%{name}/ibm-mqclient/lib64/libimqb23gl.so.4.1
2976 +%{_libdir}/%{name}/ibm-mqclient/lib64/libimqb23gl_r.so.4.1
2977 +%{_libdir}/%{name}/ibm-mqclient/lib64/libimqc23gl.so.4.1
2978 +%{_libdir}/%{name}/ibm-mqclient/lib64/libimqc23gl_r.so.4.1
2979 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqccics_r.a
2980 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqcxa.so
2981 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqcxa64.so
2982 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqcxa64_r.so
2983 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqcxa_r.so
2984 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqdc.so
2985 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqdc_r.so
2986 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqe.so
2987 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqe_r.so
2988 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqecs.so
2989 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqecs_r.so
2990 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqic.so
2991 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqic_r.so
2992 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqicb.so
2993 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqicb_r.so
2994 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqiz.so
2995 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqiz_r.so
2996 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqjx_r.so
2997 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqjxx_r.so
2998 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqm.so
2999 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqm_r.so
3000 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqmcs.so
3001 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqmcs_r.so
3002 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqmzse.so
3003 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqxzu.so
3004 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqxzu_r.so
3005 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqz.so
3006 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqz_r.so
3007 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqzsd.so
3008 +%{_libdir}/%{name}/ibm-mqclient/lib64/libmqzsd_r.so
3009 %defattr(0640,root,netdata,0640)
2979 -%{_libdir}/%{name}/ibm-mqclient/licenses/Chinese_TW.txt
3010 %{_libdir}/%{name}/ibm-mqclient/licenses/Chinese.txt
3011 +%{_libdir}/%{name}/ibm-mqclient/licenses/Chinese_TW.txt
3012 %{_libdir}/%{name}/ibm-mqclient/licenses/Czech.txt
3013 %{_libdir}/%{name}/ibm-mqclient/licenses/English.txt
3014 %{_libdir}/%{name}/ibm-mqclient/licenses/French.txt
@@ -2988,22 +3019,24 @@ fi
3019 %{_libdir}/%{name}/ibm-mqclient/licenses/Japanese.txt
3020 %{_libdir}/%{name}/ibm-mqclient/licenses/Korean.txt
3021 %{_libdir}/%{name}/ibm-mqclient/licenses/Lithuanian.txt
2991 -%{_libdir}/%{name}/ibm-mqclient/licenses/non_ibm_license.txt
2992 -%{_libdir}/%{name}/ibm-mqclient/licenses/notices.txt
3022 %{_libdir}/%{name}/ibm-mqclient/licenses/Polish.txt
3023 %{_libdir}/%{name}/ibm-mqclient/licenses/Portuguese.txt
3024 %{_libdir}/%{name}/ibm-mqclient/licenses/Russian.txt
3025 %{_libdir}/%{name}/ibm-mqclient/licenses/Slovenian.txt
3026 %{_libdir}/%{name}/ibm-mqclient/licenses/Spanish.txt
3027 %{_libdir}/%{name}/ibm-mqclient/licenses/Turkish.txt
2999 -%{_libdir}/%{name}/ibm-mqclient/MANIFEST
3000 -%{_libdir}/%{name}/ibm-mqclient/MANIFEST.Redist
3028 +%{_libdir}/%{name}/ibm-mqclient/licenses/non_ibm_license.txt
3029 +%{_libdir}/%{name}/ibm-mqclient/licenses/notices.txt
3030 %{_libdir}/%{name}/ibm-mqclient/msg/en_US/amq.cat
3002 -%{_libdir}/%{name}/ibm-mqclient/README.Redist
3031 %{_libdir}/%{name}/ibm-mqclient/swidtag/IBM_MQ-9.4.3.mqtag
3032 %{_libdir}/%{name}/ibm-mqclient/swidtag/IBM_MQ_GSKit-8.0.60.mqtag
3033 %{_libdir}/%{name}/ibm-mqclient/swidtag/IBM_MQ_Redistributable_Client-9.4.3.mqtag
3034 %{_libdir}/%{name}/ibm-mqclient/swidtag/IBM_MQ_Runtime-9.4.3.mqtag
3035 +%{_libdir}/%{name}/ibm-mqclient/swidtag/ibm.com_IBM_MQ_Advanced_for_Developers_Non-Warranted-9.4.3.1.swidtag
3036 +%{_libdir}/%{name}/ibm-mqclient/swidtag/ibm.com_IBM_MQ_Client-9.4.3.1.swidtag
3037 +%{_libdir}/%{name}/ibm-mqclient/swidtag/ibm.com_IBM_MQ_Client-9.4.3.swidtag
3038 +%{_libdir}/%{name}/ibm-mqclient/MANIFEST.Redist
3039 +%{_libdir}/%{name}/ibm-mqclient/README.Redist
3040 %endif
3041
3042 %package plugin-apps
packaging/cmake/Modules/NetdataIBMPlugin.cmake
+1 -1
@@ -120,7 +120,7 @@ function(install_ibm_runtime component)
120
121 install(DIRECTORY ${IBM_MQ_BUILD_DIR}
122 DESTINATION usr/lib/netdata
123 - COMPONENT plugin-ibm-mqclient
123 + COMPONENT plugin-ibm-libs
124 USE_SOURCE_PERMISSIONS
125 FILES_MATCHING REGEX "(${_file_group_0})"
126 REGEX "(${_file_group_1})"