From 0938aa1b94980f8922ccd02707a58762767c8ead Mon Sep 17 00:00:00 2001
From: Jordi Sanfeliu <jordi@fibranet.cat>
Date: Thu, 15 Sep 2022 11:48:40 +0200
Subject: [PATCH] changed the default configuration for 'serv.pm' in
 'monitorix.conf'  #115

---
 monitorix.conf | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/monitorix.conf b/monitorix.conf
index c75c215..e4076e2 100644
--- a/monitorix.conf
+++ b/monitorix.conf
@@ -626,7 +626,31 @@ secure_log_date_format = %b %e
 # SERV graph
 # -----------------------------------------------------------------------------
 <serv>
+	<list>
+		Default = SSH, FTP, TELNET, IMAP, Samba, Fax, CUPS, POP3, SMTP, Spam, Virus, Fail2ban
+	</list>
+	<desc>
+		SSH = file:/root/log/secure, "^%b %e", "sshd\[.*\]: Accepted "
+		FTP = file:/root/log/secure, "%b %e", "START: ftp" + " proftpd\[.*Login successful." + "\"PASS .*\" 230"
+		FTP = file:/root/log/secure, "%b %e", "OK LOGIN:"
+		FTP = file:/root/log/secure, "%b %e", "\[INFO\] .*? is now logged in"
+		TELNET = file:/root/log/secure, "^%b %e", "START: telnet"
+		Samba = exec:/root/bin/samba.sh, "", ""
+		Fax = file:/root/spool/hylafax/etc/xferfaxlog, "^%m/%d/%y", "SEND"
+		CUPS = file:/root/log/cups/page_log, "\[%d/%b/%Y:", ""
+		Fail2ban = file:/root/log/fail2ban.log, "^%Y-%m-%d", " fail2ban.actions .* Ban "
+		IMAP = file:/root/log/imap, "%b %d", " imapd\[.* Login user="
+		POP3 = file:/root/log/imap, "%b %d", " ipop3d\[.* Login user="
+		IMAP = file:/root/log/imap, "%b %d", " imap-login: .* Login: "
+		POP3 = file:/root/log/imap, "%b %d", " pop3-login: .* Login: "
+		SMTP = file:/root/log/maillog, "^%b %e", i:"to=.*stat(us)?=sent"
+		Spam = file:/root/log/maillog, "^%b %e", "MailScanner.*Spam Checks:.*Found.*spam messages" + "amavis\[.* SPAM"
+		Spam = file:/root/log/maillog, "^%b %e", "spamd: identified spam"
+		Virus = file:/root/log/maillog, "^%b %e", "MailScanner.*Virus Scanning:.*Found.*viruses" + "amavis\[.* INFECTED|amavis\[.* BANNED"
+		Virus = file:/root/log/messages, "^%b %e", " clamd\[.* FOUND$"
+	</desc>
 	mode = i
+	graphs_per_row = 2
 	rigid = 0, 0, 0
 	limit = 1000, 1000, 1000
 </serv>
@@ -1311,9 +1335,7 @@ graph_name = system, kern, proc, amdenergy, intelrapl, hptemp, lmsens, gensens,
 	_process7	= Context switches
 	_process8	= Number of processes
 	_process9	= Uptime
-	_serv1		= System services demand
-	_serv2		= IMAP and POP3 services
-	_serv3		= SMTP service
+	_serv		= System services demand
 	_mail1		= Mail statistics
 	_mail2		= Network traffic
 	_mail3		= Mails in queue