Updates for MQ 92.5

Author: ibmmqmet

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 Newest updates are at the top of this file.
 
+### Feb 25 2022 (v5.2.5)
+* Update to MQ 9.2.5
+* Update to use v5.2.5 of mq-golang repository
+* Update vendored dependencies
+* Permit use of local queues as well as model queues for metric replies (#100)
+
 ### Jan 16 2022 (no new version)
 * Update vendored dependencies
 

Dockerfile.build

@@ -59,7 +59,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.2.4.0
+    VRMF=9.2.5.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

Dockerfile.run

@@ -31,7 +31,7 @@ RUN apt-get update \
 # 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.2.4.0
+    VRMF=9.2.5.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

cmd/mq_aws/main.go

@@ -56,7 +56,7 @@ func main() {
 		}
 
 		// Connect and open standard queues
-		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, config.cf.ReplyQ2, &config.cf.CC)
 	}
 	if err == nil {
 		log.Infoln("Connected to queue manager ", config.cf.QMgrName)

cmd/mq_coll/main.go

@@ -54,7 +54,7 @@ func main() {
 		}
 
 		// Connect and open standard queues
-		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, config.cf.ReplyQ2, &config.cf.CC)
 	}
 	if err == nil {
 		log.Infoln("Connected to queue manager ", config.cf.QMgrName)

cmd/mq_influx/main.go

@@ -58,7 +58,7 @@ func main() {
 		}
 
 		// Connect and open standard queues
-		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, config.cf.ReplyQ2, &config.cf.CC)
 	}
 	if err == nil {
 		log.Infoln("Connected to queue manager ", config.cf.QMgrName)

cmd/mq_json/README.md

@@ -85,9 +85,6 @@ For example,
 
 ```
 
-The JSON structure has been substantially changed in this version of
-the monitor program, to give it a more deterministic layout.
-
 As an example of processing the data, this uses the jq program to filter and show
 just the channel name and the number of messages across it at each interval. It
 ignores all the other metrics produced.
@@ -99,6 +96,10 @@ jq -c '.collectionTime.timeStamp as $t | .points[] |
      {"time":$t, "chl":.tags.channel, "msg":.metrics.messages}'
 ```
 
+The configuration option `oneline`can be used to print a complete JSON record as a single
+line instead of pretty-printed across mutiple lines. That might be helpful for some tools that
+ingest JSON and prefer to have a single line inputs.
+
 ## Metrics
 Once the monitor program has been started, you will see metrics being available.
 More information on the metrics collected through the publish/subscribe

cmd/mq_json/config.go

@@ -1,7 +1,7 @@
 package main
 
 /*
-  Copyright (c) IBM Corporation 2016, 2021
+  Copyright (c) IBM Corporation 2016, 2022
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -25,10 +25,12 @@ import (
 type mqTTYConfig struct {
 	cf       cf.Config
 	interval string
+	oneline  bool
 }
 
 type ConfigYJson struct {
 	Interval string
+	OneLine  bool
 }
 
 type mqExporterConfigYaml struct {
@@ -50,6 +52,7 @@ func initConfig() error {
 	cf.InitConfig(&config.cf)
 
 	cf.AddParm(&config.interval, "10s", cf.CP_STR, "ibmmq.interval", "json", "interval", "How long between each collection")
+	cf.AddParm(&config.oneline, false, cf.CP_BOOL, "ibmmq.oneline", "json", "oneline", "JSON output on a single line")
 
 	err = cf.ParseParms()
 
@@ -59,6 +62,7 @@ func initConfig() error {
 			if err == nil {
 				cf.CopyYamlConfig(&config.cf, cfy.Global, cfy.Connection, cfy.Objects)
 				config.interval = cf.CopyParmIfNotSetStr("json", "interval", cfy.JSON.Interval)
+				config.oneline = cf.CopyParmIfNotSetBool("json", "oneline", cfy.JSON.OneLine)
 			}
 		}
 	}

cmd/mq_json/exporter.go

@@ -1,7 +1,7 @@
 package main
 
 /*
-  Copyright (c) IBM Corporation 2016, 2019
+  Copyright (c) IBM Corporation 2016, 2022
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -477,8 +477,13 @@ func Collect() error {
 			}
 		}
 
-		b, _ := json.MarshalIndent(j, "", "  ")
-		fmt.Printf("%s\n", b)
+		if config.oneline {
+			b, _ := json.Marshal(j)
+			fmt.Printf("%s\n", b)
+		} else {
+			b, _ := json.MarshalIndent(j, "", "  ")
+			fmt.Printf("%s\n", b)
+		}
 
 	}
 

cmd/mq_json/main.go

@@ -75,7 +75,7 @@ func main() {
 		log.Infoln("Starting IBM MQ metrics exporter for JSON")
 
 		// Connect and open standard queues
-		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, &config.cf.CC)
+		err = mqmetric.InitConnection(config.cf.QMgrName, config.cf.ReplyQ, config.cf.ReplyQ2, &config.cf.CC)
 	}
 
 	if err == nil {