Merge pull request #4 from saeedvaziry/analysis-nNgVd5

Apply fixes from StyleCI
saeedvaziry · Jan 21, 2022 · 286ed41 · 286ed41
2 parents 549d830 + 441b4ae
commit 286ed41
Show file tree

Hide file tree

Showing 32 changed files with 139 additions and 121 deletions.
diff --git a/config/monitoring.php b/config/monitoring.php
@@ -13,33 +13,33 @@
      * Route configurations
      */
     'routes' => [
-        'prefix' => 'monitoring',
-        'middlewares' => ['web']
+        'prefix'      => 'monitoring',
+        'middlewares' => ['web'],
     ],
 
     /*
      * Models
      */
     'models' => [
         'monitoring_record' => \SaeedVaziry\Monitoring\Models\MonitoringRecord::class,
-        'monitoring_alert' => \SaeedVaziry\Monitoring\Models\MonitoringAlert::class,
+        'monitoring_alert'  => \SaeedVaziry\Monitoring\Models\MonitoringAlert::class,
     ],
 
     /*
      * Chart colors
      */
     'chart_colors' => [
         'cpu' => [
-            'border_color' => '#4f46e5',
-            'background_color' => '#a5b4fc'
+            'border_color'     => '#4f46e5',
+            'background_color' => '#a5b4fc',
         ],
         'memory' => [
-            'border_color' => '#e11d48',
-            'background_color' => '#fda4af'
+            'border_color'     => '#e11d48',
+            'background_color' => '#fda4af',
         ],
         'disk' => [
-            'border_color' => '#9333ea',
-            'background_color' => '#d8b4fe'
+            'border_color'     => '#9333ea',
+            'background_color' => '#d8b4fe',
         ],
     ],
 
@@ -63,7 +63,7 @@
         /*
          * Fill it if you want the Slack channel
          */
-        'slack_webhook_url' => env('MONITORING_SLACK_WEBHOOK_URL')
+        'slack_webhook_url' => env('MONITORING_SLACK_WEBHOOK_URL'),
     ],
 
     /*
@@ -75,5 +75,5 @@
      * Purge recorded data
      * Supports PHP strtotime options like: '-1 day', '-2 hours', ...
      */
-    'purge_before' => '-1 day'
+    'purge_before' => '-1 day',
 ];
diff --git a/database/factories/MonitoringAlertFactory.php b/database/factories/MonitoringAlertFactory.php
@@ -21,10 +21,10 @@ public function definition()
     {
         return [
             'instance_name' => config('monitoring.instance_name'),
-            'cpu' => 40,
-            'memory' => 30,
-            'disk' => 20,
-            'occurred' => 0
+            'cpu'           => 40,
+            'memory'        => 30,
+            'disk'          => 20,
+            'occurred'      => 0,
         ];
     }
 }
diff --git a/database/factories/MonitoringRecordFactory.php b/database/factories/MonitoringRecordFactory.php
@@ -21,9 +21,9 @@ public function definition()
     {
         return [
             'instance_name' => config('monitoring.instance_name'),
-            'cpu' => 10,
-            'memory' => 20,
-            'disk' => 30,
+            'cpu'           => 10,
+            'memory'        => 20,
+            'disk'          => 30,
         ];
     }
 }
