diff options
Diffstat (limited to 'glances/plugins/alert/__init__.py')
| -rw-r--r-- | glances/plugins/alert/__init__.py | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/glances/plugins/alert/__init__.py b/glances/plugins/alert/__init__.py index 79ced119..8275bb30 100644 --- a/glances/plugins/alert/__init__.py +++ b/glances/plugins/alert/__init__.py @@ -2,7 +2,7 @@ # # This file is part of Glances. # -# SPDX-FileCopyrightText: 2023 Nicolas Hennion <nicolas@nicolargo.com> +# SPDX-FileCopyrightText: 2024 Nicolas Hennion <nicolas@nicolargo.com> # # SPDX-License-Identifier: LGPL-3.0-only # @@ -10,8 +10,6 @@ """Alert plugin.""" from datetime import datetime -from time import tzname -import pytz from glances.events_list import glances_events @@ -91,7 +89,7 @@ fields_description = { 'global_msg': { 'description': 'Global alert message', 'unit': 'string', - } + }, } @@ -104,9 +102,7 @@ class PluginModel(GlancesPluginModel): def __init__(self, args=None, config=None): """Init the plugin.""" super(PluginModel, self).__init__( - args=args, config=config, - stats_init_value=[], - fields_description=fields_description + args=args, config=config, stats_init_value=[], fields_description=fields_description ) # We want to display the stat in the curse interface @@ -120,6 +116,10 @@ class PluginModel(GlancesPluginModel): glances_events.set_max_events(config.get_int_value('alert', 'max_events', default=10)) glances_events.set_min_duration(config.get_int_value('alert', 'min_duration', default=6)) glances_events.set_min_interval(config.get_int_value('alert', 'min_interval', default=6)) + else: + glances_events.set_max_events(10) + glances_events.set_min_duration(6) + glances_events.set_min_interval(6) def update(self): """Nothing to do here. Just return the global glances_log.""" @@ -147,8 +147,7 @@ class PluginModel(GlancesPluginModel): # New line ret.append(self.curse_new_line()) # Start - msg = str(datetime.fromtimestamp(alert['begin'], - tz=pytz.timezone(tzname[0] if tzname[0] else 'UTC'))) + msg = str(datetime.fromtimestamp(alert['begin'], tz=datetime.now().astimezone().tzinfo)) ret.append(self.curse_add_line(msg)) # Duration if alert['end'] > 0: @@ -170,9 +169,7 @@ class PluginModel(GlancesPluginModel): if self.approx_equal(alert['min'], alert['max'], tolerance=0.1): msg = ' ({:.1f})'.format(alert['avg']) else: - msg = ' (Min:{:.1f} Mean:{:.1f} Max:{:.1f})'.format(alert['min'], - alert['avg'], - alert['max']) + msg = ' (Min:{:.1f} Mean:{:.1f} Max:{:.1f})'.format(alert['min'], alert['avg'], alert['max']) ret.append(self.curse_add_line(msg)) # Top processes top_process = ', '.join(alert['top']) |