diff --git a/README.md b/README.md index 282eccb..844a03f 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ It is a base for additional plugins which adds specific SNMP traps monitoring. Requirements ------------ -| Requirement | Version/Comment | -|:---------------------------------|:-------------------| -| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1 | -| Zabbix plugin for Fuel | 2.5.1 | +| Requirement | Version/Comment | +|:---------------------------------|:----------------------------| +| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1, and 9.2 | +| Zabbix plugin for Fuel | 2.5.2 | Installation Guide ================== @@ -36,20 +36,20 @@ To install SNMP trap daemon plugin, 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_snmptrapd-1.1-1.1.0-1.noarch.rpm root@:/tmp + # scp zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm root@:/tmp 4. Install the plugin: # cd /tmp - # fuel plugins --install zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm + # fuel plugins --install zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm 5. Check if the plugin was installed successfully: # fuel plugins id | name | version | package_version ---|-------------------|---------|---------------- - 1 | zabbix_monitoring | 2.5.1 | 3.0.0 - 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0 + 1 | zabbix_monitoring | 2.5.2 | 3.0.0 + 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0 For more information and instructions, see the SNMP trap daemon plugin Guide in the [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 185582a..a1df545 100644 --- a/doc/plugin-guide/source/changelog.rst +++ b/doc/plugin-guide/source/changelog.rst @@ -1,6 +1,10 @@ Release notes / Changelog ========================= +**1.1.1** + +* Compatibility with MOS 9.2 + **1.1.0** * 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 69c4b1a..0e9f451 100644 --- a/doc/plugin-guide/source/conf.py +++ b/doc/plugin-guide/source/conf.py @@ -46,7 +46,7 @@ master_doc = 'index' # General information about the project. project = u'The Zabbix SNMP Trap Daemon plugin for Fuel' -copyright = u'2016, Mirantis Inc.' +copyright = u'2017, Mirantis Inc.' author = u'Mirantis Inc.' # The version info for the project you're documenting, acts as replacement for @@ -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.0-1' +release = '1.1-1.1.1-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 dba9f5d..19c04e5 100644 --- a/doc/plugin-guide/source/description.rst +++ b/doc/plugin-guide/source/description.rst @@ -17,10 +17,10 @@ additional plugins to add monitoring of SNMP traps specific for their hardware. Requirements ============ -====================== ===================== +====================== ========================== Requirement Version/Comment -====================== ===================== -Fuel 7.0, 8.0, 9.0 and 9.1 -Zabbix plugin for Fuel 2.5.1 -====================== ===================== +====================== ========================== +Fuel 7.0, 8.0, 9.0, 9.1 and 9.2 +Zabbix plugin for Fuel 2.5.2 +====================== ========================== diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst index 25bdf13..ccb02c3 100644 --- a/doc/plugin-guide/source/installation.rst +++ b/doc/plugin-guide/source/installation.rst @@ -21,20 +21,20 @@ To install SNMP trap daemon for Zabbix plugin, follow these steps: Fuel Master node using ssh. If you do not have the Fuel Master node yet, see `Quick Start Guide `_:: - # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm root@:/tmp + # scp zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm root@:/tmp #. Log into the Fuel Master node. Install the plugin:: # cd /tmp - # fuel plugins --install zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm + # fuel plugins --install zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm #. Check if the plugin was installed successfully:: # fuel plugins id | name | version | package_version ---|---------------------------|----------|---------------- - 1 | zabbix_monitoring | 2.5.1 | 3.0.0 - 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0 + 1 | zabbix_monitoring | 2.5.2 | 3.0.0 + 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0 SNMP trap daemon for Zabbix plugin removal ========================================== @@ -45,7 +45,7 @@ To uninstall SNMP Trap Daemon for Zabbix plugin, follow these steps: #. Uninstall the plugin:: - # fuel plugins --remove zabbix_snmptrapd==1.1.0 + # fuel plugins --remove zabbix_snmptrapd==1.1.1 #. Check if the plugin was uninstalled successfully:: diff --git a/doc/plugin-guide/source/revisionhistory.rst b/doc/plugin-guide/source/revisionhistory.rst index fd14a47..f49e96e 100644 --- a/doc/plugin-guide/source/revisionhistory.rst +++ b/doc/plugin-guide/source/revisionhistory.rst @@ -26,5 +26,8 @@ Version Revision date Editor Comment ------- ------------- ---------------------------- --------------------- 1.1.0 10.19.2016 Olivier Bourdon Added MOS 9.1 support (obourdon@mirantis.com) +------- ------------- ---------------------------- --------------------- +1.1.1 02.17.2017 Olivier Bourdon Added MOS 9.2 support + (obourdon@mirantis.com) ======= ============= ============================ ===================== diff --git a/doc/qa/source/conf.py b/doc/qa/source/conf.py index c7d9cde..eb7247a 100644 --- a/doc/qa/source/conf.py +++ b/doc/qa/source/conf.py @@ -46,7 +46,7 @@ master_doc = 'index' # General information about the project. project = u'The Zabbix SNMP Trapd plugin for Fuel Test Plan' -copyright = u'2016, Mirantis Inc.' +copyright = u'2017, Mirantis Inc.' author = u'Mirantis Inc.' # The version info for the project you're documenting, acts as replacement for @@ -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.0-1' +release = '1.1-1.1.1-1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/specs/source/conf.py b/doc/specs/source/conf.py index 6a666d3..e130894 100644 --- a/doc/specs/source/conf.py +++ b/doc/specs/source/conf.py @@ -46,7 +46,7 @@ master_doc = 'index' # General information about the project. project = u'The Zabbix SNMP Trapd plugin for Fuel Specification' -copyright = u'2016, Mirantis Inc.' +copyright = u'2017, Mirantis Inc.' author = u'Mirantis Inc.' # The version info for the project you're documenting, acts as replacement for @@ -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.0-1' +release = '1.1-1.1.1-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 79dd9be..2a911d9 100644 --- a/doc/specs/source/index.rst +++ b/doc/specs/source/index.rst @@ -118,8 +118,8 @@ Work Items Dependencies ============ -* Fuel 7.0, 8.0, 9.0 and 9.1 -* Zabbix plugin for Fuel 2.5.1 +* Fuel 7.0, 8.0, 9.0, 9.1 and 9.2 +* Zabbix plugin for Fuel 2.5.2 Testing ======= diff --git a/metadata.yaml b/metadata.yaml index 3958e8a..a9c1e6e 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -2,7 +2,7 @@ name: zabbix_snmptrapd title: SNMP trap daemon for Zabbix plugin # Plugin version -version: 1.1.0 +version: 1.1.1 # Description description: Gives ability to receive SNMP traps and pass them to Zabbix. # Required fuel version