Fix

Author: Massimo Schembri

.gitignore

@@ -27,6 +27,7 @@
 .idea/**/uiDesigner.xml
 .idea/**/dbnavigator.xml
 .idea/
+*.xlsx
 
 # Gradle
 .idea/**/gradle.xml

main.py

@@ -51,7 +51,9 @@
         data.extend(retriever.get_mem_cpu_req_lim(ns))
     print("Data obtained from K8s APIs...")
     print("Obtaining and calculating data from Prometheus...")
-    suggested = list(map(lambda x: suggester.suggest_values(x), data))
+
+    # Filter replicas = 0
+    suggested = list(map(lambda x: suggester.suggest_values(x), filter(lambda x: x[4] != 0, data)))
 
     reporter = Reporter(header)
 

reporter.py

@@ -9,7 +9,6 @@ def __init__(self, headers):
         self.workbook.active.append(headers)
         self.end_column = chr(ord('A') + len(headers) - 1)
 
-
     def write_data_to_table(self, data):
         for row in data:
             self.workbook.active.append(row)

retriever.py

@@ -9,7 +9,8 @@ def __init__(self):
         self.resources = client.AppsV1Api()
         self.retrieve_function = {
             "deployment": self.resources.list_namespaced_deployment,
-            "statefulset": self.resources.list_namespaced_stateful_set
+            "statefulset": self.resources.list_namespaced_stateful_set,
+            "daemonset": self.resources.list_namespaced_daemon_set
         }
 
     def get_mem_cpu_req_lim(self, namespace):
@@ -18,6 +19,8 @@ def get_mem_cpu_req_lim(self, namespace):
         for object_type, function in self.retrieve_function.items():
             k8s_objects = function(namespace)
             for k8s_object in k8s_objects.items:
+                replicas = k8s_object.spec.replicas
+                name = k8s_object.metadata.name
                 for container in k8s_object.spec.template.spec.containers:
                     if container.resources.requests:
                         request_cpu = container.resources.requests.get("cpu", "Not defined")
@@ -31,9 +34,9 @@ def get_mem_cpu_req_lim(self, namespace):
                     else:
                         limit_cpu = "Not Defined"
                         limit_memory = "Not Defined"
-                    results.append((namespace, object_type, k8s_object.metadata.name,
-                                    container.name, k8s_object.spec.replicas,
-                                    request_cpu, request_memory,
-                                    limit_cpu, limit_memory))
+                    results.append((namespace, object_type, name,
+                                    container.name, replicas,
+                                    request_cpu, limit_cpu,
+                                    request_memory, limit_memory))
 
         return results

suggester.py

@@ -17,13 +17,14 @@ def suggest_values(self, k8s_object):
         #Pe i pod avg_over_time(container_memory_working_set_bytes{pod=~'snitch-jvm.*',namespace='snitch',container='snitch-jvm'}[7d])
         # Retrieve pod memory usage
         params_memory_request = {
-            "query": f"avg_over_time(container_memory_working_set_bytes{{pod=~'{k8s_object[2]}.*',namespace='{k8s_object[0]}',container='{k8s_object[3]}'}}[{self.time_range}])"
+            "query": f"avg_over_time(container_memory_working_set_bytes{{pod=~'{k8s_object[2]}.*',namespace='{k8s_object[0]}',container=''}}[{self.time_range}])"
         }
+
         response = requests.get(f"{self.prometheus_host}/api/v1/query", headers=headers, params=params_memory_request, verify=False)
         memoryRequest = f'{round(float(response.json()["data"]["result"][0]["value"][1]) / 1000000)} M'
 
         params_memory_limit = {
-            "query": f"max_over_time(container_memory_working_set_bytes{{pod=~'{k8s_object[2]}.*',namespace='{k8s_object[0]}',container='{k8s_object[3]}'}}[{self.time_range}])"
+            "query": f"max_over_time(container_memory_working_set_bytes{{pod=~'{k8s_object[2]}.*',namespace='{k8s_object[0]}',container=''}}[{self.time_range}])"
         }
 
         response = requests.get(f"{self.prometheus_host}/api/v1/query", headers=headers, params=params_memory_limit,