diff --git a/README.md b/README.md index be0723c..a33eaa9 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Requirements | Requirement | Version/Comment | |:---------------------------------|:----------------| -| Mirantis OpenStack compatibility | 7.0, 8.0 | -| Zabbix plugin for Fuel | 2.5.0 | +| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 | +| Zabbix plugin for Fuel | 2.6.0 | 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.0-1.0.1-1.noarch.rpm root@:/tmp + # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm root@:/tmp 4. Install the plugin: # cd /tmp - # fuel plugins --install zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm + # fuel plugins --install zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm 5. Check if the plugin was installed successfully: # fuel plugins id | name | version | package_version ---|-------------------|---------|---------------- - 1 | zabbix_monitoring | 2.5.0 | 3.0.0 - 2 | zabbix_snmptrapd | 1.0.1 | 2.0.0 + 1 | zabbix_monitoring | 2.6.0 | 3.0.0 + 2 | zabbix_snmptrapd | 1.1.0 | 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 bbf2cb6..9eccb39 100644 --- a/doc/plugin-guide/source/changelog.rst +++ b/doc/plugin-guide/source/changelog.rst @@ -1,6 +1,9 @@ Release notes / Changelog ========================= +**1.1.0** +* Compatibility with MOS 9.0 + **1.0.1** * Compatibility with MOS 8.0 diff --git a/doc/plugin-guide/source/conf.py b/doc/plugin-guide/source/conf.py index 7f53c77..69c4b1a 100644 --- a/doc/plugin-guide/source/conf.py +++ b/doc/plugin-guide/source/conf.py @@ -54,9 +54,9 @@ author = u'Mirantis Inc.' # built documents. # # The short X.Y version. -version = '1.0' +version = '1.1' # The full version, including alpha/beta/rc tags. -release = '1.0-1.0.1-1' +release = '1.1-1.1.0-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 01de32c..a817f34 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 and 8.0 -Zabbix plugin for Fuel 2.5.0 -====================== =============== +====================== ================ +Fuel 7.0, 8.0 and 9.0 +Zabbix plugin for Fuel 2.6.0 +====================== ================ diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst index 7ae912c..7c18446 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: that. If you do not have the Fuel Master node yet, see `Quick Start Guide `_:: - # scp zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm root@:/tmp + # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm root@:/tmp #. Log into the Fuel Master node. Install the plugin:: # cd /tmp - # fuel plugins --install zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm + # fuel plugins --install zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm #. Check if the plugin was installed successfully:: # fuel plugins id | name | version | package_version ---|---------------------------|----------|---------------- - 1 | zabbix_monitoring | 2.5.0 | 3.0.0 - 2 | zabbix_snmptrapd | 1.0.1 | 3.0.0 + 1 | zabbix_monitoring | 2.6.0 | 3.0.0 + 2 | zabbix_snmptrapd | 1.1.0 | 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.0.1 + # fuel plugins --remove zabbix_snmptrapd==1.1.0 #. Check if the plugin was uninstalled successfully:: diff --git a/doc/plugin-guide/source/revisionhistory.rst b/doc/plugin-guide/source/revisionhistory.rst index 63658cf..cbca20a 100644 --- a/doc/plugin-guide/source/revisionhistory.rst +++ b/doc/plugin-guide/source/revisionhistory.rst @@ -20,5 +20,8 @@ Version Revision date Editor Comment 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) ======= ============= ============================ ===================== diff --git a/doc/qa/source/conf.py b/doc/qa/source/conf.py index bc58a0f..c7d9cde 100644 --- a/doc/qa/source/conf.py +++ b/doc/qa/source/conf.py @@ -54,9 +54,9 @@ author = u'Mirantis Inc.' # built documents. # # The short X.Y version. -version = '1.0' +version = '1.1' # The full version, including alpha/beta/rc tags. -release = '1.0-1.0.1-1' +release = '1.1-1.1.0-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 c5a5f32..6a666d3 100644 --- a/doc/specs/source/conf.py +++ b/doc/specs/source/conf.py @@ -54,9 +54,9 @@ author = u'Mirantis Inc.' # built documents. # # The short X.Y version. -version = '1.0' +version = '1.1' # The full version, including alpha/beta/rc tags. -release = '1.0-1.0.1-1' +release = '1.1-1.1.0-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 0c1bd09..078b663 100644 --- a/doc/specs/source/index.rst +++ b/doc/specs/source/index.rst @@ -118,8 +118,8 @@ Work Items Dependencies ============ -* Fuel 7.0 and 8.0 -* Zabbix plugin for Fuel 2.5.0 +* Fuel 7.0, 8.0 and 9.0 +* Zabbix plugin for Fuel 2.6.0 Testing ======= diff --git a/metadata.yaml b/metadata.yaml index 7369b79..3958e8a 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -2,11 +2,11 @@ name: zabbix_snmptrapd title: SNMP trap daemon for Zabbix plugin # Plugin version -version: 1.0.1 +version: 1.1.0 # Description description: Gives ability to receive SNMP traps and pass them to Zabbix. # Required fuel version -fuel_version: ['7.0', '8.0'] +fuel_version: ['7.0', '8.0', '9.0'] # Groups groups: ['monitoring'] # Licenses @@ -28,6 +28,16 @@ releases: mode: ['ha'] deployment_scripts_path: deployment_scripts/ repository_path: repositories/ubuntu + - os: ubuntu + version: liberty-9.0 + mode: ['ha'] + deployment_scripts_path: deployment_scripts/ + repository_path: repositories/ubuntu + - os: ubuntu + version: mitaka-9.0 + mode: ['ha'] + deployment_scripts_path: deployment_scripts/ + repository_path: repositories/ubuntu # Version of plugin package package_version: '3.0.0'