Merge pull request #18 from LorbusChris/dev

Dynamic greenboot MotD

Author: LorbusChris

etc/greenboot/green.d/00_greenboot_notification.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 set -euo pipefail
 
-# We need to determine whether this boot was a fallback boot
+# Determine if the current boot is a fallback boot
 if grub2-editenv list | grep -q "^boot_counter=-1$"; then
+  # If booted into fallback deployment, clean up bootloader entries (rollback)
   rpm-ostree rollback
 fi

etc/greenboot/green.d/01_ostree_grub2_fallback.sh

@@ -0,0 +1 @@
+greenboot hasn't run, yet. Boot Status is INDETERMINATE.

etc/greenboot/green.d/50_greenboot_motd.sh

@@ -3,8 +3,8 @@
 %global build_timestamp %(date +"%Y%m%d%H%M%%S")
 
 Name:               greenboot
-Version:            0.4
-Release:            2%{?dist}
+Version:            0.5
+Release:            1%{?dist}
 Summary:            Generic Health Check Framework for systemd
 License:            LGPLv2+
 URL:                https://github.com/%{github_owner}/%{github_project}
@@ -57,42 +57,49 @@ Requires:           %{name} = %{version}-%{release}
 
 %install
 install -Dpm 0755 usr/libexec/greenboot/greenboot.sh %{buildroot}%{_libexecdir}/%{name}/%{name}.sh
+install -Dpm 0755 usr/libexec/greenboot/greenboot_motdgen.sh %{buildroot}%{_libexecdir}/%{name}/%{name}_motdgen.sh
 install -Dpm 0644 usr/lib/systemd/system/greenboot.target %{buildroot}%{_unitdir}/greenboot.target
 install -Dpm 0644 usr/lib/systemd/system/greenboot-healthcheck.service %{buildroot}%{_unitdir}/greenboot-healthcheck.service
 install -Dpm 0644 usr/lib/systemd/system/greenboot.service %{buildroot}%{_unitdir}/greenboot.service
 install -Dpm 0644 usr/lib/systemd/system/redboot.service %{buildroot}%{_unitdir}/redboot.service
-mkdir -p %{buildroot}/run/%{name}
-mkdir -p %{buildroot}%{_sysconfdir}/motd.d
+install -Dpm 0644 usr/lib/systemd/system/greenboot-motdgen.service %{buildroot}%{_unitdir}/greenboot-motdgen.service
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}/check/required.d
 mkdir    %{buildroot}%{_sysconfdir}/%{name}/check/wanted.d
 mkdir    %{buildroot}%{_sysconfdir}/%{name}/green.d
 mkdir    %{buildroot}%{_sysconfdir}/%{name}/red.d
