pytbox 0.1.5__tar.gz → 0.1.6__tar.gz

{pytbox-0.1.5/src/pytbox.egg-info → pytbox-0.1.6}/PKG-INFO

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

{pytbox-0.1.5 → pytbox-0.1.6}/pyproject.toml

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

{pytbox-0.1.5 → pytbox-0.1.6}/src/pytbox/alicloud/sls.py

@@ -5,19 +5,21 @@ from typing import Literal
 from aliyun.log import GetLogsRequest, LogItem, PutLogsRequest
 from aliyun.log import LogClient as SlsLogClient
 from aliyun.log.auth import AUTH_VERSION_4
-from ..utils.env import check_env
 
 
 
 class AliCloudSls:
-
-    def __init__(self, access_key_id: str=None, access_key_secret: str=None, project: str, logstore: str):
+    '''
+    pip install -U aliyun-log-python-sdk
+    '''
+    def __init__(self, access_key_id: str=None, access_key_secret: str=None, project: str=None, logstore: str=None, env: str='prod'):
         # 日志服务的服务接入点
         self.endpoint = "cn-shanghai.log.aliyuncs.com"
         # 创建 LogClient 实例，使用 V4 签名，根据实际情况填写 region，这里以杭州为例
         self.client = SlsLogClient(self.endpoint, access_key_id, access_key_secret, auth_version=AUTH_VERSION_4, region='cn-shanghai')
         self.project = project
         self.logstore = logstore
