Skip to content

Commit d661adc

Browse files
authored
Merge branch 'main' into update-synthetics-docker
2 parents 8e28367 + dd8dfbb commit d661adc

File tree

4 files changed

+27
-21
lines changed

4 files changed

+27
-21
lines changed

deploy-manage/security/fips-ingest.md

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,23 @@ When you use {{agent}} and {{fleet-server}}, these limitations apply:
8585
* Running {{agent}} in [OpenTelemetry mode](https://github.com/elastic/elastic-agent/blob/main/internal/pkg/otel/README.md) is not yet supported. This includes all receivers, such as Filebeat Receiver, Metricbeat Receiver, [Prometheus Receiver](https://www.elastic.co/docs/reference/integrations/prometheus).
8686
* Some Elastic Integrations are not FIPS compatible, as they depend on functionality that is not yet supported for FIPS configuration. In general, when using {{agent}} and {{fleet-server}}, the same restrictions listed previously for {{metricbeat}} and {{filebeat}} modules, inputs, and processors apply.
8787

88-
These Elastic Integrations have components that are **not** FIPS compatible, and **cannot** be used in FIPS environments, even if combined with other ingest tools that offer FIPS mode.
89-
90-
- [Azure Logs Integration (v2 preview)](integration-docs://reference/azure/events.md)
91-
- [Azure Event Hub Input](integration-docs://reference/azure/eventhub.md)
92-
- [SQL Input](integration-docs://reference/sql.md)
93-
- [PostgreSQL Integration](integration-docs://reference/postgresql.md)
94-
- [MongoDB Integration](integration-docs://reference/mongodb.md)
95-
- [MySQL Integration](integration-docs://reference/mysql.md)
96-
- [Microsoft SQL Server Integration](integration-docs://reference/microsoft_sqlserver.md)
97-
- [Oracle Integration](integration-docs://reference/oracle.md)
98-
88+
### Elastic Integrations that are not FIPS compatible [ingest-limitations-integrations]
89+
90+
These Elastic Integrations have components that are **not** FIPS compatible, and **cannot** be used in FIPS environments, even if combined with other ingest tools that offer FIPS mode.
91+
92+
- [Azure Logs Integration (v2 preview)](integration-docs://reference/azure/events.md)
93+
- [Azure Event Hub Input](integration-docs://reference/azure/eventhub.md)
94+
- [Azure AI Foundry Integration](integration-docs://reference/azure_ai_foundry.md)
95+
- [Azure App Service Integration](integration-docs://reference/azure_app_service.md)
96+
- [Azure Application Insights Integration](integration-docs://reference/azure_application_insights.md)
97+
- [Azure Billing Metrics Integration](integration-docs://reference/azure_billing.md)
98+
- [Azure Functions Integration](integration-docs://reference/azure_functions.md)
99+
- [Custom Azure Logs Integration](integration-docs://reference/azure_logs.md)
100+
- [Azure Resource Metrics Integration](integration-docs://reference/azure_metrics.md)
101+
- [Azure OpenAI Integration](integration-docs://reference/azure_openai.md)
102+
- [SQL Input](integration-docs://reference/sql.md)
103+
- [PostgreSQL Integration](integration-docs://reference/postgresql.md)
104+
- [MongoDB Integration](integration-docs://reference/mongodb.md)
105+
- [MySQL Integration](integration-docs://reference/mysql.md)
106+
- [Microsoft SQL Server Integration](integration-docs://reference/microsoft_sqlserver.md)
107+
- [Oracle Integration](integration-docs://reference/oracle.md)

deploy-manage/upgrade/orchestrator/upgrade-cloud-on-k8s.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,11 @@ This will update the ECK installation to the latest binary and update the CRDs a
101101
Upgrading the operator results in a one-time update to existing managed resources in the cluster. This potentially triggers a rolling restart of pods by Kubernetes to apply those changes. The following list contains the ECK operator versions that would cause a rolling restart after they have been installed.
102102

103103
```
104-
1.6, 1.9, 2.0, 2.1, 2.2, 2.4, 2.5, 2.6, 2.7, 2.8, 2.14
104+
1.6, 1.9, 2.0, 2.1, 2.2, 2.4, 2.5, 2.6, 2.7, 2.8, 2.14, 3.1 <1>
105105
```
106+
107+
1. The restart when upgrading to version 3.1 happens only for applications using [stack monitoring](/deploy-manage/monitor/stack-monitoring/eck-stack-monitoring.md).
108+
106109
::::{note}
107110
Stepping over one of these versions, for example, upgrading ECK from 2.6 to 2.9, still triggers a rolling restart.
108111
::::

reference/fleet/add-fleet-server-kubernetes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ Adapt and change the suggested manifests and deployment strategy to your needs,
336336
automountServiceAccountToken: false
337337
containers:
338338
- name: elastic-agent
339-
image: docker.elastic.co/beats/elastic-agent:{{version.stack}}
339+
image: docker.elastic.co/elastic-agent:{{version.stack}}
340340
env:
341341
- name: FLEET_SERVER_ENABLE
342342
value: "true"
@@ -422,7 +422,7 @@ Adapt and change the suggested manifests and deployment strategy to your needs,
422422
automountServiceAccountToken: false
423423
containers:
424424
- name: elastic-agent
425-
image: docker.elastic.co/beats/elastic-agent:{{version.stack}}
425+
image: docker.elastic.co/elastic-agent:{{version.stack}}
426426
env:
427427
- name: FLEET_SERVER_ENABLE
428428
value: "true"

solutions/security/get-started/spaces-defend-faq.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@ This page introduces {{elastic-sec}} space awareness and answers frequently aske
1919
::::
2020

2121
::::{note}
22-
{{elastic-sec}}'s space awareness works in conjunction with {{fleet}}'s space awareness. Space awareness is enabled by default in both applications, but for {{stack}} deployments that existed prior to version 9.1, {{fleet}} requires you to manually “opt-in” so that existing data can become space aware:
23-
24-
1. Navigate to **Fleet** using the [global search field](/explore-analyze/find-and-organize/find-apps-and-objects.md).
25-
2. Go to the **Settings** tab.
26-
3. Scroll to **Advanced settings**.
27-
4. Under **Migrate to space-aware agent policies**, click **Start migration**.
28-
5. Confirm the migration.
22+
{{elastic-sec}}'s space awareness works in conjunction with {{fleet}}'s space awareness. Space awareness is enabled by default in both applications, but for {{stack}} deployments that existed prior to version 9.1, {{fleet}} requires you to manually “opt-in” so that existing data can become space aware. For instructions, refer to [Enable space awareness in {{fleet}}](/deploy-manage/manage-spaces-fleet.md#spaces-fleet-enable).
2923

3024
This is a one-time migration that copies your existing {{fleet}} data into a new, space-aware model. Previous data will be preserved in snapshots in case rollback is needed.
3125
::::

0 commit comments

Comments
 (0)