Skip to content

Commit 6e6ac0d

Browse files
committed
[DOCS] Add ML node to node.asciidoc (#24495)
* [DOCS] Add ML node to node.asciidoc * [DOCS] Clarify ML node in node.asciidoc * [DOCS] Add X-Pack icon for admonition blocks * [DOCS] Formatting X-Pack blocks in node.asciidoc * [DOCS] Add xpack icon images to node.asciidoc * [DOCS] Add final xpack role attributes * [DOCS] Remove unnecssary xpackicon image * [DOCS] Add link to X-Pack node settings * [DOCS] Fix path to X-Pack repository * [DOCS] Add links to X-Pack node settings * [DOCS] Fixed text for links to X-Pack node settings * [DOCS] Change standalone node to dedicated node
1 parent f876a61 commit 6e6ac0d

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

docs/Versions.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ release-state can be: released | prerelease | unreleased
3030
:es: Elasticsearch
3131
:kib: Kibana
3232

33-
:xes-repo-dir: {docdir}/../../elasticsearch-extra/x-pack-elasticsearch/docs/en
33+
:xes-repo-dir: {docdir}/../../../elasticsearch-extra/x-pack-elasticsearch/docs/en
3434

3535
///////
3636
Javadoc roots used to generate links from Painless's API reference

docs/reference/modules/node.asciidoc

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ cluster health to have a stable master node.
8282
Any master-eligible node (all nodes by default) may be elected to become the
8383
master node by the <<modules-discovery-zen,master election process>>.
8484

85-
IMPORTANT: Master nodes must have access to the `data/` directory (just like
85+
IMPORTANT: Master nodes must have access to the `data/` directory (just like
8686
`data` nodes) as this is where the cluster state is persisted between node restarts.
8787

8888
Indexing and searching your data is CPU-, memory-, and I/O-intensive work
@@ -97,7 +97,7 @@ better _not_ to use dedicated master nodes for this purpose. It is important
9797
for the stability of the cluster that master-eligible nodes do as little work
9898
as possible.
9999

100-
To create a standalone master-eligible node, set:
100+
To create a dedicated master-eligible node, set:
101101

102102
[source,yaml]
103103
-------------------
@@ -109,6 +109,12 @@ node.ingest: false <3>
109109
<2> Disable the `node.data` role (enabled by default).
110110
<3> Disable the `node.ingest` role (enabled by default).
111111

112+
ifdef::include-xpack[]
113+
NOTE: These settings apply only when {xpack} is not installed. To create a
114+
dedicated master-eligible node when {xpack} is installed, see <<modules-node-xpack,{xpack} node settings>>.
115+
endif::include-xpack[]
116+
117+
112118
[float]
113119
[[split-brain]]
114120
==== Avoiding split brain with `minimum_master_nodes`
@@ -193,6 +199,11 @@ node.ingest: false <3>
193199
<2> The `node.data` role is enabled by default.
194200
<3> Disable the `node.ingest` role (enabled by default).
195201

202+
ifdef::include-xpack[]
203+
NOTE: These settings apply only when {xpack} is not installed. To create a
204+
dedicated data node when {xpack} is installed, see <<modules-node-xpack,{xpack} node settings>>.
205+
endif::include-xpack[]
206+
196207
[float]
197208
[[node-ingest-node]]
198209
=== Ingest Node
@@ -216,6 +227,11 @@ search.remote.connect: false <4>
216227
<3> The `node.ingest` role is enabled by default.
217228
<4> Disable cross-cluster search (enabled by default).
218229

230+
ifdef::include-xpack[]
231+
NOTE: These settings apply only when {xpack} is not installed. To create a
232+
dedicated ingest node when {xpack} is installed, see <<modules-node-xpack,{xpack} node settings>>.
233+
endif::include-xpack[]
234+
219235
[float]
220236
[[coordinating-only-node]]
221237
=== Coordinating only node
@@ -251,6 +267,11 @@ search.remote.connect: false <4>
251267
<3> Disable the `node.ingest` role (enabled by default).
252268
<4> Disable cross-cluster search (enabled by default).
253269

270+
ifdef::include-xpack[]
271+
NOTE: These settings apply only when {xpack} is not installed. To create a
272+
dedicated coordinating node when {xpack} is installed, see <<modules-node-xpack,{xpack} node settings>>.
273+
endif::include-xpack[]
274+
254275
[float]
255276
== Node data path settings
256277

@@ -302,3 +323,7 @@ lead to unexpected data loss.
302323
More node settings can be found in <<modules,Modules>>. Of particular note are
303324
the <<cluster.name,`cluster.name`>>, the <<node.name,`node.name`>> and the
304325
<<modules-network,network settings>>.
326+
327+
ifdef::include-xpack[]
328+
include::{xes-repo-dir}/node.asciidoc[]
329+
endif::include-xpack[]

0 commit comments

Comments
 (0)