jaro/salt-minv-graph
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Oprava chyb v Logging.php, uprava tabuliek

Browse Source 
- oprava tabuliek created_at, CURRENT_TIMESTAMP
- pridanie memory_total, load
- apcu fix
This commit is contained in:
Jaroslav Drzik
2019-11-22 10:38:09 +01:00
parent 8caa7c227b
commit 72dbd62686
5 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Http/Controllers/Logging.php
View File

@@ -8,7 +8,7 @@ use Illuminate\Support\Facades\DB;
class Logging extends Controller class Logging extends Controller
{ {
private $_items = [ 'netstat_sent' => 'i', 'netstat_recv' => 'i', 'memory_free' => 'f', 'memory_total' => 'f', 'memory_used' => 'f', 'disk_free' => 'B', 'disk_percent' => 'f', 'disk_used' => 'B', 'disk_total' => 'B', 'processes' => 'i', 'temp' => 'i', 'username' =>'s', 'computer' => 's']; private $_items = [ 'netstat_sent' => 'i', 'netstat_recv' => 'i', 'memory_free' => 'f', 'memory_total' => 'f', 'memory_used' => 'f', 'disk_free' => 'B', 'disk_percent' => 'f', 'disk_used' => 'B', 'disk_total' => 'B', 'processes' => 'i', 'temp' => 'i', 'load' => 'f', 'username' =>'s', 'computer' => 's'];
private $_values = []; private $_values = [];
private $_ucache = []; private $_ucache = [];
@@ -26,7 +26,7 @@ class Logging extends Controller
foreach ($q as $v) { foreach ($q as $v) {
$this->_ucache[$v->name] = $v->id; $this->_ucache[$v->name] = $v->id;
} }
\apcu_add('users',$this->_ucache); \apcu_store('users',$this->_ucache);
} }
$this->_ccache = \apcu_fetch('computers',$ret); $this->_ccache = \apcu_fetch('computers',$ret);
if ($ret == false ) { if ($ret == false ) {
@@ -34,31 +34,32 @@ class Logging extends Controller
foreach ($q as $v) { foreach ($q as $v) {
$this->_ucache[$v->computer] = $v->id; $this->_ucache[$v->computer] = $v->id;
} }
\apcu_add('computers',$this->_ccache); \apcu_store('computers',$this->_ccache);
} }
} }
private function get_computer_id($comp){ private function get_computer_id($comp){
if ($this->_ccache[$comp]) { if (isset($this->_ccache[$comp])) {
return $this->_ccache[$comp]; return $this->_ccache[$comp];
} }
$id = DB::table('computers')->insertGetId(['computer' => $comp]); $id = DB::table('computers')->insertGetId(['computer' => $comp]);
$this->_ccache[$comp] = $id; $this->_ccache[$comp] = $id;
\apcu_add('computers',$this->_ccache); \apc_store('computers',$this->_ccache);
return $id; return $id;
} }
private function get_user_id($user) { private function get_user_id($user) {
if ($this->_ucache[$user]) { if (isset($this->_ucache[$user])) {
return $this->_ucache[$user]; return $this->_ucache[$user];
} }
$id = DB::table('users')->insertGetId(['name' => $user]); $id = DB::table('users')->insertGetId(['name' => $user, 'email' => $user]);
$this->_ucache[$user] = $id; $this->_ucache[$user] = $id;
\apcu_add('users',$this->_ucache); \apcu_store('users',$this->_ucache);
return $id; return $id;
} }
@@ -116,9 +117,9 @@ class Logging extends Controller
$this->parse($v); $this->parse($v);
$ia = array_filter($this->_values, function($v) { $ia = array_merge($this->_values);
return $v != 's'; unset($ia["computer"]);
}); unset($ia["username"]);
$cid = $this->get_computer_id($this->_values["computer"]); $cid = $this->get_computer_id($this->_values["computer"]);
$uid = $this->get_user_id($this->_values["username"]); $uid = $this->get_user_id($this->_values["username"]);

