server: add no_sort option to grep-logs

Author: willcl-ark

src/warnet/backend/kubernetes_backend.py

@@ -313,7 +313,7 @@ def get_messages(
         messages.sort(key=lambda x: x["time"])
         return messages
 
-    def logs_grep(self, pattern: str, network: str, k8s_timestamps=False):
+    def logs_grep(self, pattern: str, network: str, k8s_timestamps=False, no_sort=False):
         compiled_pattern = re.compile(pattern)
         matching_logs = []
         pods = self.client.list_namespaced_pod(self.namespace)
@@ -335,7 +335,7 @@ def logs_grep(self, pattern: str, network: str, k8s_timestamps=False):
             except ApiException as e:
                 print(f"Error fetching logs for pod {pod.metadata.name}: {e}")
 
-        sorted_logs = sorted(matching_logs, key=lambda x: x[0])
+        sorted_logs = matching_logs if no_sort else sorted(matching_logs, key=lambda x: x[0])
         # Prepend pod names
         formatted_logs = [f"{pod_name}: {log}" for log, pod_name in sorted_logs]
 

src/warnet/cli/bitcoin.py

@@ -48,14 +48,20 @@ def messages(node_a, node_b, network):
 @bitcoin.command()
 @click.argument("pattern", type=str, required=True)
 @click.option("--show-k8s-timestamps", is_flag=True, default=False, show_default=True)
+@click.option("--no-sort", is_flag=True, default=False, show_default=True)
 @click.option("--network", default="warnet", show_default=True)
-def grep_logs(pattern, network, show_k8s_timestamps):
+def grep_logs(pattern, network, show_k8s_timestamps, no_sort):
     """
     Grep combined logs via fluentd using regex <pattern>
     """
     print(
         rpc_call(
             "logs_grep",
-            {"network": network, "pattern": pattern, "k8s_timestamps": show_k8s_timestamps},
+            {
+                "network": network,
+                "pattern": pattern,
+                "k8s_timestamps": show_k8s_timestamps,
+                "no_sort": no_sort,
+            },
         )
     )

src/warnet/server.py

@@ -570,13 +570,15 @@ def generate_deployment(self, graph_file: str, network: str = "warnet") -> str:
             self.logger.error(msg)
             raise ServerError(message=msg) from e
 
-    def logs_grep(self, pattern: str, network: str = "warnet", k8s_timestamps=False) -> str:
+    def logs_grep(
+        self, pattern: str, network: str = "warnet", k8s_timestamps=False, no_sort=False
+    ) -> str:
         """
         Grep the logs from the fluentd container for a regex pattern
         """
         try:
             wn = self.get_warnet(network)
-            return wn.container_interface.logs_grep(pattern, network, k8s_timestamps)
+            return wn.container_interface.logs_grep(pattern, network, k8s_timestamps, no_sort)
         except Exception as e:
             msg = f"Error grepping logs using pattern {pattern}: {e}"
             self.logger.error(msg)