PiFrame/monit-dashboard
PiFrame/monit-dashboard
1
0
Fork 0
Code Issues Pull requests Releases Activity

Update to python3

Browse source
This commit is contained in:
KemoNine 2020-08-22 15:45:32 -04:00
parent b136bbeb5a
commit f58707010a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/monit-dashboard.py
View file

@ -30,7 +30,7 @@ output = []
def calculate_count(data): def calculate_count(data):
count = {} count = {}
ls = data.values() ls = list(data.values())
z, nz = 0, 0 z, nz = 0, 0
for v in ls: for v in ls:
if v == 0: if v == 0:
@ -67,14 +67,14 @@ def getMonit():
checks[name] = status[name] checks[name] = status[name]
sorted_checks = OrderedDict() sorted_checks = OrderedDict()
sorted_checks = OrderedDict(sorted(checks.iteritems(), sorted_checks = OrderedDict(sorted(iter(checks.items()),
key=itemgetter(1), reverse=True)) key=itemgetter(1), reverse=True))
count = calculate_count(sorted_checks) count = calculate_count(sorted_checks)
server = dict(name=site, url=s['url'], server = dict(name=site, url=s['url'],
result=sorted_checks, s_rate=count) result=sorted_checks, s_rate=count)
output.append(server) output.append(server)
print(datetime.datetime.now()) print((datetime.datetime.now()))
return(output) return(output)
# Classes # Classes

2
bin/utils.py
View file

@ -15,7 +15,7 @@ def generate_report_excel(output, filename):
worksheet.write('B1', 'Status', bold) worksheet.write('B1', 'Status', bold)
row = 1 row = 1
col = 0 col = 0
for key, value in output[server]['result'].items(): for key, value in list(output[server]['result'].items()):
worksheet.write_string(row, col, key) worksheet.write_string(row, col, key)
if value == 0: if value == 0:
status = 'OK' status = 'OK'