Merge branch 'ATS-126' into 'master'

ATS-126

See merge request Repository/alfresco-docker-transformers!20

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("${container.name}")
+    private String containerName;
+
+    @Bean MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+        return registry -> registry.config().commonTags("containerName", containerName);
+    }
+
     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("${container.name}")
+    private String containerName;
+
+    @Bean MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+        return registry -> registry.config().commonTags("containerName", containerName);
+    }
+
     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("${container.name}")
+    private String containerName;
+
+    @Bean MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+        return registry -> registry.config().commonTags("containerName", containerName);
+    }
+
     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("${container.name}")
+    private String containerName;
+
+    @Bean MeterRegistryCustomizer<MeterRegistry> metricsCommonTags() {
+        return registry -> registry.config().commonTags("containerName", containerName);
+    }
+
     public static void main(String[] args)
     {
         SpringApplication.run(Application.class, args);

alfresco-transformer-base/pom.xml

@@ -21,6 +21,14 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

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

@@ -16,4 +16,21 @@ logging:
     org.alfresco.transformer.ImageMagickController: debug
     org.alfresco.transformer.TikaController: debug
 
-fileStoreUrl: ${FILE_STORE_URL:http://localhost:8099/alfresco/api/-default-/private/sfs/versions/1/file}
+fileStoreUrl: ${FILE_STORE_URL:http://localhost:8099/alfresco/api/-default-/private/sfs/versions/1/file}
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include:
+        - metrics
+        - prometheus
+        - health
+  metrics:
+    enable[http]: false
+    enable[logback]: false
+    enable[tomcat]: false
+    enable[jvm.classes]: false
+
+container:
+  name: ${HOSTNAME:t-engine}