Top Interfaces, exclude invalid ports (#11338)

app/Http/Controllers/Widgets/TopInterfacesController.php

@@ -51,6 +51,7 @@ class TopInterfacesController extends WidgetController
         $query = Port::hasAccess($request->user())->with(['device' => function ($query) {
             $query->select('device_id', 'hostname', 'sysName', 'status', 'os');
         }])
+            ->isValid()
             ->select('port_id', 'device_id', 'ifName', 'ifDescr', 'ifAlias')
             ->groupBy('port_id', 'device_id', 'ifName', 'ifDescr', 'ifAlias')
             ->where('poll_time', '>', Carbon::now()->subMinutes($data['time_interval'])->timestamp)

app/Models/Port.php

@@ -197,6 +197,18 @@ class Port extends DeviceRelatedModel
         });
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
+    public function scopeIsValid($query)
+    {
+        return $query->where([
+            ['deleted', '=', 0],
+            ['disabled', '=', 0],
+        ]);
+    }
+
     public function scopeHasAccess($query, User $user)
     {
         return $this->hasPortAccess($query, $user);