diff --git a/_includes/gdi/application-receiver-table-deprecated.rst b/_includes/gdi/application-receiver-table-deprecated.rst
new file mode 100644
index 000000000..2de64e9af
--- /dev/null
+++ b/_includes/gdi/application-receiver-table-deprecated.rst
@@ -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`
+
diff --git a/_includes/gdi/application-receiver-table.rst b/_includes/gdi/application-receiver-table.rst
index 549214a06..d19862c9d 100644
--- a/_includes/gdi/application-receiver-table.rst
+++ b/_includes/gdi/application-receiver-table.rst
@@ -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`
- -
\ No newline at end of file
+
diff --git a/_includes/gdi/otel-receivers-table.rst b/_includes/gdi/otel-receivers-table.rst
index ccf8ad0c3..82acb7f9b 100644
--- a/_includes/gdi/otel-receivers-table.rst
+++ b/_includes/gdi/otel-receivers-table.rst
@@ -1,7 +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`
diff --git a/_includes/gdi/processor-architecture-native.rst b/_includes/gdi/processor-architecture-native.rst
index f0fb4a00e..b9b422074 100644
--- a/_includes/gdi/processor-architecture-native.rst
+++ b/_includes/gdi/processor-architecture-native.rst
@@ -220,11 +220,6 @@
- Yes
- Yes
- Yes
- * - ``etcd``
- - Yes
- - Yes
- - Yes
- - Yes
* - ``gitlab``
- Yes
- Yes
diff --git a/_includes/gdi/processor-architecture-subprocess.rst b/_includes/gdi/processor-architecture-subprocess.rst
index 8841854af..fc0446c94 100644
--- a/_includes/gdi/processor-architecture-subprocess.rst
+++ b/_includes/gdi/processor-architecture-subprocess.rst
@@ -134,11 +134,6 @@
- Yes
- Experimental
- No
- * - ``collectd/etcd``
- - Yes
- - Yes
- - Experimental
- - No
* - ``collectd/hadoop``
- Yes
- Yes
diff --git a/gdi/databases.rst b/gdi/databases.rst
index 73d064224..9346c22a4 100644
--- a/gdi/databases.rst
+++ b/gdi/databases.rst
@@ -15,7 +15,6 @@ Configure application receivers for databases
monitors-databases/apache-spark
monitors-databases/cassandra
monitors-databases/consul
- monitors-databases/etcd
monitors-databases/exec-input
monitors-databases/hadoop
monitors-databases/hadoopjmx
@@ -38,7 +37,6 @@ These application receivers gather metrics from their associated database-relate
* :ref:`spark`
* :ref:`cassandra`
* :ref:`consul`
-* :ref:`etcd`
* :ref:`exec-input`
* :ref:`hadoop`
* :ref:`hadoopjmx`
diff --git a/gdi/hosts-servers.rst b/gdi/hosts-servers.rst
index c0e8e7056..b6236051d 100644
--- a/gdi/hosts-servers.rst
+++ b/gdi/hosts-servers.rst
@@ -29,7 +29,6 @@ Configure application receivers for hosts and servers
monitors-hosts/elasticsearch-query
monitors-hosts/filesystems
monitors-hosts/haproxy
- monitors-hosts/health-checker
monitors-hosts/host-metadata
opentelemetry/components/host-metrics-receiver
monitors-hosts/host-processes
@@ -72,7 +71,6 @@ These application receivers gather metrics from their associated host- and serve
* :ref:`elasticsearch-query`
* :ref:`filesystems`
* :ref:`haproxy`
-* :ref:`health-checker`
* :ref:`host-metadata`
* :ref:`host-metrics-receiver`
* :ref:`processes`
diff --git a/gdi/integrations-list.rst b/gdi/integrations-list.rst
index 2a475cd3e..9c35227bb 100644
--- a/gdi/integrations-list.rst
+++ b/gdi/integrations-list.rst
@@ -107,24 +107,28 @@ For more information, see :ref:`get-started-rum`.
.. raw:: html
-Learn more at :ref:`OpenTelemetry receivers `.
+.. raw:: html
+
+
-These are the available OTel receivers:
+You can monitor your applications and services with native OpenTelementry receivers. Learn more at :ref:`OpenTelemetry receivers `.
+
+These are the available OpenTelemetry receivers:
.. include:: /_includes/gdi/otel-receivers-table.rst
.. raw:: html
-.. note:: The SignalFx Smart Agent has reached End of Support. While the agent can capture and export telemetry to Splunk Observability Cloud, Splunk no longer provides any support, feature updates, security, or bug fixes. Such requests are not bound by any SLAs.
-
-Smart Agent integrations and application receivers are available and supported through the Splunk Distribution of the OpenTelemetry Collector. For more information, see :ref:`migration-monitors`.
+Smart Agent integrations are available and supported through the Splunk Distribution of the OpenTelemetry Collector. For more information, see :ref:`migration-monitors`.
Browse available monitors by category:
@@ -142,10 +146,20 @@ Browse available monitors by category:
* :ref:`Applications: Orchestration `
* :ref:`Applications: Prometheus `
-These are the available Smart Agent monitors:
+These are the available Smart Agent integrations:
.. include:: /_includes/gdi/application-receiver-table.rst
+.. raw:: html
+
+
+
+These Smart Agent integrations are deprecated:
+
+.. include:: /_includes/gdi/application-receiver-table-deprecated.rst
+
.. raw:: html