fix conflicts

Author: bhillmer

_images/images-slo/custom-metric-slo-scenario.png

@@ -1,4 +1,4 @@
-The installer script uses one of the supported package managers to install the Collector, for example apt or yum.
+The installer script uses one of the supported package managers to install the Collector.
 
 When you update the Collector using the official packages, configuration files are never overridden. If you need to update the configuration after an update, edit them manually before backward compatibility is dropped. 
 

_images/logs/LogObserverEnhancementsUI.png

@@ -0,0 +1,25 @@
+* :ref:`asp-dot-net`
+* :ref:`amazon-ecs-metadata`
+* :ref:`chrony`
+* :ref:`collectd-df`
+* :ref:`consul`
+* :ref:`disk`
+* :ref:`exec-input`
+* :ref:`load`
+* :ref:`interface`
+* :ref:`java-monitor`
+* :ref:`kong`
+* :ref:`kubernetes-cluster`
+* :ref:`kube-controller-manager`
+* :ref:`kubelet-stats`
+* :ref:`microsoft-dotnet`
+* :ref:`mongodb`
+* :ref:`mongodb-atlas`
+* :ref:`mysql`
+* :ref:`nagios`
+* :ref:`postgresql`
+* :ref:`redis`
+* :ref:`signalfx-forwarder`
+* :ref:`statsd` 
+* :ref:`telegraf-win-perf-counters`
+

_images/logs/lo-openinsplunk.png

@@ -8,10 +8,6 @@
      - :strong:`Provides metrics`
      - :strong:`Provides traces`
 
-   * - :ref:`amazon-ecs-metadata`
-     - :strong:`X`
-     -
-
    * - :ref:`activemq`
      - :strong:`X`
      -
@@ -40,10 +36,6 @@
      - :strong:`X`
      -
 
-   * - :ref:`asp-dot-net`
-     - :strong:`X`
-     -
-
    * - :ref:`appmesh`
      - :strong:`X`
      -
@@ -60,10 +52,6 @@
      - :strong:`X`
      -
 
-   * - :ref:`chrony`
-     - :strong:`X`
-     -
-
    * - :ref:`cloudfoundry-firehose-nozzle`
      - :strong:`X`
      -
@@ -72,18 +60,10 @@
      - :strong:`X`
      -
 
-   * - :ref:`collectd-df`
-     - :strong:`X`
-     -
-
    * - :ref:`collectd-uptime`
      - :strong:`X`
      -
 
-   * - :ref:`consul`
-     - :strong:`X`
-     -
-
    * - :ref:`conviva`
      - :strong:`X`
      -
@@ -104,10 +84,6 @@
      - :strong:`X`
      -
 
-   * - :ref:`disk`
-     - :strong:`X`
-     -
-
    * - :ref:`dns`
      - :strong:`X`
      -
@@ -124,14 +100,6 @@
      - :strong:`X`
      -
 
-   * - :ref:`etcd`
-     - :strong:`X`
-     -
-
-   * - :ref:`exec-input`
-     - :strong:`X`
-     -
-
    * - :ref:`expvar`
      - :strong:`X`
      -
@@ -160,10 +128,6 @@
      - :strong:`X`
      -
 
-   * - :ref:`health-checker`
-     - :strong:`X`
-     -
-
    * - :ref:`heroku`
      - :strong:`X`
      -
@@ -180,18 +144,10 @@
      - 
      -
 
-   * - :ref:`load`
-     - :strong:`X`
-     -
-
    * - :ref:`http`
      - :strong:`X`
      -
 
-   * - :ref:`interface`
-     - :strong:`X`
-     - :strong:`X`
-
    * - :ref:`get-started-istio`
      - :strong:`X`
      - :strong:`X`
@@ -200,10 +156,6 @@
      - :strong:`X`
      -
 
-   * - :ref:`java-monitor`
-     - :strong:`X`
-     -
-
    * - :ref:`jenkins`
      - :strong:`X`
      -
@@ -220,30 +172,14 @@
      - :strong:`X`
      -
 
-   * - :ref:`kong`
-     - :strong:`X`
-     -
-
    * - :ref:`kubernetes-apiserver`
      - :strong:`X`
      -
 
-   * - :ref:`kubernetes-cluster`
-     - :strong:`X`
-     -
-
-   * - :ref:`kube-controller-manager`
-     - :strong:`X`
-     -
-
    * - :ref:`kubernetes-events`
      - :strong:`X`
      -
 