+        self.env = env
 
     def get_logs(self, project_name, logstore_name, query, from_time, to_time): 
         logstore_index = {'line': {
@@ -57,7 +59,7 @@ class AliCloudSls:
         log_group = []
         log_item = LogItem()
         contents = [
-            ('env', check_env()),
+            ('env', self.env),
             ('level', level),
             ('app', app),
             ('msg', msg),
@@ -69,8 +71,9 @@ class AliCloudSls:
         log_item.set_contents(contents)
         log_group.append(log_item)
         request = PutLogsRequest(self.project, self.logstore, topic, "", log_group, compress=False)
-        self.client.put_logs(request)
-    
+        r = self.client.put_logs(request)
+        return r
+        
     def put_logs_for_meraki(self, alert):
         log_group = []
         log_item = LogItem()

{pytbox-0.1.5 → pytbox-0.1.6}/src/pytbox/base.py

@@ -15,6 +15,8 @@ from pytbox.vmware import VMwareClient
 from pytbox.pyjira import PyJira
 from pytbox.mail.client import MailClient
 from pytbox.mail.alimail import AliMail
+from pytbox.alicloud.sls import AliCloudSls
+
 
 config = load_config_by_file(path='/workspaces/pytbox/tests/alert/config_dev.toml', oc_vault_id=os.environ.get('oc_vault_id'))
 
@@ -53,6 +55,19 @@ def get_logger(app):
         mongo=get_mongo('alert_program')
     )
 
+def get_logger_sls(app):
+    return AppLogger(
+        app_name=app, 
+        enable_sls=True,
+        feishu=feishu,
+        dida=dida,
+        mongo=get_mongo('alert_program'),
+        sls_access_key_id=config['alicloud']['account1']['access_key_id'],
+        sls_access_key_secret=config['alicloud']['account1']['access_key_secret'],
+        sls_project=config['alicloud']['account1']['project'],
+        sls_logstore=config['alicloud']['account1']['logstore']
+    )
+
 # ad_dev = ADClient(
 #     server=config['ad']['dev']['AD_SERVER'],
 #     base_dn=config['ad']['dev']['BASE_DN'],
@@ -85,4 +100,11 @@ pyjira = PyJira(
 
 mail_163 = MailClient(mail_address=config['mail']['163']['mail_address'], password=config['mail']['163']['password'])
 mail_qq = MailClient(mail_address=config['mail']['qq']['mail_address'], password=config['mail']['qq']['password'])
-ali_mail = AliMail(mail_address=config['mail']['aliyun']['mail_address'], client_id=config['mail']['aliyun']['client_id'], client_secret=config['mail']['aliyun']['client_secret'])
+ali_mail = AliMail(mail_address=config['mail']['aliyun']['mail_address'], client_id=config['mail']['aliyun']['client_id'], client_secret=config['mail']['aliyun']['client_secret'])
+
+sls = AliCloudSls(
+    access_key_id=config['alicloud']['account1']['access_key_id'],
+    access_key_secret=config['alicloud']['account1']['access_key_secret'],
+    project=config['alicloud']['account1']['project'],
+    logstore=config['alicloud']['account1']['logstore']
+)

{pytbox-0.1.5 → pytbox-0.1.6}/src/pytbox/database/victoriametrics.py

@@ -18,7 +18,7 @@ class VictoriaMetrics:
             'Accept': 'application/json'
         })
         
-    def query(self, query: str, output_format: Literal['json']=None) -> ReturnResponse:
+    def query(self, query: str=None, output_format: Literal['json']=None) -> ReturnResponse:
         '''
         查询指标数据
 
@@ -61,6 +61,52 @@ class VictoriaMetrics:
         else:
             return resp
 
+    def query_range(self, query):
+        '''
+        查询指标数据
+
+        Args:
+            query (str): 查询语句
+
+        Returns:
+            dict: 查询结果
+        '''
+        url = f"{self.url}/prometheus/api/v1/query_range"
+
+        data = {
+            'query': query,
+            'start': '-1d',
+            'step': '1h'
+        }
+
+        r = requests.post(url, data=data, timeout=self.timeout)
+        res_json = r.json()
+        print(res_json)
+        # status = res_json.get("status")
+        # result = res_json.get("data", {}).get("result", [])
+        # is_json = output_format == 'json'
+
+        # if status == "success":
+        #     if result:
+        #         code = 0
+        #         msg = f"[{query}] 查询成功!"
+        #         data = result
+        #     else:
+        #         code = 2
+        #         msg = f"[{query}] 没有查询到结果"
+        #         data = res_json
+        # else:
+        #     code = 1
+        #     msg = f"[{query}] 查询失败: {res_json.get('error')}"
+        #     data = res_json
+
+        # resp = ReturnResponse(code=code, msg=msg, data=data)
+
+        # if is_json:
+        #     json_result = json.dumps(resp.__dict__, ensure_ascii=False)
+        #     return json_result
+        # else:
+        #     return resp
     def get_labels(self, metric_name: str) -> ReturnResponse:
         url = f"{self.url}/api/v1/series?match[]={metric_name}"
         response = requests.get(url, timeout=self.timeout)
@@ -104,7 +150,6 @@ class VictoriaMetrics:
                 code = 0
                 msg = f"已检查 {target} 最近 {last_minute} 分钟是正常的!"
             else:
-                
                 if all(str(item[1]) == "1" for item in values):
                     code = 1
                     msg = f"已检查 {target} 最近 {last_minute} 分钟是异常的!"
@@ -114,7 +159,6 @@ class VictoriaMetrics:
         elif r.code == 2:
             code = 2
             msg = f"没有查询到 {target} 最近 {last_minute} 分钟的ping结果!"
-        
         try:
             data = r.data[0]
         except KeyError:
@@ -146,4 +190,27 @@ class VictoriaMetrics:
             query = f'(rate(snmp_interface_ifHCOutOctets{{sysName="{sysName}", ifName="{ifName}"}}[{last_minutes}m])) * 8 / 1000000'
         r = self.query(query)
         rate = r.data[0]['value'][1]
-        return int(float(rate))
+        return int(float(rate))
+    
+    def check_snmp_port_status(self, sysname: str=None, if_name: str=None, last_minute: int=5) -> ReturnResponse:
+        '''
+        查询端口状态
+        status code 可参考 SNMP 文件 https://mibbrowser.online/mibdb_search.php?mib=IF-MIB
+
+        Args:
+            sysname (_type_): 设备名称
+            if_name (_type_): _description_
+            last_minute (_type_): _description_
+
+        Returns:
+            ReturnResponse: 
+            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)
+        status_code = r.data[0]['value'][1]
+        if status_code == 1:
+            status = 'up'
+        else:
+            status = 'down'
+        return ReturnResponse(code=0, msg=f"{sysname} {if_name} 最近 {last_minute} 分钟端口状态为 {status}", data=status)

