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.

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

[8.10] [DOCS] Remove unneeded ifevals #166563

Merged
merged 3 commits into from
Sep 18, 2023
+0 −25
Merged

[8.10] [DOCS] Remove unneeded ifevals #166563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa912cc
Revert "[DOCS] Withdraw Kibana 8.10.0 (#166562)"
jrodewig Sep 15, 2023
754dc55
Re-add admin to RNs
jrodewig Sep 15, 2023
283c0f5
Merge branch '8.10' into remove-unneeded-ifevals
jrodewig Sep 18, 2023
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
6 changes: 0 additions & 6 deletions docs/CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
:issue: https://github.com/elastic/kibana/issues/
:pull: https://github.com/elastic/kibana/pull/

ifeval::["{version}"=="8.10.0"]
IMPORTANT: {kib} 8.10.0 has been withdrawn.
endif::[]

Review important information about the {kib} 8.x releases.

* <<release-notes-8.10.1>>
Expand Down Expand Up @@ -76,9 +72,7 @@ Presentation::
[[release-notes-8.10.0]]
== {kib} 8.10.0

ifeval::["{version}"=="8.10.0"]
IMPORTANT: {kib} 8.10.0 has been withdrawn.
endif::[]

For information about the {kib} 8.10.0 release, review the following information.

Expand Down
19 changes: 0 additions & 19 deletions docs/setup/docker.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,6 @@ docker exec -it es01 /usr/share/elasticsearch/bin/elasticsearch-create-enrollmen
. Pull the {kib} Docker image.
+
--
ifeval::["{version}"=="8.10.0"]
IMPORTANT: {kib} 8.10.0 has been withdrawn.
endif::[]

ifeval::["{version}"!="8.10.0"]

ifeval::["{release-state}"=="unreleased"]
WARNING: Version {version} has not yet been released.
No Docker image is currently available for {kib} {version}.
Expand Down Expand Up @@ -158,7 +152,6 @@ To regenerate the password, run:
----
docker exec -it es01 /usr/share/elasticsearch/bin/elasticsearch-reset-password -u elastic
----
endif::[]

[discrete]
==== Remove Docker containers
Expand Down Expand Up @@ -207,17 +200,11 @@ services:

By default, {kib} auto-generates a keystore file for secure settings at startup. To persist your {kibana-ref}/secure-settings.html[secure settings], use the `kibana-keystore` utility to bind-mount the parent directory of the keystore to the container. For example:

ifeval::["{version}"=="8.10.0"]
IMPORTANT: {kib} 8.10.0 has been withdrawn.
endif::[]

ifeval::["{version}"!="8.10.0"]
["source","sh",subs="attributes"]
----
docker run -it --rm -v full_path_to/config:/usr/share/kibana/config -v full_path_to/data:/usr/share/kibana/data {kib-docker-image} bin/kibana-keystore create
docker run -it --rm -v full_path_to/config:/usr/share/kibana/config -v full_path_to/data:/usr/share/kibana/data {kib-docker-image} bin/kibana-keystore add test_keystore_setting
----
endif::[]

[discrete]
[[environment-variable-config]]
Expand Down Expand Up @@ -249,11 +236,6 @@ Supplying array options can be tricky. The following example shows the syntax fo

These variables can be set with +docker-compose+ like this:

ifeval::["{version}"=="8.10.0"]
IMPORTANT: {kib} 8.10.0 has been withdrawn.
endif::[]

ifeval::["{version}"!="8.10.0"]
["source","yaml",subs="attributes"]
----------------------------------------------------------
version: '2'
Expand All @@ -264,7 +246,6 @@ services:
SERVER_NAME: kibana.example.org
ELASTICSEARCH_HOSTS: '["http://es01:9200","http://es02:9200","http://es03:9200"]'
----------------------------------------------------------
endif::[]

Since environment variables are translated to CLI arguments, they take
precedence over settings configured in `kibana.yml`.
Expand Down
Loading