Merge pull request #36 from sdmarshall79/dev

parrobe · web-flow · commit 691ea529b032 · 2018-05-15T11:47:02.000+02:00
Fix imports for mqmetric and ibmmq
diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ the Git client, and the C compiler.
 workspace. Use "src" as the destination, to get the directory created
 automatically; this path will then be searched by the Go compiler.
 
-  git clone http://github.com/ibm-messaging/mq-golang src
+  git clone https://github.com/ibm-messaging/mq-golang.git src/github.com/ibm-messaging/mq-golang
 
 * Use Go to download prerequisite components for any monitors you are interested
 in running. The logrus package is required for all of the monitors; but not
@@ -112,7 +112,7 @@ all of the monitors require further downloads.
 
 * Compile the components you are interested in. For example
 
-  go install ./src/cmd/mq_prometheus
+  go install ./src/github.com/ibm-messaging/mq-golang/cmd/mq_prometheus
 
 At this point, you should have a compiled copy of the code in $GOPATH/bin.
 
@@ -138,4 +138,3 @@ For feedback and issues relating specifically to this package, please use the [G
 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.
-
diff --git a/cmd/mq_aws/config.go b/cmd/mq_aws/config.go
@@ -20,7 +20,8 @@ package main
 
 import (
 	"flag"
-	"mqmetric"
+
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 type mqCloudWatchConfig struct {
diff --git a/cmd/mq_aws/exporter.go b/cmd/mq_aws/exporter.go
@@ -26,12 +26,13 @@ and update the various data points.
 */
 
 import (
+	"time"
+
 	log "github.com/Sirupsen/logrus"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
-	"mqmetric"
-	"time"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 type client struct {
diff --git a/cmd/mq_aws/main.go b/cmd/mq_aws/main.go
@@ -19,10 +19,11 @@ package main
 */
 
 import (
-	log "github.com/Sirupsen/logrus"
-	"mqmetric"
 	"os"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 func initLog() {
diff --git a/cmd/mq_coll/config.go b/cmd/mq_coll/config.go
@@ -20,8 +20,9 @@ package main
 
 import (
 	"flag"
-	"mqmetric"
 	"os"
+
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 type mqTTYConfig struct {
diff --git a/cmd/mq_coll/exporter.go b/cmd/mq_coll/exporter.go
@@ -26,9 +26,10 @@ and update the various data points.
 
 import (
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"mqmetric"
 	"strings"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 var (
diff --git a/cmd/mq_coll/main.go b/cmd/mq_coll/main.go
@@ -19,10 +19,11 @@ package main
 */
 
 import (
-	log "github.com/Sirupsen/logrus"
-	"mqmetric"
 	"os"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 func initLog() {
diff --git a/cmd/mq_influx/config.go b/cmd/mq_influx/config.go
@@ -21,10 +21,11 @@ package main
 import (
 	"bufio"
 	"flag"
-	log "github.com/Sirupsen/logrus"
-	"mqmetric"
 	"os"
 	"strings"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 type mqInfluxConfig struct {
diff --git a/cmd/mq_influx/exporter.go b/cmd/mq_influx/exporter.go
@@ -26,10 +26,11 @@ and update the various data points.
 */
 
 import (
+	"time"
+
 	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 	client "github.com/influxdata/influxdb/client/v2"
-	"mqmetric"
-	"time"
 )
 
 var (
diff --git a/cmd/mq_influx/main.go b/cmd/mq_influx/main.go
@@ -19,11 +19,11 @@ package main
 */
 
 import (
-	log "github.com/Sirupsen/logrus"
-	"github.com/influxdata/influxdb/client/v2"
-	"mqmetric"
 	"os"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 func initLog() {
diff --git a/cmd/mq_json/config.go b/cmd/mq_json/config.go
@@ -20,7 +20,8 @@ package main
 
 import (
 	"flag"
-	"mqmetric"
+
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 type mqTTYConfig struct {
diff --git a/cmd/mq_json/exporter.go b/cmd/mq_json/exporter.go
@@ -26,11 +26,12 @@ and update the various data points.
 
 import (
 	"fmt"
-	log "github.com/Sirupsen/logrus"
 	"math"
-	"mqmetric"
 	"strings"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 var (
diff --git a/cmd/mq_json/main.go b/cmd/mq_json/main.go
@@ -19,10 +19,11 @@ package main
 */
 
 import (
-	log "github.com/Sirupsen/logrus"
-	"mqmetric"
 	"os"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 func initLog() {
diff --git a/cmd/mq_opentsdb/config.go b/cmd/mq_opentsdb/config.go
@@ -21,10 +21,11 @@ package main
 import (
 	"bufio"
 	"flag"
-	log "github.com/Sirupsen/logrus"
-	"mqmetric"
 	"os"
 	"strings"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 type mqOpenTSDBConfig struct {
diff --git a/cmd/mq_opentsdb/exporter.go b/cmd/mq_opentsdb/exporter.go
@@ -27,12 +27,13 @@ and update the various data points.
 
 import (
 	"bytes"
-	log "github.com/Sirupsen/logrus"
 	"io/ioutil"
-	"mqmetric"
 	"net/http"
 	"net/url"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 type client struct {
diff --git a/cmd/mq_opentsdb/main.go b/cmd/mq_opentsdb/main.go
@@ -19,10 +19,11 @@ package main
 */
 
 import (
-	log "github.com/Sirupsen/logrus"
-	"mqmetric"
 	"os"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 func initLog() {
diff --git a/cmd/mq_prometheus/config.go b/cmd/mq_prometheus/config.go
@@ -22,8 +22,9 @@ import (
 	"bufio"
 	"flag"
 	"fmt"
-	"mqmetric"
 	"os"
+
+	"github.com/ibm-messaging/mq-golang/mqmetric"
 )
 
 type mqExporterConfig struct {
diff --git a/cmd/mq_prometheus/exporter.go b/cmd/mq_prometheus/exporter.go
@@ -26,11 +26,12 @@ and update the various Gauges.
 */
 
 import (
-	log "github.com/Sirupsen/logrus"
-	"github.com/prometheus/client_golang/prometheus"
-	"mqmetric"
 	"strings"
 	"sync"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 type exporter struct {
diff --git a/cmd/mq_prometheus/main.go b/cmd/mq_prometheus/main.go
@@ -19,11 +19,12 @@ package main
 */
 
 import (
-	log "github.com/Sirupsen/logrus"
-	"github.com/prometheus/client_golang/prometheus"
-	"mqmetric"
 	"net/http"
 	"os"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/mqmetric"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
 func initLog() {
diff --git a/cmd/samples/clientconn/clientconn.go b/cmd/samples/clientconn/clientconn.go
@@ -39,9 +39,10 @@ package main
 import (
 	"bufio"
 	"fmt"
-	"ibmmq"
 	"os"
 	"time"
+
+	"github.com/ibm-messaging/mq-golang/ibmmq"
 )
 
 func main() {
diff --git a/cmd/samples/mqitest/mqitest.go b/cmd/samples/mqitest/mqitest.go
@@ -38,9 +38,10 @@ package main
 
 import (
 	"fmt"
-	"ibmmq"
 	"os"
 	"strings"
+
+	"github.com/ibm-messaging/mq-golang/ibmmq"
 )
 
 func main() {
diff --git a/mqmetric/discover.go b/mqmetric/discover.go
@@ -34,10 +34,11 @@ give a good demonstration of the process, which is followed here.
 import (
 	"bufio"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"ibmmq"
 	"os"
 	"strings"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/ibm-messaging/mq-golang/ibmmq"
 )
 
 // MonElement describes the real metric element generated by MQ
diff --git a/mqmetric/mqif.go b/mqmetric/mqif.go
@@ -25,7 +25,7 @@ don't need to repeat common setups eg of MQMD or MQSD structures.
 
 import (
 	log "github.com/Sirupsen/logrus"
-	"ibmmq"
+	"github.com/ibm-messaging/mq-golang/ibmmq"
 )
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,8 @@ package main`
`20`	`20`
`21`	`21`	`import (`
`22`	`22`	`"flag"`
`23`		`- "mqmetric"`
	`23`	`+`
	`24`	`+ "github.com/ibm-messaging/mq-golang/mqmetric"`
`24`	`25`	`)`
`25`	`26`
`26`	`27`	`type mqCloudWatchConfig struct {`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,9 @@ package main`
`20`	`20`
`21`	`21`	`import (`
`22`	`22`	`"flag"`
`23`		`- "mqmetric"`
`24`	`23`	`"os"`
	`24`	`+`
	`25`	`+ "github.com/ibm-messaging/mq-golang/mqmetric"`
`25`	`26`	`)`
`26`	`27`
`27`	`28`	`type mqTTYConfig struct {`