- })
Services List and Services Map
+Services List and Services Map
View your application topology and investigate microservice interactions.
-The Service Map API allows you to fetch a graph representation of the Service Map, which is a high-level view of your application environment, automatically derived from tracing data. For more information, see [Service Map](/docs/apm/traces/services-list-map).
+The Service Map API allows you to fetch a graph representation of the Service Map, which is a high-level view of your application environment, automatically derived from tracing data. For more information, see [Service Map](/docs/apm/services-list-map).
:::tip Other Tracing APIs
See also: [Span Analytics APIs](/docs/api/span-analytics) and [Traces APIs](/docs/api/tracing).
diff --git a/docs/api/span-analytics.md b/docs/api/span-analytics.md
index 390bc783ad..4bb7359886 100644
--- a/docs/api/span-analytics.md
+++ b/docs/api/span-analytics.md
@@ -11,7 +11,7 @@ import ApiRoles from '../reuse/api-roles.md';
}){kind=icon}
-The Span Analytics API allows you to browse spans collected in the system. You can execute queries to find individual spans matching provided search criteria as well as run aggregated span queries and retrieve their results. For more information, see [Spans](/docs/apm/traces/spans).
+The Span Analytics API allows you to browse spans collected in the system. You can execute queries to find individual spans matching provided search criteria as well as run aggregated span queries and retrieve their results. For more information, see [Spans](/docs/apm/spans).
:::tip Other Tracing APIs
See also: [Service Map APIs](/docs/api/service-map) and [Traces APIs](/docs/api/tracing).
@@ -60,4 +60,4 @@ While the span analytics query is running you need to request the query status b
## Errors
-})
1. Enter **Advanced options for Browser RUM**.})
- * **Application Name**. (Recommended) Add an **Application Name** tag of a text string to show for the app name in spans (for example, `bookings-app`). This groups services in the Application Service View. If left blank, services will belong to a "default" application. See [Application Service Dashboards](/docs/apm/traces/services-list-map.md) for more information. This setting is saved in the script for `name_of_your_web_application`.
+ * **Application Name**. (Recommended) Add an **Application Name** tag of a text string to show for the app name in spans (for example, `bookings-app`). This groups services in the Application Service View. If left blank, services will belong to a "default" application. See [Application Service Dashboards](/docs/apm/services-list-map.md) for more information. This setting is saved in the script for `name_of_your_web_application`.
* **Service Name**. (Required) Add a **Service Name** of a text string to show for the service name in spans (for example, `bookings-web-app`). This setting is saved in the script for `name_of_your_web_service`. To set up a service name dynamically (e.g., to have different service names for micro-frontend packages), leverage the `getOverriddenServiceName` function inside your page code to overwrite the default service name (requires RUM script v4.2.0 or higher). Service names should be of low cardinality and should describe parts of your website above page level. Here's an example code leveraging that function:
```javascript
window.sumoLogicOpenTelemetryRum.initialize({
diff --git a/docs/apm/traces/services-list-map.md b/docs/apm/services-list-map.md
similarity index 57%
rename from docs/apm/traces/services-list-map.md
rename to docs/apm/services-list-map.md
index 418730fd93..b7c2650e6d 100644
--- a/docs/apm/traces/services-list-map.md
+++ b/docs/apm/services-list-map.md
@@ -6,59 +6,17 @@ description: View your application topology and investigate microservice interac
import useBaseUrl from '@docusaurus/useBaseUrl';
-
+}){kind=icon}
-[**Classic UI**](/docs/get-started/sumo-logic-ui-classic). To access Services, go to the **Home** screen and select **Services**.
+To access the services list and services map features:
+* [**Classic UI**](/docs/get-started/sumo-logic-ui-classic). Go to the **Home** screen and select **Traces** > **Services**.
+* [**New UI**](/docs/get-started/sumo-logic-ui/). In the main Sumo Logic menu, select **Observability**, and then under **Application Monitoring**, select **Services**. You can also click the **Go To...** menu at the top of the screen and select **Services**.
-[**New UI**](/docs/get-started/sumo-logic-ui/). To access Services, in the main Sumo Logic menu, select **Observability**, and then under **Application Monitoring**, select **Services**. You can also click the **Go To...** menu at the top of the screen and select **Services**.
-
-
-## Services List view
-
-The **Services List** view provides a compact, high-level overview of your application service health insights, alerts, and KPIs. You can filter and sort your KPI data using the filters and column headers.
-
-})
-
-KPIs listed in the table reflect the previous 15 minutes of data. Clicking on any service will open the Entities panel allowing for further drill-down.
-
-### Alerts
-
-**Alerts** in the Service List are displayed based on the configured [Monitors](/docs/alerts/monitors/overview/) in the Sumo Logic platform for a given service.
-
-The **Alert status** column displays the most severe alert status along with the total number of alerts associated with a given service.
-
-To view alert details, click on a row and view it in the right-hand-side panel.
-
-In addition, you can narrow down the list of visible services by the type of active alerts for a given service. Service List can filter based on the following alert statuses:
-
-- Critical
-- Warning
-- Missing Data
-- Normal
-
-A service is displayed in the list if at least one of the alerts is in the selected state.
-
-### General Settings
-
-Configure anomaly detection in **General Settings** ([learn more](#anomaly-detection)).
-
-})
-
-:::note
-Your Services List and Map settings are specific to you (not your team) and will be preserved in your browser's local storage.
-:::
-
-### Display Settings
-
-Display and hide columns using **Display Settings**.
-
-
-
-## Services Map view
+## Services map view
The **Services Map** view visually maps out your application environment, giving you a greater understanding of your application architecture, hierarchy, and dependencies between monitored microservices. Health and load of each microservice is reflected in size and color to help you spot potential problems and bottlenecks in your application infrastructure.
-Services Maps are built automatically from distributed tracing data in real time as it arrives in Sumo Logic. You can:
+Services maps are built automatically from distributed tracing data in real time as it arrives in Sumo Logic. You can:
* Zoom in on the map to see a more granular level of detail, or zoom out to get a higher-level overview
* Hover over a service to see its connections to other services and the last 15 minutes of activity in terms of latency, requests, and errors
@@ -67,17 +25,15 @@ Services Maps are built automatically from distributed tracing data in real time
* Filter by environment (up to 10 values), if your tracing data has the deployment environment tag (`deployment.environment=[environment]`)
* Search for a service by name
-})
+})
-### General Settings
+### Settings
-Configure anomaly detection in **General Settings** ([learn more](#anomaly-detection)).
-
-})
+Use the **General Settings** to configure [anomaly detection](#anomaly-detection).
### Map legend
-})
+})
* **Color** of services:
* Red represents anomalies.
@@ -92,7 +48,37 @@ Configure anomaly detection in **General Settings** ([learn more](#anomaly-detec
* Circle and arrows with dotted lines represent services or connections that have been inactive an hour or more.
* **Size** of services: Size is based on service activity, where large circles are more active compared to smaller circles that are less active.
-## Anomaly Detection
+## Services list view
+
+The **Services List** view provides a compact, high-level overview of your application service health insights, alerts, and KPIs. You can filter and sort your KPI data using the filters and column headers.
+
+})
+
+KPIs listed in the table reflect the previous 15 minutes of data. Clicking on any service will open the Entities panel allowing for further drill-down.
+
+### Alerts
+
+Alerts in the Service List are displayed based on the configured [monitors](/docs/alerts/monitors/overview/) in the Sumo Logic platform for a given service.
+
+The **Alert Status** column displays the most severe alert status along with the total number of alerts associated with a given service.
+
+To view an alert's details, click on a row and view it in the right-hand-side panel.
+
+Additionally, you can narrow down the list of visible services by the type of active alerts for a given service. Service List can filter based on the following alert statuses:
+
+- Critical
+- Warning
+- Missing Data
+- Normal
+
+A service is displayed in the list if at least one of the alerts is in the selected state.
+
+### Settings
+
+* Use the general settings to configure [anomaly detection](#anomaly-detection).})
+* Use the columns display settings to display and hide columns.})
+
+## Anomaly detection
An anomaly is a spike in latency and errors or a dip in requests. Here's how to configure your own threshold settings for anomaly detection.
@@ -100,38 +86,39 @@ An anomaly is a spike in latency and errors or a dip in requests. Here's how to
**Automatic anomaly detection** is enabled by default, with the **Worst Case** option selected. This will render services to be displayed as a red circle if at least one of the KPIs (latency, errors, requests) has had an anomaly in the last 15 minutes AND the anomaly was not present 7 days ago at the same time. Optionally, you can explicitly choose one of the other KPIs - **Latency**, **Error**, or **Request**.
-})
+})
The standard [metric outlier operator](/docs/metrics/metrics-operators/outlier/) is used to detect this. You can adjust the sensitivity and **Learning window** of the outlier detection in the settings to make the logic more or less dependent on occasional spikes.
### Manual
+
Manual anomaly detection allows you to specify different detection settings for each KPI. Click the toggle switch to manually enable or disable each KPI highlight as desired.
-})
+})
### Alerts
If the **Alerts** option is enabled, the status of a service will be influenced by the presence of active alerts (or those, which have been resolved within the selected time range) associated with the service.
-})
+})
-## Services Dashboard Panels
+## Add services panel to dashboard
-The **Services Map** and **Services List** panels, available out of the box, enable you to explore your application environment and review all traces from your Dashboard. You can duplicate or add multiple panels with different filtering or queries to refine views and support your organization.
+The **Services Map** and **Services List** panels, available out of the box, enable you to explore your application environment and review all traces from a dashboard. You can duplicate or add multiple panels with different filtering or queries to refine views and support your organization.
-To add a Services panel to your Dashboard:
+To add a services panel to a dashboard:
-1. Open an existing Dashboard or create a new Dashboard. })
-1. When the panel configuration page opens, go to the **Visual Settings** > **Chart Type**, dropdown and select **Table** (Services List) or **Graph** (Services Map). })
-1. (Optional) Select from the dropdown menus to filter by the following:})
+1. Open an existing dashboard or [create a new one](/docs/dashboards/create-dashboard-new).
+1. On an existing dashboard, click **Add Panel** > **Services**, or, if you're creating a new dashboard, click **Services**.})
+1. When the panel configuration page opens, go to the **Visual Settings** > **Chart Type**, dropdown and select **Table** (Services List) or **Graph** (Services Map). })
+1. (Optional) Select from the dropdown menus to filter by the following:})
* **Application**. Your application name. You can use this if your tracing data has the tag called `application=[app-name]` To pass the variables from dashboard filters, set `application={{application}}`
* **Environment**. Your production, staging, or development environment name. You can use this if your tracing data has the tag called `deployment.environment=[environment-name]`. To pass the variables from dashboard filters, set `deployment.environment={{deployment.environment}}`
* **Service(s)**. Your application name, which should be always there. To pass the variables from dashboard filters, set `service={{service}}`.
1. Go to the **General** tab to configure your panel details (name, **Title Font Size**, and **Description**). })
1. For **Table** chart type only: Go to **Display Settings** and set the column data and services you'd like to see displayed.})
-1. Click **Add to Dashboard**. The panel loads in your Dashboard to review your applications and services according to filtering.
+1. Click **Add to Dashboard**. The panel loads in your dashboard to review your applications and services according to filtering.
:::tip
-See the [Dashboard guide](/docs/dashboards) for additional information and options to create panels, configure filters, create and filter with template variables from dashboard headers, and more.
+See [Dashboards](/docs/dashboards) for additional information on creating panels, configuring filters, filtering with template variables from dashboard headers, and more.
:::
diff --git a/docs/apm/traces/spans.md b/docs/apm/spans.md
similarity index 50%
rename from docs/apm/traces/spans.md
rename to docs/apm/spans.md
index 2c15ab7907..d972b5a0ea 100644
--- a/docs/apm/traces/spans.md
+++ b/docs/apm/spans.md
@@ -4,22 +4,27 @@ title: Span Analytics and Queries
description: Learn how to use the Spans page to explore your span data.
---
-The **Spans** page allows you to filter and aggregate your trace data at the raw span level so you can understand the performance and behavior of your application services.
+import useBaseUrl from '@docusaurus/useBaseUrl';
-## Spans page
+Sumo Logic Span Analytics enables you to filter and aggregate trace data at the raw span level, providing insights into the performance and behavior of your application services.
-[**Classic UI**](/docs/get-started/sumo-logic-ui-classic). To access Spans, go to the **Home** screen and select **Spans**.
+With its intuitive interface, Span Analytics allows you to:
+* Filter and inspect tracing data in detail.
+* Explore span metadata through a structured facets list.
+* Aggregate by any custom dimension or tag to generate charts and tables.
-[**New UI**](/docs/get-started/sumo-logic-ui/). To access Spans, in the main Sumo Logic menu, select **Observability**, and then under **Application Monitoring**, select **Span Analytics**. You can also click the **Go To...** menu at the top of the screen and select **Span Analytics**.
-
+To access span analytics:
-A new Spans page opens. Data is displayed once you run a query.
+* [**Classic UI**](/docs/get-started/sumo-logic-ui-classic). Go to the **Home** screen and click **Traces**. In the new page, click the **Traces** dropdown menu and select **Span Analytics**.
+* [**New UI**](/docs/get-started/sumo-logic-ui/). In the main Sumo Logic menu, select **Observability**, and then under **Application Monitoring**, select **Span Analytics**. You can also click the **Go To...** menu at the top of the screen and select **Span Analytics**.
-
+A new **Spans** page opens. Data is displayed once you run a query.
+
+
From here, you can filter and aggregate by any standard or custom span attribute (tag) and create charts to visualize results. If you find something interesting, you can quickly explore your raw span records in the **Messages** tab.
-For more advanced use cases, you can further enhance your query by clicking the [Open in Search](#open-in-search) button, which opens a new Log Search of your spans based on your query. Here, you can use [Search Query Language](search-query-language-support-for-traces.md) to investigate further.
+For more advanced use cases, you can further enhance your query by clicking the [Open in Search](#open-in-search) button, which opens a new Log Search of your spans based on your query. Here, you can use [Search Query Language](/docs/apm/traces/search-query-language-support-for-traces) to investigate further.
:::note
Tracing must be enabled in your account to use this functionality. Contact your account team if the only thing you see is an infographic.
@@ -29,7 +34,7 @@ import Iframe from 'react-iframe';
:::sumo Micro Lesson
-This micro lesson provides an overview of Span Analytics, and describes the term Span in the distributed tracing and the benefits of Span Analytics. It also explains how to perform Span Analytics in Sumo Logic UI.
+This micro lesson provides an overview of Span Analytics, and describes the term *span* in the distributed tracing and the benefits of Span Analytics. It also explains how to perform Span Analytics in Sumo Logic UI.
### Run query
Once you have defined your spans query, with filters and aggregation if desired, click the search button to run the search. It looks like the following:
-
+
You can pause or stop your search by clicking the appropriate icons below the search button.
-
+
-## Search Results
+## Search results
**Messages** (including **Facets**) are always provided to show you the raw output of your query. You will have **Aggregates** if your query has set the **Visualize** option.
@@ -127,10 +134,10 @@ You can pause or stop your search by clicking the appropriate icons below the se
The **Messages** table shows your raw span data. You can click on any row to open a right-side Details pane (similar to the one in [Trace View](/docs/apm/traces/view-and-investigate-traces)) showing span details and options to navigate to other parts of the system from there.
-
+
* To move a column left or right, hold click and drag it to a different location in the table.
-* To adjust column width, click and drag the vertical line in between the columns.View your application topology and investigate microservice interactions.
Learn how to use the Spans page to explore your span data.
})
+Application Monitoring provides three Service and Application dashboard views. This allows you to review tracing data by application (all or grouped), environment, and services by top level and breaking down their health by application. This helps you review the most active operations performed on specified applications and services. See [Service Map Traces](/docs/apm/services-list-map) and [Sumo Logic Apps](/docs/integrations) for more info.
### Real User Monitoring
diff --git a/docs/dashboards/panels/index.md b/docs/dashboards/panels/index.md
index 3b43bffcb6..90aafc7a31 100644
--- a/docs/dashboards/panels/index.md
+++ b/docs/dashboards/panels/index.md
@@ -167,7 +167,7 @@ The link is displayed is in the panel.
}){kind=icon}
-The [Services List and Map](/docs/apm/traces/services-list-map) views display high-level views of your application environment, giving you a greater insight into your application architecture and dependencies between monitored microservices.
+The [Services List and Map](/docs/apm/services-list-map) views display high-level views of your application environment, giving you a greater insight into your application architecture and dependencies between monitored microservices.
The panel gives you a fully functioning map to zoom in and out and move through services. The size and color of application entities shows status and activity. Click on a service to open the Entity Inspector to drill down to traces, metrics, and the service dashboard.
@@ -189,7 +189,7 @@ To add a Service Map panel:
}){kind=icon}
-Transaction tracing captures and tracks distributed business workflows, by enriching and analyzing traces, logs, and metrics in real-time with automated generated application topology. Each trace provides details on root service, when it occurred and how long, the number of [spans](/docs/apm/traces/spans), and a breakdown of services. The panel panel displays the [Traces page](/docs/apm/traces/) table to give at-a-glance tracking for traces through your Dashboard. To view transaction and service details ([Trace View](/docs/apm/traces/view-and-investigate-traces)), click a trace from the panel.
+Transaction tracing captures and tracks distributed business workflows, by enriching and analyzing traces, logs, and metrics in real-time with automated generated application topology. Each trace provides details on root service, when it occurred and how long, the number of [spans](/docs/apm/spans), and a breakdown of services. The panel panel displays the [Traces page](/docs/apm/traces/) table to give at-a-glance tracking for traces through your Dashboard. To view transaction and service details ([Trace View](/docs/apm/traces/view-and-investigate-traces)), click a trace from the panel.
See the [Dashboard](/docs/dashboards/about) guide for additional information and options to create panels, configure filters, create and filter with template variables from dashboard headers and more.
@@ -201,7 +201,7 @@ You are limited to three Trace List panels in a dashboard.
To add a Trace List panel:
-1. With the Dashboard open, click the **Add Panel** button. })
+1. With the Dashboard open, click the **Add Panel** button.
1. A panel configuration page opens. })
1. Configure a [Trace query](/docs/apm/traces/view-and-investigate-traces) to search for desired set of traces.
1. Select a time range or [create a custom range](/docs/dashboards/set-custom-time-ranges) for the panel. You can set this when creating or at any time when viewing the Dashboard panel.})
diff --git a/docs/manage/security/audit-indexes/search-audit-index.md b/docs/manage/security/audit-indexes/search-audit-index.md
index 2323121c46..fbd5c2f95d 100644
--- a/docs/manage/security/audit-indexes/search-audit-index.md
+++ b/docs/manage/security/audit-indexes/search-audit-index.md
@@ -1,12 +1,12 @@
---
id: search-audit-index
title: Search Audit Index
-description: The Search Audit Index provides event logs on search usage and activities for your account.
+description: The Search Audit Index provides event logs on search usage and activities for your account.
---
import useBaseUrl from '@docusaurus/useBaseUrl';
-The Search Audit Index provides event logs on search usage and activities for your account. The index allows you to monitor and audit the search queries being run within your account, the types of queries, the users running them, and more.
+The Search Audit Index provides event logs on search usage and activities for your account. The index allows you to monitor and audit the search queries being run within your account, the types of queries, the users running them, and more.
To visualize your Search Audit Index data, download the [Enterprise Search Audit App](/docs/integrations/sumo-apps/enterprise-search-audit), which provides pre-built dashboards and reports to help you analyze your current search use and identify areas for improvement.
@@ -25,7 +25,7 @@ The Search Audit Index must be enabled by an administrator.
To enable the Search Audit Index:
-1. [**Classic UI**](/docs/get-started/sumo-logic-ui-classic). In the main Sumo Logic menu, select **Administration > Security > Policies**. })
:::note
@@ -91,4 +91,4 @@ The table below shows the possible values for the `query_type` field.
| Sumo Internal | The Internal searches Sumo Logic runs in the background that are critical in providing other services (for example, autocomplete, scheduled view optimization, etc.). |
| Auto Refresh Dashboard | Search queries used to power auto refresh dashboard panels. |
| Monitor | Queries associated with [monitors](/docs/alerts/monitors). |
-| Span Analytics | Queries run for filtering and aggregating trace data based on [span attributes](/docs/apm/traces/spans) to understand application services performance. Queries can be built using input fields, with filters and visualized results available. |
+| Span Analytics | Queries run for filtering and aggregating trace data based on [span attributes](/docs/apm/spans) to understand application services performance. Queries can be built using input fields, with filters and visualized results available. |
diff --git a/sidebars.ts b/sidebars.ts
index c67c30e977..721070c2c4 100644
--- a/sidebars.ts
+++ b/sidebars.ts
@@ -1789,8 +1789,6 @@ module.exports = {
],
},
'apm/traces/view-and-investigate-traces',
- 'apm/traces/spans',
- 'apm/traces/services-list-map',
'apm/traces/tracing-dashboards',
'apm/traces/search-query-language-support-for-traces',
'apm/traces/tracing-ingest',
@@ -1821,6 +1819,8 @@ module.exports = {
'apm/real-user-monitoring/dashboards',
],
},
+ 'apm/spans',
+ 'apm/services-list-map',
],
},
],
diff --git a/static/img/apm/traces/Service-Dashboards-from-traces.png b/static/img/apm/Service-Dashboards-from-traces.png
similarity index 100%
rename from static/img/apm/traces/Service-Dashboards-from-traces.png
rename to static/img/apm/Service-Dashboards-from-traces.png
diff --git a/static/img/apm/traces/create-servicemap.png b/static/img/apm/create-servicemap.png
similarity index 100%
rename from static/img/apm/traces/create-servicemap.png
rename to static/img/apm/create-servicemap.png
diff --git a/static/img/apm/traces/dropdown-for-spans-filter.png b/static/img/apm/dropdown-for-spans-filter.png
similarity index 100%
rename from static/img/apm/traces/dropdown-for-spans-filter.png
rename to static/img/apm/dropdown-for-spans-filter.png
diff --git a/static/img/apm/traces/enable-alerts.png b/static/img/apm/enable-alerts.png
similarity index 100%
rename from static/img/apm/traces/enable-alerts.png
rename to static/img/apm/enable-alerts.png
diff --git a/static/img/apm/traces/facets-add-to-query.png b/static/img/apm/facets-add-to-query.png
similarity index 100%
rename from static/img/apm/traces/facets-add-to-query.png
rename to static/img/apm/facets-add-to-query.png
diff --git a/static/img/apm/traces/Facets-expanded.png b/static/img/apm/facets-expanded.png
similarity index 100%
rename from static/img/apm/traces/Facets-expanded.png
rename to static/img/apm/facets-expanded.png
diff --git a/static/img/apm/traces/filter-servicemap.png b/static/img/apm/filter-servicemap.png
similarity index 100%
rename from static/img/apm/traces/filter-servicemap.png
rename to static/img/apm/filter-servicemap.png
diff --git a/static/img/apm/traces/pause-or-stop-spans-query.png b/static/img/apm/pause-or-stop-spans-query.png
similarity index 100%
rename from static/img/apm/traces/pause-or-stop-spans-query.png
rename to static/img/apm/pause-or-stop-spans-query.png
diff --git a/static/img/apm/traces/service-color-traces-span.png b/static/img/apm/service-color-traces-span.png
similarity index 100%
rename from static/img/apm/traces/service-color-traces-span.png
rename to static/img/apm/service-color-traces-span.png
diff --git a/static/img/apm/traces/service-latency.png b/static/img/apm/service-latency.png
similarity index 100%
rename from static/img/apm/traces/service-latency.png
rename to static/img/apm/service-latency.png
diff --git a/static/img/apm/traces/service-percentile-by-time.png b/static/img/apm/service-percentile-by-time.png
similarity index 100%
rename from static/img/apm/traces/service-percentile-by-time.png
rename to static/img/apm/service-percentile-by-time.png
diff --git a/static/img/apm/services-list-display.png b/static/img/apm/services-list-display.png
new file mode 100644
index 0000000000..8248dc3575
Binary files /dev/null and b/static/img/apm/services-list-display.png differ
diff --git a/static/img/apm/traces/services-list-filters.png b/static/img/apm/services-list-filters.png
similarity index 100%
rename from static/img/apm/traces/services-list-filters.png
rename to static/img/apm/services-list-filters.png
diff --git a/static/img/apm/traces/services-list-map-auto-detection-settings.png b/static/img/apm/services-list-map-auto-detection-settings.png
similarity index 100%
rename from static/img/apm/traces/services-list-map-auto-detection-settings.png
rename to static/img/apm/services-list-map-auto-detection-settings.png
diff --git a/static/img/apm/traces/services-list-map-example.png b/static/img/apm/services-list-map-example.png
similarity index 100%
rename from static/img/apm/traces/services-list-map-example.png
rename to static/img/apm/services-list-map-example.png
diff --git a/static/img/apm/traces/services-list-map-manual-detection-settings.png b/static/img/apm/services-list-map-manual-detection-settings.png
similarity index 100%
rename from static/img/apm/traces/services-list-map-manual-detection-settings.png
rename to static/img/apm/services-list-map-manual-detection-settings.png
diff --git a/static/img/apm/services-list-settings.png b/static/img/apm/services-list-settings.png
new file mode 100644
index 0000000000..3a9d97027e
Binary files /dev/null and b/static/img/apm/services-list-settings.png differ
diff --git a/static/img/apm/traces/services-list.png b/static/img/apm/services-list.png
similarity index 100%
rename from static/img/apm/traces/services-list.png
rename to static/img/apm/services-list.png
diff --git a/static/img/apm/traces/add-servicemap.png b/static/img/apm/services-map-dashboard.png
similarity index 100%
rename from static/img/apm/traces/add-servicemap.png
rename to static/img/apm/services-map-dashboard.png
diff --git a/static/img/apm/traces/servicemap.png b/static/img/apm/services-map-icon.png
similarity index 100%
rename from static/img/apm/traces/servicemap.png
rename to static/img/apm/services-map-icon.png
diff --git a/static/img/apm/traces/services-map-legend.png b/static/img/apm/services-map-legend.png
similarity index 100%
rename from static/img/apm/traces/services-map-legend.png
rename to static/img/apm/services-map-legend.png
diff --git a/static/img/apm/traces/services-map.png b/static/img/apm/services-map.png
similarity index 100%
rename from static/img/apm/traces/services-map.png
rename to static/img/apm/services-map.png
diff --git a/static/img/apm/traces/span-count-histogram.png b/static/img/apm/span-count-histogram.png
similarity index 100%
rename from static/img/apm/traces/span-count-histogram.png
rename to static/img/apm/span-count-histogram.png
diff --git a/static/img/apm/traces/span-count-timeseries.png b/static/img/apm/span-count-timeseries.png
similarity index 100%
rename from static/img/apm/traces/span-count-timeseries.png
rename to static/img/apm/span-count-timeseries.png
diff --git a/static/img/apm/span-dashboard.png b/static/img/apm/span-dashboard.png
new file mode 100644
index 0000000000..8f86d8d96c
Binary files /dev/null and b/static/img/apm/span-dashboard.png differ
diff --git a/static/img/apm/traces/span-event-marker.png b/static/img/apm/span-event-marker.png
similarity index 100%
rename from static/img/apm/traces/span-event-marker.png
rename to static/img/apm/span-event-marker.png
diff --git a/static/img/apm/traces/span-event-markers.gif b/static/img/apm/span-event-markers.gif
similarity index 100%
rename from static/img/apm/traces/span-event-markers.gif
rename to static/img/apm/span-event-markers.gif
diff --git a/static/img/apm/traces/span-event-more1.png b/static/img/apm/span-event-more1.png
similarity index 100%
rename from static/img/apm/traces/span-event-more1.png
rename to static/img/apm/span-event-more1.png
diff --git a/static/img/apm/traces/span-event-more2.png b/static/img/apm/span-event-more2.png
similarity index 100%
rename from static/img/apm/traces/span-event-more2.png
rename to static/img/apm/span-event-more2.png
diff --git a/static/img/apm/traces/span-event-select.png b/static/img/apm/span-event-select.png
similarity index 100%
rename from static/img/apm/traces/span-event-select.png
rename to static/img/apm/span-event-select.png
diff --git a/static/img/apm/traces/span-hover-view.png b/static/img/apm/span-hover-view.png
similarity index 100%
rename from static/img/apm/traces/span-hover-view.png
rename to static/img/apm/span-hover-view.png
diff --git a/static/img/apm/traces/span-logs-in-details-pane.png b/static/img/apm/span-logs-in-details-pane.png
similarity index 100%
rename from static/img/apm/traces/span-logs-in-details-pane.png
rename to static/img/apm/span-logs-in-details-pane.png
diff --git a/static/img/apm/traces/span-open-in-search.png b/static/img/apm/span-open-in-search.png
similarity index 100%
rename from static/img/apm/traces/span-open-in-search.png
rename to static/img/apm/span-open-in-search.png
diff --git a/static/img/apm/traces/add-to-dashboard-spans.png b/static/img/apm/spans-add-to-dashboard.png
similarity index 100%
rename from static/img/apm/traces/add-to-dashboard-spans.png
rename to static/img/apm/spans-add-to-dashboard.png
diff --git a/static/img/apm/traces/sumo-logic-spans-aggregates-visualize.png b/static/img/apm/spans-aggregates-visualize.png
similarity index 100%
rename from static/img/apm/traces/sumo-logic-spans-aggregates-visualize.png
rename to static/img/apm/spans-aggregates-visualize.png
diff --git a/static/img/apm/traces/spans-basic-example-with-where-operations.png b/static/img/apm/spans-basic-example-with-where-operations.png
similarity index 100%
rename from static/img/apm/traces/spans-basic-example-with-where-operations.png
rename to static/img/apm/spans-basic-example-with-where-operations.png
diff --git a/static/img/apm/spans-messages-results.png b/static/img/apm/spans-messages-results.png
new file mode 100644
index 0000000000..b4dc301784
Binary files /dev/null and b/static/img/apm/spans-messages-results.png differ
diff --git a/static/img/apm/spans-page.png b/static/img/apm/spans-page.png
new file mode 100644
index 0000000000..466a3ccde6
Binary files /dev/null and b/static/img/apm/spans-page.png differ
diff --git a/static/img/apm/traces/blank-spans-query.png b/static/img/apm/spans-query-blank.png
similarity index 100%
rename from static/img/apm/traces/blank-spans-query.png
rename to static/img/apm/spans-query-blank.png
diff --git a/static/img/apm/spans-query.png b/static/img/apm/spans-query.png
new file mode 100644
index 0000000000..44a1343923
Binary files /dev/null and b/static/img/apm/spans-query.png differ
diff --git a/static/img/apm/traces/spans-search-button.png b/static/img/apm/spans-search-button.png
similarity index 100%
rename from static/img/apm/traces/spans-search-button.png
rename to static/img/apm/spans-search-button.png
diff --git a/static/img/apm/traces/spans-search-with-fields-highlighted.png b/static/img/apm/spans-search-with-fields-highlighted.png
similarity index 100%
rename from static/img/apm/traces/spans-search-with-fields-highlighted.png
rename to static/img/apm/spans-search-with-fields-highlighted.png
diff --git a/static/img/apm/traces/status-codes-spans-example.png b/static/img/apm/spans-status-codes-example.png
similarity index 100%
rename from static/img/apm/traces/status-codes-spans-example.png
rename to static/img/apm/spans-status-codes-example.png
diff --git a/static/img/apm/spans-time-range.png b/static/img/apm/spans-time-range.png
new file mode 100644
index 0000000000..ca1136477e
Binary files /dev/null and b/static/img/apm/spans-time-range.png differ
diff --git a/static/img/apm/traces/spans-with-where-operation-example.png b/static/img/apm/spans-with-where-operation-example.png
similarity index 100%
rename from static/img/apm/traces/spans-with-where-operation-example.png
rename to static/img/apm/spans-with-where-operation-example.png
diff --git a/static/img/apm/traces/Spans-page.png b/static/img/apm/traces/Spans-page.png
deleted file mode 100644
index 1720291558..0000000000
Binary files a/static/img/apm/traces/Spans-page.png and /dev/null differ
diff --git a/static/img/apm/traces/messages-results.png b/static/img/apm/traces/messages-results.png
deleted file mode 100644
index cae7ab0bf9..0000000000
Binary files a/static/img/apm/traces/messages-results.png and /dev/null differ
diff --git a/static/img/apm/traces/open-service-map.png b/static/img/apm/traces/open-service-map.png
deleted file mode 100644
index f0d99fd86d..0000000000
Binary files a/static/img/apm/traces/open-service-map.png and /dev/null differ
diff --git a/static/img/apm/traces/open-spans-from-menu.png b/static/img/apm/traces/open-spans-from-menu.png
deleted file mode 100644
index bde2f2826f..0000000000
Binary files a/static/img/apm/traces/open-spans-from-menu.png and /dev/null differ
diff --git a/static/img/apm/traces/resize-column.png b/static/img/apm/traces/resize-column.png
deleted file mode 100644
index fc25bf49de..0000000000
Binary files a/static/img/apm/traces/resize-column.png and /dev/null differ
diff --git a/static/img/apm/traces/services-list-display.png b/static/img/apm/traces/services-list-display.png
deleted file mode 100644
index 4fc272a2fb..0000000000
Binary files a/static/img/apm/traces/services-list-display.png and /dev/null differ
diff --git a/static/img/apm/traces/services-list-settings.png b/static/img/apm/traces/services-list-settings.png
deleted file mode 100644
index 4f3067f5c3..0000000000
Binary files a/static/img/apm/traces/services-list-settings.png and /dev/null differ
diff --git a/static/img/apm/traces/span-dashboard.png b/static/img/apm/traces/span-dashboard.png
deleted file mode 100644
index 4803d6ed65..0000000000
Binary files a/static/img/apm/traces/span-dashboard.png and /dev/null differ
diff --git a/static/img/apm/traces/spans-query.png b/static/img/apm/traces/spans-query.png
deleted file mode 100644
index 1c01bc220b..0000000000
Binary files a/static/img/apm/traces/spans-query.png and /dev/null differ
diff --git a/static/img/apm/traces/spans-time-range.png b/static/img/apm/traces/spans-time-range.png
deleted file mode 100644
index 147259e97c..0000000000
Binary files a/static/img/apm/traces/spans-time-range.png and /dev/null differ