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

Merge "Update version for the next delivery"

This commit is contained in:
Jenkins 2016-07-12 08:29:11 +00:00 committed by Gerrit Code Review
parent 6991379bdd 3462f95293
commit 46ad9590fe
8 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -14,7 +14,7 @@ Requirements
| Requirement | Version/Comment | | Requirement | Version/Comment |
|:---------------------------------|:----------------| |:---------------------------------|:----------------|
| Mirantis OpenStack compatibility | 7.0, 8.0 | | Mirantis OpenStack compatibility | 7.0, 8.0, 9.0 |
Installation Guide Installation Guide
================== ==================
@ -43,7 +43,7 @@ To install Zabbix plugin, follow these steps:
# 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
For further details see the Zabbix Plugin Guide in the For further details see the Zabbix Plugin Guide in the
[Fuel Plugins Catalog](https://software.mirantis.com/fuel-plugins) [Fuel Plugins Catalog](https://software.mirantis.com/fuel-plugins)

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

@ -57,9 +57,9 @@ author = u'Mirantis'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2.5.0' version = '2.6'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '2.5.0' release = '2.6.0'
# 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

@ -10,15 +10,19 @@ services and APIs.
Requirements Requirements
============ ============
================================== =============== ================================== ================
Requirement Version/Comment Requirement Version/Comment
================================== =============== ================================== ================
Fuel 7.0 and 8.0 Fuel 7.0, 8.0 and 9.0
================================== =============== ================================== ================
Release Notes Release Notes
============= =============
**2.6.0**
* Compatibility with MOS 7.0, 8.0 and 9.0
**2.5.0** **2.5.0**
* Service "zabbix_server" was restarted after executing of task "upload_core_repos" (bug 1529642_) * Service "zabbix_server" was restarted after executing of task "upload_core_repos" (bug 1529642_)

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

@ -15,17 +15,17 @@ To install 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_monitoring-2.5-2.5.0-1.noarch.rpm root@<Fuel_Master_IP>:/tmp # scp zabbix_monitoring-2.5-2.6.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_monitoring-2.5-2.5.0-1.noarch.rpm # fuel plugins --install zabbix_monitoring-2.6-2.6.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
doc/plugin-guide/source/removal.rst
View File

@ -9,7 +9,7 @@ To uninstall Zabbix plugin, follow these steps:
:: ::
# fuel plugins --remove zabbix_monitoring==2.5.0 # fuel plugins --remove zabbix_monitoring==2.6.0
#. Check if the plugin was uninstalled successfully: #. Check if the plugin was uninstalled successfully:

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

@ -57,9 +57,9 @@ author = u'Mirantis'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2.5.0' version = '2.6'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '2.5.0' release = '2.6.0'
# 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/qa/source/test-strategy.rst
View File

@ -26,8 +26,8 @@ Product compatibility matrix
+--------------------+-----------------+ +--------------------+-----------------+
| Product | Version/Comment | | Product | Version/Comment |
+====================+=================+ +====================+=================+
| Mirantis OpenStack | 7.0 and 8.0 | | Mirantis OpenStack | 7.0, 8.0 and 9.0|
+--------------------+-----------------+ +--------------------+-----------------+
| Zabbix monitoring | 2.5.0 or higher | | Zabbix monitoring | 2.6.0 |
+--------------------+-----------------+ +--------------------+-----------------+

2
specs/zabbix-plugin-spec.rst
View File

@ -118,7 +118,7 @@ Work Items
Dependencies Dependencies
============ ============
* Fuel 7.0 and 8.0 * Fuel 7.0, 8.0 and 9.0
Testing Testing
======= =======