From: Alexis de Talhouët <alexis.de_talhouet@bell.ca>
Date: Mon, 17 Dec 2018 17:12:00 +0000 (+0000)
Subject: Merge "Corrected SO-Monitoring url in fn_app table"
X-Git-Tag: 4.0.0-ONAP~442
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dfd8af77ba1404f4c8cd8a83abb29d588f320c09;hp=56835663b4debf0d1c9a740ee49199265e0e0ef8;p=oom.git

Merge "Corrected SO-Monitoring url in fn_app table"
---

diff --git a/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql b/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql
index f6120e4254..5bfbe74b73 100644
--- a/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql
+++ b/kubernetes/portal/charts/portal-mariadb/resources/config/mariadb/oom_updates.sql
@@ -45,7 +45,7 @@ update fn_app set app_url = 'http://{{.Values.config.msbHostName}}:{{.Values.con
 Create SO-Monitoring App
 */
 INSERT IGNORE INTO `fn_app` (`app_id`, `app_name`, `app_image_url`, `app_description`, `app_notes`, `app_url`, `app_alternate_url`, `app_rest_endpoint`, `ml_app_name`, `ml_app_admin_id`, `mots_id`, `app_password`, `open`, `enabled`, `thumbnail`, `app_username`, `ueb_key`, `ueb_secret`, `ueb_topic_name`, `app_type`,`auth_central`,`auth_namespace`) VALUES
-(10, 'SO-Monitoring', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://{{.Values.config.soMonitoringHostName}}:{{.Values.soMonitoringPort}}', NULL, 'http://so-monitoring:30224', '', '', NULL, 'password', 'Y', 'Y', NULL, 'user', '', '', '', 1,'N','SO-Monitoring');
+(10, 'SO-Monitoring', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://{{.Values.config.soMonitoringHostName}}:{{.Values.config.soMonitoringPort}}', NULL, 'http://so-monitoring:30224', '', '', NULL, 'password', 'Y', 'Y', NULL, 'user', '', '', '', 1,'N','SO-Monitoring');
 
 /*
 Add SO Monitoring to Default apps
diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml
index d84253d483..24b92f3bc3 100644
--- a/kubernetes/portal/charts/portal-mariadb/values.yaml
+++ b/kubernetes/portal/charts/portal-mariadb/values.yaml
@@ -71,7 +71,7 @@ config:
   # SO Monitoring assignment for port 30224
   soMonitoringPort: "30224"
   # application's front end hostname.  Must be resolvable on the client side environment
-  soMonitoringHostName: "http://so-monitoring"
+  soMonitoringHostName: "so-monitoring"
 
 
 # default number of instances