Merge "[HOLMES] Updated the Image Version"

5 files changed, 54 insertions, 8 deletions

diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/application.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/application.yaml
new file mode 100644
index 0000000000..f818dfd3b0
--- /dev/null
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/resources/config/application.yaml
@@ -0,0 +1,23 @@
+server:
+  port: 9102
+  servlet:
+    context-path: /api/holmes-engine-mgmt/v1
+  ssl:
+    key-store: /opt/onap/conf/holmes.keystore
+    key-store-password: holmes
+    #PKCS12
+    key-store-type: JKS
+
+logging:
+  config: classpath:logback-spring.xml
+
+spring:
+  application:
+    name: Holmes Engine Management
+  datasource:
+    dirver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://${URL_JDBC}:${DB_PORT}/${DB_NAME}
+    username: ${JDBC_USERNAME}
+    password: ${JDBC_PASSWORD}
+  mvc:
+    throw-exception-if-no-handler-found: true
\ No newline at end of file
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
index 50df26f946..ce3035e5da 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/values.yaml
@@ -28,7 +28,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/holmes/engine-management:10.0.5
+image: onap/holmes/engine-management:11.0.0
 consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
 
 #################################################################
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/config/application.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/resources/config/application.yaml
new file mode 100644
index 0000000000..18cf3b4966
--- /dev/null
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/resources/config/application.yaml
@@ -0,0 +1,23 @@
+server:
+  port: 9101
+  servlet:
+    context-path: /api/holmes-rule-mgmt/v1
+  ssl:
+    key-store: /opt/onap/conf/holmes.keystore
+    key-store-password: holmes
+    #PKCS12
+    key-store-type: JKS
+
+logging:
+  config: classpath:logback-spring.xml
+
+spring:
+  application:
+    name: Holmes Rule Management
+  datasource:
+    dirver-class-name: org.postgresql.Driver
+    url: jdbc:postgresql://${URL_JDBC}:${DB_PORT}/${DB_NAME}
+    username: ${JDBC_USERNAME}
+    password: ${JDBC_PASSWORD}
+  mvc:
+    throw-exception-if-no-handler-found: true
\ No newline at end of file
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl b/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
index 494333c2a8..814aeedf03 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/resources/rules/ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b.drl
@@ -4,7 +4,7 @@ import org.onap.holmes.common.dmaap.DmaapService;
 import org.onap.holmes.common.api.stat.VesAlarm;
 import org.onap.holmes.common.aai.CorrelationUtil;
 import org.onap.holmes.common.dmaap.entity.PolicyMsg;
-import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;
+import org.onap.holmes.common.utils.SpringContextUtil;
 import org.onap.holmes.common.utils.DroolsLog;
 
 rule "Relation_analysis_Rule"
@@ -20,7 +20,7 @@ no-loop true
         $child : VesAlarm( eventId != $eventId, parentId == null,
             CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId, $sourceName),
             eventName in ("Fault_MME_eNodeB out of service alarm"),
-            startEpochMicrosec < $startEpochMicrosec + 60000 && startEpochMicrosec > $startEpochMicrosec - 60000 )
+            startEpochMicrosec < $startEpochMicrosec + 60000 && startEpochMicrosec > $startEpochMicrosec - 60000)
     then
         DroolsLog.printInfo("===========================================================");
         DroolsLog.printInfo("Relation_analysis_Rule: rootId=" + $root.getEventId() + ", childId=" + $child.getEventId());
@@ -37,7 +37,7 @@ no-loop true
     then
         DroolsLog.printInfo("===========================================================");
         DroolsLog.printInfo("root_has_child_handle_Rule: rootId=" + $root.getEventId() + ", childId=" + $child.getEventId());
-        DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
+        DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);
         PolicyMsg policyMsg = dmaapService.getPolicyMsg($root, $child, "org.onap.holmes.droolsRule");
         dmaapService.publishPolicyMsg(policyMsg, "dcae_cl_out");
         $root.setRootFlag(1);
@@ -55,7 +55,7 @@ no-loop true
     then
         DroolsLog.printInfo("===========================================================");
         DroolsLog.printInfo("root_no_child_handle_Rule: rootId=" + $root.getEventId());
-        DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
+        DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);
         PolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, "org.onap.holmes.droolsRule");
         dmaapService.publishPolicyMsg(policyMsg, "dcae_cl_out");
         $root.setRootFlag(1);
@@ -70,7 +70,7 @@ no-loop true
     then
         DroolsLog.printInfo("===========================================================");
         DroolsLog.printInfo("root_cleared_handle_Rule: rootId=" + $root.getEventId());
-        DmaapService dmaapService = ServiceLocatorHolder.getLocator().getService(DmaapService.class);
+        DmaapService dmaapService = SpringContextUtil.getBean(DmaapService.class);
         PolicyMsg policyMsg = dmaapService.getPolicyMsg($root, null, "org.onap.holmes.droolsRule");
         dmaapService.publishPolicyMsg(policyMsg, "dcae_cl_out");
         retract($root);
@@ -85,4 +85,4 @@ no-loop true
         DroolsLog.printInfo("===========================================================");
         DroolsLog.printInfo("child_handle_Rule: childId=" + $child.getEventId());
         retract($child);
-end
+end
\ No newline at end of file
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
index 84c2108521..bd84c249c9 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/values.yaml
@@ -28,7 +28,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/holmes/rule-management:10.0.5
+image: onap/holmes/rule-management:11.0.0
 consulLoaderImage: onap/org.onap.dcaegen2.deployments.consul-loader-container:1.0.0
 
 #################################################################