summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Bourdon <obourdon@mirantis.com>2016-02-29 13:23:13 +0100
committerOlivier Bourdon <obourdon@mirantis.com>2016-03-02 15:06:07 +0100
commit7d22f3b812daf693e1e515e06fde74750d0ff3e2 (patch)
tree4bfa67ff29fb478c6b871dead4404fd1f295844c
parent971939402a794a27efe76012a9fe76149dad49a5 (diff)
Add support for MOS 7.0 and MOS 8.0
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: Wed, 16 Mar 2016 16:39:53 +0000 Reviewed-on: https://review.openstack.org/286007 Project: openstack/fuel-plugin-zabbix-monitoring-emc Branch: refs/heads/master
-rw-r--r--README.md12
-rw-r--r--doc/content/description.rst4
-rw-r--r--doc/content/installation.rst8
-rw-r--r--doc/content/terms.rst2
-rw-r--r--metadata.yaml12
-rw-r--r--spec/zabbix-monitoring-emc-plugin-spec.rst8
6 files changed, 25 insertions, 21 deletions
diff --git a/README.md b/README.md
index d911fa6..9146c46 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ Requirements
15 15
16| Requirement | Version/Comment | 16| Requirement | Version/Comment |
17|:-----------------------------------|:----------------| 17|:-----------------------------------|:----------------|
18| Mirantis OpenStack compatibility | 7.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| SNMP trap daemon for Zabbix plugin | 1.0.0 | 20| SNMP trap daemon for Zabbix plugin | 1.0.1 |
21 21
22Installation Guide 22Installation Guide
23================== 23==================
@@ -47,7 +47,7 @@ follow these steps:
475. Install the plugin: 475. Install the plugin:
48 48
49 # cd /tmp 49 # cd /tmp
50 # fuel plugins --install zabbix_monitoring_emc-1.0-1.0.0-1.noarch.rpm 50 # fuel plugins --install zabbix_monitoring_emc-1.0-1.0.1-1.noarch.rpm
51 51
526. Check if the plugin was installed successfully: 526. Check if the plugin was installed successfully:
53 53
@@ -55,8 +55,8 @@ follow these steps:
55 id | name | version | package_version 55 id | name | version | package_version
56 ---|-----------------------|---------|---------------- 56 ---|-----------------------|---------|----------------
57 1 | zabbix_monitoring | 2.5.0 | 3.0.0 57 1 | zabbix_monitoring | 2.5.0 | 3.0.0
58 2 | zabbix_snmptrapd | 1.0.0 | 2.0.0 58 2 | zabbix_snmptrapd | 1.0.1 | 2.0.0
59 3 | zabbix_monitoring_emc | 1.0.0 | 2.0.0 59 3 | zabbix_monitoring_emc | 1.0.1 | 2.0.0
60 60
61For more information and instructions, see the EMC hardware monitoring extension 61For more information and instructions, see the EMC hardware monitoring extension
62for Zabbix plugin Guide in the 62for Zabbix plugin Guide in the
@@ -74,3 +74,5 @@ Dmitry Klenov <dklenov@mirantis.com> (PM)
74Piotr Misiak <pmisiak@mirantis.com> (developer) 74Piotr Misiak <pmisiak@mirantis.com> (developer)
75Szymon Bańka <sbanka@mirantis.com> (developer) 75Szymon Bańka <sbanka@mirantis.com> (developer)
76Alexander Zatserklyany <azatserklyany@mirantis.com> (QA engineer) 76Alexander Zatserklyany <azatserklyany@mirantis.com> (QA engineer)
77Swann Croiset <scroiset@mirantis.com> (developer)
78Olivier Bourdon <obourdon@mirantis.com> (developer)
diff --git a/doc/content/description.rst b/doc/content/description.rst
index 976ffa7..dbf4d24 100644
--- a/doc/content/description.rst
+++ b/doc/content/description.rst
@@ -17,8 +17,8 @@ Requirements
17================================== =============== 17================================== ===============
18Requirement Version/Comment 18Requirement Version/Comment
19================================== =============== 19================================== ===============
20Fuel 7.0 20Fuel 7.0 and 8.0
21Zabbix plugin for Fuel 2.5.0 21Zabbix plugin for Fuel 2.5.0
22SNMP trap daemon for Zabbix plugin 1.0.0 22SNMP trap daemon for Zabbix plugin 1.0.1
23================================== =============== 23================================== ===============
24 24
diff --git a/doc/content/installation.rst b/doc/content/installation.rst
index 9c9d157..e110ac9 100644
--- a/doc/content/installation.rst
+++ b/doc/content/installation.rst
@@ -21,13 +21,13 @@ steps:
21 that. If you do not have the Fuel Master node yet, see `Quick Start Guide 21 that. If you do not have the Fuel Master node yet, see `Quick Start Guide
22 <https://software.mirantis.com/quick-start/>`_:: 22 <https://software.mirantis.com/quick-start/>`_::
23 23
24 # scp zabbix_monitoring_emc-1.0-1.0.0-1.noarch.rpm \ 24 # scp zabbix_monitoring_emc-1.0-1.0.1-1.noarch.rpm \
25 root@<The_Fuel_Master_node_IP>:/tmp 25 root@<The_Fuel_Master_node_IP>:/tmp
26 26
275. Log into the Fuel Master node. Install the plugin:: 275. Log into the Fuel Master node. Install the plugin::
28 28
29 # cd /tmp 29 # cd /tmp
30 # fuel plugins --install zabbix_monitoring_emc-1.0-1.0.0-1.noarch.rpm 30 # fuel plugins --install zabbix_monitoring_emc-1.0-1.0.1-1.noarch.rpm
31 31
326. Check if the plugin was installed successfully:: 326. Check if the plugin was installed successfully::
33 33
@@ -35,6 +35,6 @@ steps:
35 id | name | version | package_version 35 id | name | version | package_version
36 ---|---------------------------|----------|---------------- 36 ---|---------------------------|----------|----------------
37 1 | zabbix_monitoring | 2.5.0 | 3.0.0 37 1 | zabbix_monitoring | 2.5.0 | 3.0.0
38 2 | zabbix_snmptrapd | 1.0.0 | 2.0.0 38 2 | zabbix_snmptrapd | 1.0.1 | 2.0.0
39 3 | zabbix_monitoring_emc | 1.0.0 | 2.0.0 39 3 | zabbix_monitoring_emc | 1.0.1 | 2.0.0
40 40
diff --git a/doc/content/terms.rst b/doc/content/terms.rst
index 64406fa..bcdf319 100644
--- a/doc/content/terms.rst
+++ b/doc/content/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 EMC array) to monitoring 14 A message which is send from agent (for example EMC array) to monitoring
diff --git a/metadata.yaml b/metadata.yaml
index 27fbac6..4ce5e15 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,11 +2,11 @@
2name: zabbix_monitoring_emc 2name: zabbix_monitoring_emc
3title: EMC hardware monitoring extension for Zabbix plugin 3title: EMC hardware monitoring extension for Zabbix plugin
4# Plugin version 4# Plugin version
5version: 1.0.0 5version: 1.0.1
6# Description 6# Description
7description: Adds EMC hardware monitoring to Zabbix plugin 7description: Adds EMC hardware monitoring to Zabbix plugin
8# Required fuel version 8# Required fuel version
9fuel_version: ['7.0'] 9fuel_version: ['7.0', '8.0']
10# Groups 10# Groups
11groups: ['monitoring'] 11groups: ['monitoring']
12# Licenses 12# Licenses
@@ -14,7 +14,7 @@ licenses: ['Apache License, Version 2.0']
14# Homepage 14# Homepage
15homepage: 'https://github.com/stackforge/fuel-plugin-zabbix-emc' 15homepage: 'https://github.com/stackforge/fuel-plugin-zabbix-emc'
16# Authors 16# Authors
17authors: ['Dmitry Klenov <dklenov@mirantis.com>', 'Piotr Misiak <pmisiak@mirantis.com>', 'Szymon Banka <sbanka@mirantis.com>', 'Alexander Zatserklyany <azatserklyany@mirantis.com>'] 17authors: ['Dmitry Klenov <dklenov@mirantis.com>', 'Piotr Misiak <pmisiak@mirantis.com>', 'Szymon Banka <sbanka@mirantis.com>', 'Alexander Zatserklyany <azatserklyany@mirantis.com>', 'Swann Croiset <scroiset@mirantis.com>', 'Olivier Bourdon <obourdon@mirantis.com>']
18 18
19# The plugin is compatible with releases in the list 19# The plugin is compatible with releases in the list
20releases: 20releases:
@@ -23,11 +23,11 @@ releases:
23 mode: ['ha'] 23 mode: ['ha']
24 deployment_scripts_path: deployment_scripts/ 24 deployment_scripts_path: deployment_scripts/
25 repository_path: repositories/ubuntu 25 repository_path: repositories/ubuntu
26 - os: centos 26 - os: ubuntu
27 version: 2015.1.0-7.0 27 version: liberty-8.0
28 mode: ['ha'] 28 mode: ['ha']
29 deployment_scripts_path: deployment_scripts/ 29 deployment_scripts_path: deployment_scripts/
30 repository_path: repositories/centos 30 repository_path: repositories/ubuntu
31 31
32# Version of plugin package 32# Version of plugin package
33package_version: '2.0.0' 33package_version: '2.0.0'
diff --git a/spec/zabbix-monitoring-emc-plugin-spec.rst b/spec/zabbix-monitoring-emc-plugin-spec.rst
index 9f480ee..816ee66 100644
--- a/spec/zabbix-monitoring-emc-plugin-spec.rst
+++ b/spec/zabbix-monitoring-emc-plugin-spec.rst
@@ -103,6 +103,8 @@ Assignee(s)
103| Piotr Misiak <pmisiak@mirantis.com> (developer) 103| Piotr Misiak <pmisiak@mirantis.com> (developer)
104| Szymon Bańka <sbanka@mirantis.com> (developer) 104| Szymon Bańka <sbanka@mirantis.com> (developer)
105| Alexander Zatserklyany <azatserklyany@mirantis.com> (QA engineer) 105| Alexander Zatserklyany <azatserklyany@mirantis.com> (QA engineer)
106| Swann Croiset <scroiset@mirantis.com> (developer)
107| Olivier Bourdon <obourdon@mirantis.com> (developer)
106 108
107Work Items 109Work Items
108---------- 110----------
@@ -115,9 +117,9 @@ Work Items
115Dependencies 117Dependencies
116============ 118============
117 119
118* Fuel 6.1 120* Fuel 7.0 or 8.0
119* Zabbix plugin for Fuel 1.0.0 121* Zabbix plugin for Fuel 2.5.0
120* SNMP trap daemon for Zabbix plugin 1.0.0 122* SNMP trap daemon for Zabbix plugin 1.0.1
121 123
122Testing 124Testing
123======= 125=======