Update for V9.1.2

Add Docker build scripts

Author: ibmmqmet

CHANGELOG.md

@@ -1,30 +1,30 @@
 # Changelog
-## November 2018
+Newest updates are at the top of this file.
 
-* Added "platform" as a tag/label in Prometheus and JSON exporters
+## February 2019
+* Update to use v4.0.1 of the mq-golang repository
+* Update READMEs for all the monitor agent programs
+* Add a Dockerfile and scripts to build the agent binaries in a container
 
 ## November 2018
+* Added "platform" as a tag/label in Prometheus and JSON exporters
 
+## November 2018
 * Updated the JSON monitor sample to support channel status reporting
 * Updated Prometheus and JSON monitors to deal with DISPLAY QSTATUS commands
 * Updated to permit access to z/OS status data.
 
 ## October 2018
-
 * Updated the Prometheus monitor program to support channel status reporting
 * Updated the README for Prometheus for newer build instructions
 * Updated dependencies
 
-
 ## July 2018
-
 * Updated repo to use 2.0.0 version of mq-golang repo
 
 ## July 2018
-
 * Added templates for PR and Issues
 
 ## May 2018
-
 * Initial commit
 * Added Golang dependency management using [dep](https://golang.github.io/dep/)

Dockerfile

@@ -0,0 +1,72 @@
+# © Copyright IBM Corporation 2019
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ARG BASE_IMAGE=ubuntu:18.10
+FROM $BASE_IMAGE
+
+ARG GOPATH_ARG="/go"
+
+ENV GOVERSION=1.10 \
+    GOPATH=$GOPATH_ARG \
+    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; \
+     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME} main restricted" > /etc/apt/sources.list; \
+     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-updates main restricted" >> /etc/apt/sources.list; \
+     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-backports main restricted universe" >> /etc/apt/sources.list; \
+     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME} universe" >> /etc/apt/sources.list; \
+     echo "deb http://archive.ubuntu.com/ubuntu/ ${UBUNTU_CODENAME}-updates universe" >> /etc/apt/sources.list;' \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends \
+    golang-${GOVERSION} \
+    git \
+    ca-certificates \
+    curl \
+    tar \
+    bash \
+    go-dep \
+    build-essential \
+  && rm -rf /var/lib/apt/lists/*
+
+# Create location for the git clone and MQ installation
+RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \
+  && chmod -R 777 $GOPATH \
+  && mkdir -p $GOPATH/src/$ORG \
+  && mkdir -p /opt/mqm \
+  && chmod a+rx /opt/mqm
+
+# Install the MQ client from the Redistributable package. This also contains the
+# header files we need to compile against.
+RUN cd /opt/mqm \
+ && curl -LO "$RDURL/$VRMF-$RDTAR" \
+ && tar -zxf ./*.tar.gz \
+ && rm -f ./*.tar.gz
+
+# Insert the script that will do the build
+COPY buildMonitors.sh $GOPATH
+RUN chmod 777 $GOPATH/buildMonitors.sh
+
+# Copy the rest of the source tree from this directory into the container
+COPY . $GOPATH/src/$ORG/$REPO
+
+# Set the entrypoint to the script that will do the compilation
+ENTRYPOINT $GOPATH/buildMonitors.sh

Gopkg.lock

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

Gopkg.toml

@@ -6,7 +6,7 @@ to provide a program that can be used with existing monitoring technologies
 such as Prometheus, AWS CloudWatch, etc.
 
 These samples were moved to this repository from
-the [IBM® MQ golang metric packages repository](https://github.com/ibm-messaging/mq-golang).
+the [IBM MQ golang metric packages repository](https://github.com/ibm-messaging/mq-golang).
 
 ## Health Warning
 
@@ -15,7 +15,8 @@ There are also no guarantees of compatibility with any future versions of the pa
 interfaces and functions are subject to change based on any feedback.
 
 These samples use a specific version of the `mqmetric` and `ibmmq` golang packages.
-Those packages are in the [mq-golang repository](https://github.com/ibm-messaging/mq-golang).
+Those packages are in the [mq-golang repository](https://github.com/ibm-messaging/mq-golang)
+and are also included in the `vendor` tree of this repository.
 
 ## Getting started
 
@@ -25,7 +26,8 @@ You will require the following programs:
 
 * [dep](https://golang.github.io/dep/) - Golang dependency management tool
 
-If using a version of Go from after 2017, you must set environment variables to permit some compile/link flags. This is due to a security fix in the compiler.
+If using a version of Go from after 2017, you must set environment variables to permit some compile/link flags.
+This is due to a security fix in the compiler.
 
 ```
 export CGO_LDFLAGS_ALLOW="-Wl,-rpath.*"
@@ -41,22 +43,22 @@ git clone https://github.com/ibm-messaging/mq-metric-samples.git src/github.com/
 ```
 
 * Navigate to the mq-metric-samples root directory (`$GOPATH/src/github.com/ibm-messaging/mq-metric-samples`)
-* Run dep to ensure that you have the correct dependencies downloaded:
+* Run `dep` to ensure that you have the correct dependencies downloaded:
 
 ```
 dep ensure
 ```
 
-* Compile the sample program you wish to use. For example to build the mq_prometheus sample:
-
-```
-go install cmd/mq_prometheus
-```
+* Compile the sample program you wish to use. See the README in each directory for more information.
 
 At this point, you should have a compiled copy of the code in `$GOPATH/bin`. Each
 monitor agent directory also has sample scripts, configuration files etc to help
 with getting the agent running in your specific environment.
 
+## Using a Docker container to build the programs
+You can use the `buildMain.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.
+
 ## More information
 Each of the sample monitor programs has its own README file describing the
 capabilities in more detail. In general, the Prometheus monitor program is
@@ -68,12 +70,12 @@ See [CHANGELOG](CHANGELOG.md) in this directory.
 
 ## Issues and Contributions
 
-For feedback and issues relating specifically to this package, please use the [GitHub issue tracker](https://github.com/ibm-messaging/mq-golang/issues).
+For feedback and issues relating specifically to this package, please use the [GitHub issue tracker](https://github.com/ibm-messaging/mq-metric-samples/issues).
 
 Contributions to this package can be accepted under the terms of the IBM Contributor License
 Agreement, found in the [CLA file](CLA.md) of this repository. When submitting a pull request, you
 must include a statement stating you accept the terms in the CLA.
 
 ## Copyright
 
-© Copyright IBM Corporation 2016, 2018
+© Copyright IBM Corporation 2016, 2019

README.md

@@ -0,0 +1,56 @@
+# © Copyright IBM Corporation 2019
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This simple script builds a Docker container whose purpose is simply
+# to compile the binary components of the monitoring programs, and then to copy those
+# programs to a local temporary directory.
+GOPATH="/go"
+
+TAG="mq-metric-samples-gobuild"
+# Assume repo tags have been created in a sensible order
+VER=`git tag -l | sort | tail -1 | sed "s/^v//g"`
+if [ -z "$VER" ]
+then
+  VER="latest"
+fi
+echo "Building container $TAG:$VER"
+
+# Build a container that has all the pieces needed to compile the Go programs for MQ
+docker build --build-arg GOPATH_ARG=$GOPATH -t $TAG:$VER .
+rc=$?
+
+if [ $rc -eq 0 ]
+then
+  # Run the image to do the compilation and extract the files
+  # from it into a local directory mounted into the container.
+  OUTDIR=$HOME/tmp/mq-metric-samples/bin
+  rm -rf $OUTDIR
+  mkdir -p $OUTDIR
+
+  # 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`
+
+  # Set this for any special status
+  extraInfo=""
+
+  # Add "-e MONITORS=..." to only compile a subset of the monitor programs
+  # Mount an output directory
+  # Delete the container once it's done its job
+  docker run --rm \
+          -v $OUTDIR:$GOPATH/bin:z \
+          -e BUILD_EXTRA_INJECT="-X \"main.BuildStamp=$buildStamp $extraInfo\" -X \"main.GitCommit=$gitCommit\"" \
+          $TAG:$VER
+  echo "Compiled programs should now be in $OUTDIR"        
+fi