Skip to content

Add APM to shared versioning #1187

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

Merged
merged 11 commits into from
Sep 20, 2019
Merged

Add APM to shared versioning #1187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6feb231
docs: add APM Agent versions
bmorelli25 Sep 13, 2019
f47ce20
docs: add apm_server_version
bmorelli25 Sep 13, 2019
3df9456
docs: update APM shared attributes
bmorelli25 Sep 13, 2019
b8905bc
docs: update agents to current versions
bmorelli25 Sep 13, 2019
11b03a5
docs: deprecate -v attributes
bmorelli25 Sep 16, 2019
f0a2c99
docs: clarification
bmorelli25 Sep 16, 2019
a780e3c
add apm-server and apm-over refs
bmorelli25 Sep 16, 2019
9b74a59
docs: update all the comments!
bmorelli25 Sep 17, 2019
3519dd9
docs: dont change -v branch
bmorelli25 Sep 19, 2019
26eb41c
revert changed attributes
bmorelli25 Sep 20, 2019
5368b7c
docs: fix line
bmorelli25 Sep 20, 2019
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
2 changes: 1 addition & 1 deletion shared/attributes.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,4 @@
:api-example-title: Example
:api-examples-title: Examples
:api-definitions-title: Properties

1 change: 1 addition & 0 deletions shared/versions/stack/6.0.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
:logstash_version: 6.0.1
:elasticsearch_version: 6.0.1
:kibana_version: 6.0.1
:apm_server_version: 6.0.1
:branch: 6.0
:major-version: 6.x
:prev-major-version: 5.x
Expand Down
1 change: 1 addition & 0 deletions shared/versions/stack/6.1.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
:logstash_version: 6.1.4
:elasticsearch_version: 6.1.4
:kibana_version: 6.1.4
:apm_server_version: 6.1.4
:branch: 6.1
:major-version: 6.x
:prev-major-version: 5.x
Expand Down
1 change: 1 addition & 0 deletions shared/versions/stack/6.2.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
:logstash_version: 6.2.4
:elasticsearch_version: 6.2.4
:kibana_version: 6.2.4
:apm_server_version: 6.2.4
:branch: 6.2
:major-version: 6.x
:prev-major-version: 5.x
Expand Down
8 changes: 8 additions & 0 deletions shared/versions/stack/6.3.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
:logstash_version: 6.3.2
:elasticsearch_version: 6.3.2
:kibana_version: 6.3.2
:apm_server_version: 6.3.2
:branch: 6.3
:major-version: 6.x
:prev-major-version: 5.x
Expand All @@ -11,3 +12,10 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: released

////
APM Agent versions
////
:apm-rum-branch: 0.x
:apm-node-branch: 1.x
:apm-py-branch: 3.x
8 changes: 8 additions & 0 deletions shared/versions/stack/6.4.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
:logstash_version: 6.4.3
:elasticsearch_version: 6.4.3
:kibana_version: 6.4.3
:apm_server_version: 6.4.3
:branch: 6.4
:major-version: 6.x
:prev-major-version: 5.x
Expand All @@ -11,3 +12,10 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: released

