Merge branch 'main' into OD-6400-LogObserverOptimizations

Author: Tracey Carter

admin/subscription-usage/apm-billing-usage-index.rst

@@ -122,8 +122,8 @@ Usage reports for host subscription plans include the following information abou
 * The number of billed hosts. Host data is available per minute.
 * The number of billed containers. Container data is available per minute.
 * The billed trace volume. Trace volume data is available per minute.
-* The number of billed Troubleshooting MetricSets (TMS). TMS data is available per minute. 
-* The number of billed Monitoring MetricSets (MMS). MMS data is available only for histogram MMS and is available only in the usage report. MMS data is available at 10-minute intervals.
+* The number of billed Troubleshooting MetricSets (TMS). TMS data is available per minute and has a look-back period of 1 minute. 
+* The number of billed Monitoring MetricSets (MMS). MMS data is available only for histogram MMS and is available only in the usage report. MMS data is available at 10-minute intervals and has a look-back period of 1 hour. 
 * The average number of hosts. Averages are available in usage reports for complete months only.
 * The average number of containers. Averages are available in usage reports for complete months only.
 * The average number of Troubleshooting MetricSets. Averages are available in usage reports for complete months only.
@@ -141,8 +141,8 @@ Usage reports for TAPM subscription plans include the following information abou
 
 * The number of billed TAPM. TAPM data is available per minute.
 * The billed trace volume. Trace volume data is available per minute.
-* The number of billed Troubleshooting MetricSets (TMS). TMS data is available per minute. 
-* The number of billed Monitoring MetricSets (MMS). MMS data is available only for histogram MMS and is available only in the usage report. MMS data is available at 10-minute intervals.
+* The number of billed Troubleshooting MetricSets (TMS). TMS data is available per minute and has a look-back period of 1 minute. 
+* The number of billed Monitoring MetricSets (MMS). MMS data is available only for histogram MMS and is available only in the usage report. MMS data is available at 10-minute intervals and has a look-back period of 1 hour. 
 * The average number of TAPM. Averages are available in usage reports for complete months only.
 * The average number of Troubleshooting MetricSets. Averages are available in usage reports for complete months only.
 * The average number of Monitoring MetricSets. Averages are available in usage reports for complete months only.
@@ -245,11 +245,11 @@ The following metrics power the charts in your APM Subscription Usage page with
 
    * - ``sf.org.apm.numTroubleshootingMetricSets``
      - Troubleshooting MetricSets
-     - The cardinality of Troubleshooting MetricSets for each 1-minute window.
+     - The cardinality of Troubleshooting MetricSets. TMS data is available per minute and has a look-back period of 1 minute.
 
    * - ``sf.org.apm.numMonitoringMetricSets``
      - Monitoring MetricSets
-     - The cardinality of Monitoring MetricSets for each 10-minute window.
+     - The cardinality of Monitoring MetricSets. MMS data is available only for histogram MMS. MMS data is available at 10-minute intervals and has a look-back period of 1 hour. 
 
 .. _host_subscription_plans:
 
@@ -280,10 +280,10 @@ The following metrics power the charts in your APM Subscription Usage page with
 
    * - ``sf.org.apm.numTroubleshootingMetricSets``
      - Troubleshooting MetricSets
-     - The cardinality of Troubleshooting MetricSets for each 1-minute window.
+     - The cardinality of Troubleshooting MetricSets. TMS data is available per minute and has a look-back period of 1 minute.
 
    * - ``sf.org.apm.numMonitoringMetricSets``
      - Monitoring MetricSets
-     - The cardinality of Monitoring MetricSets for each 10-minute window.
+     - The cardinality of Monitoring MetricSets. MMS data is available only for histogram MMS. MMS data is available at 10-minute intervals and has a look-back period of 1 hour. 
 
 To see all of the organization metrics for APM, see :ref:`org-metrics`.

gdi/get-data-in/connect/gcp/gcp.rst

@@ -55,57 +55,65 @@ For more information, refer to Google's official announcement :new-page:`Introdu
       <h3>Select a role for your GCP service account<a name="gcp-one" class="headerlink" href="#gcp-one" title="Permalink to this headline">¶</a></h3>
    </embed>
 
-If you use GCP's :strong:`Project Viewer` role, you won't require any changes to your GCP setup to use Splunk Observability Cloud, and any update will be applied automatically. 
+You can use GCP's :strong:`Viewer` role as it comes with the permissions you need for most scenarios. 
 
-If you want to use a more restrictive role than Project Viewer, make sure your selected role has sufficient permissions to connect to Splunk Observability Cloud, otherwise you'll get an error message when trying to connect. Review and activate any missing permissions, or change the role to Project Viewer.
-
-The following table specifies the permissions required for GCP integrations:
+Alternatively you can create a more restrictive role using the permissions in the table:
 
 .. list-table::
    :header-rows: 1
-   :widths: 40 60
+   :widths: 35 45 20
 
    *  - :strong:`Permission`
       - :strong:`Required?`
+      - :strong:`Included in GCP's Viewer role?`
 
    *  - ``compute.instances.list``
       - Yes, if the Compute Engine service is activated
+      - Yes
 
    *  - ``compute.machineTypes.list``
       - Yes, if the Compute Engine service is activated
+      - Yes
 
    *  - ``container.clusters.list``
       - Yes, if the Kubernetes (GKE) service is activated
+      - Yes
 
    *  - ``container.nodes.list``
       - Yes, if the Kubernetes (GKE) service is activated
+      - Yes
 
    *  - ``container.pods.list``
       - Yes, if the Kubernetes (GKE) service is activated
+      - Yes
 
    *  - ``monitoring.metricDescriptors.get``
       - Yes
+      - Yes
 
    *  - ``monitoring.metricDescriptors.list``
       - Yes
+      - Yes
 
    *  - ``monitoring.timeSeries.list``
       - Yes
+      - Yes
 
    *  - ``resourcemanager.projects.get``
       - Yes, if you want to sync project metadata (such as labels)
+      - Yes
 
    *  - ``serviceusage.services.use``
       - Yes, if you want to activate the use of a quota from the project where metrics are stored
-
-   *  - ``serviceusage.serviceUsageConsumer``
-      - Yes, for SQL services
+      - No, but included in ``roles/serviceusage.serviceUsageConsumer``
 
    *  - ``spanner.instances.list``
       - Yes, if the Spanner service is activated
+      - Yes
 
    *  - ``storage.buckets.list``
       - Yes, if the Spanner service is activated
+      - Yes
 
 .. _gcp-two: