make all monit network checks similar, with retry and timeouts.

roles/monitoring/files/etc_monit_conf.d_apache2

@@ -4,5 +4,6 @@ check process apache2 with pidfile /var/run/apache2/apache2.pid
   stop program = "/bin/systemctl stop apache2"
   if failed host localhost port 80 protocol http
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_commento

@@ -4,5 +4,6 @@ check process commento matching "commento"
   stop program = "/bin/systemctl stop commento"
   if failed port 9100 protocol http
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_dnsmasq

@@ -2,5 +2,8 @@ check process dnsmasq with pidfile "/run/dnsmasq/dnsmasq.pid"
   group system
   start program = "/bin/systemctl start dnsmasq"
   stop program = "/bin/systemctl stop dnsmasq"
-  if failed port 53 type udp protocol dns then alert
-  if failed port 53 type udp protocol dns for 5 cycles then restart
+  if failed port 53 type udp protocol dns
+    with timeout 10 seconds
+    with retry 2
+    then restart
+  if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_dovecot

@@ -2,6 +2,12 @@ check process dovecot with pidfile /var/run/dovecot/master.pid
   group mail
   start program = "/bin/systemctl start dovecot"
   stop program = "/bin/systemctl stop dovecot"
-  if failed port 993 type tcpssl sslauto protocol imap for 5 cycles then restart
-  if failed port 995 type tcpssl sslauto protocol pop for 5 cycles then restart
-  if 3 restarts within 5 cycles then timeout
+  if failed port 993 type tcpssl sslauto protocol imap
+    with timeout 10 seconds
+    with retry 2
+    then restart
+  if failed port 995 type tcpssl sslauto protocol pop
+    with timeout 10 seconds
+    with retry 2
+    then restart
+  if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_fathom

@@ -4,5 +4,6 @@ check process fathom matching fathom
   stop program = "/bin/systemctl stop fathom-stats"
   if failed port 9000 protocol http
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_gitea

@@ -4,5 +4,6 @@ check process gitea matching gitea
   stop program = "/bin/systemctl stop gitea"
   if failed port 3000 protocol http
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_grafana

@@ -2,5 +2,8 @@ check process grafana with pidfile /var/run/grafana/grafana-server.pid
   group iot
   start program = "/bin/systemctl start grafana-server"
   stop program = "/bin/systemctl stop grafana-server"
-  if failed host localhost port 2942 protocol http then restart
+  if failed port 2942 protocol http
+    with timeout 10 seconds
+    with retry 2
+    then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_influxdb

@@ -4,5 +4,6 @@ check process influxdb matching "influxd"
   stop program = "/bin/systemctl stop influxdb"
   if failed port 8086 type tcp
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_mastodon

@@ -4,6 +4,7 @@ check process mastodon-web matching "puma [0-9.]* \(tcp://0.0.0.0:4220\) \[masto
   stop program = "/bin/systemctl stop mastodon-web"
   if failed port 4220 type tcp
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout
 
@@ -13,6 +14,7 @@ check process mastodon-streaming matching "/home/mastodon/mastodon/streaming/ind
   stop program = "/bin/systemctl stop mastodon-streaming"
   if failed port 4210 type tcp
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout
 

roles/monitoring/files/etc_monit_conf.d_matrix

@@ -4,5 +4,6 @@ check process synapse matching /opt/venvs/matrix-synapse/bin/python
   stop program = "/bin/systemctl stop matrix-synapse"
   if failed port 8008 type tcp
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_mongodb

@@ -4,5 +4,6 @@ check process mongodb matching "mongod"
   stop program = "/bin/systemctl stop mongod"
   if failed port 27017 type tcp
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_mosquitto

@@ -2,7 +2,16 @@ check process mosquitto matching mosquitto
   group iot
   start program = "/bin/systemctl start mosquitto"
   stop program = "/bin/systemctl stop mosquitto"
-  if failed host localhost port 1883 type tcp then restart
-  if failed host localhost port 8883 type tcp then restart
-  if failed host localhost port 8083 type tcp then restart
+  if failed port 1883 type tcp
+    with timeout 10 seconds
+    with retry 2
+    then restart
+  if failed port 8883 type tcp
+    with timeout 10 seconds
+    with retry 2
+    then restart
+  if failed port 8083 type tcp
+    with timeout 10 seconds
+    with retry 2
+    then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_openvpn

@@ -2,5 +2,8 @@ check process openvpn with pidfile "/run/openvpn/server.pid"
   group system
   start program = "/bin/systemctl start openvpn@server"
   stop program = "/bin/systemctl stop openvpn@server"
