x
/
fuel-plugin-zabbix-snmptrapd
Code Issues Proposed changes

Update version for the next delivery 

Change-Id: I6f950c3cd27ad4646ccd39a6d9e365fde86fee4a
This commit is contained in:
Olivier Bourdon 2016-05-13 09:33:54 +02:00
parent af0994322a
commit 9b56597246
10 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -15,8 +15,8 @@ Requirements
| Requirement | Version/Comment | | Requirement | Version/Comment |
|:---------------------------------|:----------------| |:---------------------------------|:----------------|
| Mirantis OpenStack compatibility | 7.0, 8.0 | | Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 |
| Zabbix plugin for Fuel | 2.5.0 | | Zabbix plugin for Fuel | 2.6.0 |
Installation Guide Installation Guide
================== ==================
@ -36,20 +36,20 @@ To install SNMP trap daemon plugin, 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_snmptrapd-1.0-1.0.1-1.noarch.rpm root@<Fuel_Master_ip>:/tmp # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm root@<Fuel_Master_ip>:/tmp
4. Install the plugin: 4. Install the plugin:
# cd /tmp # cd /tmp
# fuel plugins --install zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm # fuel plugins --install zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm
5. Check if the plugin was installed successfully: 5. 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.0 | 3.0.0 1 | zabbix_monitoring | 2.6.0 | 3.0.0
2 | zabbix_snmptrapd | 1.0.1 | 2.0.0 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0
For more information and instructions, see the SNMP trap daemon plugin Guide For more information and instructions, see the SNMP trap daemon plugin Guide
in the [Fuel Plugins Catalog](https://software.mirantis.com/fuel-plugins) in the [Fuel Plugins Catalog](https://software.mirantis.com/fuel-plugins)

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

@ -1,6 +1,9 @@
Release notes / Changelog Release notes / Changelog
========================= =========================
**1.1.0**
* Compatibility with MOS 9.0
**1.0.1** **1.0.1**
* Compatibility with MOS 8.0 * Compatibility with MOS 8.0

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

@ -54,9 +54,9 @@ author = u'Mirantis Inc.'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '1.0' version = '1.1'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '1.0-1.0.1-1' release = '1.1-1.1.0-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.

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

@ -17,10 +17,10 @@ additional plugins to add monitoring of SNMP traps specific for their hardware.
Requirements Requirements
============ ============
====================== =============== ====================== ================
Requirement Version/Comment Requirement Version/Comment
====================== =============== ====================== ================
Fuel 7.0 and 8.0 Fuel 7.0, 8.0 and 9.0
Zabbix plugin for Fuel 2.5.0 Zabbix plugin for Fuel 2.6.0
====================== =============== ====================== ================

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

@ -21,20 +21,20 @@ To install SNMP trap daemon for Zabbix plugin, follow these steps:
that. If you do not have the Fuel Master node yet, see `Quick Start Guide that. If you do not have the Fuel Master node yet, see `Quick Start Guide
<https://software.mirantis.com/quick-start/>`_:: <https://software.mirantis.com/quick-start/>`_::
# scp zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm root@<Fuel_Master_IP>:/tmp # scp zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm root@<Fuel_Master_IP>:/tmp
#. Log into the Fuel Master node. Install the plugin:: #. Log into the Fuel Master node. Install the plugin::
# cd /tmp # cd /tmp
# fuel plugins --install zabbix_snmptrapd-1.0-1.0.1-1.noarch.rpm # fuel plugins --install zabbix_snmptrapd-1.1-1.1.0-1.noarch.rpm
#. Check if the plugin was installed successfully:: #. 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.0 | 3.0.0 1 | zabbix_monitoring | 2.6.0 | 3.0.0
2 | zabbix_snmptrapd | 1.0.1 | 3.0.0 2 | zabbix_snmptrapd | 1.1.0 | 3.0.0
SNMP trap daemon for Zabbix plugin removal SNMP trap daemon for Zabbix plugin removal
========================================== ==========================================
@ -45,7 +45,7 @@ To uninstall SNMP Trap Daemon for Zabbix plugin, follow these steps:
#. Uninstall the plugin:: #. Uninstall the plugin::
# fuel plugins --remove zabbix_snmptrapd==1.0.1 # fuel plugins --remove zabbix_snmptrapd==1.1.0
#. Check if the plugin was uninstalled successfully:: #. Check if the plugin was uninstalled successfully::

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

@ -20,5 +20,8 @@ Version Revision date Editor Comment
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
(obourdon@mirantis.com)
======= ============= ============================ ===================== ======= ============= ============================ =====================

4
doc/qa/source/conf.py
View File

@ -54,9 +54,9 @@ author = u'Mirantis Inc.'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '1.0' version = '1.1'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '1.0-1.0.1-1' release = '1.1-1.1.0-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.

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

@ -54,9 +54,9 @@ author = u'Mirantis Inc.'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '1.0' version = '1.1'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '1.0-1.0.1-1' release = '1.1-1.1.0-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.

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

@ -118,8 +118,8 @@ Work Items
Dependencies Dependencies
============ ============
* Fuel 7.0 and 8.0 * Fuel 7.0, 8.0 and 9.0
* Zabbix plugin for Fuel 2.5.0 * Zabbix plugin for Fuel 2.6.0
Testing Testing
======= =======

14
metadata.yaml
View File

@ -2,11 +2,11 @@
name: zabbix_snmptrapd name: zabbix_snmptrapd
title: SNMP trap daemon for Zabbix plugin title: SNMP trap daemon for Zabbix plugin
# Plugin version # Plugin version
version: 1.0.1 version: 1.1.0
# Description # Description
description: Gives ability to receive SNMP traps and pass them to Zabbix. description: Gives ability to receive SNMP traps and pass them to Zabbix.
# Required fuel version # Required fuel version
fuel_version: ['7.0', '8.0'] fuel_version: ['7.0', '8.0', '9.0']
# Groups # Groups
groups: ['monitoring'] groups: ['monitoring']
# Licenses # Licenses
@ -28,6 +28,16 @@ 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: liberty-9.0
mode: ['ha']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu
- os: ubuntu
version: mitaka-9.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'