Merge pull request #1611 from Andrei-Predoiu/apu/latest-snapshot-diag

Apu/latest snapshot diag
emissary-ingress · Jun 11, 2019 · 030d897 · 030d897
2 parents b530231 + 7f6bcdc
commit 030d897
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ambassador/ambassador_diag/diagd.py b/ambassador/ambassador_diag/diagd.py
@@ -107,6 +107,7 @@ class DiagApp (Flask):
     scout_checker: Optional[PeriodicTrigger]
     last_request_info: Dict[str, int]
     last_request_time: Optional[datetime.datetime]
+    latest_snapshot: str
 
     def setup(self, snapshot_path: str, bootstrap_path: str, ads_path: str,
               config_path: Optional[str], ambex_pid: int, kick: Optional[str],
@@ -260,7 +261,7 @@ def td_format(td_object):
         if seconds > period_seconds:
             period_value, seconds = divmod(seconds, period_seconds)
 
-            strings.append("%d %s%s" % 
+            strings.append("%d %s%s" %
                            (period_value, period_name, "" if (period_value == 1) else "s"))
 
     formatted = ", ".join(strings)
@@ -285,7 +286,8 @@ def system_info():
         "cluster_id": os.environ.get('AMBASSADOR_CLUSTER_ID',
                                      os.environ.get('AMBASSADOR_SCOUT_ID', "00000000-0000-0000-0000-000000000000")),
         "boot_time": boot_time,
-        "hr_uptime": td_format(datetime.datetime.now() - boot_time)
+        "hr_uptime": td_format(datetime.datetime.now() - boot_time),
+        "latest_snapshot": app.latest_snapshot
     }
 
 
@@ -408,7 +410,7 @@ def show_overview(reqid=None):
     ddict = collect_errors_and_notices(request, reqid, "overview", diag)
 
     tvars = dict(system=system_info(),
-                 envoy_status=envoy_status(app.estats), 
+                 envoy_status=envoy_status(app.estats),
                  loginfo=app.estats.loginfo,
                  notices=app.notices.notices,
                  **ov, **ddict)
@@ -772,6 +774,7 @@ def _load_ir(self, rqueue: queue.Queue, aconf: Config, fetcher: ResourceFetcher,
                 except Exception as e:
                     self.logger.debug("could not rename %s -> %s: %s" % (from_path, to_path, e))
 
+        app.latest_snapshot = snapshot
         self.logger.info("saving Envoy configuration for snapshot %s" % snapshot)
 
         with open(app.bootstrap_path, "w") as output: