sebastian
/
solarrd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed ident

This commit is contained in:
Sebastian 2018-11-07 19:12:50 +01:00
parent f28701d04e
commit 175ae64b75
1 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
update.py
View File

@ -10,6 +10,7 @@ from config import *
calc_crc = crcmod.predefined.mkCrcFun(CRC_TYPE)
def parse_line(line):
if line[-2:] != "\r\n":
print("Failed to parse: newline broken")
@ -31,26 +32,31 @@ def parse_line(line):
return dict(data)
def create_database():
sources = []
for name, minval, maxval in STORED_VALUES:
sources += ["DS:%s:GAUGE:%d:%f:%f" % (name, DATA_INTERVAL * 2, minval, maxval)]
sources += [
"DS:%s:GAUGE:%d:%f:%f" % (name, DATA_INTERVAL * 2, minval, maxval)
]
now = time.time()
now = now - (now % DATA_INTERVAL)
rrd_params = [DATA_FILE,
"--start", "%d" % now,
"--step", str(DATA_INTERVAL)]
rrd_params = [
DATA_FILE, "--start",
"%d" % now, "--step",
str(DATA_INTERVAL)
]
rrd_params += sources
rows = ARCHIVE_INTERVAL / DATA_INTERVAL
rrd_params += ["RRA:LAST:0.1:1:%d" % (rows, )]
rrdtool.create(*rrd_params)
rrd_archive_params = [ARCHIVE_DATA_FILE,
"--start", "now",
"--step", str(DATA_INTERVAL)]
rrd_archive_params = [
ARCHIVE_DATA_FILE, "--start", "now", "--step",
str(DATA_INTERVAL)
]
steps = ARCHIVE_INTERVAL / DATA_INTERVAL
rows = ARCHIVE_KEEP_INTERVAL / ARCHIVE_INTERVAL
rrd_archive_params += sources
@ -58,7 +64,6 @@ def create_database():
rrdtool.create(*rrd_archive_params)
def update_database(line):
update_values = []
for name, _, _ in STORED_VALUES:
@ -68,7 +73,6 @@ def update_database(line):
else:
update_values += [""]
now = time.time()
now = now - (now % DATA_INTERVAL)
line = ("%d:" % now) + ":".join(update_values)
@ -80,13 +84,14 @@ def update_database(line):
print("Failed updating files")
def update_graphs():
for graph_name, lines in GRAPHS.items():
# Render current data
graph_params = ['%s.png' % graph_name, '-a',
'PNG', '-s', 'n-%d' % ARCHIVE_INTERVAL]
graph_params = [
'%s.png' % graph_name, '-a', 'PNG', '-s',
'n-%d' % ARCHIVE_INTERVAL
]
for name, lable, color in lines:
graph_params += ['DEF:%s=%s:%s:LAST' % (name, DATA_FILE, name)]
@ -98,8 +103,10 @@ def update_graphs():
print("Failed to render current data")
# Also render Archives
graph_params = ['%s_archive.png' % graph_name, '-a',
'PNG', '-s', 'n-%d' % ARCHIVE_KEEP_INTERVAL]
graph_params = [
'%s_archive.png' % graph_name, '-a', 'PNG', '-s',
'n-%d' % ARCHIVE_KEEP_INTERVAL
]
for name, lable, color in lines:
graph_params += ['DEF:%s=%s:%s:AVERAGE' % (name, DATA_FILE, name)]
@ -117,6 +124,7 @@ def _do_upload(sftp, src, dest):
except:
print("Unexpected error while uploading:", sys.exc_info()[1])
def upload_graphs():
key = paramiko.RSAKey.from_private_key_file(SFTP_KEY)
@ -128,7 +136,8 @@ def upload_graphs():
for name, _ in GRAPHS.items():
_do_upload(sftp, '%s.png' % name, 'solar/%s.png' % name)
_do_upload(sftp, '%s_archive.png' % name, 'solar/%s_archive.png' % name)
_do_upload(sftp, '%s_archive.png' % name,
'solar/%s_archive.png' % name)
_do_upload(sftp, 'index.html', 'solar/index.html')
sftp.close()
@ -155,7 +164,5 @@ def main():
sys.stdout.flush()
if __name__ == '__main__':
main()