# HG changeset patch # User Daniel O'Connor # Date 1569561309 -34200 # Node ID 08cddcdb0db36aa04d7d18a9b96ea2cf35ccc00b # Parent e73e4677f8734cadd311b4a9180e5bd44ad0cdfd fix Munin plugin diff -r e73e4677f873 -r 08cddcdb0db3 adslstats.py --- a/adslstats.py Fri Sep 27 14:44:56 2019 +0930 +++ b/adslstats.py Fri Sep 27 14:45:09 2019 +0930 @@ -75,6 +75,7 @@ help='Base directory for RRD & PNGs') parser.add_argument('-c', '--cookiejar', action='store', help='Location of cookiejar') +parser.add_argument('rest', nargs = '*') args = parser.parse_args() @@ -390,14 +391,12 @@ names = ['Noise Margin (up)', 'Noise Margin (down)', 'Attenuation (up)', 'Attenuation (down)'] if args.munin != None: # Handle the wrapper passing us its $0 as our $1 - tmp = args.munin.split('_') - if len(tmp) > 1: - args.munin = tmp[-1] + args.munin = args.munin.split('_')[-1] if args.munin not in ['signal', 'sync']: print "Unknown data type ", args.munin sys.exit(1) - if len(args) > 0: - if args[0] == 'config': + if len(args.rest) > 0: + if args.rest[0] == 'config': if args.munin == 'signal': print '''graph_category adsl graph_title DSL Signal Quality diff -r e73e4677f873 -r 08cddcdb0db3 muninplugin --- a/muninplugin Fri Sep 27 14:44:56 2019 +0930 +++ b/muninplugin Fri Sep 27 14:45:09 2019 +0930 @@ -7,5 +7,7 @@ # Add entry to /usr/local/etc/munin/plugin-conf.d/plugins.conf # [adslstats_*] # user darius +# env.HOME /home/darius /usr/local/bin/python2 /home/darius/projects/adslstats/adslstats.py -m $0 $1 +