[CORD-1805] Fix ELK Stack support in the logging module
Change-Id: I03f9ffc83acac29dc4bb252ddae4e0d4bfa2b38e
diff --git a/docker_images.yml b/docker_images.yml
index 93f6ded..7e19f4a 100644
--- a/docker_images.yml
+++ b/docker_images.yml
@@ -33,6 +33,7 @@
- "onosproject/onos:1.10.10"
- "redis:3.2"
- "node:7.9.0" # remove once the issue with node:candidate is resolved
+ - "sebp/elk:564"
# buildable_images - list of images that we build from Dockerfiles
#
diff --git a/scenarios/cord/config.yml b/scenarios/cord/config.yml
index 3ef9c83..39b7e2d 100644
--- a/scenarios/cord/config.yml
+++ b/scenarios/cord/config.yml
@@ -105,6 +105,9 @@
# Always pull XOS images if start-xos target is re-run
always_pull_xos_images: True
+# Used in platform-install / roles/cord-profile/templates/docker-compose.yml.j2
+use_elasticstack: True
+
# images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
@@ -126,6 +129,7 @@
- "opencord/mavenrepo"
- "redis"
- "node"
+ - "sebp/elk"
# node topology
physical_node_list:
diff --git a/scenarios/preppedpod/config.yml b/scenarios/preppedpod/config.yml
index 14d06ad..9e570c4 100644
--- a/scenarios/preppedpod/config.yml
+++ b/scenarios/preppedpod/config.yml
@@ -109,6 +109,7 @@
- "onosproject/onos"
- "redis"
- "node"
+ - "sebp/elk"
# Ansible Inventory
inventory_groups:
diff --git a/scenarios/single/config.yml b/scenarios/single/config.yml
index 4bf4450..a1a144f 100644
--- a/scenarios/single/config.yml
+++ b/scenarios/single/config.yml
@@ -26,7 +26,7 @@
# Vagrant VM configuration
vagrant_box: "ubuntu/trusty64"
-head_vm_mem: 4096
+head_vm_mem: 8192
head_vm_cpu: 8
head_vm_ip: "192.168.46.100"
@@ -57,6 +57,9 @@
create_configdirs_become: False
xos_images: []
+# used in platform-install / roles/cord-profile/templates/docker-compose.yml.j2
+use_elasticstack: True
+
# whitelist of images for imagebuilder to build/pull (tagged elsewhere)
docker_image_whitelist:
- "xosproject/xos-base"
@@ -78,6 +81,7 @@
- "opencord/mavenrepo"
- "redis"
- "node"
+ - "sebp/elk"
# Ansible Inventory
inventory_groups: