diff --git a/doc/content/description.rst b/doc/content/description.rst index a06aab9..c320117 100644 --- a/doc/content/description.rst +++ b/doc/content/description.rst @@ -4,9 +4,9 @@ EMC hardware monitoring extension for Zabbix plugin EMC hardware monitoring extension plugin extends Zabbix plugin functionality by adding monitoring of incoming SNMP traps sent from EMC VNX arrays via -management network to management VIP address. For more information about +management network to Zabbix VIP address. For more information about networks, see the `Logical Networks `_ section of MOS +/fuel-7.0/reference-architecture.html#logical-networks>`_ section of MOS documentation. The plugin configures snmptt to parse and pass EMC VNX specific traps to Zabbix. It also configures Zabbix by adding Template with appropriate items and triggers and by creating Hosts for each EMC VNX array. @@ -17,8 +17,8 @@ Requirements ================================== =============== Requirement Version/Comment ================================== =============== -Fuel 6.1 -Zabbix plugin for Fuel 1.0.0 +Fuel 7.0 +Zabbix plugin for Fuel 2.0.0 SNMP trap daemon for Zabbix plugin 1.0.0 ================================== =============== diff --git a/doc/content/guide.rst b/doc/content/guide.rst index 3e3c7e4..ddfec2d 100644 --- a/doc/content/guide.rst +++ b/doc/content/guide.rst @@ -7,14 +7,15 @@ Environment configuration 1. Create an environment. For more information about environment creation, see `Mirantis OpenStack User Guide `_. + /fuel-7.0/user-guide.html#create-a-new-openstack-environment>`_. 2. Enable and configure Zabbix plugin for Fuel. For instructions, see Zabbix Plugin Guide in the `Fuel Plugins Catalog `_. 3. Enable and configure SNMP trap daemon for Zabbix plugin. For instructions, see Zabbix Plugin Guide in the `Fuel Plugins Catalog `_. -4. Open *Settings* tab of the Fuel web UI and scroll the page down. Select the +4. Open *Settings* tab of the Fuel web UI and scroll the page down. On the left + choose *EMC hardware monitoring extension for Zabbix plugin*, select the plugin checkbox and optionally fill in *EMC hardware to monitor* parameter: .. image:: images/settings.png @@ -31,7 +32,7 @@ Environment configuration 5. Adjust other environment settings to your requirements and deploy the environment. For more information, see `Mirantis OpenStack User Guide `_. + /fuel-7.0/user-guide.html#create-a-new-openstack-environment>`_. User Guide ========== @@ -41,7 +42,7 @@ 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,15 +52,17 @@ To test if everything is configured properly, follow these steps: .. image:: images/snmptrapd_settings.png - ** + ** If you don’t know the address, run the following command on any node:: - [root@node-46 ~]# grep management_vip /etc/astute.yaml + [root@node-46 ~]# grep -A2 ^zabbix_vip_management /etc/astute.yaml You should get the required VIP in the output:: - management_vip: 192.168.0.1 + zabbix_vip_management: + network_role: zabbix + ipaddr: 192.168.0.1 ** @@ -99,15 +102,17 @@ You have to configure your hardware to enable SNMP traps sending. To do this, refer to your hardware’s manual. Generally, you have to set these two parameters on your hardware: -1. SNMP manager - set to management VIP address of your environment +1. SNMP manager - set to Zabbix VIP address of your environment If you don’t know the address, run the following command on any node:: - [root@node-46 ~]# grep management_vip /etc/astute.yaml + [root@node-46 ~]# grep -A2 ^zabbix_vip_management /etc/astute.yaml You should get the required VIP in the output:: - management_vip: 192.168.0.1 + zabbix_vip_management: + network_role: zabbix + ipaddr: 192.168.0.1 2. SNMP community - set the same value as in the *SNMP community* parameter from the SNMP trap daemon for Zabbix plugin settings: diff --git a/doc/content/installation.rst b/doc/content/installation.rst index 520b652..ea6469e 100644 --- a/doc/content/installation.rst +++ b/doc/content/installation.rst @@ -33,7 +33,7 @@ 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/images/settings.png b/doc/images/settings.png index d890f33..c333a1f 100644 Binary files a/doc/images/settings.png and b/doc/images/settings.png differ