Fix JMX exporter rules to emit default catalina metric names for Container Insights

Author: TravisStark

sample-apps/jmx/config.yaml

@@ -10,8 +10,10 @@ rules:
     name: java_lang_threading_$1
     type: GAUGE
 
+  # Emit catalina_globalrequestprocessor_$3 (no _total suffix) with port/protocol labels,
+  # matching the names the EKS Container Insights metric_declarations and validator expect.
   - pattern: 'Catalina<type=GlobalRequestProcessor, name=\"(\w+-\w+)-(\d+)\"><>(\w+)'
-    name: catalina_globalrequestprocessor_$3_total
+    name: catalina_globalrequestprocessor_$3
     labels:
       port: "$2"
       protocol: "$1"
@@ -34,12 +36,14 @@ rules:
     help: Catalina threadpool $3
     type: GAUGE
 
-  - pattern: 'Catalina<type=Manager, host=([-a-zA-Z0-9+&@#/%?=~_|!:.,;]*[-a-zA-Z0-9+&@#/%=~_|]), context=([-a-zA-Z0-9+/$%~_-|!.]*)><>(processingTime|sessionCounter|rejectedSessions|expiredSessions)'
-    name: catalina_session_$3_total
+  # Emit catalina_manager_$3 (e.g. catalina_manager_rejectedsessions/activesessions), matching
+  # the names the EKS Container Insights metric_declarations and validator expect.
+  - pattern: 'Catalina<type=Manager, host=([-a-zA-Z0-9+&@#/%?=~_|!:.,;]*[-a-zA-Z0-9+&@#/%=~_|]), context=([-a-zA-Z0-9+/$%~_-|!.]*)><>(rejectedSessions|activeSessions|processingTime|sessionCounter|expiredSessions)'
+    name: catalina_manager_$3
     labels:
       context: "$2"
       host: "$1"
-    help: Catalina session $3 total
+    help: Catalina Manager $3
     type: COUNTER
 
   - pattern: ".*"