update(k8s): use time_on_duty in export and ui

app/extras/pseudographic.py

@@ -4,6 +4,7 @@ from rich.progress import Progress
 from database import fetch_all
 from kubernetes import client, config
 import requests
+from datetime import datetime, timezone
 
 # Define constants
 THINK_K8S_URL = "http://localhost:8000/think/k8s"
@@ -11,6 +12,21 @@ THINK_K8S_URL = "http://localhost:8000/think/k8s"
 console = Console()
 
 # Helper functions for conversions
+def calculate_time_on_duty(creation_timestamp):
+    """
+    Calculate the time on duty in hours, days, or minutes from the creation timestamp.
+    """
+    now = datetime.now(timezone.utc)
+    delta = now - creation_timestamp
+
+    if delta.days < 1 and delta.seconds < 3600:
+        minutes = delta.seconds // 60
+        return f"{minutes} minutes" if minutes > 1 else "less than a minute"
+    if delta.days < 1:
+        hours = delta.seconds // 3600
+        return f"{hours} hours" if hours > 1 else "1 hour"
+    return f"{delta.days} days" if delta.days > 1 else "1 day"
+
 def convert_cpu_to_cores(cpu):
     if "n" in cpu:
         return round(int(cpu.replace("n", "")) / 1e9, 4)
@@ -39,54 +55,6 @@ def convert_memory_to_gb(memory):
     return float(memory)
 
 # Display tables
-def display_metal_nodes():
-    table = Table(title="🖥️ Metal Nodes", style="bold green")
-    table.add_column("ID", justify="right", style="cyan")
-    table.add_column("Name", style="magenta")
-    table.add_column("Location", style="white")
-    table.add_column("Vendor", style="green")
-    table.add_column("CPU", justify="right", style="yellow")
-    table.add_column("Memory (GB)", justify="right", style="cyan")
-    table.add_column("Storage", style="magenta")
-
-    nodes = fetch_all("metal_nodes")
-    for node in nodes:
-        table.add_row(
-            f"{node[0]}",
-            node[1],
-            node[2],
-            node[3],
-            f"{node[4]}",
-            node[5],
-            node[6]
-        )
-
-    console.print(table)
-
-def display_virtual_machines():
-    table = Table(title="💻 Virtual Machines", style="bold blue")
-    table.add_column("ID", justify="right", style="cyan")
-    table.add_column("Name", style="magenta")
-    table.add_column("Location", style="white")
-    table.add_column("CPU", justify="right", style="yellow")
-    table.add_column("Memory (GB)", justify="right", style="cyan")
-    table.add_column("Storage", style="magenta")
-    table.add_column("Type", style="green")
-
-    vms = fetch_all("virtual_machines")
-    for vm in vms:
-        table.add_row(
-            f"{vm[0]}",
-            vm[1],
-            vm[2],
-            f"{vm[3]}",
-            vm[4],
-            vm[5],
-            vm[6]
-        )
-
-    console.print(table)
-
 def display_kubernetes_nodes():
     config.load_incluster_config()
     v1 = client.CoreV1Api()
@@ -98,11 +66,13 @@ def display_kubernetes_nodes():
     table.add_column("Storage (GB)", justify="right", style="green")
     table.add_column("Instance Type", style="blue")
     table.add_column("Pods Allocatable", justify="right", style="magenta")
+    table.add_column("Time on Duty", justify="right", style="magenta")
 
     nodes = v1.list_node()
     for node in nodes.items:
         ephemeral_storage = node.status.capacity.get("ephemeral-storage", "0")
         instance_type = node.metadata.labels.get("beta.kubernetes.io/instance-type", "N/A")
+        creation_timestamp = node.metadata.creation_timestamp
 
         table.add_row(
             node.metadata.name,
@@ -110,42 +80,8 @@ def display_kubernetes_nodes():
             f"{round(convert_memory_to_mib(node.status.capacity.get('memory')), 2)}",
             f"{round(convert_memory_to_gb(ephemeral_storage), 2)}",
             instance_type,
-            node.status.allocatable.get("pods")
+            node.status.allocatable.get("pods"),
-        )
+            calculate_time_on_duty(creation_timestamp) if creation_timestamp else "N/A"
-
-    console.print(table)
-
-def display_namespace_usage():
-    config.load_incluster_config()
-    metrics_client = client.CustomObjectsApi()
-
-    table = Table(title="📊 Namespace Resource Usage", style="bold magenta")
-    table.add_column("Namespace", style="white")
-    table.add_column("CPU (Cores)", justify="right", style="yellow")
-    table.add_column("Memory (MiB)", justify="right", style="cyan")
-
-    namespace_usage = {}
-    pod_metrics = metrics_client.list_cluster_custom_object(
-        group="metrics.k8s.io", version="v1beta1", plural="pods"
-    )
-
-    for pod in pod_metrics["items"]:
-        namespace = pod["metadata"]["namespace"]
-        if namespace not in namespace_usage:
-            namespace_usage[namespace] = {"cpu": 0, "memory": 0}
-
-        for container in pod["containers"]:
-            cpu_usage = container["usage"]["cpu"]
-            memory_usage = container["usage"]["memory"]
-
-            namespace_usage[namespace]["cpu"] += convert_cpu_to_cores(cpu_usage)
-            namespace_usage[namespace]["memory"] += convert_memory_to_mib(memory_usage)
-
-    for namespace, usage in namespace_usage.items():
-        table.add_row(
-            namespace,
-            f"{round(usage['cpu'], 4)}",
-            f"{round(usage['memory'], 2)}"
         )
 
     console.print(table)

