Add qstatus and ability to access z/OS status

Author: ibmmqmet

CHANGELOG.md

@@ -3,6 +3,7 @@
 =======
 ### November 2018
 * Added functions to mqmetric to issue DISPLAY QSTATUS for additional stats
+* Added z/OS capability for minimal status
 
 ### October 2018
 * Allow compilation against MQ v8

ibmmq/mqiMQCNO.go

@@ -42,7 +42,7 @@ void setCCDTUrl(MQCNO *mqcno, PMQCHAR url, MQLONG length) {
 	mqcno->CCDTUrlOffset = 0;
 	mqcno->CCDTUrlPtr = NULL;
 	mqcno->CCDTUrlLength = length;
-	if (url != NULL) {
+	if (url != NULL && length > 0) {
 		mqcno->CCDTUrlPtr = url;
 	}
 #else
@@ -181,7 +181,9 @@ func copyCNOtoC(mqcno *C.MQCNO, gocno *MQCNO) {
 	// The CCDT URL option was introduced in MQ V9. To compile against older
 	// versions of MQ, setting of it has been moved to a C function that can use
 	// the pre-processor to decide whether it's needed.
-	C.setCCDTUrl(mqcno, C.PMQCHAR(C.CString(gocno.CCDTUrl)), C.MQLONG(len(gocno.CCDTUrl)))
+	if gocno.CCDTUrl != "" {
+		C.setCCDTUrl(mqcno, C.PMQCHAR(C.CString(gocno.CCDTUrl)), C.MQLONG(len(gocno.CCDTUrl)))
+	}
 	return
 }
 

ibmmq/mqiPCF.go

@@ -252,6 +252,15 @@ func ReadPCFParameter(buf []byte) (*PCFParameter, int) {
 	case C.MQCFT_GROUP:
 		binary.Read(p, endian, &pcfParm.Parameter)
 		binary.Read(p, endian, &pcfParm.ParameterCount)
+
+	case C.MQCFT_BYTE_STRING:
+		// For now, the data is not actually stored anywhere as we don't need it
+		// But we do need to know how to step over the field
+		offset := int32(C.MQCFBS_STRUC_LENGTH_FIXED)
+		binary.Read(p, endian, &pcfParm.Parameter)
+		binary.Read(p, endian, &pcfParm.stringLength)
+		p.Next(int(pcfParm.strucLength - offset))
+
 	default:
 		fmt.Println("mqiPCF.go: Unknown PCF type ", pcfParm.Type)
 		// Skip the remains of this structure, assuming it really is

mqmetric/channel.go

@@ -199,6 +199,8 @@ func collectChannelStatus(pattern string, instanceType int32) error {
 	buf = make([]byte, 0)
 
 	cfh := ibmmq.NewMQCFH()
+	cfh.Version = ibmmq.MQCFH_VERSION_3
+	cfh.Type = ibmmq.MQCFT_COMMAND_XR
 
 	// Can allow all the other fields to default
 	cfh.Command = ibmmq.MQCMD_INQUIRE_CHANNEL_STATUS

mqmetric/discover.go

@@ -137,9 +137,9 @@ func discoverClasses(metaPrefix string) error {
 
 	// Have to know the starting point for the topic that tells about classes
 	if metaPrefix == "" {
-		rootTopic = "$SYS/MQ/INFO/QMGR/" + qMgr.Name + "/Monitor/METADATA/CLASSES"
+		rootTopic = "$SYS/MQ/INFO/QMGR/" + resolvedQMgrName + "/Monitor/METADATA/CLASSES"
 	} else {
-		rootTopic = metaPrefix + "/INFO/QMGR/" + qMgr.Name + "/Monitor/METADATA/CLASSES"
+		rootTopic = metaPrefix + "/INFO/QMGR/" + resolvedQMgrName + "/Monitor/METADATA/CLASSES"
 	}
 	sub, err = subscribe(rootTopic)
 	if err == nil {
@@ -296,6 +296,11 @@ func discoverStats(metaPrefix string) error {
 	// Start with an empty set of information about the available stats
 	Metrics.Classes = make(map[int]*MonClass)
 
+	// Allow us to proceed on z/OS even though it does not support pub/sub resources
+	if metaPrefix == "" && platform == ibmmq.MQPL_ZOS {
+		return nil
+	}
+
 	// Then get the list of CLASSES
 	err = discoverClasses(metaPrefix)
 
@@ -418,6 +423,8 @@ func inquireObjects(objectPatternsList string, objectType int32) ([]string, erro
 		putmqmd.Report = ibmmq.MQRO_PASS_DISCARD_AND_EXPIRY
 
 		cfh := ibmmq.NewMQCFH()
+		cfh.Version = ibmmq.MQCFH_VERSION_3
+		cfh.Type = ibmmq.MQCFT_COMMAND_XR
 
 		// Can allow all the other fields to default
 		cfh.Command = command
@@ -572,6 +579,10 @@ func ProcessPublications() error {
 	var elementidx int
 	var value int64
 
+	if platform == ibmmq.MQPL_ZOS {
+		return nil
+	}
+
 	// Keep reading all available messages until queue is empty. Don't
 	// do a GET-WAIT; just immediate removals.
 	cnt := 0

mqmetric/mqif.go

@@ -28,14 +28,17 @@ import (
 	"fmt"
 
 	"github.com/ibm-messaging/mq-golang/ibmmq"
+	"strings"
 )
 
 var (
-	qMgr            ibmmq.MQQueueManager
-	cmdQObj         ibmmq.MQObject
-	replyQObj       ibmmq.MQObject
-	statusReplyQObj ibmmq.MQObject
-	getBuffer       = make([]byte, 32768)
+	qMgr             ibmmq.MQQueueManager
+	cmdQObj          ibmmq.MQObject
+	replyQObj        ibmmq.MQObject
+	statusReplyQObj  ibmmq.MQObject
+	getBuffer        = make([]byte, 32768)
+	platform         int32
+	resolvedQMgrName string
 
 	qmgrConnected = false
 	queuesOpened  = false
@@ -78,6 +81,29 @@ func InitConnection(qMgrName string, replyQ string, cc *ConnectionConfig) error
 		qmgrConnected = true
 	}
 
+	if err == nil {
+		mqod := ibmmq.NewMQOD()
+		openOptions := ibmmq.MQOO_INQUIRE + ibmmq.MQOO_FAIL_IF_QUIESCING
+
+		mqod.ObjectType = ibmmq.MQOT_Q_MGR
+		mqod.ObjectName = ""
+
+		qMgrObject, err := qMgr.Open(mqod, openOptions)
+
+		if err == nil {
+			selectors := []int32{ibmmq.MQCA_Q_MGR_NAME,
+				ibmmq.MQIA_PLATFORM}
+
+			intAttrs, charAttrs, err := qMgrObject.Inq(selectors, 1, 48)
+
+			if err == nil {
+				resolvedQMgrName = strings.TrimSpace(string(charAttrs[0:48]))
+				platform = intAttrs[0]
+			}
+
+		}
+	}
+
 	// MQOPEN of the COMMAND QUEUE
 	if err == nil {
 		mqod := ibmmq.NewMQOD()

mqmetric/queue.go

@@ -41,6 +41,7 @@ const (
 	ATTR_Q_OPPROCS     = "output_handles"
 	ATTR_Q_QTIME_SHORT = "qtime_short"
 	ATTR_Q_QTIME_LONG  = "qtime_long"
+	ATTR_Q_DEPTH       = "depth"
 )
 
 var QueueStatus StatusSet
@@ -70,6 +71,11 @@ func QueueInitAttributes() {
 	QueueStatus.Attributes[attr] = newStatusAttribute(attr, "Input Handles", ibmmq.MQIA_OPEN_INPUT_COUNT)
 	attr = ATTR_Q_OPPROCS
 	QueueStatus.Attributes[attr] = newStatusAttribute(attr, "Input Handles", ibmmq.MQIA_OPEN_OUTPUT_COUNT)
+	// Usually we get the QDepth from published resources, But on z/OS we can get it from the QSTATUS response
+	if platform == ibmmq.MQPL_ZOS {
+		attr = ATTR_Q_DEPTH
+		QueueStatus.Attributes[attr] = newStatusAttribute(attr, "Queue Depth", ibmmq.MQIA_CURRENT_Q_DEPTH)
+	}
 
 	attr = ATTR_Q_QTIME_SHORT
 	QueueStatus.Attributes[attr] = newStatusAttribute(attr, "Queue Time Short", ibmmq.MQIACF_Q_TIME_INDICATOR)
@@ -156,6 +162,8 @@ func collectQueueStatus(pattern string, instanceType int32) error {
 	buf = make([]byte, 0)
 
 	cfh := ibmmq.NewMQCFH()
+	cfh.Version = ibmmq.MQCFH_VERSION_3
+	cfh.Type = ibmmq.MQCFT_COMMAND_XR
 
 	// Can allow all the other fields to default
 	cfh.Command = ibmmq.MQCMD_INQUIRE_Q_STATUS