mirror of
https://github.com/munin-monitoring/contrib.git
synced 2018-11-08 00:59:34 +01:00
Plugin bacula_job: various improvements, flake8-clean
* avoid hiding builtins with variable names (input, bytes, str) * return exitcode=0 for autoconf "no" * unify indentation * fix all issues reported by flake8
This commit is contained in:
Lars Kruse
parent
3533998c5b
commit
fa896dffaa
@ -29,15 +29,15 @@
|
||||
# Magic markers (optional - only used by munin-config and some
|
||||
# installation scripts):
|
||||
#
|
||||
#%# family=contrib
|
||||
#%# capabilities=autoconf
|
||||
# #%# family=contrib
|
||||
# #%# capabilities=autoconf
|
||||
|
||||
import subprocess
|
||||
import time
|
||||
import sys
|
||||
import re
|
||||
import os
|
||||
|
||||
|
||||
def parse_running_jobs():
|
||||
""" Parse the bconsole output once to get the running jobs """
|
||||
|
||||
@ -49,10 +49,9 @@ def parse_running_jobs():
|
||||
clientlist = False
|
||||
|
||||
# Hold the line numbers for devices
|
||||
dev_line = []
|
||||
input = stdout.split("\n")
|
||||
input_lines = stdout.split("\n")
|
||||
|
||||
for line, i in zip(input, range(0, len(input))):
|
||||
for line, i in zip(input_lines, range(0, len(input_lines))):
|
||||
if line.startswith("Connecting to Director "):
|
||||
hostname = line.split()[-1].split(":")[0]
|
||||
|
||||
@ -86,23 +85,29 @@ def parse(clients):
|
||||
bconsole = subprocess.Popen("bconsole", stdin=subprocess.PIPE, stdout=subprocess.PIPE)
|
||||
stdout, stderr = bconsole.communicate(query_str)
|
||||
|
||||
input = stdout.split("\n")
|
||||
input_lines = stdout.split("\n")
|
||||
|
||||
jobstats = []
|
||||
|
||||
for line, pos in zip(input, range(0, len(input))):
|
||||
for line, pos in zip(input_lines, range(0, len(input_lines))):
|
||||
|
||||
# Get the client name
|
||||
if line.startswith("Connecting to Client "):
|
||||
# client_name = input[pos].split()[3].split(".")[0]
|
||||
# client_name = input_lines[pos].split()[3].split(".")[0]
|
||||
client_name = line.split()[3]
|
||||
client_clean = re.sub("^[^A-Za-z_]", "_", client_name, 1)
|
||||
client_clean = re.sub("[^A-Za-z0-9_]", "_", client_clean, 0)
|
||||
|
||||
# Get the current bytes
|
||||
if line.endswith(" is running."):
|
||||
bytes = long(input[pos+2].split()[1].split("=")[1].replace(",", ""))
|
||||
jobstats.append([client_name, client_clean, bytes])
|
||||
bytes_count_text = input_lines[pos+2].split()[1].split("=")[1].replace(",", "")
|
||||
try:
|
||||
# python2
|
||||
bytes_count = long(bytes_count_text)
|
||||
except NameError:
|
||||
# python3
|
||||
bytes_count = int(bytes_count_text)
|
||||
jobstats.append([client_name, client_clean, bytes_count])
|
||||
|
||||
job_dict = {}
|
||||
for job in jobstats:
|
||||
@ -113,54 +118,53 @@ def parse(clients):
|
||||
|
||||
def print_config():
|
||||
hostname, jobs, clients = parse_running_jobs()
|
||||
print "graph_title Bacula Job throughput"
|
||||
print "graph_vlabel bytes per ${graph_period}"
|
||||
print "graph_args --base 1024 -l 0"
|
||||
print "graph_scale yes"
|
||||
print "graph_info Bacula Job measurement."
|
||||
print "graph_category backup"
|
||||
print "graph_order",
|
||||
for fd in clients:
|
||||
print fd[1],
|
||||
print
|
||||
if os.getenv("report_hostname") is not None and \
|
||||
os.getenv("report_hostname").upper() in ["YES", "TRUE", "1", "Y"]:
|
||||
print "host_name", hostname
|
||||
print("graph_title Bacula Job throughput")
|
||||
print("graph_vlabel bytes per ${graph_period}")
|
||||
print("graph_args --base 1024 -l 0")
|
||||
print("graph_scale yes")
|
||||
print("graph_info Bacula Job measurement.")
|
||||
print("graph_category backup")
|
||||
print("graph_order", " ".join(fd[1] for fd in clients))
|
||||
print()
|
||||
if ((os.getenv("report_hostname") is not None) and
|
||||
(os.getenv("report_hostname").upper() in ["YES", "TRUE", "1", "Y"])):
|
||||
print("host_name", hostname)
|
||||
for client in clients:
|
||||
print "%s.label %s" % (client[1], client[0])
|
||||
print "%s.type DERIVE" % (client[1])
|
||||
print "%s.min 0" % (client[1])
|
||||
# print "%s.max %s" % (client[1], str(1024*1024*1024*16))
|
||||
# print "%s.cdef up,8,*" (client[1])
|
||||
print("%s.label %s" % (client[1], client[0]))
|
||||
print("%s.type DERIVE" % (client[1]))
|
||||
print("%s.min 0" % (client[1]))
|
||||
# print("%s.max %s" % (client[1], str(1024*1024*1024*16)))
|
||||
# print("%s.cdef up,8,*" (client[1]))
|
||||
sys.exit(0)
|
||||
|
||||
|
||||
if "config" in sys.argv[1:]:
|
||||
print_config()
|
||||
elif "autoconf" in sys.argv[1:]:
|
||||
for dir in os.getenv("PATH").split(":"):
|
||||
for root, dirs, files in os.walk(dir):
|
||||
for directory in os.getenv("PATH").split(":"):
|
||||
for root, dirs, files in os.walk(directory):
|
||||
if "bconsole" in files:
|
||||
print "yes"
|
||||
print("yes")
|
||||
sys.exit(0)
|
||||
print("no")
|
||||
sys.exit(0)
|
||||
print "no"
|
||||
sys.exit(1)
|
||||
elif "suggest" in sys.argv[1:]:
|
||||
sys.exit(1)
|
||||
else:
|
||||
hostname, jobs, clients = parse_running_jobs()
|
||||
str = []
|
||||
client_pairs = []
|
||||
for client in clients:
|
||||
if client[0].split("-")[0] in jobs:
|
||||
str.append((client[0], client[2]))
|
||||
client_pairs.append((client[0], client[2]))
|
||||
|
||||
client_values = parse(str)
|
||||
client_values = parse(client_pairs)
|
||||
|
||||
for client in clients:
|
||||
client_name_short = client[0].split("-")[0]
|
||||
if client_name_short in client_values:
|
||||
print "%s.value %s" % (client_values[client_name_short][1], client_values[client_name_short][2])
|
||||
print("%s.value %s" % (client_values[client_name_short][1],
|
||||
client_values[client_name_short][2]))
|
||||
else:
|
||||
print "%s.value %s" % (client[1], "0")
|
||||
print("%s.value %s" % (client[1], "0"))
|
||||
|
||||
sys.exit(0)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user