Merge ~lihuiguo/charm-nrpe:bug/1975886 into charm-nrpe:master

[Linda Guo]

MemAvailable count includes free Swap space, and now gets added to the total size of Cache memory. This can result in a cache value that is way too large, and in the rest of the calculation can then yield a negative used-memory result, and/or a free-memory result that is higher than the total amount of physical memory.

[Linda Guo (lihuiguo)]

more context https://github.com/justintime/nagios-plugins/commit/08064cb72e1e9a68b581949305ef4184b600c980

[🤖 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.

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

FAILED: Continuous integration, rev:922d3e38d0bd1e883fa407218c56e7d431574abc
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/119/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/810/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1279/

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

review: Needs Fixing (continuous-integration)

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

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

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

FAILED: Continuous integration, rev:012ff9333fbb29ef11ae643eff3b9262414b3750
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/120/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/811/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1280/

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

review: Needs Fixing (continuous-integration)

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

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

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

FAILED: Continuous integration, rev:3f2003c055cedf925818ee75889a7dac75f655ba
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/121/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/812/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1281/

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

review: Needs Fixing (continuous-integration)

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

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

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

FAILED: Continuous integration, rev:7089cb5795813525fab76be7e15553a35accf4c9
https://jenkins.canonical.com/bootstack/job/lp-charm-nrpe-ci/122/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/817/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1287/

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

review: Needs Fixing (continuous-integration)

[Alvaro Uria (aluria)]

These tests passed in jenkaas [1].

+1 from me, after the extra indentation is addressed (reported by Gui).

1. https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/834/console

review: Needs Fixing

[Linda Guo (lihuiguo)]

pushed an update to fix extra indentation

[Andrea Ieri (aieri)]

Approved, but please fix the commit message: MemAvailable does *not* include free swap. See https://www.kernel.org/doc/html/latest/filesystems/proc.html#meminfo

review: Approve

[Linda Guo (lihuiguo)]

> Approved, but please fix the commit message: MemAvailable does *not* include
> free swap. See
> https://www.kernel.org/doc/html/latest/filesystems/proc.html#meminfo

Thanks, updated the commit message

[Alvaro Uria (aluria)]

+1

review: Approve

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

Change successfully merged at revision b85a5429d3440d52422bc64036700cf9fea75fa3

diff --git a/files/plugins/check_mem.pl b/files/plugins/check_mem.pl
index 044ed5c..a1cd87c 100755
--- a/files/plugins/check_mem.pl
+++ b/files/plugins/check_mem.pl
@@ -140,6 +140,7 @@ sub get_memory_info {
     my $hugepages_nr    = 0;
     my $hugepages_size  = 0;
     my $hugepages_kb    = 0;
+    my $available_memory_kb = 0;
 
     my $uname;
     if ( -e '/usr/bin/uname') {
@@ -166,7 +167,7 @@ sub get_memory_info {
                 }
             }
             elsif (/^MemAvailable:\s+(\d+) kB/) {
-                $caches_kb += $1;
+                $available_memory_kb = $1;
             }
             elsif (/^(Buffers|Cached|SReclaimable):\s+(\d+) kB/) {
                 $caches_kb += $2;
@@ -185,7 +186,7 @@ sub get_memory_info {
             }
         }
         $hugepages_kb = $hugepages_nr * $hugepages_size;
-        $used_memory_kb = $total_memory_kb - $free_memory_kb;
+        $used_memory_kb = $total_memory_kb - $available_memory_kb;
 
         # Read hugepages info from the newer sysfs interface if available
         my $hugepages_sysfs_dir = '/sys/kernel/mm/hugepages';