Skip to content

Commit d3e954b

Browse files
authored
Merge branch 'main' into remove-apm-mobile-nav
2 parents 1b05539 + 805e4e9 commit d3e954b

File tree

3 files changed

+8
-90
lines changed

3 files changed

+8
-90
lines changed

src/tooling/docs-assembler/assembler.yml

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -51,95 +51,6 @@ narrative:
5151
# current: <git_ref>
5252
# next: <git_ref>
5353
###
54-
55-
### This is not yet ready but already added
56-
57-
#versions:
58-
# stack:
59-
# # This is the default versioning scheme, used for most of the docs.
60-
# # It uses the stack version as the current version.
61-
# base: '9.0'
62-
# current: '9.0.1' # https://artifacts.elastic.co/releases/stack.json
63-
# apm_agent_android:
64-
# current: '1.0.0' # https://github.com/elastic/apm-agent-android/releases
65-
# apm_agent_dotnet:
66-
# current: '1.32.0' # https://github.com/elastic/apm-agent-dotnet/releases
67-
# apm_agent_go:
68-
# current: '2.7.1' # https://github.com/elastic/apm-agent-go/releases
69-
# apm_agent_java:
70-
# current: '1.54.0' # https://github.com/elastic/apm-agent-java/releases
71-
# apm_agent_nodejs:
72-
# current: '4.13.0' # https://github.com/elastic/apm-agent-nodejs/releases
73-
# apm_agent_php:
74-
# current: '1.15.0' # https://github.com/elastic/apm-agent-php/releases
75-
# apm_agent_python:
76-
# current: '6.23.0' # https://github.com/elastic/apm-agent-python/releases
77-
# apm_agent_ruby:
78-
# current: '4.7.3' # https://github.com/elastic/apm-agent-ruby/releases
79-
# apm_agent_rum_js:
80-
# current: '5.17.0' # https://github.com/elastic/apm-agent-rum-js/releases
81-
# apm_agent_ios:
82-
# current: '1.2.1' # https://github.com/elastic/apm-agent-ios/releases
83-
# apm_k8s_attacher:
84-
# current: '1.1.3' # https://github.com/elastic/apm-k8s-attacher/releases
85-
# apm_aws_lambda:
86-
# current: '1.5.8' # https://github.com/elastic/apm-aws-lambda/releases
87-
# cloud_enterprise:
88-
# path_prefix: en/cloud-enterprise
89-
# current: '4.1.0' # https://github.com/elastic/cloud/blob/master/version
90-
# cloud_heroku:
91-
# current: 'current'
92-
# cloud_on_k8s:
93-
# current: '3.0.0' # https://github.com/elastic/cloud-on-k8s/releases
94-
# cloud:
95-
# current: 'current'
96-
# ecctl:
97-
# current: '1.14.3' # https://github.com/elastic/ecctl/releases
98-
# ecs_logging:
99-
# current: 'current'
100-
# ecs_logging_dotnet:
101-
# current: '8.18.1' # https://github.com/elastic/ecs-dotnet/releases
102-
# ecs_logging_go_logrus:
103-
# current: '1.0.0' # https://github.com/elastic/ecs-logging-go-logrus/releases
104-
# ecs_logging_go_zap:
105-
# current: '1.0.3' # https://github.com/elastic/ecs-logging-go-zap/releases
106-
# ecs_logging_go_zerolog:
107-
# current: '0.2.0' # https://github.com/elastic/ecs-logging-go-zerolog/releases
108-
# ecs_logging_java:
109-
# current: '1.7.0' # https://github.com/elastic/ecs-logging-java/releases
110-
# ecs_logging_nodejs:
111-
# current: '1.5.3' # https://github.com/elastic/ecs-logging-nodejs/tags
112-
# ecs_logging_php:
113-
# current: '2.0.0' # https://github.com/elastic/ecs-logging-php/releases
114-
# ecs_logging_python:
115-
# current: '2.2.0' # https://github.com/elastic/ecs-logging-python/releases
116-
# ecs_logging_ruby:
117-
# current: '1.0.0' # https://github.com/elastic/ecs-logging-ruby/tags
118-
# ecs:
119-
# current: '9.0' #
120-
# elastic-stack-glossary:
121-
# current: 'current'
122-
# curator:
123-
# current: '8.0'
124-
# eland:
125-
# current: '9.0.1' # https://github.com/elastic/eland/releases
126-
# esf:
127-
# current: '1.20.1' # https://github.com/elastic/elastic-serverless-forwarder/releases
128-
# ingest-overview:
129-
# current: 'current'
130-
# integrations-developer:
131-
# current: 'current'
132-
# integrations:
133-
# current: 'current'
134-
# logstash-versioned-plugins:
135-
# current: 'current'
136-
# reference-architectures:
137-
# current: 'current'
138-
# search-ui:
139-
# current: '1.24.0' # https://github.com/elastic/search-ui
140-
# serverless:
141-
# current: 'current'
142-
14354
references:
14455
apm-server:
14556
apm-agent-android:

