Merge branch 'master' of http://gitlab.ctune.cn/weijunh/DMapManager

2022.01.12

@@ -127,14 +127,16 @@ class Api(ApiTemplate):
         size = len(orginal)
         orginal_stamp = {'head': 1, 'tail': size}
         if size > 1:
-            stamp = {'P0': 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}
         elif size == 1:
-            stamp = {'P0': 1,
+            stamp = {
+                    #  'P0': 1,
                      'P50': size,
                      'P90': size,
                      'P95': size,

@@ -10,12 +10,12 @@ class Api(ApiTemplate):
     def para_check(self):
         if not self.para.get("host"):
             raise Exception("缺乏host参数")
-        if not self.para.get("user"):
-            raise Exception("缺乏user参数")
-        if not self.para.get("type"):
-            raise Exception("缺乏type参数")
-        if not self.para.get("passwd"):
-            raise Exception("缺乏passwd参数")
+        # if not self.para.get("user"):
+        #     raise Exception("缺乏user参数")
+        # if not self.para.get("type"):
+        #     raise Exception("缺乏type参数")
+        # if not self.para.get("passwd"):
+        #     raise Exception("缺乏passwd参数")
 
     def process(self):
 
@@ -24,9 +24,9 @@ class Api(ApiTemplate):
         res["data"] = {}
         try:
             host = self.para.get("host")  # server
-            user = self.para.get("user")
-            password = self.para.get("passwd")
-            type = self.para.get("type")
+            # user = self.para.get("user")
+            # password = self.para.get("passwd")
+            # type = self.para.get("type")
             host_name = self.para.get("host_name")
             srcid = uuid.uuid1().__str__()
 
@@ -35,7 +35,7 @@ class Api(ApiTemplate):
                 res["result"] = False
             else:
                 monitorHost = MonitorHost(
-                    srcid=srcid, host=host, user=user, password=password, type=type, host_name=host_name)
+                    srcid=srcid, host=host, host_name=host_name)
                 db.session.add(monitorHost)
                 db.session.commit()
                 res['data'] = {'host': host, 'srcid': srcid}
@@ -53,21 +53,21 @@ class Api(ApiTemplate):
              "type": "string",
              "description": "主机地址",
              "required": "true"},
-            {"name": "user",
-             "in": "formData",
-             "type": "string",
-             "description": "用户",
-             "required": "true"},
-            {"name": "passwd",
-             "in": "formData",
-             "type": "string",
-             "description": "密码",
-             "required": "true"},
-            {"name": "type",
-             "in": "formData",
-             "type": "string",
-             "description": "服务器类型",
-             "required": "true"},
+            # {"name": "user",
+            #  "in": "formData",
+            #  "type": "string",
+            #  "description": "用户",
+            #  "required": "true"},
+            # {"name": "passwd",
+            #  "in": "formData",
+            #  "type": "string",
+            #  "description": "密码",
+            #  "required": "true"},
+            # {"name": "type",
+            #  "in": "formData",
+            #  "type": "string",
+            #  "description": "服务器类型",
+            #  "required": "true"},
             {"name": "host_name",
              "in": "formData",
              "type": "string",

@@ -18,14 +18,14 @@ class Api(ApiTemplate):
         res["data"] = {}
         try:
             srcid = self.para.get("srcid")  # server
-            passwd = self.para.get("passwd")
+            passwd = None
             host_name = self.para.get("host_name")
             # Catalog.query.filter_by(guid=self.para.get("guid")).update({"name":self.para.get("name")})
 
             if passwd or host_name:
                 monitor_host = MonitorHost.query.filter_by(srcid=srcid)
-                if passwd:
-                    monitor_host.update({"password": passwd})
+                # if passwd:
+                #     monitor_host.update({"password": passwd})
                 if host_name:
                     monitor_host.update({"host_name": host_name})
                 db.session.commit()
@@ -50,10 +50,10 @@ class Api(ApiTemplate):
              "in": "formData",
              "type": "string",
              "description": "主机名"},
-            {"name": "passwd",
-             "in": "formData",
-             "type": "string",
-             "description": "密码"}
+            # {"name": "passwd",
+            #  "in": "formData",
+            #  "type": "string",
+            #  "description": "密码"}
         ],
         "responses": {
             200: {

@@ -48,8 +48,8 @@ def pull_metric():
                         continue
 
                     type_list = ["cpu_per", "memory_per", "disk_per",
-                                 "disk_read", "disk_write","disk_read_count",
-                                 "disk_write_count","network_sent","network_recv"]
+                                 "disk_read", "disk_write", "disk_read_count",
+                                 "disk_write_count", "network_send", "network_recv"]
                     for type in type_list:
                         sample_data = get_sample_data(
                             metric_data, type, host_name)
@@ -88,28 +88,30 @@ def start_schedule():
 def get_sample_data(orginal, name, host):
     res = []
     size = len(orginal)
-    orginal_stamp = {'head': 1, 'tail': size}
+    # orginal_stamp = {'head': 1, 'tail': size}
     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:
-        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:
         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])
     for key in dict.keys(stamp):