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

Try to make port counts match users expectations (#10230) 

Fix disabled count
Consistent use of isNotDeleted
This commit is contained in:
Tony Murray 2019-05-18 23:19:34 -05:00 committed by GitHub
parent 8fc9593c4f
commit d6bb9f0487
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LibreNMS/Util/ObjectCache.php
View File

@ -134,19 +134,19 @@ class ObjectCache
});
switch ($field) {
case 'down':
return $query->isNotDeleted()->isDown()->count();
return $query->isDown()->count();
case 'up':
return $query->isNotDeleted()->isUp()->count();
return $query->isUp()->count();
case 'ignored':
return $query->isNotDeleted()->isIgnored()->count();
return $query->isIgnored()->count();
case 'shutdown':
return $query->isNotDeleted()->isShutdown()->count();
return $query->isShutdown()->count();
case 'disabled':
return $query->isNotDeleted()->isDisabled()->count();
return $query->isDisabled()->count();
case 'deleted':
return $query->isDeleted()->count();
case 'errored':
return $query->isNotDeleted()->hasErrors()->count();
return $query->hasErrors()->count();
case 'pseudowire':
return Pseudowire::hasAccess(auth()->user())->count();
case 'total':

18
app/Models/Port.php
View File

@ -129,6 +129,7 @@ class Port extends BaseModel
return $query->where([
['deleted', '=', 0],
['ignore', '=', 0],
['disabled', '=', 0],
['ifOperStatus', '=', 'up'],
]);
}
@ -142,6 +143,7 @@ class Port extends BaseModel
return $query->where([
['deleted', '=', 0],
['ignore', '=', 0],
['disabled', '=', 0],
['ifOperStatus', '=', 'down'],
['ifAdminStatus', '=', 'up'],
]);
@ -153,7 +155,12 @@ class Port extends BaseModel
*/
public function scopeIsShutdown($query)
{
return $query->where('ifAdminStatus', 'down');
return $query->where([
['deleted', '=', 0],
['ignore', '=', 0],
['disabled', '=', 0],
['ifAdminStatus', '=', 'down'],
]);
}
/**
@ -176,8 +183,7 @@ class Port extends BaseModel
{
return $query->where([
['deleted', '=', 0],
['ignore', '=', 0],
['ifAdminStatus', '=', 'down'],
['disabled', '=', 1],
]);
}
@ -187,7 +193,11 @@ class Port extends BaseModel
*/
public function scopeHasErrors($query)
{
return $query->where(function ($query) {
return $query->where([
['deleted', '=', 0],
['ignore', '=', 0],
['disabled', '=', 0],
])->where(function ($query) {
/** @var Builder $query */
$query->where('ifInErrors_delta', '>', 0)
->orWhere('ifOutErrors_delta', '>', 0);