diff options
| author |   Neal Chatterley <nealch@amdocs.com> | 2018-04-18 18:24:50 +0000 |
|---|---|---|
| committer |   Mandeep Khinda <mandeep.khinda@amdocs.com> | 2018-04-20 01:12:28 +0000 |
| commit | 12c70bdc7a86b91bc4c125b61c92b66fedb64059 (patch) | |
| tree | 2acaad570dd110d7195c3663c3ab67f944413bb0 | |
| parent | a249e059e5b26b0694827b2a77251323ba559bc0 (diff) | |
Add LOG component robot healthcheck
fixing incorrect service names
Issue-ID: OOM-914
Change-Id: I59e0150781094c85fe335811381b627c265cda57
Signed-off-by: Neal Chatterley <nealch@amdocs.com>
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
| -rwxr-xr-x | resources/config/eteshare/config/integration_robot_properties.py | 5 | ||||
| -rwxr-xr-x | resources/config/eteshare/config/vm_properties.py | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/resources/config/eteshare/config/integration_robot_properties.py b/resources/config/eteshare/config/integration_robot_properties.py index 6405a34..1915efe 100755 --- a/resources/config/eteshare/config/integration_robot_properties.py +++ b/resources/config/eteshare/config/integration_robot_properties.py @@ -89,3 +89,8 @@ GLOBAL_PROXY_WARNING_CONTINUE_XPATH="" GLOBAL_DNS_TRAFFIC_DURATION = "600" # location where heat templates are loaded from GLOBAL_HEAT_TEMPLATES_FOLDER = "/share/heat" +# Log info +GLOBAL_LOG_SERVER_PROTOCOL = "http" +GLOBAL_LOG_ELASTICSEARCH_PORT = "9200" +GLOBAL_LOG_LOGSTASH_PORT = "5044" +GLOBAL_LOG_KIBANA_PORT = "5601" diff --git a/resources/config/eteshare/config/vm_properties.py b/resources/config/eteshare/config/vm_properties.py index 1f2177e..47d42bc 100755 --- a/resources/config/eteshare/config/vm_properties.py +++ b/resources/config/eteshare/config/vm_properties.py @@ -13,6 +13,9 @@ GLOBAL_INJECTED_DNS_IP_ADDR = "N/A" GLOBAL_INJECTED_DOCKER_VERSION = "1.2-STAGING-latest" GLOBAL_INJECTED_EXTERNAL_DNS = "N/A" GLOBAL_INJECTED_GERRIT_BRANCH = "master" +GLOBAL_INJECTED_LOG_ELASTICSEARCH_IP_ADDR = "log-es.{{include "common.namespace" .}}" +GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR = "log-kibana.{{include "common.namespace" .}}" +GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR = "log-ls.{{include "common.namespace" .}}" GLOBAL_INJECTED_KEYSTONE = "{{ .Values.openStackKeyStoneUrl }}" GLOBAL_INJECTED_MR_IP_ADDR = "message-router.{{include "common.namespace" .}}" GLOBAL_INJECTED_MSO_IP_ADDR = "so.{{include "common.namespace" .}}" @@ -62,6 +65,9 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_EXTERNAL_DNS" : "N/A", "GLOBAL_INJECTED_GERRIT_BRANCH" : "master", "GLOBAL_INJECTED_KEYSTONE" : "{{ .Values.openStackKeyStoneUrl }}", + "GLOBAL_INJECTED_LOG_ELASTICSEARCH_IP_ADDR" : "log-es.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR" : "log-kibana.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR" : "log-ls.{{include "common.namespace" .}}", "GLOBAL_INJECTED_MR_IP_ADDR" : "message-router.{{include "common.namespace" .}}", "GLOBAL_INJECTED_MSO_IP_ADDR" : "so.{{include "common.namespace" .}}", "GLOBAL_INJECTED_MUSIC_IP_ADDR" : "music.{{include "common.namespace" .}}", @@ -94,5 +100,4 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_VID_IP_ADDR" : "{{.Release.Name}}-vid.{{include "common.namespace" .}}", "GLOBAL_INJECTED_VM_FLAVOR" : "{{ .Values.openStackFlavourMedium }}", "GLOBAL_INJECTED_VNFSDK_IP_ADDR" : "{{.Release.Name}}-vnfsdk.{{include "common.namespace" .}}" - }
\ No newline at end of file |