From deb43ab2dfffde477c8857d9d1b5780f77be86dc Mon Sep 17 00:00:00 2001 From: Olivier Bourdon Date: Wed, 20 Jul 2016 10:21:32 +0200 Subject: [PATCH] Roll back version from 2.6.0 to 2.5.1 Change-Id: Ie3209b0fe566d26fd122bc24c61b2c1e2b0b0075 --- README.md | 6 +-- doc/plugin-guide/source/description.rst | 2 +- doc/plugin-guide/source/installation.rst | 69 ++++++++++++++++++------ doc/specs/source/index.rst | 2 +- 4 files changed, 58 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 66fd852..d44ab03 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Requirements | Requirement | Version/Comment | |:-----------------------------------|:----------------| | Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 | -| Zabbix plugin for Fuel | 2.6.0 | +| Zabbix plugin for Fuel | 2.5.1 | | SNMP trap daemon for Zabbix plugin | 1.1.0 | Installation Guide @@ -41,7 +41,7 @@ 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.6-2.6.0-1.noarch.rpm \ + # scp zabbix_monitoring_emc-2.5-2.5.1-1.noarch.rpm \ root@:/tmp 5. Install the plugin: @@ -54,7 +54,7 @@ follow these steps: # fuel plugins id | name | version | package_version ---|-----------------------|---------|---------------- - 1 | zabbix_monitoring | 2.6.0 | 3.0.0 + 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 diff --git a/doc/plugin-guide/source/description.rst b/doc/plugin-guide/source/description.rst index 89cce0e..43000b4 100644 --- a/doc/plugin-guide/source/description.rst +++ b/doc/plugin-guide/source/description.rst @@ -18,7 +18,7 @@ Requirements Requirement Version/Comment ================================== ================ Fuel 7.0, 8.0 and 9.0 -Zabbix plugin for Fuel 2.6.0 +Zabbix plugin for Fuel 2.5.1 SNMP trap daemon for Zabbix plugin 1.1.0 ================================== ================ diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst index 841ae7a..3cb3903 100644 --- a/doc/plugin-guide/source/installation.rst +++ b/doc/plugin-guide/source/installation.rst @@ -8,33 +8,70 @@ Installing EMC hardware monitoring extension To install EMC hardware monitoring extension for Zabbix plugin, follow these steps: -1. Download and install the Zabbix plugin for Fuel from the - `Fuel Plugins Catalog `_. -2. Download and install the SNMP trap daemon for Zabbix plugin from the - `Fuel Plugins Catalog `_. -3. Download the EMC hardware monitoring extension for Zabbix plugin from the - `Fuel Plugins Catalog `_. -4. Copy the plugin on already installed Fuel Master node, ssh can be used for - that. If you do not have the Fuel Master node yet, see `Quick Start Guide - `_:: +.. highlight:: none +#. Download and install the Zabbix plugin for Fuel from the + `Fuel Plugins Catalog `_. + +#. Download and install the SNMP trap daemon for Zabbix plugin from the + `Fuel Plugins Catalog `_. + +#. Download the EMC hardware monitoring extension for Zabbix plugin from the + `Fuel Plugins Catalog `_. + +#. Copy all three plugins from your local machine to a previously deployed + 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 \ + root@:/tmp + # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm \ + root@:/tmp # scp zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm \ root@:/tmp -5. Log into the Fuel Master node. Install the plugin:: +#. Log into the Fuel Master node. Install each of the three plugins using + the following commands:: # cd /tmp - # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm + # fuel plugins --install \ + zabbix_monitoring-2.5-2.5.1-1.noarch.rpm + # fuel plugins --install \ + zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm + # fuel plugins --install \ + zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm -6. Check if the plugin was installed successfully:: +#. Make sure the plugins were installed correctly:: # fuel plugins id | name | version | package_version ---|---------------------------|----------|---------------- - 1 | zabbix_monitoring | 2.6.0 | 3.0.0 + 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 +| + +EMC hardware monitoring extension removal +========================================= + +To uninstall EMC hardware monitoring extension for Zabbix plugin, +follow these steps: + +#. Delete all environments in which EMC hardware monitoring extension for Zabbix plugin has been enabled. + +#. Uninstall the plugin:: + + # fuel plugins --remove zabbix_monitoring_emc==1.1.0 + +#. Check if the plugin was uninstalled successfully:: + + # fuel plugins + id | name | version | package_version + ---|---------------------------|----------|---------------- + ... + You can still have other plugins listed here but not zabbix_monitoring_emc + diff --git a/doc/specs/source/index.rst b/doc/specs/source/index.rst index 213a91d..0c54f56 100644 --- a/doc/specs/source/index.rst +++ b/doc/specs/source/index.rst @@ -118,7 +118,7 @@ Dependencies ============ * Fuel 7.0, 8.0 and 9.0 -* Zabbix plugin for Fuel 2.6.0 +* Zabbix plugin for Fuel 2.5.1 * SNMP trap daemon for Zabbix plugin 1.1.0 Testing