fix(controller): measure api err

Author: duanhongyi

rootfs/api/management/commands/measure_networks.py

@@ -28,7 +28,7 @@ def _measure_networks(self, app_map, timestamp):
                 "type": "network",
                 "unit": "bytes",
                 "usage": record["rx_bytes"] + record["tx_bytes"],
-                "timestamp": "%d" % start
+                "timestamp": start
             })
         send_measurements.delay(networks)
 

rootfs/api/models/app.py

@@ -1168,15 +1168,15 @@ def to_measurements(self, timestamp: float):
                 "type": "cpu",
                 "unit": "milli",
                 "usage": unit_to_millicpu(config.cpu.get(container_type)) * scale,
-                "timestamp": "%f" % timestamp
+                "timestamp": int(timestamp)
             })
             measurements.append({
-                "app_id": self.app_id,
+                "app_id": self.id,
                 "owner": self.owner_id,
                 "name": container_type,
                 "type": "memory",
                 "unit": "bytes",
                 "usage": unit_to_bytes(config.memory.get(container_type)) * scale,
-                "timestamp": "%f" % timestamp
+                "timestamp": int(timestamp)
             })
         return measurements

rootfs/api/models/resource.py

@@ -230,11 +230,11 @@ def detach_resource(self, *args, **kwargs):
 
     def to_measurements(self, timestamp: float):
         return [{
-            "app_id": str(self.app_id),
-            "owner": str(self.owner_id),
+            "app_id": self.app.id,
+            "owner": self.owner_id,
             "name": self.name,
             "type": self.plan,
             "unit": "number",
             "usage": 1,
-            "timestamp": "%f" % timestamp
+            "timestamp": int(timestamp)
         }]

rootfs/api/models/volume.py

@@ -65,13 +65,13 @@ def log(self, message, level=logging.INFO):
 
     def to_measurements(self, timestamp: float):
         return [{
-            "app_id": str(self.app_id),
-            "owner": str(self.owner_id),
+            "app_id": self.app.id,
+            "owner": self.owner_id,
             "name": self.name,
             "type": "volume",
             "unit": "bytes",
             "usage": unit_to_bytes(self.size),
-            "timestamp": "%f" % timestamp
+            "timestamp": int(timestamp)
         }]
 
     def __str__(self):