Compare commits
2 Commits
4c6aabec6a
...
9714ac20b2
Author | SHA1 | Date |
---|---|---|
Joshua Boniface | 9714ac20b2 | |
Joshua Boniface | 79ad09ae59 |
|
@ -671,9 +671,9 @@ def cli_cluster_maintenance_off():
|
|||
@format_opt(
|
||||
{
|
||||
"pretty": cli_cluster_task_format_pretty,
|
||||
"raw": lambda d: "\n".join([t["id"] for t in d])
|
||||
if isinstance(d, list)
|
||||
else d["state"],
|
||||
"raw": lambda d: (
|
||||
"\n".join([t["id"] for t in d]) if isinstance(d, list) else d["state"]
|
||||
),
|
||||
"json": lambda d: jdumps(d),
|
||||
"json-pretty": lambda d: jdumps(d, indent=2),
|
||||
}
|
||||
|
|
|
@ -580,9 +580,11 @@ def cli_cluster_fault_list_format_long(CLI_CONFIG, fault_data):
|
|||
fault_id=fault["id"],
|
||||
fault_status=fault["status"].title(),
|
||||
fault_health_delta=f"-{fault['health_delta']}%",
|
||||
fault_acknowledged_at=fault["acknowledged_at"]
|
||||
fault_acknowledged_at=(
|
||||
fault["acknowledged_at"]
|
||||
if fault["acknowledged_at"] != ""
|
||||
else "N/A",
|
||||
else "N/A"
|
||||
),
|
||||
fault_last_reported=fault["last_reported"],
|
||||
fault_first_reported=fault["first_reported"],
|
||||
)
|
||||
|
|
|
@ -1765,9 +1765,9 @@ def format_info(config, domain_information, long_output):
|
|||
tags_name=tag["name"],
|
||||
tags_type=tag["type"],
|
||||
tags_protected=str(tag["protected"]),
|
||||
tags_protected_colour=ansiprint.green()
|
||||
if tag["protected"]
|
||||
else ansiprint.blue(),
|
||||
tags_protected_colour=(
|
||||
ansiprint.green() if tag["protected"] else ansiprint.blue()
|
||||
),
|
||||
end=ansiprint.end(),
|
||||
)
|
||||
)
|
||||
|
|
|
@ -320,7 +320,11 @@ def get_list_osd(zkhandler, limit=None, is_fuzzy=True):
|
|||
#
|
||||
def getPoolInformation(zkhandler, pool):
|
||||
# Parse the stats data
|
||||
(pool_stats_raw, tier, pgs,) = zkhandler.read_many(
|
||||
(
|
||||
pool_stats_raw,
|
||||
tier,
|
||||
pgs,
|
||||
) = zkhandler.read_many(
|
||||
[
|
||||
("pool.stats", pool),
|
||||
("pool.tier", pool),
|
||||
|
|
|
@ -244,9 +244,9 @@ def get_parsed_configuration(config_file):
|
|||
]
|
||||
][0]
|
||||
|
||||
config_cluster_networks_specific[
|
||||
f"{network_type}_dev_ip"
|
||||
] = f"{list(network.hosts())[address_id]}/{network.prefixlen}"
|
||||
config_cluster_networks_specific[f"{network_type}_dev_ip"] = (
|
||||
f"{list(network.hosts())[address_id]}/{network.prefixlen}"
|
||||
)
|
||||
|
||||
config = {**config, **config_cluster_networks_specific}
|
||||
|
||||
|
|
|
@ -231,7 +231,7 @@ class NetstatsInstance(object):
|
|||
# Get a list of all active interfaces
|
||||
net_root_path = "/sys/class/net"
|
||||
all_ifaces = list()
|
||||
for (_, dirnames, _) in walk(net_root_path):
|
||||
for _, dirnames, _ in walk(net_root_path):
|
||||
all_ifaces.extend(dirnames)
|
||||
all_ifaces.sort()
|
||||
|
||||
|
|
|
@ -743,7 +743,7 @@ def node_keepalive(logger, config, zkhandler, this_node, netstats):
|
|||
# Get node performance statistics
|
||||
this_node.memtotal = int(psutil.virtual_memory().total / 1024 / 1024)
|
||||
this_node.memused = int(psutil.virtual_memory().used / 1024 / 1024)
|
||||
this_node.memfree = int(psutil.virtual_memory().free / 1024 / 1024)
|
||||
this_node.memfree = int(psutil.virtual_memory().available / 1024 / 1024)
|
||||
this_node.cpuload = round(os.getloadavg()[0], 2)
|
||||
|
||||
# Get node network statistics via netstats instance
|
||||
|
|
Loading…
Reference in New Issue