diff --git a/README.md b/README.md index 0deb288..6f0266e 100644 --- a/README.md +++ b/README.md @@ -15,8 +15,8 @@ Requirements | Requirement | Version/Comment | |:-----------------------------------|:----------------| -| Mirantis OpenStack compatibility | 6.1 | -| Zabbix plugin for Fuel | 1.0.0 | +| Mirantis OpenStack compatibility | 7.0 | +| Zabbix plugin for Fuel | 2.0.0 | | SNMP trap daemon for Zabbix plugin | 1.0.0 | Installation Guide @@ -41,7 +41,8 @@ follow these steps: that. If you do not have the Fuel Master node yet, see [Quick Start Guide](https://software.mirantis.com/quick-start/) : - # scp zabbix_monitoring_emc-1.0-1.0.0-1.noarch.rpm root@:/tmp + # scp zabbix_monitoring_emc-1.0-1.0.0-1.noarch.rpm \ + root@:/tmp 5. Install the plugin: @@ -53,7 +54,7 @@ follow these steps: # fuel plugins id | name | version | package_version ---|-----------------------|---------|---------------- - 1 | zabbix_monitoring | 1.0.0 | 2.0.0 + 1 | zabbix_monitoring | 2.0.0 | 3.0.0 2 | zabbix_snmptrapd | 1.0.0 | 2.0.0 3 | zabbix_monitoring_emc | 1.0.0 | 2.0.0 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 plugin checkbox and optionally fill in *EMC hardware to monitor* parameter: .. image:: images/settings.png + :width: 100% When you add your hardware to the *EMC hardware to monitor* comma separated list, then the plugin will automatically configure monitoring for these @@ -42,7 +43,10 @@ To test if everything is configured properly, follow these steps: 1. Generate an example SNMP trap by running the following command from any node:: - [root@node-46 ~]# snmptrap -v 1 -c '.1.3.6.1.4.1.1981' 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" + [root@node-46 ~]# snmptrap -v 1 -c \ + '.1.3.6.1.4.1.1981' 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" where: @@ -51,6 +55,7 @@ To test if everything is configured properly, follow these steps: It is set in the SNMP trap daemon for Zabbix plugin Settings in Fuel UI: .. image:: images/snmptrapd_settings.png + :width: 100% ** @@ -76,17 +81,20 @@ To test if everything is configured properly, follow these steps: openstack-drivers-and-plugins/fuel-plugins/>`_): .. image:: images/issues.png + :width: 100% When you click on a date in the *Last change* column of one of the issues, you will see the **Events** page with list of events with the same type: .. image:: images/events.png + :width: 100% To see a full description of the event, you have to click on event’s description and choose *History*, then you will see a **History** page with a full event description: .. image:: images/history.png + :width: 100% 3. After clicking *Configuration* tab and selecting *Hosts* option, you will 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: parameter: .. image:: images/hosts.png + :width: 100% Hardware setup ============== @@ -118,4 +127,5 @@ parameters on your hardware: from the SNMP trap daemon for Zabbix plugin settings: .. image:: images/snmptrapd_settings.png + :width: 100% 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: that. If you do not have the Fuel Master node yet, see `Quick Start Guide `_:: - # scp zabbix_monitoring_emc-1.0-1.0.0-1.noarch.rpm root@:/tmp + # scp zabbix_monitoring_emc-1.0-1.0.0-1.noarch.rpm \ + root@:/tmp 5. Log into the Fuel Master node. Install the plugin::