summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-15 11:19:19 +0000
committerGerrit Code Review <review@openstack.org>2016-03-15 11:19:19 +0000
commit86860750388561bc1e8bdf087eea697b40620af6 (patch)
tree6498a194a9077b9f3a92a49dd98d49bbb7f56a00
parent10b4b6bf7dfa5075638ae17470dbdcca4e28cce4 (diff)
parentf523d806f08fea59f00a1f6a1a1fd14b6107f647 (diff)
Merge "Add MOS 8.0 support for 1.0.1 release"
-rw-r--r--README.md2
-rw-r--r--doc/plugin-guide/source/description.rst2
-rw-r--r--doc/plugin-guide/source/installation.rst8
-rw-r--r--doc/plugin-guide/source/terms.rst2
-rw-r--r--specs/zabbix-snmptrapd-plugin-spec.rst2
5 files changed, 9 insertions, 7 deletions
diff --git a/README.md b/README.md
index 7a0382c..be0723c 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Requirements
15 15
16| Requirement | Version/Comment | 16| Requirement | Version/Comment |
17|:---------------------------------|:----------------| 17|:---------------------------------|:----------------|
18| Mirantis OpenStack compatibility | 7.0 and 8.0 | 18| Mirantis OpenStack compatibility | 7.0, 8.0 |
19| Zabbix plugin for Fuel | 2.5.0 | 19| Zabbix plugin for Fuel | 2.5.0 |
20 20
21Installation Guide 21Installation Guide
diff --git a/doc/plugin-guide/source/description.rst b/doc/plugin-guide/source/description.rst
index 70c0291..930cdad 100644
--- a/doc/plugin-guide/source/description.rst
+++ b/doc/plugin-guide/source/description.rst
@@ -20,7 +20,7 @@ Requirements
20====================== =============== 20====================== ===============
21Requirement Version/Comment 21Requirement Version/Comment
22====================== =============== 22====================== ===============
23Fuel 7.0 23Fuel 7.0 and 8.0
24Zabbix plugin for Fuel 2.5.0 24Zabbix plugin for Fuel 2.5.0
25====================== =============== 25====================== ===============
26 26
diff --git a/doc/plugin-guide/source/installation.rst b/doc/plugin-guide/source/installation.rst
index 5d75311..f80a7fb 100644
--- a/doc/plugin-guide/source/installation.rst
+++ b/doc/plugin-guide/source/installation.rst
@@ -13,17 +13,17 @@ To install SNMP trap daemon for Zabbix plugin, follow these steps:
132. Download the SNMP trap daemon for Zabbix plugin from the 132. Download the SNMP trap daemon for Zabbix plugin from the
14 `Fuel Plugins Catalog <https://www.mirantis.com/products/ 14 `Fuel Plugins Catalog <https://www.mirantis.com/products/
15 openstack-drivers-and-plugins/fuel-plugins/>`_. 15 openstack-drivers-and-plugins/fuel-plugins/>`_.
163. Copy the plugin on already installed Fuel Master node; ssh can be used for 163. Copy the plugin on already installed Fuel Master node, ssh can be used for
17 that. If you do not have the Fuel Master node yet, see `Quick Start Guide 17 that. If you do not have the Fuel Master node yet, see `Quick Start Guide
18 <https://software.mirantis.com/quick-start/>`_:: 18 <https://software.mirantis.com/quick-start/>`_::
19 19
20 # scp zabbix_snmptrapd-1.0-1.0.0-1.noarch.rpm \ 20 # scp zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm \
21 root@<The_Fuel_Master_node_IP>:/tmp 21 root@<The_Fuel_Master_node_IP>:/tmp
22 22
234. Log into the Fuel Master node. Install the plugin:: 234. Log into the Fuel Master node. Install the plugin::
24 24
25 # cd /tmp 25 # cd /tmp
26 # fuel plugins --install zabbix_snmptrapd-1.0-1.0.0-1.noarch.rpm 26 # fuel plugins --install zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm
27 27
285. Check if the plugin was installed successfully:: 285. Check if the plugin was installed successfully::
29 29
@@ -31,5 +31,5 @@ To install SNMP trap daemon for Zabbix plugin, follow these steps:
31 id | name | version | package_version 31 id | name | version | package_version
32 ---|---------------------------|----------|---------------- 32 ---|---------------------------|----------|----------------
33 1 | zabbix_monitoring | 2.5.0 | 3.0.0 33 1 | zabbix_monitoring | 2.5.0 | 3.0.0
34 2 | zabbix_snmptrapd | 1.0.0 | 2.0.0 34 2 | zabbix_snmptrapd | 1.0.1 | 2.0.0
35 35
diff --git a/doc/plugin-guide/source/terms.rst b/doc/plugin-guide/source/terms.rst
index 9ea38b9..beac5fd 100644
--- a/doc/plugin-guide/source/terms.rst
+++ b/doc/plugin-guide/source/terms.rst
@@ -8,7 +8,7 @@ Zabbix
8 network services,servers, and other network hardware. 8 network services,servers, and other network hardware.
9 9
10VIP 10VIP
11 Virtual IP Adress. 11 Virtual IP Address.
12 12
13SNMP trap 13SNMP trap
14 A message which is send from agent (for example, from network switch) to 14 A message which is send from agent (for example, from network switch) to
diff --git a/specs/zabbix-snmptrapd-plugin-spec.rst b/specs/zabbix-snmptrapd-plugin-spec.rst
index ef07eae..0c1bd09 100644
--- a/specs/zabbix-snmptrapd-plugin-spec.rst
+++ b/specs/zabbix-snmptrapd-plugin-spec.rst
@@ -104,6 +104,8 @@ Assignee(s)
104| Piotr Misiak <pmisiak@mirantis.com> (developer) 104| Piotr Misiak <pmisiak@mirantis.com> (developer)
105| Szymon Bańka <sbanka@mirantis.com> (developer) 105| Szymon Bańka <sbanka@mirantis.com> (developer)
106| Alexander Zatserklyany <azatserklyany@mirantis.com> (QA engineer) 106| Alexander Zatserklyany <azatserklyany@mirantis.com> (QA engineer)
107| Swann Croiset <scroiset@mirantis.com> (developer)
108| Olivier Bourdon <obourdon@mirantis.com> (developer)
107 109
108Work Items 110Work Items
109---------- 111----------