Merge branch 'main' into tcarter-RelatedContent-Logs

Author: Tracey Carter

_images/collector/imagetest.png

@@ -28,7 +28,7 @@ Ensure that you give the proxy the ability to resolve the network names and make
 Use the Splunk Distribution of the OpenTelemetry Collector
 =======================================================================
 
-Use the :new-page:`Splunk Distribution of OpenTelemetry Collector <https://docs.splunk.com/Observability/gdi/opentelemetry/deployment-modes.html>` in data forwarding (gateway) mode. You can forward metrics locally to the Splunk Distribution of OpenTelemetry Collector, which serves as your local store-and-forward service for telemetry.
+The :new-page:`Splunk Distribution of OpenTelemetry Collector <https://docs.splunk.com/Observability/gdi/opentelemetry/deployment-modes.html>` supports proxies. You can configure proxies on each collector, or more typically, you would configure a collector in data forwarding (gateway) mode. In the gateway mode, you only need to configure the gateway collectors with the proxy settings; all other collectors can simply send data to the gateway collector.
 
 Ensure that you give the Splunk Distribution of OpenTelemetry Collector the ability to resolve the network names and make outbound HTTPS network connections to the URLs listed in :ref:`allow-urls` or the domains listed in :ref:`allow-domains`. Verify also the list of :ref:`exposed ports and endpoints <otel-exposed-endpoints>`.
 

admin/authentication/allow-services.rst

@@ -166,7 +166,7 @@ To set token limits:
 
 #. If you chose a team as a notification recipient and you want to have alerts display on the team's Dashboards page, you must link the detector you created in the previous step to the team. To do this:
 
-    #. Access the left navigation panel and select :menuselection:`Alerts & Detectors`.
+    #. Access the left navigation panel and select :menuselection:`Detectors & SLOs`.
     #. Select the :guilabel:`Detectors` tab.
     #. Search for the detector you created. By default, the detector's name includes the name of the access token it was created for. So, an easy way to find the detector is to search for the name of the access token.
     #. Open the detector's action menu (|more|) and select :guilabel:`Links to Teams`. Select a team.

admin/authentication/authentication-tokens/manage-usage.rst

@@ -11,7 +11,7 @@ To customize an AutoDetect detector you must copy it first, because AutoDetect d
 
 To customize a copy of an AutoDetect detector, do the following:
 
-#. In the navigation menu, select :menuselection:`Alerts & Detectors`. 
+#. In the navigation menu, select :guilabel:`Detectors & SLOs`. 
 #. Select the :strong:`Detectors` tab.
 #. In the search field, enter the name of the detector you want to customize.
 

alerts-detectors-notifications/alerts-and-detectors/autodetect/autodetect-customize.rst

@@ -22,7 +22,7 @@ See the following topics for more information on how to collect the required dat
 - :new-page-ref:`kafka`
 - :ref:`get-started-k8s`
 
-After you've set up the supported integrations, AutoDetect alerts and detectors automatically appear on the :strong:`Alerts & Detectors` page and the corresponding dashboards and navigators for your integrations. 
+After you've set up the supported integrations, AutoDetect alerts and detectors automatically appear on the :guilabel:`Detectors & SLOs` page and the corresponding dashboards and navigators for your integrations. 
 
 .. note:: By default, you aren't subscribed to receive notifications from AutoDetect. To learn how to subscribe to AutoDetect notifications, see :ref:`autodetect-subscribe-mute-turn-off`.
 

alerts-detectors-notifications/alerts-and-detectors/autodetect/autodetect-intro.rst

@@ -24,7 +24,7 @@ Turn off AutoDetect detectors
 
 To turn off an AutoDetect detector, do the following:
 
-#. In the navigation menu, select :menuselection:`Alerts & Detectors`. 
+#. In the navigation menu, select :guilabel:`Detectors & SLOs`. 
 #. Select the :strong:`Detectors` tab.
 #. In the search field, enter the name of the detector you want to turn off.
 

