Merge pull request #106 from timdaman/fix/podman

Fix cpu and memory flags in Podman

Author: martialblog

check_docker/check_docker.py

@@ -551,7 +551,10 @@ def check_memory(container, thresholds):
 
     inspection = get_stats(container)
 
-    # Subtracting cache to match what `docker stats` does.
+    # Workaround for Podman, since it doesn't provide the stats field
+    if 'stats' not in inspection['memory_stats'].keys(): inspection['memory_stats']['stats'] = {'total_cache': 0}
+
+    # # Subtracting cache to match what `docker stats` does.
     adjusted_usage = inspection['memory_stats']['usage']
     if 'total_cache' in inspection['memory_stats']['stats']:
         # CGroups v1 - https://www.kernel.org/doc/Documentation/cgroup-v1/memory.txt
@@ -715,6 +718,9 @@ def calculate_cpu_capacity_precentage(info, stats):
     else:
         available_limit_ratio = (period * num_cpus) / quota
 
+    # Workaround for Podman, since it doesn't provide the field
+    if 'system_cpu_usage' not in stats['precpu_stats'].keys(): stats['precpu_stats']['system_cpu_usage'] = 0
+
     cpu_delta = stats['cpu_stats']['cpu_usage']['total_usage'] - stats['precpu_stats']['cpu_usage']['total_usage']
     system_delta = stats['cpu_stats']['system_cpu_usage'] - stats['precpu_stats']['system_cpu_usage']
     usage = (cpu_delta / system_delta) * available_limit_ratio

tests/test_check_docker.py

@@ -257,6 +257,7 @@ def mock_response(*args, **kwargs):
         ({'limit': 10, 'usage': 1, 'stats': {'total_cache': 1}}, 20, 30, '%', cd.OK_RC),
         ({'limit': 10, 'usage': 3, 'stats': {'total_cache': 1}}, 20, 30, '%', cd.WARNING_RC),
         ({'limit': 10, 'usage': 4, 'stats': {'total_cache': 1}}, 20, 30, '%', cd.CRITICAL_RC),
+        ({'limit': 10, 'usage': 4}, 20, 30, '%', cd.CRITICAL_RC),
         ({'limit': 10, 'usage': 4, 'stats': {'total_cache': 1}}, 20, 30, 'BAD_UNITS', cd.UNKNOWN_RC),
 ))
 def test_check_memory(check_docker_with_units, memory_stats, warn, crit, units, expected_status):