Update infra_as_service_monitor.py

infra_as_service_monitor.py

@@ -205,27 +205,34 @@ def docker_container():
                         calculated_time = 0.25
                     if calculated_time == 0.25:
                         timing = " "
+                    elif calculated_time >= 3600*24:
+                        calculated_time = calculated_time / (3600*24)
+                        if round(calculated_time) > 1:
+                            timing = str(round(calculated_time)) + " days ago"
+                        else:
+                            timing = str(round(calculated_time)) + " day ago"
+                    
 
-                    elif calculated_time > 3600:
-                        calculated_time = calculated_time / calculated_time
+                    elif calculated_time >= 3600:
+                        calculated_time = calculated_time / 3600
                         if round(calculated_time) > 1:
-                            timing = str(round(calculated_time)) + " Hours"
+                            timing = str(round(calculated_time)) + " Hours ago"
                         else:
-                            timing = str(round(calculated_time)) + " Hour"
+                            timing = str(round(calculated_time)) + " Hour ago"
 
                     elif round(calculated_time) < 60:
                         if round(calculated_time) > 1:
-                            timing = str(round(calculated_time)) + " Seconds"
+                            timing = str(round(calculated_time)) + " Seconds ago"
                         else:
-                            timing = str(round(calculated_time)) + " Second"
+                            timing = str(round(calculated_time)) + " Second ago"
 
-                    elif calculated_time > 60:
+                    elif calculated_time >= 60:
 
                         calculated_time = calculated_time / 60
                         if round(calculated_time) > 1:
-                            timing = str(round(calculated_time)) + " Minutes"
+                            timing = str(round(calculated_time)) + " Minutes ago"
                         else:
-                            timing = str(round(calculated_time)) + " Minutes"
+                            timing = str(round(calculated_time)) + " Minutes ago"
                     data.append([container.name, container.id, container.attrs["State"]["Status"], timing])
 
 
@@ -249,26 +256,32 @@ def docker_container():
                     calculated_time = 0.25
                 if calculated_time == 0.25:
                     timing = ""
+                elif calculated_time > 3600*24:
+                        calculated_time = calculated_time / (3600*24)
+                        if round(calculated_time) > 1:
+                            timing = str(round(calculated_time)) + " days ago"
+                        else:
+                            timing = str(round(calculated_time)) + " day ago"
                 elif calculated_time > 3600:
                     calculated_time = calculated_time / 3600
                     if round(calculated_time) > 1:
-                        timing = str(round(calculated_time)) + " Hours"
+                        timing = str(round(calculated_time)) + " Hours ago"
                     else:
-                        timing = str(round(calculated_time)) + " Hour"
+                        timing = str(round(calculated_time)) + " Hour ago"
 
                 elif round(calculated_time) < 60:
                     if round(calculated_time) > 1:
-                        timing = str(round(calculated_time)) + " Seconds"
+                        timing = str(round(calculated_time)) + " Seconds ago"
                     else:
-                        timing = str(round(calculated_time)) + " Second"
+                        timing = str(round(calculated_time)) + " Second ago"
 
                 elif calculated_time > 60:
 
                     calculated_time = calculated_time / 60
                     if round(calculated_time) > 1:
-                        timing = str(round(calculated_time)) + " Minutes"
+                        timing = str(round(calculated_time)) + " Minutes ago"
                     else:
-                        timing = str(round(calculated_time)) + " Minutes"
+                        timing = str(round(calculated_time)) + " Minutes ago"
                 data.append([each.name, each.id, each.attrs["State"]["Status"], timing])
     except Exception as e:
         logger.info(e)