Browse Source

Add support for MOS 10.0

Change-Id: I55c5359c693d56a03c2b6bbba9841a433e11ebd3
Olivier Bourdon 2 years ago
parent
commit
d809ebac35

+ 10
- 10
README.md View File

@@ -13,11 +13,11 @@ appropriate items and triggers and by creating Hosts for each EMC VNX array.
13 13
 Requirements
14 14
 ------------
15 15
 
16
-| Requirement                        | Version/Comment             |
17
-|:-----------------------------------|:----------------------------|
18
-| Mirantis OpenStack compatibility   | 7.0, 8.0, 9.0, 9.1, and 9.2 |
19
-| Zabbix plugin for Fuel             | 2.5.2                       |
20
-| SNMP trap daemon for Zabbix plugin | 1.1.1                       |
16
+| Requirement                        | Version/Comment                  |
17
+|:-----------------------------------|:---------------------------------|
18
+| Mirantis OpenStack compatibility   | 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0 |
19
+| Zabbix plugin for Fuel             | 2.5.3                            |
20
+| SNMP trap daemon for Zabbix plugin | 1.1.2                            |
21 21
 
22 22
 Installation Guide
23 23
 ==================
@@ -41,22 +41,22 @@ follow these steps:
41 41
     that. If you do not have the Fuel Master node yet, see