{pytbox-0.1.5 → pytbox-0.1.6}/src/pytbox/log/logger.py

@@ -9,7 +9,7 @@ from ..database.mongo import Mongo
 from ..feishu.client import Client as FeishuClient
 from ..utils.timeutils import TimeUtils
 from ..dida365 import Dida365
-
+from ..alicloud.sls import AliCloudSls
 
 logger.remove()
 logger.add(sys.stdout, colorize=True, format="<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{level: <8}</level> | <level>{message}</level>")
@@ -31,7 +31,6 @@ class AppLogger:
                  feishu: FeishuClient=None,
                  dida: Dida365=None,
                  enable_sls: bool=False,
-                 sls_url: str=None,
                  sls_access_key_id: str=None,
                  sls_access_key_secret: str=None,
                  sls_project: str=None,
@@ -49,10 +48,17 @@ class AppLogger:
         self.stream = stream
         self.victorialog = Victorialog(url=victorialog_url)
         self.enable_victorialog = enable_victorialog
+        self.enable_sls = enable_sls
         self.mongo = mongo
         self.feishu = feishu
         self.dida = dida
-    
+        self.sls = AliCloudSls(
+            access_key_id=sls_access_key_id,
+            access_key_secret=sls_access_key_secret,
+            project=sls_project,
+            logstore=sls_logstore
+        )
+
     def _get_caller_info(self) -> tuple[str, int, str]:
         """
         获取调用者信息
@@ -78,6 +84,9 @@ class AppLogger:
         logger.debug(f"[{caller_filename}:{caller_lineno}:{caller_function}] {message}")
         if self.enable_victorialog:
             self.victorialog.send_program_log(stream=self.stream, level="DEBUG", message=message, app_name=self.app_name, file_name=call_full_filename, line_number=caller_lineno, function_name=caller_function)
+        if self.enable_sls:
+            self.sls.put_logs(level="DEBUG", msg=message, app=self.app_name, caller_filename=caller_filename, caller_lineno=caller_lineno, caller_function=caller_function, call_full_filename=call_full_filename)
+ 
     
     def info(self, message: str='', feishu_notify: bool=False):
         """记录信息级别日志"""
@@ -85,22 +94,28 @@ class AppLogger:
         logger.info(f"[{caller_filename}:{caller_lineno}:{caller_function}] {message}")
         if self.enable_victorialog:
             r = self.victorialog.send_program_log(stream=self.stream, level="INFO", message=message, app_name=self.app_name, file_name=call_full_filename, line_number=caller_lineno, function_name=caller_function)
+        if self.enable_sls:
+            self.sls.put_logs(level="INFO", msg=message, app=self.app_name, caller_filename=caller_filename, caller_lineno=caller_lineno, caller_function=caller_function, call_full_filename=call_full_filename)
         if feishu_notify:
             self.feishu(message)
-    
+        
     def warning(self, message: str):
         """记录警告级别日志"""
         caller_filename, caller_lineno, caller_function, call_full_filename = self._get_caller_info()
         logger.warning(f"[{caller_filename}:{caller_lineno}:{caller_function}] {message}")
         if self.enable_victorialog:
             self.victorialog.send_program_log(stream=self.stream, level="WARN", message=message, app_name=self.app_name, file_name=call_full_filename, line_number=caller_lineno, function_name=caller_function)
-    
+        if self.enable_sls:
+            self.sls.put_logs(level="WARN", msg=message, app=self.app_name, caller_filename=caller_filename, caller_lineno=caller_lineno, caller_function=caller_function, call_full_filename=call_full_filename)
+            
     def error(self, message: str):
         """记录错误级别日志"""
         caller_filename, caller_lineno, caller_function, call_full_filename = self._get_caller_info()
         logger.error(f"[{caller_filename}:{caller_lineno}:{caller_function}] {message}")
         if self.enable_victorialog:
             self.victorialog.send_program_log(stream=self.stream, level="ERROR", message=message, app_name=self.app_name, file_name=call_full_filename, line_number=caller_lineno, function_name=caller_function)
+        if self.enable_sls:
+            self.sls.put_logs(level="ERROR", msg=message, app=self.app_name, caller_filename=caller_filename, caller_lineno=caller_lineno, caller_function=caller_function, call_full_filename=call_full_filename)
         
         if self.feishu:
             existing_message = self.mongo.collection.find_one({"message": message}, sort=[("time", -1)])
@@ -150,7 +165,8 @@ class AppLogger:
         logger.critical(f"[{caller_filename}:{caller_lineno}:{caller_function}] {message}")
         if self.enable_victorialog:
             self.victorialog.send_program_log(stream=self.stream, level="CRITICAL", message=message, app_name=self.app_name, file_name=call_full_filename, line_number=caller_lineno, function_name=caller_function)
-
+        if self.enable_sls:
+            self.sls.put_logs(level="CRITICAL", msg=message, app=self.app_name, caller_filename=caller_filename, caller_lineno=caller_lineno, caller_function=caller_function, call_full_filename=call_full_filename)
 
 # 使用示例
 if __name__ == "__main__":

{pytbox-0.1.5 → pytbox-0.1.6/src/pytbox.egg-info}/PKG-INFO

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

{pytbox-0.1.5 → pytbox-0.1.6}/src/pytbox.egg-info/SOURCES.txt

@@ -74,6 +74,7 @@ src/pytbox/utils/timeutils.py
 src/pytbox/win/ad.py
 tests/test_base.py
 tests/test_feishu.py
+tests/test_load_jsonfile.py
 tests/test_logger.py
 tests/test_onepassword_connect.py
 tests/test_onepassword_sa.py

pytbox-0.1.6/tests/test_load_jsonfile.py

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+
+
+from pytbox.utils.load_config import load_config_by_file
+
+
+config = load_config_by_file(
+    path='/workspaces/pytbox/tests/alert/config_dev.toml',
+    # oc_vault_id="hcls5uxuq5dmxorw6rfewefdsa"
+    jsonfile="test_load_config.json"
+)
+
+
+print(config['json_test'])

pytbox-0.1.6/tests/test_logger.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python3
+
+from pytbox.base import get_logger_sls, get_logger
+
+
+log = get_logger('tests.test_logger')
+log_sls = get_logger_sls(app="tests.test_logger")
+
+def test_logger_info():
+    log.info('test_logger_info')
+    log.error('test error log2')
+
+
+def test_logger_sls():
+    log_sls.debug('test_logger_sls')
+    # log.error('test error log2')
+
+if __name__ == "__main__":
+    # test_logger_info()
+    test_logger_sls()

{pytbox-0.1.5 → pytbox-0.1.6}/tests/test_victoriametrics.py

@@ -16,7 +16,12 @@ def test_get_labels():
     r = vm.get_labels('ping_average_response_ms')
     print(r)
 
+def test_check_snmp_port_status():
+    r = vm.check_snmp_port_status(sysname="shylf-prod-coresw-ce6820-182", if_name="10GE1/0/47", last_minute=10)
+    print(r)
+
 if __name__ == "__main__":
     # test_get_labels()
     # test_query()
-    test_check_ping_result()
+    # test_check_ping_result()
+    test_check_snmp_port_status()

pytbox-0.1.5/tests/test_logger.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-from pytbox.base import get_logger
-
-
-
-log = get_logger('tests.test_logger')
-
-def test_logger_info():
-    log.info('test_logger_info')
-    log.error('test error log2')
-
-
-if __name__ == "__main__":
-    test_logger_info()