summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Misiak <pmisiak@mirantis.com>2015-08-17 13:10:45 +0200
committerPiotr Misiak <pmisiak@mirantis.com>2015-08-17 13:30:25 +0200
commit51a57f90d94b5b62ed1af0a51c36d7efe18a1e11 (patch)
treee578639681cdddf44bd1b6357e55b9e3e09eca8f
parenta359d59809e6b1f5664fc20e7a29ba3c944a3484 (diff)
fix images sizes and lines width in documentation
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Szymon Banka <sbanka@mirantis.com> Workflow+1: Szymon Banka <sbanka@mirantis.com> Code-Review+1: Olena <omandryka@mirantis.com> Code-Review+1: Maciej Relewicz <mrelewicz@mirantis.com> Submitted-by: Jenkins Submitted-at: Wed, 19 Aug 2015 14:56:09 +0000 Reviewed-on: https://review.openstack.org/213666 Project: stackforge/fuel-plugin-zabbix-monitoring-emc Branch: refs/heads/master
-rw-r--r--README.md9
-rw-r--r--doc/content/guide.rst12
-rw-r--r--doc/content/installation.rst3
3 files changed, 18 insertions, 6 deletions
diff --git a/README.md b/README.md
index 0deb288..6f0266e 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,8 @@ Requirements
15 15
16| Requirement | Version/Comment | 16| Requirement | Version/Comment |
17|:-----------------------------------|:----------------| 17|:-----------------------------------|:----------------|
18| Mirantis OpenStack compatibility | 6.1 | 18| Mirantis OpenStack compatibility | 7.0 |
19| Zabbix plugin for Fuel | 1.0.0 | 19| Zabbix plugin for Fuel | 2.0.0 |
20| SNMP trap daemon for Zabbix plugin | 1.0.0 | 20| SNMP trap daemon for Zabbix plugin | 1.0.0 |
21 21
22Installation Guide 22Installation Guide
@@ -41,7 +41,8 @@ follow these steps:
41 that. If you do not have the Fuel Master node yet, see 41 that. If you do not have the Fuel Master node yet, see
42 [Quick Start Guide](https://software.mirantis.com/quick-start/) : 42 [Quick Start Guide](https://software.mirantis.com/quick-start/) :
43 43
44 # scp zabbix_monitoring_emc-1.0-1.0.0-1.noarch.rpm root@<Fuel_Master_ip>:/tmp 44 # scp zabbix_monitoring_emc-1.0-1.0.0-1.noarch.rpm \
45 root@<Fuel_Master_ip>:/tmp
45 46
465. Install the plugin: 475. Install the plugin:
47 48
@@ -53,7 +54,7 @@ follow these steps:
53 # fuel plugins 54 # fuel plugins
54 id | name | version | package_version 55 id | name | version | package_version
55 ---|-----------------------|---------|---------------- 56 ---|-----------------------|---------|----------------
56 1 | zabbix_monitoring | 1.0.0 | 2.0.0 57 1 | zabbix_monitoring | 2.0.0 | 3.0.0
57 2 | zabbix_snmptrapd | 1.0.0 | 2.0.0 58 2 | zabbix_snmptrapd | 1.0.0 | 2.0.0
58 3 | zabbix_monitoring_emc | 1.0.0 | 2.0.0 59 3 | zabbix_monitoring_emc | 1.0.0 | 2.0.0
59 60
diff --git a/doc/content/guide.rst b/doc/content/guide.rst
index ddfec2d..c1d9bc6 100644
--- a/doc/content/guide.rst
+++ b/doc/content/guide.rst
@@ -19,6 +19,7 @@ Environment configuration
19 plugin checkbox and optionally fill in *EMC hardware to monitor* parameter: 19 plugin checkbox and optionally fill in *EMC hardware to monitor* parameter:
20 20
21 .. image:: images/settings.png 21 .. image:: images/settings.png
22 :width: 100%
22 23
23 When you add your hardware to the *EMC hardware to monitor* comma separated 24 When you add your hardware to the *EMC hardware to monitor* comma separated
24 list, then the plugin will automatically configure monitoring for these 25 list, then the plugin will automatically configure monitoring for these
@@ -42,7 +43,10 @@ To test if everything is configured properly, follow these steps:
421. Generate an example SNMP trap by running the following command from any 431. Generate an example SNMP trap by running the following command from any
43 node:: 44 node::
44 45
45 [root@node-46 ~]# snmptrap -v 1 -c <SNMP_community> <zabbix_VIP_address> '.1.3.6.1.4.1.1981' <host_ip_address> 6 6 '10' .1.3.6.1.4.1.1981 s "null" .1.3.6.1.4.1.1981 s "null" .1.3.6.1.4.1.1981 s "a37" 46 [root@node-46 ~]# snmptrap -v 1 -c <SNMP_community> \
47 <zabbix_VIP_address> '.1.3.6.1.4.1.1981' <host_ip_address> 6 6 '10' \
48 .1.3.6.1.4.1.1981 s "null" .1.3.6.1.4.1.1981 s "null" \
49 .1.3.6.1.4.1.1981 s "a37"
46 50
47 where: 51 where:
48 52
@@ -51,6 +55,7 @@ To test if everything is configured properly, follow these steps:
51 It is set in the SNMP trap daemon for Zabbix plugin Settings in Fuel UI: 55 It is set in the SNMP trap daemon for Zabbix plugin Settings in Fuel UI:
52 56
53 .. image:: images/snmptrapd_settings.png 57 .. image:: images/snmptrapd_settings.png
58 :width: 100%
54 59
55 *<zabbix_VIP_address>* 60 *<zabbix_VIP_address>*
56 61
@@ -76,17 +81,20 @@ To test if everything is configured properly, follow these steps:
76 openstack-drivers-and-plugins/fuel-plugins/>`_): 81 openstack-drivers-and-plugins/fuel-plugins/>`_):
77 82
78 .. image:: images/issues.png 83 .. image:: images/issues.png
84 :width: 100%
79 85
80 When you click on a date in the *Last change* column of one of the issues, 86 When you click on a date in the *Last change* column of one of the issues,
81 you will see the **Events** page with list of events with the same type: 87 you will see the **Events** page with list of events with the same type:
82 88
83 .. image:: images/events.png 89 .. image:: images/events.png
90 :width: 100%
84 91
85 To see a full description of the event, you have to click on event’s 92 To see a full description of the event, you have to click on event’s
86 description and choose *History*, then you will see a **History** page with 93 description and choose *History*, then you will see a **History** page with
87 a full event description: 94 a full event description:
88 95
89 .. image:: images/history.png 96 .. image:: images/history.png
97 :width: 100%
90 98
913. After clicking *Configuration* tab and selecting *Hosts* option, you will 993. After clicking *Configuration* tab and selecting *Hosts* option, you will
92 see a list of hosts with linked monitoring templates. There should be one 100 see a list of hosts with linked monitoring templates. There should be one
@@ -94,6 +102,7 @@ To test if everything is configured properly, follow these steps:
94 parameter: 102 parameter:
95 103
96 .. image:: images/hosts.png 104 .. image:: images/hosts.png
105 :width: 100%
97 106
98Hardware setup 107Hardware setup
99============== 108==============
@@ -118,4 +127,5 @@ parameters on your hardware:
118 from the SNMP trap daemon for Zabbix plugin settings: 127 from the SNMP trap daemon for Zabbix plugin settings:
119 128
120 .. image:: images/snmptrapd_settings.png 129 .. image:: images/snmptrapd_settings.png
130 :width: 100%
121 131
diff --git a/doc/content/installation.rst b/doc/content/installation.rst
index ea6469e..47a2669 100644
--- a/doc/content/installation.rst
+++ b/doc/content/installation.rst
@@ -21,7 +21,8 @@ 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 root@<The_Fuel_Master_node_IP>:/tmp 24 # scp zabbix_monitoring_emc-1.0-1.0.0-1.noarch.rpm \
25 root@<The_Fuel_Master_node_IP>:/tmp
25 26
265. Log into the Fuel Master node. Install the plugin:: 275. Log into the Fuel Master node. Install the plugin::
27 28