remote worker configuration, allow default routes to workers

chuckablack · Oct 23, 2020 · d60336b · d60336b
1 parent 236bb29
commit d60336b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/quokka/controller/CaptureManager.py b/quokka/controller/CaptureManager.py
@@ -56,9 +56,11 @@ def find_monitor(ip=None):
             if ip in IPNetwork(network):
                 return CaptureManager.capture_monitors[network]
 
-        else:
-            # If we didn't find a specific monitor, default to localhost
-            return "localhost"
+        if "0.0.0.0/0" in CaptureManager.capture_monitors:
+            return CaptureManager.capture_monitors["0.0.0.0/0"]
+
+        # If we didn't find a specific monitor, default to localhost
+        return "localhost"
 
     @staticmethod
     def initiate_capture(ip, protocol, port, count):

diff --git a/quokka/controller/PortscanManager.py b/quokka/controller/PortscanManager.py
@@ -38,9 +38,11 @@ def find_monitor(ip=None):
             if ip in IPNetwork(network):
                 return PortscanManager.portscan_monitors[network]
 
-        else:
-            # If we didn't find a specific monitor, default to localhost
-            return "localhost"
+        if "0.0.0.0/0" in PortscanManager.portscan_monitors:
+            return PortscanManager.portscan_monitors["0.0.0.0/0"]
+
+        # If we didn't find a specific monitor, default to localhost
+        return "localhost"
 
     @staticmethod
     def initiate_portscan(host_ip, host_name, token):

diff --git a/quokka/controller/TracerouteManager.py b/quokka/controller/TracerouteManager.py
@@ -34,9 +34,11 @@ def find_monitor(target=None):
         if target in TracerouteManager.traceroute_monitors:
             return TracerouteManager.traceroute_monitors[target]
 
-        else:
-            # If we didn't find a specific monitor, default to localhost
-            return "localhost"
+        if "0.0.0.0/0" in TracerouteManager.traceroute_monitors:
+            return TracerouteManager.traceroute_monitors["0.0.0.0/0"]
+
+        # If we didn't find a specific monitor, default to localhost
+        return "localhost"
 
     @staticmethod
     def initiate_traceroute(target, token):

diff --git a/quokka/data/capturemonitors.yaml b/quokka/data/capturemonitors.yaml
@@ -1 +1 @@
-192.168.254.0/24 : 192.168.254.136
+0.0.0.0/0 : 192.168.254.136
diff --git a/quokka/data/cisco.nxos.standard.config.diff.NXOS-sandbox (SSH) b/quokka/data/cisco.nxos.standard.config.diff.NXOS-sandbox (SSH)
@@ -1,7 +1,6 @@
 cfs eth distribute
 feature vpc
 feature telemetry
-vlan 1-9,100-105
 vpc domain 10
 telemetry
   sensor-group 1

diff --git a/quokka/data/portscanmonitors.yaml b/quokka/data/portscanmonitors.yaml
@@ -1 +1 @@
-192.168.254.0/24 : 192.168.254.136
+0.0.0.0/0 : 192.168.254.136
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		192.168.254.0/24 : 192.168.254.136
		0.0.0.0/0 : 192.168.254.136