Merge branch 'dev'

4 files changed, 23 insertions, 1 deletions

diff --git a/modules/role/manifests/backup.pp b/modules/role/manifests/backup.pp
index b35c542..6b8d00c 100644
--- a/modules/role/manifests/backup.pp
+++ b/modules/role/manifests/backup.pp
@@ -14,6 +14,7 @@ class role::backup (
   include "profile::xmr_stak"
   include "profile::known_hosts"
   include "profile::boinc"
+  include "profile::monitoring"
 
   include "role::backup::postgresql"
 
@@ -124,5 +125,11 @@ class role::backup (
         order   => "$order_dirname-$order_part",
       }
     }
+
+    @profile::monitoring::local_service { "Last backup in $base is not too old":
+      local => {
+        check_command => "check_last_file_date!$base!14",
+      }
+    }
   }
 }
diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp
index 75d9dbd..b7948e6 100644
--- a/modules/role/manifests/caldance.pp
+++ b/modules/role/manifests/caldance.pp
@@ -6,6 +6,7 @@ class role::caldance (
   include "profile::postgresql"
   include "profile::apache"
   include "profile::redis"
+  include "profile::monitoring"
 
   ensure_packages(["python-pip", "python-virtualenv", "python-django"])
 }
diff --git a/modules/role/manifests/cryptoportfolio.pp b/modules/role/manifests/cryptoportfolio.pp
index c675e91..1738685 100644
--- a/modules/role/manifests/cryptoportfolio.pp
+++ b/modules/role/manifests/cryptoportfolio.pp
@@ -28,6 +28,7 @@ class role::cryptoportfolio (
   include "profile::apache"
   include "profile::xmr_stak"
   include "profile::boinc"
+  include "profile::monitoring"
 
   contain "role::cryptoportfolio::postgresql"
   contain "role::cryptoportfolio::apache"
@@ -41,7 +42,6 @@ class role::cryptoportfolio (
     contain "role::cryptoportfolio::bot"
   }
 
-  # FIXME: restore backup
   unless empty($front_version) {
     contain "role::cryptoportfolio::front"
   }
diff --git a/modules/role/manifests/etherpad.pp b/modules/role/manifests/etherpad.pp
index 5ab5023..119af56 100644
--- a/modules/role/manifests/etherpad.pp
+++ b/modules/role/manifests/etherpad.pp
@@ -22,6 +22,7 @@ class role::etherpad (
   include "profile::tools"
   include "profile::postgresql"
   include "profile::apache"
+  include "profile::monitoring"
 
   ensure_packages(["npm"])
   ensure_packages(["abiword"])
@@ -121,4 +122,17 @@ class role::etherpad (
     proxy_preserve_host => true;
     default: *          => $::profile::apache::apache_vhost_default;
   }
+
+  @profile::monitoring::external_service { "Etherpad service is running on $web_host":
+    type   => "web",
+    master => {
+      check_command => "check_https!$web_host!/!<title>Etherpad"
+    }
+  }
+  @profile::monitoring::external_service { "$web_host ssl certificate is up to date":
+    type   => "web",
+    master => {
+      check_command => "check_https_certificate!$web_host"
+    }
+  }
 }