Merge remote-tracking branch 'duming/stage4' into pipelineConfig_proc…

…essors

# Conflicts:
#	core/config/UserLogConfigParser.cpp
#	core/event_handler/EventHandler.cpp
#	core/processor/ProcessorParseRegexNative.cpp
#	core/processor/ProcessorSplitLogStringNative.cpp
#	core/processor/ProcessorTagNative.cpp
#	core/reader/LogFileReader.cpp

CHANGELOG.md

@@ -38,9 +38,4 @@ your changes, such as:
 ## [Unreleased]
 
 - [public] [both] [added] add UsingOldContentTag. When UsingOldContentTag is set to false, the Tag is now placed in the Meta instead of Logs during cgo.
-- [public] [both] [fixed] fix send local buffer failed when upgrade iLogtail from version earlier than 1.3.
-- [public] [both] [updated] Updated strptime_ns to parse %c format from "%x %X" to "%a %b %d %H:%M:%S %Y" for consistent behavior with striptime.
-- [public] [both] [fixed] fix topic key does not support underscore.
-- [public] [both] [fixed] fix jmxfetch status error when exist multi jmxfetch config in the same machine.
-- [public] [both] [fixed] fix user container wss increase problem.
-- [public] [both] [fixed] fix cannot log blacklist config error
+

Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 .DEFAULT_GOAL := all
-VERSION ?= 1.8.0
+VERSION ?= 1.8.1
 DOCKER_PUSH ?= false
 DOCKER_REPOSITORY ?= aliyun/ilogtail
 BUILD_REPOSITORY ?= aliyun/ilogtail_build

changes/v1.8.0.md

@@ -54,7 +54,6 @@ All issues and pull requests are [here](https://github.com/alibaba/ilogtail/mile
 |  ----  | ----  | ----  | ----  |
 |[ilogtail-1.8.0.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.0/ilogtail-1.8.0.linux-amd64.tar.gz)|Linux|x86-64|[ilogtail-1.8.0.linux-amd64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.0/ilogtail-1.8.0.linux-amd64.tar.gz.sha256)|
 |[ilogtail-1.8.0.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.0/ilogtail-1.8.0.linux-arm64.tar.gz)|Linux|arm64|[ilogtail-1.8.0.linux-arm64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.0/ilogtail-1.8.0.linux-arm64.tar.gz.sha256)|
-|[ilogtail-1.8.0.windows-amd64.zip](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.0/ilogtail-1.8.0.windows-amd64.zip)|Windows|x86-64|[ilogtail-1.8.0.windows-amd64.zip.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.0/ilogtail-1.8.0.windows-amd64.zip.sha256)|
 
 ## Docker Image
 

changes/v1.8.1.md

@@ -0,0 +1,38 @@
+# 1.8.1
+
+## Changes
+
+All issues and pull requests are [here](https://github.com/alibaba/ilogtail/milestone/21).
+
+### Features
+
+
+### Fixed
+
+- [public] [both] [fixed] fix prometheus send wrong sls logs when reuse string memory
+- [public] [both] [fixed] fix dropping jvm metrics when collecting multiple skywalking instances's data
+- [public] [both] [fixed] fix elasticsearch flusher authentication tls config and http config
+- [public] [both] [fixed] fix profiling wrong type when the different profiling type having same stack. 
+- [public] [both] [fixed] fix send local buffer failed when upgrade iLogtail from version earlier than 1.3.
+- [public] [both] [fixed] change strptime_ns to parse %c format from "%x %X" to "%a %b %d %H:%M:%S %Y" for consistent behavior with striptime.
+- [public] [both] [fixed] fix topic key does not support underscore.
+- [public] [both] [fixed] fix jmxfetch status error when exist multi jmxfetch config in the same machine.
+- [public] [both] [fixed] fix increasing WSS memory issue in collected containers.
+- [public] [both] [fixed] fix cannot log blacklist config error
+
+### Doc
+
+
+## Download
+
+| **Filename** | **OS** | **Arch** | **SHA256 Checksum** |
+|  ----  | ----  | ----  | ----  |
+|[ilogtail-1.8.1.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.1/ilogtail-1.8.1.linux-amd64.tar.gz)|Linux|x86-64|[ilogtail-1.8.1.linux-amd64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.1/ilogtail-1.8.1.linux-amd64.tar.gz.sha256)|
+|[ilogtail-1.8.1.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.1/ilogtail-1.8.1.linux-arm64.tar.gz)|Linux|arm64|[ilogtail-1.8.1.linux-arm64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/1.8.1/ilogtail-1.8.1.linux-arm64.tar.gz.sha256)|
+
+## Docker Image
+
+**Docker Pull Command**
+``` bash
+docker pull sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail:1.8.1
+```

core/CMakeLists.txt

@@ -23,7 +23,7 @@ option(WITHOUTGDB "Build Logtail without gdb" OFF)
 
 # Name/Version information.
 if (NOT DEFINED LOGTAIL_VERSION)
-    set(LOGTAIL_VERSION "1.8.0")
+    set(LOGTAIL_VERSION "1.8.1")
 endif ()
 message(STATUS "Version: ${LOGTAIL_VERSION}")
 

core/aggregator/Aggregator.cpp

@@ -31,6 +31,9 @@
 using namespace std;
 using namespace sls_logs;
 
+DEFINE_FLAG_BOOL(default_secondary_storage, "default strategy whether enable secondary storage", false);
+DEFINE_FLAG_INT32(batch_send_metric_size, "batch send metric size limit(bytes)(default 256KB)", 256 * 1024);
+
 DECLARE_FLAG_INT32(merge_log_count_limit);
 DECLARE_FLAG_INT32(same_topic_merge_send_count);
 DECLARE_FLAG_INT32(max_send_log_group_size);