Add time-since metrics for queues and channels

Add QMSTATUS and TPSTATUS fields

Author: ibmmqmet

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 Newest updates are at the top of this file.
 
+## April 03 2019
+* mqmetric - Added last put/get time metric for queues
+* mqmetric - Added last msg time metric for channels
+* mqmetric - Added fields from QMSTATUS and TPSTATUS 
+
 ## April 1 2019
 * Added scripts to compile samples inside a container
 

mqmetric/channel.go

@@ -33,6 +33,7 @@ import (
 	"github.com/ibm-messaging/mq-golang/ibmmq"
 	"regexp"
 	"strings"
+	"time"
 )
 
 const (
@@ -47,6 +48,7 @@ const (
 	ATTR_CHL_SUBSTATE      = "substate"
 	ATTR_CHL_TYPE          = "type"
 	ATTR_CHL_INSTANCE_TYPE = "instance_type"
+	ATTR_CHL_SINCE_MSG     = "time_since_msg"
 
 	SQUASH_CHL_STATUS_STOPPED    = 0
 	SQUASH_CHL_STATUS_TRANSITION = 1
@@ -74,13 +76,13 @@ func ChannelInitAttributes() {
 	// These fields are used to construct the key to the per-channel map values and
 	// as tags to uniquely identify a channel instance
 	attr := ATTR_CHL_NAME
-	ChannelStatus.Attributes[attr] = newStatusAttribute(attr, "Channel Name", -1)
+	ChannelStatus.Attributes[attr] = newPseudoStatusAttribute(attr, "Channel Name")
 	attr = ATTR_CHL_RQMNAME
-	ChannelStatus.Attributes[attr] = newStatusAttribute(attr, "Remote Queue Manager Name", -1)
+	ChannelStatus.Attributes[attr] = newPseudoStatusAttribute(attr, "Remote Queue Manager Name")
 	attr = ATTR_CHL_JOBNAME
-	ChannelStatus.Attributes[attr] = newStatusAttribute(attr, "MCA Job Name", -1)
+	ChannelStatus.Attributes[attr] = newPseudoStatusAttribute(attr, "MCA Job Name")
 	attr = ATTR_CHL_CONNNAME
-	ChannelStatus.Attributes[attr] = newStatusAttribute(attr, "Connection Name", -1)
+	ChannelStatus.Attributes[attr] = newPseudoStatusAttribute(attr, "Connection Name")
 
 	// These are the integer status fields that are of interest
 	attr = ATTR_CHL_MESSAGES
@@ -104,6 +106,9 @@ func ChannelInitAttributes() {
 	ChannelStatus.Attributes[attr] = newStatusAttribute(attr, "Channel Status - Simplified", ibmmq.MQIACH_CHANNEL_STATUS)
 	ChannelStatus.Attributes[attr].squash = true
 	chlAttrsInit = true
+
+	attr = ATTR_CHL_SINCE_MSG
+	ChannelStatus.Attributes[attr] = newStatusAttribute(attr, "Time Since Msg", -1)
 }
 
 // If we need to list the channels that match a pattern. Not needed for
@@ -285,6 +290,9 @@ func parseChlData(instanceType int32, cfh *ibmmq.MQCFH, buf []byte) string {
 	startTime := ""
 	key := ""
 
+	lastMsgDate := ""
+	lastMsgTime := ""
+
 	parmAvail := true
 	bytesRead := 0
 	offset := 0
@@ -389,9 +397,20 @@ func parseChlData(instanceType int32, cfh *ibmmq.MQCFH, buf []byte) string {
 					}
 				}
 			}
+		} else {
+			switch elem.Parameter {
+			case ibmmq.MQCACH_LAST_MSG_TIME:
+				lastMsgTime = strings.TrimSpace(elem.String[0])
+			case ibmmq.MQCACH_LAST_MSG_DATE:
+				lastMsgDate = strings.TrimSpace(elem.String[0])
+			}
 		}
 	}
 
+	now := time.Now()
+	diff := statusTimeDiff(now, lastMsgDate, lastMsgTime)
+	ChannelStatus.Attributes[ATTR_CHL_SINCE_MSG].Values[key] = newStatusValueInt64(diff)
+
 	return key
 }
 

mqmetric/mqif.go

@@ -59,6 +59,8 @@ to be used for all responses including the publications
 */
 func InitConnection(qMgrName string, replyQ string, cc *ConnectionConfig) error {
 	var err error
+	var errorString = ""
+
 	gocno := ibmmq.NewMQCNO()
 	gocsp := ibmmq.NewMQCSP()
 
@@ -80,6 +82,8 @@ func InitConnection(qMgrName string, replyQ string, cc *ConnectionConfig) error
 	qMgr, err = ibmmq.Connx(qMgrName, gocno)
 	if err == nil {
 		qmgrConnected = true
+	} else {
+		errorString = "Cannot connect to queue manager " + qMgrName
 	}
 
 	// Discover important information about the qmgr - its real name
@@ -109,6 +113,7 @@ func InitConnection(qMgrName string, replyQ string, cc *ConnectionConfig) error
 				commandLevel = v[ibmmq.MQIA_COMMAND_LEVEL].(int32)
 				if commandLevel < 900 && platform != ibmmq.MQPL_ZOS && platform != ibmmq.MQPL_APPLIANCE {
 					err = fmt.Errorf("Queue manager must be at least V9.0 for monitoring.")
+					errorString = "Unsupported system"
 				}
 			}
 			// Don't need the qMgrObject any more
@@ -130,6 +135,9 @@ func InitConnection(qMgrName string, replyQ string, cc *ConnectionConfig) error
 		}
 
 		cmdQObj, err = qMgr.Open(mqod, openOptions)
+		if err != nil {
+			errorString = "Cannot open queue " + mqod.ObjectName
+		}
 
 	}
 
@@ -144,6 +152,8 @@ func InitConnection(qMgrName string, replyQ string, cc *ConnectionConfig) error
 		replyQBaseName = replyQ
 		if err == nil {
 			queuesOpened = true
+		} else {
+			errorString = "Cannot open queue " + replyQ
 		}
 	}
 
@@ -154,10 +164,13 @@ func InitConnection(qMgrName string, replyQ string, cc *ConnectionConfig) error
 		mqod.ObjectType = ibmmq.MQOT_Q
 		mqod.ObjectName = replyQ
 		statusReplyQObj, err = qMgr.Open(mqod, openOptions)
+		if err != nil {
+			errorString = "Cannot open queue" + replyQ
+		}
 	}
 
 	if err != nil {
-		return fmt.Errorf("Cannot access queue manager. Error: %v", err)
+		return fmt.Errorf(errorString+". Error: %v", err)
 	}
 
 	return err
@@ -221,7 +234,7 @@ func getMessageWithHObj(wait bool, hObj ibmmq.MQObject) ([]byte, error) {
 
 	if wait {
 		gmo.Options |= ibmmq.MQGMO_WAIT
-		gmo.WaitInterval = 10 * 1000
+		gmo.WaitInterval = 30 * 1000
 	}
 
 	datalen, err = hObj.Get(getmqmd, gmo, getBuffer)
@@ -277,8 +290,7 @@ func GetPlatform() int32 {
 }
 
 /*
-Return the current platform - the MQPL_* definition value. It
-can be turned into a string if necessary via ibmmq.MQItoString("PL"...)
+Return the current command level
 */
 func GetCommandLevel() int32 {
 	return commandLevel