aligned timestamps for ppg data

blueprints/cloud-operations/network-dashboard/cloud-function/metrics/limits.py

@@ -158,7 +158,7 @@ def get_quota_current_limit(config, project_link, metric_name):
 
 def count_effective_limit(config, project_id, network_dict, usage_metric_name,
                           limit_metric_name, utilization_metric_name,
-                          limit_dict):
+                          limit_dict, timestamp=None):
   '''
     Calculates the effective limits (using algorithm in the link below) for peering groups and writes data (usage, limit, utilization) to the custom metrics.
     Source: https://cloud.google.com/vpc/docs/quota#vpc-peering-effective-limit
@@ -171,11 +171,13 @@ def count_effective_limit(config, project_id, network_dict, usage_metric_name,
         limit_metric_name (string): Name of the custom metric to be populated for limit per VPC peering group.
         utilization_metric_name (string): Name of the custom metric to be populated for utilization per VPC peering group.
         limit_dict (dictionary of string:int): Dictionary containing the limit per peering group (either VPC specific or default limit).
+        timestamp (time): timestamp to be recorded for all points
       Returns:
         None
   '''
 
-  timestamp = time.time()
+  if timestamp == None:
+    timestamp = time.time()
 
   if network_dict['peerings'] == []:
     return

blueprints/cloud-operations/network-dashboard/cloud-function/metrics/metrics.py

@@ -186,6 +186,7 @@ def get_pgg_data(config, metric_dict, usage_dict, limit_metric, limit_dict):
 
     current_quota_limit_view = customize_quota_view(current_quota_limit)
 
+    timestamp = time.time()
     # For each network in this GCP project
     for network_dict in network_dict_list:
       if network_dict['network_id'] == 0:
@@ -236,7 +237,7 @@ def get_pgg_data(config, metric_dict, usage_dict, limit_metric, limit_dict):
                                    metric_dict["usage"]["name"],
                                    metric_dict["limit"]["name"],
                                    metric_dict["utilization"]["name"],
-                                   limit_dict)
+                                   limit_dict, timestamp)
       print(
           f"Buffered {metric_dict['usage']['name']} for peering group {network_dict['network_name']} in {project_id}"
       )

blueprints/cloud-operations/network-dashboard/cloud-function/metrics/routes.py

@@ -15,6 +15,7 @@
 #
 
 from ast import AnnAssign
+from os import times
 import re
 from sqlite3 import Timestamp
 import time
@@ -144,6 +145,7 @@ def get_routes_ppg(config, metric_dict, usage_dict, limit_dict):
       Returns:
         None
   '''
+  timestamp = time.time()
   for project_id in config["monitored_projects"]:
     network_dict_list = peerings.gather_peering_data(config, project_id)
 
@@ -177,7 +179,7 @@ def get_routes_ppg(config, metric_dict, usage_dict, limit_dict):
                                    metric_dict["usage"]["name"],
                                    metric_dict["limit"]["name"],
                                    metric_dict["utilization"]["name"],
-                                   limit_dict)
+                                   limit_dict, timestamp)
       print(
           f"Buffered {metric_dict['usage']['name']} for peering group {network_dict['network_name']} in {project_id}"
       )