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.

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

Promote ECK 2.16 branch to current. #3139

Closed
wants to merge 12 commits into from
1 change: 1 addition & 0 deletions .buildkite/pull-requests.org-wide.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"elastic/logstash-docs",
"elastic/observability-docs",
"elastic/observability-robots-playground",
"elastic/search-ui",
"elastic/security-docs",
"elastic/stack-docs",
"elastic/tech-content",
Expand Down
28 changes: 24 additions & 4 deletions conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ repos:
logstash-docs: https://github.com/elastic/logstash-docs.git
observability-docs: https://github.com/elastic/observability-docs.git
package-spec: https://github.com/elastic/package-spec.git
search-ui: https://github.com/elastic/search-ui.git
security-docs: https://github.com/elastic/security-docs.git
sense: https://github.com/elastic/sense.git
stack-docs: https://github.com/elastic/stack-docs.git
Expand All @@ -79,10 +80,10 @@ contents_title: Elastic documentation
# <key>: &<variable> <value>
# The keys don't really matter, but by convention the are the same as the variable.
variables:
stackcurrent: &stackcurrent 8.16
stacklive: &stacklive [ 8.16, 7.17 ]
stackcurrent: &stackcurrent 8.17
stacklive: &stacklive [ 8.17, 7.17 ]

cloudSaasCurrent: &cloudSaasCurrent ms-116
cloudSaasCurrent: &cloudSaasCurrent ms-117

mapCloudEceToClientsTeam: &mapCloudEceToClientsTeam
ms-105: main
Expand Down Expand Up @@ -126,6 +127,21 @@ variables:

toc_extra: extra/docs_landing.html
contents:
- title: Search UI
sections:
- title: Search UI
prefix: en/search-ui
current: main
branches: [ main ]
live: [ main ]
index: docs/index.asciidoc
chunk: 3
tags: Search UI/Guide
subject: Search UI
sources:
-
repo: search-ui
path: docs
- title: Integrations
sections:
- title: Integrations
Expand Down Expand Up @@ -2189,8 +2205,12 @@ contents:
prefix: en/cloud-on-k8s
tags: Kubernetes/Reference
subject: ECK
<<<<<<< HEAD
current: 2.16
=======
current: 2.15
branches: [ {main: master}, 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, 1.0-beta, 0.9, 0.8 ]
>>>>>>> b4e83236 (Add ECK 2.16 (#3138))
branches: [ {main: master}, 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, 1.0-beta, 0.9, 0.8 ]
index: docs/index.asciidoc
chunk: 1
sources:
Expand Down
3 changes: 3 additions & 0 deletions doc_build_aliases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ alias docbldserverless='$GIT_HOME/docs/build_docs --doc $GIT_HOME/docs-content/s
# Integrations
alias docbldintegration='$GIT_HOME/docs/build_docs --doc $GIT_HOME/integration-docs/dist/index.asciidoc --chunk 2'

# Search UI
alias docbldsearchui='$GIT_HOME/docs/build_docs --doc $GIT_HOME/search-ui/docs/index.asciidoc --chunk 3'

# Elasticsearch
alias docbldesx='$GIT_HOME/docs/build_docs --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1'

Expand Down
2 changes: 1 addition & 1 deletion resources/web/style/base_styles.pcss
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ html {
}

details[open] {
summary {
> summary {
&:before {
transform: translate(-3.5px, 0px) rotate(90deg);
transition: .1s ease-in-out;
Expand Down
1 change: 1 addition & 0 deletions shared/attributes.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ Elastic Cloud
:ess-skip-section: If you use {ess}, skip this section. {ess} handles these changes for you.
:api-cloud: https://www.elastic.co/docs/api/doc/cloud
:api-ece: https://www.elastic.co/docs/api/doc/cloud-enterprise
:api-kibana-serverless: https://www.elastic.co/docs/api/doc/serverless
//////////
Elasticsearch
//////////
Expand Down
15 changes: 8 additions & 7 deletions shared/versions/stack/8.16.asciidoc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
:version: 8.16.1
:version: 8.16.2
////
bare_version never includes -alpha or -beta
////
:bare_version: 8.16.1
:logstash_version: 8.16.1
:elasticsearch_version: 8.16.1
:kibana_version: 8.16.1
:apm_server_version: 8.16.1
:bare_version: 8.16.2
:logstash_version: 8.16.2
:elasticsearch_version: 8.16.2
:kibana_version: 8.16.2
:apm_server_version: 8.16.2
// branch is 8.16 instead of 8.x for long-term linking purposes
:branch: 8.16
:minor-version: 8.16
Expand All @@ -29,7 +29,7 @@ release-state can be: released | prerelease | unreleased
//////////
is-current-version can be: true | false
//////////
:is-current-version: true
:is-current-version: false

//////////
hide-xpack-tags defaults to "false" (they are shown unless set to "true")
Expand Down Expand Up @@ -73,3 +73,4 @@ Synthetics
API URLs
////
:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8
:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8
5 changes: 3 additions & 2 deletions shared/versions/stack/8.17.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ Keep the :esf_version: attribute value as master.
//////////
release-state can be: released | prerelease | unreleased
//////////
:release-state: unreleased
:release-state: released

//////////
is-current-version can be: true | false
//////////
:is-current-version: false
:is-current-version: true

//////////
hide-xpack-tags defaults to "false" (they are shown unless set to "true")
Expand Down Expand Up @@ -73,3 +73,4 @@ Synthetics
API URLs
////
:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8
:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8
1 change: 1 addition & 0 deletions shared/versions/stack/8.x.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,4 @@ Synthetics
API URLs
////
:api-kibana: https://www.elastic.co/docs/api/doc/kibana/v8
:api-es: https://www.elastic.co/docs/api/doc/elasticsearch/v8
2 changes: 1 addition & 1 deletion shared/versions/stack/current.asciidoc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include::8.16.asciidoc[]
include::8.17.asciidoc[]
1 change: 1 addition & 0 deletions shared/versions/stack/master.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ Synthetics
API URLs
////
:api-kibana: https://www.elastic.co/docs/api/doc/kibana
:api-es: https://www.elastic.co/docs/api/doc/elasticsearch

////
Feature flags
Expand Down