fixes #6

sarfraznawaz2005 · Feb 11, 2020 · 82d9309 · 82d9309
1 parent 236037e
commit 82d9309
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         }
     ],
     "require": {
-        "php": ">=7.0",
+        "php": ">=7.3",
         "illuminate/support": "~5|~6",
         "consoletvs/charts": "6.*",
         "balping/json-raw-encoder": "^1.0"

diff --git a/src/Charts/CommandsTimeChart.php b/src/Charts/CommandsTimeChart.php
@@ -74,7 +74,7 @@ protected function setData(MeterModel $model)
             if (isset($item->content['time'])) {
                 $this->data[(string)$item->created_at] = [
                     'x' => $item->content['command'],
-                    'y' => $item->content['time'],
+                    'y' => (int)$item->content['time'],
                 ];
             }
         }

diff --git a/src/Charts/ConnectionsChart.php b/src/Charts/ConnectionsChart.php
@@ -57,7 +57,7 @@ protected function setOptions()
     protected function setData(MeterModel $model)
     {
         foreach ($model->type(Type::CONNECTIONS)->filtered()->orderBy('id', 'asc')->get() as $item) {
-            $this->data[(string)$item->created_at] = $item->content['count'];
+            $this->data[(string)$item->created_at] = (int)$item->content['count'];
         }
     }
 

diff --git a/src/Charts/CpuChart.php b/src/Charts/CpuChart.php
@@ -57,7 +57,7 @@ protected function setOptions()
     protected function setData(MeterModel $model)
     {
         foreach ($model->type(Type::CPU)->filtered()->orderBy('id', 'asc')->get() as $item) {
-            $this->data[(string)$item->created_at] = $item->content['percent'];
+            $this->data[(string)$item->created_at] = (int)$item->content['percent'];
         }
     }
 

diff --git a/src/Charts/DiskSpaceChart.php b/src/Charts/DiskSpaceChart.php
@@ -57,7 +57,7 @@ protected function setOptions()
     protected function setData(MeterModel $model)
     {
         foreach ($model->type(Type::DISK)->filtered()->orderBy('id', 'asc')->get() as $item) {
-            $this->data[(string)$item->created_at] = $item->content['percent'];
+            $this->data[(string)$item->created_at] = (int)$item->content['percent'];
         }
     }
 

diff --git a/src/Charts/EventsTimeChart.php b/src/Charts/EventsTimeChart.php
@@ -74,7 +74,7 @@ protected function setData(MeterModel $model)
             if (isset($item->content['time'])) {
                 $this->data[(string)$item->created_at] = [
                     'x' => $item->content['name'],
-                    'y' => $item->content['time'],
+                    'y' => (int)$item->content['time'],
                 ];
             }
         }

diff --git a/src/Charts/QueriesTimeChart.php b/src/Charts/QueriesTimeChart.php
@@ -75,7 +75,7 @@ protected function setData(MeterModel $model)
             if (isset($item->content['time'])) {
                 $this->data[(string)$item->created_at] = [
                     'x' => Str::limit($item->content['sql'], 120),
-                    'y' => $item->content['time'],
+                    'y' => (int)$item->content['time'],
                 ];
             }
         }

diff --git a/src/Charts/RequestMemoryChart.php b/src/Charts/RequestMemoryChart.php
@@ -74,7 +74,7 @@ protected function setData(MeterModel $model)
             if (isset($item->content['memory'])) {
                 $this->data[(string)$item->created_at] = [
                     'x' => $item->content['uri'],
-                    'y' => $item->content['memory'],
+                    'y' => (int)$item->content['memory'],
                 ];
             }
         }

diff --git a/src/Charts/RequestTimeChart.php b/src/Charts/RequestTimeChart.php
@@ -74,7 +74,7 @@ protected function setData(MeterModel $model)
             if (isset($item->content['duration'])) {
                 $this->data[(string)$item->created_at] = [
                     'x' => $item->content['uri'],
-                    'y' => $item->content['duration'],
+                    'y' => (int)$item->content['duration'],
                 ];
             }
         }

diff --git a/src/Charts/SchedulesTimeChart.php b/src/Charts/SchedulesTimeChart.php
@@ -87,7 +87,7 @@ protected function setData(MeterModel $model)
             if (isset($item->content['time'])) {
                 $this->data[(string)$item->created_at] = [
                     'x' => $item->content['command'],
-                    'y' => $item->content['time'],
+                    'y' => (int)$item->content['time'],
                 ];;
             }
         }

diff --git a/src/Charts/ServerMemoryChart.php b/src/Charts/ServerMemoryChart.php
@@ -57,7 +57,7 @@ protected function setOptions()
     protected function setData(MeterModel $model)
     {
         foreach ($model->type(Type::MEMORY)->filtered()->orderBy('id', 'asc')->get() as $item) {
-            $this->data[(string)$item->created_at] = $item->content['percent'];
+            $this->data[(string)$item->created_at] = (int)$item->content['percent'];
         }
     }
 

diff --git a/src/Config/config.php b/src/Config/config.php
@@ -101,28 +101,28 @@
 
         // monitors average CPU usage
         Sarfraznawaz2005\Meter\Monitors\CpuMonitor::class => [
-            'enabled' => env('METER_CPU_MONITOR', true),
+            'enabled' => env('METER_CPU_MONITOR', false),
             'graph_type' => env('METER_CPU_GRAPH_TYPE', 'bar'), // bar, line
             'show_on_dashboard' => env('METER_CPU_ON_DASHBOARD', true)
         ],
 
         // monitors disk space usage
         Sarfraznawaz2005\Meter\Monitors\DiskSpaceMonitor::class => [
-            'enabled' => env('METER_DISK_MONITOR', true),
+            'enabled' => env('METER_DISK_MONITOR', false),
             'graph_type' => env('METER_DISK_GRAPH_TYPE', 'bar'), // bar, line
             'show_on_dashboard' => env('METER_DISK_ON_DASHBOARD', true)
         ],
 
         // monitors server memory usage
         Sarfraznawaz2005\Meter\Monitors\MemoryMonitor::class => [
-            'enabled' => env('METER_MEMORY_MONITOR', true),
+            'enabled' => env('METER_MEMORY_MONITOR', false),
             'graph_type' => env('METER_MEMORY_GRAPH_TYPE', 'bar'), // bar, line
             'show_on_dashboard' => env('METER_MEMOR_ON_DASHBOARD', true)
         ],
 
         // monitors active http connections count on port 80
         Sarfraznawaz2005\Meter\Monitors\HttpConnectionsMonitor::class => [
-            'enabled' => env('METER_HTTP_CONNECTIONS_MONITOR', true),
+            'enabled' => env('METER_HTTP_CONNECTIONS_MONITOR', false),
             'graph_type' => env('METER_HTTP_CONNECTIONS_GRAPH_TYPE', 'bar'), // bar, line
             'show_on_dashboard' => env('METER_HTTP_CONNECTIONS_ON_DASHBOARD', true)
         ],

diff --git a/src/Tables/Table.php b/src/Tables/Table.php
@@ -49,8 +49,8 @@ public function getData(): array
         $draw = request()->draw;
         $start = request()->start;
         $length = request()->length;
-        $orderColumn = request()->order[0]['column'];
-        $dir = request()->order[0]['dir'];
+        $orderColumn = request()->order[0]['column'] ?? null;
+        $dir = request()->order[0]['dir'] ?? null;
         $searchValue = trim(request()->search['value']);
 
         // sets the current page