Skip to content

Commit d9a9a0f

Browse files
authored
Merge branch 'main' into monitoring-pt2
2 parents 590c048 + 01a88b7 commit d9a9a0f

File tree

75 files changed

+215
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+215
-214
lines changed

deploy-manage/deploy/elastic-cloud/edit-stack-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Change how {{es}} runs by providing your own user settings. {{ech}} appends thes
5959

6060
{{ech}} automatically rejects `elasticsearch.yml` settings that could break your cluster.
6161

62-
For a list of supported settings, check [Supported {{es}} settings](elasticsearch://reference/elasticsearch/configuration-reference/elastic-cloud-hosted-elasticsearch-settings.md).
62+
For a list of supported settings, check [Supported {{es}} settings](elasticsearch://reference/elasticsearch/configuration-reference/index.md).
6363

6464
::::{warning}
6565
You can also update [dynamic cluster settings](../../../deploy-manage/deploy/self-managed/configure-elasticsearch.md#dynamic-cluster-setting) using {{es}}'s [update cluster settings API](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-cluster-put-settings). However, {{ech}} doesn’t reject unsafe setting changes made using this API. Use it with caution.

deploy-manage/monitor/autoops/ec-autoops-notifications-settings.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ The PagerDuty integration consists of the following parts:
8686

8787
**AutoOps configuration**
8888

89-
1. Add a new PagerDuty endpoint using the PagerDuty configuration application key.
89+
1. Add a new PagerDuty connector using the PagerDuty configuration application key.
9090
2. To receive Slack notifications, add a notification filter. Scroll down the Notification page and click **Add**.
9191
3. Fill in the filter details.
9292
4. Select the events that should be sent to this output.
@@ -107,8 +107,8 @@ To set up a webhook to send AutoOps notifications to a Slack channel, go through
107107
6. Toggle the **Activate Incoming Webhooks** to On.
108108
7. Click **Request to Add New Webhook**.
109109
8. Select a Slack channel from the list to receive the notifications and click **Allow**.
110-
9. Copy the webhook URL to set up the webhook notification endpoint in AutoOps.
111-
10. Add the webhook URL when creating the endpoint.
110+
9. Copy the webhook URL to set up the webhook notification connector in AutoOps.
111+
10. Add the webhook URL when creating the connector.
112112
113113
:::
114114
@@ -126,7 +126,7 @@ The VictorOps integration consists of the following parts:
126126

127127
**AutoOps configuration**
128128

129-
1. Add a new PagerDuty endpoint using the PagerDuty configuration application key.
129+
1. Add a new PagerDuty connector using the PagerDuty configuration application key.
130130
2. To receive Slack notifications, add a notification filter. Scroll down the Notification page and click Add.
131131
3. Fill in the filter details.
132132
4. Select the events that should be sent to this output.
@@ -151,7 +151,7 @@ The Opsgenie integration consists of the following parts:
151151

152152
1. Open AutoOps and go to **User Profile**. Then, select **Notifications**.
153153
2. Click **Add** and select **Opsgenie** from the dropdown list.
154-
3. Name your endpoint and add Api Key from opsgenie API configuration. Click the validate button to make sure that your notification setting is working. Don’t forget to save your notification endpoint!
154+
3. Name your connector and add Api Key from opsgenie API configuration. Click the validate button to make sure that your notification setting is working. Don’t forget to save your notification connector!
155155
4. To receive notifications on Opsgenie, you need to add a notification filter. Scroll down the **Notification** page and click **Add**.
156156
5. Fill in the filter details.
157157
6. Select events that should be sent to this output.
@@ -167,7 +167,7 @@ Save the URL displayed during the creation of the incoming webhook, as you will
167167

168168
**AutoOps configuration**
169169

170-
1. Add a new MS team endpoint using the URL from Microsoft Teams.
170+
1. Add a new MS team connector using the URL from Microsoft Teams.
171171
2. To receive notifications into Microsoft Teams, you need to add a notification filter. Scroll down the Notification page and click Add.
172172
3. Fill in the filter details.
173173
4. Select events that should be sent to this output.
@@ -182,8 +182,8 @@ A webhook enables an application to provide other applications with real-time in
182182

183183
**How to add a webhook notification**
184184

185-
1. Go to **Settings** **Notifications*** ***Endpoint settings** and click **Add**.
186-
2. Select Webhook from the drop-down list and enter the following details:
185+
1. Go to **Settings** > **Notifications** > **Connector settings** and click **Add**.
186+
2. Select Webhook from the drop-dowon list and enter the following details:
187187

188188
* **Name**: It must be a unique name for this webhook.
189189
* **URL**: This is the endpoint to which HTTP POST requests will be sent when events occur.
@@ -209,9 +209,8 @@ A webhook enables an application to provide other applications with real-time in
209209
4. Click **Validate** to check your settings, and then click **Save**.
210210
5. Optionally, you can test the webhook integration by using the [webhook.site](https://webhook.site/#!/view/fe9d630e-2f01-44b7-9e41-ef9520fbe9a7).
211211

212-
:::{note}
213-
When the Endpoint settings have been completed, continue to set up the notification filter to define which events you’d like to be notified about.
214-
:::
212+
::::{note}
213+
When the connector settings have been completed, continue to set up the notification filter to define which events you’d like to be notified about.
215214
::::
216215

217216
## Notifications report [ec-notification-report]

explore-analyze/machine-learning/nlp/ml-nlp-elser.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ The easiest and recommended way to download and deploy ELSER is to use the [{{in
5757
2. Create an {{infer}} endpoint with the ELSER service by running the following API request:
5858

5959
```console
60-
PUT _inference/sparse_embedding/my-elser-model
60+
PUT _inference/sparse_embedding/my-elser-endpoint
6161
{
6262
"service": "elasticsearch",
6363
"service_settings": {
@@ -67,7 +67,7 @@ PUT _inference/sparse_embedding/my-elser-model
6767
"max_number_of_allocations": 10
6868
},
6969
"num_threads": 1,
70-
"model_id": ".elser_model_2_linux-x86_64"
70+
"model_id": ".elser_model_2"
7171
}
7272
}
7373
```

raw-migrated-files/docs-content/serverless/security-automatic-import.md

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

raw-migrated-files/docs-content/serverless/security-vuln-management-faq.md

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

raw-migrated-files/security-docs/security/index.md

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

raw-migrated-files/toc.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,7 @@ toc:
103103
- file: docs-content/serverless/project-setting-data.md
104104
- file: docs-content/serverless/project-settings-alerts.md
105105
- file: docs-content/serverless/project-settings-content.md
106-
- file: docs-content/serverless/security-automatic-import.md
107106
- file: docs-content/serverless/security-detection-engine-overview.md
108-
- file: docs-content/serverless/security-vuln-management-faq.md
109107
- file: docs-content/serverless/what-is-observability-serverless.md
110108
- file: elasticsearch-hadoop/elasticsearch-hadoop/index.md
111109
children:
@@ -146,7 +144,6 @@ toc:
146144
children:
147145
- file: observability-docs/observability/index.md
148146
- file: observability-docs/observability/obs-ai-assistant.md
149-
- file: security-docs/security/index.md
150147
- file: stack-docs/elastic-stack/index.md
151148
children:
152149
- file: stack-docs/elastic-stack/installing-stack-demo-self.md

reference/data-analysis/observability/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ mapped_pages:
88

99
Learn about the key metrics displayed in the Infrastructure app and how they are calculated.
1010

11-
* [Host metrics](/reference/data-analysis/observability/observability-host-metrics-serverless.md)
12-
* [Container metrics](/reference/data-analysis/observability/observability-container-metrics-serverless.md)
13-
* [Kubernetes pod metrics](/reference/data-analysis/observability/observability-kubernetes-pod-metrics-serverless.md)
14-
* [AWS metrics](/reference/data-analysis/observability/observability-aws-metrics-serverless.md)
11+
* [Host metrics](/reference/data-analysis/observability/observability-host-metrics.md)
12+
* [Container metrics](/reference/data-analysis/observability/observability-container-metrics.md)
13+
* [Kubernetes pod metrics](/reference/data-analysis/observability/observability-kubernetes-pod-metrics.md)
14+
* [AWS metrics](/reference/data-analysis/observability/observability-aws-metrics.md)
1515

1616

1717

File renamed without changes.

0 commit comments

Comments
 (0)