Use same fault formatting for short and long

client-cli/pvc/cli/formatters.py

@@ -136,7 +136,7 @@ def cli_cluster_status_format_pretty(CLI_CONFIG, data):
             )
 
         messages = "\n               ".join(message_list)
-        output.append(f"{ansii['purple']}New Faults:{ansii['end']}    {messages}")
+        output.append(f"{ansii['purple']}Active Faults:{ansii['end']} {messages}")
 
     output.append("")
 
@@ -274,8 +274,28 @@ def cli_cluster_status_format_short(CLI_CONFIG, data):
     )
 
     if messages is not None and len(messages) > 0:
-        messages = "\n         ".join(messages["text"])
+        message_list = list()
-        output.append(f"{ansii['purple']}Faults:{ansii['end']}  {messages}")
+        for message in messages:
+            if message["health_delta"] >= 50:
+                message_colour = ansii["red"]
+            elif message["health_delta"] >= 10:
+                message_colour = ansii["yellow"]
+            else:
+                message_colour = ansii["green"]
+            message_delta = (
+                f"({message_colour}-{message['health_delta']}%{ansii['end']})"
+            )
+            message_list.append(
+                # 15 length due to ANSI colour sequences
+                "{id} {delta:<15} {text}".format(
+                    id=message["id"],
+                    delta=message_delta,
+                    text=message["text"],
+                )
+            )
+
+        messages = "\n               ".join(message_list)
+        output.append(f"{ansii['purple']}Active Faults:{ansii['end']} {messages}")
 
     output.append("")