Added improved JVM runtime metrics dashboard.

Signed-off-by: Alexander Wert <alexander.wert@elastic.co>

x-pack/plugins/apm/public/components/app/metrics/index.tsx

@@ -22,13 +22,6 @@ export function Metrics() {
   const { agentName, runtimeName, serverlessType } = useApmServiceContext();
   const isAWSLambda = isAWSLambdaAgent(serverlessType);
 
-  if (
-    !isAWSLambda &&
-    (isJavaAgentName(agentName) || isJRubyAgent(agentName, runtimeName))
-  ) {
-    return <JvmMetricsOverview />;
-  }
-
   if (isAWSLambda) {
     return <ServerlessMetrics />;
   }
@@ -38,6 +31,7 @@ export function Metrics() {
     runtimeName,
     serverlessType,
   });
+
   if (hasStaticDashboard) {
     return (
       <JsonMetricsDashboard
@@ -48,5 +42,12 @@ export function Metrics() {
     );
   }
 
+  if (
+    !isAWSLambda &&
+    (isJavaAgentName(agentName) || isJRubyAgent(agentName, runtimeName))
+  ) {
+    return <JvmMetricsOverview />;
+  }
+
   return <ServiceMetrics />;
 }

x-pack/plugins/apm/public/components/app/metrics/static_dashboard/dashboards/dashboard_catalog.ts

@@ -7,6 +7,7 @@
 
 export const AGENT_NAME_DASHBOARD_FILE_MAPPING: Record<string, string> = {
   nodejs: 'nodejs',
+  java: 'java',
 };
 
 /**
@@ -21,6 +22,12 @@ export async function loadDashboardFile(filename: string): Promise<any> {
         './nodejs.json'
       );
     }
+    case 'java': {
+      return import(
+        /* webpackChunkName: "lazyNodeJsDashboard" */
+        './java.json'
+      );
+    }
     default: {
       break;
     }