-   * - :ref:`kubelet-stats`
-     - :strong:`X`
-     -
-
    * - :ref:`kubernetes-proxy`
      - :strong:`X`
      -
@@ -272,10 +208,6 @@
      - :strong:`X`
      -
 
-   * - :ref:`microsoft-dotnet`
-     - :strong:`X`
-     -
-
    * - :ref:`get-started-dotnet-otel`
      - :strong:`X`
      -
@@ -288,22 +220,6 @@
      - :strong:`X`
      -
 
-   * - :ref:`mongodb`
-     - :strong:`X`
-     -
-
-   * - :ref:`mongodb-atlas`
-     - :strong:`X`
-     -
-
-   * - :ref:`mysql`
-     - :strong:`X`
-     -
-
-   * - :ref:`nagios`
-     - :strong:`X`
-     -
-
    * - :ref:`net-io`
      - :strong:`X`
      -
@@ -340,10 +256,6 @@
      - :strong:`X`
      -
 
-   * - :ref:`postgresql`
-     - :strong:`X`
-     -
-
    * - :ref:`procstat`
      - :strong:`X`
      -
@@ -380,18 +292,10 @@
      - :strong:`X`
      -
 
-   * - :ref:`redis`
-     - :strong:`X`
-     -
-  
    * - :ref:`hana`
      - :strong:`X`
      -
 
-   * - :ref:`signalfx-forwarder`
-     - :strong:`X`
-     - :strong:`X`
-
    * - :ref:`snmp`
      - :strong:`X`
      -
@@ -404,10 +308,6 @@
      - :strong:`X`
      -
 
-   * - :ref:`statsd`
-     - :strong:`X`
-     -
-
    * - :ref:`supervisor`
      - :strong:`X`
      -
@@ -428,10 +328,8 @@
      - :strong:`X`
      -
 
-   * - :ref:`telegraf-win-perf-counters`
+   * - :ref:`telegraf-win-services`
      - :strong:`X`
      -
 
-   * - :ref:`telegraf-win-services`
-     - :strong:`X`
-     -
+

_includes/collector-upgrade.rst

@@ -88,7 +88,7 @@ You can collect data from the following AWS services:
     - :strong:`X`
     - 
     - 
-    - 
+    - :strong:`X`
 
   * - AWS/CloudFront
     - AWS CloudFront
@@ -684,4 +684,9 @@ The following applies to the collected logs and metadata listed in the table:
 #. EC2 tags & properties only
 #. Logs collected by the CloudWatch agent stored in CloudWatch Logs
 #. Metadata in this context refers to AWS tags and properties
-#. Collected by the :ref:`Splunk Distribution of the Collector for Kubernetes <collector-kubernetes-intro>`
+#. Collected by the :ref:`Splunk Distribution of the Collector for Kubernetes <collector-kubernetes-intro>`
+
+The following applies to GovCloud regions:
+
+* Metric sync in GovCloud regions is limited to namespaces supported by AWS. Verify the specific namespaces available in your GovCloud region in the official AWS documentation :new-page:`Services in AWS GovCloud (US) Regions <https://docs.aws.amazon.com/govcloud-us/latest/UserGuide/using-services.html>`.
+* AWS doesn't currently provide FIPS-complaint endpoints to retrieve tags. If you set up tags in your AWS GovCloud infrastructure do not include any sensitive information. In Splunk Observability Cloud AWS tags are identified by the prefix ``aws_tag``.

_includes/gdi/application-receiver-table-deprecated.rst

@@ -1,6 +1,9 @@
 * :ref:`apache-receiver`
+* :ref:`apache-spark-receiver`
+* :ref:`awsecscontainermetrics-receiver`
 * :ref:`azureeventhub-receiver`
 * :ref:`carbon-receiver`
+* :ref:`chrony-receiver`
 * :ref:`cloudfoundry-receiver`
 * :ref:`collectd-receiver`
 * :ref:`discovery-receiver`

_includes/gdi/application-receiver-table.rst

@@ -220,11 +220,6 @@
      - Yes
      - Yes
      - Yes
-   * - ``etcd``
-     - Yes
-     - Yes
-     - Yes
-     - Yes
    * - ``gitlab``
      - Yes
      - Yes

_includes/gdi/available-aws.rst

@@ -134,11 +134,6 @@
      - Yes
      - Experimental
      - No
-   * - ``collectd/etcd``
-     - Yes
-     - Yes
-     - Experimental
-     - No
    * - ``collectd/hadoop``
      - Yes
      - Yes