底层接口封装补充

.idea/dictionaries/Administrator.xml

@@ -63,6 +63,7 @@
       <w>proxyids</w>
       <w>publickey</w>
       <w>pytest</w>
+      <w>reslove</w>
       <w>rmcp</w>
       <w>ruleid</w>
       <w>ruleids</w>

WorkApi/API/Host/host_delete.py

+# -*- coding: utf-8 -*-
+# 删除主机
+# 作者: 陈磊
+# 时间: 2019-12-02
+from WorkUtils.UtilsRequest import UtilsRequest
+from WorkUtils.UtilsLog import UtilsLog
+from WorkApi.ApiBase import ApiBase, GetBase
+
+
+class HostDelete(object):
+    def __init__(self, _host):
+        """
+        :param _host: 域名
+        :return:
+        """
+        self.log = UtilsLog()
+        self.log.info("调用删除主机")
+        self.log.info(self.__class__)
+
+        self._host = _host
+        self._headers = {}
+        self._path = "/host/delete"
+        self._url = self._host + self._path
+        self._params = {}
+        self._json = {}
+        self._data = {}
+        self.response = ""
+
+        self.local_json = {}
+
+        self.hostids = None
+
+        self.api = UtilsRequest()
+
+    def get_response(self):
+        base = ApiBase()
+        base.dict_add_key(_key="hostids", value=self.hostids)
+        self._json = base._json
+        self.response = self.api.post(url=self._url, json=self._json)

WorkApi/API/Event/event_acknowledge.py → WorkApi/API/Problem/problem_acknowledge.py

@@ -6,7 +6,7 @@ from WorkUtils.UtilsRequest import UtilsRequest
 from WorkUtils.UtilsLog import UtilsLog
 
 
