Merge pull request elastic#41 from bmorelli25/update-compat

[APM] Simplify and move APM agent compatibility
colleenmcginnis · Oct 3, 2023 · 80e3721 · 80e3721
2 parents 8423f42 + bab19eb
commit 80e3721
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 39 deletions.
diff --git a/docs/apm-agents/apm-agents-elastic-apm-agents.mdx b/docs/apm-agents/apm-agents-elastic-apm-agents.mdx
@@ -33,3 +33,23 @@ Elastic APM agents are built and maintained by Elastic. While they are similar,
   <DocTab name=".NET"><Net /></DocTab>
   <DocTab name="PHP"><Php /></DocTab>
 </DocTabs>
+
+## Minimum supported versions
+
+The following versions of Elastic APM agents are supported:
+
+| Agent name | Agent version |
+|---|---|
+| **APM AWS Lambda extension** | ≥`1.x` |
+| **Go agent** | ≥`1.x` |
+| **Java agent** | ≥`1.x` |
+| **.NET agent** | ≥`1.x` |
+| **Node.js agent** | ≥`4.x` |
+| **PHP agent** | ≥`1.x` |
+| **Python agent** | ≥`6.x` |
+| **Ruby agent** | ≥`3.x` |
+
+<DocCallOut title="Note">
+Some recently added features may require newer agent versions than those listed above.
+In these instances, the required APM agent versions will be documented with the feature.
+</DocCallOut>
diff --git a/docs/apm/apm-agent-compatibility.mdx b/docs/apm/apm-agent-compatibility.mdx
diff --git a/docs/apm/apm-troubleshooting/common-response-codes.mdx b/docs/apm/apm-troubleshooting/common-response-codes.mdx
@@ -7,7 +7,7 @@
 ### HTTP 400: Data decoding error / Data validation error
 
 The most likely cause for this error is using incompatible versions of ((apm-agent)) and APM Server.
-See the <DocLink id="serverlessObservabilityApmAgentCompatibility">agent/server compatibility matrix</DocLink> to verify compatibility.
+See <DocLink id="serverlessObservabilityApmAgents" section="minimum-supported-versions">minimum supported APM agent versions</DocLink> to verify compatibility.
 
 <div id="event-too-large"></div>
 

diff --git a/serverless-observability.docnav.json b/serverless-observability.docnav.json
@@ -337,12 +337,6 @@
           "id": "serverlessObservabilityApmSecureCommunicationWithApmAgents",
           "classic-sources": [ "enApmGuideSecureAgentCommunication" ]
         },
-        {
-          "id": "serverlessObservabilityApmAgentCompatibility",
-          "classic-sources": [
-            "enApmGuideAgentServerCompatibility"
-          ]
-        },
         {
           "id": "serverlessObservabilityApmTroubleshooting",
           "classic-sources": [