补充提交

@@ -48,8 +48,8 @@ def pull_metric():
                         continue
                         continue
 
 
                     type_list = ["cpu_per", "memory_per", "disk_per",
                     type_list = ["cpu_per", "memory_per", "disk_per",
-                                 "disk_read", "disk_write","disk_read_count",
-                                 "disk_write_count","network_send","network_recv"]
+                                 "disk_read", "disk_write", "disk_read_count",
+                                 "disk_write_count", "network_send", "network_recv"]
                     for type in type_list:
                     for type in type_list:
                         sample_data = get_sample_data(
                         sample_data = get_sample_data(
                             metric_data, type, host_name)
                             metric_data, type, host_name)
@@ -88,28 +88,30 @@ def start_schedule():
 def get_sample_data(orginal, name, host):
 def get_sample_data(orginal, name, host):
     res = []
     res = []
     size = len(orginal)
     size = len(orginal)
-    orginal_stamp = {'head': 1, 'tail': size}
+    # orginal_stamp = {'head': 1, 'tail': size}
     if size > 1:
     if size > 1:
-        stamp = {'P0': 1,
-                 'P50': math.floor(0.5*size),
-                  'P90': math.floor(0.9*size),
-                  'P95': math.floor(0.95*size),
-                 #  'P99': math.floor(0.99*size),
-                 'P100': size}
+        stamp = {
+            # 'P0': 1,
+            'P50': math.floor(0.5*size),
+            # 'P90': math.floor(0.9*size),
+            'P95': math.floor(0.95*size),
+            #  'P99': math.floor(0.99*size),
+            'P100': size}
     elif size == 1:
     elif size == 1:
-        stamp = {'P0': 1,
-                 'P50': size,
-                  'P90': size,
-                  'P95': size,
-                 #  'P99': size,
-                 'P100': size}
+        stamp = {
+            # 'P0': 1,
+            'P50': size,
+            # 'P90': size,
+            'P95': size,
+            #  'P99': size,
+            'P100': size}
     else:
     else:
         return res
         return res
 
 
-    for key in dict.keys(orginal_stamp):
-        cur_data = orginal[orginal_stamp[key]-1]
-        info = get_data(key, host, name, cur_data)
-        res.append(info)
+    # for key in dict.keys(orginal_stamp):
+    #     cur_data = orginal[orginal_stamp[key]-1]
+    #     info = get_data(key, host, name, cur_data)
+    #     res.append(info)
 
 
     data = sorted(orginal, key=lambda x: x[name])
     data = sorted(orginal, key=lambda x: x[name])
     for key in dict.keys(stamp):
     for key in dict.keys(stamp):