From 16d56109c899a4834ec1fcc019e7ee4e418f22eb Mon Sep 17 00:00:00 2001
From: Bharath Vignesh J K <52282402+RazCrimson@users.noreply.github.com>
Date: Mon, 19 Aug 2024 00:01:59 +0530
Subject: [PATCH] chg: alerts - standardise history display timings

---
 .../static/js/components/plugin-alert.vue     | 187 +++++++++---------
 glances/outputs/static/public/glances.js      | Bin 452858 -> 453190 bytes
 glances/plugins/alert/__init__.py             |   4 +-
 3 files changed, 100 insertions(+), 91 deletions(-)

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 @@
 <template>
-    <div class="plugin">
-        <section id="alerts">
+  <div class="plugin">
+    <section id="alerts">
             <span class="title" v-if="hasAlerts">
                 Warning or critical alerts (last {{ countAlerts }} entries)
             </span>
-            <span class="title" v-else>No warning or critical alert detected</span>
-        </section>
-        <section id="alert">
-            <div class="table">
-                <div class="table-row" v-for="(alert, alertId) in alerts" :key="alertId">
-                    <div class="table-cell text-left">
-                        {{ formatDate(alert.begin) }}
-                        {{ alert.tz }}
-                        ({{ alert.ongoing ? 'ongoing' : alert.duration }}) -
-                        <span v-show="!alert.ongoing"> {{ alert.state }} on </span>
-                        <span :class="alert.state.toLowerCase()">
+      <span class="title" v-else>No warning or critical alert detected</span>
+    </section>
+    <section id="alert">
+      <div class="table">
+        <div class="table-row" v-for="(alert, alertId) in alerts" :key="alertId">
+          <div class="table-cell text-left">
+            {{ formatDate(alert.begin) }}
+            ({{ alert.ongoing ? 'ongoing' : alert.duration }}) -
+            <span v-show="!alert.ongoing"> {{ alert.state }} on </span>
+            <span :class="alert.state.toLowerCase()">
                             {{ alert.type }}
-                        </span>
-                        ({{ $filters.number(alert.max, 1) }})
-                        {{ alert.top }}
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
+            </span>
+            ({{ $filters.number(alert.max, 1) }})
+            {{ alert.top }}
+          </div>
+        </div>
+      </div>
+    </section>
+  </div>
 </template>
 
 <script>
