From 8e7e775eefda803aaf36dcddf3435fa3107a0fb7 Mon Sep 17 00:00:00 2001 From: DenisGabriela Date: Mon, 15 Oct 2018 16:08:47 +0300 Subject: [PATCH] ATS-126 : Expose JVM metrics - eg. CPU & Memory (within jvm process / container) - addressed review comments --- .../src/main/java/org/alfresco/transformer/Application.java | 6 +++--- .../src/main/java/org/alfresco/transformer/Application.java | 6 +++--- .../src/main/java/org/alfresco/transformer/Application.java | 6 +++--- .../src/main/java/org/alfresco/transformer/Application.java | 6 +++--- .../src/main/resources/application.yaml | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/Application.java b/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/Application.java index 3c26f1ea..ec500713 100644 --- a/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/Application.java +++ b/alfresco-docker-alfresco-pdf-renderer/src/main/java/org/alfresco/transformer/Application.java @@ -24,11 +24,11 @@ import org.springframework.context.annotation.Bean; @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class}) public class Application { - @Value("${pod.name}") - private String podName; + @Value("${container.name}") + private String containerName; @Bean MeterRegistryCustomizer metricsCommonTags() { - return registry -> registry.config().commonTags("podName", podName); + return registry -> registry.config().commonTags("containerName", containerName); } public static void main(String[] args) diff --git a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/Application.java b/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/Application.java index d13e27a2..778b51db 100644 --- a/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/Application.java +++ b/alfresco-docker-imagemagick/src/main/java/org/alfresco/transformer/Application.java @@ -24,11 +24,11 @@ import org.springframework.context.annotation.Bean; @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class}) public class Application { - @Value("${pod.name}") - private String podName; + @Value("${container.name}") + private String containerName; @Bean MeterRegistryCustomizer metricsCommonTags() { - return registry -> registry.config().commonTags("podName", podName); + return registry -> registry.config().commonTags("containerName", containerName); } public static void main(String[] args) diff --git a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/Application.java b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/Application.java index 3c26f1ea..ec500713 100644 --- a/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/Application.java +++ b/alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/Application.java @@ -24,11 +24,11 @@ import org.springframework.context.annotation.Bean; @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class}) public class Application { - @Value("${pod.name}") - private String podName; + @Value("${container.name}") + private String containerName; @Bean MeterRegistryCustomizer metricsCommonTags() { - return registry -> registry.config().commonTags("podName", podName); + return registry -> registry.config().commonTags("containerName", containerName); } public static void main(String[] args) diff --git a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/Application.java b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/Application.java index d13e27a2..778b51db 100644 --- a/alfresco-docker-tika/src/main/java/org/alfresco/transformer/Application.java +++ b/alfresco-docker-tika/src/main/java/org/alfresco/transformer/Application.java @@ -24,11 +24,11 @@ import org.springframework.context.annotation.Bean; @EnableAutoConfiguration(exclude={DataSourceAutoConfiguration.class}) public class Application { - @Value("${pod.name}") - private String podName; + @Value("${container.name}") + private String containerName; @Bean MeterRegistryCustomizer metricsCommonTags() { - return registry -> registry.config().commonTags("podName", podName); + return registry -> registry.config().commonTags("containerName", containerName); } public static void main(String[] args) diff --git a/alfresco-transformer-base/src/main/resources/application.yaml b/alfresco-transformer-base/src/main/resources/application.yaml index d8b69ff4..48825600 100644 --- a/alfresco-transformer-base/src/main/resources/application.yaml +++ b/alfresco-transformer-base/src/main/resources/application.yaml @@ -32,5 +32,5 @@ management: enable[tomcat]: false enable[jvm.classes]: false -pod: - name: ${POD_NAME:t-engine} \ No newline at end of file +container: + name: ${HOSTNAME:t-engine} \ No newline at end of file