Update for MQ V9.1.3, mq-golang 4.0.8

Author: ibmmqmet

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 Newest updates are at the top of this file.
 
+### Jul 11 2019
+* Update to use v4.0.8 of the mq-golang repository
+* Enable use of USAGE queue attribute
+  * Supported in the Prometheus and JSON monitors
+* Don't give a visible error from setmqenv if queue manager remote
+
 ### Jun 24 2019
 * Update to use v4.0.7 of the mq-golang repository
 * Enable time-based re-expansion of queue wildcards while monitors are running

Dockerfile

@@ -22,11 +22,6 @@ ENV GOVERSION=1.10 \
     ORG="github.com/ibm-messaging" \
     REPO="mq-metric-samples"
 
-# 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.2.0
-
 # Install the Go compiler and Git
 RUN export DEBIAN_FRONTEND=noninteractive \
   && bash -c 'source /etc/os-release; \
@@ -54,6 +49,11 @@ RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \
   && mkdir -p /opt/mqm \
   && chmod a+rx /opt/mqm
 
+# 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.3.0
+
 # Install the MQ client from the Redistributable package. This also contains the
 # header files we need to compile against.
 RUN cd /opt/mqm \

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "github.com/ibm-messaging/mq-golang"
-  version = "4.0.7"
+  version = "4.0.8"
 
 [prune]
   go-tests = true

Gopkg.toml

@@ -17,10 +17,12 @@ and are also included in the `vendor` tree of this repository.
 
 ## Getting started
 
-### Sample requirements
+### Requirements
 
 You will require the following programs:
 
+* Go compiler. This should be at least version 10. If you see an error similar to "ld: NULL not defined"
+then it is likely you need to upgrade your compiler.
 * [dep](https://golang.github.io/dep/) - Golang dependency management tool
 
 To build the programs on Linux and MacOS, you must set an environment variable to permit some compile/link flags.
@@ -54,7 +56,8 @@ with getting the agent running in your specific environment.
 
 ## Using a Docker container to build the programs
 You can use the `buildMonitors.sh` script in this directory to build a Docker container that
-in turn will build the binary programs and copy them to a local directory.
+in turn will build the binary programs and copy them to a local directory. That script also
+sets some extra version-related flags that will be shown when the program starts.
 
 ## More information
 Each of the sample monitor programs has its own README file describing the

README.md

@@ -61,6 +61,9 @@ then
   # Get some variables to pass the build information into the compile steps
   buildStamp=`date +%Y%m%d-%H%M%S`
   gitCommit=`git rev-list -1 HEAD --abbrev-commit`
+  hw=`uname -i`
+  os=`uname -s`
+  bp="$os/$hw"
 
   # Set this for any special status
   extraInfo=""
@@ -71,7 +74,7 @@ then
   docker run --rm \
           --user $uid:$gid \
           -v $OUTDIR:$GOPATH/bin \
-          -e BUILD_EXTRA_INJECT="-X \"main.BuildStamp=$buildStamp $extraInfo\" -X \"main.GitCommit=$gitCommit\"" \
+          -e BUILD_EXTRA_INJECT="-X \"main.BuildStamp=$buildStamp $extraInfo\" -X \"main.BuildPlatform=$bp\" -X \"main.GitCommit=$gitCommit\"" \
           $TAG:$VER
   echo "Compiled programs should now be in $OUTDIR"
 fi

buildMonitors.sh

@@ -19,16 +19,17 @@ package main
 */
 
 import (
-	"fmt"
 	"os"
 	"time"
 
 	"github.com/ibm-messaging/mq-golang/mqmetric"
+	cf "github.com/ibm-messaging/mq-metric-samples/pkg/config"
 	log "github.com/sirupsen/logrus"
 )
 
 var BuildStamp string
 var GitCommit string
+var BuildPlatform string
 
 func initLog() {
 	level, err := log.ParseLevel(config.logLevel)
@@ -38,21 +39,10 @@ func initLog() {
 	log.SetLevel(level)
 }
 
-func printInfo(title string, stamp string, commit string) {
-	fmt.Println(title)
-	if stamp != "" {
-		fmt.Println("Build        : " + stamp)
-	}
-	if commit != "" {
-		fmt.Println("Commit Level : " + commit)
-	}
-	fmt.Println("")
-}
-
 func main() {
 	var err error
 
-	printInfo("IBM MQ metrics exporter for AWS CloudWatch monitoring", BuildStamp, GitCommit)
+	cf.PrintInfo("IBM MQ metrics exporter for AWS CloudWatch monitoring", BuildStamp, GitCommit, BuildPlatform)
 
 	initConfig()
 	initLog()

cmd/mq_aws/main.go

@@ -7,7 +7,12 @@
 qMgr=$1
 
 # Set the environment to ensure we pick up libmqm.so etc
-. /opt/mqm/bin/setmqenv -m $qMgr -k
+# If this is a client connection, then deal with no known qmgr of the given name.
+. /opt/mqm/bin/setmqenv -m $qMgr -k >/dev/null 2>&1
+if [ $? -ne 0 ]
+then
+  . /opt/mqm/bin/setmqenv -s -k
+fi
 
 # A list of queues to be monitored is given here.
 # It is a set of names or patterns ('*' only at the end, to match how MQ works),

cmd/mq_aws/mq_aws.sh

@@ -19,16 +19,17 @@ package main
 */
 
 import (
-	"fmt"
 	"os"
 	"time"
 
 	"github.com/ibm-messaging/mq-golang/mqmetric"
+	cf "github.com/ibm-messaging/mq-metric-samples/pkg/config"
 	log "github.com/sirupsen/logrus"
 )
 
 var BuildStamp string
 var GitCommit string
+var BuildPlatform string
 
 func initLog() {
 	level, err := log.ParseLevel(config.logLevel)
@@ -41,21 +42,10 @@ func initLog() {
 	log.SetOutput(os.Stderr)
 }
 
-func printInfo(title string, stamp string, commit string) {
-	fmt.Println(title)
-	if stamp != "" {
-		fmt.Println("Build        : " + stamp)
-	}
-	if commit != "" {
-		fmt.Println("Commit Level : " + commit)
-	}
-	fmt.Println("")
-}
-
 func main() {
 	var err error
 
-	printInfo("IBM MQ metrics exporter for collectd", BuildStamp, GitCommit)
+	cf.PrintInfo("IBM MQ metrics exporter for collectd", BuildStamp, GitCommit, BuildPlatform)
 
 	initConfig()
 	initLog()

cmd/mq_coll/main.go

@@ -10,7 +10,12 @@ qMgr=$1
 # Set the environment to ensure we pick up libmqm.so etc
 # This assumes there is an MQ installation in the default location, even
 # if it is not the one associated with the queue manager
-. /opt/mqm/bin/setmqenv -m $qMgr -k
+# If this is a client connection, then deal with no known qmgr of the given name.
+. /opt/mqm/bin/setmqenv -m $qMgr -k >/dev/null 2>&1
+if [ $? -ne 0 ]
+then
+  . /opt/mqm/bin/setmqenv -s -k
+fi
 
 # A list of queues to be monitored is given here.
 # It is a set of names or patterns ('*' only at the end, to match how MQ works),