资产ips下拉框

.idea/dictionaries/Administrator.xml

@@ -9,6 +9,7 @@
       <w>businessid</w>
       <w>businessids</w>
       <w>contextname</w>
+      <w>correlationid</w>
       <w>departmentid</w>
       <w>dingding</w>
       <w>discoveryids</w>
@@ -89,6 +90,7 @@
       <w>triggerids</w>
       <w>triggerprototype</w>
       <w>useip</w>
+      <w>userid</w>
       <w>valuemapid</w>
       <w>wechat</w>
       <w>zabbix</w>

WorkApi/APP/Device/device_create.py

@@ -42,7 +42,7 @@ class DeviceCreate(object):
         self.ipmiPrivilege = None
         self.ipmiUsername = None
         self.ipmiPassword = None
-        self.factory = None
+        self.factory_id = None
         self.model = None
         self.version = None
         self.serialnumber = None
@@ -72,7 +72,7 @@ class DeviceCreate(object):
         base.dict_add_key(_key="ipmiPrivilege", value=self.ipmiPrivilege)
         base.dict_add_key(_key="ipmiUsername", value=self.ipmiUsername)
         base.dict_add_key(_key="ipmiPassword", value=self.ipmiPassword)
-        base.dict_add_key(_key="factory", value=self.factory)
+        base.dict_add_key(_key="factory_id", value=self.factory_id)
         base.dict_add_key(_key="model", value=self.model)
         base.dict_add_key(_key="version", value=self.version)
         base.dict_add_key(_key="serialnumber", value=self.serialnumber)

WorkCase/API/Host/test_host_create.py

@@ -80,8 +80,8 @@ class TestHostCreate(object):
         api.inventory_mode = inventory_mode
         api.tls_connect = 1
         api.tls_accept = 1
-        api.tls_psk_identity = "Test"
-        api.tls_psk = "Test"
+        api.tls_psk_identity = ""
+        api.tls_psk = ""
         api.get_response()
         return api.response
 

WorkCase/API/Host/test_host_delete.py

@@ -75,8 +75,8 @@ class TestHostDelete(object):
         api.inventory_mode = inventory_mode
         api.tls_connect = 1
         api.tls_accept = 1
-        api.tls_psk_identity = "Test"
-        api.tls_psk = "Test"
+        api.tls_psk_identity = ""
+        api.tls_psk = ""
         api.get_response()
         return api.response
 

WorkCase/API/Host/test_host_get.py

@@ -77,8 +77,8 @@ class TestHostGet(object):
         api.inventory_mode = inventory_mode
         api.tls_connect = 1
         api.tls_accept = 1
-        api.tls_psk_identity = "Test"
-        api.tls_psk = "Test"
+        api.tls_psk_identity = ""
+        api.tls_psk = ""
         api.get_response()
         return api.response
 

WorkCase/API/HostInterface/test_hostinterface_create.py

@@ -145,8 +145,8 @@ class TestHostInterfaceCreate(object):
         api.inventory_mode = inventory_mode
         api.tls_connect = 1
         api.tls_accept = 1
-        api.tls_psk_identity = "Test"
-        api.tls_psk = "Test"
+        api.tls_psk_identity = ""
+        api.tls_psk = ""
         api.get_response()
         return api.response
 

WorkCase/API/HostInterface/test_hostinterface_delete.py

@@ -155,8 +155,8 @@ class TestHostInterfaceDelete(object):
         api.inventory_mode = inventory_mode
         api.tls_connect = 1
         api.tls_accept = 1
-        api.tls_psk_identity = "Test"
-        api.tls_psk = "Test"
+        api.tls_psk_identity = ""
+        api.tls_psk = ""
         api.get_response()
         return api.response
 

WorkCase/API/HostInterface/test_hostinterface_get.py

@@ -179,8 +179,8 @@ class TestHostInterfaceGet(object):
         api.inventory_mode = inventory_mode
         api.tls_connect = 1
         api.tls_accept = 1
