From 240b82fe68f9418d360c648d16f9883bf9de8864 Mon Sep 17 00:00:00 2001 From: Andrey Vertiprahov Date: Sat, 4 Sep 2021 20:47:33 +0500 Subject: [PATCH] Convert MetricsCollector metrics timestamp to localtime. --- services/metricscollector/service.py | 4 +++- ui/web/inv/sensorprofile/Application.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/metricscollector/service.py b/services/metricscollector/service.py index 04cc795021..974e546dca 100755 --- a/services/metricscollector/service.py +++ b/services/metricscollector/service.py @@ -8,6 +8,7 @@ # Python modules import asyncio +import pytz from dataclasses import dataclass from typing import Any, Optional, Tuple, List, Dict, Set, DefaultDict from collections import defaultdict @@ -52,6 +53,7 @@ class MetricsCollectorService(FastAPIService): self.id_mappings: Dict[str, List[CfgItem]] = {} self.n_parts: int = 0 self.ready_event: Optional[asyncio.Event] = None + self.tz = pytz.timezone(config.timezone) async def init_api(self): # Postpone initialization process until config datastream is fully processed @@ -189,7 +191,7 @@ class MetricsCollectorService(FastAPIService): # Matched rule found if map_item.ch_table not in out: out[map_item.ch_table] = { - "ts": item.ts.timestamp() * NS, + "ts": (item.ts.timestamp() + self.tz._utcoffset.seconds) * NS, "scope": map_item.ch_table, "labels": item.labels, "service": item.service, diff --git a/ui/web/inv/sensorprofile/Application.js b/ui/web/inv/sensorprofile/Application.js index 4b1c3a3dfc..89de27e861 100644 --- a/ui/web/inv/sensorprofile/Application.js +++ b/ui/web/inv/sensorprofile/Application.js @@ -101,7 +101,7 @@ Ext.define("NOC.inv.sensorprofile.Application", { fieldLabel: __("Collect interval"), allowBlank: true, uiStyle: "medium", - minValue: 20, + minValue: 1, maxValue: 3600 }, { -- GitLab