Merge pull request #6896 from Icinga/bugfix/notification-delay-5561

[icinga2] / itl / plugins-contrib.d / ipmi.conf

diff --git a/itl/plugins-contrib.d/ipmi.conf b/itl/plugins-contrib.d/ipmi.conf
index 5c9646ad797ec36a7bd1e123f23887d996409ef5..b290fe50d60450b43be32871c37e4e98d75172f1 100644 (file)
--- a/itl/plugins-contrib.d/ipmi.conf
+++ b/itl/plugins-contrib.d/ipmi.conf
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2015 Icinga Development Team (https://www.icinga.org)   *
+ * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)      *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *
@@ -18,7 +18,6 @@
  ******************************************************************************/
 
 object CheckCommand "ipmi-sensor" {
-       import "plugin-check-command"
        import "ipv4-or-ipv6"
 
        command = [ PluginContribDir + "/check_ipmi_sensor" ]
@@ -52,16 +51,36 @@ object CheckCommand "ipmi-sensor" {
                        value = "$ipmi_sensor_type$"
                        description = "Limit sensors to query based on IPMI sensor type (seperated by comma)"
                }
+               "-ST" = {
+                       value = "$ipmi_sel_type$"
+                       description = "Limit SEL entries to specific types. (seperated by comma)"
+               }
                "-x" = {
-                       value = "$ipmi_sensor_id$"
+                       value = "$ipmi_exclude_sensor_id$"
                        description = "Exclude sensor matching ipmi_sensor_id"
                }
+               "-xT" = {
+                       value = "$ipmi_exclude_sensor$"
+                       description = "Exclude sensors based on IPMI sensor type. (seperated by comma)"
+               }
+               "-xST" = {
+                       value = "$ipmi_exclude_sel$"
+                       description = "Exclude SEL entries of specific sensor types. (seperated by comma)"
+               }
                "-i" = {
-                       value = "$ipmi_exclude_sensor_id$"
+                       value = "$ipmi_sensor_id$"
                        description = "Include sensor matching ipmi_sensor_id"
                }
+               "--nosel" = {
+                       set_if = "$ipmi_no_sel_checking$"
+                       description = "Turn off system event log checking via ipmi-sel"
+               }
+               "--nothresholds" = {
+                       set_if = "$ipmi_no_thresholds$"
+                       description = "Turn off performance data thresholds from output-sensor-thresholds"
+               }
                "-D" = {
-                       value = "$ipmi_protocal_lan_version$"
+                       value = "$ipmi_protocol_lan_version$"
                        description = "Change the protocol LAN version (default: LAN_2_0)"
                }
                "-fc" = {
@@ -72,12 +91,42 @@ object CheckCommand "ipmi-sensor" {
                        set_if = "$ipmi_show_fru$"
                        description = "Print the product serial number got by ipmi-fru"
                }
-               "--nosel" = {
-                       set_if = "$ipmi_no_sel_checking$"
-                       description = "Turn off system event log checking via ipmi-sel"
+               "--noentityabsent" = {
+                       set_if = "$ipmi_noentityabsent$"
+                       description = "Skip sensor checks for sensors that have 'noentityabsent' as event state"
+               }
+               "-vv" = {
+                       set_if = "$ipmi_verbose$"
+                       description = "Be Verbose multi line output, also with additional details for warnings"
+               }
+               "-vvv" = {
+                       set_if = "$ipmi_debug$"
+                       description = "Be Verbose debugging output, followed by normal multi line output"
+               }
+               "-us" = {
+                       value = "$ipmi_unify_file$"
+                       description = "Path to the unify file to unify sensor names."
                }
        }
 
        vars.ipmi_address = "$check_address$"
-       vars.ipmi_protocal_lan_version = "LAN_2_0"
+       vars.ipmi_protocol_lan_version = "LAN_2_0"
+}
+
+/*
+ * Icinga2 CheckCommand definition for an IPMI interface ping check
+*/
+
+template CheckCommand "ipmi-alive-common" {
+       vars.ping_wrta = 5000.0
+       vars.ping_wpl = 100
+
+       vars.ping_crta = 5000.0
+       vars.ping_cpl = 100
+
+       vars.ping_packets = 1
+}
+object CheckCommand "ipmi-alive" {
+       import "ping"
+       import "ipmi-alive-common"
 }