src/tooling/docs-assembler/legacy-url-mappings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ mappings:
3131
en/cloud-on-k8s/: [ '3.0.0', '2.16', '2.15', '2.14', '2.13', '2.12', '2.11', '2.10', '2.9', '2.8', '2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0', '1.9', '1.8', '1.7', '1.6', '1.5', '1.4', '1.3', '1.2', '1.1', '1.0' ]
3232
en/cloud/: []
3333
en/cloud-enterprise/: [ '4.0', '3.8', '3.7', '3.6', '3.5', '3.4', '3.3', '3.2', '3.1', '3.0', '2.13', '2.12', '2.11', '2.10', '2.9', '2.8', '2.7', '2.6', '2.5', '2.4', '2.3', '2.2', '2.1', '2.0', '1.1', '1.0' ]
34-
en/ecctl/: [ '1.13', '1.12', '1.11', '1.10', '1.9', '1.8', '1.7', '1.6', '1.5', '1.4', '1.3', '1.2', '1.1', '1.0' ]
34+
en/ecctl/: [ '1.14+', '1.13', '1.12', '1.11', '1.10', '1.9', '1.8', '1.7', '1.6', '1.5', '1.4', '1.3', '1.2', '1.1', '1.0' ]
3535
en/ecs-logging/: []
3636
en/ecs-logging/dotnet/: [ '8.18.1' ]
3737
en/ecs-logging/go-logrus/: [ '1.0.0' ]

src/tooling/docs-assembler/navigation.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,14 @@ toc:
103103
# https://github.com/elastic/docs-content/blob/main/release-notes/elastic-cloud-serverless/toc.yml
104104
- toc: docs-content://release-notes/elastic-cloud-serverless
105105
path_prefix: release-notes/cloud-serverless
106+
106107
# Cloud Hosted
107108
# https://github.com/elastic/cloud/blob/master/docs/release-notes/cloud-hosted/toc.yml
108109
# We probably need to add `max_toc_depth: 2` to
109110
# https://github.com/elastic/cloud/blob/master/docs/docset.yml
110111
- toc: cloud://release-notes/cloud-hosted
111112
path_prefix: release-notes/cloud-hosted
113+
112114
# Cloud Enterprise
113115
# https://github.com/elastic/cloud/blob/master/docs/release-notes/cloud-enterprise/toc.yml
114116
- toc: cloud://release-notes/cloud-enterprise
@@ -204,6 +206,11 @@ toc:
204206
- toc: ecs://release-notes
205207
path_prefix: release-notes/ecs
206208

209+
# ECCTL
210+
# https://github.com/elastic/ecctl/blob/master/docs/release-notes/toc.yml
211+
- toc: ecctl://release-notes
212+
path_prefix: release-notes/ecctl
213+
207214
#############
208215
# REFERENCE #
209216
#############

0 commit comments

Comments
 (0)