-        api.tls_psk_identity = "Test"
-        api.tls_psk = "Test"
+        api.tls_psk_identity = ""
+        api.tls_psk = ""
         api.get_response()
         return api.response
 

WorkCase/API/HostInterface/test_hostinterface_update.py

@@ -171,8 +171,8 @@ class TestHostInterfaceUpdate(object):
         api.inventory_mode = inventory_mode
         api.tls_connect = 1
         api.tls_accept = 1
-        api.tls_psk_identity = "Test"
-        api.tls_psk = "Test"
+        api.tls_psk_identity = ""
+        api.tls_psk = ""
         api.get_response()
         return api.response
 

WorkCase/API/Items/test_items_get.py

@@ -78,8 +78,8 @@ class TestItemsGet(object):
         api.inventory_mode = inventory_mode
         api.tls_connect = 1
         api.tls_accept = 1
-        api.tls_psk_identity = "Test"
-        api.tls_psk = "Test"
+        api.tls_psk_identity = ""
+        api.tls_psk = ""
         api.get_response()
         return api.response
 

WorkData/Argus/hosts_items.py

@@ -83,3 +83,33 @@ class DataHostsItems(object):
             self.log.error(error)
             session.close()
             return error
+
+    def insert_one(self, session, _id=None, host_id=None, name=None, key_=None):
+        """
+        :param session: 指针
+        :param _id:
+        :param host_id:
+        :param name:
+        :param key_:
+        :return:
+        """
+        self.log.debug("新增表数据:")
+        try:
+            base = UtilsDataBase()
+            base.add_param(_key="id", value=_id)
+            base.add_param(_key="host_id", value=host_id)
+            base.add_param(_key="name", value=name)
+            base.add_param(_key="key_", value=key_)
+            sql_rep = self.table(**base.param)
+
+            session.add(sql_rep)
+            session.commit()
+            _id = sql_rep.id
+            self.log.debug("新增的hostid:%s" % _id)
+            session.close()
+            return _id
+        except UtilsDataBase().errors as error:
+            self.log.error("异常:")
+            self.log.error(error)
+            session.close()
+            return error

WorkData/Argus/problem.py

