freifunk/ffmap-backend
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

rrd: fixes

Browse source
This commit is contained in:
Nils Schneider 2014-02-11 11:35:18 +01:00
parent 2ad0deda40
commit 0918b5a3b1
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
rrd.py
View file

@ -34,14 +34,14 @@ class rrd:
,'--step' , '60' ,'--step' , '60'
# Number of nodes available # Number of nodes available
,'DS:nodes:GAUGE:120:0:U' ,'DS:nodes:GAUGE:120:0:U'
,'RRA:LAST:0:1:120' ,'RRA:AVERAGE:0.5:1:120'
,'RRA:LAST:0:60:744' ,'RRA:AVERAGE:0.5:60:744'
,'RRA:LAST:0:1440:1780' ,'RRA:AVERAGE:0.5:1440:1780'
# Number of client available # Number of client available
,'DS:clients:GAUGE:120:0:U' ,'DS:clients:GAUGE:120:0:U'
,'RRA:LAST:0:1:120' ,'RRA:AVERAGE:0.5:1:120'
,'RRA:LAST:0:60:744' ,'RRA:AVERAGE:0.5:60:744'
,'RRA:LAST:0:1440:1780' ,'RRA:AVERAGE:0.5:1440:1780'
] ]
subprocess.call(args) subprocess.call(args)
@ -58,8 +58,8 @@ class rrd:
def createGlobalGraph(self): def createGlobalGraph(self):
nodeGraph = self.imagePath + "/" + "globalGraph.png" nodeGraph = self.imagePath + "/" + "globalGraph.png"
args = ["rrdtool", 'graph', nodeGraph, '-s', '-' + self.displayTimeGlobal, '-w', '800', '-h' '400' args = ["rrdtool", 'graph', nodeGraph, '-s', '-' + self.displayTimeGlobal, '-w', '800', '-h' '400'
,'DEF:nodes=' + self.globalDbFile + ':nodes:LAST', 'LINE1:nodes#F00:nodes\\l' ,'DEF:nodes=' + self.globalDbFile + ':nodes:AVERAGE', 'LINE1:nodes#F00:nodes\\l'
,'DEF:clients=' + self.globalDbFile + ':clients:LAST','LINE2:clients#00F:clients' ,'DEF:clients=' + self.globalDbFile + ':clients:AVERAGE','LINE2:clients#00F:clients'
] ]
subprocess.check_output(args) subprocess.check_output(args)
@ -106,7 +106,7 @@ class rrd:
nodeGraph = self.nodeMACToPNGFile(nodePrimaryMAC) nodeGraph = self.nodeMACToPNGFile(nodePrimaryMAC)
nodeFile = self.nodeMACToRRDFile(nodePrimaryMAC) nodeFile = self.nodeMACToRRDFile(nodePrimaryMAC)
args = ['rrdtool','graph', nodeGraph, '-s', '-' + self.displayTimeNode , '-w', '800', '-h', '400', '-l', '0', '-y', '1:1', args = ['rrdtool','graph', nodeGraph, '-s', '-' + self.displayTimeNode , '-w', '800', '-h', '400', '-l', '0', '-y', '1:1',
'DEF:clients=' + nodeFile + ':clients:LAST', 'DEF:clients=' + nodeFile + ':clients:AVERAGE',
'VDEF:maxc=clients,MAXIMUM', 'VDEF:maxc=clients,MAXIMUM',
'CDEF:c=0,clients,ADDNAN', 'CDEF:c=0,clients,ADDNAN',
'CDEF:d=clients,UN,maxc,UN,1,maxc,IF,*', 'CDEF:d=clients,UN,maxc,UN,1,maxc,IF,*',