From eb49b1aade1c4802b17018d4c33e6404c4a86e4f Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Fri, 15 Apr 2016 15:44:28 +0200 Subject: [PATCH] (netflow, flowd agg) correct start timestamp for resolution in get_top_data --- src/opnsense/scripts/netflow/lib/aggregate.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/opnsense/scripts/netflow/lib/aggregate.py b/src/opnsense/scripts/netflow/lib/aggregate.py index 121630aba..72aeb4290 100644 --- a/src/opnsense/scripts/netflow/lib/aggregate.py +++ b/src/opnsense/scripts/netflow/lib/aggregate.py @@ -30,7 +30,6 @@ import os import datetime import sqlite3 -import copy class AggMetadata(object): """ store some metadata needed to keep track of parse progress @@ -336,8 +335,8 @@ class BaseFlowAggregator(object): else: value_sql = '0' - # query filters - query_params['start_time'] = self._parse_timestamp(start_time) + # query filters, correct start_time for resolution + query_params['start_time'] = self._parse_timestamp((int(start_time/self.resolution))*self.resolution) query_params['end_time'] = self._parse_timestamp(end_time) if data_filter: tmp = data_filter.split('=')[0].strip()