aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-08-12 04:57:02 +0000
committerGerrit Code Review <review@openstack.org>2019-08-12 04:57:02 +0000
commit38f8e6776996111e2eb60bd366abb3741a79379a (patch)
tree8ca17e1c31ee9337dbac3e7eda8dd25975cf73ad
parente3108d93c69dbad0c575da719f842d36c195a673 (diff)
parentdde74ebfdc1a50f002e844b4433a17b9533db78e (diff)
downloadkolla-38f8e6776996111e2eb60bd366abb3741a79379a.tar.gz
kolla-38f8e6776996111e2eb60bd366abb3741a79379a.zip
Merge "Upgrade Monasca to InfluxDB 1.7"
-rw-r--r--contrib/template-override/monasca-template-overrides.j23
-rw-r--r--doc/source/admin/template-override/monasca.rst18
-rw-r--r--releasenotes/notes/upgrade-influxdb-for-monasca-202f3cf22ff8597e.yaml12
3 files changed, 12 insertions, 21 deletions
diff --git a/contrib/template-override/monasca-template-overrides.j2 b/contrib/template-override/monasca-template-overrides.j2
deleted file mode 100644
index d58a6a143..000000000
--- a/contrib/template-override/monasca-template-overrides.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends parent_template %}
-
-{% set influxdb_packages_override = ["influxdb-1.3.7"] %}
diff --git a/doc/source/admin/template-override/monasca.rst b/doc/source/admin/template-override/monasca.rst
deleted file mode 100644
index a36f66773..000000000
--- a/doc/source/admin/template-override/monasca.rst
+++ /dev/null
@@ -1,18 +0,0 @@
-==============================================
-Building non-standard Monasca container images
-==============================================
-
-The `monasca-template-overrides.j2` file shows how to build
-any images required for Monasca which are non-standard. Currently this
-includes only InfluxDB. When Monasca is upgraded this file will
-no longer be required.
-
-InfluxDB
---------
-
-Build the container by executing the following command:
-
-.. code-block:: console
-
- kolla-build --template-override contrib/template-override/monasca-template-overrides.j2 influxdb
-
diff --git a/releasenotes/notes/upgrade-influxdb-for-monasca-202f3cf22ff8597e.yaml b/releasenotes/notes/upgrade-influxdb-for-monasca-202f3cf22ff8597e.yaml
new file mode 100644
index 000000000..a65b1929c
--- /dev/null
+++ b/releasenotes/notes/upgrade-influxdb-for-monasca-202f3cf22ff8597e.yaml
@@ -0,0 +1,12 @@
+---
+upgrade:
+ - |
+ Monasca now supports InfluxDB 1.7.x, the default version provided by Kolla.
+ Monasca users can follow the InfluxDB upgrade notes in the guide:
+ https://docs.influxdata.com/influxdb/v1.7/administration/upgrading/
+security:
+ - In prior versions of InfluxDB, including 1.3.x, InfluxDB incorrectly
+ ignored tag names starting with a leading underscore. In Monasca
+ this broke tenant isolation because queries containing
+ `where _tenant_id = 'some_id'` where not scoped to the tenant_id.
+ Upgrading to InfluxDB 1.7.x solves this issue.