R5 tag update

[dcaegen2/platform/blueprints.git] / blueprints / k8s-ves.yaml-template

diff --git a/blueprints/k8s-ves.yaml-template b/blueprints/k8s-ves.yaml-template
index 7c2f824..3cf8d35 100644 (file)
--- a/blueprints/k8s-ves.yaml-template
+++ b/blueprints/k8s-ves.yaml-template
@@ -2,7 +2,7 @@
 #
 # ============LICENSE_START====================================================
 # =============================================================================
-# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,36 +21,42 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.1.0/k8splugin_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml
 
 inputs:
   ves_other_publish_url:
     type: string
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_OTHER_OUTPUT"
-    #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_OTHER_OUTPUT"
   ves_heartbeat_publish_url:
     type: string
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT"
-    #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT"
   ves_fault_publish_url:
     type: string
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_FAULT_OUTPUT"
-    #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_FAULT_OUTPUT"
   ves_measurement_publish_url:
     type: string
-    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT"
-    #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT"
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"
+  ves_notification_publish_url:
+    type: string
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
+  ves_pnfRegistration_publish_url:
+    type: string
+    default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_PNFREG_OUTPUT"
   tag_version:
     type: string
-    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.2.0"
+    default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.3.1"
   external_port:
     type: string
     description: Kubernetes node port on which collector is exposed
     default: "30235"
+  external_tls_port:
+    type: string
+    description: Kubernetes node port on which collector is exposed for https
+    default: "30417"
   replicas:
     type: integer
     description: number of instances
-    default: 1   
+    default: 1
 node_templates:
   ves:
     interfaces:
@@ -58,44 +64,55 @@ node_templates:
         start:
           inputs:
            ports:
-             - concat: ["8080:", { get_input: external_port }]             
+             - concat: ["8080:", { get_input: external_port }]
+             - concat: ["8443:", { get_input: external_tls_port }]
     properties:
       application_config:
-        collector.dmaap.streamid: fault=ves_fault|syslog=ves_syslog|heartbeat=ves_heartbeat|measurementsForVfScaling=ves_measurement|mobileFlow=ves_mobileflow|other=ves_other|stateChange=ves_statechange|thresholdCrossingAlert=ves_thresholdCrossingAlert|voiceQuality=ves_voicequality|sipSignaling=ves_sipsignaling
+        collector.dmaap.streamid: fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration
         collector.inputQueue.maxPending: "8096"
         collector.keystore.alias: "dynamically generated"
         collector.keystore.file.location: /opt/app/VESCollector/etc/keystore
         collector.keystore.passwordfile: /opt/app/VESCollector/etc/passwordfile
         collector.schema.checkflag: "1"
-        collector.schema.file: "{\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.json\"}"
+        collector.schema.file: "{\"v1\":\"./etc/CommonEventFormat_27.2.json\",\"v2\":\"./etc/CommonEventFormat_27.2.json\",\"v3\":\"./etc/CommonEventFormat_27.2.json\",\"v4\":\"./etc/CommonEventFormat_27.2.json\",\"v5\":\"./etc/CommonEventFormat_28.4.1.json\",\"v7\":\"./etc/CommonEventFormat_30.0.1.json\"}"
         collector.service.port: "8080"
         collector.service.secure.port: "8443"
         event.transform.flag: "0"
         header.authflag: "0"
-        header.authlist: "userid1,base64encodepwd1|userid2,base64encodepwd2"
+        header.authlist: "sample1,c2FtcGxlMQ=="
         services_calls: []
         streams_publishes:
-            ves_fault:
+            ves-fault:
               dmaap_info:
                 topic_url:
                   get_input: ves_fault_publish_url
               type: message_router
-            ves_measurement:
+            ves-measurement:
               dmaap_info:
                 topic_url:
                   get_input: ves_measurement_publish_url
               type: message_router
-            ves_heartbeat:
+            ves-notification:
+              dmaap_info:
+                topic_url:
+                  get_input: ves_notification_publish_url
+              type: message_router
+            ves-pnfRegistration:
+              dmaap_info:
+                topic_url:
+                  get_input: ves_pnfRegistration_publish_url
+              type: message_router
+            ves-heartbeat:
               dmaap_info:
                 topic_url:
                   get_input: ves_heartbeat_publish_url
               type: message_router
-            ves_other:
+            ves-other:
               dmaap_info:
                 topic_url:
                   get_input: ves_other_publish_url
-              type: message_router              
-        tomcat.maxthreads: "200"
+              type: message_router
+        collector.dynamic.config.update.frequency: "5"
       docker_config:
         healthcheck:
           endpoint: /healthcheck
@@ -110,5 +127,5 @@ node_templates:
       log_info:
         log_directory: "/opt/app/VESCollector/logs/ecomp"
     type: dcae.nodes.ContainerizedPlatformComponent
-    
+