summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2016-07-20 10:21:32 +0200
committerOlivier Bourdon <obourdon@mirantis.com>2016-07-20 11:13:29 +0200
commitdeb43ab2dfffde477c8857d9d1b5780f77be86dc (patch)
tree63430f6b68c2c81cb538daf46c67eb3a0bb2b0fd
parentccc72e665ebb25467a8f6d96d9aa8fda3952cc4f (diff)
Roll back version from 2.6.0 to 2.5.1
Notes
Notes (review): Code-Review+2: Swann Croiset <scroiset@mirantis.com> Code-Review+2: Olivier Bourdon <obourdon@mirantis.com> Workflow+1: Olivier Bourdon <obourdon@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 26 Jul 2016 14:50:49 +0000 Reviewed-on: https://review.openstack.org/344638 Project: openstack/fuel-plugin-zabbix-monitoring-emc Branch: refs/heads/master
-rw-r--r--README.md6
-rw-r--r--doc/plugin-guide/source/description.rst2
-rw-r--r--doc/plugin-guide/source/installation.rst57
-rw-r--r--doc/specs/source/index.rst2
4 files changed, 52 insertions, 15 deletions
diff --git a/README.md b/README.md
index 66fd852..d44ab03 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Requirements
16| Requirement | Version/Comment | 16| Requirement | Version/Comment |
17|:-----------------------------------|:----------------| 17|:-----------------------------------|:----------------|
18| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 | 18| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 |
19| Zabbix plugin for Fuel | 2.6.0 | 19| Zabbix plugin for Fuel | 2.5.1 |
20| SNMP trap daemon for Zabbix plugin | 1.1.0 | 20| SNMP trap daemon for Zabbix plugin | 1.1.0 |
21 21
22Installation Guide 22Installation Guide
@@ -41,7 +41,7 @@ follow these steps:
41 that. If you do not have the Fuel Master node yet, see 41 that. If you do not have the Fuel Master node yet, see
42 [Quick Start Guide](https://software.mirantis.com/quick-start/) : 42 [Quick Start Guide](https://software.mirantis.com/quick-start/) :
43 43
44 # scp zabbix_monitoring_emc-2.6-2.6.0-1.noarch.rpm \ 44 # scp zabbix_monitoring_emc-2.5-2.5.1-1.noarch.rpm \
45 root@<Fuel_Master_ip>:/tmp 45 root@<Fuel_Master_ip>:/tmp
46 46
475. Install the plugin: 475. Install the plugin:
@@ -54,7 +54,7 @@ follow these steps:
54 # fuel plugins 54 # fuel plugins
55 id | name | version | package_version 55 id | name | version | package_version
56 ---|-----------------------|---------|---------------- 56 ---|-----------------------|---------|----------------
57 1 | zabbix_monitoring | 2.6.0 | 3.0.0 57 1 | zabbix_monitoring | 2.5.1 | 3.0.0
58 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0 58 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0
59 3 | zabbix_monitoring_emc | 1.1.0 | 3.0.0 59 3 | zabbix_monitoring_emc | 1.1.0 | 3.0.0
60 60
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
18Requirement Version/Comment 18Requirement Version/Comment
19================================== ================ 19================================== ================
20Fuel 7.0, 8.0 and 9.0 20Fuel 7.0, 8.0 and 9.0
21Zabbix plugin for Fuel 2.6.0 21Zabbix plugin for Fuel 2.5.1
22SNMP trap daemon for Zabbix plugin 1.1.0 22SNMP trap daemon for Zabbix plugin 1.1.0
23================================== ================ 23================================== ================
24 24
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
8To install EMC hardware monitoring extension for Zabbix plugin, follow these 8To install EMC hardware monitoring extension for Zabbix plugin, follow these
9steps: 9steps:
10 10
111. Download and install the Zabbix plugin for Fuel from the 11.. highlight:: none
12
13#. Download and install the Zabbix plugin for Fuel from the
12 `Fuel Plugins Catalog <https://www.mirantis.com/products/ 14 `Fuel Plugins Catalog <https://www.mirantis.com/products/
13 openstack-drivers-and-plugins/fuel-plugins/>`_. 15 openstack-drivers-and-plugins/fuel-plugins/>`_.
142. Download and install the SNMP trap daemon for Zabbix plugin from the 16
17#. Download and install the SNMP trap daemon for Zabbix plugin from the
15 `Fuel Plugins Catalog <https://www.mirantis.com/products/ 18 `Fuel Plugins Catalog <https://www.mirantis.com/products/
16 openstack-drivers-and-plugins/fuel-plugins/>`_. 19 openstack-drivers-and-plugins/fuel-plugins/>`_.
173. Download the EMC hardware monitoring extension for Zabbix plugin from the 20
21#. Download the EMC hardware monitoring extension for Zabbix plugin from the
18 `Fuel Plugins Catalog <https://www.mirantis.com/products/ 22 `Fuel Plugins Catalog <https://www.mirantis.com/products/
19 openstack-drivers-and-plugins/fuel-plugins/>`_. 23 openstack-drivers-and-plugins/fuel-plugins/>`_.
204. Copy the plugin on already installed Fuel Master node, ssh can be used for
21 that. If you do not have the Fuel Master node yet, see `Quick Start Guide
22 <https://software.mirantis.com/quick-start/>`_::
23 24
25#. Copy all three plugins from your local machine to a previously deployed
26 Fuel Master node using ssh. If you do not have the Fuel Master node yet,
27 see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_::
28
29 # scp zabbix_monitoring-2.5-2.5.1-1.noarch.rpm \
30 root@<Fuel_Master_IP>:/tmp
31 # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm \
32 root@<Fuel_Master_IP>:/tmp
24 # scp zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm \ 33 # scp zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm \
25 root@<The_Fuel_Master_node_IP>:/tmp 34 root@<The_Fuel_Master_node_IP>:/tmp
26 35
275. Log into the Fuel Master node. Install the plugin:: 36#. Log into the Fuel Master node. Install each of the three plugins using
37 the following commands::
28 38
29 # cd /tmp 39 # cd /tmp
30 # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm 40 # fuel plugins --install \
41 zabbix_monitoring-2.5-2.5.1-1.noarch.rpm
42 # fuel plugins --install \
43 zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm
44 # fuel plugins --install \
45 zabbix_monitoring_emc-1.1-1.1.0-1.noarch.rpm
31 46
326. Check if the plugin was installed successfully:: 47#. Make sure the plugins were installed correctly::
33 48
34 # fuel plugins 49 # fuel plugins
35 id | name | version | package_version 50 id | name | version | package_version
36 ---|---------------------------|----------|---------------- 51 ---|---------------------------|----------|----------------
37 1 | zabbix_monitoring | 2.6.0 | 3.0.0 52 1 | zabbix_monitoring | 2.5.1 | 3.0.0
38 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0 53 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0
39 3 | zabbix_monitoring_emc | 1.1.0 | 3.0.0 54 3 | zabbix_monitoring_emc | 1.1.0 | 3.0.0
40 55
56|
57
58EMC hardware monitoring extension removal
59=========================================
60
61To uninstall EMC hardware monitoring extension for Zabbix plugin,
62follow these steps:
63
64#. Delete all environments in which EMC hardware monitoring extension for Zabbix plugin has been enabled.
65
66#. Uninstall the plugin::
67
68 # fuel plugins --remove zabbix_monitoring_emc==1.1.0
69
70#. Check if the plugin was uninstalled successfully::
71
72 # fuel plugins
73 id | name | version | package_version
74 ---|---------------------------|----------|----------------
75 ...
76 You can still have other plugins listed here but not zabbix_monitoring_emc
77
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
118============ 118============
119 119
120* Fuel 7.0, 8.0 and 9.0 120* Fuel 7.0, 8.0 and 9.0
121* Zabbix plugin for Fuel 2.6.0 121* Zabbix plugin for Fuel 2.5.1
122* SNMP trap daemon for Zabbix plugin 1.1.0 122* SNMP trap daemon for Zabbix plugin 1.1.0
123 123
124Testing 124Testing