summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2016-12-22 10:02:12 +0100
committerOlivier Bourdon <obourdon@mirantis.com>2017-02-17 17:14:39 +0100
commit5583575ff29fff2577eb84faade3fd48d2b0d794 (patch)
treed0382f9739cc667fbed696b4d2d5791dcc23fbb8
parentca12eacc3253770019a137abdbb5e89523966967 (diff)
Add support for MOS 10.0HEAD1.1.2.rc11.1.2master
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: Thu, 23 Feb 2017 09:12:25 +0000 Reviewed-on: https://review.openstack.org/435997 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.py2
-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.rst25
-rw-r--r--doc/specs/source/conf.py2
-rw-r--r--doc/specs/source/index.rst6
-rw-r--r--metadata.yaml9
9 files changed, 56 insertions, 44 deletions
diff --git a/README.md b/README.md
index f4abac4..2906e93 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 and 9.2 | 19| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0 |
20| Zabbix plugin for Fuel | 2.5.2 | 20| Zabbix plugin for Fuel | 2.5.3 |
21| SNMP trap daemon for Zabbix plugin | 1.1.1 | 21| SNMP trap daemon for Zabbix plugin | 1.1.2 |
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.1-1.noarch.rpm \ 45 # scp zabbix_monitoring_extreme_networks-1.1-1.1.2-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.1-1.noarch.rpm 52 zabbix_monitoring_extreme_networks-1.1-1.1.2-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.2 | 3.0.0 59 1 | zabbix_monitoring | 2.5.3 | 3.0.0
60 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0 60 2 | zabbix_snmptrapd | 1.1.2 | 3.0.0
61 3 | zabbix_monitoring_extreme_networks | 1.1.1 | 3.0.0 61 3 | zabbix_monitoring_extreme_networks | 1.1.2 | 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 d3c77c7..16736c1 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.2**
5
6* Compatibility with MOS 10.0
7
4**1.1.1** 8**1.1.1**
5 9
6* Compatibility with MOS 9.2 10* Compatibility with MOS 9.2
diff --git a/doc/plugin-guide/source/conf.py b/doc/plugin-guide/source/conf.py
index 4d75610..5a78172 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 = '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.1-1' 59release = '1.1-1.1.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 aa92edb..0ec457c 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, 9.1 and 9.2 21Fuel 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0
22Zabbix plugin for Fuel 2.5.2 22Zabbix plugin for Fuel 2.5.3
23SNMP trap daemon for Zabbix plugin 1.1.1 23SNMP trap daemon for Zabbix plugin 1.1.2
24================================== ========================== 24================================== ================================
25 25
diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst
index 25a5eed..9d3995a 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.2-1.noarch.rpm \ 29 # scp zabbix_monitoring-2.5-2.5.3-1.noarch.rpm \
30 root@<Fuel_Master_IP>:/tmp 30 root@<Fuel_Master_IP>:/tmp
31 # scp zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm \ 31 # scp zabbix_snmptrapd-1.1-1.1.2-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.1-1.noarch.rpm \ 33 # scp zabbix_monitoring_extreme_networks-1.1-1.1.2-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.2-1.noarch.rpm 41 zabbix_monitoring-2.5-2.5.3-1.noarch.rpm
42 # fuel plugins --install \ 42 # fuel plugins --install \
43 zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm 43 zabbix_snmptrapd-1.1-1.1.2-1.noarch.rpm
44 # fuel plugins --install \ 44 # fuel plugins --install \
45 zabbix_monitoring_extreme_networks-1.1-1.1.1-1.noarch.rpm 45 zabbix_monitoring_extreme_networks-1.1-1.1.2-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.2 | 3.0.0 52 1 | zabbix_monitoring | 2.5.3 | 3.0.0
53 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0 53 2 | zabbix_snmptrapd | 1.1.2 | 3.0.0
54 3 | zabbix_monitoring_extreme_networks | 1.1.1 | 3.0.0 54 3 | zabbix_monitoring_extreme_networks | 1.1.2 | 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.1 66 # fuel plugins --remove zabbix_monitoring_extreme_networks==1.1.2
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 8bbb862..772c163 100644
--- a/doc/plugin-guide/source/revisionhistory.rst
+++ b/doc/plugin-guide/source/revisionhistory.rst
@@ -2,35 +2,38 @@
2Revision history 2Revision history
3================ 3================
4 4
5======= ============= ============================ ===================== 5======= ============= ============================ ======================
6Version Revision date Editor Comment 6Version Revision date Editor Comment
7======= ============= ============================ ===================== 7======= ============= ============================ ======================
80.1 06.22.2015 Piotr Misiak First release 80.1 06.22.2015 Piotr Misiak First release
9 (pmisiak@mirantis.com) 9 (pmisiak@mirantis.com)
10------- ------------- ---------------------------- --------------------- 10------- ------------- ---------------------------- ----------------------
110.2 08.13.2015 Piotr Misiak Updated release 110.2 08.13.2015 Piotr Misiak Updated release
12 (pmisiak@mirantis.com) 12 (pmisiak@mirantis.com)
13------- ------------- ---------------------------- --------------------- 13------- ------------- ---------------------------- ----------------------
140.3 09.02.2015 Marciej Relewicz Updated for fix 140.3 09.02.2015 Marciej Relewicz Updated for fix
15 (mrelewicz@mirantis.com) 15 (mrelewicz@mirantis.com)
16------- ------------- ---------------------------- --------------------- 16------- ------------- ---------------------------- ----------------------
170.4 09.15.2015 Marciej Relewicz Updated documentation 170.4 09.15.2015 Marciej Relewicz Updated documentation
18 (mrelewicz@mirantis.com) 18 (mrelewicz@mirantis.com)
19------- ------------- ---------------------------- --------------------- 19------- ------------- ---------------------------- ----------------------
201.0.0 11.20.2015 Swann Croiset New Major version 201.0.0 11.20.2015 Swann Croiset New Major version
21 (scroiset@mirantis.com) 21 (scroiset@mirantis.com)
22------- ------------- ---------------------------- --------------------- 22------- ------------- ---------------------------- ----------------------
231.0.1 03.14.2016 Olivier Bourdon Added MOS 8.0 support 231.0.1 03.14.2016 Olivier Bourdon Added MOS 8.0 support
24 (obourdon@mirantis.com) 24 (obourdon@mirantis.com)
25 Doc fixes 25 Doc fixes
26------- ------------- ---------------------------- --------------------- 26------- ------------- ---------------------------- ----------------------
271.1.0 05.11.2016 Olivier Bourdon Added MOS 9.0 support 271.1.0 05.11.2016 Olivier Bourdon Added MOS 9.0 support
28 (obourdon@mirantis.com) 28 (obourdon@mirantis.com)
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------- ------------- ---------------------------- --------------------- 32------- ------------- ---------------------------- ----------------------
331.1.1 02.17.2016 Olivier Bourdon Added MOS 9.2 support 331.1.1 02.17.2016 Olivier Bourdon Added MOS 9.2 support
34 (obourdon@mirantis.com) 34 (obourdon@mirantis.com)
35======= ============= ============================ ===================== 35------- ------------- ---------------------------- ----------------------
361.1.2 02.20.2016 Olivier Bourdon Added MOS 10.0 support
37 (obourdon@mirantis.com)
38======= ============= ============================ ======================
36 39
diff --git a/doc/specs/source/conf.py b/doc/specs/source/conf.py
index 12c9646..7dad09e 100644
--- a/doc/specs/source/conf.py
+++ b/doc/specs/source/conf.py
@@ -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.1-1' 62release = '1.1-1.1.2-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 e061077..e511372 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, 9.1 and 9.2 122* Fuel 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0
123* Zabbix plugin for Fuel 2.5.2 123* Zabbix plugin for Fuel 2.5.3
124* SNMP trap daemon for Zabbix plugin 1.1.1 124* SNMP trap daemon for Zabbix plugin 1.1.2
125 125
126Testing 126Testing
127======= 127=======
diff --git a/metadata.yaml b/metadata.yaml
index def9e34..ca02bd6 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,11 +2,11 @@
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.1 5version: 1.1.2
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
9fuel_version: ['7.0', '8.0', '9.0'] 9fuel_version: ['7.0', '8.0', '9.0', '10.0']
10# Groups 10# Groups
11groups: ['monitoring'] 11groups: ['monitoring']
12# Licenses 12# Licenses
@@ -38,6 +38,11 @@ releases:
38 mode: ['ha'] 38 mode: ['ha']
39 deployment_scripts_path: deployment_scripts/ 39 deployment_scripts_path: deployment_scripts/
40 repository_path: repositories/ubuntu 40 repository_path: repositories/ubuntu
41 - os: ubuntu
42 version: newton-10.0
43 mode: ['ha']
44 deployment_scripts_path: deployment_scripts/
45 repository_path: repositories/ubuntu
41 46
42# Version of plugin package 47# Version of plugin package
43package_version: '3.0.0' 48package_version: '3.0.0'