-  if failed port 1194 type udp then alert
-  if failed port 1194 type udp for 5 cycles then restart
+  if failed port 1194 type udp
+    with timeout 10 seconds
+    with retry 2
+    then restart
+  if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_pgsql_deb10

@@ -2,5 +2,8 @@ check process postgres with pidfile /var/run/postgresql/11-main.pid
   group database
   start program = "/bin/systemctl start postgresql"
   stop program = "/bin/systemctl stop postgresql"
-  if failed host localhost port 5432 protocol pgsql then restart
+  if failed port 5432 protocol pgsql
+    with timeout 10 seconds
+    with retry 2
+    then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_pgsql_deb11

@@ -2,5 +2,8 @@ check process postgres with pidfile /var/run/postgresql/13-main.pid
   group database
   start program = "/bin/systemctl start postgresql"
   stop program = "/bin/systemctl stop postgresql"
-  if failed host localhost port 5432 protocol pgsql then restart
+  if failed port 5432 protocol pgsql
+    with timeout 10 seconds
+    with retry 2
+    then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_pgsql_deb9

@@ -2,5 +2,8 @@ check process postgres with pidfile /var/run/postgresql/9.6-main.pid
   group database
   start program = "/bin/systemctl start postgresql"
   stop program = "/bin/systemctl stop postgresql"
-  if failed host localhost port 5432 protocol pgsql then restart
+  if failed port 5432 protocol pgsql
+    with timeout 10 seconds
+    with retry 2
+    then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_postfix

@@ -2,5 +2,8 @@ check process postfix with pidfile /var/spool/postfix/pid/master.pid
   group mail
   start program = "/bin/systemctl start postfix"
   stop program = "/bin/systemctl stop postfix"
-  if failed port 25 protocol smtp then restart
+  if failed port 25 protocol smtp
+    with timeout 10 seconds
+    with retry 2
+    then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_prosody

@@ -4,5 +4,6 @@ check process prosody with pidfile /var/run/prosody/prosody.pid
   stop program = "/bin/systemctl stop prosody"
   if failed port 5222 type tcp
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_redis

@@ -4,5 +4,6 @@ check process redis with pidfile /var/run/redis/redis-server.pid
   stop program = "/bin/systemctl stop redis"
   if failed port 6379 type tcp
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_rocketchat

@@ -4,5 +4,6 @@ check process rocketchat matching "Rocket.Chat"
   stop program = "/bin/systemctl stop rocketchat"
   if failed port 3042 protocol http
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_rspamd

@@ -4,5 +4,6 @@ check process rspamd matching rspamd
   stop program = "/bin/systemctl stop rspamd"
   if failed port 11333 type tcp
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_slapd

@@ -4,5 +4,6 @@ check process slapd with pidfile /var/run/slapd/slapd.pid
   stop program = "/bin/systemctl stop slapd"
   if failed port 389 protocol LDAP3
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_sshd

@@ -2,5 +2,8 @@ check process sshd with pidfile /var/run/sshd.pid
   group system
   start program = "/bin/systemctl start ssh"
   stop program = "/bin/systemctl stop ssh"
-  if failed host 127.0.0.1 port 22 protocol ssh then restart
+  if failed port 22 protocol ssh
+    with timeout 10 seconds
+    with retry 2
+    then restart
   if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_tomcat_deb10

@@ -2,5 +2,8 @@ check process tomcat matching tomcat9
   group mail
   start program = "/bin/systemctl start tomcat9"
   stop program = "/bin/systemctl stop tomcat9"
-  if failed port 8080 then alert
-  if failed port 8080 for 5 cycles then restart
+  if failed port 8080
+    with timeout 10 seconds
+    with retry 2
+    then restart
+  if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_tomcat_deb9

@@ -2,5 +2,8 @@ check process tomcat with pidfile "/var/run/tomcat8.pid"
   group mail
   start program = "/bin/systemctl start tomcat8"
   stop program = "/bin/systemctl stop tomcat8"
-  if failed port 8080 then alert
-  if failed port 8080 for 5 cycles then restart
+  if failed port 8080
+    with timeout 10 seconds
+    with retry 2
+    then restart
+  if 5 restarts within 5 cycles then timeout

roles/monitoring/files/etc_monit_conf.d_znc

@@ -4,5 +4,6 @@ check process znc with pidfile /var/run/znc/znc.pid
   stop program = "/bin/systemctl stop znc"
   if failed port 6643 type tcp
     with timeout 10 seconds
+    with retry 2
     then restart
   if 5 restarts within 5 cycles then timeout