opensourcemirror
/
LibreNMS
mirror of https://github.com/librenms/librenms.git
1
0
Fork 0
Code Releases Activity

hrsystem write fix (#13314)

This commit is contained in:
SourceDoctor 2021-10-03 01:03:24 +02:00 committed by GitHub
parent e5f540eed8
commit 30c20fa11f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/Device.php
View File

@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasManyThrough;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\MorphToMany;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Str;
@ -631,9 +632,9 @@ class Device extends BaseModel
return $this->hasMany(HrDevice::class, 'device_id');
}
public function hostResourceValues(): HasMany
public function hostResourceValues(): HasOne
{
return $this->hasMany(HrSystem::class, 'device_id');
return $this->hasOne(HrSystem::class, 'device_id');
}
public function entityPhysical(): HasMany

2
app/Models/HrSystem.php
View File

@ -6,7 +6,7 @@ class HrSystem extends DeviceRelatedModel
{
public $timestamps = false;
protected $table = 'hrSystem';
protected $fillable = ['hrSystemNumUsers', 'hrSystemProcesses', 'hrSystemMaxProcesses'];
protected $fillable = ['device_id', 'hrSystemNumUsers', 'hrSystemProcesses', 'hrSystemMaxProcesses'];
protected $primaryKey = 'hrSystem_id';
}

13
includes/polling/hr-mib.inc.php
View File

@ -3,14 +3,12 @@
// HOST-RESOURCES-MIB
// Generic System Statistics
use App\Models\Device;
use App\Models\HrSystem;
use LibreNMS\RRD\RrdDefinition;
$oid_list = ['hrSystemMaxProcesses.0', 'hrSystemProcesses.0', 'hrSystemNumUsers.0'];
$hrSystem = snmp_get_multi($device, $oid_list, '-OUQs', 'HOST-RESOURCES-MIB');
$current_device = Device::find($device['device_id']);
if (is_numeric($hrSystem[0]['hrSystemProcesses'])) {
$tags = [
'rrd_def' => RrdDefinition::make()->addDataset('procs', 'GAUGE', 0),
@ -35,10 +33,11 @@ if (is_numeric($hrSystem[0]['hrSystemNumUsers'])) {
data_update($device, 'hr_users', $tags, $fields);
$current_device->hostResourceValues()->updateOrCreate(['device_id' => $current_device->id, 'key' => 'num_users'],
['hrSystemNumUsers' => $hrSystem[0]['hrSystemNumUsers'],
'hrSystemProcesses' => $hrSystem[0]['hrSystemProcesses'],
'hrSystemMaxProcesses' => $hrSystem[0]['hrSystemMaxProcesses'], ]);
HrSystem::updateOrCreate(['device_id' => $device['device_id']],
['hrSystemNumUsers' => $hrSystem[0]['hrSystemNumUsers'],
'hrSystemProcesses' => $hrSystem[0]['hrSystemProcesses'],
'hrSystemMaxProcesses' => $hrSystem[0]['hrSystemMaxProcesses'], ]);
$os->enableGraph('hr_users');
echo ' Users';
}