经验手册

.idea/dictionaries/Administrator.xml

@@ -83,6 +83,7 @@
       <w>sortorder</w>
       <w>tablename</w>
       <w>tagid</w>
+      <w>tagids</w>
       <w>templated</w>
       <w>templateid</w>
       <w>templateids</w>

WorkData/Argus/hosts_items.py

@@ -105,7 +105,7 @@ class DataHostsItems(object):
             session.add(sql_rep)
             session.commit()
             _id = sql_rep.id
-            self.log.debug("新增的hostid:%s" % _id)
+            self.log.debug("新增的itemid:%s" % _id)
             session.close()
             return _id
         except UtilsDataBase().errors as error:

WorkData/Argus/problem.py

@@ -77,16 +77,16 @@ class DataProblem(object):
             session.close()
             return error
 
-    def delete_like_host_name(self, session, host_name):
+    def delete_hostid(self, session, hostid):
         """
         :param session: 指针
-        :param host_name:
+        :param hostid:
         :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.query(self.table).filter_by(hostid=hostid).delete(synchronize_session=False)
             # session.delete(sql)
             session.commit()
             session.close()
@@ -98,48 +98,52 @@ class DataProblem(object):
             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):
+    def insert_one(self, session, eventid=None, source=None, _object=None, objectid=None, clock=None, ns=None,
+                   r_clock=None, r_ns=None, hostid=None, name=None, acknowledged=None, acknowledged_time=None,
+                   severity=None, status=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:
+        :param eventid:
+        :param source:
+        :param _object:
+        :param objectid:
+        :param clock:
+        :param ns:
+        :param r_clock:
+        :param r_ns:
+        :param hostid:
+        :param name:
+        :param acknowledged:
+        :param acknowledged_time:
+        :param severity:
+        :param status:
         :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)
+            base.add_param(_key="eventid", value=eventid)
+            base.add_param(_key="hostid", value=hostid)
+            base.add_param(_key="name", value=name)
+            base.add_param(_key="source", value=source)
+            base.add_param(_key="object", value=_object)
+            base.add_param(_key="objectid", value=objectid)
+            base.add_param(_key="clock", value=clock)
+            base.add_param(_key="ns", value=ns)
+            base.add_param(_key="r_clock", value=r_clock)
+            base.add_param(_key="r_ns", value=r_ns)
+            base.add_param(_key="acknowledged", value=acknowledged)
+            base.add_param(_key="acknowledged_time", value=acknowledged_time)
+            base.add_param(_key="severity", value=severity)
+            base.add_param(_key="status", value=status)
             sql_rep = self.table(**base.param)
 
             session.add(sql_rep)
             session.commit()
-            hostid = sql_rep.hostid
-            self.log.debug("新增的hostid:%s" % hostid)
+            eventid = sql_rep.eventid
+            self.log.debug("新增的eventid:%s" % eventid)
             session.close()
-            return hostid
+            return eventid
         except UtilsDataBase().errors as error:
             self.log.error("异常:")
             self.log.error(error)

WorkData/Argus/tag.py

+# -*- coding: utf_8 -*-
+# 表名: tag
+# 作者: 陈磊
+# 时间: 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 Tag(Base):
+    """
+    标签表
+    """
+    __tablename__ = "tag"
+
+    tagid = Column(BigInteger, primary_key=True)
+    tag = Column(VARCHAR(255), comment="标签值")
+
+
+class DataTag(object):
+    def __init__(self):
+        self.log = UtilsLog()
+        self.log.info(self.__class__)
+
+        self.table = Tag
+
+    def select_all_from_allKeys(self, session, tagid=None, tag=None):
+        """
+        :param session: 指针
+        :param tagid:
+        :param tag:
+        :return: 查询结果
+        """
+        self.log.debug("查询数据库:")
+        try:
+            base = UtilsDataBase()
+            base.add_param(_key="tagid", value=tagid)
+            base.add_param(_key="tag", value=tag)
+            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_tag(self, session, tag):
+        """
+        :param session: 指针
+        :param tag:
+        :return:
+        """
+        self.log.debug("查询数据库:")
+        try:
+            self.log.debug("删除相关测试数据")
+            session.query(self.table).filter(self.table.tag.like(str(tag) + "%")).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