lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reporting/Health - new rrd fetchData.py can't cope with rrd files containing a single measurement very well. https://forum.opnsense.org/index.php?topic=36634.0

Browse Source
This commit is contained in:
Ad Schellevis 2023-10-26 14:40:02 +02:00
parent 837de4771e
commit 8439eeb90c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/opnsense/scripts/health/fetchData.py
View File

@ -76,7 +76,7 @@ if len(sys.argv) > 1:
if rra.get('cf') == 'AVERAGE':
record = {'ds': []}
ds_count = len(ruleData['ds'])
for ds in ruleData['ds']:
for ds in (ruleData['ds'] if type(ruleData['ds']) is list else [ruleData['ds']]):
record['ds'].append({
'key': ds['name'].strip() if ds.get('name') else '',
'values': []
@ -90,7 +90,7 @@ if len(sys.argv) > 1:
record['recorded_time'] = last_ts - first_ts
for idx, row in enumerate(rra['database']['row']):
this_ts = first_ts + (record['step_size'] * idx)
for vidx, v in enumerate(row['v']):
for vidx, v in enumerate(row['v'] if type(row['v']) is list else [row['v']]):
if ds_count >= vidx:
record['ds'][vidx]['values'].append([
this_ts * 1000,