From b17006136837515cc824ae0e44e27fda12c00d29 Mon Sep 17 00:00:00 2001
From: ruflin <spam@ruflin.com>
Date: Fri, 24 Jun 2016 10:55:08 +0200
Subject: [PATCH] Update mysql version dependency to 5.7.12

* Fix failing test because of ucfg change
* Add make env-logs to easier see environment logging information
* Some command cleanup
---
 libbeat/scripts/Makefile                      | 14 ++++++++------
 metricbeat/docker-compose.yml                 |  2 +-
 metricbeat/docs/modules/mysql.asciidoc        |  2 +-
 metricbeat/include/list.go                    |  1 +
 metricbeat/module/mysql/_meta/docs.asciidoc   |  2 +-
 metricbeat/module/mysql/status/status_test.go |  2 +-
 testing/environments/Makefile                 |  4 ++++
 7 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile
index cd921efcfea..14111bb86a8 100755
--- a/libbeat/scripts/Makefile
+++ b/libbeat/scripts/Makefile
@@ -135,9 +135,7 @@ integration-tests: prepare-tests
 
 # Runs the integration inside a virtual environment. This can be run on any docker-machine (local, remote)
 .PHONY: integration-tests-environment
-integration-tests-environment:
-	$(MAKE) prepare-tests
-	$(MAKE) build-image
+integration-tests-environment: prepare-tests build-image
 	${DOCKER_COMPOSE} run beat make integration-tests RACE_DETECTOR=$(RACE_DETECTOR)
 
 # Runs the system tests
@@ -148,9 +146,7 @@ system-tests: buildbeat.test prepare-tests python-env
 
 # Runs the system tests
 .PHONY: system-tests-environment
-system-tests-environment:
-	$(MAKE) prepare-tests
-	$(MAKE) build-image
+system-tests-environment: prepare-tests build-image
 	${DOCKER_COMPOSE} run beat make system-tests;
 
 # Runs system tests without coverage reports and in parallel
@@ -283,6 +279,12 @@ write-environment:
 	echo "ES_USER=beats" >> ${BUILD_DIR}/test.env
 	echo "ES_PASS=testing" >> ${BUILD_DIR}/test.env
 
+# Tails the environment logs
+.PHONY: env-logs
+env-logs:
+	${DOCKER_COMPOSE} logs -f
+
+
 ### Packaging targets ####
 
 # Installs the files that need to get to the home path on installations
diff --git a/metricbeat/docker-compose.yml b/metricbeat/docker-compose.yml
index 7edc56d7303..16f77ad1b34 100644
--- a/metricbeat/docker-compose.yml
+++ b/metricbeat/docker-compose.yml
@@ -41,7 +41,7 @@ mongodb:
   image: mongo:3.0
 
 mysql:
-  image: mysql:5.7.10
+  image: mysql:5.7.12
   environment:
     - MYSQL_ROOT_PASSWORD=test
 
diff --git a/metricbeat/docs/modules/mysql.asciidoc b/metricbeat/docs/modules/mysql.asciidoc
index 3c50a2564cd..3031c73bfcb 100644
--- a/metricbeat/docs/modules/mysql.asciidoc
+++ b/metricbeat/docs/modules/mysql.asciidoc
@@ -21,7 +21,7 @@ DSN is as following:
 [float]
 === Compatibility
 
-The mysql MetricSets were tested with mysql 5.7.10 and are expected to work with all version
+The mysql MetricSets were tested with mysql 5.7.12 and are expected to work with all version
 >= 5.7.0.
 
 
diff --git a/metricbeat/include/list.go b/metricbeat/include/list.go
index d785586d17e..840ac88694e 100644
--- a/metricbeat/include/list.go
+++ b/metricbeat/include/list.go
@@ -20,6 +20,7 @@ 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"
diff --git a/metricbeat/module/mysql/_meta/docs.asciidoc b/metricbeat/module/mysql/_meta/docs.asciidoc
index bcb4eab491e..13e271ce058 100644
--- a/metricbeat/module/mysql/_meta/docs.asciidoc
+++ b/metricbeat/module/mysql/_meta/docs.asciidoc
@@ -16,5 +16,5 @@ DSN is as following:
 [float]
 === Compatibility
 
-The mysql MetricSets were tested with mysql 5.7.10 and are expected to work with all version
+The mysql MetricSets were tested with mysql 5.7.12 and are expected to work with all version
 >= 5.7.0.
diff --git a/metricbeat/module/mysql/status/status_test.go b/metricbeat/module/mysql/status/status_test.go
index 33f9939c645..ca729599535 100644
--- a/metricbeat/module/mysql/status/status_test.go
+++ b/metricbeat/module/mysql/status/status_test.go
@@ -22,7 +22,7 @@ func TestConfigValidation(t *testing.T) {
 				"module":     "mysql",
 				"metricsets": []string{"status"},
 			},
-			err: "missing required field accessing config",
+			err: "missing required field accessing 'hosts'",
 		},
 		{
 			// Invalid DSN
diff --git a/testing/environments/Makefile b/testing/environments/Makefile
index 3aaa2f41070..ee4ae41464c 100644
--- a/testing/environments/Makefile
+++ b/testing/environments/Makefile
@@ -14,3 +14,7 @@ stop:
 clean:
 	docker stop $(shell docker ps -a -q)
 	docker rm -v $(shell docker ps -a -q)
+
+# Tails the environment log files
+logs:
+	${BASE_COMMAND} logs -f