diff --git a/glances/outputs/static/js/components/plugin-alert.vue b/glances/outputs/static/js/components/plugin-alert.vue index 84543100..5c109f04 100644 --- a/glances/outputs/static/js/components/plugin-alert.vue +++ b/glances/outputs/static/js/components/plugin-alert.vue @@ -1,102 +1,111 @@ \ No newline at end of file diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js index 76763000..e98f4c0f 100644 Binary files a/glances/outputs/static/public/glances.js and b/glances/outputs/static/public/glances.js differ diff --git a/glances/plugins/alert/__init__.py b/glances/plugins/alert/__init__.py index 5350ba24..9bc26816 100644 --- a/glances/plugins/alert/__init__.py +++ b/glances/plugins/alert/__init__.py @@ -144,8 +144,8 @@ class PluginModel(GlancesPluginModel): # New line ret.append(self.curse_new_line()) # Start - msg = str(datetime.fromtimestamp(alert['begin'], tz=datetime.now().astimezone().tzinfo)) - ret.append(self.curse_add_line(msg)) + alert_dt = datetime.fromtimestamp(alert['begin'], tz=datetime.now().astimezone().tzinfo) + ret.append(self.curse_add_line(alert_dt.strftime("%Y-%m-%d %H:%M:%S(%z)"))) # Duration if alert['end'] > 0: # If finished display duration