Improve output format

Author: cmd-ntrf

utils/incus_report.sh

@@ -11,13 +11,13 @@ puppet_server=$(incus list --columns "nd" -f csv | grep \"puppet\" | cut -d',' -
 echo
 for nodename in $(incus list -c n -f csv); do
 	echo -n "### ${nodename}" 
-	failures=$(incus exec ${puppet_server} -- cat /var/lib/node_exporter/puppet_report_${nodename}.prom | grep 'name="Failure"' | cut -d' ' -f2)
+	failures=$(incus exec ${puppet_server} -- grep 'name="Failure"' /var/lib/node_exporter/puppet_report_${nodename}.prom | cut -d' ' -f2)
 	timeout=$(incus exec $nodename -- journalctl -u puppet -p3..4 | grep -i 'command exceeded timeout' | wc -l)
 	if (( $failures - $timeout > 0 )); then
 		echo " FAILED"
 		cat <<- EOF
-			#### failures
-			<details><pre><code>$(incus exec $nodename -- journalctl -u puppet -p3..4 | grep -i -v -P '(connection|routes|wrapped|command exceeded timeout)')
+			<details><summary>failures</summary>
+			<pre><code>$(incus exec $nodename -- journalctl -u puppet -p3..4 | grep -i -v -P '(connection|routes|wrapped|command exceeded timeout)')
 			</code></pre></details>
 		EOF
 		SUCCESSFUL=1
@@ -26,22 +26,22 @@ for nodename in $(incus list -c n -f csv); do
 	fi
 	if (( $timeout > 0 )); then
 		cat <<- EOF
-			#### timeout
-			<details><pre><code>$(incus exec $nodename -- journalctl -u puppet -p3..4 | grep -i 'command exceeded timeout')
+			<details><summary>timeout</summary>
+			<pre><code>$(incus exec $nodename -- journalctl -u puppet -p3..4 | grep -i 'command exceeded timeout')
 			</code></pre></details>
 		EOF
 	fi
 
 	echo
 	cat <<- EOF
-		#### apply log
-		<details><pre><code>$(incus exec $nodename -- journalctl -u puppet)
+		<details><summary>apply log</summary>
+		<pre><code>$(incus exec $nodename -- journalctl -u puppet)
 		</code></pre></details>
 	EOF
 	echo
 	cat <<- EOF
-		#### Puppet report
-		<details><pre><code>$(incus exec ${puppet_server} -- cat /var/lib/node_exporter/puppet_report_${nodename}.prom | grep '^puppet_report')
+		<details><summary>Puppet report</summary>
+		<pre><code>$(incus exec ${puppet_server} -- cat /var/lib/node_exporter/puppet_report_${nodename}.prom | grep '^puppet_report')
 		</code></pre></details>
 	EOF
 	echo