parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Remove headers and add util to short output

This commit is contained in:
Joshua Boniface 2024-09-05 17:08:54 -04:00
parent 2de999c700
commit 73c0834f85
1 changed files with 68 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
client-cli/pvc/cli/formatters.py
View File

@ -88,7 +88,7 @@ def cli_cluster_status_format_pretty(CLI_CONFIG, data):
total_cpu_utilization = ( total_cpu_utilization = (
data.get("resources", {}).get("cpu", {}).get("utilization", 0) data.get("resources", {}).get("cpu", {}).get("utilization", 0)
) )
total_cpu_str = ( total_cpu_string = (
f"{total_cpu_utilization:.1f}% ({total_cpu_load:.1f} / {total_cpu_total})" f"{total_cpu_utilization:.1f}% ({total_cpu_load:.1f} / {total_cpu_total})"
) )
@ -101,7 +101,7 @@ def cli_cluster_status_format_pretty(CLI_CONFIG, data):
total_memory_utilization = ( total_memory_utilization = (
data.get("resources", {}).get("memory", {}).get("utilization", 0) data.get("resources", {}).get("memory", {}).get("utilization", 0)
) )
total_memory_str = f"{total_memory_utilization:.1f}% ({total_memory_used:.1f} GB / {total_memory_total:.1f} GB)" total_memory_string = f"{total_memory_utilization:.1f}% ({total_memory_used:.1f} GB / {total_memory_total:.1f} GB)"
total_disk_total = ( total_disk_total = (
data.get("resources", {}).get("disk", {}).get("total", 0) / 1024 / 1024 data.get("resources", {}).get("disk", {}).get("total", 0) / 1024 / 1024
@ -112,7 +112,7 @@ def cli_cluster_status_format_pretty(CLI_CONFIG, data):
total_disk_utilization = round( total_disk_utilization = round(
data.get("resources", {}).get("disk", {}).get("utilization", 0) data.get("resources", {}).get("disk", {}).get("utilization", 0)
) )
total_disk_str = f"{total_disk_utilization:.1f}% ({total_disk_used:.1f} GB / {total_disk_total:.1f} GB)" total_disk_string = f"{total_disk_utilization:.1f}% ({total_disk_used:.1f} GB / {total_disk_total:.1f} GB)"
if maintenance == "true" or health == -1: if maintenance == "true" or health == -1:
health_colour = ansii["blue"] health_colour = ansii["blue"]
@ -125,9 +125,6 @@ def cli_cluster_status_format_pretty(CLI_CONFIG, data):
output = list() output = list()
output.append(f"{ansii['bold']}PVC cluster status:{ansii['end']}")
output.append("")
output.append(f"{ansii['purple']}Primary node:{ansii['end']} {primary_node}") output.append(f"{ansii['purple']}Primary node:{ansii['end']} {primary_node}")
output.append(f"{ansii['purple']}PVC version:{ansii['end']} {pvc_version}") output.append(f"{ansii['purple']}PVC version:{ansii['end']} {pvc_version}")
output.append(f"{ansii['purple']}Upstream IP:{ansii['end']} {upstream_ip}") output.append(f"{ansii['purple']}Upstream IP:{ansii['end']} {upstream_ip}")
@ -167,7 +164,17 @@ def cli_cluster_status_format_pretty(CLI_CONFIG, data):
) )
messages = "\n ".join(message_list) messages = "\n ".join(message_list)
output.append(f"{ansii['purple']}Active Faults:{ansii['end']} {messages}") else:
messages = "None"
output.append(f"{ansii['purple']}Active faults:{ansii['end']} {messages}")
output.append(f"{ansii['purple']}Total CPU:{ansii['end']} {total_cpu_string}")
output.append(
f"{ansii['purple']}Total memory:{ansii['end']} {total_memory_string}"
)
output.append(f"{ansii['purple']}Total disk:{ansii['end']} {total_disk_string}")
output.append("") output.append("")
@ -265,12 +272,6 @@ def cli_cluster_status_format_pretty(CLI_CONFIG, data):
output.append("") output.append("")
output.append(f"{ansii['purple']}CPU Usage:{ansii['end']} {total_cpu_str}")
output.append(f"{ansii['purple']}Memory Usage:{ansii['end']} {total_memory_str}")
output.append(f"{ansii['purple']}Disk Usage:{ansii['end']} {total_disk_str}")
return "\n".join(output) return "\n".join(output)
@ -295,9 +296,6 @@ def cli_cluster_status_format_short(CLI_CONFIG, data):
output = list() output = list()
output.append(f"{ansii['bold']}PVC cluster status:{ansii['end']}")
output.append("")
if health != "-1": if health != "-1":
health = f"{health}%" health = f"{health}%"
else: else:
@ -332,7 +330,48 @@ def cli_cluster_status_format_short(CLI_CONFIG, data):
) )
messages = "\n ".join(message_list) messages = "\n ".join(message_list)
output.append(f"{ansii['purple']}Active Faults:{ansii['end']} {messages}") else:
messages = "None"
output.append(f"{ansii['purple']}Active faults:{ansii['end']} {messages}")
total_cpu_total = data.get("resources", {}).get("cpu", {}).get("total", 0)
total_cpu_load = data.get("resources", {}).get("cpu", {}).get("load", 0)
total_cpu_utilization = (
data.get("resources", {}).get("cpu", {}).get("utilization", 0)
)
total_cpu_string = (
f"{total_cpu_utilization:.1f}% ({total_cpu_load:.1f} / {total_cpu_total})"
)
total_memory_total = (
data.get("resources", {}).get("memory", {}).get("total", 0) / 1024
)
total_memory_used = (
data.get("resources", {}).get("memory", {}).get("used", 0) / 1024
)
total_memory_utilization = (
data.get("resources", {}).get("memory", {}).get("utilization", 0)
)
total_memory_string = f"{total_memory_utilization:.1f}% ({total_memory_used:.1f} GB / {total_memory_total:.1f} GB)"
total_disk_total = (
data.get("resources", {}).get("disk", {}).get("total", 0) / 1024 / 1024
)
total_disk_used = (
data.get("resources", {}).get("disk", {}).get("used", 0) / 1024 / 1024
)
total_disk_utilization = round(
data.get("resources", {}).get("disk", {}).get("utilization", 0)
)
total_disk_string = f"{total_disk_utilization:.1f}% ({total_disk_used:.1f} GB / {total_disk_total:.1f} GB)"
output.append(f"{ansii['purple']}CPU usage:{ansii['end']} {total_cpu_string}")
output.append(
f"{ansii['purple']}Memory usage:{ansii['end']} {total_memory_string}"
)
output.append(f"{ansii['purple']}Disk usage:{ansii['end']} {total_disk_string}")
output.append("") output.append("")