-class EventAcknowledge(object):
+class ProblemAcknowledge(object):
     def __init__(self, _host, eventids=None, action=None, message=None, severity=None):
         """
         :param _host: 域名
@@ -22,7 +22,7 @@ class EventAcknowledge(object):
 
         self._host = _host
         self._headers = {}
-        self._path = "/event/acknowledge"
+        self._path = "/problem/acknowledge"
         self._url = self._host + self._path
         self._params = {}
         self._json = {}

WorkApi/APP/Analyze/analyze_effectiveness.py

+# -*- coding: utf-8 -*-
+# 查询有效性分析
+# 作者: 陈磊
+# 时间: 2019-12-02
+from WorkUtils.UtilsRequest import UtilsRequest
+from WorkUtils.UtilsLog import UtilsLog
+from WorkApi.ApiBase import ApiBase, GetBase
+
+
+class AnalyzeEffectiveness(object):
+    def __init__(self, _host):
+        """
+        :param _host: 域名
+        :return:
+        """
+        self.log = UtilsLog()
+        self.log.info("调用查询有效性分析")
+        self.log.info(self.__class__)
+
+        self._host = _host
+        self._headers = {}
+        self._path = "/analyze/effectiveness"
+        self._url = self._host + self._path
+        self._params = {}
+        self._json = {}
+        self._data = {}
+        self.response = ""
+
+        self.token = {}
+        self.startTime = None
+        self.endTime = None
+        self.severity = None
+        self.manageLevel = None
+        self.resloveFlag = None
+        self.businessId = None
+        self.hostType = None
+        self.manageIp = None
+        self.alarmRuleid = None
+        self.ruleDescription = None
+        self.hostid = None
+        self.itemid = None
+
+        self.api = UtilsRequest()
+
+    def get_response(self):
+        base = ApiBase()
+        base.dict_add_key(_key="token", value=self.token)
+        self._headers = base._json
+
+        base = ApiBase()
+        base.dict_add_key(_key="startTime", value=self.startTime)
+        base.dict_add_key(_key="endTime", value=self.endTime)
+        base.dict_add_key(_key="severity", value=self.severity)
+        base.dict_add_key(_key="manageLevel", value=self.manageLevel)
+        base.dict_add_key(_key="resloveFlag", value=self.resloveFlag)
+        base.dict_add_key(_key="businessId", value=self.businessId)
+        base.dict_add_key(_key="hostType", value=self.hostType)
+        base.dict_add_key(_key="manageIp", value=self.manageIp)
+        base.dict_add_key(_key="alarmRuleid", value=self.alarmRuleid)
+        base.dict_add_key(_key="ruleDescription", value=self.ruleDescription)
+        base.dict_add_key(_key="hostid", value=self.hostid)
+        base.dict_add_key(_key="itemid", value=self.itemid)
+        self._params = base._json
+        self.response = self.api.get(url=self._url, headers=self._headers, params=self._params)

WorkApi/APP/Analyze/analyze_efficiency.py

+# -*- coding: utf-8 -*-
+# 查询处理效率分析
+# 作者: 陈磊
+# 时间: 2019-12-02
+from WorkUtils.UtilsRequest import UtilsRequest
+from WorkUtils.UtilsLog import UtilsLog
+from WorkApi.ApiBase import ApiBase, GetBase
+
+
+class AnalyzeEfficiency(object):
+    def __init__(self, _host):
+        """
+        :param _host: 域名
+        :return:
+        """
+        self.log = UtilsLog()
+        self.log.info("调用查询处理效率分析")
+        self.log.info(self.__class__)
+
+        self._host = _host
+        self._headers = {}
+        self._path = "/analyze/efficiency"
+        self._url = self._host + self._path
+        self._params = {}
+        self._json = {}
+        self._data = {}
+        self.response = ""
+
+        self.token = {}
+        self.startTime = None
+        self.endTime = None
+        self.severity = None
+        self.manageLevel = None
+        self.resloveFlag = None
+        self.businessId = None
+        self.hostType = None
+        self.manageIp = None
+        self.alarmRuleid = None
+        self.ruleDescription = None
+        self.hostid = None
+        self.itemid = None
+
+        self.api = UtilsRequest()
+
+    def get_response(self):
+        base = ApiBase()
+        base.dict_add_key(_key="token", value=self.token)
+        self._headers = base._json
+
+        base = ApiBase()
+        base.dict_add_key(_key="startTime", value=self.startTime)
+        base.dict_add_key(_key="endTime", value=self.endTime)
+        base.dict_add_key(_key="severity", value=self.severity)
+        base.dict_add_key(_key="manageLevel", value=self.manageLevel)
+        base.dict_add_key(_key="resloveFlag", value=self.resloveFlag)
+        base.dict_add_key(_key="businessId", value=self.businessId)
+        base.dict_add_key(_key="hostType", value=self.hostType)
+        base.dict_add_key(_key="manageIp", value=self.manageIp)
+        base.dict_add_key(_key="alarmRuleid", value=self.alarmRuleid)
+        base.dict_add_key(_key="ruleDescription", value=self.ruleDescription)
+        base.dict_add_key(_key="hostid", value=self.hostid)
+        base.dict_add_key(_key="itemid", value=self.itemid)
+        self._params = base._json
+        self.response = self.api.get(url=self._url, headers=self._headers, params=self._params)

WorkApi/APP/Analyze/analyze_general.py

+# -*- coding: utf-8 -*-
+# 查询通用告警
+# 作者: 陈磊
+# 时间: 2019-12-02
+from WorkUtils.UtilsRequest import UtilsRequest
+from WorkUtils.UtilsLog import UtilsLog
+from WorkApi.ApiBase import ApiBase, GetBase
+
+
+class AnalyzeGeneral(object):
+    def __init__(self, _host):
+        """
+        :param _host: 域名
+        :return:
+        """
+        self.log = UtilsLog()
+        self.log.info("调用查询通用告警")
+        self.log.info(self.__class__)
+
+        self._host = _host
+        self._headers = {}
+        self._path = "/analyze/general"
+        self._url = self._host + self._path
+        self._params = {}
+        self._json = {}
+        self._data = {}
+        self.response = ""
+
+        self.token = {}
+        self.startTime = None
+        self.endTime = None
+        self.severity = None
+        self.manageLevel = None
+        self.resloveFlag = None
+        self.businessId = None
+        self.hostType = None
+        self.manageIp = None
+        self.alarmRuleid = None
+        self.ruleDescription = None
+        self.hostid = None
+        self.itemid = None
+
+        self.api = UtilsRequest()
+
+    def get_response(self):
+        base = ApiBase()
+        base.dict_add_key(_key="token", value=self.token)
+        self._headers = base._json
+
+        base = ApiBase()
+        base.dict_add_key(_key="startTime", value=self.startTime)
+        base.dict_add_key(_key="endTime", value=self.endTime)
+        base.dict_add_key(_key="severity", value=self.severity)
+        base.dict_add_key(_key="manageLevel", value=self.manageLevel)
+        base.dict_add_key(_key="resloveFlag", value=self.resloveFlag)
+        base.dict_add_key(_key="businessId", value=self.businessId)
+        base.dict_add_key(_key="hostType", value=self.hostType)
+        base.dict_add_key(_key="manageIp", value=self.manageIp)
+        base.dict_add_key(_key="alarmRuleid", value=self.alarmRuleid)
+        base.dict_add_key(_key="ruleDescription", value=self.ruleDescription)
+        base.dict_add_key(_key="hostid", value=self.hostid)
+        base.dict_add_key(_key="itemid", value=self.itemid)
+        self._params = base._json
+        self.response = self.api.get(url=self._url, headers=self._headers, params=self._params)

WorkApi/APP/Analyze/analyze_resolve.py

+# -*- coding: utf-8 -*-
+# 查询自愈分析
+# 作者: 陈磊
+# 时间: 2019-12-02
+from WorkUtils.UtilsRequest import UtilsRequest
+from WorkUtils.UtilsLog import UtilsLog
+from WorkApi.ApiBase import ApiBase, GetBase
+
+
+class AnalyzeResolve(object):
+    def __init__(self, _host):
+        """
+        :param _host: 域名
+        :return:
+        """
+        self.log = UtilsLog()
+        self.log.info("调用查询自愈分析")
+        self.log.info(self.__class__)
+
+        self._host = _host
+        self._headers = {}
+        self._path = "/analyze/resolve"
+        self._url = self._host + self._path
+        self._params = {}
+        self._json = {}
+        self._data = {}
+        self.response = ""
+
+        self.token = {}
+        self.startTime = None
+        self.endTime = None
+        self.severity = None
+        self.manageLevel = None
+        self.resloveFlag = None
+        self.businessId = None
+        self.hostType = None
+        self.manageIp = None
+        self.alarmRuleid = None
+        self.ruleDescription = None
+        self.hostid = None
+        self.itemid = None
+
+        self.api = UtilsRequest()
+
+    def get_response(self):
+        base = ApiBase()
+        base.dict_add_key(_key="token", value=self.token)
+        self._headers = base._json
+
+        base = ApiBase()
+        base.dict_add_key(_key="startTime", value=self.startTime)
+        base.dict_add_key(_key="endTime", value=self.endTime)
+        base.dict_add_key(_key="severity", value=self.severity)
+        base.dict_add_key(_key="manageLevel", value=self.manageLevel)
+        base.dict_add_key(_key="resloveFlag", value=self.resloveFlag)
+        base.dict_add_key(_key="businessId", value=self.businessId)
+        base.dict_add_key(_key="hostType", value=self.hostType)
+        base.dict_add_key(_key="manageIp", value=self.manageIp)
+        base.dict_add_key(_key="alarmRuleid", value=self.alarmRuleid)
+        base.dict_add_key(_key="ruleDescription", value=self.ruleDescription)
+        base.dict_add_key(_key="hostid", value=self.hostid)
+        base.dict_add_key(_key="itemid", value=self.itemid)
+        self._params = base._json
+        self.response = self.api.get(url=self._url, headers=self._headers, params=self._params)

WorkData/Zabbix/events.py

+# -*- coding: utf_8 -*-
+# 表名: events
+# 作者: 陈磊
+# 时间: 2019-12-02
+
+
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import Column, Integer, VARCHAR, BIGINT, 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 Events(Base):
+    """
+    事件告警列表
+    """
+    __tablename__ = "events"
+
+    eventid = Column(BigInteger, primary_key=True)
+    source = Column(Integer)
+    object = Column(Integer)
+    objectid = Column(BigInteger)
+    clock = Column(Integer)
+    value = Column(Integer)
+    acknowledged = Column(Integer)
+    ns = Column(Integer)
+    name = Column(VARCHAR(2048))
+    severity = Column(Integer)
+
+
+class DataEvents(object):
+    def __init__(self):
+        self.log = UtilsLog()
+        self.log.info(self.__class__)
+
+        self.table = Events
+
+    def select_all_from_allKeys(self, session, eventid=None, objectid=None):
+        """
+        :param session: 指针
+        :param eventid:
+        :param objectid:
+        :return: 查询结果
+        """
+        self.log.debug("查询数据库:")
+        self.log.debug("eventid: %s" % eventid)
+        self.log.debug("objectid: %s" % objectid)
+        try:
+            base = UtilsDataBase()
+            base.add_param(_key="eventid", value=eventid)
+            base.add_param(_key="objectid", value=objectid)
+            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 insert_one(self, session, eventid=None, source=None, _object=None, objectid=None, clock=None,
+                   value=None, acknowledged=None, ns=None, name=None, severity=None):
+        """
+        :param session: 指针
+        :param eventid:
+        :param source:
+        :param _object:
+        :param objectid:
+        :param clock:
+        :param value:
+        :param acknowledged:
+        :param ns:
+        :param name:
+        :param severity:
+        :return:
+        """
+        self.log.debug("新增表数据:")
+        try:
+            base = UtilsDataBase()
+            base.add_param(_key="eventid", value=eventid)
+            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="value", value=value)
+            base.add_param(_key="acknowledged", value=acknowledged)
+            base.add_param(_key="ns", value=ns)
+            base.add_param(_key="name", value=name)
+            base.add_param(_key="severity", value=severity)
+            sql_rep = self.table(**base.param)
+
+            session.add(sql_rep)
+            session.commit()
+            eventid = sql_rep.eventid
+            self.log.debug("新增的eventid:%s" % eventid)
+            session.close()
+            return eventid
+        except UtilsDataBase().errors as error:
+            self.log.error("异常:")
+            self.log.error(error)
+            session.close()
+            return error
+
+    def delete_name(self, session, name):
+        """
+        :param session: 指针
+        :param name:
+        :return:
+        """
+        self.log.debug("查询数据库:")
+        try:
+            self.log.debug("删除相关测试数据")
+            session.query(self.table).filter_by(name=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
\ No newline at end of file