aliyun-log-python-sdk 0.9.42__tar.gz → 0.9.45__tar.gz

{aliyun_log_python_sdk-0.9.42/aliyun_log_python_sdk.egg-info → aliyun_log_python_sdk-0.9.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aliyun-log-python-sdk
-Version: 0.9.42
+Version: 0.9.45
 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.42 → aliyun_log_python_sdk-0.9.45}/aliyun/log/etl_core/trans_comp/trans_json.py

@@ -73,8 +73,8 @@ class json_transformer(trans_comp_check_mdoe_base):
         :param depth: depth to scan, 1 means first layer, default is 100.
         :param include_node: keys to expand and include. regex string. using '|' for multiple ones. default is all.
         :param exclude_node: keys to skip, regex string. using '|' for multiple ones. default is nothing.
-        :param include_path: path to expand and include. regex string to match from begin. using '|' for multiple ones. default is all. e.g. r"data\.k1", all sub-keys in data.k1 will be included.
-        :param exclude_path: path to skip, regex string to match from begin. using '|' for multiple ones. default is nothing. . e.g. r"data\.k2", all sub-keys in data.k2 will be excluded.
+        :param include_path: path to expand and include. regex string to match from begin. using '|' for multiple ones. default is all. e.g. r"data\\.k1", all sub-keys in data.k1 will be included.
+        :param exclude_path: path to skip, regex string to match from begin. using '|' for multiple ones. default is nothing. . e.g. r"data\\.k2", all sub-keys in data.k2 will be excluded.
         :param fmt: during expansion, how to format the key name, there're several types or customized as described in FMT_MAP
         :param sep: sep used in formatting during expansion
         :param prefix: prefix used in formatting during expansion

{aliyun_log_python_sdk-0.9.42 → aliyun_log_python_sdk-0.9.45}/aliyun/log/logclient.py

@@ -1527,7 +1527,7 @@ class LogClient(object):
 +                    }
 +                }
         :type telemetry_type: string
-        :param telemetry_type: the Telemetry type
+        :param telemetry_type: the Telemetry type, can only be one of 'Metrics', 'None' or '', any other value will be treated as ''
 
         :type mode: string
         :param mode: type of logstore, can be choose between lite and standard, default value standard
@@ -1545,6 +1545,9 @@ class LogClient(object):
         if preserve_storage:
             ttl = 3650
 
+        if telemetry_type not in ['Metrics', 'None', '', 'Event']:
+            telemetry_type = ''
+
         params = {}
         resource = "/logstores"
         headers = {"x-log-bodyrawsize": '0', "Content-Type": "application/json"}
@@ -1684,7 +1687,7 @@ class LogClient(object):
         :type mode: string
         :param mode: type of logstore, can be choose between lite and standard, default value standard
         :type telemetry_type: string
-        :param telemetry_type: the Telemetry type
+        :param telemetry_type: the Telemetry type, deprecated, telemetry type is ignored when updating logstore
 
         :type infrequent_access_ttl: int
         :param infrequent_access_ttl: infrequent access storage time

{aliyun_log_python_sdk-0.9.42 → aliyun_log_python_sdk-0.9.45}/aliyun/log/logclient_operator.py

