pytbox 0.1.6__tar.gz → 0.1.8__tar.gz

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

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

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

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

{pytbox-0.1.6 → pytbox-0.1.8}/src/pytbox/alert/ping.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-
 from ..database.victoriametrics import VictoriaMetrics
 from ..lib.load_config import load_config
 

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

@@ -16,6 +16,7 @@ from pytbox.pyjira import PyJira
 from pytbox.mail.client import MailClient
 from pytbox.mail.alimail import AliMail
 from pytbox.alicloud.sls import AliCloudSls
+from pytbox.utils.cronjob import cronjob_counter
 
 
 config = load_config_by_file(path='/workspaces/pytbox/tests/alert/config_dev.toml', oc_vault_id=os.environ.get('oc_vault_id'))
@@ -107,4 +108,8 @@ sls = AliCloudSls(
     access_key_secret=config['alicloud']['account1']['access_key_secret'],
     project=config['alicloud']['account1']['project'],
     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.6 → pytbox-0.1.8}/src/pytbox/database/victoriametrics.py

@@ -1,7 +1,8 @@
 #!/usr/bin/env python3
 
+import time
 import json
-from typing import Literal, Optional
+from typing import Literal, Optional, Dict, List
 import requests
 from ..utils.response import ReturnResponse
 from ..utils.load_vm_devfile import load_dev_file
@@ -9,7 +10,7 @@ from ..utils.load_vm_devfile import load_dev_file
 
 class VictoriaMetrics:
     
-    def __init__(self, url: str='', timeout: int=3) -> None:
+    def __init__(self, url: str='', timeout: int=3, env: str='prod') -> None:
         self.url = url
         self.timeout = timeout
         self.session = requests.Session()
@@ -17,7 +18,44 @@ class VictoriaMetrics:
             'Content-Type': 'application/json',
             'Accept': 'application/json'
         })
+        self.env = env
+
+    def insert(self, metric_name: str = '', labels: Dict[str, str] = None, 
+               value: List[float] = None, timestamp: int = None) -> ReturnResponse:
+        """插入指标数据。
+        
+        Args:
+            metric_name: 指标名称
+            labels: 标签字典
+            value: 值列表
+            timestamp: 时间戳（毫秒），默认为当前时间
+            
+        Raises:
+            requests.RequestException: 当请求失败时抛出
+        """
+        if labels is None:
+            labels = {}
+        if value is None:
+            value = 1
+        if timestamp is None:
+            timestamp = int(time.time() * 1000)
+            
+        url = f"{self.url}/api/v1/import"
+        data = {
+            "metric": {
+                "__name__": metric_name,
+                **labels
+            },
+            "values": [value],
+            "timestamps": [timestamp]
+        }
         
+        try:
+            response = requests.post(url, json=data, timeout=self.timeout)
+            return ReturnResponse(code=0, msg=f"数据插入成功，状态码: {response.status_code}, metric_name: {metric_name}, labels: {labels}, value: {value}, timestamp: {timestamp}")
+        except requests.RequestException as e:
+            return ReturnResponse(code=1, msg=f"数据插入失败: {e}")
+
     def query(self, query: str=None, output_format: Literal['json']=None) -> ReturnResponse:
         '''
         查询指标数据
@@ -208,9 +246,67 @@ class VictoriaMetrics:
         '''
         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'
+        if r.code == 0:
+            status_code = int(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)
         else:
-            status = 'down'
-        return ReturnResponse(code=0, msg=f"{sysname} {if_name} 最近 {last_minute} 分钟端口状态为 {status}", data=status)
+            return r
+
+    def insert_cronjob_run_status(self, 
+                                  app_type: Literal['alert', 'meraki', 'other']='other', 
+                                  app: str='', 
+                                  status_code: Literal[0, 1]=1, 
+                                  comment: str=None, 
+                                  schedule_interval: str=None, 
+                                  schedule_cron: str=None
+                                ) -> ReturnResponse:
+        labels = {
+            "app": app,
+            "env": self.env,
+        }
+        if app_type:
+            labels['app_type'] = app_type
+        if comment:
+            labels['comment'] = comment
+            
+        if schedule_interval:
+            labels['schedule_type'] = 'interval'
+            labels['schedule_interval'] = schedule_interval
+            
+        if schedule_cron:
+            labels['schedule_type'] = 'cron'
+            labels['schedule_cron'] = schedule_cron
+            
+        r = self.insert(metric_name="cronjob_run_status", labels=labels, value=status_code)
+        return r
+    
+    def insert_cronjob_duration_seconds(self, 
+                                        app_type: Literal['alert', 'meraki', 'other']='other', 
+                                        app: str='', 
+                                        duration_seconds: float=None, 
+                                        comment: str=None, 
+                                        schedule_interval: str=None, 
+                                        schedule_cron: str=None
+                                    ) -> ReturnResponse:
+        labels = {
+            "app": app,
+            "env": self.env
+        }
+        if app_type:
+            labels['app_type'] = app_type
+        if comment:
+            labels['comment'] = comment
+
+        if schedule_interval:
+            labels['schedule_type'] = 'interval'
+            labels['schedule_interval'] = schedule_interval
+            
+        if schedule_cron:
+            labels['schedule_type'] = 'cron'
+            labels['schedule_cron'] = schedule_cron
+        r = self.insert(metric_name="cronjob_run_duration_seconds", labels=labels, value=duration_seconds)
+        return r

