diff --git a/README.md b/README.md index 07d785c..061c3fa 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 | Installation Guide ================== @@ -48,7 +48,7 @@ To install SNMP trap daemon plugin, 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 For more information and instructions, see the SNMP trap daemon plugin Guide diff --git a/doc/content/description.rst b/doc/content/description.rst index 4ca4ce3..07585b2 100644 --- a/doc/content/description.rst +++ b/doc/content/description.rst @@ -5,7 +5,7 @@ SNMP trap daemon for Zabbix plugin This plugin extends Zabbix plugin functionality by adding ability to receive SNMP traps from management network and pass them to Zabbix. For more information about networks, see the `Logical Networks `_ section of MOS documentation. The plugins installs snmptrapd daemon for receiving and snmptt software for parsing and passing traps to Zabbix. This plugin does not provide any additional features from user @@ -20,7 +20,7 @@ Requirements ====================== =============== Requirement Version/Comment ====================== =============== -Fuel 6.1 -Zabbix plugin for Fuel 1.0.0 +Fuel 7.0 +Zabbix plugin for Fuel 2.0.0 ====================== =============== diff --git a/doc/content/guide.rst b/doc/content/guide.rst index 47c68c5..82b24c2 100644 --- a/doc/content/guide.rst +++ b/doc/content/guide.rst @@ -7,14 +7,16 @@ 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. Open *Settings* tab of the Fuel web UI and scroll the page down. Select the - plugin checkbox and set *SNMP community* parameter: +3. Open *Settings* tab of the Fuel web UI and scroll the page down. On the left + choose *SNMP trap daemon for Zabbix plugin*, select the plugin checkbox and + set *SNMP community* parameter: .. image:: images/settings.png + :width: 100% You could see default value by clicking on the eye icon. It is highly recommended to change default SNMP community, because it is used to @@ -22,15 +24,15 @@ Environment configuration 4. 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>`_. Environment validation ====================== After a successful deployment, all Controller Nodes should have the following: -1. snmptrapd daemon running and listening on UDP/162 port on the VIP management - address. +1. snmptrapd daemon running and listening on UDP/162 port on the VIP address + reserved for Zabbix. 2. snmptrapd daemon configured to pass all SNMP traps to snmptt handler. 3. snmptt daemon running which parse SNMP traps and stores them in a log file in a format accepted by Zabbix. @@ -41,7 +43,8 @@ To test if everything is installed and configured properly, follow these steps: 1. Generate a test SNMP trap running following command from any node:: - [root@node-46 ~]# snmptrap -v 2c -c "" .1.3.6.1.4.1.8072.2.3.0.1 + [root@node-46 ~]# snmptrap -v 2c -c \ + "" .1.3.6.1.4.1.8072.2.3.0.1 where: @@ -50,23 +53,29 @@ To test if everything is installed and configured properly, follow these steps: It is set in the SNMP trap daemon for Zabbix plugin Settings in Fuel UI: .. image:: images/settings.png + :width: 100% - ** + ** 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. After several seconds of running the snmptrap command you should see a line in the Zabbix Server log file similar to this one:: - [root@node-45 ~]# grep netSnmpExampleHeartbeatNotification \ /var/log/zabbix/zabbix_server.log - 10730:20150611:182933.176 unmatched trap received from [192.168.0.4]: 18:29:27 2015/06/11 .1.3.6.1.4.1.8072.2.3.0.1 Normal "Status Events" node-46.domain.tld - netSnmpExampleHeartbeatNotification + [root@node-45 ~]# grep netSnmpExampleHeartbeatNotification \ + /var/log/zabbix/zabbix_server.log + 10730:20150611:182933.176 unmatched trap received from [192.168.0.4]: + 18:29:27 2015/06/11 .1.3.6.1.4.1.8072.2.3.0.1 Normal "Status Events" + node-46.domain.tld - netSnmpExampleHeartbeatNotification This is a proof that test SNMP trap has been received and passed to Zabbix. It is “unmatched” for Zabbix because there is no configuration for this trap diff --git a/doc/content/installation.rst b/doc/content/installation.rst index 70b5183..54a2c9f 100644 --- a/doc/content/installation.rst +++ b/doc/content/installation.rst @@ -9,15 +9,16 @@ To install SNMP trap daemon for Zabbix plugin, follow these steps: 1. Download and install the Zabbix plugin for Fuel from the `Fuel Plugins Catalog `_ + openstack-drivers-and-plugins/fuel-plugins/>`_. 2. Download the SNMP trap daemon for Zabbix plugin from the `Fuel Plugins Catalog `_ + openstack-drivers-and-plugins/fuel-plugins/>`_. 3. Copy the plugin on already installed Fuel Master node; ssh can be used for that. If you do not have the Fuel Master node yet, see `Quick Start Guide `_:: - # scp zabbix_snmptrapd-1.0-1.0.0-1.noarch.rpm root@:/tmp + # scp zabbix_snmptrapd-1.0-1.0.0-1.noarch.rpm \ + root@:/tmp 4. Log into the Fuel Master node. Install the plugin:: @@ -29,6 +30,6 @@ To install SNMP trap daemon for Zabbix plugin, 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 diff --git a/doc/images/settings.png b/doc/images/settings.png index 07dfce7..0ecdbaf 100644 Binary files a/doc/images/settings.png and b/doc/images/settings.png differ