@@ -254,7 +254,7 @@ def copy_logstore(from_client, from_project, from_logstore, to_logstore, to_proj
 
     if to_region_endpoint is not None and to_client is None:
         to_client = copy.deepcopy(from_client)
-        to_client.set_endpoint(to_region_endpoint)
+        to_client._setendpoint(to_region_endpoint)
     else:
         to_client = to_client or from_client
 
@@ -1043,7 +1043,7 @@ def copy_dashboard(from_client, from_project, from_dashboard_name, to_project=No
 
     if to_region_endpoint is not None and to_client is None:
         to_client = copy.deepcopy(from_client)
-        to_client.set_endpoint(to_region_endpoint)
+        to_client._setendpoint(to_region_endpoint)
     else:
         to_client = to_client or from_client
 
@@ -1118,7 +1118,7 @@ def copy_alert(from_client, from_project, from_alert_name, to_project=None, to_a
 
     if to_region_endpoint is not None and to_client is None:
         to_client = copy.deepcopy(from_client)
-        to_client.set_endpoint(to_region_endpoint)
+        to_client._setendpoint(to_region_endpoint)
     else:
         to_client = to_client or from_client
 

{aliyun_log_python_sdk-0.9.42 → aliyun_log_python_sdk-0.9.45}/aliyun/log/logger_hanlder.py

@@ -227,7 +227,7 @@ class SimpleLogHandler(logging.Handler, object):
     def _get_extract_kv_ptn(self):
         sep = self.extract_kv_sep
         p1 = u'(?!{0})([\u4e00-\u9fa5\u0800-\u4e00\\w\\.\\-]+)\\s*{0}\\s*([\u4e00-\u9fa5\u0800-\u4e00\\w\\.\\-]+)'
-        p2 = u'(?!{0})([\u4e00-\u9fa5\u0800-\u4e00\\w\\.\\-]+)\\s*{0}\\s*"\s*([^"]+?)\s*"'
+        p2 = u'(?!{0})([\u4e00-\u9fa5\u0800-\u4e00\\w\\.\\-]+)\\s*{0}\\s*"\\s*([^"]+?)\\s*"'
         ps = '|'.join([p1, p2]).format(sep)
 
         return re.compile(ps)

{aliyun_log_python_sdk-0.9.42 → aliyun_log_python_sdk-0.9.45}/aliyun/log/logtail_config_detail.py

@@ -125,7 +125,7 @@ class CommonRegLogConfigDetail(LogtailConfigDetail):
     :param log_path: the log file dir path
 
     :type file_pattern: string
-    :param file_pattern: the log file name pattern, e.g \*.LOG , access.log
+    :param file_pattern: the log file name pattern, e.g *.LOG , access.log
 
     :type time_format: string
     :param time_format: the time format of the logs, e.g.  "%Y-%m-%d %M:%H:%S"
@@ -134,7 +134,7 @@ class CommonRegLogConfigDetail(LogtailConfigDetail):
     :param log_begin_regex: the regular express to match the first line of a log
 
     :type log_parse_regex: string
-    :param log_parse_regex: the regular express to match a log, e.g (\d+-\d+\d+ \d+:\d+:\d+) (\S+) (.*)
+    :param log_parse_regex: the regular express to match a log, e.g (\\d+-\\d+\\d+ \\d+:\\d+:\\d+) (\\S+) (.*)
 
     :type reg_keys: string list
     :param reg_keys: the key for every captured value in log_parse_reg, e.g ["time", "level", "message"]
@@ -460,7 +460,7 @@ class PluginConfigDetail(ConfigDetailBase):
     :param enableRawLog: if upload raw data in content, default is False
 
     :type topicFormat: string
-    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\w+).log" will extract each file as topic, default is "none"
+    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\\w+).log" will extract each file as topic, default is "none"
 
     :type fileEncoding: string
     :param fileEncoding: "utf8" or "gbk" so far
@@ -539,7 +539,7 @@ class SeperatorFileConfigDetail(ConfigDetailBase):
     :param enableRawLog: if upload raw data in content, default is False
 
     :type topicFormat: string
-    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\w+).log" will extract each file as topic, default is "none"
+    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\\w+).log" will extract each file as topic, default is "none"
 
     :type fileEncoding: string
     :param fileEncoding: "utf8" or "gbk" so far
@@ -624,7 +624,7 @@ class SimpleFileConfigDetail(ConfigDetailBase):
     :param enableRawLog: if upload raw data in content, default is False
 
     :type topicFormat: string
-    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\w+).log" will extract each file as topic, default is "none"
+    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\\w+).log" will extract each file as topic, default is "none"
 
     :type fileEncoding: string
     :param fileEncoding: "utf8" or "gbk" so far
@@ -720,7 +720,7 @@ class FullRegFileConfigDetail(ConfigDetailBase):
     :param enableRawLog: if upload raw data in content, default is False
 
     :type topicFormat: string
-    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\w+).log" will extract each file as topic, default is "none"
+    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\\w+).log" will extract each file as topic, default is "none"
 
     :type fileEncoding: string
     :param fileEncoding: "utf8" or "gbk" so far
@@ -812,7 +812,7 @@ class JsonFileConfigDetail(ConfigDetailBase):
     :param enableRawLog: if upload raw data in content, default is False
 
     :type topicFormat: string
-    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\w+).log" will extract each file as topic, default is "none"
+    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\\w+).log" will extract each file as topic, default is "none"
 
     :type fileEncoding: string
     :param fileEncoding: "utf8" or "gbk" so far
@@ -898,7 +898,7 @@ class ApsaraFileConfigDetail(ConfigDetailBase):
     :param enableRawLog: if upload raw data in content, default is False
 
     :type topicFormat: string
-    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\w+).log" will extract each file as topic, default is "none"
+    :param topicFormat: "none", "group_topic" or regex to extract value from file path e.g. "/test/(\\w+).log" will extract each file as topic, default is "none"
 
     :type fileEncoding: string
     :param fileEncoding: "utf8" or "gbk" so far

{aliyun_log_python_sdk-0.9.42 → aliyun_log_python_sdk-0.9.45}/aliyun/log/version.py

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

{aliyun_log_python_sdk-0.9.42 → aliyun_log_python_sdk-0.9.45/aliyun_log_python_sdk.egg-info}/PKG-INFO

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