summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShaabanEltanany <shaaban.eltanany.ext@orange.com>2019-12-10 18:44:58 +0200
committerKAPIL SINGAL <ks220y@att.com>2019-12-26 16:10:54 +0000
commit9139997c4ab71e5134bb737a7c1ea6a8f105dfa3 (patch)
tree8a7abf7ea4345171a6af7704a68d73ad2c8e937b
parente3447bd3e00253056e89551437e997e77e65034d (diff)
Fixing SDCListenerCustomIndicator issues
Issue-ID: CCSDK-1669 Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com> Change-Id: Ifa69221c9008c344b712728f26b94f1e7114baaf
-rw-r--r--ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/configuration/HealthCheckProperties.kt4
-rw-r--r--ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerApplication.java3
-rw-r--r--ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/actuator/indicator/SDCListenerCustomIndicator.java16
-rw-r--r--ms/sdclistener/application/src/main/resources/application.yaml25
4 files changed, 37 insertions, 11 deletions
diff --git a/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/configuration/HealthCheckProperties.kt b/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/configuration/HealthCheckProperties.kt
index f64cba88b..c1532cd35 100644
--- a/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/configuration/HealthCheckProperties.kt
+++ b/ms/blueprintsprocessor/modules/inbounds/health-api-common/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/healthapi/configuration/HealthCheckProperties.kt
@@ -52,7 +52,7 @@ open class HealthCheckProperties {
}
open fun getCDSListenerServiceInformation(): List<ServiceEndpoint> {
- val serviceName = ServiceName.BLUEPRINT
+ val serviceName = ServiceName.CDSLISTENER
return getListOfServiceEndPoints(cdsListenerServiceMapping, serviceName)
}
@@ -78,7 +78,7 @@ open class HealthCheckProperties {
private fun getServiceEndpoint(serviceEndpointInfo: List<String>): ServiceEndpoint {
return ServiceEndpoint(
- removeSpecialCharacter(serviceEndpointInfo.get(0)), removeSpecialCharacter(serviceEndpointInfo.get(1))
+ removeSpecialCharacter(serviceEndpointInfo[0]), removeSpecialCharacter(serviceEndpointInfo[1])
)
}
diff --git a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerApplication.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerApplication.java
index 2ec241d75..04cbebe7a 100644
--- a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerApplication.java
+++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/SdcListenerApplication.java
@@ -19,11 +19,14 @@ package org.onap.ccsdk.cds.sdclistener;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
@EnableConfigurationProperties(SdcListenerConfiguration.class)
+@ComponentScan(basePackages = {"org.onap.ccsdk.cds.blueprintsprocessor.healthapi","org.onap.ccsdk.cds.sdclistener"})
public class SdcListenerApplication {
public static void main(String[] args) {
+
SpringApplication.run(SdcListenerApplication.class, args);
}
diff --git a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/actuator/indicator/SDCListenerCustomIndicator.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/actuator/indicator/SDCListenerCustomIndicator.java
index 1a5bafcc8..57585125e 100644
--- a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/actuator/indicator/SDCListenerCustomIndicator.java
+++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/actuator/indicator/SDCListenerCustomIndicator.java
@@ -20,8 +20,8 @@ import org.onap.ccsdk.cds.blueprintsprocessor.healthapi.domain.HealthApiResponse
import org.onap.ccsdk.cds.blueprintsprocessor.healthapi.domain.HealthCheckStatus;
import org.onap.ccsdk.cds.blueprintsprocessor.healthapi.service.health.SDCListenerHealthCheck;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.health.AbstractHealthIndicator;
-import org.springframework.boot.actuate.health.Health.Builder;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.stereotype.Component;
/**
@@ -31,20 +31,18 @@ import org.springframework.stereotype.Component;
* @version 1.0
*/
@Component
-public class SDCListenerCustomIndicator extends AbstractHealthIndicator {
+public class SDCListenerCustomIndicator implements HealthIndicator {
@Autowired
private SDCListenerHealthCheck sDCListenerHealthCheck;
@Override
- protected void doHealthCheck(Builder builder) {
+ public Health health() {
HealthApiResponse healthAPIResponse = sDCListenerHealthCheck.retrieveEndpointExecutionStatus();
if (healthAPIResponse.getStatus() == HealthCheckStatus.UP) {
- builder.up();
- } else {
- builder.down();
+
+ return Health.up().withDetail("Services", healthAPIResponse.getChecks()).build();
}
- builder.withDetail("Services", healthAPIResponse.getChecks());
+ return Health.down().build();
}
-
}
diff --git a/ms/sdclistener/application/src/main/resources/application.yaml b/ms/sdclistener/application/src/main/resources/application.yaml
index b3f8443eb..424f0a5c0 100644
--- a/ms/sdclistener/application/src/main/resources/application.yaml
+++ b/ms/sdclistener/application/src/main/resources/application.yaml
@@ -25,3 +25,28 @@ server:
spring:
main:
web-environment: ${sprintWebListenerEnabled:true}
+
+
+
+cdslistener:
+ healthcheck:
+ baseUrl: http://localhost:9000/
+#servicename = SDC Listener service and service link = /api/v1/sdclistener/healthcheck (this is used to check if sdclistener is up depending on all services status)
+#if you want to add more service it will like [service-name,service-link],[],[]
+ mapping-service-name-with-service-link: "[SDC Listener service,/api/v1/sdclistener/healthcheck]"
+
+management:
+ endpoint:
+ health:
+ show-details: always
+
+
+ endpoints:
+ web:
+ exposure:
+ include: "*"
+
+endpoints:
+ user:
+ name: eHbVUbJAj4AG2522cSbrOQ==
+ password: eHbVUbJAj4AG2522cSbrOQ==