alerts-detectors-notifications/alerts-and-detectors/autodetect/autodetect-subscribe-mute-turn-off.rst

@@ -6,11 +6,11 @@ View AutoDetect alerts and detectors
 .. meta::
    :description: Splunk Observability Cloud automatically creates alerts and detectors when you have supported integrations configured. Learn how to use and customize with AutoDetect alerts and detectors.
 
-You can view AutoDetect detectors on the :guilabel:`Alerts & Detectors` page, in a navigator or dashboard for a service, or in a chart.
+You can view AutoDetect detectors on the :guilabel:`Detectors & SLOs` page, in a navigator or dashboard for a service, or in a chart.
 
 To view a complete list of all available AutoDetect alerts and detectors in your organization, do the following:
 
-#. From the Splunk Observability Cloud home page, go to the :guilabel:`Alerts & Detectors` page.
+#. From the Splunk Observability Cloud home page, go to the :guilabel:`Detectors & SLOs` page.
 #. Select the :guilabel:`Active Alerts` or :guilabel:`Detectors` tab. Alerts genereated by AutoDetect detectors have an :guilabel:`Auto` badge. 
 #. You can also select :guilabel:`AutoDetect` or :guilabel:`Customized AutoDetect` in the filter on the :guilabel:`Active Alerts` or :guilabel:`Detectors` tabs.
 

alerts-detectors-notifications/alerts-and-detectors/autodetect/autodetect-view.rst

@@ -13,7 +13,7 @@ Detectors are made up of alert rules. When you create an alert rule you can sele
 
 When a detector determines that the conditions for a rule are met, it triggers an alert, creates an event, and sends notifications, if specified. Detectors can send notifications through email, as well as through other systems, such as Slack, or by using a webhook. To learn more, see :ref:`admin-notifs-index`.
 
-You can find active alerts, existing detectors, and muting rules under :guilabel:`Alerts & Detectors`. You can also find alerts in the Events Feed, available within any dashboard.
+You can find active alerts, existing detectors, and muting rules under :guilabel:`Detectors & SLOs`. You can also find alerts in the Events Feed, available within any dashboard.
 
 .. note:: This topic covers Infrastructure and Custom Metrics detectors. You can create a Splunk APM detector to monitor request rates, error rates, and latency for your service. To learn more about Splunk APM detectors, visit :ref:`apm-alerts`.
 
@@ -45,7 +45,7 @@ There are several ways to create a detector.
 Clone an existing detector
 -------------------------------------------------------------------
 
-You can see a list of existing detectors on the :guilabel:`Detectors` tab under Alerts & Detectors. 
+You can see a list of existing detectors on the :guilabel:`Detectors` tab under :guilabel:`Detectors & SLOs`. 
 
 1. Look for a detector that is similar to the detector you want to create. 
 2. Select the detector.
