Skip to content

Commit 2340032

Browse files
committed
Update all exporters to parity. Add YAML configuration option.
Update to use modules with v5.0.0 of mq-golang Update READMEs
1 parent 042f1ef commit 2340032

File tree

737 files changed

+125021
-107191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

737 files changed

+125021
-107191
lines changed

CHANGELOG.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
11
# Changelog
22
Newest updates are at the top of this file.
33

4-
### Apr 02 2020
4+
### Jun 01 2020
5+
* Exporters can have configuration provided in YAML file (`-f <file>`) instead of command line options
6+
* Use modules (go.mod) to define prereqs (ibm-messaging/mq-golang#138)
7+
* Update to use v5.0.0 of the mq-golang repository as the new module format
8+
* Update to use more recent versions of other dependencies
9+
* Exporters now have some specific exit codes (in particular 30 for trying to connect to a standby qmgr) (#35)
10+
* Default exit code for error situation is 1
11+
* New option `-ibmmq.QueueSubscriptionFilter` to restrict subscriptions made for each queue
12+
* Set it to `PUT,GET` for most useful metrics (#34)
13+
* Default is to collect everything including OPENCLOSE and INQSET resources
14+
* Turn off echo when asking for passwords
15+
* All exporters now have comparable function on which objects to monitor
16+
* Some metric names on some exporters will have changed though not on Prometheus
17+
18+
### Apr 02 2020
519
* Update to use v4.1.4 of the mq-golang repository
620

7-
### Jan 09 2020
21+
### Jan 09 2020
822
* Update to use v4.1.3 of the mq-golang repository
923
* mqmetric - Add DESCR attribute from queues and channels to permit labelling in metrics (ibm-messaging/mq-metric-samples#16)
1024

Dockerfile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG BASE_IMAGE=ubuntu:19.04
15+
ARG BASE_IMAGE=ubuntu:19.10
1616
FROM $BASE_IMAGE
1717

1818
ARG GOPATH_ARG="/go"
1919

20-
ENV GOVERSION=1.12 \
20+
ENV GOVERSION=1.13 \
2121
GOPATH=$GOPATH_ARG \
2222
ORG="github.com/ibm-messaging"
2323

@@ -38,7 +38,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
3838
curl \
3939
tar \
4040
bash \
41-
go-dep \
4241
build-essential \
4342
&& rm -rf /var/lib/apt/lists/*
4443

@@ -52,7 +51,7 @@ RUN mkdir -p $GOPATH/src $GOPATH/bin $GOPATH/pkg \
5251
# Location of the downloadable MQ client package \
5352
ENV RDURL="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqdev/redist" \
5453
RDTAR="IBM-MQC-Redist-LinuxX64.tar.gz" \
55-
VRMF=9.1.4.0
54+
VRMF=9.1.5.0
5655

5756
# Install the MQ client from the Redistributable package. This also contains the
5857
# header files we need to compile against.
@@ -65,6 +64,13 @@ RUN cd /opt/mqm \
6564
COPY buildInDocker.sh $GOPATH
6665
RUN chmod 777 $GOPATH/buildInDocker.sh
6766

67+
WORKDIR $GOPATH/src/$ORG/$REPO
68+
COPY go.mod .
69+
COPY go.sum .
70+
RUN chmod 777 go.*
71+
72+
#RUN /usr/lib/go-${GOVERSION}/bin/go mod download
73+
6874
# Copy the rest of the source tree from this directory into the container and
6975
# make sure it's readable by the user running the container
7076
ENV REPO="mq-metric-samples"

Gopkg.lock

Lines changed: 0 additions & 178 deletions
This file was deleted.

Gopkg.toml

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)