Changes in progress

elastic · Nov 13, 2024 · 4ca0f74 · 4ca0f74
1 parent fb81683
commit 4ca0f74
Show file tree

Hide file tree

Showing 14 changed files with 206 additions and 170 deletions.
diff --git a/docs/en/serverless/application-and-service-monitoring.asciidoc b/docs/en/serverless/application-and-service-monitoring.asciidoc
@@ -9,19 +9,9 @@ Explore the topics in this section to learn how to observe and monitor software
 
 [cols="1,1"]
 |===
-|<<apm>>
+|<<observability-apm>>
 |Monitor software services and applications in real time, by collecting detailed performance information on response time for incoming requests, database queries, calls to caches, external HTTP requests, and more.
 
-|<<monitor-uptime-synthetics>>
+|<<observability-monitor-synthetics>>
 |Monitor the availability of network endpoints and services.
-
-|<<user-experience>>
-|Quantify and analyze the perceived performance of your web application using real-world user experiences.
-
-|<<uptime-intro>>
-|Periodically check the status of your services and applications.
-
-|<<monitor-java-app>>
-|Monitor a Java application using Elastic Observability: Logs, Infrastructure metrics, APM, and Uptime.
-
 |===
diff --git a/docs/en/serverless/incident-management.asciidoc b/docs/en/serverless/incident-management.asciidoc
@@ -6,13 +6,13 @@ Explore the topics in this section to learn how to respond to incidents detected
 
 [cols="1,1"]
 |===
-|<<create-alerts>>
+|<<observability-alerting>>
 |Trigger alerts when incidents occur, and use built-in connectors to send the alerts to email, slack, or other third-party systems, such as your external incident management application.
 
-|<<create-cases>>
+|<<observability-cases>>
 |Collect and share information about {observability} issues by opening cases and optionally sending them to your external incident management application.
 
-|<<slo>>
+|<<observability-slos>>
 |Set clear, measurable targets for your service performance, based on factors like availability, response times, error rates, and other key metrics.
 |===
 

diff --git a/docs/en/serverless/index.asciidoc b/docs/en/serverless/index.asciidoc
diff --git a/docs/en/serverless/infra-monitoring/infra-monitoring.asciidoc b/docs/en/serverless/infra-monitoring/infra-monitoring.asciidoc
@@ -1,5 +1,5 @@
 [[observability-infrastructure-monitoring]]
-= Infrastructure monitoring
+= Analyze infrastructure and host metrics
 
 // :description: Monitor metrics from your servers, Docker, Kubernetes, Prometheus, and other services and applications.
 // :keywords: serverless, observability, overview

diff --git a/docs/en/serverless/infrastructure-and-host-monitoring-intro.asciidoc b/docs/en/serverless/infrastructure-and-host-monitoring-intro.asciidoc
@@ -9,21 +9,12 @@ Explore the topics in this section to learn how to observe and monitor hosts and
 
 [cols="1,1"]
 |===
-|<<monitor-infrastructure-and-hosts>>
+|<<observability-infrastructure-monitoring>>
 |Visualize infrastructure metrics to help diagnose problematic spikes, identify high resource utilization, automatically discover and track pods, and unify your metrics with other observability data.
 
-|<<universal-profiling>>
-|Profile all the code running on a machine, including application code, kernel, and third-party libraries.
-
-|<<monitor-kubernetes>>
-|Observe all layers of your application, including the orchestration software itself.
-
-|<<monitor-nginx>>
-|Collect valuable metrics and logs from your nginx instances.
-
-|<<troubleshooting-infrastructure-monitoring>>
+|<<observability-troubleshooting-infrastructure-monitoring>>
 |Troubleshoot common issues on your own or ask for help.
 
-|<<metrics-reference>>
+|<<observability-metrics-reference>>
 |Learn about the key metrics displayed in the Infrastructure UI and how they are calculated.
 |===
diff --git a/docs/en/serverless/logging/log-monitoring.asciidoc b/docs/en/serverless/logging/log-monitoring.asciidoc
@@ -1,6 +1,10 @@
 [[observability-log-monitoring]]
 = Log monitoring
 
+++++
+<titleabbrev>Logs</titleabbrev>
+++++
+
 // :description: Use Elastic to deploy and manage logs at a petabyte scale, and get insights from your logs in minutes.
 // :keywords: serverless, observability, overview
 

diff --git a/docs/en/serverless/observability-get-started.asciidoc b/docs/en/serverless/observability-get-started.asciidoc
@@ -1,12 +1,14 @@
 [[observability-get-started]]
 = Get started with Elastic Observability
 
+//REVIEWERS: Any concerns that this duplicates some of the info provided on the Obs landing page?
+//I think this page might rank higher in a google search for users who are looking for GS content because it's longer and has the
+//right keywords.
+
 ++++
 <titleabbrev>Get started</titleabbrev>
 ++++
 