app/routes/export.py

@@ -1,13 +1,57 @@
 from fastapi import APIRouter, Response
 from database import fetch_all
 from kubernetes import client, config
+from datetime import datetime, timezone
 import yaml
 import json
-import logging
 
 router = APIRouter()
 
 # Helper functions for conversions
+def calculate_time_on_duty(creation_timestamp):
+    """
+    Calculate the time on duty in hours, days, or minutes from the creation timestamp.
+    """
+    now = datetime.now(timezone.utc)
+    delta = now - creation_timestamp
+
+    # If less than an hour, return minutes
+    if delta.days < 1 and delta.seconds < 3600:
+        minutes = delta.seconds // 60
+        return f"{minutes} minutes" if minutes > 1 else "less than a minute"
+    
+    # If less than a day, return hours
+    if delta.days < 1:
+        hours = delta.seconds // 3600
+        return f"{hours} hours" if hours > 1 else "1 hour"
+
+    # Otherwise, return days
+    return f"{delta.days} days" if delta.days > 1 else "1 day"
+
+def convert_memory_to_gb(memory):
+    """
+    Convert memory to GB (gigabytes) for ephemeral-storage.
+    """
+    if "Ki" in memory:
+        return int(memory.replace("Ki", "")) / (1024 ** 2)
+    elif "Mi" in memory:
+        return int(memory.replace("Mi", "")) / 1024
+    elif "Gi" in memory:
+        return int(memory.replace("Gi", ""))
+    return float(memory)
+
+def convert_memory_to_mib(memory):
+    """
+    Convert memory to MiB (mebibytes).
+    """
+    if "Ki" in memory:
+        return int(memory.replace("Ki", "")) / 1024
+    elif "Mi" in memory:
+        return int(memory.replace("Mi", ""))
+    elif "Gi" in memory:
+        return int(memory.replace("Gi", "")) * 1024
+    return float(memory)
+
 def convert_cpu_to_cores(cpu):
     """
     Convert CPU usage to cores for human-readable format.
@@ -22,19 +66,6 @@ def convert_cpu_to_cores(cpu):
         return round(int(cpu.replace("m", "")) / 1000, 4)
     return float(cpu)  # Already in cores
 
-def convert_memory_to_mib(memory):
-    """
-    Convert memory to MiB (mebibytes).
-    Handles units: Ki (kibibytes), Mi (mebibytes), Gi (gibibytes).
-    """
-    if "Ki" in memory:
-        return int(memory.replace("Ki", "")) / 1024
-    elif "Mi" in memory:
-        return int(memory.replace("Mi", ""))
-    elif "Gi" in memory:
-        return int(memory.replace("Gi", "")) * 1024
-    return float(memory)
-
 # Fetch Kubernetes data with namespace resource usage
 def fetch_k8s_data_with_usage():
     config.load_incluster_config()
@@ -47,6 +78,10 @@ def fetch_k8s_data_with_usage():
         # Extract storage (ephemeral-storage) and instance type
         ephemeral_storage = node.status.capacity.get("ephemeral-storage", "0")
         instance_type = node.metadata.labels.get("beta.kubernetes.io/instance-type", "N/A")
+        creation_timestamp = node.metadata.creation_timestamp
+
+        # Calculate time on duty
+        time_on_duty = calculate_time_on_duty(creation_timestamp) if creation_timestamp else "N/A"
 
         nodes.append({
             "node_name": node.metadata.name,
@@ -55,6 +90,7 @@ def fetch_k8s_data_with_usage():
             "storage": f"{round(convert_memory_to_gb(ephemeral_storage), 2)} GB",
             "instance_type": instance_type,
             "pods_allocatable": node.status.allocatable.get("pods"),
+            "time_on_duty": time_on_duty,  # Add time on duty
         })
 
     # Fetch namespaces
@@ -89,19 +125,6 @@ def fetch_k8s_data_with_usage():
 
     return {"nodes": nodes, "namespaces": namespaces, "namespace_usage": namespace_usage}
 
-
-def convert_memory_to_gb(memory):
-    """
-    Convert memory to GB (gigabytes) for ephemeral-storage.
-    """
-    if "Ki" in memory:
-        return int(memory.replace("Ki", "")) / (1024 ** 2)
-    elif "Mi" in memory:
-        return int(memory.replace("Mi", "")) / 1024
-    elif "Gi" in memory:
-        return int(memory.replace("Gi", ""))
-    return float(memory)
-
 # Export endpoint
 @router.get("/export")
 def export_data(format: str = "yaml"):