x
/
fuel-plugin-zabbix-monitoring-emc
Code Issues Proposed changes

Add support for MOS 10.0 

Change-Id: I55c5359c693d56a03c2b6bbba9841a433e11ebd3
This commit is contained in:
Olivier Bourdon 2016-12-22 09:52:14 +01:00
parent 5953939012
commit d809ebac35
9 changed files with 56 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@ -13,11 +13,11 @@ appropriate items and triggers and by creating Hosts for each EMC VNX array.
Requirements Requirements
------------ ------------
| Requirement | Version/Comment | | Requirement | Version/Comment |
|:-----------------------------------|:----------------------------| |:-----------------------------------|:---------------------------------|
| Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1, and 9.2 | | Mirantis OpenStack compatibility | 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0 |
| Zabbix plugin for Fuel | 2.5.2 | | Zabbix plugin for Fuel | 2.5.3 |
| SNMP trap daemon for Zabbix plugin | 1.1.1 | | SNMP trap daemon for Zabbix plugin | 1.1.2 |
Installation Guide Installation Guide
================== ==================
@ -41,22 +41,22 @@ follow these steps:
that. If you do not have the Fuel Master node yet, see that. If you do not have the Fuel Master node yet, see
[Quick Start Guide](https://software.mirantis.com/quick-start/) : [Quick Start Guide](https://software.mirantis.com/quick-start/) :
# scp zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm \ # scp zabbix_monitoring_emc-1.1-1.1.2-1.noarch.rpm \
root@<Fuel_Master_ip>:/tmp root@<Fuel_Master_ip>:/tmp
5. Install the plugin: 5. Install the plugin:
# cd /tmp # cd /tmp
# fuel plugins --install zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.2-1.noarch.rpm
6. Check if the plugin was installed successfully: 6. Check if the plugin was installed successfully:
# fuel plugins # fuel plugins
id | name | version | package_version id | name | version | package_version
---|-----------------------|---------|---------------- ---|-----------------------|---------|----------------
1 | zabbix_monitoring | 2.5.2 | 3.0.0 1 | zabbix_monitoring | 2.5.3 | 3.0.0
2 | zabbix_snmptrapd | 1.1.1 | 3.0.0 2 | zabbix_snmptrapd | 1.1.2 | 3.0.0
3 | zabbix_monitoring_emc | 1.1.1 | 3.0.0 3 | zabbix_monitoring_emc | 1.1.2 | 3.0.0
For more information and instructions, see the EMC hardware monitoring extension For more information and instructions, see the EMC hardware monitoring extension
for Zabbix plugin Guide in the for Zabbix plugin Guide in the

4
doc/plugin-guide/source/changelog.rst
View File

@ -1,6 +1,10 @@
Release notes / Changelog Release notes / Changelog
========================= =========================
**1.1.2**
* Compatibility with MOS 10.0
**1.1.1** **1.1.1**
* Compatibility with MOS 9.2 * Compatibility with MOS 9.2

2
doc/plugin-guide/source/conf.py
View File

@ -56,7 +56,7 @@ author = u'Mirantis Inc.'
# The short X.Y version. # The short X.Y version.
version = '1.1' version = '1.1'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '1.1-1.1.1-1' release = '1.1-1.1.2-1'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

12
doc/plugin-guide/source/description.rst
View File

@ -14,11 +14,11 @@ items and triggers and by creating Hosts for each EMC VNX array.
Requirements Requirements
============ ============
================================== ========================== ================================== ================================
Requirement Version/Comment Requirement Version/Comment
================================== ========================== ================================== ================================
Fuel 7.0, 8.0, 9.0, 9.1 and 9.2 Fuel 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0
Zabbix plugin for Fuel 2.5.2 Zabbix plugin for Fuel 2.5.3
SNMP trap daemon for Zabbix plugin 1.1.1 SNMP trap daemon for Zabbix plugin 1.1.2
================================== ========================== ================================== ================================

20
doc/plugin-guide/source/installation.rst
View File

@ -26,11 +26,11 @@ steps:
Fuel Master node using ssh. If you do not have the Fuel Master node yet, Fuel Master node using ssh. If you do not have the Fuel Master node yet,
see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_:: see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_::
# scp zabbix_monitoring-2.5-2.5.2-1.noarch.rpm \ # scp zabbix_monitoring-2.5-2.5.3-1.noarch.rpm \
root@<Fuel_Master_IP>:/tmp root@<Fuel_Master_IP>:/tmp
# scp zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm \ # scp zabbix_snmptrapd-1.1-1.1.2-1.noarch.rpm \
root@<Fuel_Master_IP>:/tmp root@<Fuel_Master_IP>:/tmp
# scp zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm \ # scp zabbix_monitoring_emc-1.1-1.1.2-1.noarch.rpm \
root@<The_Fuel_Master_node_IP>:/tmp root@<The_Fuel_Master_node_IP>:/tmp
#. Log into the Fuel Master node. Install each of the three plugins using #. Log into the Fuel Master node. Install each of the three plugins using
@ -38,20 +38,20 @@ steps:
# cd /tmp # cd /tmp
# fuel plugins --install \ # fuel plugins --install \
zabbix_monitoring-2.5-2.5.2-1.noarch.rpm zabbix_monitoring-2.5-2.5.3-1.noarch.rpm
# fuel plugins --install \ # fuel plugins --install \
zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm zabbix_snmptrapd-1.1-1.1.2-1.noarch.rpm
# fuel plugins --install \ # fuel plugins --install \
zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm zabbix_monitoring_emc-1.1-1.1.2-1.noarch.rpm
#. Make sure the plugins were installed correctly:: #. Make sure the plugins were installed correctly::
# fuel plugins # fuel plugins
id | name | version | package_version id | name | version | package_version
---|---------------------------|----------|---------------- ---|---------------------------|----------|----------------
1 | zabbix_monitoring | 2.5.2 | 3.0.0 1 | zabbix_monitoring | 2.5.3 | 3.0.0
2 | zabbix_snmptrapd | 1.1.1 | 3.0.0 2 | zabbix_snmptrapd | 1.1.2 | 3.0.0
3 | zabbix_monitoring_emc | 1.1.1 | 3.0.0 3 | zabbix_monitoring_emc | 1.1.2 | 3.0.0
| |
@ -65,7 +65,7 @@ follow these steps:
#. Uninstall the plugin:: #. Uninstall the plugin::
# fuel plugins --remove zabbix_monitoring_emc==1.1.1 # fuel plugins --remove zabbix_monitoring_emc==1.1.2
#. Check if the plugin was uninstalled successfully:: #. Check if the plugin was uninstalled successfully::

25
doc/plugin-guide/source/revisionhistory.rst
View File

@ -2,35 +2,38 @@
Revision history Revision history
================ ================
======= ============= ============================ ===================== ======= ============= ============================ ======================
Version Revision date Editor Comment Version Revision date Editor Comment
======= ============= ============================ ===================== ======= ============= ============================ ======================
0.1 06.22.2015 Piotr Misiak First release 0.1 06.22.2015 Piotr Misiak First release
(pmisiak@mirantis.com) (pmisiak@mirantis.com)
------- ------------- ---------------------------- --------------------- ------- ------------- ---------------------------- ----------------------
0.2 08.13.2015 Piotr Misiak Updated release 0.2 08.13.2015 Piotr Misiak Updated release
(pmisiak@mirantis.com) (pmisiak@mirantis.com)
------- ------------- ---------------------------- --------------------- ------- ------------- ---------------------------- ----------------------
0.3 08.17.2015 Piotr Misiak Minor doc updates 0.3 08.17.2015 Piotr Misiak Minor doc updates
(pmisiak@mirantis.com) (pmisiak@mirantis.com)
------- ------------- ---------------------------- --------------------- ------- ------------- ---------------------------- ----------------------
0.4 09.02.2015 Marciej Relewicz Updated for fix 0.4 09.02.2015 Marciej Relewicz Updated for fix
(mrelewicz@mirantis.com) (mrelewicz@mirantis.com)
------- ------------- ---------------------------- --------------------- ------- ------------- ---------------------------- ----------------------
1.0.0 11.20.2015 Swann Croiset New Major version 1.0.0 11.20.2015 Swann Croiset New Major version
(scroiset@mirantis.com) (scroiset@mirantis.com)
------- ------------- ---------------------------- --------------------- ------- ------------- ---------------------------- ----------------------
1.0.1 03.14.2016 Olivier Bourdon Added MOS 8.0 support 1.0.1 03.14.2016 Olivier Bourdon Added MOS 8.0 support
(obourdon@mirantis.com) (obourdon@mirantis.com)
Doc fixes Doc fixes
------- ------------- ---------------------------- --------------------- ------- ------------- ---------------------------- ----------------------
1.1.0 05.11.2016 Olivier Bourdon Added MOS 9.0 support 1.1.0 05.11.2016 Olivier Bourdon Added MOS 9.0 support
(obourdon@mirantis.com) (obourdon@mirantis.com)
------- ------------- ---------------------------- --------------------- ------- ------------- ---------------------------- ----------------------
1.1.0 10.19.2016 Olivier Bourdon Added MOS 9.1 support 1.1.0 10.19.2016 Olivier Bourdon Added MOS 9.1 support
(obourdon@mirantis.com) (obourdon@mirantis.com)
------- ------------- ---------------------------- --------------------- ------- ------------- ---------------------------- ----------------------
1.1.1 01.17.2017 Olivier Bourdon Added MOS 9.2 support 1.1.1 01.17.2017 Olivier Bourdon Added MOS 9.2 support
(obourdon@mirantis.com) (obourdon@mirantis.com)
======= ============= ============================ ===================== ------- ------------- ---------------------------- ----------------------
1.1.2 02.20.2017 Olivier Bourdon Added MOS 10.0 support
(obourdon@mirantis.com)
======= ============= ============================ ======================

2
doc/specs/source/conf.py
View File

@ -59,7 +59,7 @@ author = u'Mirantis'
# The short X.Y version. # The short X.Y version.
version = '1.1' version = '1.1'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '1.1-1.1.1-1' release = '1.1-1.1.2-1'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

6
doc/specs/source/index.rst
View File

@ -117,9 +117,9 @@ Work Items
Dependencies Dependencies
============ ============
* Fuel 7.0, 8.0, 9.0, 9.1, and 9.2 * Fuel 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0
* Zabbix plugin for Fuel 2.5.2 * Zabbix plugin for Fuel 2.5.3
* SNMP trap daemon for Zabbix plugin 1.1.1 * SNMP trap daemon for Zabbix plugin 1.1.2
Testing Testing
======= =======

9
metadata.yaml
View File

@ -2,11 +2,11 @@
name: zabbix_monitoring_emc name: zabbix_monitoring_emc
title: EMC hardware monitoring extension for Zabbix plugin title: EMC hardware monitoring extension for Zabbix plugin
# Plugin version # Plugin version
version: 1.1.1 version: 1.1.2
# Description # Description
description: Adds EMC hardware monitoring to Zabbix plugin description: Adds EMC hardware monitoring to Zabbix plugin
# Required fuel version # Required fuel version
fuel_version: ['7.0', '8.0', '9.0'] fuel_version: ['7.0', '8.0', '9.0', '10.0']
# Groups # Groups
groups: ['monitoring'] groups: ['monitoring']
# Licenses # Licenses
@ -38,6 +38,11 @@ releases:
mode: ['ha'] mode: ['ha']
deployment_scripts_path: deployment_scripts/ deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu repository_path: repositories/ubuntu
- os: ubuntu
version: newton-10.0
mode: ['ha']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu
# Version of plugin package # Version of plugin package
package_version: '3.0.0' package_version: '3.0.0'