From e36bb075fbfc2c7f17311407ce357183f741f938 Mon Sep 17 00:00:00 2001
From: "Kim B. Heino" <b@bbbs.net>
Date: Tue, 6 Apr 2021 16:03:56 +0300
Subject: [PATCH] amavis_multi: rename "amavisd" to "amavis", as "d" was
 dropped in upstream too

---
 plugins/amavis/amavis_multi | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/amavis/amavis_multi b/plugins/amavis/amavis_multi
index 1fbb1893..93dc5931 100755
--- a/plugins/amavis/amavis_multi
+++ b/plugins/amavis/amavis_multi
@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-"""Munin plugin to monitor amavisd mail filter status.
+"""Munin plugin to monitor amavis mail filter status.
 
 =head1 NAME
 
-amavis_multi - monitor amavisd mail filter status
+amavis_multi - monitor amavis mail filter status
 
 =head1 CONFIGURATION
 
@@ -45,7 +45,7 @@ def run_binary(arg):
 
 
 def get_values():
-    """Get status from nanny and agent. They are part of amavisd."""
+    """Get status from nanny and agent. They are part of amavis."""
     ret = {
         'nanny': {
             'total': 0,
@@ -85,7 +85,7 @@ def print_status(config):
     # doesn't trigger warning.
     print('multigraph amavis_childs')
     if config or both:
-        print('graph_title Amavisd mail filter busy childs')
+        print('graph_title Amavis mail filter busy childs')
         print('graph_vlabel % busy')
         print('graph_args --base 1000 --lower-limit 0 --upper-limit 100')
         print('graph_category spamfilter')
@@ -114,7 +114,7 @@ def print_status(config):
     # Mail counts
     print('multigraph amavis_mails')
     if config or both:
-        print('graph_title Amavisd mail filter mail counts')
+        print('graph_title Amavis mail filter mail counts')
         print('graph_period minute')
         print('graph_vlabel mails per ${graph_period}')
         print('graph_args --base 1000 --lower-limit 0')
@@ -154,7 +154,7 @@ def print_status(config):
     # Elapsed times
     print('multigraph amavis_times')
     if config or both:
-        print('graph_title Amavisd mail filter elapsed times')
+        print('graph_title Amavis mail filter elapsed times')
         print('graph_vlabel seconds per mail')
         print('graph_args --base 1000 --lower-limit 0')
         print('graph_category spamfilter')
@@ -182,7 +182,7 @@ def print_status(config):
 if __name__ == '__main__':
     if len(sys.argv) > 1 and sys.argv[1] == 'autoconf':
         print('yes' if get_values()['agent'] else
-              'no (amavisd is not running)')
+              'no (amavis is not running)')
     elif len(sys.argv) > 1 and sys.argv[1] == 'config':
         print_status(True)
     else: