Update for MQ 9.3.3

ibmmqmet · ibmmqmet · commit 7d178304b23f · 2023-06-21T07:45:08.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 Newest updates are at the top of this file.
 
+## Jun 21 2023 - v5.5.0
+- Update for MQ 9.3.3
+- mqmetric - Configurable timeout for status queries (ibm-messaging/mq-metric-samples#227)
+
 ## Feb 17 2023 - v5.4.0
 - Update for MQ 9.3.2
 - mqmetric - Add hostname tag for 9.3.2 qmgrs (added to DIS QMSTATUS response) (ibm-messaging/mq-metric-samples#184)
diff --git a/Dockerfile b/Dockerfile
@@ -17,10 +17,12 @@ FROM $BASE_IMAGE
 
 ARG GOPATH_ARG="/go"
 ARG GOVERSION=1.17      
+ARG GOARCH=amd64
+ARG MQARCH=X64
 
 ENV GOVERSION=${GOVERSION}   \
     GOPATH=$GOPATH_ARG \
-    GOTAR=go${GOVERSION}.linux-amd64.tar.gz \
+    GOTAR=go${GOVERSION}.linux-${GOARCH}.tar.gz \
     ORG="github.com/ibm-messaging"
 
 
@@ -57,8 +59,8 @@ RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \
 
 # Location of the downloadable MQ client package \
 ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \
-    RDTAR="IBM-MQC-Redist-LinuxX64.tar.gz" \
-    VRMF=9.3.2.0
+    RDTAR="IBM-MQC-Redist-Linux${MQARCH}.tar.gz" \
+    VRMF=9.3.3.0
 
 # Install the MQ client from the Redistributable package. This also contains the
 # header files we need to compile against. Setup the subset of the package
@@ -80,8 +82,8 @@ RUN chmod 777 $GOPATH/buildInDocker.sh
 # Copy the rest of the source tree from this directory into the container
 # And make sure it's readable by the id that will run the compiles (not just root)
 ENV  REPO="mq-golang"
-COPY . $GOPATH/src/$ORG/$REPO
-RUN chmod -R a+rx $GOPATH/src
+COPY --chmod=0777 . $GOPATH/src/$ORG/$REPO
+# RUN chmod -R a+rx $GOPATH/src
 
 # Set the entrypoint to the script that will do the compilation
 ENTRYPOINT $GOPATH/buildInDocker.sh
diff --git a/ibmmq/cmqc_aix.go b/ibmmq/cmqc_aix.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  2/7/23 5:13 PM
-*   Build Level:   p932-L230207
+*   Generated on:  5/31/23 12:58 PM
+*   Build Level:   p933-L230531
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 932
+	MQCMDL_CURRENT_LEVEL           int32  = 933
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1082,6 +1082,7 @@ const (
 	MQCMDL_LEVEL_930               int32  = 930
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
+	MQCMDL_LEVEL_933               int32  = 933
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
diff --git a/ibmmq/cmqc_darwin.go b/ibmmq/cmqc_darwin.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  2/7/23 5:13 PM
-*   Build Level:   p932-L230207
+*   Generated on:  5/31/23 12:58 PM
+*   Build Level:   p933-L230531
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 932
+	MQCMDL_CURRENT_LEVEL           int32  = 933
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1082,6 +1082,7 @@ const (
 	MQCMDL_LEVEL_930               int32  = 930
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
+	MQCMDL_LEVEL_933               int32  = 933
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
diff --git a/ibmmq/cmqc_linux_amd64.go b/ibmmq/cmqc_linux_amd64.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  2/7/23 5:13 PM
-*   Build Level:   p932-L230207
+*   Generated on:  5/31/23 12:58 PM
+*   Build Level:   p933-L230531
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 932
+	MQCMDL_CURRENT_LEVEL           int32  = 933
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1082,6 +1082,7 @@ const (
 	MQCMDL_LEVEL_930               int32  = 930
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
+	MQCMDL_LEVEL_933               int32  = 933
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
diff --git a/ibmmq/cmqc_linux_ppc64le.go b/ibmmq/cmqc_linux_ppc64le.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  2/7/23 5:13 PM
-*   Build Level:   p932-L230207
+*   Generated on:  5/31/23 12:58 PM
+*   Build Level:   p933-L230531
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 932
+	MQCMDL_CURRENT_LEVEL           int32  = 933
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1082,6 +1082,7 @@ const (
 	MQCMDL_LEVEL_930               int32  = 930
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
+	MQCMDL_LEVEL_933               int32  = 933
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
diff --git a/ibmmq/cmqc_linux_s390x.go b/ibmmq/cmqc_linux_s390x.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  2/7/23 5:13 PM
-*   Build Level:   p932-L230207
+*   Generated on:  5/31/23 12:58 PM
+*   Build Level:   p933-L230531
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 932
+	MQCMDL_CURRENT_LEVEL           int32  = 933
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1082,6 +1082,7 @@ const (
 	MQCMDL_LEVEL_930               int32  = 930
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
+	MQCMDL_LEVEL_933               int32  = 933
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
diff --git a/ibmmq/cmqc_windows.go b/ibmmq/cmqc_windows.go
@@ -30,8 +30,8 @@ package ibmmq
 ****************************************************************
 *
 *   <BEGIN_BUILDINFO>
-*   Generated on:  2/7/23 5:13 PM
-*   Build Level:   p932-L230207
+*   Generated on:  5/31/23 12:58 PM
+*   Build Level:   p933-L230531
 *   Build Type:    Production
 *   <END_BUILDINFO>
  */
@@ -1032,7 +1032,7 @@ const (
 	MQCMDI_SEC_SIGNOFF_ERROR       int32  = 17
 	MQCMDI_SEC_TIMER_ZERO          int32  = 14
 	MQCMDI_SEC_UPPERCASE           int32  = 21
-	MQCMDL_CURRENT_LEVEL           int32  = 932
+	MQCMDL_CURRENT_LEVEL           int32  = 933
 	MQCMDL_LEVEL_1                 int32  = 100
 	MQCMDL_LEVEL_101               int32  = 101
 	MQCMDL_LEVEL_110               int32  = 110
@@ -1082,6 +1082,7 @@ const (
 	MQCMDL_LEVEL_930               int32  = 930
 	MQCMDL_LEVEL_931               int32  = 931
 	MQCMDL_LEVEL_932               int32  = 932
+	MQCMDL_LEVEL_933               int32  = 933
 	MQCMD_ACCOUNTING_MQI           int32  = 167
 	MQCMD_ACCOUNTING_Q             int32  = 168
 	MQCMD_ACTIVITY_MSG             int32  = 69
diff --git a/ibmmq/mqistr.go b/ibmmq/mqistr.go
@@ -1457,6 +1457,8 @@ func MQItoString(class string, value int) string {
 			s = "MQCMDL_LEVEL_931"
 		case 932:
 			s = "MQCMDL_LEVEL_932"
+		case 933:
+			s = "MQCMDL_LEVEL_933"
 		default:
 			s = ""
 		}
diff --git a/mqmetric/channel.go b/mqmetric/channel.go
@@ -355,7 +355,7 @@ func collectChannelStatus(pattern string, instanceType int32) error {
 	// Now get the responses - loop until all have been received (one
 	// per channel) or we run out of time
 	for allReceived := false; !allReceived; {
-		cfh, buf, allReceived, err = statusGetReply()
+		cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 		if buf != nil {
 			key := parseChlData(instanceType, cfh, buf)
 			if key != "" {
@@ -612,7 +612,7 @@ func inquireChannelAttributes(objectPatternsList string, infoMap map[string]*Obj
 		}
 
 		for allReceived := false; !allReceived; {
-			cfh, buf, allReceived, err = statusGetReply()
+			cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 			if buf != nil {
 				parseChannelAttrData(cfh, buf, infoMap)
 			}
diff --git a/mqmetric/channelamqp.go b/mqmetric/channelamqp.go
@@ -255,7 +255,7 @@ func collectAMQPChannelStatus(pattern string, instanceType int32) error {
 	// Now get the responses - loop until all have been received (one
 	// per channel) or we run out of time
 	for allReceived := false; !allReceived; {
-		cfh, buf, allReceived, err = statusGetReply()
+		cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 		if buf != nil {
 			key := parseAMQPChlData(instanceType, cfh, buf)
 			if key != "" {
@@ -427,7 +427,7 @@ func inquireAMQPChannelAttributes(objectPatternsList string, infoMap map[string]
 		}
 
 		for allReceived := false; !allReceived; {
-			cfh, buf, allReceived, err = statusGetReply()
+			cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 			if buf != nil {
 				parseAMQPChannelAttrData(cfh, buf, infoMap)
 			}
diff --git a/mqmetric/cluster.go b/mqmetric/cluster.go
@@ -130,7 +130,7 @@ func collectClusterStatus() error {
 	// Now get the responses - loop until all have been received (one
 	// per queue) or we run out of time
 	for allReceived := false; !allReceived; {
-		cfh, buf, allReceived, err = statusGetReply()
+		cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 		if buf != nil {
 			parseClusterData(cfh, buf)
 		}
diff --git a/mqmetric/globals.go b/mqmetric/globals.go
@@ -63,6 +63,8 @@ type connectionInfo struct {
 	discoveryDone    bool
 	publicationCount int
 
+	waitInterval int
+
 	objectStatus     [OT_LAST_USED + 1]objectStatus
 	publishedMetrics AllMetrics
 }
diff --git a/mqmetric/metrics.txt b/mqmetric/metrics.txt
@@ -8,7 +8,7 @@ vary by queue manager platform and version.
 As an example, one of the metrics available in Prometheus might be "ibmmq_channel_bytes_sent" with
 the full name created by combining the product name, the class, and the individual metric.
 
-The metrics published by the queue manager are listed in the product documentation are
+The metrics published by the queue manager are listed in the product documentation and
 are not repeated in this file:
 https://www.ibm.com/docs/en/ibm-mq/latest?topic=trace-metrics-published-system-topics
 
@@ -119,4 +119,4 @@ Class: bufferpool/pageset
   ATTR_PS_TOTAL                   : pages_total
   ATTR_PS_UNUSED                  : pages_unused
 
-This page was automatically generated from the source tree on 2023-02-15 07:35:57
+This page was automatically generated from the source tree on 2023-06-20 09:33:10
diff --git a/mqmetric/mqif.go b/mqmetric/mqif.go
@@ -47,6 +47,7 @@ type ConnectionConfig struct {
 	ShowInactiveChannels bool
 	HideSvrConnJobname   bool
 	HideAMQPClientId     bool
+	WaitInterval         int
 
 	CcdtUrl  string
 	ConnName string
@@ -182,6 +183,7 @@ func initConnectionKey(key string, qMgrName string, replyQ string, replyQ2 strin
 		var v map[int32]interface{}
 
 		ci.useStatus = cc.UseStatus
+		ci.waitInterval = cc.WaitInterval
 
 		mqod := ibmmq.NewMQOD()
 		openOptions := ibmmq.MQOO_INQUIRE + ibmmq.MQOO_FAIL_IF_QUIESCING
@@ -407,9 +409,10 @@ func subscribeDurable(topic string, pubQObj *ibmmq.MQObject) (*MQTopicDescriptor
 }
 
 /*
-subscribe to the 	} else {
-								s.removeSubscription()
-							}nominated topic, but ask the queue manager to
+	subscribe to the 	} else {
+									s.removeSubscription()
+								}nominated topic, but ask the queue manager to
+
 allocate the replyQ for us
 */
 func subscribeManaged(topic string, pubQObj *ibmmq.MQObject) (*MQTopicDescriptor, error) {
@@ -563,7 +566,7 @@ func clearDurableSubscriptions(prefix string, cmdQObj ibmmq.MQObject, replyQObj
 	// Now get the responses - loop until all have been received (one
 	// per queue) or we run out of time
 	for allReceived := false; !allReceived; {
-		cfh, buf, allReceived, err = statusGetReply()
+		cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 		if buf != nil {
 			subName, subId := parseInqSubData(cfh, buf)
 			if subName != "" {
@@ -603,7 +606,7 @@ func clearDurableSubscriptions(prefix string, cmdQObj ibmmq.MQObject, replyQObj
 		// Don't really care about the responses, just loop until
 		// the operation is complete one way or the other
 		for allReceived := false; !allReceived; {
-			_, _, allReceived, _ = statusGetReply()
+			_, _, allReceived, _ = statusGetReply(putmqmd.MsgId)
 		}
 	}
 
diff --git a/mqmetric/qmgr.go b/mqmetric/qmgr.go
@@ -277,7 +277,7 @@ func collectQueueManagerListeners() error {
 	// Now get the responses - loop until all have been received (one
 	// per queue) or we run out of time
 	for allReceived := false; !allReceived; {
-		cfh, buf, allReceived, err = statusGetReply()
+		cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 		if buf != nil {
 			if parseQMgrListeners(cfh, buf) {
 				listenerCount++
@@ -324,7 +324,7 @@ func collectQueueManagerStatus(instanceType int32) error {
 	// Now get the responses - loop until all have been received (one
 	// per queue) or we run out of time
 	for allReceived := false; !allReceived; {
-		cfh, buf, allReceived, err = statusGetReply()
+		cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 		if buf != nil {
 			parseQMgrData(instanceType, cfh, buf)
 		}
diff --git a/mqmetric/queue.go b/mqmetric/queue.go
@@ -260,7 +260,7 @@ func collectQueueStatus(pattern string, instanceType int32) error {
 	// Now get the responses - loop until all have been received (one
 	// per queue) or we run out of time
 	for allReceived := false; !allReceived; {
-		cfh, buf, allReceived, err = statusGetReply()
+		cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 		if buf != nil {
 			parseQData(instanceType, cfh, buf)
 		}
@@ -303,7 +303,7 @@ func collectResetQStats(pattern string) error {
 	// Now get the responses - loop until all have been received (one
 	// per queue) or we run out of time
 	for allReceived := false; !allReceived; {
-		cfh, buf, allReceived, err = statusGetReply()
+		cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 		if buf != nil {
 			parseResetQStatsData(cfh, buf)
 		}
@@ -368,7 +368,7 @@ func inquireQueueAttributes(objectPatternsList string) error {
 		}
 
 		for allReceived := false; !allReceived; {
-			cfh, buf, allReceived, err = statusGetReply()
+			cfh, buf, allReceived, err = statusGetReply(putmqmd.MsgId)
 			if buf != nil {
 				parseQAttrData(cfh, buf)
 			}
diff --git a/mqmetric/status.go b/mqmetric/status.go
diff --git a/mqmetric/sub.go b/mqmetric/sub.go
diff --git a/mqmetric/topic.go b/mqmetric/topic.go
diff --git a/mqmetric/usage.go b/mqmetric/usage.go
diff --git a/samples/runSample.bud.sh b/samples/runSample.bud.sh
diff --git a/samples/runSample.deb.Dockerfile b/samples/runSample.deb.Dockerfile
diff --git a/samples/runSample.ubi.Dockerfile b/samples/runSample.ubi.Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -1457,6 +1457,8 @@ func MQItoString(class string, value int) string {`
`1457`	`1457`	`s = "MQCMDL_LEVEL_931"`
`1458`	`1458`	`case 932:`
`1459`	`1459`	`s = "MQCMDL_LEVEL_932"`
	`1460`	`+ case 933:`
	`1461`	`+ s = "MQCMDL_LEVEL_933"`
`1460`	`1462`	`default:`
`1461`	`1463`	`s = ""`
`1462`	`1464`	`}`