-mkdir    %{buildroot}%{_sysconfdir}/%{name}/motd
 install -Dpm 0755 etc/greenboot/check/required.d/* %{buildroot}%{_sysconfdir}/%{name}/check/required.d
 install -Dpm 0755 etc/greenboot/check/wanted.d/* %{buildroot}%{_sysconfdir}/%{name}/check/wanted.d
 install -Dpm 0755 etc/greenboot/green.d/* %{buildroot}%{_sysconfdir}/%{name}/green.d
 install -Dpm 0755 etc/greenboot/red.d/* %{buildroot}%{_sysconfdir}/%{name}/red.d
-install -Dpm 0644 etc/greenboot/motd/* %{buildroot}%{_sysconfdir}/%{name}/motd
-ln -snf /run/greenboot/motd %{buildroot}%{_sysconfdir}/motd.d/%{name}
+install -Dpm 0644 etc/greenboot/motd %{buildroot}%{_sysconfdir}/%{name}/motd
 
 %post
 %systemd_post greenboot.target
 %systemd_post greenboot.service
 %systemd_post greenboot-healthcheck.service
 %systemd_post redboot.service
 
+%post motd
+%systemd_post greenboot-motdgen.service
+
 %preun
 %systemd_preun greenboot.target
 %systemd_preun greenboot.service
 %systemd_preun greenboot-healthcheck.service
 %systemd_preun redboot.service
 
+%preun motd
+%systemd_preun greenboot-motdgen.service
+
 %postun
 %systemd_postun_with_restart greenboot.target
 %systemd_postun_with_restart greenboot.service
 %systemd_postun_with_restart greenboot-healthcheck.service
 %systemd_postun_with_restart redboot.service
 
+%postun motd
+%systemd_postun greenboot-motdgen.service
+
 %check
 # TODO
 
@@ -112,16 +119,12 @@ ln -snf /run/greenboot/motd %{buildroot}%{_sysconfdir}/motd.d/%{name}
 %dir %{_sysconfdir}/%{name}/check/wanted.d
 %{_sysconfdir}/%{name}/check/wanted.d/00_wanted_scripts_start.sh
 %dir %{_sysconfdir}/%{name}/green.d
-%{_sysconfdir}/%{name}/green.d/00_greenboot_notification.sh
 %dir %{_sysconfdir}/%{name}/red.d
-%{_sysconfdir}/%{name}/red.d/00_redboot_notification.sh
 
 %files motd
-%dir /run/%{name}
-%config(noreplace) %{_sysconfdir}/motd.d/%{name}
-%config %{_sysconfdir}/%{name}/motd/
-%{_sysconfdir}/%{name}/green.d/50_greenboot_motd.sh
-%{_sysconfdir}/%{name}/red.d/50_redboot_motd.sh
+%config %{_sysconfdir}/%{name}/motd
+%{_libexecdir}/%{name}/%{name}_motdgen.sh
+%{_unitdir}/greenboot-motdgen.service
 
 %files ostree-grub2
 %{_sysconfdir}/%{name}/green.d/01_ostree_grub2_fallback.sh

etc/greenboot/motd

@@ -2,6 +2,8 @@
 set -euo pipefail
 
 rpm-ostree upgrade
+# In order to activate grub2's Boot Couting feature,
+# boot_counter must be set to a number >= 1, and boot_success=0
 grub2-editenv - set boot_success=0
 grub2-editenv - set boot_counter=3
 reboot

etc/greenboot/motd/greenboot.motd

@@ -0,0 +1,10 @@
+[Unit]
+Description=greenboot MotD Generator
+After=greenboot-healthcheck.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/libexec/greenboot/greenboot_motdgen.sh
+
+[Install]
+WantedBy=greenboot.service redboot.service

etc/greenboot/motd/redboot.motd

@@ -21,7 +21,7 @@ script_runner () {
           exit $rc
       esac
     else
-      echo "<5>Script '$(basename $script)' SUCCESS"
+      echo "<6>Script '$(basename $script)' SUCCESS"
     fi
   done
 }
@@ -32,9 +32,11 @@ case "$1" in
     script_runner "/etc/greenboot/check/wanted.d" "relaxed" "Running Wanted Health Check Scripts..."
     ;;
   "green")
+    echo "<5>Boot Status is GREEN - Health Check SUCCESS!"
     script_runner "/etc/greenboot/green.d" "relaxed" "Running Green Scripts..."
     ;;
   "red")
+    echo "<0>Boot Status is RED - Health Check FAILURE!"
     script_runner "/etc/greenboot/red.d" "relaxed" "Running Red Scripts..."
     ;;
   *)

etc/greenboot/red.d/00_redboot_notification.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -euo pipefail
+
+if [ ! -d /etc/motd.d ]; then
+    mkdir /etc/motd.d
+fi
+
+if [ "$(systemctl is-active greenboot.target)" = "active" ]; then
+    greenboot_logs=$(journalctl -u greenboot.service -p 0..5 -b -0 -o cat)
+    printf '%s\n' "$greenboot_logs" > /etc/greenboot/motd
+else
+    redboot_logs=$(journalctl -u redboot.service -p 0..5 -b -0 -o cat)
+    printf '%s\n' "$redboot_logs" > /etc/greenboot/motd
+    current_healthcheck_logs=$(journalctl -u greenboot-healthcheck.service -p 0..2 -b 0 -o cat)
+    printf '%\n' "$current_healthcheck_logs" >> /etc/greenboot/motd
+fi
+
+if grub2-editenv list | grep -q "^boot_counter=-1$"; then
+    prev_healthcheck_logs=$(journalctl -u greenboot-healthcheck.service -p 0..2 -b -1 -o cat)
+    printf 'The current boot seems to be a fallback boot. Showing health check logs from previous boot:\n%s\n' "$prev_healthcheck_logs" >> /etc/greenboot/motd
+fi
+
+# remove the following line and write above directly to /run/motd.d/greenboot
+# once https://github.com/linux-pam/linux-pam/pull/69 is merged
+ln -snf /etc/greenboot/motd /etc/motd.d/greenboot