Merge branch 'testing'

files/etc/monit/conf.d-extras/docker-ps

+check program docker-status with path "/opt/monit/docker-ps" with timeout 30 seconds
+              if status != 0 then alert

files/opt/monit/docker-ps

+#!/bin/bash
+
+if [ $(docker ps -q --all --filter status=exited --filter status=dead 2>/dev/null | wc -l) -gt 0 ]; then
+    exit 1
+else
+    exit 0
+fi

manifests/monit.pp

-class ubuntu_server::monit($admin_user = "madmin", $admin_passwd = "gEt0ffMyL4wn", $admin_emails, $mailserver = "mailer.gwdg.de", $monit_basis_config_template = "ubuntu_server/etc/monit/conf.d/config.erb", $monit_filesystems_config_template = "ubuntu_server/etc/monit/conf.d/filesystems.erb", $monit_config_dir = "puppet:///modules/ubuntu_server/etc/monit/conf.d") {
+class ubuntu_server::monit($admin_user = "madmin", $admin_passwd = "gEt0ffMyL4wn", $admin_emails, $mailserver = "mailer.gwdg.de", $monit_basis_config_template = "ubuntu_server/etc/monit/conf.d/config.erb", $monit_filesystems_config_template = "ubuntu_server/etc/monit/conf.d/filesystems.erb", $monit_config_dir = "puppet:///modules/ubuntu_server/etc/monit/conf.d", $docker_check = false) {
 
     File{
         owner => root,
@@ -34,4 +34,24 @@ class ubuntu_server::monit($admin_user = "madmin", $admin_passwd = "gEt0ffMyL4wn
         recurse => remote,
         require => Package['monit'],
     } ~> Service['monit']
+
+    file{'/opt/monit':
+        ensure => directory,
+    }
+
+    if $docker_check == "true" {
+        file{'docker_test':
+            path => "/opt/monit/docker-ps",
+            ensure => present,
+            source => "puppet:///modules/ubuntu_server/opt/monit/docker-ps",
+            mode => 740,
+        }
+
+        file{'/etc/monit/conf.d/docker-ps':
+            ensure => present,
+            source => "puppet:///modules/ubuntu_server/etc/monit/conf.d-extras/docker-ps",
+            require => Package['monit'],
+        } ~> Service['monit']
+    }
+
 }