-import { padStart } from 'lodash';
-import { GlancesFavico } from '../services.js';
+import {padStart} from 'lodash';
+import {GlancesFavico} from '../services.js';
 
 export default {
-    props: {
-        data: {
-            type: Object
-        }
-    },
-    computed: {
-        stats() {
-            return this.data.stats['alert'];
-        },
-        alerts() {
-            return (this.stats || []).map((alertalertStats) => {
-                const alert = {};
-                var tzoffset = new Date().getTimezoneOffset();
-                alert.state = alertalertStats.state;
-                alert.type = alertalertStats.type;
-                alert.begin = alertalertStats.begin * 1000 - tzoffset * 60 * 1000;
-                alert.end = alertalertStats.end * 1000 - tzoffset * 60 * 1000;
-                alert.ongoing = alertalertStats.end == -1;
-                alert.min = alertalertStats.min;
-                alert.avg = alertalertStats.avg;
-                alert.max = alertalertStats.max;
-                alert.top = alertalertStats.top.join(', ');
-
-                if (!alert.ongoing) {
-                    const duration = alert.end - alert.begin;
-                    const seconds = parseInt((duration / 1000) % 60),
-                        minutes = parseInt((duration / (1000 * 60)) % 60),
-                        hours = parseInt((duration / (1000 * 60 * 60)) % 24);
-
-                    alert.duration =
-                        padStart(hours, 2, '0') +
-                        ':' +
-                        padStart(minutes, 2, '0') +
-                        ':' +
-                        padStart(seconds, 2, '0');
-                }
-
-                return alert;
-            });
-        },
-        hasAlerts() {
-            return this.countAlerts > 0;
-        },
-        countAlerts() {
-            return this.alerts.length;
-        },
-        hasOngoingAlerts() {
-            return this.countOngoingAlerts > 0;
-        },
-        countOngoingAlerts() {
-            return this.alerts.filter(({ ongoing }) => ongoing).length;
-        }
-    },
-    watch: {
-        countOngoingAlerts() {
-            if (this.countOngoingAlerts) {
-                GlancesFavico.badge(this.countOngoingAlerts);
-            } else {
-                GlancesFavico.reset();
-            }
-        }
-    },
-    methods: {
-        formatDate(date) {
-            return new Date(date).toLocaleString();
-        }
+  props: {
+    data: {
+      type: Object
     }
+  },
+  computed: {
+    stats() {
+      return this.data.stats['alert'];
+    },
+    alerts() {
+      return (this.stats || []).map((alertStats) => {
+        const alert = {};
+        alert.state = alertStats.state;
+        alert.type = alertStats.type;
+        alert.begin = alertStats.begin * 1000;
+        alert.end = alertStats.end * 1000;
+        alert.ongoing = alertStats.end == -1;
+        alert.min = alertStats.min;
+        alert.avg = alertStats.avg;
+        alert.max = alertStats.max;
+        alert.top = alertStats.top.join(', ');
+
+        if (!alert.ongoing) {
+          const duration = alert.end - alert.begin;
+          const seconds = parseInt((duration / 1000) % 60),
+              minutes = parseInt((duration / (1000 * 60)) % 60),
+              hours = parseInt((duration / (1000 * 60 * 60)) % 24);
+
+          alert.duration = padStart(hours, 2, '0') +
+              ':' + padStart(minutes, 2, '0') +
+              ':' + padStart(seconds, 2, '0');
+        }
+
+        return alert;
+      });
+    },
+    hasAlerts() {
+      return this.countAlerts > 0;
+    },
+    countAlerts() {
+      return this.alerts.length;
+    },
+    hasOngoingAlerts() {
+      return this.countOngoingAlerts > 0;
+    },
+    countOngoingAlerts() {
+      return this.alerts.filter(({ongoing}) => ongoing).length;
+    }
+  },
+  watch: {
+    countOngoingAlerts() {
+      if (this.countOngoingAlerts) {
+        GlancesFavico.badge(this.countOngoingAlerts);
+      } else {
+        GlancesFavico.reset();
+      }
+    }
+  },
+  methods: {
+    formatDate(timestamp) {
+      const tzOffset = new Date().getTimezoneOffset();
+      const hours = Math.trunc(Math.abs(tzOffset) / 60);
+      const minutes = Math.abs(tzOffset % 60);
+
+      let tzString = tzOffset <= 0 ? '+' : '-';
+      tzString += String(hours).padStart(2, '0') + String(minutes).padStart(2, '0');
+
+      const date = new Date(timestamp);
+      return String(date.getFullYear()) +
+          '-' + String(date.getMonth()).padStart(2, '0') +
+          '-' + String(date.getDate()).padStart(2, '0') +
+          ' ' + String(date.getHours()).padStart(2, '0') +
+          ':' + String(date.getMinutes()).padStart(2, '0') +
+          ':' + String(date.getSeconds()).padStart(2, '0') +
+          '(' + tzString + ')';
+    }
+  }
 };
 </script>
\ No newline at end of file
diff --git a/glances/outputs/static/public/glances.js b/glances/outputs/static/public/glances.js
index 767630008565db3cc6e3cff24c9d9f899e54d3c6..e98f4c0f74a6ef8ba5c58fd41303c90220d6b647 100644
GIT binary patch
delta 3391
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
IAbBePzZeHyt^fc4

delta 3025
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
IOnzDPUmTh0AOHXW

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