x
/
kwapi
Code Issues Proposed changes

RRD: bug fixes. 

Change-Id: I8828f137e4fdde55b88fb8a7e632702bee7fb4b9
This commit is contained in:
François Rossigneux 2013-06-29 11:11:49 +02:00
parent b475bb15dc
commit 1f47df830c
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/kwapi/rrd.conf
View File

@ -16,9 +16,10 @@ rrd_dir = /var/lib/kwapi/kwapi-rrd
# Billing
kwh_price = 0.125
currency = €
# Graphs
color = #BBFF99
hue = 100
max_watts = 200
refresh_interval = 5

26
kwapi/plugins/rrd/rrd.py
View File

@ -42,6 +42,9 @@ rrd_opts = [
cfg.FloatOpt('kwh_price',
required=True,
),
cfg.IntOpt('hue',
required=True,
),
cfg.IntOpt('max_watts',
required=True,
),
@ -51,7 +54,7 @@ rrd_opts = [
cfg.MultiStrOpt('watch_probe',
required=False,
),
cfg.StrOpt('color',
cfg.StrOpt('currency',
required=True,
),
cfg.StrOpt('driver_metering_secret',
@ -99,21 +102,14 @@ def color_generator(nb_colors):
step = 0
else:
step = (max_brightness-min_brightness) / (nb_colors-1.0)
rgb_base = struct.unpack('BBB',
cfg.CONF.color.strip('#').decode('hex'))
i = min_brightness
while True:
hsv = colorsys.rgb_to_hsv(rgb_base[0]/255.0,
rgb_base[1]/255.0,
rgb_base[2]/255.0)
new_rgb = colorsys.hsv_to_rgb(hsv[0],
hsv[1],
i/100.0)
new_rgb = tuple([int(x*255) for x in new_rgb])
yield '#' + struct.pack('BBB', *new_rgb).encode('hex')
while int(i) <= max_brightness:
rgb = colorsys.hsv_to_rgb(cfg.CONF.hue/360.0,
1,
i/100.0)
rgb = tuple([int(x*255) for x in rgb])
yield '#' + struct.pack('BBB', *rgb).encode('hex')
i += step
if i > max_brightness:
i = min_brightness
def create_dirs():
@ -278,7 +274,7 @@ def build_graph(scale, probe=None):
args.append('GPRINT:watt_with_unknown:LAST:Last\: %3.1lf W\j')
args.append('TEXTALIGN:center')
args.append('GPRINT:kwh:LAST:Total\: %lf kWh')
args.append('GPRINT:cost:LAST:Cost\: %lf €')
args.append('GPRINT:cost:LAST:Cost\: %lf ' + cfg.CONF.currency)
LOG.info('Build PNG summary graph')
rrdtool.graph(args)
return png_file