ATS-126 : Expose JVM metrics - eg. CPU & Memory (within jvm process / container)

- added pod name tag tag on metrics

alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/Application.java

@@ -11,15 +11,26 @@
  */
 package org.alfresco.transformer;
 
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 public class Application
 {
+    @Value("${pod.name}")
+    private String podName;
+
+    @Bean MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+        return registry -> registry.config().commonTags("podName", podName);
+    }
+
     public static void main(String[] args)
     {
         SpringApplication.run(Application.class, args);

alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/Application.java

@@ -11,15 +11,26 @@
  */
 package org.alfresco.transformer;
 
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 public class Application
 {
+    @Value("${pod.name}")
+    private String podName;
+
+    @Bean MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+        return registry -> registry.config().commonTags("podName", podName);
+    }
+
     public static void main(String[] args)
     {
         SpringApplication.run(Application.class, args);

alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/Application.java

@@ -11,15 +11,26 @@
  */
 package org.alfresco.transformer;
 
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 public class Application
 {
+    @Value("${pod.name}")
+    private String podName;
+
+    @Bean MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+        return registry -> registry.config().commonTags("podName", podName);
+    }
+
     public static void main(String[] args)
     {
         SpringApplication.run(Application.class, args);

alfresco-docker-tika/src/main/java/org/alfresco/transformer/Application.java

@@ -11,15 +11,26 @@
  */
 package org.alfresco.transformer;
 
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class})
 public class Application
 {
+    @Value("${pod.name}")
+    private String podName;
+
+    @Bean MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+        return registry -> registry.config().commonTags("podName", podName);
+    }
+
     public static void main(String[] args)
     {
         SpringApplication.run(Application.class, args);

alfresco-transformer-base/src/main/resources/application.yaml

@@ -30,4 +30,7 @@ management:
     enable[http]: false
     enable[logback]: false
     enable[tomcat]: false
-    enable[jvm.classes]: false
+    enable[jvm.classes]: false
+
+pod:
+  name: ${POD_NAME:t-engine}