pytbox 0.2.1__tar.gz → 0.2.3__tar.gz

{pytbox-0.2.1/src/pytbox.egg-info → pytbox-0.2.3}/PKG-INFO

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

{pytbox-0.2.1 → pytbox-0.2.3}/pyproject.toml

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

{pytbox-0.2.1 → pytbox-0.2.3}/src/pytbox/database/victoriametrics.py

@@ -251,16 +251,47 @@ class VictoriaMetrics:
             ReturnResponse: _description_
         '''
         if direction == 'in':
-            query = f'avg_over_time(rate(snmp_interface_ifHCInOctets{{sysName="{sysname}", ifName="{ifname}"}}[{last_minutes}m]) * 8 [{last_hours}h:]) / 1e6'
+            query = f'avg_over_time((rate(snmp_interface_ifHCInOctets{{sysName="{sysname}", ifName="{ifname}"}}[{last_minutes}m]) * 8) [{last_hours}h:]) / 1e6'
         else:
-            query = f'avg_over_time(rate(snmp_interface_ifHCOutOctets{{sysName="{sysname}", ifName="{ifname}"}}[{last_minutes}m]) * 8 [{last_hours}h:]) / 1e6'
+            query = f'avg_over_time((rate(snmp_interface_ifHCOutOctets{{sysName="{sysname}", ifName="{ifname}"}}[{last_minutes}m]) * 8) [{last_hours}h:]) / 1e6'
         r = self.query(query)
         try:
             rate = r.data[0]['value'][1]
             return ReturnResponse(code=0, msg=f"查询 {sysname} {ifname} 最近 {last_hours} 小时平均速率为 {round(float(rate), 2)} Mbit/s", data=round(float(rate), 2))
         except KeyError:
             return ReturnResponse(code=1, msg=f"查询 {sysname} {ifname} 最近 {last_hours} 小时平均速率为 0 Mbit/s")
-    
+
+    def check_interface_max_rate(self,
+                                 direction: Literal['in', 'out'],
+                                 sysname: str, 
+                                 ifname:str, 
+                                 last_hours: Optional[int] = 24,
+                                 last_minutes: Optional[int] = 5,
+                                ) -> ReturnResponse:
+        '''
+        _summary_
+
+        Args:
+            direction (Literal['in', 'out']): _description_
+            sysname (str): _description_
+            ifname (str): _description_
+            last_hours (Optional[int], optional): _description_. Defaults to 24.
+            last_minutes (Optional[int], optional): _description_. Defaults to 5.
+
+        Returns:
+            ReturnResponse: _description_
+        '''
+        if direction == 'in':
+            query = f'max_over_time((rate(snmp_interface_ifHCInOctets{{sysName="{sysname}", ifName="{ifname}"}}[{last_minutes}m]) * 8) [{last_hours}h:]) / 1e6'
+        else:
+            query = f'max_over_time((rate(snmp_interface_ifHCOutOctets{{sysName="{sysname}", ifName="{ifname}"}}[{last_minutes}m]) * 8) [{last_hours}h:]) / 1e6'
+        r = self.query(query)
+        try:
+            rate = r.data[0]['value'][1]
+            return ReturnResponse(code=0, msg=f"查询 {sysname} {ifname} 最近 {last_hours} 小时最大速率为 {round(float(rate), 2)} Mbit/s", data=round(float(rate), 2))
+        except KeyError:
+            return ReturnResponse(code=1, msg=f"查询 {sysname} {ifname} 最近 {last_hours} 小时最大速率为 0 Mbit/s")
+
     def check_snmp_port_status(self, sysname: str=None, if_name: str=None, last_minute: int=5, dev_file: str=None) -> ReturnResponse:
         '''
         查询端口状态

{pytbox-0.2.1 → pytbox-0.2.3/src/pytbox.egg-info}/PKG-INFO

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

{pytbox-0.2.1 → pytbox-0.2.3}/tests/test_victoriametrics.py

@@ -22,7 +22,10 @@ def test_check_snmp_port_status():
     print(r)
 
 
-r = vm.check_interface_avg_rate(direction='in', sysname='whcq-prod-coresw-s6720-254', ifname='XGigabitEthernet0/0/47', last_hours=24, last_minutes=5)
+r = vm.check_interface_avg_rate(direction='in', sysname='whcq-prod-coresw-s6720-254', ifname='XGigabitEthernet0/0/47', last_hours=24*30, last_minutes=5)
+print(r)
+
+r = vm.check_interface_max_rate(direction='in', sysname='whcq-prod-coresw-s6720-254', ifname='XGigabitEthernet0/0/47', last_hours=24*30, last_minutes=5)
 print(r)
 
 if __name__ == "__main__":