2 files changed, 5 insertions, 0 deletions
diff --git a/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java b/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java
index 8481eadf1b..b85f391b8e 100644
--- a/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java
+++ b/cps-application/src/main/java/org/onap/cps/config/MicroMeterConfig.java
@@ -28,6 +28,7 @@ import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.binder.MeterBinder;
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -45,11 +46,13 @@ public class MicroMeterConfig {
     }
 
     @Bean
+    @ConditionalOnProperty("cps.monitoring.micrometer-jvm-extras")
     public MeterBinder processMemoryMetrics() {
         return new ProcessMemoryMetrics();
     }
 
     @Bean
+    @ConditionalOnProperty("cps.monitoring.micrometer-jvm-extras")
     public MeterBinder processThreadMetrics() {
         return new ProcessThreadMetrics();
     }
diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
index 0b5d59ecc9..6b9c694cf2 100644
--- a/cps-application/src/main/resources/application.yml
+++ b/cps-application/src/main/resources/application.yml
@@ -152,6 +152,8 @@ security:
         password: ${CPS_PASSWORD:cpsr0cks!}
 
 cps:
+    monitoring:
+        micrometer-jvm-extras: false
     tracing:
         sampler:
             jaeger_remote: