Skip to content

Commit a6798c8

Browse files
authored
Merge branch 'main' into fix-logs-formatting
2 parents df63e95 + 976cbfb commit a6798c8

8 files changed

+15
-21
lines changed

reference/ingestion-tools/fleet/agent-command-reference.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ elastic-agent enroll --fleet-server-es <string>
182182
[--force]
183183
[--header <strings>]
184184
[--help]
185-
[--non-interactive]
186185
[--proxy-disabled]
187186
[--proxy-header <strings>]
188187
[--proxy-url <string>]
@@ -307,9 +306,6 @@ For more information about custom certificates, refer to [Configure SSL/TLS for
307306
We strongly recommend that you use a secure connection.
308307

309308

310-
`--non-interactive`
311-
: Install {{agent}} in a non-interactive mode. This flag is helpful when using automation software or scripted deployments. If {{agent}} is already installed on the host, the installation will terminate.
312-
313309
`--proxy-disabled`
314310
: Disable proxy support including environment variables.
315311

reference/ingestion-tools/fleet/logstash-output.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ outputs:
2525

2626
To receive the events in {{ls}}, you also need to create a {{ls}} configuration pipeline. The {{ls}} configuration pipeline listens for incoming {{agent}} connections, processes received events, and then sends the events to {{es}}.
2727

28+
Please be aware that the structure of the documents sent from {{agent}} to {{ls}} must not be modified by the pipeline. We recommend that the pipeline doesn’t edit or remove the fields and their contents. Editing the structure of the documents coming from {{agent}} can prevent the {{es}} ingest pipelines associated to the integrations in use to work correctly. We cannot guarantee that the {{es}} ingest pipelines associated to the integrations using {agent} can work with missing or modified fields.
29+
2830
The following {{ls}} pipeline definition example configures a pipeline that listens on port `5044` for incoming {{agent}} connections and routes received events to {{es}}.
2931

3032
```yaml

solutions/observability/cloud/monitor-amazon-cloud-compute-ec2.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ To collect EC2 metrics, you typically need to install the Elastic [Amazon EC2 in
2626

2727
Expand the **quick guide** to learn how, or skip to the next section if your data is already in {{es}}.
2828

29-
:::::{dropdown} **Quick guide: Add data**
30-
::::{admonition}
29+
:::::{dropdown} Quick guide: Add data
3130
1. In the Observability UI, find **Integrations** in the main menu or use the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
3231
2. In the query bar, search for and select the **Amazon EC2** integration.
3332
3. Read the overview to make sure you understand integration requirements and other considerations.

solutions/observability/cloud/monitor-amazon-kinesis-data-streams.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ To collect Kinesis data stream metrics from Amazon CloudWatch, you typically nee
2828

2929
Expand the **quick guide** to learn how, or skip to the next section if your data is already in {{es}}.
3030

31-
:::::{dropdown} **Quick guide: Add data**
32-
::::{note}
31+
:::::{dropdown} Quick guide: Add data
3332
1. In the Observability UI, find **Integrations** in the main menu or use the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
3433
2. In the query bar, search for and select the **Amazon Kinesis Data Stream** integration.
3534
3. Read the overview to make sure you understand integration requirements and other considerations.

solutions/observability/cloud/monitor-amazon-simple-queue-service-sqs.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ To collect SQS metrics, you typically need to install the Elastic [Amazon SQS in
2424

2525
Expand the **quick guide** to learn how, or skip to the next section if your data is already in {{es}}.
2626

27-
:::::{dropdown} **Quick guide: Add data**
28-
::::{note}
27+
:::::{dropdown} Quick guide: Add data
2928
1. In the Observability UI, find **Integrations** in the main menu or use the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
3029
2. In the query bar, search for and select the **Amazon SQS** integration.
3130
3. Read the overview to make sure you understand integration requirements and other considerations.

solutions/observability/cloud/monitor-amazon-simple-storage-service-s3.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ To collect S3 metrics, you typically need to install the Elastic [Amazon S3 inte
2727

2828
Expand the **quick guide** to learn how, or skip to the next section if your data is already in {{es}}.
2929

30-
:::::{dropdown} **Quick guide: Add data**
31-
::::{note}
30+
:::::{dropdown} Quick guide: Add data
3231
1. In the Observability UI, find **Integrations** in the main menu or use the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
3332
2. In the query bar, search for and select the **Amazon S3** integration.
3433
3. Read the overview to make sure you understand integration requirements and other considerations.

solutions/observability/cloud/monitor-microsoft-azure-with-elastic-agent.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ To add the integration:
113113
**Subscription ID**
114114
: The subscription ID listed on the main Subscriptions page.
115115

116-
:::{image} ../../../images/observability-agent-tut-azure-integration-settings.png
117-
:alt: Screenshot of integration settings for Azure
118-
:class: screenshot
119-
:::
116+
:::{image} ../../../images/observability-agent-tut-azure-integration-settings.png
117+
:alt: Screenshot of integration settings for Azure
118+
:class: screenshot
119+
:::
120120

121121
6. Make sure the **Collect Azure Billing metrics** selector is turned on.
122122
7. Accept the defaults to create a new agent policy.
@@ -266,10 +266,10 @@ To add the integration:
266266
**Storage account key**
267267
: A valid access key defined for the storage account.
268268

269-
:::{image} ../../../images/observability-agent-tut-azure-activity-log-settings.png
270-
:alt: Screenshot of integration settings for Azure activity logs
271-
:class: screenshot
272-
:::
269+
:::{image} ../../../images/observability-agent-tut-azure-activity-log-settings.png
270+
:alt: Screenshot of integration settings for Azure activity logs
271+
:class: screenshot
272+
:::
273273

274274
6. Make sure the **Collect Azure activity logs from Event Hub** selector is turned on.
275275
7. Under **Existing hosts**, select the agent policy that created earlier.

solutions/observability/infra-and-hosts/view-infrastructure-metrics-by-resource-type.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ The processes listed in the **Top processes** table are based on an aggregation
139139

140140
:::::
141141

142-
:::::{dropdown} **Universal Profiling**
142+
:::::{dropdown} Universal Profiling
143143
The **Universal Profiling** tab shows CPU usage down to the application code level. From here, you can find the sources of resource usage, and identify code that can be optimized to reduce infrastructure costs. The Universal Profiling tab has the following views.
144144

145145
| | |

0 commit comments

Comments
 (0)