UCD buffers and cache discovered with inverted free/used values

(polling was correct)
murrant · Nov 1, 2023 · a1aeb3b · a1aeb3b
1 parent 7c542d7
commit a1aeb3b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/LibreNMS/Modules/Mempools.php b/LibreNMS/Modules/Mempools.php
@@ -207,6 +207,15 @@ private function calculateAvailable(Collection $mempools)
             if ($system !== null) {
                 $old = Number::formatBi($system->mempool_free);
                 $system->fillUsage(($system->mempool_used - $buffers - $cached) / $system->mempool_precision, $system->mempool_total / $system->mempool_precision);
+
+                dd([
+                    'used' => Number::formatBi($system->mempool_used),
+                    'buffers' => Number::formatBi($buffers),
+                    'cached' => Number::formatBi($cached),
+                    'actual_used' => Number::formatBi($system->mempool_used - $buffers - $cached),
+                    'old' => $old,
+                    'free' => Number::formatBi($system->mempool_free),
+                ]);
                 $new = Number::formatBi($system->mempool_free);
                 Log::debug("Free memory adjusted by availability calculation: {$old} -> {$new}\n");
             }

diff --git a/LibreNMS/OS/Traits/UcdResources.php b/LibreNMS/OS/Traits/UcdResources.php
@@ -96,7 +96,7 @@ public function discoverMempools()
                 'mempool_precision' => 1024,
                 'mempool_descr' => 'Memory buffers',
                 'mempool_used_oid' => '.1.3.6.1.4.1.2021.4.14.0',
-            ]))->fillUsage(null, $data[0]['memTotalReal'], $data[0]['memBuffer']));
+            ]))->fillUsage($data[0]['memBuffer'], $data[0]['memTotalReal']));
         }
 
         if ($this->oidValid($data, 'memCached')) {
@@ -107,7 +107,7 @@ public function discoverMempools()
                 'mempool_precision' => 1024,
                 'mempool_descr' => 'Cached memory',
                 'mempool_used_oid' => '.1.3.6.1.4.1.2021.4.15.0',
-            ]))->fillUsage(null, $data[0]['memTotalReal'], $data[0]['memCached']));
+            ]))->fillUsage($data[0]['memCached'], $data[0]['memTotalReal']));
         }
 
         if ($this->oidValid($data, 'memSysAvail')) {