Merge "Allow docker default version (no specific version) install"

diff --git a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
index 3b95006..8d18a94 100644 (file)
--- a/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
+++ b/RECIPE_EXAMPLE/RIC_AUX_RECIPE_EXAMPLE
@@ -89,6 +89,9 @@ dashboard:
     portalapi:
       username: username
       password: password
+    metrics:
+      url:
+        ac: http://ric-aux-kibana-server:5601/goto/fedcba9876543210?embed=true
     # key.properties
     cipher.enc.key: AGLDdG4D04BKm2IxIWEr8o==
     # portal.properties

diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
index 68e1925..7640ffb 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/templates/appconfig.yaml
@@ -41,6 +41,7 @@ data:
     portalapi.appname  = {{ .Values.dashboard.portalapi.appname  }}
     portalapi.username = {{ .Values.dashboard.portalapi.username }}
     portalapi.password = {{ .Values.dashboard.portalapi.password }}
+    metrics.url.ac     = {{ .Values.dashboard.metrics.url.ac     }}
 
   key.properties: |
     cipher.enc.key     = {{ .Values.dashboard.cipher.enc.key }}

diff --git a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
index d0a8817..a4992a0 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/dashboard/values.yaml
@@ -76,3 +76,6 @@ dashboard:
     ecomp_redirect_url: https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm
     ecomp_rest_url: http://portal-app.onap:8989/ONAPPORTAL/auxapi
     ueb_app_key: uebkey
+  metrics:
+    url:
+      ac: http://ric-aux-kibana-server:5601/goto/1234567890abcdef?embed=true

diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
index f14d4e2..1d2a49d 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
+++ b/ric-platform/50-RIC-Platform/helm/a1mediator/templates/deployment.yaml
@@ -74,11 +74,11 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /healthcheck
+              path: /a1-p/healthcheck
               port: http
           readinessProbe:
             httpGet:
-              path: /healthcheck
+              path: /a1-p/healthcheck
               port: http
       volumes:
         - name: "a1conf"

diff --git a/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml b/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
index 9bebd45..8a58108 100644 (file)
--- a/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
+++ b/ric-platform/50-RIC-Platform/helm/a1mediator/values.yaml
@@ -29,7 +29,7 @@ a1mediator:
 
   image:
     name: ric-plt-a1
-    tag: 0.10.2
+    tag: 0.10.3
 
   # Service ports are now defined in
   # ric-common/Common-Template/helm/ric-common/templates/_ports.tpl file.