Update for MQ V9.1.4 and mq-golang/4.1.2

Author: ibmmqmet

Dockerfile

@@ -69,7 +69,7 @@ RUN chmod 777 $GOPATH/buildInDocker.sh
 # make sure it's readable by the user running the container
 ENV  REPO="mq-metric-samples"
 COPY . $GOPATH/src/$ORG/$REPO
-RUN chmod -R a+rx $GOPATH/src/$ORG/$REPO
+RUN chmod -R a+rwx $GOPATH/src/$ORG/$REPO
 
 # Set the entrypoint to the script that will do the compilation
 ENTRYPOINT $GOPATH/buildInDocker.sh

Gopkg.lock

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

Gopkg.toml

@@ -31,6 +31,7 @@
       "hideTimeOverride": true,
       "id": 4,
       "links": [],
+      "options": {},
       "pageSize": null,
       "scroll": true,
       "showHeader": true,
@@ -259,13 +260,15 @@
       "dashes": false,
       "datasource": "MQ Prometheus",
       "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 12,
         "x": 12,
         "y": 0
       },
       "id": 6,
+      "interval": "",
       "legend": {
         "avg": false,
         "current": false,
@@ -279,11 +282,20 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
       "renderer": "flot",
-      "seriesOverrides": [],
+      "seriesOverrides": [
+        {
+          "alias": "/Count/",
+          "nullPointMode": "null as zero",
+          "yaxis": 2
+        }
+      ],
       "spaceLength": 10,
       "stack": false,
       "steppedLine": false,
@@ -294,6 +306,12 @@
           "intervalFactor": 1,
           "legendFormat": "{{channel}} [{{type}}]",
           "refId": "A"
+        },
+        {
+          "expr": "count by (channel)(ibmmq_channel_status)",
+          "instant": false,
+          "legendFormat": "Count: {{channel}}",
+          "refId": "B"
         }
       ],
       "thresholds": [],
@@ -317,15 +335,16 @@
       "yaxes": [
         {
           "format": "s",
-          "label": null,
+          "label": "Time since Msg",
           "logBase": 1,
           "max": null,
           "min": "0",
           "show": true
         },
         {
+          "decimals": 0,
           "format": "short",
-          "label": null,
+          "label": "Chl instances",
           "logBase": 1,
           "max": null,
           "min": null,
@@ -344,6 +363,7 @@
       "dashes": false,
       "datasource": "MQ Prometheus",
       "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 12,
@@ -364,6 +384,9 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -429,6 +452,7 @@
       "dashes": false,
       "datasource": "MQ Prometheus",
       "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 12,
@@ -449,6 +473,9 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -521,6 +548,7 @@
       "dashes": false,
       "datasource": "MQ Prometheus",
       "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 12,
@@ -541,6 +569,9 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -627,6 +658,7 @@
       "dashes": false,
       "datasource": "MQ Prometheus",
       "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 12,
@@ -647,6 +679,9 @@
       "linewidth": 1,
       "links": [],
       "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -713,10 +748,85 @@
         "align": false,
         "alignLevel": null
       }
+    },
+    {
+      "columns": [],
+      "datasource": "MQ Prometheus",
+      "fontSize": "100%",
+      "gridPos": {
+        "h": 6,
+        "w": 12,
+        "x": 5,
+        "y": 16
+      },
+      "id": 14,
+      "options": {},
+      "pageSize": null,
+      "scroll": true,
+      "showHeader": true,
+      "sort": {
+        "col": 0,
+        "desc": true
+      },
+      "styles": [
+        {
+          "alias": "Time",
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "pattern": "Time",
+          "type": "hidden"
+        },
+        {
+          "alias": "Count",
+          "colorMode": "row",
+          "colors": [
+            "rgba(50, 172, 45, 0.97)",
+            "rgba(237, 129, 40, 0.89)",
+            "rgba(245, 54, 54, 0.9)"
+          ],
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "decimals": 0,
+          "mappingType": 1,
+          "pattern": "/Value/",
+          "thresholds": [
+            "7",
+            "200"
+          ],
+          "type": "number",
+          "unit": "short"
+        },
+        {
+          "alias": "Queue Manager",
+          "colorMode": null,
+          "colors": [
+            "rgba(245, 54, 54, 0.9)",
+            "rgba(237, 129, 40, 0.89)",
+            "rgba(50, 172, 45, 0.97)"
+          ],
+          "decimals": 2,
+          "pattern": "/qmgr/",
+          "thresholds": [],
+          "type": "string",
+          "unit": "short"
+        }
+      ],
+      "targets": [
+        {
+          "expr": " count(ibmmq_channel_status) by (qmgr)",
+          "format": "table",
+          "instant": true,
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Total Active Channels",
+      "transform": "table",
+      "type": "table"
     }
   ],
   "refresh": "10s",
-  "schemaVersion": 16,
+  "schemaVersion": 19,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -754,5 +864,5 @@
   "timezone": "",
   "title": "Channel Status",
   "uid": "ik0Jp9-mz",
-  "version": 13
+  "version": 14
 }

cmd/mq_prometheus/Channels-1554192538476.json renamed to cmd/mq_prometheus/Channel Status-1573633353444.json

@@ -82,10 +82,16 @@ The sets of queues can be given either directly on the command line with the
 named on the command line, with the `-ibmmq.monitoredQueuesFile` flag. An
 example is included in the startup shell script.
 
-Note that the queue patterns are expanded only at startup
-of the monitor program. If you want to change the patterns, or new
-queues are defined that match an existing pattern, the monitor must be
-restarted with a `STOP SERVICE` and `START SERVICE` pair of commands.
+### Wildcard Patterns for Queues
+The `ibmmq.monitoredQueues` parameter can include both positive and negative
+wildcards. For example `ibmmq.monitoredQueues=A*,!AB*"` will collect data on
+queues beginning with "AC" or "AD" but not "AB". The full rules for expansion can
+be seen near the bottom of the _discover.go_ module in the _mqmetric_ package.
+
+The queue patterns are expanded at startup of the program and at regular
+intervals thereafter. So newly-defined queues will eventually be monitored if
+they match the pattern. The rediscovery interval is 1h by default, but can be
+modified by the `rediscoverInterval` parameter.
 
 ## Channel Status
 The monitor program can now process channel status, reporting that back into