@@ -73,7 +73,7 @@ After you create a detector from a chart, a :ref:`link to the new detector<link-
 Create a detector from scratch
 -------------------------------------------------------------------
 
-To create a new detector for Infrastructure or Custom Metrics from scratch, you can either select :guilabel:`New Detector` under Alerts & Detectors, or select :menuselection:`Custom Detector` from the create menu on the navigation bar. Enter a detector name and then select :guilabel:`Create Alert Rule` to proceed to the alert rule builder. For instructions on building the rule, see :ref:`build-rules`.
+To create a new detector for Infrastructure or Custom Metrics from scratch, you can either select :guilabel:`New Detector` under :guilabel:`Detectors & SLOs`, or select :menuselection:`Custom Detector` from the create menu on the navigation bar. Enter a detector name and then select :guilabel:`Create Alert Rule` to proceed to the alert rule builder. For instructions on building the rule, see :ref:`build-rules`.
 
 .. _create-via-api:
 
@@ -257,7 +257,7 @@ The following table explains different types of email notifications:
 
 .. note:: Tips
 
-   - If you want to add the same subscribers to each of multiple rules, you can add the subscribers to all rules at once by using the :ref:`Manage subscriptions<manage-subs>` option on the Detectors tab under Alerts & Detectors after you save the detector.
+   - If you want to add the same subscribers to each of multiple rules, you can add the subscribers to all rules at once by using the :ref:`Manage subscriptions<manage-subs>` option on the :guilabel:`Detectors` tab under :guilabel:`Detectors & SLOs` after you save the detector.
 
    - You can temporarily stop a detector from sending notifications by :ref:`muting notifications<mute-notifications>`.
 
@@ -269,7 +269,7 @@ Activate
 
 On the :strong:`Activate` tab you see a summary of the detector settings you specified. Review the summary and make any necessary changes in the associated tabs, then name the rule; by default, the rule name is the same as the detector name. The rule name is displayed on the Alerts page and in notifications.
 
-Select :guilabel:`Activate Alert Rule` to save the detector and begin monitoring the specified signal. After you activate the detector, the :strong:`Alert Rules` tab of the detector is displayed, showing the signal you selected and a summary of the rule you built. You can edit the detector name; the text you enter here is displayed as the detector name on the Detectors tab under Alerts & Detectors. You can also provide additional descriptive text below the name, for example, to clarify the purpose of the detector for others.
+Select :guilabel:`Activate Alert Rule` to save the detector and begin monitoring the specified signal. After you activate the detector, the :strong:`Alert Rules` tab of the detector is displayed, showing the signal you selected and a summary of the rule you built. You can edit the detector name; the text you enter here is displayed as the detector name on the :guilabel:`Detectors` tab under :guilabel:`Detectors & SLOs`. You can also provide additional descriptive text below the name, for example, to clarify the purpose of the detector for others.
 
 
 .. note:: If you make any changes to the detector name or description, select the :guilabel:`Save` button. If you select the :strong:`Close` button without saving, your changes will be lost.

alerts-detectors-notifications/alerts-and-detectors/create-detectors-for-alerts.rst

@@ -11,12 +11,12 @@ Scenario: Kai finds active alerts to investigate a CPU issue
 
 Kai, a site reliability engineer at Buttercup Games, has created a detector called "CPU Detector" that monitors Buttercup Games host machine's CPU usage for sudden changes. Kai has received many alerts from this detector, and wants to get a more detailed view of these alerts. 
 
-Using the :guilabel:`Alerts & Detectors` page in Splunk Observability Cloud, Kai can find and view these active alerts so they can easily troubleshoot the CPU changes.
+Using the :guilabel:`Detectors & SLOs` page in Splunk Observability Cloud, Kai can find and view these active alerts so they can easily troubleshoot the CPU changes.
 
 Find active alerts using the search list
 ====================================================
 
-From the :guilabel:`Alerts & Detectors` page, Kai can find active alerts using the search list. Kai follows these steps: 
+From the :guilabel:`Detectors & SLOs` page, Kai can find active alerts using the search list. Kai follows these steps: 
 
 #. Kai wants to find an active alert, so they select the :guilabel:`Active Alerts` tab.
 #. Kai enters filters so they can find their active alerts more easily. They enter desired values for the following fields:

alerts-detectors-notifications/alerts-and-detectors/scenarios-detectors-alerts/find-detectors.rst

@@ -16,7 +16,7 @@ Using Splunk Observability Cloud, Kai can create a detector that alerts them whe
 Define the data to use for alerting
 ===================================
 
-Kai opens the :guilabel:`Alerts & Detectors` page in Splunk Observability Cloud and selects :guilabel:`New Detector` to create a detector from scratch.
+Kai opens the :guilabel:`Detectors & SLOs` page in Splunk Observability Cloud and selects :guilabel:`New Detector` to create a detector from scratch.
 
 After naming the detector, Kai chooses :guilabel:`Infrastructure or Custom Metrics Alert Rule`.