diff --git a/cmd/scollector/collectors/keepalived_linux.go b/cmd/scollector/collectors/keepalived_linux.go index 0df5a2e522..e9d51d4330 100644 --- a/cmd/scollector/collectors/keepalived_linux.go +++ b/cmd/scollector/collectors/keepalived_linux.go @@ -5,10 +5,9 @@ import ( "reflect" "strings" - "bosun.org/_third_party/github.com/mjibson/snmp" - "bosun.org/metadata" "bosun.org/opentsdb" + "bosun.org/snmp" ) type VRRPInstanceEntry struct { diff --git a/cmd/scollector/collectors/snmp.go b/cmd/scollector/collectors/snmp.go index ca5b3fc1eb..122ef0afd3 100644 --- a/cmd/scollector/collectors/snmp.go +++ b/cmd/scollector/collectors/snmp.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "bosun.org/_third_party/github.com/mjibson/snmp" "bosun.org/cmd/scollector/conf" "bosun.org/metadata" "bosun.org/opentsdb" + "bosun.org/snmp" ) var builtInSNMPs = map[string]func(cfg conf.SNMP){ diff --git a/cmd/scollector/collectors/snmp_ciscobgp.go b/cmd/scollector/collectors/snmp_ciscobgp.go index 6213cec465..f585041941 100644 --- a/cmd/scollector/collectors/snmp_ciscobgp.go +++ b/cmd/scollector/collectors/snmp_ciscobgp.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "bosun.org/_third_party/github.com/mjibson/snmp" "bosun.org/cmd/scollector/conf" "bosun.org/metadata" "bosun.org/opentsdb" + "bosun.org/snmp" ) func SNMPCiscoBGP(cfg conf.SNMP) { diff --git a/_third_party/github.com/mjibson/snmp/asn1/LICENSE b/snmp/asn1/LICENSE similarity index 100% rename from _third_party/github.com/mjibson/snmp/asn1/LICENSE rename to snmp/asn1/LICENSE diff --git a/_third_party/github.com/mjibson/snmp/asn1/asn1.go b/snmp/asn1/asn1.go similarity index 100% rename from _third_party/github.com/mjibson/snmp/asn1/asn1.go rename to snmp/asn1/asn1.go diff --git a/_third_party/github.com/mjibson/snmp/asn1/asn1_test.go b/snmp/asn1/asn1_test.go similarity index 100% rename from _third_party/github.com/mjibson/snmp/asn1/asn1_test.go rename to snmp/asn1/asn1_test.go diff --git a/_third_party/github.com/mjibson/snmp/asn1/common.go b/snmp/asn1/common.go similarity index 100% rename from _third_party/github.com/mjibson/snmp/asn1/common.go rename to snmp/asn1/common.go diff --git a/_third_party/github.com/mjibson/snmp/asn1/marshal.go b/snmp/asn1/marshal.go similarity index 100% rename from _third_party/github.com/mjibson/snmp/asn1/marshal.go rename to snmp/asn1/marshal.go diff --git a/_third_party/github.com/mjibson/snmp/asn1/marshal_test.go b/snmp/asn1/marshal_test.go similarity index 100% rename from _third_party/github.com/mjibson/snmp/asn1/marshal_test.go rename to snmp/asn1/marshal_test.go diff --git a/_third_party/github.com/mjibson/snmp/get.go b/snmp/get.go similarity index 96% rename from _third_party/github.com/mjibson/snmp/get.go rename to snmp/get.go index 4ca61bdbb6..78427bac94 100644 --- a/_third_party/github.com/mjibson/snmp/get.go +++ b/snmp/get.go @@ -3,7 +3,7 @@ package snmp import ( "fmt" - "bosun.org/_third_party/github.com/mjibson/snmp/mib" + "bosun.org/snmp/mib" ) // Get is a wrapper for SNMP.Get. diff --git a/_third_party/github.com/mjibson/snmp/get_test.go b/snmp/get_test.go similarity index 98% rename from _third_party/github.com/mjibson/snmp/get_test.go rename to snmp/get_test.go index 9dd9d618e0..68de3acfcf 100644 --- a/_third_party/github.com/mjibson/snmp/get_test.go +++ b/snmp/get_test.go @@ -86,7 +86,7 @@ func TestCommunity(t *testing.T) { ch <- test }() } - for _ = range communityTests { + for range communityTests { test := <-ch if (test.err == nil) != test.ok { t.Errorf("%s invalid err: %s", test.str, test.err) diff --git a/_third_party/github.com/mjibson/snmp/mib/mib.go b/snmp/mib/mib.go similarity index 97% rename from _third_party/github.com/mjibson/snmp/mib/mib.go rename to snmp/mib/mib.go index 4212639068..fa9d7ebb39 100644 --- a/_third_party/github.com/mjibson/snmp/mib/mib.go +++ b/snmp/mib/mib.go @@ -9,7 +9,7 @@ import ( "strings" "sync" - "bosun.org/_third_party/github.com/mjibson/snmp/asn1" + "bosun.org/snmp/asn1" ) var mibDir = "" diff --git a/_third_party/github.com/mjibson/snmp/mib/mib_test.go b/snmp/mib/mib_test.go similarity index 97% rename from _third_party/github.com/mjibson/snmp/mib/mib_test.go rename to snmp/mib/mib_test.go index 3ead155a8f..ac1ec3a79c 100644 --- a/_third_party/github.com/mjibson/snmp/mib/mib_test.go +++ b/snmp/mib/mib_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "bosun.org/_third_party/github.com/mjibson/snmp/asn1" + "bosun.org/snmp/asn1" ) type LookupTest struct { diff --git a/_third_party/github.com/mjibson/snmp/snmp.go b/snmp/snmp.go similarity index 99% rename from _third_party/github.com/mjibson/snmp/snmp.go rename to snmp/snmp.go index 71631dc957..92a690c253 100644 --- a/_third_party/github.com/mjibson/snmp/snmp.go +++ b/snmp/snmp.go @@ -7,7 +7,7 @@ import ( "net" "time" - "bosun.org/_third_party/github.com/mjibson/snmp/asn1" + "bosun.org/snmp/asn1" ) // reserved binding values. diff --git a/_third_party/github.com/mjibson/snmp/snmp_test.go b/snmp/snmp_test.go similarity index 100% rename from _third_party/github.com/mjibson/snmp/snmp_test.go rename to snmp/snmp_test.go diff --git a/_third_party/github.com/mjibson/snmp/walk.go b/snmp/walk.go similarity index 98% rename from _third_party/github.com/mjibson/snmp/walk.go rename to snmp/walk.go index 556bb601cd..4fdae72ed7 100644 --- a/_third_party/github.com/mjibson/snmp/walk.go +++ b/snmp/walk.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "bosun.org/_third_party/github.com/mjibson/snmp/asn1" - "bosun.org/_third_party/github.com/mjibson/snmp/mib" + "bosun.org/snmp/asn1" + "bosun.org/snmp/mib" ) // Walk is a wrapper for SNMP.Walk. diff --git a/_third_party/github.com/mjibson/snmp/walk_test.go b/snmp/walk_test.go similarity index 100% rename from _third_party/github.com/mjibson/snmp/walk_test.go rename to snmp/walk_test.go