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. Requirements ------------ -| Requirement | Version/Comment | -|:-----------------------------------|:---------------------------| -| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1 and 9.2 | -| Zabbix plugin for Fuel | 2.5.2 | -| SNMP trap daemon for Zabbix plugin | 1.1.1 | +| Requirement | Version/Comment | +|:-----------------------------------|:---------------------------------| +| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0 | +| Zabbix plugin for Fuel | 2.5.3 | +| SNMP trap daemon for Zabbix plugin | 1.1.2 | Installation Guide ================== @@ -42,23 +42,23 @@ follow these steps: that. If you do not have the Fuel Master node yet, see [Quick Start Guide](https://software.mirantis.com/quick-start/) : - # scp zabbix_monitoring_extreme_networks-1.1-1.1.1-1.noarch.rpm \ + # scp zabbix_monitoring_extreme_networks-1.1-1.1.2-1.noarch.rpm \ root@:/tmp 5. Install the plugin: # cd /tmp # fuel plugins --install \ - zabbix_monitoring_extreme_networks-1.1-1.1.1-1.noarch.rpm + zabbix_monitoring_extreme_networks-1.1-1.1.2-1.noarch.rpm 6. Check if the plugin was installed successfully: # fuel plugins id | name | version | package_version ---|------------------------------------|---------|---------------- - 1 | zabbix_monitoring | 2.5.2 | 3.0.0 - 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0 - 3 | zabbix_monitoring_extreme_networks | 1.1.1 | 3.0.0 + 1 | zabbix_monitoring | 2.5.3 | 3.0.0 + 2 | zabbix_snmptrapd | 1.1.2 | 3.0.0 + 3 | zabbix_monitoring_extreme_networks | 1.1.2 | 3.0.0 For more information and instructions, see the Extreme Networks hardware monitoring 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 @@ Release notes / Changelog ========================= +**1.1.2** + +* Compatibility with MOS 10.0 + **1.1.1** * 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.' # The short X.Y version. version = '1.1' # The full version, including alpha/beta/rc tags. -release = '1.1-1.1.1-1' +release = '1.1-1.1.2-1' # The language for content autogenerated by Sphinx. Refer to documentation # 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. Requirements ============ -================================== ========================== +================================== ================================ Requirement Version/Comment -================================== ========================== -Fuel 7.0, 8.0, 9.0, 9.1 and 9.2 -Zabbix plugin for Fuel 2.5.2 -SNMP trap daemon for Zabbix plugin 1.1.1 -================================== ========================== +================================== ================================ +Fuel 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0 +Zabbix plugin for Fuel 2.5.3 +SNMP trap daemon for Zabbix plugin 1.1.2 +================================== ================================ 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: Fuel Master node using ssh. If you do not have the Fuel Master node yet, see `Quick Start Guide `_:: - # scp zabbix_monitoring-2.5-2.5.2-1.noarch.rpm \ + # scp zabbix_monitoring-2.5-2.5.3-1.noarch.rpm \ root@:/tmp - # scp zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm \ + # scp zabbix_snmptrapd-1.1-1.1.2-1.noarch.rpm \ root@:/tmp - # scp zabbix_monitoring_extreme_networks-1.1-1.1.1-1.noarch.rpm \ + # scp zabbix_monitoring_extreme_networks-1.1-1.1.2-1.noarch.rpm \ root@:/tmp #. Log into the Fuel Master node. Install each of the three plugins using @@ -38,20 +38,20 @@ follow these steps: # cd /tmp # fuel plugins --install \ - zabbix_monitoring-2.5-2.5.2-1.noarch.rpm + zabbix_monitoring-2.5-2.5.3-1.noarch.rpm # fuel plugins --install \ - zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm + zabbix_snmptrapd-1.1-1.1.2-1.noarch.rpm # fuel plugins --install \ - zabbix_monitoring_extreme_networks-1.1-1.1.1-1.noarch.rpm + zabbix_monitoring_extreme_networks-1.1-1.1.2-1.noarch.rpm #. Make sure the plugins were installed correctly:: # fuel plugins id | name | version | package_version ---|------------------------------------|----------|---------------- - 1 | zabbix_monitoring | 2.5.2 | 3.0.0 - 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0 - 3 | zabbix_monitoring_extreme_networks | 1.1.1 | 3.0.0 + 1 | zabbix_monitoring | 2.5.3 | 3.0.0 + 2 | zabbix_snmptrapd | 1.1.2 | 3.0.0 + 3 | zabbix_monitoring_extreme_networks | 1.1.2 | 3.0.0 Extreme Networks hardware monitoring extension removal ====================================================== @@ -63,7 +63,7 @@ follow these steps: #. Uninstall the plugin:: - # fuel plugins --remove zabbix_monitoring_extreme_networks==1.1.1 + # fuel plugins --remove zabbix_monitoring_extreme_networks==1.1.2 #. Check if the plugin was uninstalled successfully:: 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 @@ Revision history ================ -======= ============= ============================ ===================== +======= ============= ============================ ====================== Version Revision date Editor Comment -======= ============= ============================ ===================== +======= ============= ============================ ====================== 0.1 06.22.2015 Piotr Misiak First release (pmisiak@mirantis.com) -------- ------------- ---------------------------- --------------------- +------- ------------- ---------------------------- ---------------------- 0.2 08.13.2015 Piotr Misiak Updated release (pmisiak@mirantis.com) -------- ------------- ---------------------------- --------------------- +------- ------------- ---------------------------- ---------------------- 0.3 09.02.2015 Marciej Relewicz Updated for fix (mrelewicz@mirantis.com) -------- ------------- ---------------------------- --------------------- +------- ------------- ---------------------------- ---------------------- 0.4 09.15.2015 Marciej Relewicz Updated documentation (mrelewicz@mirantis.com) -------- ------------- ---------------------------- --------------------- +------- ------------- ---------------------------- ---------------------- 1.0.0 11.20.2015 Swann Croiset New Major version (scroiset@mirantis.com) -------- ------------- ---------------------------- --------------------- +------- ------------- ---------------------------- ---------------------- 1.0.1 03.14.2016 Olivier Bourdon Added MOS 8.0 support (obourdon@mirantis.com) Doc fixes -------- ------------- ---------------------------- --------------------- +------- ------------- ---------------------------- ---------------------- 1.1.0 05.11.2016 Olivier Bourdon Added MOS 9.0 support (obourdon@mirantis.com) -------- ------------- ---------------------------- --------------------- +------- ------------- ---------------------------- ---------------------- 1.1.0 10.19.2016 Olivier Bourdon Added MOS 9.1 support (obourdon@mirantis.com) -------- ------------- ---------------------------- --------------------- +------- ------------- ---------------------------- ---------------------- 1.1.1 02.17.2016 Olivier Bourdon Added MOS 9.2 support (obourdon@mirantis.com) -======= ============= ============================ ===================== +------- ------------- ---------------------------- ---------------------- +1.1.2 02.20.2016 Olivier Bourdon Added MOS 10.0 support + (obourdon@mirantis.com) +======= ============= ============================ ====================== 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' # The short X.Y version. version = '1.1' # The full version, including alpha/beta/rc tags. -release = '1.1-1.1.1-1' +release = '1.1-1.1.2-1' # The language for content autogenerated by Sphinx. Refer to documentation # 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 Dependencies ============ -* Fuel 7.0, 8.0, 9.0, 9.1 and 9.2 -* Zabbix plugin for Fuel 2.5.2 -* SNMP trap daemon for Zabbix plugin 1.1.1 +* Fuel 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0 +* Zabbix plugin for Fuel 2.5.3 +* SNMP trap daemon for Zabbix plugin 1.1.2 Testing ======= diff --git a/metadata.yaml b/metadata.yaml index def9e34..ca02bd6 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -2,11 +2,11 @@ name: zabbix_monitoring_extreme_networks title: Extreme Networks hardware monitoring extension for Zabbix plugin # Plugin version -version: 1.1.1 +version: 1.1.2 # Description description: Adds Extreme Networks hardware monitoring to Zabbix plugin # Required fuel version -fuel_version: ['7.0', '8.0', '9.0'] +fuel_version: ['7.0', '8.0', '9.0', '10.0'] # Groups groups: ['monitoring'] # Licenses @@ -38,6 +38,11 @@ releases: mode: ['ha'] deployment_scripts_path: deployment_scripts/ repository_path: repositories/ubuntu + - os: ubuntu + version: newton-10.0 + mode: ['ha'] + deployment_scripts_path: deployment_scripts/ + repository_path: repositories/ubuntu # Version of plugin package package_version: '3.0.0'