terghalin/metalcheck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix(k8s): round core count

Browse Source
This commit is contained in:
Aleksandr Tcitlionok
2024-12-05 07:22:32 +00:00
parent 62ad85fa46
commit 38dc985545
2 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/routes/export.py
View File

@@ -8,19 +8,19 @@ import logging
router = APIRouter() router = APIRouter()
# Helper functions for conversions # Helper functions for conversions
def convert_cpu_to_millicores(cpu): def convert_cpu_to_cores(cpu):
""" """
Convert CPU usage to millicores (m). Convert CPU usage to cores for human-readable format.
Handles units: n (nano), u (micro), m (milli), or none (cores). Handles units: n (nano), u (micro), m (milli), or none (cores).
Returns float values for cores, rounded appropriately.
""" """
if "n" in cpu: # Convert nanocores to millicores if "n" in cpu: # Nanocores to cores
return int(cpu.replace("n", "")) / 1e6 return round(int(cpu.replace("n", "")) / 1e9, 4)
elif "u" in cpu: # Convert microcores to millicores elif "u" in cpu: # Microcores to cores
return int(cpu.replace("u", "")) / 1e3 return round(int(cpu.replace("u", "")) / 1e6, 4)
elif "m" in cpu: # Already in millicores elif "m" in cpu: # Millicores to cores
return int(cpu.replace("m", "")) return round(int(cpu.replace("m", "")) / 1000, 4)
return float(cpu) * 1000 # Convert cores to millicores return float(cpu) # Already in cores
def convert_memory_to_mib(memory): def convert_memory_to_mib(memory):
if "Ki" in memory: if "Ki" in memory:
@@ -62,21 +62,22 @@ def fetch_k8s_data_with_usage():
cpu_usage = container["usage"]["cpu"] cpu_usage = container["usage"]["cpu"]
memory_usage = container["usage"]["memory"] memory_usage = container["usage"]["memory"]
# Convert CPU to millicores and memory to MiB # Convert CPU to cores and memory to MiB
namespace_usage[pod_namespace]["cpu"] += convert_cpu_to_millicores(cpu_usage) namespace_usage[pod_namespace]["cpu"] += convert_cpu_to_cores(cpu_usage)
namespace_usage[pod_namespace]["memory"] += convert_memory_to_mib(memory_usage) namespace_usage[pod_namespace]["memory"] += convert_memory_to_mib(memory_usage)
# Convert usage to serializable types # Round and format usage for readability
namespace_usage = { namespace_usage = {
ns: { ns: {
"cpu": round(usage["cpu"], 2), # Round to 2 decimal places for readability "cpu": round(usage["cpu"], 4), # Round to 4 decimal places
"memory": round(usage["memory"], 2), "memory": round(usage["memory"], 2), # Memory in MiB
} }
for ns, usage in namespace_usage.items() for ns, usage in namespace_usage.items()
} }
return {"nodes": nodes, "namespaces": namespaces, "namespace_usage": namespace_usage} return {"nodes": nodes, "namespaces": namespaces, "namespace_usage": namespace_usage}
# Export endpoint # Export endpoint
@router.get("/export") @router.get("/export")
def export_data(format: str = "yaml"): def export_data(format: str = "yaml"):

32
app/routes/k8s.py
View File

@@ -5,7 +5,7 @@ import math
router = APIRouter() router = APIRouter()
def fetch_k8s_data_with_usage(): def fetch_k8s_data_with_usage():
config.load_incluster_config() # Use in-cluster configuration config.load_incluster_config()
v1 = client.CoreV1Api() v1 = client.CoreV1Api()
metrics_client = client.CustomObjectsApi() metrics_client = client.CustomObjectsApi()
@@ -34,15 +34,15 @@ def fetch_k8s_data_with_usage():
cpu_usage = container["usage"]["cpu"] cpu_usage = container["usage"]["cpu"]
memory_usage = container["usage"]["memory"] memory_usage = container["usage"]["memory"]
# Convert CPU to millicores and memory to MiB # Convert CPU to cores and memory to MiB
namespace_usage[pod_namespace]["cpu"] += convert_cpu_to_millicores(cpu_usage) namespace_usage[pod_namespace]["cpu"] += convert_cpu_to_cores(cpu_usage)
namespace_usage[pod_namespace]["memory"] += convert_memory_to_mib(memory_usage) namespace_usage[pod_namespace]["memory"] += convert_memory_to_mib(memory_usage)
# Convert usage to serializable types # Round and format usage for readability
namespace_usage = { namespace_usage = {
ns: { ns: {
"cpu": round(usage["cpu"], 2), # Round to 2 decimal places for readability "cpu": round(usage["cpu"], 4), # Round to 4 decimal places
"memory": round(usage["memory"], 2), "memory": round(usage["memory"], 2), # Memory in MiB
} }
for ns, usage in namespace_usage.items() for ns, usage in namespace_usage.items()
} }
@@ -50,19 +50,19 @@ def fetch_k8s_data_with_usage():
return {"nodes": nodes, "namespaces": namespaces, "namespace_usage": namespace_usage} return {"nodes": nodes, "namespaces": namespaces, "namespace_usage": namespace_usage}
def convert_cpu_to_millicores(cpu): def convert_cpu_to_cores(cpu):
""" """
Convert CPU usage to millicores (m). Convert CPU usage to cores for human-readable format.
Handles units: n (nano), u (micro), m (milli), or none (cores). Handles units: n (nano), u (micro), m (milli), or none (cores).
Returns float values for cores, rounded appropriately.
""" """
if "n" in cpu: # Convert nanocores to millicores if "n" in cpu: # Nanocores to cores
return int(cpu.replace("n", "")) / 1e6 return round(int(cpu.replace("n", "")) / 1e9, 4)
elif "u" in cpu: # Convert microcores to millicores elif "u" in cpu: # Microcores to cores
return int(cpu.replace("u", "")) / 1e3 return round(int(cpu.replace("u", "")) / 1e6, 4)
elif "m" in cpu: # Already in millicores elif "m" in cpu: # Millicores to cores
return int(cpu.replace("m", "")) return round(int(cpu.replace("m", "")) / 1000, 4)
return float(cpu) * 1000 # Convert cores to millicores return float(cpu) # Already in cores
def convert_memory_to_mib(memory): def convert_memory_to_mib(memory):
if "Ki" in memory: if "Ki" in memory: