diff --git a/README.md b/README.md index ce1a24761..5add3c72e 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,10 @@ For the daring, snapshot builds from `master` branch are available. These builds | artifact | | --- | -| [tar](https://snapshots.elastic.co/downloads/logstash/logstash-6.0.0-beta1-SNAPSHOT.tar.gz) | -| [zip](https://snapshots.elastic.co/downloads/logstash/logstash-6.0.0-beta1-SNAPSHOT.zip) | -| [deb](https://snapshots.elastic.co/downloads/logstash/logstash-6.0.0-beta1-SNAPSHOT.deb) | -| [rpm](https://snapshots.elastic.co/downloads/logstash/logstash-6.0.0-beta1-SNAPSHOT.rpm) | +| [tar](https://snapshots.elastic.co/downloads/logstash/logstash-7.0.0-alpha1-SNAPSHOT.tar.gz) | +| [zip](https://snapshots.elastic.co/downloads/logstash/logstash-7.0.0-alpha1-SNAPSHOT.zip) | +| [deb](https://snapshots.elastic.co/downloads/logstash/logstash-7.0.0-alpha1-SNAPSHOT.deb) | +| [rpm](https://snapshots.elastic.co/downloads/logstash/logstash-7.0.0-alpha1-SNAPSHOT.rpm) | ## Need Help? diff --git a/docs/index-shared1.asciidoc b/docs/index-shared1.asciidoc index bff97caf1..f2219d40b 100644 --- a/docs/index-shared1.asciidoc +++ b/docs/index-shared1.asciidoc @@ -1,9 +1,9 @@ :branch: master -:major-version: 6.x -:logstash_version: 6.0.0-beta1 -:elasticsearch_version: 6.0.0-beta1 -:kibana_version: 6.0.0-beta1 +:major-version: 7.x +:logstash_version: 7.0.0-alpha1 +:elasticsearch_version: 7.0.0-alpha1 +:kibana_version: 7.0.0-alpha1 :docker-image: docker.elastic.co/logstash/logstash:{logstash_version} ////////// diff --git a/docs/static/releasenotes.asciidoc b/docs/static/releasenotes.asciidoc index da3b38a98..91982cba0 100644 --- a/docs/static/releasenotes.asciidoc +++ b/docs/static/releasenotes.asciidoc @@ -3,40 +3,9 @@ This section summarizes the changes in the following releases: -* <> -* <> -* <> +* <> -[[logstash-6-0-0-beta1]] -=== Logstash 6.0.0-beta1 Release Notes +[[logstash-7-0-0-alpha1]] +=== Logstash 7.0.0-alpha1 Release Notes -Placeholder for beta1 release notes - -* Added new `logstash.yml` setting: `config.support_escapes`. When - enabled, Logstash will interpret escape sequences in strings in the pipeline - configuration. - - -[[logstash-6-0-0-alpha2]] -=== Logstash 6.0.0-alpha2 Release Notes - -* Breaking: Currently, when Logstash is installed and set up via package managers, it loads all files found - in `/etc/logstash/conf.d` as configuration. This can be problematic if there are non-configuration files in this - folder. Starting from alpha2, Logstash will only glob files ending with `.conf` extension in `/etc/logstash/conf.d` ({lsissue}6979)[Issue 6979)]). -* Added support for running multiple pipelines in the same Logstash instance. Running multiple pipelines - allow users to isolate data flow, provide separate runtime pipeline parameters and helps simplify complex - configurations. -* A new `pipelines.yml` configuration file has been added to define pipelines. - -[[logstash-6-0-0-alpha1]] -=== Logstash 6.0.0-alpha1 Release Notes - -* Introducing a new internal representation for the existing Logstash configuration that forms the - foundation of many new features. This is not a breaking change, and existing configs will work as is. - -[float] - -==== Filter Plugins - -*`GeoIP`*: You can now use MaxMind's commercial database to get enriched Geo information. ASN data can be - obtained via the GeoIP2-ISP database. +Placeholder for alpha1 release notes \ No newline at end of file diff --git a/logstash-core-plugin-api/logstash-core-plugin-api.gemspec b/logstash-core-plugin-api/logstash-core-plugin-api.gemspec index 89877be4a..a79c28d1a 100644 --- a/logstash-core-plugin-api/logstash-core-plugin-api.gemspec +++ b/logstash-core-plugin-api/logstash-core-plugin-api.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |gem| gem.require_paths = ["lib"] gem.version = LOGSTASH_CORE_PLUGIN_API - gem.add_runtime_dependency "logstash-core", "6.0.0.beta1" + gem.add_runtime_dependency "logstash-core", "7.0.0.alpha1" # Make sure we dont build this gem from a non jruby # environment. diff --git a/logstash-core/lib/logstash-core/version.rb b/logstash-core/lib/logstash-core/version.rb index da3b637ee..e798d2543 100644 --- a/logstash-core/lib/logstash-core/version.rb +++ b/logstash-core/lib/logstash-core/version.rb @@ -5,4 +5,4 @@ # Note to authors: this should not include dashes because 'gem' barfs if # you include a dash in the version string. -LOGSTASH_CORE_VERSION = "6.0.0-beta1" +LOGSTASH_CORE_VERSION = "7.0.0-alpha1" diff --git a/logstash-core/lib/logstash/version.rb b/logstash-core/lib/logstash/version.rb index 7e808e34b..eb06f937a 100644 --- a/logstash-core/lib/logstash/version.rb +++ b/logstash-core/lib/logstash/version.rb @@ -11,4 +11,4 @@ # eventually this file should be in the root logstash lib fir and dependencies in logstash-core should be # fixed. -LOGSTASH_VERSION = "6.0.0-beta1" +LOGSTASH_VERSION = "7.0.0-alpha1" diff --git a/modules/netflow/configuration/elasticsearch/netflow.json b/modules/netflow/configuration/elasticsearch/netflow.json index d3c7bc828..885f12d61 100644 --- a/modules/netflow/configuration/elasticsearch/netflow.json +++ b/modules/netflow/configuration/elasticsearch/netflow.json @@ -4,7 +4,7 @@ "mappings": { "_default_": { "_meta": { - "version": "6.0.0" + "version": "7.0.0" }, "dynamic_templates": [ { diff --git a/tools/benchmark-cli/src/test/resources/org/logstash/benchmark/cli/metrics.json b/tools/benchmark-cli/src/test/resources/org/logstash/benchmark/cli/metrics.json index 8168a7ea0..261c8b5b0 100644 --- a/tools/benchmark-cli/src/test/resources/org/logstash/benchmark/cli/metrics.json +++ b/tools/benchmark-cli/src/test/resources/org/logstash/benchmark/cli/metrics.json @@ -1,6 +1,6 @@ { "host": "localhost", - "version": "6.0.0-alpha3", + "version": "7.0.0-alpha1", "http_address": "127.0.0.1:9600", "id": "8bbabc13-ea58-4dcd-b94e-90ae5f692c17", "name": "localhost", diff --git a/versions.yml b/versions.yml index 52fd4875c..e47300cb0 100644 --- a/versions.yml +++ b/versions.yml @@ -1,6 +1,6 @@ --- -logstash: 6.0.0-beta1 -logstash-core: 6.0.0-beta1 +logstash: 7.0.0-alpha1 +logstash-core: 7.0.0-alpha1 logstash-core-plugin-api: 2.1.16 jruby: version: 9.1.12.0