pytbox 0.1.8__tar.gz → 0.1.9__tar.gz

{pytbox-0.1.8/src/pytbox.egg-info → pytbox-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytbox
-Version: 0.1.8
+Version: 0.1.9
 Summary: A collection of Python integrations and utilities (Feishu, Dida365, VictoriaMetrics, ...)
 Author-email: mingming hou <houm01@foxmail.com>
 License-Expression: MIT

{pytbox-0.1.8 → pytbox-0.1.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytbox"
-version = "0.1.8"
+version = "0.1.9"
 description = "A collection of Python integrations and utilities (Feishu, Dida365, VictoriaMetrics, ...)"
 authors = [{ name = "mingming hou", email = "houm01@foxmail.com" }]
 license = "MIT"

{pytbox-0.1.8 → pytbox-0.1.9}/src/pytbox/alert/alert_handler.py

@@ -7,6 +7,7 @@ from ..database.mongo import Mongo
 from ..feishu.client import Client as FeishuClient
 from ..dida365 import Dida365
 from ..utils.timeutils import TimeUtils
+from ..mail.client import MailClient
 
 
 class AlertHandler:
@@ -15,12 +16,16 @@ class AlertHandler:
                  config: dict=None,
                  mongo_client: Mongo=None,
                  feishu_client: FeishuClient=None,
-                 dida_client: Dida365=None
+                 dida_client: Dida365=None,
+                 mail_client: MailClient=None,
+                 env: Literal['dev', 'prod']='prod'
             ):
         self.config = config
         self.mongo = mongo_client
         self.feishu = feishu_client
         self.dida = dida_client
+        self.mail = mail_client
+        self.env = env
 
     def send_alert(self, 
                  event_id: str=None,
@@ -34,7 +39,7 @@ class AlertHandler:
                  suggestion: str='',
                  troubleshot: str='暂无',
                  mongo_id: str=None
-                ):
+            ):
         
         if not event_id:
             event_id = str(uuid.uuid4())
@@ -62,11 +67,11 @@ class AlertHandler:
                 update = {"$set": { "resolved_time": event_time}}
                 self.mongo.collection.update_one(filter_doc, update)
                 alarm_time = self.mongo.collection.find_one(filter_doc, {'event_time': 1})['event_time']
