Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mysql version dependency to 5.7.12 #1904

Merged
merged 1 commit into from
Jun 24, 2016
Merged

Update mysql version dependency to 5.7.12 #1904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions libbeat/scripts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/mysql.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.


Expand Down
1 change: 1 addition & 0 deletions metricbeat/include/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/mysql/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion metricbeat/module/mysql/status/status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions testing/environments/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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