1 files changed, 9 insertions, 3 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java
index be534f326a..c0a89d6954 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/health/HealthCheckBusinessLogic.java
@@ -126,6 +126,7 @@ public class HealthCheckBusinessLogic {
 
         //Dmaap
         getDmaapHealthCheck(healthCheckInfos);
+
         // BE
         getBeHealthCheck(healthCheckInfos);
 
@@ -182,9 +183,14 @@ public class HealthCheckBusinessLogic {
     }
 
     private List<HealthCheckInfo> getDmaapHealthCheck(List<HealthCheckInfo> healthCheckInfos) {
-        String appVersion = getAppVersion();
-        dmaapHealth.getHealthCheckInfo().setVersion(appVersion);
-        healthCheckInfos.add(dmaapHealth.getHealthCheckInfo());
+        if(ConfigurationManager.getConfigurationManager().getConfiguration().getDmaapConsumerConfiguration().isActive()){
+            String appVersion = getAppVersion();
+            dmaapHealth.getHealthCheckInfo().setVersion(appVersion);
+            healthCheckInfos.add(dmaapHealth.getHealthCheckInfo());
+        } else {
+          log.debug("Dmaap health check disabled");
+        }
+
         return healthCheckInfos;
     }