Skip to content

Commit 127435e

Browse files
ibmmqmetibmmqmet
committed
Update for MQ V9.1.3
1 parent 08ee693 commit 127435e

File tree

12 files changed

+317
-73
lines changed

12 files changed

+317
-73
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22
Newest updates are at the top of this file.
3+
## July 11 2018 - v4.0.8
4+
* Update for MQ 9.1.3 - No new API function introduced
5+
* mqmetric - Fix leak in subscriptions after rediscovery
6+
* mqmetric - Add USAGE as a queue label for selection by xmitq
37

48
## June 25 2019 - v4.0.7
59
* mqmetric - Allow exclusion patterns for queue names (but not other object types)

‎Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ ENV GOVERSION=1.10 \
2222
ORG="github.com/ibm-messaging" \
2323
REPO="mq-golang"
2424

25-
# Location of the downloadable MQ client package \
26-
ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \
27-
RDTAR="IBM-MQC-Redist-LinuxX64.tar.gz" \
28-
VRMF=9.1.2.0
29-
3025
# Install the Go compiler and Git
3126
RUN export DEBIAN_FRONTEND=noninteractive \
3227
&& bash -c 'source /etc/os-release; \
@@ -54,6 +49,11 @@ RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \
5449
&& mkdir -p /opt/mqm \
5550
&& chmod a+rx /opt/mqm
5651

52+
# Location of the downloadable MQ client package \
53+
ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \
54+
RDTAR="IBM-MQC-Redist-LinuxX64.tar.gz" \
55+
VRMF=9.1.3.0
56+
5757
# Install the MQ client from the Redistributable package. This also contains the
5858
# header files we need to compile against.
5959
RUN cd /opt/mqm \

‎README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This repository demonstrates how you can call IBM MQ from applications written i
66
77
This repository previously contained sample programs that exported MQ statistics to
88
some monitoring packages. These have now been moved to a
9-
new [GitHub repository called mq-metric-samples](https://github.com/ibm-messaging/mq-metric-samples).
9+
[GitHub repository called mq-metric-samples](https://github.com/ibm-messaging/mq-metric-samples).
1010

1111
A minimum level of MQ V8 is required to build these packages. However, note that
1212
the monitoring data published by the queue manager and exploited in the mqmetric package
@@ -57,6 +57,9 @@ but subsequent steps are independent of the platform.
5757

5858
* Install the Go runtime and compiler. On Linux, the packaging may vary but a typical
5959
directory for the code is `/usr/lib/golang`.
60+
The compiler should be at least version 10. If you see an error similar to "ld: NULL not defined"
61+
when building a program then it is likely you need to upgrade your compiler.
62+
6063

6164
* Create a working directory. For example, ```mkdir $HOME/gowork```
6265

@@ -67,7 +70,7 @@ directory for the code is `/usr/lib/golang`.
6770
export GOPATH=$HOME/gowork
6871
```
6972

70-
* If using a version of Go from after 2017, you must set environment variables to permit some compile/link flags. This is due to a security fix in the compiler.
73+
* On Linux, you must set environment variables to permit some compile/link flags. This is due to a security fix in the compiler.
7174

7275
```
7376
export CGO_LDFLAGS_ALLOW="-Wl,-rpath.*"

‎ibmmq/cmqc_darwin.go‎

Lines changed: 57 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ package ibmmq
3030
****************************************************************
3131
*
3232
* <BEGIN_BUILDINFO>
33-
* Generated on: 3/8/19 4:14 PM
34-
* Build Level: p912-L190308
33+
* Generated on: 6/28/19 2:38 PM
34+
* Build Level: p913-L190628
3535
* Build Type: Production
3636
* <END_BUILDINFO>
3737
*/
@@ -41,6 +41,8 @@ var (
4141
MQACH_CURRENT_VERSION int32 = 1
4242
MQACH_LENGTH_1 int32 = 72
4343
MQACH_VERSION_1 int32 = 1
44+
MQACTIVE_NO int32 = 0
45+
MQACTIVE_YES int32 = 1
4446
MQACTP_FORWARD int32 = 1
4547
MQACTP_NEW int32 = 0
4648
MQACTP_REPLY int32 = 2
@@ -83,6 +85,8 @@ var (
8385
MQAIT_IDPW_LDAP int32 = 4
8486
MQAIT_IDPW_OS int32 = 3
8587
MQAIT_OCSP int32 = 2
88+
MQAPPL_IMMOVABLE int32 = 0
89+
MQAPPL_MOVABLE int32 = 1
8690
MQAS_ACTIVE int32 = 6
8791
MQAS_INACTIVE int32 = 7
8892
MQAS_NONE int32 = 0
@@ -186,6 +190,7 @@ var (
186190
MQBACF_ALTERNATE_SECURITYID int32 = 7019
187191
MQBACF_CF_LEID int32 = 7014
188192
MQBACF_CONNECTION_ID int32 = 7006
193+
MQBACF_CONN_TAG int32 = 7038
189194
MQBACF_CORREL_ID int32 = 7011
190195
MQBACF_DESTINATION_CORREL_ID int32 = 7015
191196
MQBACF_EVENT_ACCOUNTING_TOKEN int32 = 7001
@@ -194,7 +199,7 @@ var (
194199
MQBACF_FIRST int32 = 7001
195200
MQBACF_GENERIC_CONNECTION_ID int32 = 7007
196201
MQBACF_GROUP_ID int32 = 7012
197-
MQBACF_LAST_USED int32 = 7037
202+
MQBACF_LAST_USED int32 = 7038
198203
MQBACF_MESSAGE_DATA int32 = 7020
199204
MQBACF_MQBO_STRUCT int32 = 7021
200205
MQBACF_MQCBC_STRUCT int32 = 7023
@@ -219,6 +224,15 @@ var (
219224
MQBACF_XA_XID int32 = 7033
220225
MQBACF_XQH_CORREL_ID int32 = 7034
221226
MQBACF_XQH_MSG_ID int32 = 7035
227+
MQBALANCED_NO int32 = 0
228+
MQBALANCED_NOT_APPLICABLE int32 = 2
229+
MQBALANCED_UNKNOWN int32 = 3
230+
MQBALANCED_YES int32 = 1
231+
MQBALSTATE_HIGH int32 = 3
232+
MQBALSTATE_LOW int32 = 1
233+
MQBALSTATE_NOT_APPLICABLE int32 = 0
234+
MQBALSTATE_OK int32 = 2
235+
MQBALSTATE_UNKNOWN int32 = 4
222236
MQBA_FIRST int32 = 6001
223237
MQBA_LAST int32 = 8000
224238
MQBL_NULL_TERMINATED int32 = -1
@@ -249,6 +263,8 @@ var (
249263
MQCACF_APPL_DESC int32 = 3174
250264
MQCACF_APPL_FUNCTION int32 = 3200
251265
MQCACF_APPL_IDENTITY_DATA int32 = 3135
266+
MQCACF_APPL_IMMOVABLE_DATE int32 = 3209
267+
MQCACF_APPL_IMMOVABLE_TIME int32 = 3210
252268
MQCACF_APPL_NAME int32 = 3024
253269
MQCACF_APPL_ORIGIN_DATA int32 = 3136
254270
MQCACF_APPL_TAG int32 = 3058
@@ -325,7 +341,7 @@ var (
325341
MQCACF_LAST_PUB_TIME int32 = 3162
326342
MQCACF_LAST_PUT_DATE int32 = 3128
327343
MQCACF_LAST_PUT_TIME int32 = 3129
328-
MQCACF_LAST_USED int32 = 3208
344+
MQCACF_LAST_USED int32 = 3210
329345
MQCACF_LOCAL_Q_NAMES int32 = 3015
330346
MQCACF_LOG_PATH int32 = 3074
331347
MQCACF_MEDIA_LOG_EXTENT_NAME int32 = 3073
@@ -722,11 +738,12 @@ var (
722738
MQCC_OK int32 = 0
723739
MQCC_UNKNOWN int32 = -1
724740
MQCC_WARNING int32 = 1
725-
MQCDC_CURRENT_LENGTH int32 = 1984
726-
MQCDC_CURRENT_VERSION int32 = 11
741+
MQCDC_CURRENT_LENGTH int32 = 1992
742+
MQCDC_CURRENT_VERSION int32 = 12
727743
MQCDC_LENGTH_1 int32 = 984
728744
MQCDC_LENGTH_10 int32 = 1920
729745
MQCDC_LENGTH_11 int32 = 1984
746+
MQCDC_LENGTH_12 int32 = 1992
730747
MQCDC_LENGTH_2 int32 = 1312
731748
MQCDC_LENGTH_3 int32 = 1480
732749
MQCDC_LENGTH_4 int32 = 1568
@@ -740,6 +757,7 @@ var (
740757
MQCDC_VERSION_1 int32 = 1
741758
MQCDC_VERSION_10 int32 = 10
742759
MQCDC_VERSION_11 int32 = 11
760+
MQCDC_VERSION_12 int32 = 12
743761
MQCDC_VERSION_2 int32 = 2
744762
MQCDC_VERSION_3 int32 = 3
745763
MQCDC_VERSION_4 int32 = 4
@@ -748,11 +766,12 @@ var (
748766
MQCDC_VERSION_7 int32 = 7
749767
MQCDC_VERSION_8 int32 = 8
750768
MQCDC_VERSION_9 int32 = 9
751-
MQCD_CURRENT_LENGTH int32 = 1984
752-
MQCD_CURRENT_VERSION int32 = 11
769+
MQCD_CURRENT_LENGTH int32 = 1992
770+
MQCD_CURRENT_VERSION int32 = 12
753771
MQCD_LENGTH_1 int32 = 984
754772
MQCD_LENGTH_10 int32 = 1920
755773
MQCD_LENGTH_11 int32 = 1984
774+
MQCD_LENGTH_12 int32 = 1992
756775
MQCD_LENGTH_2 int32 = 1312
757776
MQCD_LENGTH_3 int32 = 1480
758777
MQCD_LENGTH_4 int32 = 1568
@@ -764,6 +783,7 @@ var (
764783
MQCD_VERSION_1 int32 = 1
765784
MQCD_VERSION_10 int32 = 10
766785
MQCD_VERSION_11 int32 = 11
786+
MQCD_VERSION_12 int32 = 12
767787
MQCD_VERSION_2 int32 = 2
768788
MQCD_VERSION_3 int32 = 3
769789
MQCD_VERSION_4 int32 = 4
@@ -982,7 +1002,7 @@ var (
9821002
MQCMDI_SEC_SIGNOFF_ERROR int32 = 17
9831003
MQCMDI_SEC_TIMER_ZERO int32 = 14
9841004
MQCMDI_SEC_UPPERCASE int32 = 21
985-
MQCMDL_CURRENT_LEVEL int32 = 912
1005+
MQCMDL_CURRENT_LEVEL int32 = 913
9861006
MQCMDL_LEVEL_1 int32 = 100
9871007
MQCMDL_LEVEL_101 int32 = 101
9881008
MQCMDL_LEVEL_110 int32 = 110
@@ -1020,6 +1040,7 @@ var (
10201040
MQCMDL_LEVEL_910 int32 = 910
10211041
MQCMDL_LEVEL_911 int32 = 911
10221042
MQCMDL_LEVEL_912 int32 = 912
1043+
MQCMDL_LEVEL_913 int32 = 913
10231044
MQCMD_ACCOUNTING_MQI int32 = 167
10241045
MQCMD_ACCOUNTING_Q int32 = 168
10251046
MQCMD_ACTIVITY_MSG int32 = 69
@@ -1101,6 +1122,7 @@ var (
11011122
MQCMD_DEREGISTER_SUBSCRIBER int32 = 62
11021123
MQCMD_ESCAPE int32 = 38
11031124
MQCMD_INQUIRE_AMQP_CAPABILITY int32 = 216
1125+
MQCMD_INQUIRE_APPL_STATUS int32 = 220
11041126
MQCMD_INQUIRE_ARCHIVE int32 = 114
11051127
MQCMD_INQUIRE_AUTH_INFO int32 = 83
11061128
MQCMD_INQUIRE_AUTH_INFO_NAMES int32 = 84
@@ -1235,6 +1257,7 @@ var (
12351257
MQCNO_CURRENT_LENGTH int32 = 256
12361258
MQCNO_CURRENT_VERSION int32 = 7
12371259
MQCNO_FASTPATH_BINDING int32 = 1
1260+
MQCNO_GENERATE_CONN_TAG int32 = 2097152
12381261
MQCNO_HANDLE_SHARE_BLOCK int32 = 64
12391262
MQCNO_HANDLE_SHARE_NONE int32 = 32
12401263
MQCNO_HANDLE_SHARE_NO_BLOCK int32 = 128
@@ -1662,6 +1685,14 @@ var (
16621685
MQIACF_API_ENVIRONMENT int32 = 1358
16631686
MQIACF_APPL_COUNT int32 = 1089
16641687
MQIACF_APPL_FUNCTION_TYPE int32 = 1400
1688+
MQIACF_APPL_IMMOVABLE_COUNT int32 = 1432
1689+
MQIACF_APPL_IMMOVABLE_REASON int32 = 1435
1690+
MQIACF_APPL_INFO_APPL int32 = 1429
1691+
MQIACF_APPL_INFO_ATTRS int32 = 1425
1692+
MQIACF_APPL_INFO_LOCAL int32 = 1431
1693+
MQIACF_APPL_INFO_QMGR int32 = 1430
1694+
MQIACF_APPL_INFO_TYPE int32 = 1428
1695+
MQIACF_APPL_MOVABLE int32 = 1426
16651696
MQIACF_ARCHIVE_LOG_SIZE int32 = 1416
16661697
MQIACF_ASYNC_STATE int32 = 1308
16671698
MQIACF_AUTHORIZATION_LIST int32 = 1115
@@ -1675,6 +1706,8 @@ var (
16751706
MQIACF_AUX_ERROR_DATA_INT_1 int32 = 1070
16761707
MQIACF_AUX_ERROR_DATA_INT_2 int32 = 1071
16771708
MQIACF_BACKOUT_COUNT int32 = 1241
1709+
MQIACF_BALANCED int32 = 1433
1710+
MQIACF_BALSTATE int32 = 1434
16781711
MQIACF_BRIDGE_TYPE int32 = 1073
16791712
MQIACF_BROKER_COUNT int32 = 1088
16801713
MQIACF_BROKER_OPTIONS int32 = 1077
@@ -1763,7 +1796,7 @@ var (
17631796
MQIACF_INVALID_DEST_COUNT int32 = 1371
17641797
MQIACF_ITEM_COUNT int32 = 1378
17651798
MQIACF_KNOWN_DEST_COUNT int32 = 1369
1766-
MQIACF_LAST_USED int32 = 1424
1799+
MQIACF_LAST_USED int32 = 1435
17671800
MQIACF_LDAP_CONNECTION_STATUS int32 = 1409
17681801
MQIACF_LISTENER_ATTRS int32 = 1222
17691802
MQIACF_LISTENER_STATUS_ATTRS int32 = 1223
@@ -1858,6 +1891,7 @@ var (
18581891
MQIACF_REFRESH_TYPE int32 = 1078
18591892
MQIACF_REGISTRATION_OPTIONS int32 = 1081
18601893
MQIACF_REG_REG_OPTIONS int32 = 1091
1894+
MQIACF_REMOTE_QMGR_ACTIVE int32 = 1427
18611895
MQIACF_REMOVE_AUTHREC int32 = 1398
18621896
MQIACF_REMOVE_QUEUES int32 = 1096
18631897
MQIACF_REPLACE int32 = 1006
@@ -2085,7 +2119,7 @@ var (
20852119
MQIACH_KEEP_ALIVE_INTERVAL int32 = 1566
20862120
MQIACH_LAST_SEQUENCE_NUMBER int32 = 1529
20872121
MQIACH_LAST_SEQ_NUMBER int32 = 1529
2088-
MQIACH_LAST_USED int32 = 1645
2122+
MQIACH_LAST_USED int32 = 1646
20892123
MQIACH_LISTENER_CONTROL int32 = 1601
20902124
MQIACH_LISTENER_STATUS int32 = 1599
20912125
MQIACH_LONG_RETRIES_LEFT int32 = 1540
@@ -2131,6 +2165,7 @@ var (
21312165
MQIACH_SHORT_RETRY int32 = 1505
21322166
MQIACH_SHORT_TIMER int32 = 1504
21332167
MQIACH_SOCKET int32 = 1521
2168+
MQIACH_SPL_PROTECTION int32 = 1646
21342169
MQIACH_SSLTASKS_MAX int32 = 1588
21352170
MQIACH_SSLTASKS_STARTED int32 = 1587
21362171
MQIACH_SSL_CLIENT_AUTH int32 = 1568
@@ -2586,6 +2621,11 @@ var (
25862621
MQIMGRCOV_AS_Q_MGR int32 = 2
25872622
MQIMGRCOV_NO int32 = 0
25882623
MQIMGRCOV_YES int32 = 1
2624+
MQIMMREASON_APPLNAME_CHANGED int32 = 4
2625+
MQIMMREASON_MOVING int32 = 3
2626+
MQIMMREASON_NONE int32 = 0
2627+
MQIMMREASON_NOT_CLIENT int32 = 1
2628+
MQIMMREASON_NOT_RECONNECTABLE int32 = 2
25892629
MQIMPO_CONVERT_TYPE int32 = 2
25902630
MQIMPO_CONVERT_VALUE int32 = 32
25912631
MQIMPO_CURRENT_LENGTH int32 = 64
@@ -3111,6 +3151,7 @@ var (
31113151
MQRCCF_ALLOC_RETRY_ERROR int32 = 3164
31123152
MQRCCF_ALLOC_SLOW_TIMER_ERROR int32 = 3165
31133153
MQRCCF_ALREADY_JOINED int32 = 3157
3154+
MQRCCF_APPL_STATUS_NOT_FOUND int32 = 4097
31143155
MQRCCF_ATTR_VALUE_ERROR int32 = 4005
31153156
MQRCCF_ATTR_VALUE_FIXED int32 = 3213
31163157
MQRCCF_AUTH_VALUE_ERROR int32 = 3171
@@ -3272,6 +3313,7 @@ var (
32723313
MQRCCF_IPADDR_RANGE_CONFLICT int32 = 3343
32733314
MQRCCF_IPADDR_RANGE_ERROR int32 = 3346
32743315
MQRCCF_KEEP_ALIVE_INT_ERROR int32 = 4060
3316+
MQRCCF_KWD_VALUE_WRONG_TYPE int32 = 4096
32753317
MQRCCF_LIKE_OBJECT_WRONG_TYPE int32 = 4003
32763318
MQRCCF_LISTENER_CONFLICT int32 = 3232
32773319
MQRCCF_LISTENER_NOT_STARTED int32 = 4020
@@ -3851,6 +3893,7 @@ var (
38513893
MQRC_Q_MGR_NOT_ACTIVE int32 = 2223
38523894
MQRC_Q_MGR_NOT_AVAILABLE int32 = 2059
38533895
MQRC_Q_MGR_QUIESCING int32 = 2161
3896+
MQRC_Q_MGR_RECONNECT_REQUESTED int32 = 2601
38543897
MQRC_Q_MGR_STOPPING int32 = 2162
38553898
MQRC_Q_NOT_EMPTY int32 = 2055
38563899
MQRC_Q_SERVICE_INTERVAL_HIGH int32 = 2226
@@ -4281,6 +4324,9 @@ var (
42814324
MQSO_SET_IDENTITY_CONTEXT int32 = 64
42824325
MQSO_WILDCARD_CHAR int32 = 1048576
42834326
MQSO_WILDCARD_TOPIC int32 = 2097152
4327+
MQSPL_AS_POLICY int32 = 2
4328+
MQSPL_PASSTHRU int32 = 0
4329+
MQSPL_REMOVE int32 = 1
42844330
MQSP_AVAILABLE int32 = 1
42854331
MQSP_NOT_AVAILABLE int32 = 0
42864332
MQSQQM_IGNORE int32 = 1

0 commit comments

Comments
 (0)