Skip to content

Commit 7938ac9

Browse files
committed
Move samples to seperate repository
1 parent 8963f7d commit 7938ac9

Some content is hidden

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

52 files changed

+24
-7895
lines changed

CHANGES.md

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* Formatted go code with `go fmt`
88
* Added glide files and vendor directory to handle content dependencies
99
* Rearranged this file
10+
* Removed logging from golang package `mqmetric`
11+
* Moved samples to a separate repository
1012

1113
## March 2018
1214

@@ -24,24 +26,19 @@
2426
## 18 May 2017
2527

2628
* Added the V9.0.3 constant definitions.
27-
* Reinstated 64-bit structure "length" fields in
28-
cmqc.go after fixing a bug in the base product C source code generator.
29+
* Reinstated 64-bit structure "length" fields in cmqc.go after fixing a bug in the base product C source code generator.
2930

3031
## 25 Mar 2017
3132

3233
* Added the metaPrefix option to the Prometheus monitor. This allows selection of non-default resources such as the MQ Bridge for Salesforce included in MQ 9.0.2.
3334

3435
## 15 Feb 2017
35-
* API BREAKING CHANGE: The MQI verbs have been changed to return a single
36-
error indicator instead of two separate values. See mqitest.go for
37-
examples of how MQRC/MQCC codes can now be tested and extracted. This change
38-
makes the MQI implementation a bit more natural for Go environments.
36+
37+
* API BREAKING CHANGE: The MQI verbs have been changed to return a single error indicator instead of two separate values. See mqitest.go for examples of how MQRC/MQCC codes can now be tested and extracted. This change makes the MQI implementation a bit more natural for Go environments.
3938

4039
## 10 Jan 2017
4140

42-
* Added support for the MQCD and MQSCO structures to allow programmable client
43-
connectivity, without requiring a CCDT. See the clientconn sample program
44-
for an example of using the MQCD.
41+
* Added support for the MQCD and MQSCO structures to allow programmable client connectivity, without requiring a CCDT. See the clientconn sample program for an example of using the MQCD.
4542
* Moved sample programs into subdirectory
4643

4744
## 14 Dec 2016
@@ -51,46 +48,36 @@ for an example of using the MQCD.
5148

5249
## 07 Nov 2016
5350

54-
* Added a collector that prints metrics in a simple JSON format.
55-
See the [README](cmd/mq_json/README.md) for more details.
51+
* Added a collector that prints metrics in a simple JSON format. See the [README](cmd/mq_json/README.md) for more details.
5652
* Fixed bug where freespace metrics were showing as non-integer bytes, not percentages
5753

5854
## 17 Oct 2016
5955

60-
* Added some Windows support. An example batch file is included in the mq_influx directory;
61-
changes would be needed to the MQSC script to call it. The other monitor programs can be
62-
supported with similar modifications.
56+
* Added some Windows support. An example batch file is included in the mq_influx directory; changes would be needed to the MQSC script to call it. The other monitor programs can be supported with similar modifications.
6357
* Added a "getting started" section to this README.
6458

6559
## 23 Aug 2016
6660

67-
* Added a collector for Amazon AWS CloudWatch monitoring. See the [README](cmd/mq_aws/README.md)
68-
for more details.
61+
* Added a collector for Amazon AWS CloudWatch monitoring. See the [README](cmd/mq_aws/README.md) for more details.
6962

7063
## 12 Aug 2016
7164

72-
* Added a OpenTSDB monitor. See the [README](cmd/mq_opentsdb/README.md) for
73-
more details.
74-
* Added a Collectd monitor. See the [README](cmd/mq_coll/README.md) for
75-
more details.
76-
* Added MQI MQCNO/MQCSP structures to support client connections and password authentication
77-
with MQCONNX.
65+
* Added a OpenTSDB monitor. See the [README](cmd/mq_opentsdb/README.md) for more details.
66+
* Added a Collectd monitor. See the [README](cmd/mq_coll/README.md) for more details.
67+
* Added MQI MQCNO/MQCSP structures to support client connections and password authentication with MQCONNX.
7868
* Allow client-mode connections from the monitor programs
7969
* Added Grafana dashboards for the different monitors to show how to query them
8070
* Changed database password mechanism so that "exec" maintains the PID for MQ services
8171