42 42
     [Quick Start Guide](https://software.mirantis.com/quick-start/) :
43 43
 
44
-        # scp zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm \
44
+        # scp zabbix_monitoring_emc-1.1-1.1.2-1.noarch.rpm \
45 45
           root@<Fuel_Master_ip>:/tmp
46 46
 
47 47
 5. Install the plugin:
48 48
 
49 49
         # cd /tmp
50
-        # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm
50
+        # fuel plugins --install zabbix_monitoring_emc-1.1-1.1.2-1.noarch.rpm
51 51
 
52 52
 6. Check if the plugin was installed successfully:
53 53
 
54 54
         # fuel plugins
55 55
         id | name                  | version | package_version
56 56
         ---|-----------------------|---------|----------------
57
-        1  | zabbix_monitoring     | 2.5.2   | 3.0.0
58
-        2  | zabbix_snmptrapd      | 1.1.1   | 3.0.0
59
-        3  | zabbix_monitoring_emc | 1.1.1   | 3.0.0
57
+        1  | zabbix_monitoring     | 2.5.3   | 3.0.0
58
+        2  | zabbix_snmptrapd      | 1.1.2   | 3.0.0
59
+        3  | zabbix_monitoring_emc | 1.1.2   | 3.0.0
60 60
 
61 61
 For more information and instructions, see the EMC hardware monitoring extension
62 62
 for Zabbix plugin Guide in the

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

@@ -1,6 +1,10 @@
1 1
 Release notes / Changelog
2 2
 =========================
3 3
 
4
+**1.1.2**
5
+
6
+* Compatibility with MOS 10.0
7
+
4 8
 **1.1.1**
5 9
 
6 10
 * Compatibility with MOS 9.2

+ 1
- 1
doc/plugin-guide/source/conf.py View File

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

+ 6
- 6
doc/plugin-guide/source/description.rst View File

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

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

@@ -26,11 +26,11 @@ steps:
26 26
    Fuel Master node using ssh. If you do not have the Fuel Master node yet,
27 27
    see `Quick Start Guide <https://software.mirantis.com/quick-start/>`_::
28 28
 
29
-    # scp zabbix_monitoring-2.5-2.5.2-1.noarch.rpm \
29
+    # scp zabbix_monitoring-2.5-2.5.3-1.noarch.rpm \
30 30
       root@<Fuel_Master_IP>:/tmp
31
-    # scp zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm \
31
+    # scp zabbix_snmptrapd-1.1-1.1.2-1.noarch.rpm \
32 32
       root@<Fuel_Master_IP>:/tmp
33
-    # scp zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm \
33
+    # scp zabbix_monitoring_emc-1.1-1.1.2-1.noarch.rpm \
34 34
       root@<The_Fuel_Master_node_IP>:/tmp
35 35
 
36 36
 #. Log into the Fuel Master node. Install each of the three plugins using
@@ -38,20 +38,20 @@ steps:
38 38
 
39 39
     # cd /tmp
40 40
     # fuel plugins --install \
41
-      zabbix_monitoring-2.5-2.5.2-1.noarch.rpm
41
+      zabbix_monitoring-2.5-2.5.3-1.noarch.rpm
42 42
     # fuel plugins --install \
43
-      zabbix_snmptrapd-1.1-1.1.1-1.noarch.rpm
43
+      zabbix_snmptrapd-1.1-1.1.2-1.noarch.rpm
44 44
     # fuel plugins --install \
45
-      zabbix_monitoring_emc-1.1-1.1.1-1.noarch.rpm
45
+      zabbix_monitoring_emc-1.1-1.1.2-1.noarch.rpm
46 46
 
47 47
 #. Make sure the plugins were installed correctly::
48 48
 
49 49
     # fuel plugins
50 50
     id | name                      | version  | package_version
51 51
     ---|---------------------------|----------|----------------
52
-    1  | zabbix_monitoring         | 2.5.2    | 3.0.0
53
-    2  | zabbix_snmptrapd          | 1.1.1    | 3.0.0
54
-    3  | zabbix_monitoring_emc     | 1.1.1    | 3.0.0
52
+    1  | zabbix_monitoring         | 2.5.3    | 3.0.0
53
+    2  | zabbix_snmptrapd          | 1.1.2    | 3.0.0
54
+    3  | zabbix_monitoring_emc     | 1.1.2    | 3.0.0
55 55
 
56 56
 |
57 57
 
@@ -65,7 +65,7 @@ follow these steps:
65 65
 
66 66
 #. Uninstall the plugin::
67 67
 
68
-     # fuel plugins --remove zabbix_monitoring_emc==1.1.1
68
+     # fuel plugins --remove zabbix_monitoring_emc==1.1.2
69 69
 
70 70
 #. Check if the plugin was uninstalled successfully::
71 71
 

+ 14
- 11
doc/plugin-guide/source/revisionhistory.rst View File

@@ -2,35 +2,38 @@
2 2
 Revision history
3 3
 ================
4 4
 
5
-======= ============= ============================ =====================
5
+======= ============= ============================ ======================
6 6
 Version Revision date Editor                       Comment              
7
-======= ============= ============================ =====================
7
+======= ============= ============================ ======================
8 8
 0.1     06.22.2015    Piotr Misiak                 First release
9 9
                       (pmisiak@mirantis.com)                            
10
-------- ------------- ---------------------------- ---------------------
10
+------- ------------- ---------------------------- ----------------------
11 11
 0.2     08.13.2015    Piotr Misiak                 Updated release
12 12
                       (pmisiak@mirantis.com)                            
13
-------- ------------- ---------------------------- ---------------------
13
+------- ------------- ---------------------------- ----------------------
14 14
 0.3     08.17.2015    Piotr Misiak                 Minor doc updates
15 15
                       (pmisiak@mirantis.com)                            
16
-------- ------------- ---------------------------- ---------------------
16
+------- ------------- ---------------------------- ----------------------
17 17
 0.4     09.02.2015    Marciej Relewicz             Updated for fix
18 18
                       (mrelewicz@mirantis.com)
19
-------- ------------- ---------------------------- ---------------------
19
+------- ------------- ---------------------------- ----------------------
20 20
 1.0.0   11.20.2015    Swann Croiset                New Major version        
21 21
                       (scroiset@mirantis.com)      
22
-------- ------------- ---------------------------- ---------------------
22
+------- ------------- ---------------------------- ----------------------
23 23
 1.0.1   03.14.2016    Olivier Bourdon              Added MOS 8.0 support
24 24
                       (obourdon@mirantis.com)      
25 25
                                                    Doc fixes
26
-------- ------------- ---------------------------- ---------------------
26
+------- ------------- ---------------------------- ----------------------
27 27
 1.1.0   05.11.2016    Olivier Bourdon              Added MOS 9.0 support
28 28
                       (obourdon@mirantis.com)      
29
-------- ------------- ---------------------------- ---------------------
29
+------- ------------- ---------------------------- ----------------------
30 30
 1.1.0   10.19.2016    Olivier Bourdon              Added MOS 9.1 support
31 31
                       (obourdon@mirantis.com)      
32
-------- ------------- ---------------------------- ---------------------
32
+------- ------------- ---------------------------- ----------------------
33 33
 1.1.1   01.17.2017    Olivier Bourdon              Added MOS 9.2 support
34 34
                       (obourdon@mirantis.com)      
35
-======= ============= ============================ =====================
35
+------- ------------- ---------------------------- ----------------------
36
+1.1.2   02.20.2017    Olivier Bourdon              Added MOS 10.0 support
37
+                      (obourdon@mirantis.com)      
38
+======= ============= ============================ ======================
36 39
 

+ 1
- 1
doc/specs/source/conf.py View File

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

+ 3
- 3
doc/specs/source/index.rst View File

@@ -117,9 +117,9 @@ Work Items
117 117
 Dependencies
118 118
 ============
119 119
 
120
-* Fuel 7.0, 8.0, 9.0, 9.1, and 9.2
121
-* Zabbix plugin for Fuel 2.5.2
122
-* SNMP trap daemon for Zabbix plugin 1.1.1
120
+* Fuel 7.0, 8.0, 9.0, 9.1, 9.2 and 10.0
121
+* Zabbix plugin for Fuel 2.5.3
122
+* SNMP trap daemon for Zabbix plugin 1.1.2
123 123
 
124 124
 Testing
125 125
 =======

+ 7
- 2
metadata.yaml View File

@@ -2,11 +2,11 @@
2 2
 name: zabbix_monitoring_emc
3 3
 title: EMC hardware monitoring extension for Zabbix plugin
4 4
 # Plugin version
5
-version: 1.1.1
5
+version: 1.1.2
6 6
 # Description
7 7
 description: Adds EMC hardware monitoring to Zabbix plugin
8 8
 # Required fuel version
9
-fuel_version: ['7.0', '8.0', '9.0']
9
+fuel_version: ['7.0', '8.0', '9.0', '10.0']
10 10
 # Groups
11 11
 groups: ['monitoring']
12 12
 # Licenses
@@ -38,6 +38,11 @@ releases:
38 38
     mode: ['ha']
39 39
     deployment_scripts_path: deployment_scripts/
40 40
     repository_path: repositories/ubuntu
41
+  - os: ubuntu
42
+    version: newton-10.0
43
+    mode: ['ha']
44
+    deployment_scripts_path: deployment_scripts/
45
+    repository_path: repositories/ubuntu
41 46
 
42 47
 # Version of plugin package
43 48
 package_version: '3.0.0'

Loading…
Cancel
Save