summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2017-02-17 13:03:05 +0100
committerOlivier Bourdon <obourdon@mirantis.com>2017-02-17 13:17:30 +0100
commitca12eacc3253770019a137abdbb5e89523966967 (patch)
treeff0b1b5d8a151a6df2c2ee3b3b77aa7d9c77252d
parent70c22784b46a14d6b1e9bc848f6fdb8beada689d (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:35:26 +0000 Reviewed-on: https://review.openstack.org/435412 Project: openstack/fuel-plugin-zabbix-monitoring-extreme-networks 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 b94d447..f4abac4 100644
--- a/README.md
+++ b/README.md
@@ -14,11 +14,11 @@ and triggers and by creating Hosts for each Extreme Networks hardware.
14Requirements 14Requirements
15------------ 15------------
16 16
17| Requirement | Version/Comment | 17| Requirement | Version/Comment |
18|:-----------------------------------|:-------------------| 18|:-----------------------------------|:---------------------------|
19| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1 | 19| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1 and 9.2 |
20| Zabbix plugin for Fuel | 2.5.1 | 20| Zabbix plugin for Fuel | 2.5.2 |
21| SNMP trap daemon for Zabbix plugin | 1.1.0 | 21| SNMP trap daemon for Zabbix plugin | 1.1.1 |
22 22
23Installation Guide 23Installation Guide
24================== 24==================
@@ -42,23 +42,23 @@ follow these steps:
42 that. If you do not have the Fuel Master node yet, see 42 that. If you do not have the Fuel Master node yet, see
43 [Quick Start Guide](https://software.mirantis.com/quick-start/) : 43 [Quick Start Guide](https://software.mirantis.com/quick-start/) :
44 44
45 # scp zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm \ 45 # scp zabbix_monitoring_extreme_networks-1.1-1.1.1-1.noarch.rpm \
46 root@<Fuel_Master_ip>:/tmp 46 root@<Fuel_Master_ip>:/tmp
47 47
485. Install the plugin: 485. Install the plugin:
49 49
50 # cd /tmp 50 # cd /tmp
51 # fuel plugins --install \ 51 # fuel plugins --install \
52 zabbix_monitoring_extreme_networks-1.1-1.1.0-1.noarch.rpm 52 zabbix_monitoring_extreme_networks-1.1-1.1.1-1.noarch.rpm
53 53
546. Check if the plugin was installed successfully: 546. Check if the plugin was installed successfully:
55 55
56 # fuel plugins 56 # fuel plugins
57 id | name | version | package_version 57 id | name | version | package_version
58 ---|------------------------------------|---------|---------------- 58 ---|------------------------------------|---------|----------------
59 1 | zabbix_monitoring | 2.5.1 | 3.0.0 59 1 | zabbix_monitoring | 2.5.2 | 3.0.0
60 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0 60 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0
61 3 | zabbix_monitoring_extreme_networks | 1.1.0 | 3.0.0 61 3 | zabbix_monitoring_extreme_networks | 1.1.1 | 3.0.0
62 62
63For more information and instructions, see the Extreme Networks hardware 63For more information and instructions, see the Extreme Networks hardware
64monitoring extension for Zabbix plugin Guide in the 64monitoring extension for 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 7be2c99..4d75610 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 Extreme Networks hardware monitoring extension' 48project = u'The Zabbix plugin for Fuel Extreme Networks 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 6b5cb24..aa92edb 100644
--- a/doc/plugin-guide/source/description.rst
+++ b/doc/plugin-guide/source/description.rst
@@ -15,11 +15,11 @@ Networks hardware.
15Requirements 15Requirements
16============ 16============
17 17
18================================== ===================== 18================================== ==========================
19Requirement Version/Comment 19Requirement Version/Comment
20================================== ===================== 20================================== ==========================
21Fuel 7.0, 8.0, 9.0 and 9.1 21Fuel 7.0, 8.0, 9.0, 9.1 and 9.2
22Zabbix plugin for Fuel 2.5.1 22Zabbix plugin for Fuel 2.5.2
23SNMP trap daemon for Zabbix plugin 1.1.0 23SNMP trap daemon for Zabbix plugin 1.1.1
24================================== ===================== 24================================== ==========================
25 25
diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst
index 36dbb44..25a5eed 100644
--- a/doc/plugin-guide/source/installation.rst
+++ b/doc/plugin-guide/source/installation.rst
@@ -26,11 +26,11 @@ follow these 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_extreme_networks-1.1-1.1.0-1.noarch.rpm \ 33 # scp zabbix_monitoring_extreme_networks-1.1-1.1.1-1.noarch.rpm \
34 root@<Fuel_Master_IP>:/tmp 34 root@<Fuel_Master_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 @@ follow these 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_extreme_networks-1.1-1.1.0-1.noarch.rpm 45 zabbix_monitoring_extreme_networks-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_extreme_networks | 1.1.0 | 3.0.0 54 3 | zabbix_monitoring_extreme_networks | 1.1.1 | 3.0.0
55 55
56Extreme Networks hardware monitoring extension removal 56Extreme Networks hardware monitoring extension removal
57====================================================== 57======================================================
@@ -63,7 +63,7 @@ follow these steps:
63 63
64#. Uninstall the plugin:: 64#. Uninstall the plugin::
65 65
66 # fuel plugins --remove zabbix_monitoring_extreme_networks==1.1.0 66 # fuel plugins --remove zabbix_monitoring_extreme_networks==1.1.1
67 67
68#. Check if the plugin was uninstalled successfully:: 68#. Check if the plugin was uninstalled successfully::
69 69
diff --git a/doc/plugin-guide/source/revisionhistory.rst b/doc/plugin-guide/source/revisionhistory.rst
index 9fda19d..8bbb862 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 02.17.2016 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 849e80c..12c9646 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 Extreme Networks hardware monitoring extension specification' 51project = u'The Zabbix plugin for Fuel Extreme Networks 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 90cce21..e061077 100644
--- a/doc/specs/source/index.rst
+++ b/doc/specs/source/index.rst
@@ -119,9 +119,9 @@ Work Items
119Dependencies 119Dependencies
120============ 120============
121 121
122* Fuel 7.0, 8.0, 9.0 and 9.1 122* Fuel 7.0, 8.0, 9.0, 9.1 and 9.2
123* Zabbix plugin for Fuel 2.5.1 123* Zabbix plugin for Fuel 2.5.2
124* SNMP trap daemon for Zabbix plugin 1.1.0 124* SNMP trap daemon for Zabbix plugin 1.1.1
125 125
126Testing 126Testing
127======= 127=======
diff --git a/metadata.yaml b/metadata.yaml
index a4416ed..def9e34 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,7 +2,7 @@
2name: zabbix_monitoring_extreme_networks 2name: zabbix_monitoring_extreme_networks
3title: Extreme Networks hardware monitoring extension for Zabbix plugin 3title: Extreme Networks 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 Extreme Networks hardware monitoring to Zabbix plugin 7description: Adds Extreme Networks hardware monitoring to Zabbix plugin
8# Required fuel version 8# Required fuel version