Update for MQ 9.2

Author: ibmmqmet

CHANGELOG.md

@@ -1,7 +1,14 @@
 # Changelog
 Newest updates are at the top of this file.
 
-### Jun 01 2020
+### Jul 23 2020
+* Update to use v5.1.0 of the mq-golang repository
+* Update to use MQ 9.2.0
+* Added pseudo-metric qmgr_exporter_publications for how many consumed on each scrape
+* Added showInactiveChannels option (#38)
+* Added explicit client configuration options (#40)
+
+### Jun 01 2020 (v5.0.0)
 * Exporters can have configuration provided in YAML file (`-f <file>`) instead of command line options
 * Use modules (go.mod) to define prereqs (ibm-messaging/mq-golang#138)
 * Update to use v5.0.0 of the mq-golang repository as the new module format

Dockerfile

@@ -51,7 +51,7 @@ 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.1.5.0
+    VRMF=9.2.0.0
 
 # Install the MQ client from the Redistributable package. This also contains the
 # header files we need to compile against.
@@ -69,6 +69,9 @@ COPY go.mod .
 COPY go.sum .          
 RUN chmod 777 go.*
 
+COPY config.common.yaml .
+RUN chmod 777 config.common.yaml
+
 #RUN /usr/lib/go-${GOVERSION}/bin/go mod download
 
 # Copy the rest of the source tree from this directory into the container and

README.md

@@ -152,6 +152,11 @@ a Grafana bug, or it may really be how Grafana is designed to work. But without
 the metric line, the table was showing multiple versions of the status for each channel. This
 table combines multiple metrics on the same line now.
 
+Information about channels comes from the DISPLAY CHSTATUS CURRENT command. That
+only shows channels with a known state and does not report on inactive channels.
+To also see the inactive channels, then set the showInactiveChannels 
+configuration attribute to true.
+
 ### z/OS Support
 Because the DIS QSTATUS and DIS CHSTATUS commands can be used on z/OS, the monitors can now
 support showing some limited information from a z/OS queue manager. There is nothing special needed to configure it, beyond the client
@@ -195,10 +200,11 @@ Instead of providing all of the configuration for the exporters via command-line
 provide the configuration in a YAML file. Then only the `-f` command-line option is required for the exporter to
 point at the file.
 
-An example configuration file is provided in each exporter's directory. All of the exporters support
+All of the exporters support
 the same configuration options for how to connect to MQ and which objects are monitored. There is
 then an exporter-specific section for additional configuration such as how to contact the back-end
 database. 
+The common options are shown in a template in this directory; the exporter-specific options are in individual files in each directory. Combine the two pieces into a single file to get a complete deployable configuration.
 
 Unlike the command line flags, lists are provided in a more natural format instead of comma-separated
 values in a single string. If an option is provided on both the command line and in the file, it is the file

buildInDocker.sh

@@ -57,9 +57,9 @@ do
   then
     cp $srcdir/*.mqsc $GOPATH/bin
   fi
-  if [ -r $srcdir/$m.yaml ]
+  if [ -r $srcdir/config.collector.yaml ]
   then
-    cp $srcdir/*.yaml $GOPATH/bin
+    cat ./config.common.yaml $srcdir/config.collector.yaml > $GOPATH/bin/$m.yaml
   fi
 
 done

cmd/mq_aws/config.collector.yaml

@@ -0,0 +1,9 @@
+
+# This is the collector-specific portion of the configuration
+cloudwatch:
+  region: eu-west-1
+  interval: 60s
+  maxErrors: 10
+  maxPoints: 20
+  namespace: "IBM/MQ"
+

cmd/mq_aws/exporter.go

@@ -110,7 +110,7 @@ func Collect() error {
 	pollStatus := false
 	thisPoll := time.Now()
 	elapsed := thisPoll.Sub(lastPoll)
-	if elapsed >= config.cf.PollIntervalDuration {
+	if elapsed >= config.cf.PollIntervalDuration || first {
 		log.Debugf("Polling for object status")
 		lastPoll = thisPoll
 		pollStatus = true
@@ -192,12 +192,22 @@ func Collect() error {
 		t := time.Now()
 		bp := newBatchPoints()
 
+		// Start with a metric that shows how many publications were processed by this collection
+		series = "qmgr"
+		tags := map[string]string{
+			"qmgr":     config.cf.QMgrName,
+			"platform": platformString,
+		}
+		pt, _ := newPoint(series+"."+"exporter_publications", t, float64(mqmetric.GetProcessPublicationCount()), tags)
+		bp.addPoint(pt)
+		log.Debugf("Adding point %v", pt)
+
 		for _, cl := range mqmetric.Metrics.Classes {
 			for _, ty := range cl.Types {
 				for _, elem := range ty.Elements {
 					for key, value := range elem.Values {
 						f := mqmetric.Normalise(elem, key, value)
-						tags := map[string]string{
+						tags = map[string]string{
 							"qmgr":     config.cf.QMgrName,
 							"platform": platformString,
 						}
@@ -221,6 +231,7 @@ func Collect() error {
 						tags["description"] = mqmetric.GetObjectDescription(key, ibmmq.MQOT_Q)
 						pt, _ := newPoint(series+"."+elem.MetricName, t, float64(f), tags)
 						bp.addPoint(pt)
+						log.Debugf("Adding point %v", pt)
 
 						// AWS recommends not sending too many
 						// data points in a single request.
@@ -232,6 +243,7 @@ func Collect() error {
 				}
 			}
 		}
+
 		series = "channel"
 		for _, attr := range mqmetric.ChannelStatus.Attributes {
 			for key, value := range attr.Values {

cmd/mq_aws/mq_aws.yaml

@@ -0,0 +1,5 @@
+
+# This is the collector-specific portion of the configuration
+collectd:
+  interval: 10s
+  hostname: localhost

cmd/mq_coll/config.collector.yaml

@@ -62,7 +62,7 @@ func Collect() error {
 	pollStatus := false
 	thisPoll := time.Now()
 	elapsed := thisPoll.Sub(lastPoll)
-	if elapsed >= config.cf.PollIntervalDuration {
+	if elapsed >= config.cf.PollIntervalDuration || first {
 		log.Debugf("Polling for object status")
 		lastPoll = thisPoll
 		pollStatus = true
@@ -150,13 +150,20 @@ func Collect() error {
 		// a misleading range on graphs.
 		first = false
 	} else {
+		// Start with a metric that shows how many publications were processed by this collection
+		series = "qmgr"
+		tags := map[string]string{
+			"qmgr":     config.cf.QMgrName,
+			"platform": platformString,
+		}
+		printPoint(series, "exporter_publications", float32(mqmetric.GetProcessPublicationCount()), tags)
 
 		for _, cl := range mqmetric.Metrics.Classes {
 			for _, ty := range cl.Types {
 				for _, elem := range ty.Elements {
 					for key, value := range elem.Values {
 						f := mqmetric.Normalise(elem, key, value)
-						tags := map[string]string{
+						tags = map[string]string{
 							"qmgr": config.cf.QMgrName,
 						}