Update dependencies (#1905)

* Add .bat to cleanup script
* Replace labix.org/v2 through gopkg.in/mgo.v2 as it allows setting a version number
* A more versions numbers to dependencies and update them
* Fix imports which broke metricbeat crosscompile

glide.yaml

@@ -3,30 +3,42 @@ import:
 - package: github.com/garyburd/redigo
   version: v1.0.0
 - package: gopkg.in/yaml.v2
+  version: a83829b6f1293c91addabc89d0571c246397bbf4
 - package: github.com/nranchev/go-libGeoIP
+  version: c78e8bd2dd3599feb21fd30886043979e82fe948
 - package: golang.org/x/sys
+  version: 62bee037599929a6e9146f29d10dd5208c43507d
   subpackages:
   - /windows/svc
 - package: github.com/stretchr/testify
   version: v1.1.3
   subpackages:
   - /assert
 - package: github.com/davecgh/go-spew
+  version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
   subpackages:
   - /spew
 - package: github.com/stretchr/objx
+  version: 1a9d0bb9f541897e62256577b352fdbc1fb4fd94
 - package: github.com/pmezard/go-difflib
+  version: 792786c7400a136282c1664665ae0a8db921c6c2
   subpackages:
   - /difflib
 - package: github.com/elastic/gosigar
+  version: f42b670971458b6dd33dedff713c0de3c020fabb
 - package: github.com/samuel/go-parser
+  version: ca8abbf65d0e61dedf061f98bd3850f250e27539
 - package: github.com/samuel/go-thrift
   version: 2187045faa54fce7f5028706ffeb2f2fc342aa7e
-  # Alternative name? gopkg.in/mgo.v2 https://github.com/Masterminds/glide/issues/221#issuecomment-179817757
-- package: labix.org/v2/mgo
+  # This is the same as labix.org/v2/mgo. See https://github.com/Masterminds/glide/issues/221#issuecomment-179817757
+- package: gopkg.in/mgo.v2
+  version: 29cc868a5ca65f401ff318143f9408d02f4799cc
 - package: github.com/tsg/gopacket
+  version: 8c16bb8f00ff46af06942df2a8767ba1cf639bdc
 - package: github.com/joeshaw/multierror
+  version: 69b34d4ec901851247ae7e77d33909caf9df99ed
 - package: github.com/andrewkroh/sys
+  version: 287798fe3e430efeb9318b95ff52353aaa2b59b1
   subpackages:
   - /windows/svc/eventlog
 - package: golang.org/x/net

metricbeat/include/list.go

@@ -20,7 +20,6 @@ import (
 	_ "github.com/elastic/beats/metricbeat/module/redis/info"
 	_ "github.com/elastic/beats/metricbeat/module/redis/keyspace"
 	_ "github.com/elastic/beats/metricbeat/module/system"
-	_ "github.com/elastic/beats/metricbeat/module/system/common"
 	_ "github.com/elastic/beats/metricbeat/module/system/core"
 	_ "github.com/elastic/beats/metricbeat/module/system/cpu"
 	_ "github.com/elastic/beats/metricbeat/module/system/diskio"

metricbeat/module/mongodb/status/status.go

@@ -5,8 +5,8 @@ import (
 	"github.com/elastic/beats/metricbeat/mb"
 
 	"github.com/pkg/errors"
-	"labix.org/v2/mgo"
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2/bson"
 )
 
 /*

metricbeat/scripts/generate_imports.py

@@ -31,7 +31,7 @@ def generate(go_beat_path):
 
         # Fetch all metricsets
         for metricset in os.listdir(base_dir + "/" + module):
-            if os.path.isfile(base_dir + "/" + module + "/" + metricset) or metricset == "_meta" or metricset == "vendor":
+            if os.path.isfile(base_dir + "/" + module + "/" + metricset) or metricset == "_meta" or metricset == "vendor"  or metricset == "common":
                 continue
 
             list_file += '	_ "' + go_beat_path + '/module/' + module + '/' + metricset + '"\n'

packetbeat/protos/mongodb/mongodb_parser.go

@@ -8,7 +8,7 @@ import (
 	"github.com/elastic/beats/libbeat/common"
 	"github.com/elastic/beats/libbeat/logp"
 
-	"labix.org/v2/mgo/bson"
+	"gopkg.in/mgo.v2/bson"
 )
 
 func mongodbMessageParser(s *stream) (bool, bool) {

scripts/clean_vendor.sh

@@ -40,3 +40,6 @@ find $DIR_LIST -type f -name "*.txt" -a ! \( -iname "LICENSE.*" -o -iname "CHANG
 
 ## Removing all *.cfg files
 find $DIR_LIST -type f -name "*.cfg" -exec rm -r {} \;
+
+## Removing all *.bat files
+find $DIR_LIST -type f -name "*.bat" -exec rm -r {} \;