diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2020-10-25 20:47:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-25 20:47:01 +0300 |
| commit | e66709e13bcdcfdad3321ea68cd6ab66b206ad8b (patch) | |
| tree | a08c2426554e9df4c46bb884925e4f535628e8f5 /include/tests_accounting | |
| parent | cee7d49a42c0ad38bbbbd5c23efc7d02fbdcdeb7 (diff) | |
| parent | bd7131f6db22c17569d0ce24f75e1d4595c473c3 (diff) | |
Merge pull request #1011 from Varbin/986-sysstat-systemd
[ACCT-9626] Detect sysstat systemd unit
Diffstat (limited to 'include/tests_accounting')
| -rw-r--r-- | include/tests_accounting | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/tests_accounting b/include/tests_accounting index ea763789..dd1ef2a8 100644 --- a/include/tests_accounting +++ b/include/tests_accounting @@ -123,8 +123,19 @@ Display --indent 2 --text "- Checking sysstat accounting data" --result "${STATUS_DISABLED}" --color WHITE ReportSuggestion "${TEST_NO}" "Enable sysstat to collect accounting (cron disabled)" fi + elif [ -f "${ROOTDIR}lib/systemd/system/sysstat.service" ] || [ -f "${ROOTDIR}etc/systemd/system/sysstat.service" ]; then + LogText "Result: sysstat systemd unit found" + if [ -L "${ROOTDIR}etc/systemd/system/multi-user.target.wants/sysstat.service" ]; then + # Assuming -collect.timer and -summary.timer are enabled as well, + # as they are usually in the install section. + LogText "Result: sysstat enabled via systemd" + Display --indent 2 --text "- Checking sysstat accounting data" --result "${STATUS_ENABLED}" --color GREEN + else + LogText "Result: sysstat disabled via systemd" + Display --indent 2 --text "- Checking sysstat accounting data" --result "${STATUS_DISABLED}" --color WHITE + fi else - LogText "Result: sysstat not found via ${ROOTDIR}etc/default/sysstat or ${ROOTDIR}etc/cron.d/sysstat" + LogText "Result: sysstat not found via ${ROOTDIR}etc/default/sysstat or ${ROOTDIR}etc/cron.d/sysstat or as a systemd unit" Display --indent 2 --text "- Checking sysstat accounting data" --result "${STATUS_NOT_FOUND}" --color YELLOW ReportSuggestion "${TEST_NO}" "Enable sysstat to collect accounting (no results)" fi |