8272
## 04 Aug 2016
8373

84-
* Added a monitor command for exporting MQ data to InfluxDB. See the [README]
85-
(cmd/mq_influx/README.md) for more details
86-
* Restructured the monitoring code to put common material in the mqmetric
87-
package, called from the Influx and Prometheus monitors.
74+
* Added a monitor command for exporting MQ data to InfluxDB. See the [README](cmd/mq_influx/README.md) for more details
75+
* Restructured the monitoring code to put common material in the mqmetric package, called from the Influx and Prometheus monitors.
8876

8977
## 25 Jul 2016
9078

9179
* Added functions to handle basic PCF creation and parsing
92-
* Added a monitor command for exporting MQ V9 queue manager data to Prometheus. See
93-
the [README](cmd/mq_prometheus/README.md) for more details
80+
* Added a monitor command for exporting MQ V9 queue manager data to Prometheus. See the [README](cmd/mq_prometheus/README.md) for more details
9481

9582
## 18 Jul 2016
9683

README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ This repository demonstrates how you can call IBM MQ from applications written i
44

55
> **NOTICE**: Please ensure that you use a dependency management tool such as [dep](https://github.com/golang/dep) or [Glide](http://glide.sh/), and add a specific version dependency. The current content has been marked as version 1.0.0, and a new version with breaking changes will be released soon. By using a dependency manager, you can continue to use the old version if you want to.
66
7-
The repository also includes programs to export MQ statistics to some monitoring packages including Prometheus, InfluxDB and OpenTSDB.
7+
This repository previously contained sample programs that exported MQ statistics to some monitoring packages. These have now been moved to a new [GitHub repository called mq-metric-samples](https://github.com/ibm-messaging/mq-metric-samples).
88

9-
A minimum level of MQ V9 is required to build this package.
9+
A minimum level of MQ V9 is required to build these packages.
1010
The monitoring data published by the queue manager is not available before that version; the interface also assumes availability of MQI structures from that level of MQ.
1111

1212
## Health Warning
@@ -25,7 +25,7 @@ Feedback on the utility of this package, thoughts about whether it should be cha
2525

2626
## Using the package
2727

28-
To use code in this repository, you will need to be able to build Go applications, and have a copy of MQ installed to build against. It uses cgo to access the MQI C structures and definitions. It assumes that MQ has been installed in the default location on a Linux platform (/opt/mqm) but you can easily change the cgo directives in the source files if necessary.
28+
To use code in this repository, you will need to be able to build Go applications, and have a copy of MQ installed to build against. It uses cgo to access the MQI C structures and definitions. It assumes that MQ has been installed in the default location on a Linux platform (`/opt/mqm`) but you can easily change the cgo directives in the source files if necessary.
2929

3030
Some Windows capability is also included. This has been tested with Go 1.10 compiler, which now permits standard Windows paths (eg including spaces) so the CGO directives can point at the normal MQ install path.
3131

@@ -94,9 +94,13 @@ If you are unfamiliar with Go, the following steps can help create a working env
9494

9595
```go install ./src/github.com/ibm-messaging/mq-golang/mqmetric```
9696

97-
* Compile the components you are interested in. For example
97+
* Use git to get a get a copy of the MQ samples metric clients in a new directory in the workspace.
9898

99-
```go install ./src/github.com/ibm-messaging/mq-golang/cmd/mq_prometheus```
99+
```git clone https://github.com/ibm-messaging/mq-metric-samples.git src/github.com/ibm-messaging/mq-metric-samples```
100+
101+
* Compile the sample programs you are interested in. For example:
102+
103+
```go install ./src/github.com/ibm-messaging/mq-metric-samples/cmd/mq_prometheus```
100104

101105
At this point, you should have a compiled copy of the code in `$GOPATH/bin`.
102106

0 commit comments

Comments
 (0)