+# -*- coding: utf_8 -*-
+# 表名: problem
+# 作者: 陈磊
+# 时间: 2019-12-04
+
+
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import Column, Integer, VARCHAR, SMALLINT, DATETIME, DECIMAL, BigInteger, FLOAT, NUMERIC, TEXT
+from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
+from sqlalchemy import or_
+
+from WorkUtils.UtilsLog import UtilsLog
+from WorkUtils.UtilsDataBase import UtilsDataBase
+
+import time
+
+Base = declarative_base()
+
+
+class Problem(Base):
+    """
+    问题表
+    """
+    __tablename__ = "problem"
+
+    eventid = Column(Integer, primary_key=True)
+    source = Column(Integer, comment="问题事件的类型。0：由触发器创建的事件，3：内部事件")
+    object = Column(Integer, comment="与问题事件相关的对象类型。详细见附录页【事件相关的对象类型】中的触发器和内部事件")
+    objectid = Column(BigInteger, comment="相关对象的id")
+    clock = Column(Integer, comment="问题事件创建的时间")
+    ns = Column(Integer, comment="问题事件创建时的纳秒")
+    r_eventid = Column(Integer, comment="恢复的事件id")
+    r_clock = Column(VARCHAR(128), comment="创建恢复事件的时间")
+    r_ns = Column(Integer, comment="创建恢复事件的纳秒")
+    correlationid = Column(Integer, comment="相关规则的id。如果事件被全局相关规则恢复")
+    userid = Column(VARCHAR(255), comment="问题事件被手动关闭的用户id")
+    name = Column(VARCHAR(255), comment="域名")
+    acknowledged = Column(VARCHAR(255), comment="0：不确定；1：确定")
+    acknowledged_time = Column(VARCHAR(255), comment="确认时间")
+    severity = Column(Integer, comment="未分离：0；信息：1；警告：2；一般严重：3；严重：4;灾难：5")
+    hostid = Column(Integer, comment="资产编号")
+    status = Column(Integer, comment="0:不忽略，1：忽略")
+    ignore_time = Column(BigInteger, comment="忽略时间")
+    type = Column(VARCHAR(255), comment="告警类型 cpu 温度..")
+
+
+class DataProblem(object):
+    def __init__(self):
+        self.log = UtilsLog()
+        self.log.info(self.__class__)
+
+        self.table = Problem
+
+    def select_all_from_allKeys(self, session, hostid=None, host_name=None, available=None, monitor_status=None):
+        """
+        :param session: 指针
+        :param hostid:
+        :param host_name:
+        :param available:
+        :param monitor_status:
+        :return: 查询结果
+        """
+        self.log.debug("查询数据库:")
+        try:
+            base = UtilsDataBase()
+            base.add_param(_key="hostid", value=hostid)
+            base.add_param(_key="host_name", value=host_name)
+            base.add_param(_key="available", value=available)
+            base.add_param(_key="monitor_status", value=monitor_status)
+            sql_rep = session.query(self.table).filter_by(**base.param).all()
+            self.log.debug(sql_rep)
+            session.close()
+            return sql_rep
+        except UtilsDataBase().errors as error:
+            self.log.error("异常:")
+            self.log.error(error)
+            session.close()
+            return error
+
+    def delete_like_host_name(self, session, host_name):
+        """
+        :param session: 指针
+        :param host_name:
+        :return:
+        """
+        self.log.debug("查询数据库:")
+        try:
+            self.log.debug("删除相关测试数据")
+            session.query(self.table).filter(self.table.host_name.like(str(host_name) + "%")).delete(synchronize_session=False)
+            # session.delete(sql)
+            session.commit()
+            session.close()
+            self.log.debug("删除成功")
+            return True
+        except UtilsDataBase().errors as error:
+            self.log.error("异常:")
+            self.log.error(error)
+            session.close()
+            return error
+
+    def insert_one(self, session, host_name=None, asset_code=None, manage_ip=None, departmentid=None, manage_level=None,
+                   host_type=None, parent_host=None, available=None, monitor_status=None, iplist=None, monitor_interface=None,
+                   del_flag=None):
+        """
+        :param session: 指针
+        :param host_name:
+        :param asset_code:
+        :param manage_ip:
+        :param departmentid:
+        :param manage_level:
+        :param host_type:
+        :param parent_host:
+        :param available:
+        :param monitor_status:
+        :param iplist:
+        :param monitor_interface:
+        :param del_flag:
+        :return:
+        """
+        self.log.debug("新增表数据:")
+        try:
+            base = UtilsDataBase()
+            base.add_param(_key="host_name", value=host_name)
+            base.add_param(_key="asset_code", value=asset_code)
+            base.add_param(_key="manage_ip", value=manage_ip)
+            base.add_param(_key="departmentid", value=departmentid)
+            base.add_param(_key="manage_level", value=manage_level)
+            base.add_param(_key="host_type", value=host_type)
+            base.add_param(_key="parent_host", value=parent_host)
+            base.add_param(_key="available", value=available)
+            base.add_param(_key="monitor_status", value=monitor_status)
+            base.add_param(_key="iplist", value=iplist)
+            base.add_param(_key="monitor_interface", value=monitor_interface)
+            base.add_param(_key="del_flag", value=del_flag)
+            sql_rep = self.table(**base.param)
+
+            session.add(sql_rep)
+            session.commit()
+            hostid = sql_rep.hostid
+            self.log.debug("新增的hostid:%s" % hostid)
+            session.close()
+            return hostid
+        except UtilsDataBase().errors as error:
+            self.log.error("异常:")
+            self.log.error(error)
+            session.close()
+            return error