feat: bump stack to 7.7

We were suffering this bug in metricbeat 7.6.0: elastic/beats#17261
mdelapenya · May 18, 2020 · 3707c07 · 3707c07
1 parent fb044e2
commit 3707c07
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile
@@ -27,8 +27,8 @@ pipeline {
     choice(name: 'LOG_LEVEL', choices: ['INFO', 'DEBUG'], description: 'Log level to be used')
     choice(name: 'QUERY_MAX_ATTEMPTS', choices: ['5', '10', '20'], description: 'Number of attempts to create the connection to Elasticsearch')
     choice(name: 'RETRY_TIMEOUT', choices: ['3', '5', '7', '11'], description: 'Number of seconds between retry')
-    string(name: 'STACK_VERSION', defaultValue: '7.6.0', description: 'SemVer version of the stack to be used.')
-    string(name: 'METRICBEAT_VERSION', defaultValue: '7.6.0', description: 'SemVer version of the metricbeat to be used.')
+    string(name: 'STACK_VERSION', defaultValue: '7.7.0', description: 'SemVer version of the stack to be used.')
+    string(name: 'METRICBEAT_VERSION', defaultValue: '7.7.0', description: 'SemVer version of the metricbeat to be used.')
     string(name: 'HELM_CHART_VERSION', defaultValue: '7.6.1', description: 'SemVer version of Helm chart to be used.')
     string(name: 'HELM_VERSION', defaultValue: '2.16.3', description: 'SemVer version of Helm to be used.')
     string(name: 'KIND_VERSION', defaultValue: '0.7.0', description: 'SemVer version of Kind to be used.')

diff --git a/.ci/scripts/functional-test.sh b/.ci/scripts/functional-test.sh
@@ -11,8 +11,8 @@ set -euxo pipefail
 
 GO_VERSION=${1:?GO_VERSION is not set}
 FEATURE=${2:-''}
-STACK_VERSION=${3:-'7.6.0'}
-METRICBEAT_VERSION=${4:-'7.6.0'}
+STACK_VERSION=${3:-'7.7.0'}
+METRICBEAT_VERSION=${4:-'7.7.0'}
 TARGET_OS=${GOOS:-linux}
 TARGET_ARCH=${GOARCH:-amd64}
 

diff --git a/cli/config/compose/services/logstash/docker-compose.yml b/cli/config/compose/services/logstash/docker-compose.yml
@@ -3,7 +3,6 @@ services:
   logstash:
     image: docker.elastic.co/logstash/logstash:${logstashTag}
     environment:
-      - monitoring.enabled=${xpackMonitoring:-true}
       - monitoring.logstash.collection.enabled=${xpackMonitoring:-true}
       - monitoringEsHost=${monitoringEsHost:-elasticsearch}
       - monitoringEsPort=${monitoringEsPort:-9200}

diff --git a/e2e/README.md b/e2e/README.md
@@ -96,8 +96,8 @@ At this moment, the CLI and the functional tests coexist in the same repository,
 ```shell
 $ export GO111MODULE=on                            # Go modules support
 $ make -C cli install                              # installs CLI dependencies
-$ export STACK_VERSION=7.6.0                       # exports stack version as runtime
-$ export METRICBEAT_VERSION=7.6.0                  # exports metricbeat version to be tested
+$ export STACK_VERSION=7.7.0                       # exports stack version as runtime
+$ export METRICBEAT_VERSION=7.7.0                  # exports metricbeat version to be tested
 $ # export FEATURE=redis                           # exports which feature to run (default 'all')
 $ # export GOOS=darwin                             # exports your O.S. (default 'linux', valid: [darwin, linux, windows])
 $ # export GOARCH=amd64                            # exports your O.S. (default 'amd64', valid: [amd64, 386])
@@ -110,8 +110,8 @@ or simply run as the CI does:
 
 ```shell
 $ export GO_VERSION=1.12.7                         # exports which GIMME version to use
-$ export STACK_VERSION=7.6.0                       # exports stack version as runtime
-$ export METRICBEAT_VERSION=7.6.0                  # exports metricbeat version
+$ export STACK_VERSION=7.7.0                       # exports stack version as runtime
+$ export METRICBEAT_VERSION=7.7.0                  # exports metricbeat version
 $ #export FEATURE=redis                            # exports which feature to run (default 'all')
 $ ./.ci/scripts/functional-test.sh ${GO_VERSION} ${FEATURE}
 ```

diff --git a/e2e/metricbeat_test.go b/e2e/metricbeat_test.go
@@ -16,7 +16,7 @@ import (
 
 // metricbeatVersion is the version of the metricbeat to use
 // It can be overriden by OP_METRICBEAT_VERSION env var
-var metricbeatVersion = "7.6.0"
+var metricbeatVersion = "7.7.0"
 
 var serviceManager services.ServiceManager
 

diff --git a/e2e/runner_test.go b/e2e/runner_test.go
@@ -84,7 +84,7 @@ var supportedProducts = map[string]*contextMetadata{
 
 // stackVersion is the version of the stack to use
 // It can be overriden by OP_STACK_VERSION env var
-var stackVersion = "7.6.0"
+var stackVersion = "7.7.0"
 
 var opt = godog.Options{Output: colors.Colored(os.Stdout)}