Merge branch 'glucas:master' into 'master'

Change binary (and check definition) for check OpenVPN.



See merge request !8

README.md

@@ -17,6 +17,7 @@ available under Debian in package `nagios-plugins-basic`.
 The DNS zone check calls [Bortzmeyer's](https://github.com/bortzmeyer/check_dns_soa)
 (introduced [here](http://www.bortzmeyer.org/go-dns-icinga.html)).
 
+The OpenVPN check calls [Liquidat's](https://github.com/liquidat/nagios-icinga-openvpn/).
 
 Usage
 -----

picomon/checks.py

@@ -259,15 +259,15 @@ class CheckSMTP6(CheckSMTP, Check6):
 
 
 class CheckOpenVPN(Check):
+    def build_command(self):
+        command = ['/usr/lib/nagios/plugins/check_openvpn',
+                   '-p', "443",
+                   '--timeout', str(self.timeout),
+                   str(self.dest)]
+        return command
+
     def check(self):
-        command = ['/usr/lib/nagios/plugins/check_udp',
-                   '-H', self.dest,
-                   '-p', "1194",
-                   '-m', "1",
-                   '-M', "ok",  # actualy just having a reply is enough
-                   '-s', "\x38\x01\x01\x01\x01\x01\x01\x01\x42",
-                   '-e', "@",
-                   '-t', str(self.timeout)]
+        command = self.build_command()
         return self.exec_with_timeout(command, timeout=self.timeout + 1)
 
 
@@ -279,6 +279,21 @@ class CheckOpenVPN6(CheckOpenVPN, Check6):
     pass
 
 
+class CheckOpenVPNTCP(CheckOpenVPN):
+    def check(self):
+        command = self.build_command()
+        command.insert(1, '-t')
+        return self.exec_with_timeout(command, timeout=self.timeout + 1)
+
+
+class CheckOpenVPNTCP4(CheckOpenVPNTCP, Check4):
+    pass
+
+
+class CheckOpenVPNTCP6(CheckOpenVPNTCP, Check6):
+    pass
+
+
 class CheckJabber(Check):
     def check(self):
         command = ['/usr/lib/nagios/plugins/check_jabber',