summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2017-01-10 09:03:44 +0100
committerOlivier Bourdon <obourdon@mirantis.com>2017-01-10 09:03:44 +0100
commit45bcbdecb7646e60e0af027b4739a6b356ade64f (patch)
tree9b7ae058e8578818a85c7723d82f0d433c68b4d0
parent646dc920522b0164f0672809095b529d16413794 (diff)
Update for 2.5.2 release
Notes
Notes (review): Code-Review+2: Swann Croiset <scroiset@mirantis.com> Workflow+1: Swann Croiset <scroiset@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 11 Jan 2017 14:19:55 +0000 Reviewed-on: https://review.openstack.org/418244 Project: openstack/fuel-plugin-external-zabbix Branch: refs/heads/master
-rw-r--r--README.md8
-rw-r--r--doc/plugin-guide/source/changelog.rst9
-rw-r--r--doc/plugin-guide/source/conf.py2
-rw-r--r--doc/plugin-guide/source/description.rst8
-rw-r--r--doc/plugin-guide/source/installation.rst8
-rw-r--r--doc/plugin-guide/source/limitations.rst4
-rw-r--r--doc/plugin-guide/source/revisionhistory.rst3
-rw-r--r--doc/plugin-guide/source/troubleshooting.rst2
-rw-r--r--doc/qa/source/conf.py2
-rw-r--r--doc/qa/source/test-strategy.rst14
-rw-r--r--doc/specs/source/conf.py2
-rw-r--r--doc/specs/source/index.rst6
-rw-r--r--metadata.yaml2
13 files changed, 41 insertions, 29 deletions
diff --git a/README.md b/README.md
index f8cc6f3..6e73706 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,9 @@ and OpenStack services and APIs.
12Requirements 12Requirements
13------------ 13------------
14 14
15| Requirement | Version/Comment | 15| Requirement | Version/Comment |
16|:---------------------------------|:-------------------| 16|:---------------------------------|:------------------------|
17| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1 | 17| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1, 9.2 |
18 18
19Installation Guide 19Installation Guide
20================== 20==================
@@ -43,7 +43,7 @@ To install Zabbix plugin, follow these steps:
43 # fuel plugins 43 # fuel plugins
44 id | name | version | package_version 44 id | name | version | package_version
45 ---|-------------------|---------|---------------- 45 ---|-------------------|---------|----------------
46 1 | zabbix_monitoring | 2.5.1 | 3.0.0 46 1 | zabbix_monitoring | 2.5.2 | 3.0.0
47 47
48For further details see the Zabbix Plugin Guide in the 48For further details see the Zabbix Plugin Guide in the
49[Fuel Plugins Catalog](https://software.mirantis.com/fuel-plugins) 49[Fuel Plugins Catalog](https://software.mirantis.com/fuel-plugins)
diff --git a/doc/plugin-guide/source/changelog.rst b/doc/plugin-guide/source/changelog.rst
index 662b5fa..6489550 100644
--- a/doc/plugin-guide/source/changelog.rst
+++ b/doc/plugin-guide/source/changelog.rst
@@ -1,6 +1,15 @@
1Release notes / Changelog 1Release notes / Changelog
2========================= 2=========================
3 3
4**2.5.2**
5
6* Compatibility with MOS 7.0, 8.0, 9.0, 9.1 and 9.2
7* VIP becomes unavailable after its Controller reboot if Zabbix with OVS bridges are used (bug 1644821_)
8* Error when deploying on MOS 9.0 env with modified hostnames (bug 1633701_)
9
10.. _1644821: https://bugs.launchpad.net/fuel-plugins/+bug/1644821
11.. _1633701: https://bugs.launchpad.net/fuel-plugins/+bug/1633701
12
4**2.5.1** 13**2.5.1**
5 14
6* Compatibility with MOS 7.0, 8.0, 9.0 and 9.1 15* Compatibility with MOS 7.0, 8.0, 9.0 and 9.1
diff --git a/doc/plugin-guide/source/conf.py b/doc/plugin-guide/source/conf.py
index 85c2a93..e59be52 100644
--- a/doc/plugin-guide/source/conf.py
+++ b/doc/plugin-guide/source/conf.py
@@ -56,7 +56,7 @@ author = u'Mirantis Inc.'
56# The short X.Y version. 56# The short X.Y version.
57version = '2.5' 57version = '2.5'
58# The full version, including alpha/beta/rc tags. 58# The full version, including alpha/beta/rc tags.
59release = '2.5-2.5.1-1' 59release = '2.5-2.5.2-1'
60 60
61# The language for content autogenerated by Sphinx. Refer to documentation 61# The language for content autogenerated by Sphinx. Refer to documentation
62# for a list of supported languages. 62# for a list of supported languages.
diff --git a/doc/plugin-guide/source/description.rst b/doc/plugin-guide/source/description.rst
index 88a936b..f7c0058 100644
--- a/doc/plugin-guide/source/description.rst
+++ b/doc/plugin-guide/source/description.rst
@@ -10,11 +10,11 @@ services and APIs.
10Requirements 10Requirements
11============ 11============
12 12
13=========== ===================== 13=========== ==========================
14Requirement Version/Comment 14Requirement Version/Comment
15=========== ===================== 15=========== ==========================
16Fuel 7.0, 8.0, 9.0 and 9.1 16Fuel 7.0, 8.0, 9.0, 9.1 and 9.2
17=========== ===================== 17=========== ==========================
18 18
19Operational limitations 19Operational limitations
20======================= 20=======================
diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst
index 1866c1d..a8b1745 100644
--- a/doc/plugin-guide/source/installation.rst
+++ b/doc/plugin-guide/source/installation.rst
@@ -17,19 +17,19 @@ To install Zabbix plugin, follow these steps:
17 Fuel Master node using SSH. If you do not have the Fuel Master node yet, 17 Fuel Master node using SSH. If you do not have the Fuel Master node yet,
18 see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_:: 18 see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_::
19 19
20 # scp zabbix_monitoring-2.5-2.5.1-1.noarch.rpm root@<Fuel_Master_IP>:/tmp 20 # scp zabbix_monitoring-2.5-2.5.2-1.noarch.rpm root@<Fuel_Master_IP>:/tmp
21 21
22#. Log into the Fuel Master node. Install the plugin:: 22#. Log into the Fuel Master node. Install the plugin::
23 23
24 # cd /tmp 24 # cd /tmp
25 # fuel plugins --install zabbix_monitoring-2.5-2.5.1-1.noarch.rpm 25 # fuel plugins --install zabbix_monitoring-2.5-2.5.2-1.noarch.rpm
26 26
27#. Check if the plugin was installed successfully:: 27#. Check if the plugin was installed successfully::
28 28
29 # fuel plugins 29 # fuel plugins
30 id | name | version | package_version 30 id | name | version | package_version
31 ---|---------------------------|----------|---------------- 31 ---|---------------------------|----------|----------------
32 1 | zabbix_monitoring | 2.5.1 | 3.0.0 32 1 | zabbix_monitoring | 2.5.2 | 3.0.0
33 33
34Zabbix plugin removal 34Zabbix plugin removal
35===================== 35=====================
@@ -40,7 +40,7 @@ To uninstall Zabbix plugin, follow these steps:
40 40
41#. Uninstall the plugin:: 41#. Uninstall the plugin::
42 42
43 # fuel plugins --remove zabbix_monitoring==2.5.1 43 # fuel plugins --remove zabbix_monitoring==2.5.2
44 44
45#. Check if the plugin was uninstalled successfully:: 45#. Check if the plugin was uninstalled successfully::
46 46
diff --git a/doc/plugin-guide/source/limitations.rst b/doc/plugin-guide/source/limitations.rst
index 65dc25b..7dbdb75 100644
--- a/doc/plugin-guide/source/limitations.rst
+++ b/doc/plugin-guide/source/limitations.rst
@@ -19,8 +19,8 @@ Reduced footprint
19The Zabbix plugin does not support reduced footprint deployment for Fuel 7.0 19The Zabbix plugin does not support reduced footprint deployment for Fuel 7.0
20and Fuel 8.0. `LP1610217 <https://bugs.launchpad.net/fuel/+bug/1610217>`_ 20and Fuel 8.0. `LP1610217 <https://bugs.launchpad.net/fuel/+bug/1610217>`_
21 21
22The Zabbix plugin version 2.5.1 supports the reduced footprint deployment 22The Zabbix plugin version 2.5.2 supports the reduced footprint deployment
23with Fuel 9.x **only**. To deploy a corresponding OpenStack environment: 23starting with Fuel 9.x **only**. To deploy a corresponding OpenStack environment:
24 24
25#. Enable the `reduced footprint <https://docs.mirantis.com/openstack/fuel/fuel-master/operations/reduced-footprint-ops.html>`_ 25#. Enable the `reduced footprint <https://docs.mirantis.com/openstack/fuel/fuel-master/operations/reduced-footprint-ops.html>`_
26 feature and deploy all ``virt`` nodes **without** enabling the Zabbix 26 feature and deploy all ``virt`` nodes **without** enabling the Zabbix
diff --git a/doc/plugin-guide/source/revisionhistory.rst b/doc/plugin-guide/source/revisionhistory.rst
index 23d4e81..f6af84b 100644
--- a/doc/plugin-guide/source/revisionhistory.rst
+++ b/doc/plugin-guide/source/revisionhistory.rst
@@ -50,5 +50,8 @@ Version Revision date Editor Comment
50------- ------------- ---------------------------- --------------------- 50------- ------------- ---------------------------- ---------------------
512.5.1 10.19.2016 Olivier Bourdon Added MOS 9.1 support 512.5.1 10.19.2016 Olivier Bourdon Added MOS 9.1 support
52 (obourdon@mirantis.com) 52 (obourdon@mirantis.com)
53------- ------------- ---------------------------- ---------------------
542.5.2 01.10.2017 Olivier Bourdon Added MOS 9.2 support
55 (obourdon@mirantis.com) Bug Fixes
53======= ============= ============================ ===================== 56======= ============= ============================ =====================
54 57
diff --git a/doc/plugin-guide/source/troubleshooting.rst b/doc/plugin-guide/source/troubleshooting.rst
index 4c641c0..46b80cd 100644
--- a/doc/plugin-guide/source/troubleshooting.rst
+++ b/doc/plugin-guide/source/troubleshooting.rst
@@ -32,7 +32,7 @@ Finding the management VIP
32 32
33On the returned node from the command above for a given environment, you might also want to know what is the Zabbix VIP address, so run the following command on Fuel master node:: 33On the returned node from the command above for a given environment, you might also want to know what is the Zabbix VIP address, so run the following command on Fuel master node::
34 34
35 # ssh -q node-4 ip netns exec haproxy ifconfig b_zbx_vip_mgmt | \ 35 # ssh -q node-4 ip netns exec zabbix ifconfig b_zbx_vip_mgmt | \
36 grep 'inet addr:' | sed -e 's/[^:]*://' -e 's/ .*//' 36 grep 'inet addr:' | sed -e 's/[^:]*://' -e 's/ .*//'
37 192.168.0.3 37 192.168.0.3
38 # ssh -q node-4 awk '/zbx_vip_mgmt/ {n=1} n==1 && /ipaddr/ {print;exit}' \ 38 # ssh -q node-4 awk '/zbx_vip_mgmt/ {n=1} n==1 && /ipaddr/ {print;exit}' \
diff --git a/doc/qa/source/conf.py b/doc/qa/source/conf.py
index 2e11c53..936f2ab 100644
--- a/doc/qa/source/conf.py
+++ b/doc/qa/source/conf.py
@@ -56,7 +56,7 @@ author = u'Mirantis Inc.'
56# The short X.Y version. 56# The short X.Y version.
57version = '2.5' 57version = '2.5'
58# The full version, including alpha/beta/rc tags. 58# The full version, including alpha/beta/rc tags.
59release = '2.5-2.5.1-1' 59release = '2.5-2.5.2-1'
60 60
61# The language for content autogenerated by Sphinx. Refer to documentation 61# The language for content autogenerated by Sphinx. Refer to documentation
62# for a list of supported languages. 62# for a list of supported languages.
diff --git a/doc/qa/source/test-strategy.rst b/doc/qa/source/test-strategy.rst
index 33723fc..5a2c49e 100644
--- a/doc/qa/source/test-strategy.rst
+++ b/doc/qa/source/test-strategy.rst
@@ -23,11 +23,11 @@ Test environment, infrastructure and tools
23Product compatibility matrix 23Product compatibility matrix
24============================ 24============================
25 25
26+--------------------+----------------------+ 26+--------------------+----------------------------+
27| Product | Version/Comment | 27| Product | Version/Comment |
28+====================+======================+ 28+====================+============================+
29| Mirantis OpenStack | 7.0, 8.0, 9.0 and 9.1| 29| Mirantis OpenStack | 7.0, 8.0, 9.0, 9.1 and 9.2 |
30+--------------------+----------------------+ 30+--------------------+----------------------------+
31| Zabbix monitoring | 2.5.1 | 31| Zabbix monitoring | 2.5.2 |
32+--------------------+----------------------+ 32+--------------------+----------------------------+
33 33
diff --git a/doc/specs/source/conf.py b/doc/specs/source/conf.py
index 8b480e7..d02e6a5 100644
--- a/doc/specs/source/conf.py
+++ b/doc/specs/source/conf.py
@@ -56,7 +56,7 @@ author = u'Mirantis Inc.'
56# The short X.Y version. 56# The short X.Y version.
57version = '2.5' 57version = '2.5'
58# The full version, including alpha/beta/rc tags. 58# The full version, including alpha/beta/rc tags.
59release = '2.5-2.5.0-1' 59release = '2.5-2.5.2-1'
60 60
61# The language for content autogenerated by Sphinx. Refer to documentation 61# The language for content autogenerated by Sphinx. Refer to documentation
62# for a list of supported languages. 62# for a list of supported languages.
diff --git a/doc/specs/source/index.rst b/doc/specs/source/index.rst
index 35ca608..cd3ee8d 100644
--- a/doc/specs/source/index.rst
+++ b/doc/specs/source/index.rst
@@ -3,9 +3,9 @@
3 3
4 http://www.apache.org/licenses/LICENSE-2.0 4 http://www.apache.org/licenses/LICENSE-2.0
5 5
6============================= 6==================
7Zabbix Fuel plugin 7Zabbix Fuel plugin
8============================= 8==================
9 9
10Zabbix plugin for Fuel extends Mirantis OpenStack functionality 10Zabbix plugin for Fuel extends Mirantis OpenStack functionality
11by installing Zabbix monitoring system. 11by installing Zabbix monitoring system.
@@ -120,7 +120,7 @@ Work Items
120Dependencies 120Dependencies
121============ 121============
122 122
123* Fuel 7.0, 8.0, 9.0 and 9.1 123* Fuel 7.0, 8.0, 9.0, 9.1 and 9.2
124 124
125Testing 125Testing
126======= 126=======
diff --git a/metadata.yaml b/metadata.yaml
index fe22317..6d9b6c7 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,7 +2,7 @@
2name: zabbix_monitoring 2name: zabbix_monitoring
3title: Zabbix for Fuel 3title: Zabbix for Fuel
4# Plugin version 4# Plugin version
5version: 2.5.1 5version: 2.5.2
6# Description 6# Description
7description: Enables Zabbix Monitoring. For information how to access Zabbix UI refer to Zabbix plugin User Guide. Zabbix URL schema is http://<VIP>/zabbix 7description: Enables Zabbix Monitoring. For information how to access Zabbix UI refer to Zabbix plugin User Guide. Zabbix URL schema is http://<VIP>/zabbix
8# Required fuel version 8# Required fuel version