diff --git a/src/Actions/CreateAlert.php b/src/Actions/CreateAlert.php
@@ -9,8 +9,10 @@ class CreateAlert
 {
     /**
      * @param array $input
-     * @return mixed
+     *
      * @throws ValidationException
+     *
+     * @return mixed
      */
     public function create(array $input)
     {
@@ -19,7 +21,7 @@ public function create(array $input)
         $alert = app(config('monitoring.models.monitoring_alert'))
             ->where('instance_name', $input['instance_name'])
             ->firstOrCreate([
-                'instance_name' => $input['instance_name']
+                'instance_name' => $input['instance_name'],
             ], $input);
         $alert->update($input);
 
@@ -28,13 +30,15 @@ public function create(array $input)
 
     /**
      * @param array $input
-     * @return void
+     *
      * @throws ValidationException
+     *
+     * @return void
      */
     protected function validate(array $input)
     {
         $rules = [
-            'instance_name' => 'required'
+            'instance_name' => 'required',
         ];
 
         if (isset($input['cpu']) && !empty($input['cpu'])) {
@@ -56,9 +60,9 @@ protected function validate(array $input)
             (empty($input['cpu']) && empty($input['memory']) && empty($input['disk']))
         ) {
             throw ValidationException::withMessages([
-                'cpu' => __('You must fill at least one item'),
+                'cpu'    => __('You must fill at least one item'),
                 'memory' => __('You must fill at least one item'),
-                'disk' => __('You must fill at least one item'),
+                'disk'   => __('You must fill at least one item'),
             ])->errorBag('createAlert');
         }
     }

diff --git a/src/Actions/RecordUsage.php b/src/Actions/RecordUsage.php
@@ -9,8 +9,10 @@ class RecordUsage
 {
     /**
      * @param array $resources
-     * @return MonitoringRecord
+     *
      * @throws \Exception
+     *
+     * @return MonitoringRecord
      */
     public function record(array $resources)
     {
@@ -19,18 +21,19 @@ public function record(array $resources)
         $model = config('monitoring.models.monitoring_record');
         $record = new $model([
             'instance_name' => str_replace(' ', '', config('monitoring.instance_name')),
-            'cpu' => $resources['cpu'] ?? null,
-            'memory' => $resources['memory'] ?? null,
-            'disk' => $resources['disk'] ?? null,
+            'cpu'           => $resources['cpu'] ?? null,
+            'memory'        => $resources['memory'] ?? null,
+            'disk'          => $resources['disk'] ?? null,
         ]);
         $record->save();
 
         return $record;
     }
 
     /**
-     * @return void
      * @throws \Exception
+     *
+     * @return void
      */
     protected function checkOS()
     {

diff --git a/src/Channels/BaseChannel.php b/src/Channels/BaseChannel.php
@@ -9,19 +9,20 @@ abstract class BaseChannel implements Channel
      */
     protected function subject($record)
     {
-        return __("Resource usage for :instance", ['instance' => $record->instance_name]);
+        return __('Resource usage for :instance', ['instance' => $record->instance_name]);
     }
 
     /**
      * @param $record
+     *
      * @return string
      */
     protected function message($record)
     {
         return __("CPU: :cpu\n Memory: :memory\n Disk: :disk", [
-            'cpu' => $record->cpu,
+            'cpu'    => $record->cpu,
             'memory' => $record->memory,
-            'disk' => $record->disk,
+            'disk'   => $record->disk,
         ]);
     }
 }
diff --git a/src/Channels/Channel.php b/src/Channels/Channel.php
@@ -6,6 +6,7 @@ interface Channel
 {
     /**
      * @param $record
+     *
      * @return void
      */
     public function send($record);

diff --git a/src/Channels/Email.php b/src/Channels/Email.php
@@ -9,6 +9,7 @@ class Email extends BaseChannel
 {
     /**
      * @param $record
+     *
      * @return void
      */
     public function send($record)

diff --git a/src/Channels/Slack.php b/src/Channels/Slack.php
@@ -8,12 +8,13 @@ class Slack extends BaseChannel
 {
     /**
      * @param $record
+     *
      * @return void
      */
     public function send($record)
     {
         Http::post(config('monitoring.notifications.slack_webhook_url'), [
-            'text' => '*' . $this->subject($record) . '*' . "\n" . $this->message($record),
+            'text' => '*'.$this->subject($record).'*'."\n".$this->message($record),
         ]);
     }
 }
diff --git a/src/Commands/PurgeCommand.php b/src/Commands/PurgeCommand.php
@@ -4,7 +4,6 @@
 
 use Exception;
 use Illuminate\Console\Command;
-use SaeedVaziry\Monitoring\Models\MonitoringRecord;
 
 class PurgeCommand extends Command
 {
@@ -35,9 +34,9 @@ public function __construct()
     /**
      * Execute the console command.
      *
-     * @return void
      * @throws Exception
      *
+     * @return void
      */
     public function handle()
     {

diff --git a/src/Commands/RecordCommand.php b/src/Commands/RecordCommand.php
@@ -37,16 +37,16 @@ public function __construct()
     /**
      * Execute the console command.
      *
-     * @return void
      * @throws Exception
      *
+     * @return void
      */
     public function handle()
     {
         tap(app(RecordUsage::class)->record([
-            'cpu' => Monitoring::cpu()->usage(),
+            'cpu'    => Monitoring::cpu()->usage(),
             'memory' => Monitoring::memory()->usage(),
-            'disk' => Monitoring::disk()->usage(),
+            'disk'   => Monitoring::disk()->usage(),
         ]), function ($record) {
             app(CheckForAlerts::class)->check($record);
         });

diff --git a/src/Exceptions/OSIsNotSupported.php b/src/Exceptions/OSIsNotSupported.php
@@ -11,6 +11,6 @@ class OSIsNotSupported extends Exception
      */
     public function __construct($message)
     {
-        parent::__construct($message . ' is not supported');
+        parent::__construct($message.' is not supported');
     }
 }
diff --git a/src/HasAlerts.php b/src/HasAlerts.php
@@ -6,6 +6,7 @@ trait HasAlerts
 {
     /**
      * @param array $instances
+     *
      * @return array
      */
     public function getAlerts(array $instances)

diff --git a/src/HasRecords.php b/src/HasRecords.php
@@ -3,7 +3,6 @@
 namespace SaeedVaziry\Monitoring;
 
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
 
 trait HasRecords
 {
@@ -26,6 +25,7 @@ protected function getInstances()
 
     /**
      * @param array $instances
+     *
      * @return array
      */
     protected function getRecords(array $instances)
@@ -44,6 +44,7 @@ protected function getRecords(array $instances)
 
     /**
      * @param array $instances
+     *
      * @return array
      */
     protected function getLastRecords(array $instances)
@@ -61,6 +62,7 @@ protected function getLastRecords(array $instances)
 
     /**
      * @param Collection $records
+     *
      * @return array
      */
     protected function getRecordsChart(Collection $records)
@@ -77,40 +79,42 @@ protected function getRecordsChart(Collection $records)
         }
 
         return [
-            'labels' => $labels,
+            'labels'   => $labels,
             'datasets' => [
                 [
-                    'label' => 'CPU',
-                    'data' => $cpu,
-                    'borderWidth' => 1.5,
-                    'fill' => false,
-                    'borderColor' => config('monitoring.chart_colors.cpu.border_color'),
-                    'backgroundColor' => config('monitoring.chart_colors.cpu.background_color')
+                    'label'           => 'CPU',
+                    'data'            => $cpu,
+                    'borderWidth'     => 1.5,
+                    'fill'            => false,
+                    'borderColor'     => config('monitoring.chart_colors.cpu.border_color'),
+                    'backgroundColor' => config('monitoring.chart_colors.cpu.background_color'),
                 ],
                 [
-                    'label' => 'Memory',
-                    'data' => $memory,
-                    'borderWidth' => 1.5,
-                    'fill' => false,
-                    'borderColor' => config('monitoring.chart_colors.memory.border_color'),
-                    'backgroundColor' => config('monitoring.chart_colors.memory.background_color')
+                    'label'           => 'Memory',
+                    'data'            => $memory,
+                    'borderWidth'     => 1.5,
+                    'fill'            => false,
+                    'borderColor'     => config('monitoring.chart_colors.memory.border_color'),
+                    'backgroundColor' => config('monitoring.chart_colors.memory.background_color'),
                 ],
                 [
-                    'label' => 'Disk',
-                    'data' => $disk,
-                    'borderWidth' => 1.5,
-                    'fill' => false,
-                    'borderColor' => config('monitoring.chart_colors.disk.border_color'),
-                    'backgroundColor' => config('monitoring.chart_colors.disk.background_color')
-                ]
+                    'label'           => 'Disk',
+                    'data'            => $disk,
+                    'borderWidth'     => 1.5,
+                    'fill'            => false,
+                    'borderColor'     => config('monitoring.chart_colors.disk.border_color'),
+                    'backgroundColor' => config('monitoring.chart_colors.disk.background_color'),
+                ],
             ],
         ];
     }
 
     /**
      * @param array $records
-     * @return array
+     *
      * @throws \Exception
+     *
+     * @return array
      */
     protected function getCharts(array $records)
     {

diff --git a/src/Http/Controller.php b/src/Http/Controller.php
@@ -9,5 +9,7 @@
 
 class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
 }