Fix metricts filters, fix #68

Author: RobiNN1

assets/js/scripts.js

@@ -559,7 +559,7 @@ const time_switcher = (callback) => {
             time_buttons.forEach(btn => btn.classList.remove('active'));
             button.classList.add('active');
 
-            metrics_active_filter = parseInt(button.dataset.tab, 10);
+            metrics_active_filter = button.dataset.tab;
             callback();
         });
     });
@@ -607,7 +607,7 @@ const fetch_metrics = (callback) => {
         } else {
             document.getElementById('alerts').innerHTML = `Server responded with status ${request.status}`;
         }
-    }, {points: metrics_active_filter}, false);
+    }, {filter: metrics_active_filter}, false);
 };
 
 const init_metrics = (render_charts, chart_config) => {

config.dist.php

@@ -149,7 +149,7 @@
     'listview'       => 'table', // table/tree - default key list view.
     'panelrefresh'   => 30, // In seconds, refresh interval for panels - default 30
     'metricsrefresh' => 60, // In seconds, refresh interval for metrics - default 60
-    'metricstab'     => 1440, // Default tab in metrics, 60 - Last hour, 1440 - Last day, 10080 - Last week, 43200 - Last month - default 1440
+    'metricstab'     => '1d', // Default tab in metrics, 1h - Last hour, 1d - Last day, 1w - Last week, 1m - Last month - default 1d
     'hash'           => 'pca', // Any random string to secure a metrics DB file.
     'metricsdir'     => __DIR__.'/tmp/metrics', // Directory for metrics DB files.
     'twigcache'      => __DIR__.'/tmp/twig', // Directory for Twig cache files.

src/Dashboards/Memcached/MemcachedMetrics.php

@@ -248,15 +248,22 @@ private function insertMetrics(array $metrics): void {
      * @return array<int, array<string, mixed>>
      */
     private function fetchRecentMetrics(): array {
-        $max_data_points_to_return = Http::post('points', Config::get('metricstab', 1440));
+        $filter = Http::post('filter', Config::get('metricstab', '1d'));
 
-        $stmt = $this->pdo->prepare('SELECT * FROM metrics ORDER BY id DESC LIMIT :limit');
-        $stmt->bindValue(':limit', $max_data_points_to_return, PDO::PARAM_INT);
-        $stmt->execute();
+        $seconds = match ($filter) {
+            '1h' => 3600,
+            '1w' => 604800,
+            '1m' => 2592000,
+            default => 86400,
+        };
+
+        $time_ago = time() - $seconds;
 
-        $results = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $stmt = $this->pdo->prepare('SELECT * FROM metrics WHERE timestamp >= :time_ago ORDER BY id DESC');
+        $stmt->bindValue(':time_ago', $time_ago, PDO::PARAM_INT);
+        $stmt->execute();
 
-        return array_reverse($results);
+        return array_reverse($stmt->fetchAll(PDO::FETCH_ASSOC));
     }
 
     /**

src/Dashboards/Redis/RedisMetrics.php

@@ -158,10 +158,19 @@ private function insertMetrics(array $metrics): void {
      * @return array<int, array<string, mixed>>
      */
     private function fetchRecentMetrics(): array {
-        $max_data_points_to_return = Http::post('points', Config::get('metricstab', 1440));
+        $filter = Http::post('filter', Config::get('metricstab', '1d'));
 
-        $stmt = $this->pdo->prepare('SELECT * FROM metrics ORDER BY id DESC LIMIT :limit');
-        $stmt->bindValue(':limit', $max_data_points_to_return, PDO::PARAM_INT);
+        $seconds = match ($filter) {
+            '1h' => 3600,
+            '1w' => 604800,
+            '1m' => 2592000,
+            default => 86400,
+        };
+
+        $time_ago = time() - $seconds;
+
+        $stmt = $this->pdo->prepare('SELECT * FROM metrics WHERE timestamp >= :time_ago ORDER BY id DESC');
+        $stmt->bindValue(':time_ago', $time_ago, PDO::PARAM_INT);
         $stmt->execute();
 
         return array_reverse($stmt->fetchAll(PDO::FETCH_ASSOC));

templates/dashboards/memcached/metrics.twig

@@ -1,12 +1,12 @@
 {{ include('components/tabs.twig', {
     tabs: true,
     pills: true,
-    selected: config('metricstab', 1440),
+    selected: config('metricstab', '1d'),
     links: {
-        60: 'Last hour',
-        1440: 'Last day',
-        10080: 'Last week',
-        43200: 'Last month',
+        '1h': 'Last hour',
+        '1d': 'Last day',
+        '1w': 'Last week',
+        '1m': 'Last month',
     },
 }) }}
 

templates/dashboards/redis/metrics.twig

@@ -1,12 +1,12 @@
 {{ include('components/tabs.twig', {
     tabs: true,
     pills: true,
-    selected: config('metricstab', 1440),
+    selected: config('metricstab', '1d'),
     links: {
-        60: 'Last hour',
-        1440: 'Last day',
-        10080: 'Last week',
-        43200: 'Last month',
+        '1h': 'Last hour',
+        '1d': 'Last day',
+        '1w': 'Last week',
+        '1m': 'Last month',
     },
 }) }}
 

templates/layout.twig

@@ -30,7 +30,8 @@
 
         const panels_refresh_interval = {{ config('panelrefresh', 30) * 1000 }};
         const ajax_panels = {{ ajax_panels is defined and ajax_panels == true ? 'true' : 'false' }};
-        let metrics_active_filter = {{ config('metricstab', 1440) }};
+        const metrics_refresh_interval = {{ config('metricsrefresh', 30) * 1000 }};
+        let metrics_active_filter = '{{ config('metricstab', '1d') }}';
         const decimalsep = '{{ config('decimalsep', ',') }}';
         const thousandssep = '{{ config('thousandssep', ' ') }}';
     </script>