Skip to content

Commit c5b976c

Browse files
committed
Merge branch 'main' into leemthompo/data-analysis-cleanup
2 parents 8786118 + 9108cce commit c5b976c

File tree

8 files changed

+49
-83
lines changed

8 files changed

+49
-83
lines changed

deploy-manage/remote-clusters/remote-clusters-self-managed.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ $$$sniff-mode$$$
3535
Sniff mode
3636
: In sniff mode, a cluster alias is registered with a name of your choosing and a list of addresses of *seed* nodes specified with the `cluster.remote.<cluster_alias>.seeds` setting. When you register a remote cluster using sniff mode, {{es}} retrieves from one of the seed nodes the addresses of up to three *gateway nodes*. Each `remote_cluster_client` node in the local {{es}} cluster then opens several TCP connections to the publish addresses of the gateway nodes. This mode therefore requires that the gateway nodes' publish addresses are accessible to nodes in the local cluster.
3737

38-
Sniff mode is the default connection mode. See [Sniff mode remote cluster settings](remote-clusters-settings.md#remote-cluster-sniff-settings) for more information about configuring sniff mode.
38+
Sniff mode is the default connection mode. See [Sniff mode remote cluster settings](elasticsearch://reference/elasticsearch/configuration-reference/remote-clusters.md#remote-cluster-sniff-settings) for more information about configuring sniff mode.
3939

4040
$$$gateway-nodes-selection$$$
4141
The *gateway nodes* selection depends on the following criteria:
4242

4343
* **version**: Remote nodes must be compatible with the cluster they are registered to.
4444
* **role**: By default, any non-[master-eligible](/deploy-manage/distributed-architecture/clusters-nodes-shards/node-roles.md#master-node-role) node can act as a gateway node. Dedicated master nodes are never selected as gateway nodes.
45-
* **attributes**: You can define the gateway nodes for a cluster by setting [`cluster.remote.node.attr.gateway`](remote-clusters-settings.md#cluster-remote-node-attr) to `true`. However, such nodes still have to satisfy the two above requirements.
45+
* **attributes**: You can define the gateway nodes for a cluster by setting [`cluster.remote.node.attr.gateway`](elasticsearch://reference/elasticsearch/configuration-reference/remote-clusters.md#cluster-remote-node-attr) to `true`. However, such nodes still have to satisfy the two above requirements.
4646

4747

4848
$$$proxy-mode$$$
4949

5050
Proxy mode
5151
: In proxy mode, a cluster alias is registered with a name of your choosing and the address of a TCP (layer 4) reverse proxy specified with the `cluster.remote.<cluster_alias>.proxy_address` setting. You must configure this proxy to route connections to one or more nodes of the remote cluster. When you register a remote cluster using proxy mode, {{es}} opens several TCP connections to the proxy address and uses these connections to communicate with the remote cluster. In proxy mode {{es}} disregards the publish addresses of the remote cluster nodes which means that the publish addresses of the remote cluster nodes need not be accessible to the local cluster.
5252

53-
Proxy mode is not the default connection mode, so you must set `cluster.remote.<cluster_alias>.mode: proxy` to use it. See [Proxy mode remote cluster settings](remote-clusters-settings.md#remote-cluster-proxy-settings) for more information about configuring proxy mode.
53+
Proxy mode is not the default connection mode, so you must set `cluster.remote.<cluster_alias>.mode: proxy` to use it. See [Proxy mode remote cluster settings](elasticsearch://reference/elasticsearch/configuration-reference/remote-clusters.md#remote-cluster-proxy-settings) for more information about configuring proxy mode.
5454

5555
Proxy mode has the same [version compatibility requirements](#gateway-nodes-selection) as sniff mode.

deploy-manage/remote-clusters/remote-clusters-settings.md

Lines changed: 0 additions & 75 deletions
This file was deleted.

deploy-manage/toc.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,6 @@ toc:
656656
- file: remote-clusters/remote-clusters-api-key.md
657657
- file: remote-clusters/remote-clusters-cert.md
658658
- file: remote-clusters/remote-clusters-migrate.md
659-
- file: remote-clusters/remote-clusters-settings.md
660659
- file: remote-clusters/eck-remote-clusters.md
661660
- file: monitor.md
662661
children:

explore-analyze/visualize/canvas/canvas-function-reference.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@ Interprets a `TinyMath` math expression using a `number` or `datatable` as *cont
13081308

13091309
| Argument | Type | Description |
13101310
| --- | --- | --- |
1311-
| *Unnamed*<br>Alias: `expression` | `string` | An evaluated `TinyMath` expression. See [canvas-tinymath-functions.md](/reference/data-analysis/kibana/tinymath-functions.md). |
1311+
| *Unnamed*<br>Alias: `expression` | `string` | An evaluated `TinyMath` expression. See [canvas-tinymath-functions.md](/explore-analyze/visualize/canvas/canvas-tinymath-functions.md). |
13121312
| `onError` | `string` | In case the `TinyMath` evaluation fails or returns NaN, the return value is specified by onError. When `'throw'`, it will throw an exception, terminating expression execution (default). |
13131313

13141314
**Returns:** Depends on your input and arguments
@@ -1323,7 +1323,7 @@ Adds a column by evaluating `TinyMath` on each row. This function is optimized f
13231323
| Argument | Type | Description |
13241324
| --- | --- | --- |
13251325
| *Unnamed* **\***<br>Aliases: `column`, `name` | `string` | The name of the resulting column. Names are not required to be unique. |
1326-
| *Unnamed*<br>Alias: `expression` | `string` | An evaluated `TinyMath` expression. See [canvas-tinymath-functions.md](/reference/data-analysis/kibana/tinymath-functions.md). |
1326+
| *Unnamed*<br>Alias: `expression` | `string` | An evaluated `TinyMath` expression. See [canvas-tinymath-functions.md](/explore-analyze/visualize/canvas/canvas-tinymath-functions.md). |
13271327
| `castColumns`| `string` | The column ids that are cast to numbers before the formula is applied. |
13281328
| `copyMetaFrom` | `string`, `null` | If set, the meta object from the specified column id is copied over to the specified target column. If the column doesn’t exist it silently fails.<br>Default: `null` |
13291329
| `id` **\*** | `string` | id of the resulting column. Must be unique. |
@@ -1443,7 +1443,7 @@ Subdivides a `datatable` by the unique values of the specified columns, and pass
14431443

14441444
### `pointseries` [pointseries_fn]
14451445

1446-
Turn a `datatable` into a point series model. Currently we differentiate measure from dimensions by looking for a `TinyMath` expression. See [canvas-tinymath-functions.md](/reference/data-analysis/kibana/tinymath-functions.md). If you enter a `TinyMath` expression in your argument, we treat that argument as a measure, otherwise it is a dimension. Dimensions are combined to create unique keys. Measures are then deduplicated by those keys using the specified `TinyMath` function
1446+
Turn a `datatable` into a point series model. Currently we differentiate measure from dimensions by looking for a `TinyMath` expression. See [canvas-tinymath-functions.md](/explore-analyze/visualize/canvas/canvas-tinymath-functions.md). If you enter a `TinyMath` expression in your argument, we treat that argument as a measure, otherwise it is a dimension. Dimensions are combined to create unique keys. Measures are then deduplicated by those keys using the specified `TinyMath` function
14471447

14481448
**Accepts:** `datatable`
14491449

redirects.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,5 +551,8 @@ redirects:
551551
'reference/data-analysis/machine-learning/ootb-ml-jobs-siem.md': 'reference/machine-learning/ootb-ml-jobs-siem.md'
552552
'reference/data-analysis/machine-learning/ootb-ml-jobs-uptime.md': 'reference/machine-learning/ootb-ml-jobs-uptime.md'
553553

554+
# Remote cluster settings moved to reference: https://github.com/elastic/docs-content/issues/579
555+
'deploy-manage/remote-clusters/remote-clusters-settings.md': 'elasticsearch://reference/elasticsearch/configuration-reference/remote-clusters.md'
556+
554557

555558

reference/data-analysis/index.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Data analysis
2+
3+
This section contains reference information for data analysis features, including:
4+
5+
* [Supplied {{anomaly-detect}} configurations](/reference/data-analysis/machine-learning/supplied-anomaly-detection-configurations.md)
6+
* [Function reference for anomaly detection jobs](/reference/data-analysis/machine-learning/machine-learning-functions.md)
7+
* [Metrics reference for the Infrastructure app](/reference/data-analysis/observability/index.md)
8+
* [Text analysis components](elasticsearch://reference/text-analysis/index.md)
9+
* [Aggregations](elasticsearch://reference/aggregations/index.md)
10+
11+
Visit the [Explore and analyze](/explore-analyze/index.md) section to learn how to use the Elasticsearch platform to explore and analyze your data effectively.

reference/data-analysis/toc.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
toc:
2+
- file: index.md
3+
- file: machine-learning/supplied-anomaly-detection-configurations.md
4+
children:
5+
- file: machine-learning/ootb-ml-jobs-apache.md
6+
- file: machine-learning/ootb-ml-jobs-apm.md
7+
- file: machine-learning/ootb-ml-jobs-auditbeat.md
8+
- file: machine-learning/ootb-ml-jobs-logs-ui.md
9+
- file: machine-learning/ootb-ml-jobs-metricbeat.md
10+
- file: machine-learning/ootb-ml-jobs-metrics-ui.md
11+
- file: machine-learning/ootb-ml-jobs-nginx.md
12+
- file: machine-learning/ootb-ml-jobs-siem.md
13+
- file: machine-learning/ootb-ml-jobs-uptime.md
14+
- file: machine-learning/machine-learning-functions.md
15+
children:
16+
- file: machine-learning/ml-count-functions.md
17+
- file: machine-learning/ml-geo-functions.md
18+
- file: machine-learning/ml-info-functions.md
19+
- file: machine-learning/ml-metric-functions.md
20+
- file: machine-learning/ml-rare-functions.md
21+
- file: machine-learning/ml-sum-functions.md
22+
- file: machine-learning/ml-time-functions.md
23+
- file: observability/index.md
24+
children:
25+
- file: observability/observability-host-metrics.md
26+
- file: observability/observability-container-metrics.md
27+
- file: observability/observability-kubernetes-pod-metrics.md
28+
- file: observability/observability-aws-metrics.md

reference/glossary/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ $$$glossary-ml-bucket$$$ bucket
9595
## C [c-glos]
9696

9797
$$$glossary-canvas-language$$$ Canvas expression language
98-
: A pipeline-based expression language for manipulating and visualizing data. Includes dozens of functions and other capabilities, such as table transforms, type casting, and sub-expressions. Supports TinyMath functions for complex math calculations. See [Canvas function reference](/reference/data-analysis/kibana/canvas-functions.md).
98+
: A pipeline-based expression language for manipulating and visualizing data. Includes dozens of functions and other capabilities, such as table transforms, type casting, and sub-expressions. Supports TinyMath functions for complex math calculations. See [Canvas function reference](/explore-analyze/visualize/canvas/canvas-function-reference.md).
9999

100100
$$$glossary-canvas$$$ Canvas
101101
: Enables you to create presentations and infographics that pull live data directly from {{es}}. See [Canvas](/explore-analyze/visualize/canvas.md).

0 commit comments

Comments
 (0)