Various updates, generally overdue or MIT firewall related

- bots: Google Hangouts is dead, so don't check for the Hangouts-related bots
- Migrate DNS from chankillo to goslar (for the MIT firewall,
  adehnert-sysconfig/salt #64)
- Check that proxy1 is serving mail services (again for the MIT firewall)
    - It also forwards the KDC, but we don't have an existing check for it, and
      it seems unlikely that mail would work but KDC forwarding would go down,
      without an issue with masada, which has its own (ping) monitoring
- olinda has been dead for ages; just delete the file -- we can restore it from
  git if needed

diff --git a/local.d/bots.cfg b/local.d/bots.cfg
index 0bd67a7e356a7fdcc4f7553d9852679ae5a8cfaa..992f8b321a7ced9df072290cec97026ceeca3250 100644 (file)
--- a/local.d/bots.cfg
+++ b/local.d/bots.cfg
@@ -4,22 +4,6 @@ define host{
     address                 bots.augsburg.vms.dehnerts.com
 }
 
-define service {
-    use adehnert-service
-    host_name           bots
-    service_description RUN-BRIDGE
-    check_command       check_byssh_service!bridge-zulip-hangouts.service
-    notifications_enabled   0
-}
-
-define service {
-    use adehnert-service
-    host_name           bots
-    service_description RUN-CHIRON-HANGOUTS
-    check_command       check_byssh_service!chiron-hangouts.service
-    notifications_enabled   0
-}
-
 define service {
     use adehnert-service
     host_name           bots
@@ -27,14 +11,6 @@ define service {
     check_command       check_byssh_service!chiron-zulip.service
 }
 
-define service {
-    use adehnert-service
-    host_name           bots
-    service_description RUN-FORMATIONBOT-HANGOUTS
-    check_command       check_byssh_service!formationbot-hangouts.service
-    notifications_enabled   0
-}
-
 define service {
     use adehnert-service
     host_name           bots

diff --git a/local.d/chankillo.cfg b/local.d/chankillo.cfg
index 4644c9b9ebd0b8a868d6078e3d9f3340cfef3175..f51efa1f0abfa991c7aca7b9c5a0376abe2df626 100644 (file)
--- a/local.d/chankillo.cfg
+++ b/local.d/chankillo.cfg
@@ -55,13 +55,13 @@ define service {
        host_name chankillo
 }
 
-define service {
-       name chankillo-dns
-       use adehnert-service
-       service_description DNS
-       check_command check_dns
-       host_name chankillo
-}
+#define service {
+#      name chankillo-dns
+#      use adehnert-service
+#      service_description DNS
+#      check_command check_dns
+#      host_name chankillo
+#}
 
 define service {
        name chankillo-postgresql

diff --git a/local.d/goslar.cfg b/local.d/goslar.cfg
new file mode 100644 (file)
index 0000000..fa82f5a
--- /dev/null
+++ b/local.d/goslar.cfg
@@ -0,0 +1,14 @@
+define host{
+        use                     adehnert-host            ; Name of host template to use
+        host_name               goslar
+        address                 goslar.dehnerts.com
+}
+
+define service {
+       name goslar-dns
+       use adehnert-service
+       service_description DNS
+        # goslar isn't expected to be a recursive, so use a hostname it's authoritative for
+       check_command check_dns!-Hwww.dehnerts.com
+       host_name goslar
+}

diff --git a/local.d/olinda.cfg b/local.d/olinda.cfg
deleted file mode 100644 (file)
index d7c1674..0000000
--- a/local.d/olinda.cfg
+++ /dev/null
@@ -1,61 +0,0 @@
-define host{
-        use                     adehnert-host            ; Name of host template to use
-        host_name               olinda
-        address                 18.18.208.12
-        notifications_enabled   0
-}
-
-# SMTP is redundant with SMTP-SSL, since they use the same port
-#define service {
-#      name olinda-smtp
-#      use adehnert-service
-#      service_description SMTP
-#      check_command check_smtp
-#      host_name olinda
-#}
-
-define service {
-       name olinda-smtp-ssl
-       use adehnert-service
-       service_description SMTP
-       check_command check_smtp_ssl
-       host_name olinda
-        notifications_enabled   0
-}
-
-define service {
-       name olinda-https
-       use adehnert-service
-       service_description HTTPS
-       check_command check_https_hostname
-       __check_cert_expiry_days 10
-       host_name olinda
-        notifications_enabled   0
-}
-
-define service {
-       name olinda-imaps
-       use adehnert-service
-       service_description IMAPS
-       check_command check_simap
-       host_name olinda
-        notifications_enabled   0
-}
-
-define service {
-       name olinda-dns
-       use adehnert-service
-       service_description DNS
-       check_command check_dns
-       host_name olinda
-        notifications_enabled   0
-}
-
-define service {
-       name olinda-jabber
-       use adehnert-service
-       service_description Jabber
-       check_command check_jabber
-       host_name olinda
-        notifications_enabled   0
-}

diff --git a/local.d/proxy1.cfg b/local.d/proxy1.cfg
new file mode 100644 (file)
index 0000000..3ab99d2
--- /dev/null
+++ b/local.d/proxy1.cfg
@@ -0,0 +1,37 @@
+define host{
+        use                     adehnert-host            ; Name of host template to use
+        host_name               proxy1
+        address                 proxy1.dehnerts.com
+}
+
+define service {
+       name proxy1-smtp-ssl
+       use adehnert-service
+       service_description SMTP
+       check_command check_smtp_ssl
+       host_name proxy1
+}
+
+define service {
+       name proxy1-submission
+       use adehnert-service
+       service_description SUBMISSION
+       check_command check_smtp!-p587
+       host_name proxy1
+}
+
+define service {
+       name proxy1-imaps
+       use adehnert-service
+       service_description IMAPS
+       check_command check_simap!--certificate=21,7
+       host_name proxy1
+}
+
+define service {
+       name proxy1-pops
+       use adehnert-service
+       service_description POP3S
+       check_command check_spop!--certificate=21,7
+       host_name proxy1
+}