8
database/migrations/2014_10_12_000000_create_users_table.php
View File

@@ -17,11 +17,11 @@ class CreateUsersTable extends Migration
$table->increments('id'); $table->increments('id');
$table->string('name'); $table->string('name');
$table->string('email')->unique(); $table->string('email')->unique();
$table->string('password'); $table->string('password')->nullable();
$table->string('full_name'); $table->string('full_name')->nullable();
$table->string('ou'); $table->string('ou')->nullable();
$table->rememberToken(); $table->rememberToken();
$table->timestamps(); $table->timestamp('created_at')->default(DB::raw('CURRENT_TIMESTAMP'));
$table->index([DB::raw('email(191)')]); $table->index([DB::raw('email(191)')]);
}); });

4
database/migrations/2019_11_07_000001_create_computers_table.php
View File

@@ -15,8 +15,8 @@ class CreateComputersTable extends Migration
{ {
Schema::create('computers', function (Blueprint $table) { Schema::create('computers', function (Blueprint $table) {
$table->increments('id'); $table->increments('id');
$table->string('computer'); $table->string('computer');
$table->timestamps(); $table->timestamp('created_at')->default(DB::raw('CURRENT_TIMESTAMP'));
}); });
} }

12
database/migrations/2019_11_07_000002_create_user_ip_table.php
View File

@@ -15,15 +15,15 @@ class CreateUserIpTable extends Migration
{ {
Schema::create('user_ip', function (Blueprint $table) { Schema::create('user_ip', function (Blueprint $table) {
$table->bigIncrements('id'); $table->bigIncrements('id');
$table->string('ip'); $table->string('ip');
$table->unsignedInteger('computer_id'); $table->unsignedInteger('computer_id');
$table->foreign('computer_id')->references('id')->on('computers'); $table->foreign('computer_id')->references('id')->on('computers');
$table->unsignedInteger('user_id'); $table->unsignedInteger('user_id');
$table->foreign('user_id')->references('id')->on('users'); $table->foreign('user_id')->references('id')->on('users');
$table->timestamps(); $table->timestamp('created_at')->default(DB::raw('CURRENT_TIMESTAMP'));
}); });
} }

6
database/migrations/2019_11_07_000003_create_values_table.php
View File

@@ -17,15 +17,17 @@ class CreateValuesTable extends Migration
$table->bigIncrements('id'); $table->bigIncrements('id');
$table->bigInteger('netstat_sent')->nullable(); $table->bigInteger('netstat_sent')->nullable();
$table->bigInteger('netstat_recv')->nullable(); $table->bigInteger('netstat_recv')->nullable();
$table->bigInteger('memory_total')->nullable();
$table->bigInteger('memory_free')->nullable(); $table->bigInteger('memory_free')->nullable();
$table->bigInteger('memory_used')->nullable(); $table->bigInteger('memory_used')->nullable();
$table->bigInteger('disk_free')->nullable(); $table->bigInteger('disk_free')->nullable();
$table->float('disk_percent',8,2)->nullable(); $table->float('disk_percent',8,2)->nullable();
$table->float('load',8,2)->nullable();
$table->bigInteger('disk_used')->nullable(); $table->bigInteger('disk_used')->nullable();
$table->bigInteger('disk_total')->nullable(); $table->bigInteger('disk_total')->nullable();
$table->integer('processes')->nullable(); $table->integer('processes')->nullable();
$table->integer('temp')->nullable(); $table->integer('temp')->nullable();
$table->timestamps(); $table->timestamp('created_at')->default(DB::raw('CURRENT_TIMESTAMP'));
$table->unsignedBigInteger('computer_id'); $table->unsignedBigInteger('computer_id');
$table->foreign('computer_id')->references('id')->on('computers'); $table->foreign('computer_id')->references('id')->on('computers');