Projet

Général

Profil

Révision e36bb075

IDe36bb075fbfc2c7f17311407ce357183f741f938
Parent dd749a26
Enfant 30328b35

Ajouté par Kim B. Heino il y a plus de 4 ans

amavis_multi: rename "amavisd" to "amavis", as "d" was dropped in upstream too

Voir les différences:

plugins/amavis/amavis_multi
1 1
#!/usr/bin/env python3
2 2

  
3
"""Munin plugin to monitor amavisd mail filter status.
3
"""Munin plugin to monitor amavis mail filter status.
4 4

  
5 5
=head1 NAME
6 6

  
7
amavis_multi - monitor amavisd mail filter status
7
amavis_multi - monitor amavis mail filter status
8 8

  
9 9
=head1 CONFIGURATION
10 10

  
......
45 45

  
46 46

  
47 47
def get_values():
48
    """Get status from nanny and agent. They are part of amavisd."""
48
    """Get status from nanny and agent. They are part of amavis."""
49 49
    ret = {
50 50
        'nanny': {
51 51
            'total': 0,
......
85 85
    # doesn't trigger warning.
86 86
    print('multigraph amavis_childs')
87 87
    if config or both:
88
        print('graph_title Amavisd mail filter busy childs')
88
        print('graph_title Amavis mail filter busy childs')
89 89
        print('graph_vlabel % busy')
90 90
        print('graph_args --base 1000 --lower-limit 0 --upper-limit 100')
91 91
        print('graph_category spamfilter')
......
114 114
    # Mail counts
115 115
    print('multigraph amavis_mails')
116 116
    if config or both:
117
        print('graph_title Amavisd mail filter mail counts')
117
        print('graph_title Amavis mail filter mail counts')
118 118
        print('graph_period minute')
119 119
        print('graph_vlabel mails per ${graph_period}')
120 120
        print('graph_args --base 1000 --lower-limit 0')
......
154 154
    # Elapsed times
155 155
    print('multigraph amavis_times')
156 156
    if config or both:
157
        print('graph_title Amavisd mail filter elapsed times')
157
        print('graph_title Amavis mail filter elapsed times')
158 158
        print('graph_vlabel seconds per mail')
159 159
        print('graph_args --base 1000 --lower-limit 0')
160 160
        print('graph_category spamfilter')
......
182 182
if __name__ == '__main__':
183 183
    if len(sys.argv) > 1 and sys.argv[1] == 'autoconf':
184 184
        print('yes' if get_values()['agent'] else
185
              'no (amavisd is not running)')
185
              'no (amavis is not running)')
186 186
    elif len(sys.argv) > 1 and sys.argv[1] == 'config':
187 187
        print_status(True)
188 188
    else:

Formats disponibles : Unified diff