Merge branch 'master' into feature/itl-check-temp

diff --cc doc/10-icinga-template-library.md
index 76e287a9ebbdf8cd8ef9515f9c4fd9d163d412fa,4b7f13acc144e3b380d127df9fb6e5b97c7cef53..f0b4da694a9154a410fc5dc1fffb9fe37f2ae308
--- 1/doc/10-icinga-template-library.md
--- 2/doc/10-icinga-template-library.md
+++ b/doc/10-icinga-template-library.md
@@@ -2579,19 -2601,34 +2601,47 @@@ openmanage_timeout           | **Optional.** Plu
  openmanage_vdisk_critical     | **Optional.** Make any alerts on virtual disks critical
  openmanage_warning            | **Optional.** Custom temperature warning limits
  
 +#### temp <a id="plugin-contrib-command-temp"></a>
 +
 +The [check_temp](https://github.com/jackbenny/check_temp) plugin,
 +uses the `lm-sensors` binary to monitor temperature sensors.
 +
 +Custom attributes passed as [command parameters](03-monitoring-basics.md#command-passing-parameters):
 +
 +Name                    | Description
 +------------------------|----------------------------------------------------------------------------------
 +temp_warning            | **Required.** Exit with WARNING status if above INTEGER degrees
 +temp_critical           | **Required.** Exit with CRITICAL status if above INTEGER degrees
 +temp_sensor             | **Optional.** Set what to monitor, for example CPU or MB (or M/B). Check sensors for the correct word. Default is CPU.
 +
+ #### hddtemp <a id="plugin-contrib-command-hddtemp"></a>
+ 
+ The [check_hddtemp](https://github.com/vint21h/nagios-check-hddtemp) plugin,
+ uses the `hddtemp` binary to monitor hard drive temperature.
+ 
+ Custom attributes passed as [command parameters](03-monitoring-basics.md#command-passing-parameters):
+ 
+ Name                    | Description
+ ------------------------|----------------------------------------------------------------------------------
+ hddtemp_server          | **Required.** server name or address
+ hddtemp_port            | **Optional.** port number
+ hddtemp_devices         | **Optional.** comma separated devices list, or empty for all devices in hddtemp response
+ hddtemp_separator       | **Optional.** hddtemp separator
+ hddtemp_warning         | **Required.** warning temperature
+ hddtemp_critical        | **Required.** critical temperature
+ hddtemp_timeout         | **Optional.** receiving data from hddtemp operation network timeout
+ hddtemp_performance     | **Optional.** If set, return performance data
+ hddtemp_quiet           | **Optional.** If set, be quiet
+ 
+ The following sane default value are specified:
+ ```
+ vars.hddtemp_server = "127.0.0.1"
+ vars.hddtemp_warning = 55
+ vars.hddtemp_critical = 60
+ vars.hddtemp_performance = true
+ vars.hddtemp_timeout = 5
+ ```
+ 
  #### adaptec-raid <a id="plugin-contrib-command-adaptec-raid"></a>
  
  The [check_adaptec_raid](https://github.com/thomas-krenn/check_adaptec_raid) plugin

diff --cc itl/plugins-contrib.d/hardware.conf
index 53455a242aa43ab5efd4c0039c1ae2f9d853e710,3a5fefeac961fdb6609821c927c3a259beb53724..46ce836049f12d07763586ffe36af9efc4f3b4dc
--- 1/itl/plugins-contrib.d/hardware.conf
--- 2/itl/plugins-contrib.d/hardware.conf
+++ b/itl/plugins-contrib.d/hardware.conf
@@@ -205,27 -205,55 +205,80 @@@ object CheckCommand "openmanage" 
        }
  }
  
 +object CheckCommand "temp" {
 +      command = [ PluginDir + "/check_temp" ]
 +
 +      arguments = {
 +              "-w" = {
 +                      value = "$temp_warning$"
 +                      description = "Exit with WARNING status if above INTEGER degrees"
 +                      required = true
 +              }
 +              "-c" = {
 +                      value = "$temp_critical$"
 +                      description = "Exit with CRITICAL status if above INTEGER degrees"
 +                      required = true
 +              }
 +              "--sensor" = {
 +                      value = "$temp_sensor$"
 +                      description = "Set what to monitor, for example CPU or MB (or M/B). Check sensors for the correct word. Default is CPU."
 +              }
 +      }
 +
 +      vars.temp_warning = "75"
 +      vars.temp_critical = "80"
 +      vars.temp_sensor = "Core"
 +}
++
+ object CheckCommand "hddtemp" {
+       import "plugin-check-command"
+       command = [ PluginDir + "/check_hddtemp" ]
+ 
+       arguments = {
+               "--server" = {
+                       value = "$hddtemp_server$"
+                       description = "server name or address"
+                       required = true
+               }
+               "--port" = {
+                       value = "$hddtemp_port$"
+                       description = "port number"
+               }
+               "--devices" = {
+                       value = "$hddtemp_devices$"
+                       description = "comma separated devices list, or empty for all devices in hddtemp response"
+               }
+               "--separator" = {
+                       value = "$hddtemp_separator$"
+                       description = "hddtemp separator"
+               }
+               "--warning" = {
+                       value = "$hddtemp_warning$"
+                       description = "warning temperature"
+                       required = true
+               }
+               "--critical" = {
+                       value = "$hddtemp_critical$"
+                       description = "critical temperature"
+                       required = true
+               }
+               "--timeout" = {
+                       value = "$hddtemp_timeout$"
+                       description = "receiving data from hddtemp operation network timeout"
+               }
+               "--performance-data" = {
+                       set_if = "$hddtemp_performance$"
+                       description = "return performance data"
+               }
+               "--quiet" = {
+                       set_if = "$hddtemp_quiet$"
+                       description = "be quiet"
+               }
+       }
+ 
+       vars.hddtemp_server = "127.0.0.1"
+       vars.hddtemp_warning = 55
+       vars.hddtemp_critical = 60
+       vars.hddtemp_performance = true
+       vars.hddtemp_timeout = 5
+ }