////
APM Agent versions
////
:apm-rum-branch: 0.x
:apm-node-branch: 1.x
:apm-py-branch: 3.x
12 changes: 12 additions & 0 deletions shared/versions/stack/6.5.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
:logstash_version: 6.5.4
:elasticsearch_version: 6.5.4
:kibana_version: 6.5.4
:apm_server_version: 6.5.4
:branch: 6.5
:major-version: 6.x
:prev-major-version: 5.x
Expand All @@ -11,3 +12,14 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: released

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 2.x
:apm-node-branch: 2.x
:apm-py-branch: 4.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x
12 changes: 12 additions & 0 deletions shared/versions/stack/6.6.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
:logstash_version: 6.6.2
:elasticsearch_version: 6.6.2
:kibana_version: 6.6.2
:apm_server_version: 6.6.2
:branch: 6.6
:major-version: 6.x
:prev-major-version: 5.x
Expand All @@ -11,3 +12,14 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: released

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 3.x
:apm-node-branch: 2.x
:apm-py-branch: 5.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x
12 changes: 12 additions & 0 deletions shared/versions/stack/6.7.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
:logstash_version: 6.7.2
:elasticsearch_version: 6.7.2
:kibana_version: 6.7.2
:apm_server_version: 6.7.2
:branch: 6.7
:major-version: 6.x
:prev-major-version: 5.x
Expand All @@ -11,3 +12,14 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: released

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 2.x
:apm-py-branch: 5.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x
12 changes: 12 additions & 0 deletions shared/versions/stack/6.8.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta
:logstash_version: 6.8.3
:elasticsearch_version: 6.8.3
:kibana_version: 6.8.3
:apm_server_version: 6.8.3
:branch: 6.8
:major-version: 6.x
:prev-major-version: 5.x
Expand All @@ -15,3 +16,14 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: released

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 2.x
:apm-py-branch: 5.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x
12 changes: 12 additions & 0 deletions shared/versions/stack/7.0.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta
:logstash_version: 7.0.1
:elasticsearch_version: 7.0.1
:kibana_version: 7.0.1
:apm_server_version: 7.0.1
:branch: 7.0
:major-version: 7.x
:prev-major-version: 6.x
Expand All @@ -16,3 +17,14 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: released

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 2.x
:apm-py-branch: 5.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x
12 changes: 12 additions & 0 deletions shared/versions/stack/7.1.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta
:logstash_version: 7.1.1
:elasticsearch_version: 7.1.1
:kibana_version: 7.1.1
:apm_server_version: 7.1.1
:branch: 7.1
:major-version: 7.x
:prev-major-version: 6.x
Expand All @@ -16,3 +17,14 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: released

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 2.x
:apm-py-branch: 5.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x
12 changes: 12 additions & 0 deletions shared/versions/stack/7.2.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta
:logstash_version: 7.2.1
:elasticsearch_version: 7.2.1
:kibana_version: 7.2.1
:apm_server_version: 7.2.1
:branch: 7.2
:major-version: 7.x
:prev-major-version: 6.x
Expand All @@ -16,3 +17,14 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: released

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 2.x
:apm-py-branch: 5.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x
14 changes: 13 additions & 1 deletion shared/versions/stack/7.3.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta
:logstash_version: 7.3.2
:elasticsearch_version: 7.3.2
:kibana_version: 7.3.2
:apm_server_version: 7.3.2
:branch: 7.3
:major-version: 7.x
:prev-major-version: 6.x
Expand All @@ -15,4 +16,15 @@ bare_version never includes -alpha or -beta
release-state can be: released | prerelease | unreleased
//////////

:release-state: released
:release-state: released

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 2.x
:apm-py-branch: 5.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x
12 changes: 12 additions & 0 deletions shared/versions/stack/7.4.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta
:logstash_version: 7.4.0
:elasticsearch_version: 7.4.0
:kibana_version: 7.4.0
:apm_server_version: 7.4.0
:branch: 7.4
:major-version: 7.x
:prev-major-version: 6.x
Expand All @@ -16,3 +17,14 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: unreleased

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 2.x
:apm-py-branch: 5.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x
12 changes: 12 additions & 0 deletions shared/versions/stack/7.x.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta
:logstash_version: 7.5.0
:elasticsearch_version: 7.5.0
:kibana_version: 7.5.0
:apm_server_version: 7.5.0
:branch: 7.x
:major-version: 7.x
:prev-major-version: 6.x
Expand All @@ -16,3 +17,14 @@ release-state can be: released | prerelease | unreleased
//////////

:release-state: unreleased

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 2.x
:apm-py-branch: 5.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x
11 changes: 11 additions & 0 deletions shared/versions/stack/master.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta
:logstash_version: 8.0.0
:elasticsearch_version: 8.0.0
:kibana_version: 8.0.0
:apm_server_version: 8.0.0
:branch: master
:major-version: 8.x
:prev-major-version: 7.x
Expand All @@ -17,3 +18,13 @@ release-state can be: released | prerelease | unreleased

:release-state: unreleased

////
APM Agent versions
////
:apm-go-branch: 1.x
:apm-java-branch: 1.x
:apm-rum-branch: 4.x
:apm-node-branch: 2.x
:apm-py-branch: 5.x
:apm-ruby-branch: 2.x
:apm-dotnet-branch: 1.x