Merge ~jfguedez/charm-nrpe:bug/1967210 into charm-nrpe:master

[Jose Guedez]

cis-audit: update cronjob default max-age, to avoid race condition

Closes-Bug: #1967210

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:0dd488f98f8256ccc1e631810cf20196e49a80f1
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/106/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/730/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1198/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/106//rebuild

review: Approve (continuous-integration)

[Xav Paice (xavpaice)]

lgtm

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 602b11b8464af1ec7a565ea8668bbbba2ddbdcfd

diff --git a/files/plugins/cron_cis_audit.py b/files/plugins/cron_cis_audit.py
index 706337b..50693fb 100755
--- a/files/plugins/cron_cis_audit.py
+++ b/files/plugins/cron_cis_audit.py
@@ -88,8 +88,8 @@ def parse_args(args):
         "--max-age",
         "-a",
         type=int,
-        help="maximum age (h) of audit result file before alerting (default 170)",
-        default=170,
+        help="maximum age (h) of result file before running the audit (default 168)",
+        default=168,
     )
     profile_options = PROFILES + [""]
     parser.add_argument(
diff --git a/mod/charmhelpers b/mod/charmhelpers
index 446cbfd..0cf9358 160000
--- a/mod/charmhelpers
+++ b/mod/charmhelpers
@@ -1 +1 @@
-Subproject commit 446cbfdad83e15b5cfd20f862d3c3b5b1956b998
+Subproject commit 0cf935879e675a54269567458e1e928ea86a4c64
diff --git a/tests/unit/test_plugins_cis_audit.py b/tests/unit/test_plugins_cis_audit.py
index e9a9319..7fd02da 100644
--- a/tests/unit/test_plugins_cis_audit.py
+++ b/tests/unit/test_plugins_cis_audit.py
@@ -94,7 +94,7 @@ class TestCronCisAudit(TestCase):
         """Test the default parsing behavior of the argument parser."""
         # test empty parameters
         args = cron_cis_audit.parse_args([])
-        self.assertEqual(args, argparse.Namespace(cis_profile="", max_age=170))
+        self.assertEqual(args, argparse.Namespace(cis_profile="", max_age=168))
 
         # test setting parameters
         args = cron_cis_audit.parse_args(["-a 1", "-p=level2_workstation"])