aliyun-log-python-sdk 0.9.31__tar.gz → 0.9.33__tar.gz

{aliyun_log_python_sdk-0.9.31/aliyun_log_python_sdk.egg-info → aliyun_log_python_sdk-0.9.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.31
+Version: 0.9.33
 Summary: Aliyun log service Python client SDK
 Home-page: https://github.com/aliyun/aliyun-log-python-sdk
 Author: Aliyun

{aliyun_log_python_sdk-0.9.31 → aliyun_log_python_sdk-0.9.33}/aliyun/log/logclient.py

@@ -3464,7 +3464,7 @@ class LogClient(object):
         """
         return copy_alert(self, from_project, from_alert_name, to_project=to_project, to_alert_name=to_alert_name, to_client=to_client, to_region_endpoint=to_region_endpoint)
 
-    def list_project(self, offset=0, size=100, project_name_pattern=None, resource_group_id=''):
+    def list_project(self, offset=0, size=100, project_name_pattern=None, resource_group_id='', description=None):
         """ list the project
         Unsuccessful operation will cause an LogException.
 
@@ -3480,6 +3480,9 @@ class LogClient(object):
         :type resource_group_id: string
         :param resource_group_id: the resource group id, used for the server to return project in resource group
 
+        :type description: string
+        :param description: use this to filter project by description, support fuzzy search
+
         :return: ListProjectResponse
 
         :raise: LogException
@@ -3497,6 +3500,8 @@ class LogClient(object):
         params['offset'] = str(offset)
         params['size'] = str(size)
         params['resourceGroupId'] = resource_group_id
+        if description:
+            params['description'] = str(description)
         (resp, header) = self._send("GET", None, None, resource, params, headers)
         return ListProjectResponse(resp, header)
 

{aliyun_log_python_sdk-0.9.31 → aliyun_log_python_sdk-0.9.33}/aliyun/log/machine_group_detail.py

@@ -71,13 +71,19 @@ class MachineStatus(object):
     :param heartbeat_time: last updated heartbeat_time
     """
 
-    def __init__(self, ip, machine_unique_id, user_defined_id, heartbeat_time):
+    def __init__(self, ip, machine_unique_id, user_defined_id, heartbeat_time, binary=None):
         self.ip = ip
         self.machine_unique_id = machine_unique_id
         self.user_defined_id = user_defined_id
         self.heartbeat_time = heartbeat_time
+        self.binary = binary
 
     def log_print(self):
-        print('MachineStatus: machine_unique_id={}, user_defined_id={}, heartbeat_time={}'.format(self.machine_unique_id,
-                                                                                                  self.user_defined_id,
-                                                                                                  self.heartbeat_time))
+        print(
+            "MachineStatus: machine_unique_id={}, user_defined_id={}, heartbeat_time={}, binary={}".format(
+                self.machine_unique_id,
+                self.user_defined_id,
+                self.heartbeat_time,
+                self.binary,
+            )
+        )

{aliyun_log_python_sdk-0.9.31 → aliyun_log_python_sdk-0.9.33}/aliyun/log/machinegroup_response.py

@@ -181,12 +181,17 @@ class ListMachinesResponse(LogResponse):
 
     def __init__(self, resp, header):
         LogResponse.__init__(self, header, resp)
-        self.count = resp['count']
-        self.total = resp['total']
+        self.count = resp["count"]
+        self.total = resp["total"]
         self.machines = []
-        for machine_status in resp['machines']:
-            machine = MachineStatus(machine_status['ip'], machine_status['machine-uniqueid'],
-                                    machine_status['userdefined-id'], machine_status['lastHeartbeatTime'])
+        for machine_status in resp["machines"]:
+            machine = MachineStatus(
+                machine_status["ip"],
+                machine_status.get("machine-uniqueid", None),
+                machine_status["userdefined-id"],
+                machine_status["lastHeartbeatTime"],
+                machine_status.get("binary", None),
+            )
             self.machines.append(machine)
 
     def get_machine_count(self):

{aliyun_log_python_sdk-0.9.31 → aliyun_log_python_sdk-0.9.33}/aliyun/log/version.py

@@ -1,4 +1,4 @@
-__version__ = '0.9.31'
+__version__ = '0.9.33'
 
 import sys
 OS_VERSION = str(sys.platform)

{aliyun_log_python_sdk-0.9.31 → aliyun_log_python_sdk-0.9.33/aliyun_log_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.31
+Version: 0.9.33
 Summary: Aliyun log service Python client SDK
 Home-page: https://github.com/aliyun/aliyun-log-python-sdk
 Author: Aliyun

{aliyun_log_python_sdk-0.9.31 → aliyun_log_python_sdk-0.9.33}/setup.py

@@ -43,7 +43,7 @@ requirements_py2 = [
     'jmespath==0.9.5',
     'enum34==1.1.10',
     'futures==3.3.0',
-    'protobuf>3.4.0,<=3.17.3', # 3.18.0 is the last version support py2, but yanked
+    'protobuf==3.17.3', # 3.18.0 is the last version support py2, but yanked
     'regex==2021.3.17',
     'tzlocal==2.0.0',
     'lz4==2.2.1',