Peering Matrix - increase lookback days and make configurable

barryo · barryo · commit 53333e4faa54 · 2021-12-16T14:51:56.000Z
diff --git a/app/Http/Controllers/PeeringMatrixController.php b/app/Http/Controllers/PeeringMatrixController.php
@@ -218,6 +218,14 @@ private function getPeers( int $vlan, int $protocol = 6, bool $restrictActivePee
             return $apeers;
         }
 
+        // the number of days back we look is not a perfect science. generally, the bigger the interface / more
+        // traffic, the less likely we'll find bgp sessions recently via sflow sampling.
+        // 28 days seems good in practice but his can be changed in config/ixp.php
+        $lookback_days = (int)config( 'ixp.peering-matrix.lookback_days' );
+        if( !is_int( $lookback_days ) || $lookback_days < 1 ) {
+            $lookback_days = 30;
+        }
+
         // we've added "bs.timestamp >= NOW() - INTERVAL 7 DAY" below as we don't
         // dump old date (yet) and the time to run the query is O(n) on number
         // of rows...
@@ -237,7 +245,7 @@ private function getPeers( int $vlan, int $protocol = 6, bool $restrictActivePee
             ->leftJoin( 'cust AS cs', 'cs.id', 'vis.custid' )
             ->leftJoin( 'cust AS cd', 'cd.id', 'vid.custid' )
             ->leftJoin( 'vlan', 'vlan.id', 'srcip.vlanid' )
-            ->whereRaw( 'bs.last_seen >= NOW() - INTERVAL 7 DAY' )
+            ->whereRaw( 'bs.last_seen >= NOW() - INTERVAL ' . $lookback_days . ' DAY' )
             ->where( 'bs.protocol', $protocol )
             ->where( 'bs.packetcount', '>=', 1 )
             ->where( 'vlan.id', $vlan )
diff --git a/config/ixp.php b/config/ixp.php
@@ -76,14 +76,16 @@
     ],
 
 
-    /* ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-       ;; Minimum user auth level for the peering matrix
-       ;;
-       ;; See https://docs.ixpmanager.org/usage/users/#types-of-users
-       ;;
-       ;; */
     'peering-matrix' => [
+
+        // Minimum user auth level for the peering matrix
+        // See https://docs.ixpmanager.org/usage/users/#types-of-users
         'min-auth' => env( 'PEERING_MATRIX_MIN_AUTH', \IXP\Models\User::AUTH_PUBLIC ),
+
+        // the number of days back we look is not a perfect science. generally, the bigger the interface / more
+        // traffic, the less likely we'll find bgp sessions recently via sflow sampling.
+        // 28 days seems good in practice but his can be changed in config/ixp.php
+        'lookback_days' => env( 'PEERING_MATRIX_LOOKBACK_DAYS', 28 ),
     ],
 
 