pytbox-0.1.8/src/pytbox/utils/cronjob.py

@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+
+import time
+from functools import wraps
+from typing import Literal
+from ..database.victoriametrics import VictoriaMetrics
+
+
+def cronjob_counter(vm: VictoriaMetrics=None, log: str=None, app_type: Literal['']='', app='', comment=None, schedule_interval=None, schedule_cron=None):
+    """计算函数运行时间的装饰器，支持记录到 VictoriaMetrics
+    
+    Args:
+        app_type: 应用类型 ('alert', 'meraki', 'other')
+        app: 应用名称
+        comment: 备注信息
+        schedule_interval: 定时任务间隔（如 '1m', '5m'）
+        schedule_cron: cron 表达式（如 '0 */5 * * *'）
+    """
+    def decorator(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            start_time = time.time()
+            
+            try:
+                result = func(*args, **kwargs)
+                end_time = time.time()
+                elapsed_time = end_time - start_time
+                
+                # 记录任务成功完成状态
+                vm.insert_cronjob_run_status(
+                    app_type=app_type,
+                    app=app,
+                    status_code=1,  # 0 表示成功完成
+                    comment=f"成功完成: {comment}" if comment else "任务成功完成",
+                    schedule_interval=schedule_interval,
+                    schedule_cron=schedule_cron
+                )
+                
+                # 记录执行耗时
+                vm.insert_cronjob_duration_seconds(
+                    app_type=app_type,
+                    app=app,
+                    duration_seconds=elapsed_time,
+                    comment=comment,
+                    schedule_interval=schedule_interval,
+                    schedule_cron=schedule_cron
+                )
+                log.info(f"{app} 任务成功完成, 耗时 {elapsed_time:.2f} 秒")
+                
+                return result
+                
+            except Exception as e:
+                end_time = time.time()
+                elapsed_time = end_time - start_time
+                
+                # 记录任务失败状态
+                error_comment = f"执行出错: {str(e)}" if not comment else f"{comment} (出错: {str(e)})"
+                vm.insert_cronjob_run_status(
+                    app_type=app_type,
+                    app=app,
+                    status_code=0,  # 1 表示失败
+                    comment=error_comment,
+                    schedule_interval=schedule_interval,
+                    schedule_cron=schedule_cron
+                )
+                
+                # 即使出错也记录耗时
+                vm.insert_cronjob_duration_seconds(
+                    app_type=app_type,
+                    app=app,
+                    duration_seconds=elapsed_time,
+                    comment=error_comment,
+                    schedule_interval=schedule_interval,
+                    schedule_cron=schedule_cron
+                )
+                log.error(f"任务失败: {error_comment}")
+                raise
+        return wrapper
+    return decorator

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

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

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

@@ -64,10 +64,10 @@ src/pytbox/mail/alimail.py
 src/pytbox/mail/client.py
 src/pytbox/mail/mail_detail.py
 src/pytbox/network/meraki.py
+src/pytbox/utils/cronjob.py
 src/pytbox/utils/env.py
 src/pytbox/utils/load_config.py
 src/pytbox/utils/load_vm_devfile.py
-src/pytbox/utils/ping_checker.py
 src/pytbox/utils/response.py
 src/pytbox/utils/richutils.py
 src/pytbox/utils/timeutils.py

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-from pytbox.base import vm
-
+from pytbox.base import vm, get_cronjob_counter
+from pytbox.utils.cronjob import cronjob_counter
 
 
 def test_query():
@@ -16,6 +16,7 @@ def test_get_labels():
     r = vm.get_labels('ping_average_response_ms')
     print(r)
 
+@get_cronjob_counter(app_type="tests", app="tests.test_victoriameterics", schedule_interval='5s')
 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)

pytbox-0.1.6/src/pytbox/utils/ping_checker.py

@@ -1 +0,0 @@
-