diff --git a/README.md b/README.md index 2773733..6f86fd1 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,11 @@ appropriate items and triggers and by creating Hosts for each EMC VNX array. Requirements ------------ -| Requirement | Version/Comment | -|:-----------------------------------|:-------------------| -| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1 | -| Zabbix plugin for Fuel | 2.5.1 | -| SNMP trap daemon for Zabbix plugin | 1.1.0 | +| 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 | Installation Guide ================== @@ -41,22 +41,22 @@ 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_emc-2.5-2.5.1-1.noarch.rpm \ + # scp zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm \ root@:/tmp 5. Install the plugin: # cd /tmp - # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm + # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm 6. 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 - 3 | zabbix_monitoring_emc | 1.1.0 | 3.0.0 + 1 | zabbix_monitoring | 2.5.2 | 3.0.0 + 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0 + 3 | zabbix_monitoring_emc | 1.1.1 | 3.0.0 For more information and instructions, see the EMC 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 7393b6a..d3c77c7 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 6fe7f6a..f6a0857 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 plugin for Fuel EMC hardware monitoring extension' -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 763f9f6..bab40b6 100644 --- a/doc/plugin-guide/source/description.rst +++ b/doc/plugin-guide/source/description.rst @@ -14,11 +14,11 @@ items and triggers and by creating Hosts for each EMC VNX array. Requirements ============ -================================== ===================== +================================== ========================== Requirement Version/Comment -================================== ===================== -Fuel 7.0, 8.0, 9.0 and 9.1 -Zabbix plugin for Fuel 2.5.1 -SNMP trap daemon for Zabbix plugin 1.1.0 -================================== ===================== +================================== ========================== +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 +================================== ========================== diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst index 3cb3903..61f6caa 100644 --- a/doc/plugin-guide/source/installation.rst +++ b/doc/plugin-guide/source/installation.rst @@ -26,11 +26,11 @@ 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.1-1.noarch.rpm \ + # scp zabbix_monitoring-2.5-2.5.2-1.noarch.rpm \ root@:/tmp - # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm \ + # scp zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm \ root@:/tmp - # scp zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm \ + # scp zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm \ root@:/tmp #. Log into the Fuel Master node. Install each of the three plugins using @@ -38,20 +38,20 @@ steps: # cd /tmp # fuel plugins --install \ - zabbix_monitoring-2.5-2.5.1-1.noarch.rpm + zabbix_monitoring-2.5-2.5.2-1.noarch.rpm # fuel plugins --install \ - zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm + zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm # fuel plugins --install \ - zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm + zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm #. Make sure the plugins were installed correctly:: # 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 - 3 | zabbix_monitoring_emc | 1.1.0 | 3.0.0 + 1 | zabbix_monitoring | 2.5.2 | 3.0.0 + 2 | zabbix_snmptrapd | 1.1.1 | 3.0.0 + 3 | zabbix_monitoring_emc | 1.1.1 | 3.0.0 | @@ -65,7 +65,7 @@ follow these steps: #. Uninstall the plugin:: - # fuel plugins --remove zabbix_monitoring_emc==1.1.0 + # fuel plugins --remove zabbix_monitoring_emc==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 0dd0b1b..eb5480a 100644 --- a/doc/plugin-guide/source/revisionhistory.rst +++ b/doc/plugin-guide/source/revisionhistory.rst @@ -29,5 +29,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 01.17.2017 Olivier Bourdon Added MOS 9.2 support + (obourdon@mirantis.com) ======= ============= ============================ ===================== 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 On the Fuel master node, use the primary controller node (here node-3):: - # ssh -q node-3 ip netns exec haproxy ifconfig b_zbx_vip_mgmt | \ + # ssh -q node-3 ip netns exec zabbix ifconfig b_zbx_vip_mgmt | \ grep 'inet addr:' | sed -e 's/[^:]*://' -e 's/ .*//' 192.168.0.3 diff --git a/doc/specs/source/conf.py b/doc/specs/source/conf.py index 15f2433..8618c30 100644 --- a/doc/specs/source/conf.py +++ b/doc/specs/source/conf.py @@ -49,7 +49,7 @@ master_doc = 'index' # General information about the project. project = u'The Zabbix plugin for Fuel EMC hardware monitoring extension specification' -copyright = u'2016, Mirantis' +copyright = u'2017, Mirantis' author = u'Mirantis' # The version info for the project you're documenting, acts as replacement for @@ -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.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 0258f84..b385617 100644 --- a/doc/specs/source/index.rst +++ b/doc/specs/source/index.rst @@ -117,9 +117,9 @@ Work Items Dependencies ============ -* Fuel 7.0, 8.0, 9.0 and 9.1 -* Zabbix plugin for Fuel 2.5.1 -* SNMP trap daemon for Zabbix plugin 1.1.0 +* 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 Testing ======= diff --git a/metadata.yaml b/metadata.yaml index 12c71a1..1fa3ccd 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -2,7 +2,7 @@ name: zabbix_monitoring_emc title: EMC hardware monitoring extension for Zabbix plugin # Plugin version -version: 1.1.0 +version: 1.1.1 # Description description: Adds EMC hardware monitoring to Zabbix plugin # Required fuel version