Update for MQ 9.2.1

Author: ibmmqmet

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 Newest updates are at the top of this file.
 
+### Dec 04 2020
+* Update to use v5.1.3 of the mq-golang repository
+* Update to use MQ 9.2.1
+* Update YAML processing to better handle missing values as defaults (#50)
+* Add 'host' to Prometheus listener config (#51)
+* URLs pointing at MQ KnowledgeCenter updated 
+
+### Sep 10 2020
+* Update to use v5.1.2 of the mq-golang repository
+
 ### Aug 10 2020
 * Update to use v5.1.1 of the mq-golang repository
 * Moved build shell commands to `scripts` subdirectory and added README there

Dockerfile.build

@@ -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.2.0.0
+    VRMF=9.2.1.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.0.0
+    VRMF=9.2.1.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

README.md

@@ -78,6 +78,21 @@ There is a `buildMonitors.bat` file that may help with building on Windows. It a
 the [tdm-gcc-64](https://jmeubank.github.io/tdm-gcc/download/) 64-bit compiler suite installed. It
 builds all the collectors and corresponding YAML configuration files into %GOPATH%/bin
 
+## Queue manager configuration
+When metrics are being collected from the publish/subscribe interface (all platforms except z/OS),
+there are some considerations:
+* MAXHANDS on queue manager: Each subscription uses an object handle. If many queues are being monitored
+the default MAXHANDS may need to be increased. A warning is printed if the monitor thinks this attribute
+appears too low.
+* MAXDEPTH on model queues: The model queue used as the basis for publication and reply queues in the
+monitor must have a MAXDEPTH suitable for the expected amount of data. For published metrics, this is
+estimated based on holding one minute's amount of publications; the number of monitored channels is also
+used as an estimate, although that does not need to be time-based as the data is requested directly by the
+monitor.
+* USEDLQ on the admin topic: The USEDLQ attribute on the topic object associated with the metrics publications (usually
+SYSTEM.ADMIN.TOPIC) determines what happens if the subscriber's queue is full. You might prefer to set this to
+NO to avoid filling the system DLQ if the collection program does not read the publications frequently enough.
+
 ## Monitor configuration
 The monitors always collect all of the available queue manager-wide metrics.
 They can also be configured to collect statistics for specific sets of queues where

cmd/mq_aws/README.md

@@ -63,10 +63,8 @@ The example Grafana dashboard shows how queries can be constructed to extract da
 about specific queues or the queue manager.
 
 More information on the metrics collected through the publish/subscribe
-interface can be found in the [MQ KnowledgeCenter]
-(https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.mon.doc/mo00013_.htm)
-with further description in [an MQDev blog entry]
-(https://www.ibm.com/developerworks/community/blogs/messaging/entry/Statistics_published_to_the_system_topic_in_MQ_v9?lang=en)
+interface can be found in the [MQ KnowledgeCenter](https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.mon.doc/mo00013_.htm)
+with further description in [an MQDev blog entry](https://www.ibm.com/developerworks/community/blogs/messaging/entry/Statistics_published_to_the_system_topic_in_MQ_v9?lang=en)
 
 The metrics stored in the database are named after the
 descriptions that you can see when running the amqsrua sample program, but with some

cmd/mq_coll/README.md

@@ -55,10 +55,8 @@ The example Grafana dashboard shows how queries can be constructed to extract da
 about specific queues or the queue manager.
 
 More information on the metrics collected through the publish/subscribe
-interface can be found in the [MQ KnowledgeCenter]
-(https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.mon.doc/mo00013_.htm)
-with further description in [an MQDev blog entry]
-(https://www.ibm.com/developerworks/community/blogs/messaging/entry/Statistics_published_to_the_system_topic_in_MQ_v9?lang=en)
+interface can be found in the [MQ KnowledgeCenter](https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.mon.doc/mo00013_.htm)
+with further description in [an MQDev blog entry](https://www.ibm.com/developerworks/community/blogs/messaging/entry/Statistics_published_to_the_system_topic_in_MQ_v9?lang=en)
 
 The metrics stored in the database are named after the
 descriptions that you can see when running the amqsrua sample program, but with some

cmd/mq_influx/README.md

@@ -59,10 +59,8 @@ The example Grafana dashboard shows how queries can be constructed to extract da
 about specific objects or the queue manager.
 
 More information on the metrics collected through the publish/subscribe
-interface can be found in the [MQ KnowledgeCenter]
-(https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.mon.doc/mo00013_.htm)
-with further description in [an MQDev blog entry]
-(https://www.ibm.com/developerworks/community/blogs/messaging/entry/Statistics_published_to_the_system_topic_in_MQ_v9?lang=en)
+interface can be found in the [MQ KnowledgeCenter](https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.mon.doc/mo00013_.htm)
+with further description in [an MQDev blog entry](https://www.ibm.com/developerworks/community/blogs/messaging/entry/Statistics_published_to_the_system_topic_in_MQ_v9?lang=en)
 
 The metrics stored in the Influx database are named after the
 descriptions that you can see when running the amqsrua sample program, but with some

cmd/mq_json/README.md

@@ -102,10 +102,8 @@ jq -c '.collectionTime.timeStamp as $t | .points[] |
 ## Metrics
 Once the monitor program has been started, you will see metrics being available.
 More information on the metrics collected through the publish/subscribe
-interface can be found in the [MQ KnowledgeCenter]
-(https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.mon.doc/mo00013_.htm)
-with further description in [an MQDev blog entry]
-(https://www.ibm.com/developerworks/community/blogs/messaging/entry/Statistics_published_to_the_system_topic_in_MQ_v9?lang=en)
+interface can be found in the [MQ KnowledgeCenter](https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.mon.doc/mo00013_.htm)
+with further description in [an MQDev blog entry](https://www.ibm.com/developerworks/community/blogs/messaging/entry/Statistics_published_to_the_system_topic_in_MQ_v9?lang=en)
 
 The metrics printed are named after the
 descriptions that you can see when running the amqsrua sample program, but with some

cmd/mq_opentsdb/README.md

@@ -56,10 +56,8 @@ The example Grafana dashboard shows how queries can be constructed to extract da
 about specific object or the queue manager.
 
 More information on the metrics collected through the publish/subscribe
-interface can be found in the [MQ KnowledgeCenter]
-(https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.mon.doc/mo00013_.htm)
-with further description in [an MQDev blog entry]
-(https://www.ibm.com/developerworks/community/blogs/messaging/entry/Statistics_published_to_the_system_topic_in_MQ_v9?lang=en)
+interface can be found in the [MQ KnowledgeCenter](https://www.ibm.com/support/knowledgecenter/SSFKSJ_latest/com.ibm.mq.mon.doc/mo00013_.htm)
+with further description in [an MQDev blog entry](https://www.ibm.com/developerworks/community/blogs/messaging/entry/Statistics_published_to_the_system_topic_in_MQ_v9?lang=en)
 
 The metrics stored in the database are named after the
 descriptions that you can see when running the amqsrua sample program, but with some

go.mod

@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/aws/aws-sdk-go v1.30.18
-	github.com/ibm-messaging/mq-golang/v5 v5.1.2
+	github.com/ibm-messaging/mq-golang/v5 v5.1.3
 	github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d
 	github.com/prometheus/client_golang v1.6.0
 	github.com/sirupsen/logrus v1.5.0