diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2021-02-13 19:14:56 +0100 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2021-02-13 19:15:57 +0100 |
| commit | e5aecdda170a1d64f45bf877c779f47fee474047 (patch) | |
| tree | 5d87072e0fb338e14b7e584fae33097e264a309c | |
| parent | b0684cbe2eb5549e706e85141e5f0657b3d35dec (diff) | |
Handle changes to number of RRD files better
This ensures that the first row contains data (may be None) for all
fields and this ignores RRD files that are no longer plotted.
| -rw-r--r-- | muninplot/data.py | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/muninplot/data.py b/muninplot/data.py index 68fa724..02ad971 100644 --- a/muninplot/data.py +++ b/muninplot/data.py @@ -137,21 +137,22 @@ def _fetch_rrd(filename, start, end, resolution=300, cf='AVERAGE'): pass -def get_raw_values(group, host, graph, start, end, resolution=300, minmax=True): +def get_raw_values(group, host, graph, fields, start, end, resolution=300, minmax=True): """Get the data points available from the specified graph.""" start = int(start / resolution - 1.1) * resolution end = int(end / resolution) * resolution data = defaultdict(defaultdict) for f in _get_rrd_files(group, host, graph): field = '-'.join(f.split('-')[2:-1]) - filename = os.path.join(group, f) - for time_, value in _fetch_rrd(filename, start, end, resolution, 'AVERAGE'): - data[time_][field] = value - if minmax: - for time_, value in _fetch_rrd(filename, start, end, resolution, 'MIN'): - data[time_][field + '.min'] = value - for time_, value in _fetch_rrd(filename, start, end, resolution, 'MAX'): - data[time_][field + '.max'] = value + if field in fields: + filename = os.path.join(group, f) + for time_, value in _fetch_rrd(filename, start, end, resolution, 'AVERAGE'): + data[time_][field] = value + if minmax: + for time_, value in _fetch_rrd(filename, start, end, resolution, 'MIN'): + data[time_][field + '.min'] = value + for time_, value in _fetch_rrd(filename, start, end, resolution, 'MAX'): + data[time_][field + '.max'] = value return [dict(time=k, **v) for k, v in sorted(data.items())] @@ -185,8 +186,15 @@ def cdef_eval(expression, row, suffix=''): def get_values(group, host, graph, start, end, resolution=300, minmax=True): """Get the data points available from the specified graph.""" graph_info = get_info()['%s/%s/%s' % (group, host, graph)] - data = get_raw_values(group, host, graph, start, end, resolution, minmax) + fields = [field_info['name'] for field_info in graph_info['fields']] + data = get_raw_values(group, host, graph, fields, start, end, resolution, minmax) for field_info in graph_info['fields']: + # ensure the field is present in first row + field = field_info['name'] + data[0].setdefault(field, None) + if minmax: + data[0].setdefault(field + '.min', None) + data[0].setdefault(field + '.max', None) # negative is a new field that is the negative of another field negative = field_info.get('negative') if negative: @@ -205,7 +213,6 @@ def get_values(group, host, graph, start, end, resolution=300, minmax=True): pass cdef = field_info.get('cdef') if cdef: - field = field_info['name'] for row in data: try: values = [ |