-// QUESTION: Some of this duplicates what we have on the landing page for Elastic Observability. Is that OK or should we prune this down?
-
 New to Elastic {observability}? Discover more about our observability features and how to get started.
 
 [discrete]
@@ -56,8 +58,10 @@ Each quickstart provides:
 
 Follow the steps in these guides to get started quickly:
 
-* <<quickstart-monitor-hosts-with-elastic-agent>>
-* <<monitor-k8s-logs-metrics-with-elastic-agent>>
+* <<observability-quickstarts-monitor-hosts-with-elastic-agent>>
+* <<observability-quickstarts-k8s-logs-metrics>>
+
+//TODO: Ask Arianna: will the firehose QS be added to serverless
 
 [discrete]
 === Get started with other features

diff --git a/docs/en/serverless/quickstarts/k8s-logs-metrics.asciidoc b/docs/en/serverless/quickstarts/k8s-logs-metrics.asciidoc
@@ -1,5 +1,5 @@
 [[observability-quickstarts-k8s-logs-metrics]]
-= Monitor your Kubernetes cluster with Elastic Agent
+= Quickstart: Monitor your Kubernetes cluster with Elastic Agent
 
 // :description: Learn how to monitor your cluster infrastructure running on Kubernetes.
 // :keywords: serverless, observability, how-to

diff --git a/docs/en/serverless/quickstarts/monitor-hosts-with-elastic-agent.asciidoc b/docs/en/serverless/quickstarts/monitor-hosts-with-elastic-agent.asciidoc
@@ -1,5 +1,5 @@
 [[observability-quickstarts-monitor-hosts-with-elastic-agent]]
-= Monitor hosts with {agent}
+= Quickstart: Monitor hosts with {agent}
 
 // :description: Learn how to scan your hosts to detect and collect logs and metrics.
 // :keywords: serverless, observability, how-to

diff --git a/docs/en/serverless/quickstarts/overview.asciidoc b/docs/en/serverless/quickstarts/overview.asciidoc
diff --git a/docs/en/serverless/reference.asciidoc b/docs/en/serverless/reference.asciidoc
@@ -0,0 +1,7 @@
+[[reference]]
+= Reference
+
+This section contains reference information related to using Elastic {observability}.
+
+* <<observability-infrastructure-monitoring-required-fields>>
+* <<observability-elastic-entity-model>>
diff --git a/.../serverless/elastic-entity-model.asciidoc → ...s/reference/elastic-entity-model.asciidoc b/.../serverless/elastic-entity-model.asciidoc → ...s/reference/elastic-entity-model.asciidoc
@@ -32,7 +32,7 @@ The concept of an entity is important as a means to unify observability signals
 
 :role: Admin
 :goal: enable the Elastic Entity Model
-include::./partials/roles.asciidoc[]
+include::../partials/roles.asciidoc[]
 :role!:
 
 :goal!:
@@ -45,7 +45,7 @@ You can enable the Elastic Entity Model from the new <<observability-inventory,I
 
 :role: Admin
 :goal: enable the Elastic Entity Model
-include::./partials/roles.asciidoc[]
+include::../partials/roles.asciidoc[]
 :role!:
 
 :goal!:

diff --git a/...ra-monitoring/metrics-app-fields.asciidoc → ...ess/reference/metrics-app-fields.asciidoc b/...ra-monitoring/metrics-app-fields.asciidoc → ...ess/reference/metrics-app-fields.asciidoc
@@ -1,5 +1,5 @@
 [[observability-infrastructure-monitoring-required-fields]]
-= Required fields
+= Infrastructure app fields
 
 // :description: Learn about the fields required to display data in the Infrastructure UI.
 // :keywords: serverless, observability, reference

diff --git a/docs/en/serverless/what-is-observability-serverless.asciidoc b/docs/en/serverless/what-is-observability-serverless.asciidoc
@@ -13,7 +13,9 @@ While in technical preview, Elastic Observability serverless projects should not
 [discrete]
 == Get started
 
-* <<observability-quickstarts-overview,*Quickstarts*>>: Learn how to ingest your observability data and get immediate value.
+* <<observability-get-started,*Get started*>>: Discover more about our observability features and how to get started.
+* <<observability-quickstarts-monitor-hosts-with-elastic-agent,*Quickstart: Monitor hosts with Elastic Agent*>>: Scan your host to detect and collect logs and metrics.
+* <<observability-quickstarts-k8s-logs-metrics,*Quickstart: Monitor your Kubernetes cluster with Elastic Agent*>>: Create the Kubernetes resources that are required to monitor your cluster infrastructure.
 * <<observability-get-started-with-logs,*Get started with Logs*>>: Add your log data to Elastic Observability and start exploring your logs.
 * <<observability-apm-get-started,*Get started with traces and APM*>>: Collect Application Performance Monitoring (APM) data and visualize it in real time.
 * <<observability-get-started-with-metrics,*Get started with metrics*>>: Add your metrics data to Elastic Observability and visualize it in real time.