-    
+            
             content = [
                 f'**事件名称**: {event_name}',
                 f'**告警时间**: {TimeUtils.convert_timeobj_to_str(timeobj=event_time, timezone_offset=0) if event_type == "trigger" else TimeUtils.convert_timeobj_to_str(timeobj=alarm_time, timezone_offset=8)}',
-                f'**事件内容**: {event_content}',
+                f'**事件内容**: {event_content + " 已恢复" if event_type == "resolved" else event_content}',
                 f'**告警实例**: {entity_name}',
                 f'**建议**: {suggestion}',
                 f'**故障排查**: {troubleshot}',
@@ -78,17 +83,30 @@ class AlertHandler:
     
             if self.config['feishu']['enable_alert']:
                 self.feishu.extensions.send_message_notify(
+                    receive_id=self.config['feishu']['receive_id'],
                     color='red' if event_type == "trigger" else 'green',
-                    title=event_content,
+                    title=event_content + " 已恢复" if event_type == "resolved" else event_content,
                     priority=priority,
-                    sub_title="",
+                    sub_title='测试告警, 无需处理' if self.env == 'dev' else '',
                     content='\n'.join(content)
                 )
             
+            if self.config['mail']['enable_mail']:
+                if event_type == "trigger":
+                    self.mail.send_mail(
+                        receiver=[self.config['mail']['mail_address']],
+                        subject=f'{self.config['mail']['subject_trigger']}, {event_content}',
+                        contents=f'event_content:{event_content}, alarm_time: {str(event_time)}, event_id: {event_id}, alarm_name: {event_name}, entity_name: {entity_name}, priority: {priority}, automate_ts: {troubleshot}, suggestion: {suggestion}'
+                    )
+                else:
+                    self.mail.send_mail(
+                        receiver=[self.config['mail']['mail_address']],
+                        subject=f'{self.config['mail']['subject_resolved']}, {event_content}', 
+                        contents=f'event_content:{event_content}, alarm_time: {str(TimeUtils.get_now_time_mongo())}, event_id: {event_id}, alarm_name: {event_name}, entity_name: {entity_name}, priority: {priority}, automate_ts: {troubleshot}, suggestion: {suggestion}')
+            
             if self.config['dida']['enable_alert']:
                 if event_type == "trigger":
                     res = self.dida.task_create(
-                        
                         project_id=self.config['dida']['alert_project_id'],
                         title=event_content,
                         content='\n'.join(content),

{pytbox-0.1.8 → pytbox-0.1.9}/src/pytbox/base.py

@@ -8,7 +8,6 @@ from pytbox.feishu.client import Client as FeishuClient
 from pytbox.dida365 import Dida365
 from pytbox.alert.alert_handler import AlertHandler
 from pytbox.log.logger import AppLogger
-from pytbox.win.ad import ADClient
 from pytbox.network.meraki import Meraki
 from pytbox.utils.env import get_env_by_os_environment
 from pytbox.vmware import VMwareClient
@@ -110,6 +109,5 @@ sls = AliCloudSls(
     logstore=config['alicloud']['account1']['logstore']
 )
 
-
 def get_cronjob_counter(app_type='', app='', comment=None, schedule_interval=None, schedule_cron=None):
     return cronjob_counter(vm=vm, log=get_logger('cronjob_counter'), app_type=app_type, app=app, comment=comment, schedule_interval=schedule_interval, schedule_cron=schedule_cron)

{pytbox-0.1.8 → pytbox-0.1.9}/src/pytbox/database/mongo.py

@@ -80,7 +80,7 @@ class Mongo:
         alarm_list = []
         for result in results:
             duration_minute = '持续 ' + str(int((result['resolved_time'] - result['event_time']).total_seconds() / 60)) + ' 分钟'
-            alarm_list.append('触发告警: ' + TimeUtils.convert_timeobj_to_str(timeobj=result['event_time']) + ' ' + duration_minute)
+            alarm_list.append('触发时间: ' + TimeUtils.convert_timeobj_to_str(timeobj=result['event_time']) + ' ' + duration_minute)
 
         alarm_str = '\n'.join(alarm_list)
         

{pytbox-0.1.8 → pytbox-0.1.9}/src/pytbox/database/victoriametrics.py

@@ -230,7 +230,7 @@ class VictoriaMetrics:
         rate = r.data[0]['value'][1]
         return int(float(rate))
     
-    def check_snmp_port_status(self, sysname: str=None, if_name: str=None, last_minute: int=5) -> ReturnResponse:
+    def check_snmp_port_status(self, sysname: str=None, if_name: str=None, last_minute: int=5, dev_file: str=None) -> ReturnResponse:
         '''
         查询端口状态
         status code 可参考 SNMP 文件 https://mibbrowser.online/mibdb_search.php?mib=IF-MIB
@@ -245,7 +245,10 @@ class VictoriaMetrics:
             code: 0, msg: , data: up,down
         '''
         q = f"""avg_over_time(snmp_interface_ifOperStatus{{sysName="{sysname}", ifName="{if_name}"}}[{last_minute}m])"""
-        r = self.query(query=q)
+        if self.env == 'dev':
+            r = load_dev_file(dev_file)
+        else:
+            r = self.query(query=q)
         if r.code == 0:
             status_code = int(r.data[0]['value'][1])
             if status_code == 1:

{pytbox-0.1.8 → pytbox-0.1.9}/src/pytbox/mail/client.py

@@ -27,6 +27,10 @@ class MailClient:
         elif 'foxmail.com' in mail_address:
             self.smtp_address = 'smtp.qq.com'
             self.imap_address = 'imap.qq.com'
+        
+        elif 'mail' in mail_address and 'cn' in mail_address:
+            self.smtp_address = "smtpdm.aliyun.com"
+            self.imap_address = ""
             
         else:
             raise ValueError(f'不支持的邮箱地址: {mail_address}')

{pytbox-0.1.8 → pytbox-0.1.9/src/pytbox.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytbox
-Version: 0.1.8
+Version: 0.1.9
 Summary: A collection of Python integrations and utilities (Feishu, Dida365, VictoriaMetrics, ...)
 Author-email: mingming hou <houm01@foxmail.com>
 License-Expression: MIT