Reuse graphite time format constant

Uninett · Mar 9, 2023 · db33cb2 · db33cb2
1 parent 3b40ba2
commit db33cb2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/python/nav/metrics/data.py b/python/nav/metrics/data.py
@@ -33,6 +33,7 @@
 _logger = logging.getLogger(__name__)
 
 MAX_TARGETS_PER_REQUEST = 100
+GRAPHITE_TIME_FORMAT = "%H:%M_%Y%m%d"
 
 
 def get_metric_average(target, start="-5min", end="now", ignore_unknown=True):
@@ -109,9 +110,9 @@ def get_metric_data(target, start="-5min", end="now"):
     # What does Graphite accept of formats? Lets check if the parameters are
     # datetime objects and try to force a format then
     if isinstance(start, datetime):
-        start = start.strftime('%H:%M%Y%m%d')
+        start = start.strftime(GRAPHITE_TIME_FORMAT)
     if isinstance(end, datetime):
-        end = end.strftime('%H:%M%Y%m%d')
+        end = end.strftime(GRAPHITE_TIME_FORMAT)
 
     query = {
         'target': target,

diff --git a/python/nav/web/sortedstats/views.py b/python/nav/web/sortedstats/views.py
@@ -30,8 +30,8 @@
 from .forms import ViewForm
 from . import CLASSMAP, TIMEFRAMES
 from nav.metrics.errors import GraphiteUnreachableError
+from nav.metrics.data import GRAPHITE_TIME_FORMAT
 
-GRAPHITE_TIME_FORMAT = "%H:%M_%Y%m%d"
 _logger = logging.getLogger(__name__)
 cache = caches['sortedstats']