From dde74ebfdc1a50f002e844b4433a17b9533db78e Mon Sep 17 00:00:00 2001 From: Doug Szumski Date: Fri, 10 May 2019 14:41:12 +0100 Subject: [PATCH] Upgrade Monasca to InfluxDB 1.7 Monasca now supports InfluxDB 1.7, the current version provided by Kolla. We no longer need to build an old version for Monasca. Depends-On: https://review.opendev.org/#/c/658330 Change-Id: I5a86405901139d643172835acb89f55b14bfedbf --- .../monasca-template-overrides.j2 | 3 --- doc/source/admin/template-override/monasca.rst | 18 ------------------ ...-influxdb-for-monasca-202f3cf22ff8597e.yaml | 12 ++++++++++++ 3 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 contrib/template-override/monasca-template-overrides.j2 delete mode 100644 doc/source/admin/template-override/monasca.rst create mode 100644 releasenotes/notes/upgrade-influxdb-for-monasca-202f3cf22ff8597e.yaml diff --git a/contrib/template-override/monasca-template-overrides.j2 b/contrib/template-override/monasca-template-overrides.j2 deleted file mode 100644 index d58a6a143f..0000000000 --- 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 a36f667736..0000000000 --- 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 0000000000..a65b1929cf --- /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.