Skip to content
Snippets Groups Projects
Commit 455ee962 authored by Thibault Debatty's avatar Thibault Debatty
Browse files

upgrade phpcs and fix style

parent 6db41464
No related branches found
No related tags found
No related merge requests found
Pipeline #13329 failed
Showing
with 37 additions and 33 deletions
...@@ -19,7 +19,7 @@ class AgentScheduler ...@@ -19,7 +19,7 @@ class AgentScheduler
{ {
/** /**
* *
* @var LazyCollection<Sensor> * @var LazyCollection<Sensor>
*/ */
private $sensors; private $sensors;
...@@ -46,7 +46,7 @@ class AgentScheduler ...@@ -46,7 +46,7 @@ class AgentScheduler
} }
/** /**
* *
* @return LazyCollection<Sensor> * @return LazyCollection<Sensor>
*/ */
public function sensors() : LazyCollection public function sensors() : LazyCollection
...@@ -55,7 +55,7 @@ class AgentScheduler ...@@ -55,7 +55,7 @@ class AgentScheduler
} }
/** /**
* *
* @return LazyCollection<Sensor> * @return LazyCollection<Sensor>
*/ */
public function autodiscover() : LazyCollection public function autodiscover() : LazyCollection
...@@ -74,7 +74,7 @@ class AgentScheduler ...@@ -74,7 +74,7 @@ class AgentScheduler
} }
/** /**
* *
* @param LazyCollection<Sensor> $sensors * @param LazyCollection<Sensor> $sensors
* @return array * @return array
*/ */
...@@ -92,12 +92,14 @@ class AgentScheduler ...@@ -92,12 +92,14 @@ class AgentScheduler
/** /**
* Get the list of defined agent labels. * Get the list of defined agent labels.
* *
* @return array * @return array
*/ */
public function agentLabel() : array public function agentLabel() : array
{ {
return $this->sensors->map(function(Sensor $sensor) {return $sensor->config()->label; })->toArray(); return $this->sensors->map(function (Sensor $sensor) {
return $sensor->config()->label;
})->toArray();
} }
// ------------------ SCHEDULING of agents // ------------------ SCHEDULING of agents
......
...@@ -7,7 +7,8 @@ use App\Record; ...@@ -7,7 +7,8 @@ use App\Record;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class ApiController extends Controller { class ApiController extends Controller
{
public function echo(Request $request, Server $server) public function echo(Request $request, Server $server)
{ {
...@@ -58,7 +59,7 @@ class ApiController extends Controller { ...@@ -58,7 +59,7 @@ class ApiController extends Controller {
"max" => $server->info()->cpuinfo()["threads"]]; "max" => $server->info()->cpuinfo()["threads"]];
} }
public function ifconfig (Server $server, string $token) public function ifconfig(Server $server, string $token)
{ {
if ($server->read_token != $token) { if ($server->read_token != $token) {
abort(403); abort(403);
...@@ -69,7 +70,7 @@ class ApiController extends Controller { ...@@ -69,7 +70,7 @@ class ApiController extends Controller {
return $sensor->points($server->lastRecords("ifconfig")); return $sensor->points($server->lastRecords("ifconfig"));
} }
public function netstat (Server $server, string $token) public function netstat(Server $server, string $token)
{ {
if ($server->read_token != $token) { if ($server->read_token != $token) {
abort(403); abort(403);
......
...@@ -16,14 +16,14 @@ class RunAgent implements ShouldQueue ...@@ -16,14 +16,14 @@ class RunAgent implements ShouldQueue
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
/** /**
* *
* @var Sensor * @var Sensor
*/ */
public $agent; public $agent;
/** /**
* *
* @var Server * @var Server
*/ */
public $server; public $server;
......
...@@ -45,7 +45,7 @@ class StatusChangeDetection implements ShouldQueue ...@@ -45,7 +45,7 @@ class StatusChangeDetection implements ShouldQueue
$change = new StatusChange(); $change = new StatusChange();
$change->server_id = $server->id; $change->server_id = $server->id;
$change->time = time(); $change->time = time();
$change->status = $current_status->code(); $change->status = $current_status->code();
$change->save(); $change->save();
return; return;
} }
...@@ -55,7 +55,7 @@ class StatusChangeDetection implements ShouldQueue ...@@ -55,7 +55,7 @@ class StatusChangeDetection implements ShouldQueue
return; return;
} }
Log::notice("Status of server changed to " . $current_status->code() . Log::notice("Status of server changed to " . $current_status->code() .
" for server #" . $server->id); " for server #" . $server->id);
$change = new StatusChange(); $change = new StatusChange();
......
...@@ -21,9 +21,9 @@ class Record extends Model ...@@ -21,9 +21,9 @@ class Record extends Model
return $this->belongsTo(Server::class); return $this->belongsTo(Server::class);
} }
public function save(array $options = []) { public function save(array $options = [])
{
if (parent::save($options)) { if (parent::save($options)) {
AgentScheduler::get()->notify($this); AgentScheduler::get()->notify($this);
return true; return true;
} }
......
...@@ -11,12 +11,12 @@ use Illuminate\Database\Eloquent\Model; ...@@ -11,12 +11,12 @@ use Illuminate\Database\Eloquent\Model;
* @property integer $time * @property integer $time
* @property integer $server_id * @property integer $server_id
* @property string $label * @property string $label
* *
* Properties set by analysis agent: * Properties set by analysis agent:
* @property int $status_code * @property int $status_code
* @property string $title * @property string $title
* @property string $html * @property string $html
* *
* @author tibo * @author tibo
*/ */
class Report extends Model implements HasStatus class Report extends Model implements HasStatus
......
...@@ -34,7 +34,7 @@ class CPUtemperature implements Sensor ...@@ -34,7 +34,7 @@ class CPUtemperature implements Sensor
{ {
$report = (new Report())->setTitle("CPU temperature"); $report = (new Report())->setTitle("CPU temperature");
$record = $records->last(); $record = $records->last();
$cpus = $this->parse($record->data); $cpus = $this->parse($record->data);
$report->setHTML(view("sensor.cputemperature", ["cpus" => $cpus])); $report->setHTML(view("sensor.cputemperature", ["cpus" => $cpus]));
$report->setStatus(Status::max($cpus)); $report->setStatus(Status::max($cpus));
......
...@@ -19,7 +19,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -19,7 +19,7 @@ use Illuminate\Database\Eloquent\Collection;
*/ */
class ClientVersion implements Sensor class ClientVersion implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("client-version", "version"); return new SensorConfig("client-version", "version");
} }
......
...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection;
*/ */
class Date implements Sensor class Date implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("date", "date"); return new SensorConfig("date", "date");
} }
......
...@@ -18,7 +18,7 @@ use Illuminate\Support\Collection; ...@@ -18,7 +18,7 @@ use Illuminate\Support\Collection;
*/ */
class Disks implements Sensor class Disks implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("disks", "disks"); return new SensorConfig("disks", "disks");
} }
...@@ -38,7 +38,7 @@ class Disks implements Sensor ...@@ -38,7 +38,7 @@ class Disks implements Sensor
} }
/** /**
* *
* @param string $string * @param string $string
* @return Collection<Partition> * @return Collection<Partition>
*/ */
......
...@@ -18,7 +18,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -18,7 +18,7 @@ use Illuminate\Database\Eloquent\Collection;
*/ */
class Ifconfig implements Sensor class Ifconfig implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("ifconfig", "ifconfig"); return new SensorConfig("ifconfig", "ifconfig");
} }
......
...@@ -10,6 +10,7 @@ use App\Status; ...@@ -10,6 +10,7 @@ use App\Status;
use Illuminate\Database\Eloquent\Collection as DatabaseCollection; use Illuminate\Database\Eloquent\Collection as DatabaseCollection;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
/** /**
* Description of Update * Description of Update
* *
...@@ -17,7 +18,7 @@ use Illuminate\Support\Collection; ...@@ -17,7 +18,7 @@ use Illuminate\Support\Collection;
*/ */
class Inodes implements Sensor class Inodes implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("inodes", "inodes"); return new SensorConfig("inodes", "inodes");
} }
......
...@@ -18,7 +18,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -18,7 +18,7 @@ use Illuminate\Database\Eloquent\Collection;
class ListeningPorts implements Sensor class ListeningPorts implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("listening-tcp", "netstat-listen-tcp"); return new SensorConfig("listening-tcp", "netstat-listen-tcp");
} }
......
...@@ -18,7 +18,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -18,7 +18,7 @@ use Illuminate\Database\Eloquent\Collection;
*/ */
class LoadAvg implements Sensor class LoadAvg implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("loadavg", "loadavg"); return new SensorConfig("loadavg", "loadavg");
} }
......
...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection;
*/ */
class MemInfo implements Sensor class MemInfo implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("memory", "memory"); return new SensorConfig("memory", "memory");
} }
......
...@@ -18,7 +18,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -18,7 +18,7 @@ use Illuminate\Database\Eloquent\Collection;
class Netstat implements Sensor class Netstat implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("netstat-retransmitted", "netstat-statistics"); return new SensorConfig("netstat-retransmitted", "netstat-statistics");
} }
......
...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection;
*/ */
class Perccli implements Sensor class Perccli implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("perccli", "perccli"); return new SensorConfig("perccli", "perccli");
} }
......
...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection;
*/ */
class Reboot implements Sensor class Reboot implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("reboot", "reboot"); return new SensorConfig("reboot", "reboot");
} }
......
...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection;
*/ */
class Ssacli implements Sensor class Ssacli implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("ssacli", "ssacli"); return new SensorConfig("ssacli", "ssacli");
} }
...@@ -28,7 +28,7 @@ class Ssacli implements Sensor ...@@ -28,7 +28,7 @@ class Ssacli implements Sensor
{ {
$report = (new Report())->setTitle("HP ssacli"); $report = (new Report())->setTitle("HP ssacli");
$record = $records->last(); $record = $records->last();
$disks = $this->parse($record->data); $disks = $this->parse($record->data);
$report->setHTML(view("sensor.ssacli", ["disks" => $disks])); $report->setHTML(view("sensor.ssacli", ["disks" => $disks]));
......
...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection; ...@@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Collection;
*/ */
class USBtemperature implements Sensor class USBtemperature implements Sensor
{ {
public function config(): SensorConfig public function config(): SensorConfig
{ {
return new SensorConfig("usb-temperature", "TEMPer"); return new SensorConfig("usb-temperature", "TEMPer");
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment