pytbox 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

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/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/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/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/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.dist-info → pytbox-0.1.9.dist-info}/METADATA

@@ -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.dist-info → pytbox-0.1.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pytbox/base.py,sha256=uzrv0vlHVPOr2JjpUGd8R2Wr-iRf6SysnrAYOalKXYY,4283
+pytbox/base.py,sha256=wc2CTbICGBNvS0mBU3pRIHrIGaFdjf3Y5DIkux-_CmU,4247
 pytbox/cli.py,sha256=N775a0GK80IT2lQC2KRYtkZpIiu9UjavZmaxgNUgJhQ,160
 pytbox/dida365.py,sha256=pUMPB9AyLZpTTbaz2LbtzdEpyjvuGf4YlRrCvM5sbJo,10545
 pytbox/excel.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -6,7 +6,7 @@ pytbox/onepassword_connect.py,sha256=nD3xTl1ykQ4ct_dCRRF138gXCtk-phPfKYXuOn-P7Z8
 pytbox/onepassword_sa.py,sha256=08iUcYud3aEHuQcUsem9bWNxdXKgaxFbMy9yvtr-DZQ,6995
 pytbox/pyjira.py,sha256=TMy34Rtu7OXRA8wpUuLsFeyIQfRNUn2ed2no00L8YSE,22470
 pytbox/vmware.py,sha256=WiH67_3-VCBjXJuh3UueOc31BdZDItiZhkeuPzoRhw4,3975
-pytbox/alert/alert_handler.py,sha256=FePPQS4LyGphSJ0QMv0_pLWaXxEqsRlcTKMfUjtsNfk,5048
+pytbox/alert/alert_handler.py,sha256=mDg1bv9F9XOH0NNNZTlw_KaN_P4G3w8rswmDW_N_3gw,6553
 pytbox/alert/ping.py,sha256=KEnnXdIRJHvR_rEHPWLBt0wz4cGwmA29Lenlak3Z_1Y,778
 pytbox/alicloud/sls.py,sha256=-r6rbCwDUQ4jwAgSVSNu7B2h1MNg20CrRIKnlXVeY9w,4159
 pytbox/categraf/build_config.py,sha256=9G85rLqkz3lchpH7ef0LbvckYHl0nRA6mHVLeUfs9Mw,6308
@@ -42,8 +42,8 @@ pytbox/cli/common/utils.py,sha256=0uQ5L1l5cySFheixB91B9ptq0p6tGsBhqvvm3ouRGbI,90
 pytbox/cli/formatters/__init__.py,sha256=4o85w4j-A-O1oBLvuE9q8AFiJ2C9rvB3MIKsy5VvdfQ,101
 pytbox/cli/formatters/output.py,sha256=h5WhZlQk1rjmxEj88Jy5ODLcv6L5zfGUhks_3AWIkKU,5455
 pytbox/common/__init__.py,sha256=3JWfgCQZKZuSH5NCE7OCzKwq82pkyop9l7sH5YSNyfU,122
-pytbox/database/mongo.py,sha256=CSpHC7iR-M0BaVxXz5j6iXjMKPgXJX_G7MrjCj5Gm8Q,3478
-pytbox/database/victoriametrics.py,sha256=pKiAeZUTEXBegN8kGwkiGh1Pdm3i9DOnBhSG-la0mKk,11300
+pytbox/database/mongo.py,sha256=AhJ9nCAQHKrrcL-ujeonOwEf3x2QkmT2VhoCdglqJmU,3478
+pytbox/database/victoriametrics.py,sha256=k6D6SGi7ky5pugM8iHa4ZjzTIlcnxwFw178VA6Wjbyk,11408
 pytbox/feishu/client.py,sha256=kwGLseGT_iQUFmSqpuS2_77WmxtHstD64nXvktuQ3B4,5865
 pytbox/feishu/endpoints.py,sha256=z3nPOZPC2JGDJlO7SusWBpRA33hZZ4Z-GBhI6F8L_u4,40240
 pytbox/feishu/errors.py,sha256=79qFAHZw7jDj3gnWAjI1-W4tB0q1_aSfdjee4xzXeuI,1179
@@ -52,7 +52,7 @@ pytbox/feishu/typing.py,sha256=3hWkJgOi-v2bt9viMxkyvNHsPgrbAa0aZOxsZYg2vdM,122
 pytbox/log/logger.py,sha256=tfqRc7VcDyI_U-NiiK4euFe8O2ro9yeXVohPmzAC_hY,8867
 pytbox/log/victorialog.py,sha256=gffEiq38adv9sC5oZeMcyKghd3SGfRuqtZOFuqHQF6E,4139
 pytbox/mail/alimail.py,sha256=njKA3PUbIaiKFaxKvUObmklmEEHg2YA-O5rpgsgT5_w,5147
-pytbox/mail/client.py,sha256=6HeKpChHGjTCYGBgQcfAhWlU_wh9wtO-bjP6TU38pGM,6120
+pytbox/mail/client.py,sha256=RNgWhhTXFTpD43U4p7hbmnfRdmltuZmbm890gaZTzhI,6278
 pytbox/mail/mail_detail.py,sha256=6u8DK-7WzYPSuX6TdicSCh2Os_9Ou6Rn9xc6WRvv85M,699
 pytbox/network/meraki.py,sha256=054E3C5KzAuXs9aPalvdAOUo6Hc5aOKZSWUaVbPquy4,6112
 pytbox/utils/cronjob.py,sha256=b17CY1fmaFTdQojicXAXHliov_JZdmT7cZhtO4v5sCo,3080
@@ -63,8 +63,8 @@ pytbox/utils/response.py,sha256=kXjlwt0WVmLRam2eu1shzX2cQ7ux4cCQryaPGYwle5g,1247
 pytbox/utils/richutils.py,sha256=OT9_q2Q1bthzB0g1GlhZVvM4ZAepJRKL6a_Vsr6vEqo,487
 pytbox/utils/timeutils.py,sha256=uSKgwt20mVcgIGKLsH2tNum8v3rcpzgmBibPvyPQFgM,20433
 pytbox/win/ad.py,sha256=-3pWfL3dElz-XoO4j4M9lrgu3KJtlhrS9gCWJBpafAU,1147
-pytbox-0.1.8.dist-info/METADATA,sha256=iAknEyd73pj7U9J8ML0v1o9-q4AJvwD6OYSM4d91KAk,6319
-pytbox-0.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pytbox-0.1.8.dist-info/entry_points.txt,sha256=YaTOJ2oPjOiv2SZwY0UC-UA9QS2phRH1oMvxGnxO0Js,43
-pytbox-0.1.8.dist-info/top_level.txt,sha256=YADgWue-Oe128ptN3J2hS3GB0Ncc5uZaSUM3e1rwswE,7
-pytbox-0.1.8.dist-info/RECORD,,
+pytbox-0.1.9.dist-info/METADATA,sha256=BrT45GpS_cUh5Xz1ClDKgHl58mcsFulmXfVzgMCAsrc,6319
+pytbox-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pytbox-0.1.9.dist-info/entry_points.txt,sha256=YaTOJ2oPjOiv2SZwY0UC-UA9QS2phRH1oMvxGnxO0Js,43
+pytbox-0.1.9.dist-info/top_level.txt,sha256=YADgWue-Oe128ptN3J2hS3GB0Ncc5uZaSUM3e1rwswE,7
+pytbox-0.1.9.dist-info/RECORD,,