Juju Lint

Merge ~mertkirpici/juju-lint:lp/1999416 into juju-lint:master

  1. Git
  2. lp:~mertkirpici/juju-lint
  3. lp/1999416
  4. Merge into master
Proposed by Mert Kirpici
Status: Merged
Approved by: Gabriel Cocenza
Approved revision: c3553f50ac010f05c64e527b7fb2973f4197623f
Merged at revision: 0ca90f2c1635c2876dc893b560e3d28665c6a722
Proposed branch: ~mertkirpici/juju-lint:lp/1999416
Merge into: juju-lint:master
Diff against target: 26 lines (+4/-0)
2 files modified
contrib/canonical-rules.yaml (+2/-0)
contrib/includes/base.yaml (+2/-0)
Reviewer Review Type Date Requested Status
Gabriel Cocenza Approve
🤖 prod-jenkaas-bootstack continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+435942@code.launchpad.net

Commit message

Close LP #1999416

Description of the change

contrib: ensure swap checking is disabled on nrpe

Since swap is already monitored by the memory check, this config option is redundant.

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
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:0038c2863585de8ffb0d4915319103e83a675a20
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/57/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/2047/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1923/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/57//rebuild

review: Approve (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:c3553f50ac010f05c64e527b7fb2973f4197623f
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/58/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/2048/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1924/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/58//rebuild

review: Approve (continuous-integration)
Revision history for this message
Gabriel Cocenza (gabrielcocenza) wrote :

LGTM

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

Change successfully merged at revision 0ca90f2c1635c2876dc893b560e3d28665c6a722

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/contrib/canonical-rules.yaml b/contrib/canonical-rules.yaml
2index 60726d0..04c007d 100644
3--- a/contrib/canonical-rules.yaml
4+++ b/contrib/canonical-rules.yaml
5@@ -69,6 +69,8 @@ config:
6 neq: ""
7 netlinks:
8 neq: ""
9+ swap:
10+ eq: ""
11 landscape-client:
12 disable-unattended-upgrades:
13 eq: true
14diff --git a/contrib/includes/base.yaml b/contrib/includes/base.yaml
15index e8016f7..8ea49b1 100644
16--- a/contrib/includes/base.yaml
17+++ b/contrib/includes/base.yaml
18@@ -12,6 +12,8 @@ config:
19 netlinks:
20 neq: ""
21 suffixes: [host, physical]
22+ swap:
23+ eq: ""
24 landscape-client:
25 disable-unattended-upgrades:
26 eq: true

Subscribers

People subscribed via source and target branches