server: add option to show k8s timestamps in log-grep

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):
+    def logs_grep(self, pattern: str, network: str, k8s_timestamps=False):
         compiled_pattern = re.compile(pattern)
         matching_logs = []
 
@@ -329,7 +329,7 @@ def logs_grep(self, pattern: str, network: str):
                     name=pod.metadata.name,
                     container=BITCOIN_CONTAINER_NAME,
                     namespace=self.namespace,
-                    timestamps=False,
+                    timestamps=k8s_timestamps,
                     _preload_content=False,
                 )
 

src/warnet/cli/bitcoin.py

@@ -47,9 +47,15 @@ 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("--network", default="warnet", show_default=True)
-def grep_logs(pattern, network):
+def grep_logs(pattern, network, show_k8s_timestamps):
     """
     Grep combined logs via fluentd using regex <pattern>
     """
-    print(rpc_call("logs_grep", {"network": network, "pattern": pattern}))
+    print(
+        rpc_call(
+            "logs_grep",
+            {"network": network, "pattern": pattern, "k8s_timestamps": show_k8s_timestamps},
+        )
+    )

src/warnet/server.py

@@ -570,13 +570,13 @@ 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") -> str:
+    def logs_grep(self, pattern: str, network: str = "warnet", k8s_timestamps=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)
+            return wn.container_interface.logs_grep(pattern, network, k8s_timestamps)
         except Exception as e:
             msg = f"Error grepping logs using pattern {pattern}: {e}"
             self.logger.error(msg)