Merge ~nkoltsov/charm-nrpe:bugfix_1983350 into charm-nrpe:master

Proposed by Nikita Koltsov
Status: Merged
Approved by: Eric Chen
Approved revision: 63eaa23fba3147332687da0fa5d18cd7988bba92
Merged at revision: 39071e12c050621fd8790ef28d745459b78d9210
Proposed branch: ~nkoltsov/charm-nrpe:bugfix_1983350
Merge into: charm-nrpe:master
Diff against target: 13 lines (+1/-1)
1 file modified
files/plugins/check_cis_audit.py (+1/-1)
Reviewer Review Type Date Requested Status
Eric Chen Approve
BootStack Reviewers Pending
Review via email: mp+427713@code.launchpad.net

Commit message

Change default value for max-age to fix 1983350

Description of the change

Change max-age value to prevent false positive triggers of cis audit check

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Nikita Koltsov (nkoltsov) wrote :

In theory 171 hour should be enough, but I would prefer to stay on the safe side, and use 172 to trigger the check only when there is an actual issue.

Revision history for this message
Eric Chen (eric-chen) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 39071e12c050621fd8790ef28d745459b78d9210

Revision history for this message
Mert Kirpici (mertkirpici) wrote :

I think this change is breaking a unit test:
https://pastebin.ubuntu.com/p/24rb7rWPF3/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/files/plugins/check_cis_audit.py b/files/plugins/check_cis_audit.py
2index 47c57d2..8116236 100755
3--- a/files/plugins/check_cis_audit.py
4+++ b/files/plugins/check_cis_audit.py
5@@ -124,7 +124,7 @@ def parse_args(args):
6 "-a",
7 type=int,
8 help="maximum age (h) of audit result file before alerting (default 170)",
9- default=170,
10+ default=172,
11 )
12 parser.add_argument(
13 "--cis-profile",

Subscribers

People subscribed via source and target branches

to all changes: