summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2017-02-17 12:45:41 +0100
committerOlivier Bourdon <obourdon@mirantis.com>2017-02-17 12:50:30 +0100
commit5953939012d12eafd90ea7a5c60544d9f031d720 (patch)
tree88411038ac36af83b9a4961962c499c954363eac
parent92601e16529404225421e107310d271f0d0bc7a9 (diff)
Add MOS 9.2 as supported release1.1.1
Notes
Notes (review): Code-Review+2: Swann Croiset <scroiset@mirantis.com> Code-Review+2: Olivier Bourdon <obourdon@mirantis.com> Workflow+1: Olivier Bourdon <obourdon@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 17 Feb 2017 15:34:57 +0000 Reviewed-on: https://review.openstack.org/435401 Project: openstack/fuel-plugin-zabbix-monitoring-emc Branch: refs/heads/master
-rw-r--r--README.md20
-rw-r--r--doc/plugin-guide/source/changelog.rst4
-rw-r--r--doc/plugin-guide/source/conf.py4
-rw-r--r--doc/plugin-guide/source/description.rst12
-rw-r--r--doc/plugin-guide/source/installation.rst20
-rw-r--r--doc/plugin-guide/source/revisionhistory.rst3
-rw-r--r--doc/plugin-guide/source/troubleshooting.rst2
-rw-r--r--doc/specs/source/conf.py4
-rw-r--r--doc/specs/source/index.rst6
-rw-r--r--metadata.yaml2
10 files changed, 42 insertions, 35 deletions
diff --git a/README.md b/README.md
index 2773733..6f86fd1 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,11 @@ appropriate items and triggers and by creating Hosts for each EMC VNX array.
13Requirements 13Requirements
14------------ 14------------
15 15
16| Requirement | Version/Comment | 16| Requirement | Version/Comment |
17|:-----------------------------------|:-------------------| 17|:-----------------------------------|:----------------------------|
18| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1 | 18| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1, and 9.2 |
19| Zabbix plugin for Fuel | 2.5.1 | 19| Zabbix plugin for Fuel | 2.5.2 |
20| SNMP trap daemon for Zabbix plugin | 1.1.0 | 20| SNMP trap daemon for Zabbix plugin | 1.1.1 |
21 21
22Installation Guide 22Installation Guide
23================== 23==================
@@ -41,22 +41,22 @@ follow these steps:
41 that. If you do not have the Fuel Master node yet, see 41 that. If you do not have the Fuel Master node yet, see
42 [Quick Start Guide](https://software.mirantis.com/quick-start/) : 42 [Quick Start Guide](https://software.mirantis.com/quick-start/) :
43 43
44 # scp zabbix_monitoring_emc-2.5-2.5.1-1.noarch.rpm \ 44 # scp zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm \
45 root@<Fuel_Master_ip>:/tmp 45 root@<Fuel_Master_ip>:/tmp
46 46
475. Install the plugin: 475. Install the plugin:
48 48
49 # cd /tmp 49 # cd /tmp
50 # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm 50 # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm
51 51
526. Check if the plugin was installed successfully: 526. Check if the plugin was installed successfully:
53 53
54 # fuel plugins 54 # fuel plugins
55 id | name | version | package_version 55 id | name | version | package_version
56 ---|-----------------------|---------|---------------- 56 ---|-----------------------|---------|----------------
57 1 | zabbix_monitoring | 2.5.1 | 3.0.0 57 1 | zabbix_monitoring | 2.5.2 | 3.0.0
58 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0 58 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0
59 3 | zabbix_monitoring_emc | 1.1.0 | 3.0.0 59 3 | zabbix_monitoring_emc | 1.1.1 | 3.0.0
60 60
61For more information and instructions, see the EMC hardware monitoring extension 61For more information and instructions, see the EMC hardware monitoring extension
62for Zabbix plugin Guide in the 62for Zabbix plugin Guide in the
diff --git a/doc/plugin-guide/source/changelog.rst b/doc/plugin-guide/source/changelog.rst
index 7393b6a..d3c77c7 100644
--- a/doc/plugin-guide/source/changelog.rst
+++ b/doc/plugin-guide/source/changelog.rst
@@ -1,6 +1,10 @@
1Release notes / Changelog 1Release notes / Changelog
2========================= 2=========================
3 3
4**1.1.1**
5
6* Compatibility with MOS 9.2
7
4**1.1.0** 8**1.1.0**
5 9
6* Compatibility with MOS 9.0 and MOS 9.1 10* Compatibility with MOS 9.0 and MOS 9.1
diff --git a/doc/plugin-guide/source/conf.py b/doc/plugin-guide/source/conf.py
index 6fe7f6a..f6a0857 100644
--- a/doc/plugin-guide/source/conf.py
+++ b/doc/plugin-guide/source/conf.py
@@ -46,7 +46,7 @@ master_doc = 'index'
46 46
47# General information about the project. 47# General information about the project.
48project = u'The Zabbix plugin for Fuel EMC hardware monitoring extension' 48project = u'The Zabbix plugin for Fuel EMC hardware monitoring extension'
49copyright = u'2016, Mirantis Inc.' 49copyright = u'2017, Mirantis Inc.'
50author = u'Mirantis Inc.' 50author = u'Mirantis Inc.'
51 51
52# The version info for the project you're documenting, acts as replacement for 52# The version info for the project you're documenting, acts as replacement for
@@ -56,7 +56,7 @@ author = u'Mirantis Inc.'
56# The short X.Y version. 56# The short X.Y version.
57version = '1.1' 57version = '1.1'
58# The full version, including alpha/beta/rc tags. 58# The full version, including alpha/beta/rc tags.
59release = '1.1-1.1.0-1' 59release = '1.1-1.1.1-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 763f9f6..bab40b6 100644
--- a/doc/plugin-guide/source/description.rst
+++ b/doc/plugin-guide/source/description.rst
@@ -14,11 +14,11 @@ items and triggers and by creating Hosts for each EMC VNX array.
14Requirements 14Requirements
15============ 15============
16 16
17================================== ===================== 17================================== ==========================
18Requirement Version/Comment 18Requirement Version/Comment
19================================== ===================== 19================================== ==========================
20Fuel 7.0, 8.0, 9.0 and 9.1 20Fuel 7.0, 8.0, 9.0, 9.1 and 9.2
21Zabbix plugin for Fuel 2.5.1 21Zabbix plugin for Fuel 2.5.2
22SNMP trap daemon for Zabbix plugin 1.1.0 22SNMP trap daemon for Zabbix plugin 1.1.1
23================================== ===================== 23================================== ==========================
24 24
diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst
index 3cb3903..61f6caa 100644
--- a/doc/plugin-guide/source/installation.rst
+++ b/doc/plugin-guide/source/installation.rst
@@ -26,11 +26,11 @@ steps:
26 Fuel Master node using ssh. If you do not have the Fuel Master node yet, 26 Fuel Master node using ssh. If you do not have the Fuel Master node yet,
27 see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_:: 27 see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_::
28 28
29 # scp zabbix_monitoring-2.5-2.5.1-1.noarch.rpm \ 29 # scp zabbix_monitoring-2.5-2.5.2-1.noarch.rpm \
30 root@<Fuel_Master_IP>:/tmp 30 root@<Fuel_Master_IP>:/tmp
31 # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm \ 31 # scp zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm \
32 root@<Fuel_Master_IP>:/tmp 32 root@<Fuel_Master_IP>:/tmp
33 # scp zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm \ 33 # scp zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm \
34 root@<The_Fuel_Master_node_IP>:/tmp 34 root@<The_Fuel_Master_node_IP>:/tmp
35 35
36#. Log into the Fuel Master node. Install each of the three plugins using 36#. Log into the Fuel Master node. Install each of the three plugins using
@@ -38,20 +38,20 @@ steps:
38 38
39 # cd /tmp 39 # cd /tmp
40 # fuel plugins --install \ 40 # fuel plugins --install \
41 zabbix_monitoring-2.5-2.5.1-1.noarch.rpm 41 zabbix_monitoring-2.5-2.5.2-1.noarch.rpm
42 # fuel plugins --install \ 42 # fuel plugins --install \
43 zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm 43 zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm
44 # fuel plugins --install \ 44 # fuel plugins --install \
45 zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm 45 zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm
46 46
47#. Make sure the plugins were installed correctly:: 47#. Make sure the plugins were installed correctly::
48 48
49 # fuel plugins 49 # fuel plugins
50 id | name | version | package_version 50 id | name | version | package_version
51 ---|---------------------------|----------|---------------- 51 ---|---------------------------|----------|----------------
52 1 | zabbix_monitoring | 2.5.1 | 3.0.0 52 1 | zabbix_monitoring | 2.5.2 | 3.0.0
53 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0 53 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0
54 3 | zabbix_monitoring_emc | 1.1.0 | 3.0.0 54 3 | zabbix_monitoring_emc | 1.1.1 | 3.0.0
55 55
56| 56|
57 57
@@ -65,7 +65,7 @@ follow these steps:
65 65
66#. Uninstall the plugin:: 66#. Uninstall the plugin::
67 67
68 # fuel plugins --remove zabbix_monitoring_emc==1.1.0 68 # fuel plugins --remove zabbix_monitoring_emc==1.1.1
69 69
70#. Check if the plugin was uninstalled successfully:: 70#. Check if the plugin was uninstalled successfully::
71 71
diff --git a/doc/plugin-guide/source/revisionhistory.rst b/doc/plugin-guide/source/revisionhistory.rst
index 0dd0b1b..eb5480a 100644
--- a/doc/plugin-guide/source/revisionhistory.rst
+++ b/doc/plugin-guide/source/revisionhistory.rst
@@ -29,5 +29,8 @@ Version Revision date Editor Comment
29------- ------------- ---------------------------- --------------------- 29------- ------------- ---------------------------- ---------------------
301.1.0 10.19.2016 Olivier Bourdon Added MOS 9.1 support 301.1.0 10.19.2016 Olivier Bourdon Added MOS 9.1 support
31 (obourdon@mirantis.com) 31 (obourdon@mirantis.com)
32------- ------------- ---------------------------- ---------------------
331.1.1 01.17.2017 Olivier Bourdon Added MOS 9.2 support
34 (obourdon@mirantis.com)
32======= ============= ============================ ===================== 35======= ============= ============================ =====================
33 36
diff --git a/doc/plugin-guide/source/troubleshooting.rst b/doc/plugin-guide/source/troubleshooting.rst
index 5744c7b..554cd77 100644
--- a/doc/plugin-guide/source/troubleshooting.rst
+++ b/doc/plugin-guide/source/troubleshooting.rst
@@ -51,7 +51,7 @@ Finding the management VIP to use to send SNMP traps
51 51
52On the Fuel master node, use the primary controller node (here node-3):: 52On the Fuel master node, use the primary controller node (here node-3)::
53 53
54 # ssh -q node-3 ip netns exec haproxy ifconfig b_zbx_vip_mgmt | \ 54 # ssh -q node-3 ip netns exec zabbix ifconfig b_zbx_vip_mgmt | \
55 grep 'inet addr:' | sed -e 's/[^:]*://' -e 's/ .*//' 55 grep 'inet addr:' | sed -e 's/[^:]*://' -e 's/ .*//'
56 192.168.0.3 56 192.168.0.3
57 57
diff --git a/doc/specs/source/conf.py b/doc/specs/source/conf.py
index 15f2433..8618c30 100644
--- a/doc/specs/source/conf.py
+++ b/doc/specs/source/conf.py
@@ -49,7 +49,7 @@ master_doc = 'index'
49 49
50# General information about the project. 50# General information about the project.
51project = u'The Zabbix plugin for Fuel EMC hardware monitoring extension specification' 51project = u'The Zabbix plugin for Fuel EMC hardware monitoring extension specification'
52copyright = u'2016, Mirantis' 52copyright = u'2017, Mirantis'
53author = u'Mirantis' 53author = u'Mirantis'
54 54
55# The version info for the project you're documenting, acts as replacement for 55# The version info for the project you're documenting, acts as replacement for
@@ -59,7 +59,7 @@ author = u'Mirantis'
59# The short X.Y version. 59# The short X.Y version.
60version = '1.1' 60version = '1.1'
61# The full version, including alpha/beta/rc tags. 61# The full version, including alpha/beta/rc tags.
62release = '1.1-1.1.0-1' 62release = '1.1-1.1.1-1'
63 63
64# The language for content autogenerated by Sphinx. Refer to documentation 64# The language for content autogenerated by Sphinx. Refer to documentation
65# for a list of supported languages. 65# for a list of supported languages.
diff --git a/doc/specs/source/index.rst b/doc/specs/source/index.rst
index 0258f84..b385617 100644
--- a/doc/specs/source/index.rst
+++ b/doc/specs/source/index.rst
@@ -117,9 +117,9 @@ Work Items
117Dependencies 117Dependencies
118============ 118============
119 119
120* Fuel 7.0, 8.0, 9.0 and 9.1 120* Fuel 7.0, 8.0, 9.0, 9.1, and 9.2
121* Zabbix plugin for Fuel 2.5.1 121* Zabbix plugin for Fuel 2.5.2
122* SNMP trap daemon for Zabbix plugin 1.1.0 122* SNMP trap daemon for Zabbix plugin 1.1.1
123 123
124Testing 124Testing
125======= 125=======
diff --git a/metadata.yaml b/metadata.yaml
index 12c71a1..1fa3ccd 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,7 +2,7 @@
2name: zabbix_monitoring_emc 2name: zabbix_monitoring_emc
3title: EMC hardware monitoring extension for Zabbix plugin 3title: EMC hardware monitoring extension for Zabbix plugin
4# Plugin version 4# Plugin version
5version: 1.1.0 5version: 1.1.1
6# Description 6# Description
7description: Adds EMC hardware monitoring to Zabbix plugin 7description: Adds EMC hardware monitoring to Zabbix plugin
8# Required fuel version 8# Required fuel version