From fe6dc00a85a6a64c2d992d9c7d33d28c08eb445f Mon Sep 17 00:00:00 2001 From: Carlos Cesario Date: Fri, 8 Aug 2014 09:06:44 -0300 Subject: [PATCH 1/8] Add some manubulon snmp plugins refs #6650 --- doc/6-configuring-icinga-2.md | 160 +++++++++++++++++++++++++++ etc/icinga2/constants.conf.cmake | 4 + itl/plugin-commands-manubulon.conf | 172 +++++++++++++++++++++++++++++ 3 files changed, 336 insertions(+) create mode 100644 itl/plugin-commands-manubulon.conf diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md index 495a1d149..73b6fd5d2 100644 --- a/doc/6-configuring-icinga-2.md +++ b/doc/6-configuring-icinga-2.md @@ -2307,3 +2307,163 @@ Check command object for the `check_running_kernel` plugin provided by the `nagios-plugins-contrib` package on Debian. The `running_kernel` check command does not support any vars. + + +## SNMP Manubulon Plugin Check Commands + +### Overview + +The SNMP Manubulon Plugin Check Commands provides example configuration for plugin check commands provided by the Snmp Manubulon plugins. + +The SNMP manubulon plugin check commands assume that there's a global constant named `ManubulonPluginDir` which contains the path of the plugins from the Snmp Manubulon page. + +### Checks you can make by host type + +**N/A** : nothing of this type to check. + +**SNMP** : yes with simple SNMP query. + +**??** : not tested because useless most of the time. + +**Specific** : name of the script to look at for platform specific checks. + + + Host type | Interface | storage | load/cpu | mem | process | env | specific + ------------------------|------------|----------|-----------|-----|----------|-----|------------------------- + Linux | Yes | Yes | Yes | Yes | Yes | No | + Windows | Yes | Yes | Yes | Yes | Yes | No | check_snmp_win.pl + Cisco router/switch | Yes | N/A | Yes | Yes | N/A | Yes | + HP router/switch | Yes | N/A | Yes | Yes | N/A | No | + Bluecoat proxy | Yes | SNMP | Yes | SNMP| No | Yes | + CheckPoint on SPLAT | Yes | Yes | Yes | Yes | Yes | No | check_snmp_cpfw.pl + CheckPoint on Nokia IP | Yes | Yes | Yes | No | ?? | No | check_snmp_vrrp.pl + Boostedge | Yes | Yes | Yes | Yes | ?? | No | check_snmp_boostedge.pl + AS400 | Yes | Yes | Yes | Yes | No | No | + NetsecureOne Netbox | Yes | Yes | Yes | ?? | Yes | No | + Radware Linkproof | Yes | N/A | SNMP | SNMP| No | No | check_snmp_linkproof_nhr
check_snmp_vrrp.pl + IronPort | Yes | SNMP | SNMP | SNMP| No | Yes | + Cisco CSS | Yes | ?? | Yes | Yes | No | ?? | check_snmp_css.pl + + +#### snmp-load + +Check command object for the check_snmp_load.pl plugin. + +Custom Attributes: + + +Name | Description +------------------------|-------------- +snmp_address | **Optional.** The host's address. Defaults to "$address$". +snmp_nocrypt | **Optional.** Define SNMP encryption. If set **snmp_v3** needs to be set. Defaults to "false". +snmp_community | **Optional.** The SNMP community. Defaults to "public". +snmp_port | **Optional.** The SNMP port connection. +snmp_v2 | **Optional.** SNMP version to 2c. Defaults to "false". +snmp_v3 | **Optional.** SNMP version to 3. Defaults to "false". +snmp_login | **Optional.** SNMP version 3 username. Defaults to "snmpuser". +snmp_password | **Required.** SNMP version 3 password. No value defined as default. +snmp_v3_use_privpass | **Optional.** Define to use SNMP version 3 priv password. Defaults to "false". +snmp_authprotocol | **Optional.** SNMP version 3 authentication protocol. Defaults to "md5,des". +snmp_privpass | **Required.** SNMP version 3 priv password. No value defined as default. +snmp_warn | **Optional.** The warning threshold. +snmp_crit | **Optional.** The critical threshold. +snmp_load_type | **Optional.** Load type. Default to "stand". Check all availables snmp load. +snmp_perf | **Optional.** Enable perfdata values. Defaults to "true". + +#### snmp-memory + +Check command object for the check_snmp_mem.pl plugin. + +Custom Attributes: + +Name | Description +------------------------|-------------- +snmp_address | **Optional.** The host's address. Defaults to "$address$". +snmp_nocrypt | **Optional.** Define SNMP encryption. If set **snmp_v3** needs to be set. Defaults to "false". +snmp_community | **Optional.** The SNMP community. Defaults to "public". +snmp_port | **Optional.** The SNMP port connection. +snmp_v2 | **Optional.** SNMP version to 2c. Defaults to "false". +snmp_v3 | **Optional.** SNMP version to 3. Defaults to "false". +snmp_login | **Optional.** SNMP version 3 username. Defaults to "snmpuser". +snmp_password | **Required.** SNMP version 3 password. No value defined as default. +snmp_v3_use_privpass | **Optional.** Define to use SNMP version 3 priv password. Defaults to "false". +snmp_authprotocol | **Optional.** SNMP version 3 authentication protocol. Defaults to "md5,des". +snmp_privpass | **Required.** SNMP version 3 priv password. No value defined as default. +snmp_warn | **Optional.** The warning threshold. +snmp_crit | **Optional.** The critical threshold. +snmp_perf | **Optional.** Enable perfdata values. Defaults to "true". + +#### snmp-storage + +Check command object for the check_snmp_storage.pl plugin. + +Custom Attributes: + +Name | Description +------------------------|-------------- +snmp_address | **Optional.** The host's address. Defaults to "$address$". +snmp_nocrypt | **Optional.** Define SNMP encryption. If set **snmp_v3** needs to be set. Defaults to "false". +snmp_community | **Optional.** The SNMP community. Defaults to "public". +snmp_port | **Optional.** The SNMP port connection. +snmp_v2 | **Optional.** SNMP version to 2c. Defaults to "false". +snmp_v3 | **Optional.** SNMP version to 3. Defaults to "false". +snmp_login | **Optional.** SNMP version 3 username. Defaults to "snmpuser". +snmp_password | **Required.** SNMP version 3 password. No value defined as default. +snmp_v3_use_privpass | **Optional.** Define to use SNMP version 3 priv password. Defaults to "false". +snmp_authprotocol | **Optional.** SNMP version 3 authentication protocol. Defaults to "md5,des". +snmp_privpass | **Required.** SNMP version 3 priv password. No value defined as default.. +snmp_warn | **Optional.** The warning threshold. +snmp_crit | **Optional.** The critical threshold. +snmp_storage_name | **Optional.** Storage name. Default to regex "^/$$". Check more options in snmp storage. +snmp_perf | **Optional.** Enable perfdata values. Defaults to "true". + +#### snmp-int + +Check command object for the check_snmp_int.pl plugin. + +Custom Attributes: + +Name | Description +------------------------|-------------- +snmp_address | **Optional.** The host's address. Defaults to "$address$". +snmp_nocrypt | **Optional.** Define SNMP encryption. If set **snmp_v3** needs to be set. Defaults to "false". +snmp_community | **Optional.** The SNMP community. Defaults to "public". +snmp_port | **Optional.** The SNMP port connection. +snmp_v2 | **Optional.** SNMP version to 2c. Defaults to "false". +snmp_v3 | **Optional.** SNMP version to 3. Defaults to "false". +snmp_login | **Optional.** SNMP version 3 username. Defaults to "snmpuser". +snmp_password | **Required.** SNMP version 3 password. No value defined as default. +snmp_v3_use_privpass | **Optional.** Define to use SNMP version 3 priv password. Defaults to "false". +snmp_authprotocol | **Optional.** SNMP version 3 authentication protocol. Defaults to "md5,des". +snmp_privpass | **Required.** SNMP version 3 priv password. No value defined as default.. +snmp_warn | **Optional.** The warning threshold. +snmp_crit | **Optional.** The critical threshold. +snmp_interface | **Optional.** Network interface name. Default to regex "eth0". +snmp_interface_perf | **Optional.** Check the input/ouput bandwidth of the interface. Defaults to "true". +snmp_interface_bits | **Optional.** Make the warning and critical levels in KBits/s. Defaults to "true". +snmp_interface_64bit | **Optional.** Use 64 bits counters instead of the standard counters when checking bandwidth & performance data for interface >= 1Gbps. Defaults to "false". +snmp_perf | **Optional.** Enable perfdata values. Defaults to "true". + +#### snmp-process + +Check command object for the check_snmp_process.pl plugin. + +Custom Attributes: + +Name | Description +------------------------|-------------- +snmp_address | **Optional.** The host's address. Defaults to "$address$". +snmp_nocrypt | **Optional.** Define SNMP encryption. If set **snmp_v3** needs to be set. Defaults to "false". +snmp_community | **Optional.** The SNMP community. Defaults to "public". +snmp_port | **Optional.** The SNMP port connection. +snmp_v2 | **Optional.** SNMP version to 2c. Defaults to "false". +snmp_v3 | **Optional.** SNMP version to 3. Defaults to "false". +snmp_login | **Optional.** SNMP version 3 username. Defaults to "snmpuser". +snmp_password | **Required.** SNMP version 3 password. No value defined as default. +snmp_v3_use_privpass | **Optional.** Define to use SNMP version 3 priv password. Defaults to "false". +snmp_authprotocol | **Optional.** SNMP version 3 authentication protocol. Defaults to "md5,des". +snmp_privpass | **Required.** SNMP version 3 priv password. No value defined as default.. +snmp_warn | **Optional.** The warning threshold. +snmp_crit | **Optional.** The critical threshold. +snmp_process_name | **Optional.** Name of the process (regexp). No trailing slash!. Defaults to ".*". +snmp_perf | **Optional.** Enable perfdata values. Defaults to "true". diff --git a/etc/icinga2/constants.conf.cmake b/etc/icinga2/constants.conf.cmake index c3ceb7322..d2337226f 100644 --- a/etc/icinga2/constants.conf.cmake +++ b/etc/icinga2/constants.conf.cmake @@ -6,6 +6,10 @@ /* The directory which contains the plugins from the Monitoring Plugins project. */ const PluginDir = "@ICINGA2_PLUGINDIR@" + +/* The directory which contains the Manubulon plugins from http://nagios.manubulon.com/index_snmp.html. */ +const ManubulonPluginDir = "@ICINGA2_PLUGINDIR@" + /* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`. * This should be the common name from the API certificate. */ diff --git a/itl/plugin-commands-manubulon.conf b/itl/plugin-commands-manubulon.conf new file mode 100644 index 000000000..49d6c26cd --- /dev/null +++ b/itl/plugin-commands-manubulon.conf @@ -0,0 +1,172 @@ +/* main snmp-manubulon template */ +template CheckCommand "snmp-manubulon-command" { + import "plugin-check-command", + + arguments = { + "-H" = "$snmp_address$" + "-C" = { + set_if = "$snmp_nocrypt$" + value = "$snmp_community$" + } + "-p" = "$snmp_port$" + "-v2c" = { + set_if = "$snmp_v2$" + } + "-l" = { + set_if = "$snmp_v3$" + value = "$snmp_login$" + } + "-x" = { + set_if = "$snmp_v3$" + value = "$snmp_password$" + } + "-L" = { + set_if = "$snmp_v3_use_authprotocol$" + value = "$snmp_authprotocol$" + } + "-X" = { + set_if = "$snmp_v3_use_privpass$" + value = "$snmp_privpass$" + } + + "-w" = "$snmp_warn$" + "-c" = "$snmp_crit$" + } + + vars.snmp_address = "$address$" + vars.snmp_nocrypt = true + vars.snmp_community = "public" + vars.snmp_v2 = false + vars.snmp_v3 = false + vars.snmp_login = "snmpuser" + vars.snmp_v3_use_privpass = false + vars.snmp_v3_use_authprotocol = false + vars.snmp_authprotocol = "md5,des" +} + + +/** snmp load + * Url reference: http://nagios.manubulon.com/snmp_load.html + **/ +object CheckCommand "snmp-load" { + import "snmp-manubulon-command", + + command = [ ManubulonPluginDir + "/check_snmp_load.pl" ] + + arguments += { + "-T" = "$snmp_load_type$" + "-f" = { + set_if = "$snmp_perf$" + } + } + + vars.snmp_load_type = "stand" + vars.snmp_warn = 85 + vars.snmp_crit = 95 + vars.snmp_perf = true +} + + +/** Memory and swap usage on Linux given by Net-snmp + * Memory usage on cisco routers or Pix + * For other systems use check_snmp_storage.pl + * Url reference: http://nagios.manubulon.com/snmp_mem.html + **/ + +object CheckCommand "snmp-memory" { + import "snmp-manubulon-command", + + command = [ ManubulonPluginDir + "/check_snmp_mem.pl" ] + + arguments += { + "-f" = { + set_if = "$snmp_perf$" + } + } + + vars.snmp_warn = "94,50" + vars.snmp_crit = "98,80" + vars.snmp_perf = true +} + + +/** snmp storage - Disk/Memory + * Url reference: http://nagios.manubulon.com/snmp_storage.html + **/ +object CheckCommand "snmp-storage" { + import "snmp-manubulon-command", + + command = [ ManubulonPluginDir + "/check_snmp_storage.pl" ] + + arguments += { + "-m" = "$snmp_storage_name$" + "-f" = { + set_if = "$snmp_perf$" + } + } + + vars.snmp_storage_name = "^/$$" + vars.snmp_warn = 80 + vars.snmp_crit = 90 + vars.snmp_perf = true +} + + +/** snmp network interfaces + * Url reference: http://nagios.manubulon.com/snmp_int.html + **/ +object CheckCommand "snmp-interface" { + import "snmp-manubulon-command", + + command = [ ManubulonPluginDir + "/check_snmp_int.pl" ] + + arguments += { + "-n" = "$snmp_interface$" + "-k" = { + set_if = "$snmp_interface_perf$" + } + "-B" = { + set_if = "$snmp_interface_bits$" + } + "--64bits" = { + set_if = "$snmp_interface_64bit$" + } + "-f" = { + set_if = "$snmp_perf$" + } + } + + vars.snmp_interface = "eth0" + vars.snmp_interface_perf = true + vars.snmp_interface_bits = true + vars.snmp_interface_64bit = false + vars.snmp_warn = "300,400" + vars.snmp_crit = "0,600" + vars.snmp_perf = true +} + + +/** snmp process + * Url reference: http://nagios.manubulon.com/snmp_process.html + **/ +object CheckCommand "snmp-process" { + import "snmp-manubulon-command", + + command = [ ManubulonPluginDir + "/check_snmp_process.pl" ] + + arguments += { + "-n" = { + description = "Regex service name eg. ^apache2$" + value = "$snmp_process_name$" + } + "-F" = { + set_if = "$snmp_perf$" + } + } + + vars.snmp_process_name = ".*" + vars.snmp_warn = 0 + vars.snmp_crit = 0 + vars.snmp_perf = true +} + From 42b63c48f3a53efbd9e79d7dc41991c92ef0ac4b Mon Sep 17 00:00:00 2001 From: Carlos Cesario Date: Fri, 15 Aug 2014 09:27:18 -0300 Subject: [PATCH 2/8] Added license header, remove commas after expressions and change comments format refs #6650 --- itl/plugin-commands-manubulon.conf | 78 +++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 24 deletions(-) diff --git a/itl/plugin-commands-manubulon.conf b/itl/plugin-commands-manubulon.conf index 49d6c26cd..910bf6105 100644 --- a/itl/plugin-commands-manubulon.conf +++ b/itl/plugin-commands-manubulon.conf @@ -1,6 +1,28 @@ -/* main snmp-manubulon template */ +/****************************************************************************** + * Icinga 2 * + * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org) * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License * + * as published by the Free Software Foundation; either version 2 * + * of the License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software Foundation * + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * + ******************************************************************************/ + +/** + * main snmp-manubulon template + */ + template CheckCommand "snmp-manubulon-command" { - import "plugin-check-command", + import "plugin-check-command" arguments = { "-H" = "$snmp_address$" @@ -45,11 +67,13 @@ template CheckCommand "snmp-manubulon-command" { } -/** snmp load - * Url reference: http://nagios.manubulon.com/snmp_load.html - **/ +/** + * snmp load + * Url reference: http://nagios.manubulon.com/snmp_load.html + */ + object CheckCommand "snmp-load" { - import "snmp-manubulon-command", + import "snmp-manubulon-command" command = [ ManubulonPluginDir + "/check_snmp_load.pl" ] @@ -67,14 +91,15 @@ object CheckCommand "snmp-load" { } -/** Memory and swap usage on Linux given by Net-snmp - * Memory usage on cisco routers or Pix - * For other systems use check_snmp_storage.pl - * Url reference: http://nagios.manubulon.com/snmp_mem.html - **/ +/** + * Memory and swap usage on Linux given by Net-snmp + * Memory usage on cisco routers or Pix + * For other systems use check_snmp_storage.pl + * Url reference: http://nagios.manubulon.com/snmp_mem.html + */ object CheckCommand "snmp-memory" { - import "snmp-manubulon-command", + import "snmp-manubulon-command" command = [ ManubulonPluginDir + "/check_snmp_mem.pl" ] @@ -90,11 +115,12 @@ object CheckCommand "snmp-memory" { } -/** snmp storage - Disk/Memory - * Url reference: http://nagios.manubulon.com/snmp_storage.html - **/ +/** + * snmp storage - Disk/Memory + * Url reference: http://nagios.manubulon.com/snmp_storage.html + */ object CheckCommand "snmp-storage" { - import "snmp-manubulon-command", + import "snmp-manubulon-command" command = [ ManubulonPluginDir + "/check_snmp_storage.pl" ] @@ -112,11 +138,13 @@ object CheckCommand "snmp-storage" { } -/** snmp network interfaces - * Url reference: http://nagios.manubulon.com/snmp_int.html - **/ +/** + * snmp network interfaces + * Url reference: http://nagios.manubulon.com/snmp_int.html + */ + object CheckCommand "snmp-interface" { - import "snmp-manubulon-command", + import "snmp-manubulon-command" command = [ ManubulonPluginDir + "/check_snmp_int.pl" ] @@ -146,11 +174,13 @@ object CheckCommand "snmp-interface" { } -/** snmp process - * Url reference: http://nagios.manubulon.com/snmp_process.html - **/ +/** + * snmp process + * Url reference: http://nagios.manubulon.com/snmp_process.html + */ + object CheckCommand "snmp-process" { - import "snmp-manubulon-command", + import "snmp-manubulon-command" command = [ ManubulonPluginDir + "/check_snmp_process.pl" ] From 1f86887a1dc8104ca4562bb11dd480defa7b4741 Mon Sep 17 00:00:00 2001 From: Carlos Cesario Date: Fri, 15 Aug 2014 09:30:38 -0300 Subject: [PATCH 3/8] Added plugin-commands-manubulon.conf into CMakeLists.txt refs #6650 --- itl/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itl/CMakeLists.txt b/itl/CMakeLists.txt index 75714a369..2ef1f18e2 100644 --- a/itl/CMakeLists.txt +++ b/itl/CMakeLists.txt @@ -16,6 +16,6 @@ # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. install( - FILES itl command.conf command-icinga.conf timeperiod.conf plugins command-plugins.conf + FILES itl command.conf command-icinga.conf timeperiod.conf plugins command-plugins.conf plugin-commands-manubulon.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include ) From 170c41b5f07d48c1f5e01ee9bc2cafcb5e672e74 Mon Sep 17 00:00:00 2001 From: Carlos Cesario Date: Fri, 15 Aug 2014 10:56:09 -0300 Subject: [PATCH 4/8] Addes itl/manubulon file refs #6650 --- itl/manubulon | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 itl/manubulon diff --git a/itl/manubulon b/itl/manubulon new file mode 100644 index 000000000..ecfc9938a --- /dev/null +++ b/itl/manubulon @@ -0,0 +1,24 @@ +/****************************************************************************** + * Icinga 2 * + * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org) * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License * + * as published by the Free Software Foundation; either version 2 * + * of the License, or (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the Free Software Foundation * + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * + ******************************************************************************/ + +/** + * This is the SNMP Manubulon Template Library. + */ + +include "plugin-commands-manubulon.conf" From 84b65e786f373c56d5e2a3bacc68970aaff3c5e7 Mon Sep 17 00:00:00 2001 From: Carlos Cesario Date: Fri, 15 Aug 2014 13:27:48 -0300 Subject: [PATCH 5/8] Updated Manubulon documentation refs #6650 --- doc/6-configuring-icinga-2.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md index 73b6fd5d2..3db60cd6c 100644 --- a/doc/6-configuring-icinga-2.md +++ b/doc/6-configuring-icinga-2.md @@ -2317,6 +2317,10 @@ The SNMP Manubulon Plugin Check Commands provides example configuration for plug The SNMP manubulon plugin check commands assume that there's a global constant named `ManubulonPluginDir` which contains the path of the plugins from the Snmp Manubulon page. +You can make usage this plugin by using the include directive in your configuration file: + + include + ### Checks you can make by host type **N/A** : nothing of this type to check. From aef11814d0a0b81eddcae9116f0c55c6462c0d6a Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 27 Aug 2014 19:36:00 +0200 Subject: [PATCH 6/8] Rename plugin-commands-manubulon.conf to command-plugins-manubulon.conf refs #6650 --- itl/CMakeLists.txt | 2 +- ...n-commands-manubulon.conf => command-plugins-manubulon.conf} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename itl/{plugin-commands-manubulon.conf => command-plugins-manubulon.conf} (100%) diff --git a/itl/CMakeLists.txt b/itl/CMakeLists.txt index 2ef1f18e2..d8c70b537 100644 --- a/itl/CMakeLists.txt +++ b/itl/CMakeLists.txt @@ -16,6 +16,6 @@ # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. install( - FILES itl command.conf command-icinga.conf timeperiod.conf plugins command-plugins.conf plugin-commands-manubulon.conf + FILES itl command.conf command-icinga.conf timeperiod.conf plugins command-plugins.conf command-plugins-manubulon.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include ) diff --git a/itl/plugin-commands-manubulon.conf b/itl/command-plugins-manubulon.conf similarity index 100% rename from itl/plugin-commands-manubulon.conf rename to itl/command-plugins-manubulon.conf From b4953a613bbfdaa6652298904d6dacd2f7e7b09b Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 27 Aug 2014 19:52:59 +0200 Subject: [PATCH 7/8] Fix the documentation for manubulon check plugin commands refs #6650 --- doc/6-configuring-icinga-2.md | 33 +++++++++++++++++--------------- etc/icinga2/constants.conf.cmake | 4 +++- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/doc/6-configuring-icinga-2.md b/doc/6-configuring-icinga-2.md index 3db60cd6c..6e5641862 100644 --- a/doc/6-configuring-icinga-2.md +++ b/doc/6-configuring-icinga-2.md @@ -2313,23 +2313,26 @@ The `running_kernel` check command does not support any vars. ### Overview -The SNMP Manubulon Plugin Check Commands provides example configuration for plugin check commands provided by the Snmp Manubulon plugins. +The `SNMP Manubulon Plugin Check Commands` provide example configuration for plugin check +commands provided by the [SNMP Manubulon project](http://nagios.manubulon.com/index_snmp.html). -The SNMP manubulon plugin check commands assume that there's a global constant named `ManubulonPluginDir` which contains the path of the plugins from the Snmp Manubulon page. +The SNMP manubulon plugin check commands assume that the global constant named `ManubulonPluginDir` +is set to the path where the Manubublon SNMP plugins are installed. -You can make usage this plugin by using the include directive in your configuration file: +You can enable these plugin check commands by adding the following the include directive in your +configuration [icinga2.conf](#icinga2-conf) file: include -### Checks you can make by host type +### Checks by Host Type -**N/A** : nothing of this type to check. +**N/A** : Not available for this type. -**SNMP** : yes with simple SNMP query. +**SNMP** : Available for simple SNMP query. -**??** : not tested because useless most of the time. +**??** : Untested. -**Specific** : name of the script to look at for platform specific checks. +**Specific** : Script name for platform specific checks. Host type | Interface | storage | load/cpu | mem | process | env | specific @@ -2351,7 +2354,7 @@ You can make usage this plugin by using the include directive in your configurat #### snmp-load -Check command object for the check_snmp_load.pl plugin. +Check command object for the [check_snmp_load.pl](http://nagios.manubulon.com/snmp_load.html) plugin. Custom Attributes: @@ -2371,12 +2374,12 @@ snmp_authprotocol | **Optional.** SNMP version 3 authentication protocol. snmp_privpass | **Required.** SNMP version 3 priv password. No value defined as default. snmp_warn | **Optional.** The warning threshold. snmp_crit | **Optional.** The critical threshold. -snmp_load_type | **Optional.** Load type. Default to "stand". Check all availables snmp load. +snmp_load_type | **Optional.** Load type. Defaults to "stand". Check all available types int the [snmp load](http://nagios.manubulon.com/snmp_load.html) documentation. snmp_perf | **Optional.** Enable perfdata values. Defaults to "true". #### snmp-memory -Check command object for the check_snmp_mem.pl plugin. +Check command object for the [check_snmp_mem.pl](http://nagios.manubulon.com/snmp_mem.html) plugin. Custom Attributes: @@ -2399,7 +2402,7 @@ snmp_perf | **Optional.** Enable perfdata values. Defaults to "tru #### snmp-storage -Check command object for the check_snmp_storage.pl plugin. +Check command object for the [check_snmp_storage.pl](http://nagios.manubulon.com/snmp_storage.html) plugin. Custom Attributes: @@ -2418,12 +2421,12 @@ snmp_authprotocol | **Optional.** SNMP version 3 authentication protocol. snmp_privpass | **Required.** SNMP version 3 priv password. No value defined as default.. snmp_warn | **Optional.** The warning threshold. snmp_crit | **Optional.** The critical threshold. -snmp_storage_name | **Optional.** Storage name. Default to regex "^/$$". Check more options in snmp storage. +snmp_storage_name | **Optional.** Storage name. Default to regex "^/$$". More options available in the [snmp storage](http://nagios.manubulon.com/snmp_storage.html) documentation. snmp_perf | **Optional.** Enable perfdata values. Defaults to "true". #### snmp-int -Check command object for the check_snmp_int.pl plugin. +Check command object for the [check_snmp_int.pl](http://nagios.manubulon.com/snmp_int.html) plugin. Custom Attributes: @@ -2450,7 +2453,7 @@ snmp_perf | **Optional.** Enable perfdata values. Defaults to "tru #### snmp-process -Check command object for the check_snmp_process.pl plugin. +Check command object for the [check_snmp_process.pl](http://nagios.manubulon.com/snmp_process.html) plugin. Custom Attributes: diff --git a/etc/icinga2/constants.conf.cmake b/etc/icinga2/constants.conf.cmake index d2337226f..faf6067fe 100644 --- a/etc/icinga2/constants.conf.cmake +++ b/etc/icinga2/constants.conf.cmake @@ -7,7 +7,9 @@ const PluginDir = "@ICINGA2_PLUGINDIR@" -/* The directory which contains the Manubulon plugins from http://nagios.manubulon.com/index_snmp.html. */ +/* The directory which contains the Manubulon plugins. + * Check the documentation, chapter "SNMP Manubulon Plugin Check Commands", for details. + */ const ManubulonPluginDir = "@ICINGA2_PLUGINDIR@" /* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`. From 52e85dc22e0c40d082f789ec8bd9c68d24ee48ec Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Wed, 27 Aug 2014 19:57:06 +0200 Subject: [PATCH 8/8] Install missing itl/manubulon refs #6650 --- itl/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itl/CMakeLists.txt b/itl/CMakeLists.txt index d8c70b537..c5c06629c 100644 --- a/itl/CMakeLists.txt +++ b/itl/CMakeLists.txt @@ -16,6 +16,6 @@ # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. install( - FILES itl command.conf command-icinga.conf timeperiod.conf plugins command-plugins.conf command-plugins-manubulon.conf + FILES itl command.conf command-icinga.conf timeperiod.conf plugins command-plugins.conf manubulon command-plugins-manubulon.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/icinga2/include )