summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-07-01 11:44:30 +0000
committerGerrit Code Review <review@openstack.org>2020-07-01 11:44:30 +0000
commit30ea0594f6bcb9a525a64ba94dd0d6a30cc86fcf (patch)
treeadc6bd9f6cd31c7860b4a66e4b80c7689d6442ee
parentabba960ff377b4403f029936e9e56bdef37074f6 (diff)
parent57a05bd77020ead74d077d1762d51a46d0535dbf (diff)
downloadkolla-30ea0594f6bcb9a525a64ba94dd0d6a30cc86fcf.tar.gz
kolla-30ea0594f6bcb9a525a64ba94dd0d6a30cc86fcf.zip
Merge "Update support matrix for ELK images" into stable/train
-rw-r--r--doc/source/matrix_aarch64.csv9
-rw-r--r--doc/source/matrix_x86.csv9
2 files changed, 12 insertions, 6 deletions
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 6bb121e1a..46533e3a7 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -20,7 +20,8 @@ dind (deprecated),C,C,C,C,N,C
dnsmasq,C,C,C,C,N,C
dragonflow (deprecated),N,C,N,C,N,C
ec2-api,C,C,C,C,N,C
-elasticsearch,N,N,C,C,N,C
+elasticsearch (5),N,N,C,C,N,C
+elasticsearch (6),N,N,N,N,N,N
etcd,C,C,C,C,N,C
fluentd,C,C,C,C,N,C
freezer,N,C,N,C,N,C
@@ -41,13 +42,15 @@ kafka,C,C,C,C,N,C
karbor,N,C,N,C,N,C
keepalived,C,C,C,C,N,C
keystone,C,C,C,C,N,C
-kibana,N,N,N,N,N,N
+kibana (5),N,N,N,N,N,N
+kibana (6),N,N,N,N,N,N
kolla-toolbox,C,C,C,C,N,C
kube (deprecated),C,C,C,C,N,C
kubernetes-entrypoint (deprecated),C,C,C,C,N,C
kubetoolbox (deprecated),C,C,C,C,N,C
kuryr,N,C,N,C,N,C
-logstash,C,C,C,C,N,C
+logstash (2),C,C,C,C,N,C
+logstash (6),N,N,N,N,N,N
magnum,C,C,C,C,N,C
manila,C,C,C,C,N,C
mariadb,C,C,C,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 2e25d00fa..279269d90 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -21,7 +21,8 @@ dind (deprecated),C,C,N,N,C,C,N,C
dnsmasq,T,T,T,T,C,T,N,C
dragonflow (deprecated),N,C,N,N,N,C,N,C
ec2-api,C,C,C,C,N,C,N,C
-elasticsearch,C,C,N,N,C,C,N,C
+elasticsearch (5),C,C,N,N,C,C,N,C
+elasticsearch (6),C,C,C,C,N,N,N,N
etcd,C,T,C,T,C,T,N,C
fluentd,T,T,T,T,T,T,N,T
freezer,N,C,N,C,N,C,N,C
@@ -43,13 +44,15 @@ kafka,C,C,C,C,C,C,N,C
karbor,N,C,N,C,N,C,N,C
keepalived,T,T,T,T,T,T,N,C
keystone,T,T,T,T,T,T,N,T
-kibana,C,C,N,N,C,C,N,C
+kibana (5),C,C,N,N,C,C,N,C
+kibana (6),C,C,C,C,N,N,N,N
kolla-toolbox,T,T,T,T,T,T,N,T
kube (deprecated),C,C,N,N,C,C,N,C
kubernetes-entrypoint (deprecated),C,C,N,N,C,C,N,C
kubetoolbox (deprecated),C,C,N,N,C,C,N,C
kuryr,N,T,N,T,N,T,N,C
-logstash,C,C,C,C,C,C,N,C
+logstash (2),C,C,C,C,C,C,N,C
+logstash (6),C,C,C,C,N,N,N,N
magnum,C,C,C,C,C,C,N,C
manila,C,C,C,C,C,C,N,C
mariadb,T,T,T,T,T,T,N,T