diff --git a/Makefile b/Makefile index 8d7f3d944f..56361afc9e 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ # limitations under the License. .DEFAULT_GOAL := all -VERSION ?= 2.0.0 +VERSION ?= 2.0.4 DOCKER_PUSH ?= false DOCKER_REPOSITORY ?= aliyun/ilogtail BUILD_REPOSITORY ?= aliyun/ilogtail_build diff --git a/changes/v2.0.4.md b/changes/v2.0.4.md new file mode 100644 index 0000000000..c52ab0a718 --- /dev/null +++ b/changes/v2.0.4.md @@ -0,0 +1,51 @@ +# 2.0.4 + +## Changes + +All issues and pull requests are [here](https://github.com/alibaba/ilogtail/milestone/23). + +### Features + +- [public] [both] [added] Improve sender log condition to record valuable debug info (#1359) +- [public] [both] [added] wait for read flush timeout instead of flushing last line immediately on file deletion (#1418) +- [public] [both] [added] refactor logic of last matched line (#1426) +- [public] [both] [added] test: add a case to test timeformat without year (#1432) +- [public] [both] [added] Update chatgroup image (#1445) +- [public] [both] [added] refactory: enable move for SourceBuffer (#1457) +- [public] [both] [added] summer-ospp-2024 (#1461) +- [public] [both] [added] default enable spl (#1475) +- [public] [both] [added] allow empty endpoint in enterprise flusher_sls to avoid unsuccessful load of config (#1486) + +### Fixed + +- [public] [both] [fixed] fix dockershim cause containerd invalid (#1424) +- [public] [both] [fixed] fix: correct pipeline version recognition issue (#1427) +- [public] [both] [fixed] fix: refactor multiline split state (#1410) +- [public] [both] [fixed] fix: update base image to resolve 'Illegal instruction' error on old CPUs (#1429) +- [public] [both] [fixed] ensure config name in golang config and ctx matching C++ config name (#1437) +- [public] [both] [fixed] fix missing user agent info (#1444) +- [public] [both] [fixed] fix plugin alarm with default version (#1443) +- [public] [both] [fixed] fix: make LOGTAIL_LOG_LEVEL env variable effective for ilogtail.LOG (#1440) +- [public] [both] [fixed] Fix parameter errors for container metadata preview. (#1430) +- [public] [both] [fixed] fix: Ensure alarms raised during collection for profile projects are reported (#1455) +- [public] [both] [fixed] fix missing uuid and incorrect instance id (#1476) + + +### Doc + +- [public] [both] [doc] document: fix document for flusher pulsar (#1460) + +## Download + +| **Filename** | **OS** | **Arch** | **SHA256 Checksum** | +| ---- | ---- | ---- | ---- | +|[ilogtail-2.0.4.linux-amd64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.4/ilogtail-2.0.4.linux-amd64.tar.gz)|Linux|x86-64|[ilogtail-2.0.4.linux-amd64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.4/ilogtail-2.0.4.linux-amd64.tar.gz.sha256)| +|[ilogtail-2.0.4.linux-arm64.tar.gz](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.4/ilogtail-2.0.4.linux-arm64.tar.gz)|Linux|arm64|[ilogtail-2.0.4.linux-arm64.tar.gz.sha256](https://ilogtail-community-edition.oss-cn-shanghai.aliyuncs.com/2.0.4/ilogtail-2.0.4.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:2.0.4 +``` \ No newline at end of file diff --git a/core/options.cmake b/core/options.cmake index f82172f8bf..a7e97d19e6 100644 --- a/core/options.cmake +++ b/core/options.cmake @@ -14,7 +14,7 @@ # Name/Version information. if (NOT DEFINED LOGTAIL_VERSION) - set(LOGTAIL_VERSION "2.0.0") + set(LOGTAIL_VERSION "2.0.4") endif () message(STATUS "Version: ${LOGTAIL_VERSION}") diff --git a/docker/Dockerfile_build b/docker/Dockerfile_build index 1767a67ae3..3835653c2c 100644 --- a/docker/Dockerfile_build +++ b/docker/Dockerfile_build @@ -19,7 +19,7 @@ WORKDIR /src COPY . . ARG HOST_OS=Linux -ARG VERSION=2.0.0 +ARG VERSION=2.0.4 USER root diff --git a/docker/Dockerfile_development_part b/docker/Dockerfile_development_part index a6808c68a0..e25dd418ac 100644 --- a/docker/Dockerfile_development_part +++ b/docker/Dockerfile_development_part @@ -15,7 +15,7 @@ FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:2.0.1 ARG HOST_OS=Linux -ARG VERSION=2.0.0 +ARG VERSION=2.0.4 USER root WORKDIR /ilogtail diff --git a/docker/Dockerfile_e2e b/docker/Dockerfile_e2e index 8ac012d89e..125ca946aa 100644 --- a/docker/Dockerfile_e2e +++ b/docker/Dockerfile_e2e @@ -15,7 +15,7 @@ FROM sls-opensource-registry.cn-shanghai.cr.aliyuncs.com/ilogtail-community-edition/ilogtail-build-linux:gcc_9.3.1-2 ARG HOST_OS=Linux -ARG VERSION=2.0.0 +ARG VERSION=2.0.4 USER root WORKDIR /ilogtail diff --git a/docker/Dockerfile_production b/docker/Dockerfile_production index 92be76506c..52cca96a87 100644 --- a/docker/Dockerfile_production +++ b/docker/Dockerfile_production @@ -13,7 +13,7 @@ # limitations under the License. FROM --platform=$TARGETPLATFORM centos:centos7.9.2009 as build -ARG VERSION=2.0.0 +ARG VERSION=2.0.4 ARG TARGETPLATFORM WORKDIR /usr/local COPY dist/ilogtail-${VERSION}.linux-*.tar.gz . @@ -28,7 +28,7 @@ ENV container docker RUN yum update -y && yum upgrade -y && yum -y clean all && rm -fr /var/cache && rm -rf /core.* ARG HOST_OS=Linux -ARG VERSION=2.0.0 +ARG VERSION=2.0.4 ARG TARGETPLATFORM COPY --from=build /usr/local/ilogtail-${VERSION} /usr/local/ilogtail diff --git a/docker/Dockerfile_production_minimal b/docker/Dockerfile_production_minimal index 09a6c1fa6d..a31c1ec665 100644 --- a/docker/Dockerfile_production_minimal +++ b/docker/Dockerfile_production_minimal @@ -13,7 +13,7 @@ # limitations under the License. FROM --platform=$TARGETPLATFORM debian:bookworm as build -ARG VERSION=2.0.0 +ARG VERSION=2.0.4 ARG TARGETPLATFORM ARG UID=65532 WORKDIR /usr/local @@ -30,7 +30,7 @@ LABEL org.opencontainers.image.authors="yyuuttaaoo@gmail.com, jiangdeyan@gmail.c COPY --from=build /usr/lib/x86_64-linux-gnu/libuuid.so.1.3.0 /lib/x86_64-linux-gnu/libuuid.so.1 ARG HOST_OS=Linux -ARG VERSION=2.0.0 +ARG VERSION=2.0.4 ARG TARGETPLATFORM COPY --from=build --chown=$UID:$UID /usr/local/ilogtail /usr/local/ilogtail diff --git a/docs/en/guides/How-to-build-with-docker.md b/docs/en/guides/How-to-build-with-docker.md index e3d03d7723..440b792aec 100644 --- a/docs/en/guides/How-to-build-with-docker.md +++ b/docs/en/guides/How-to-build-with-docker.md @@ -17,13 +17,13 @@ make solib ### Build image - The default {DOCKER_REPOSITORY} is `aliyun/ilogtail`. - - The default {VERSION} is `2.0.0`. + - The default {VERSION} is `2.0.4`. - The default {DOCKER_PUSH} is `false`. When the option is configured as true, the built images would also be pushed to the {DOCKER_REPOSITORY} with {VERSION} tag. ```shell DOCKER_PUSH={DOCKER_PUSH} DOCKER_REPOSITORY={DOCKER_REPOSITORY} VERSION={VERSION} make wholedocker ``` - So when you exec `make wholedocker` command, the built image named as `aliyun/ilogtail:2.0.0` would be stored in local repository. + So when you exec `make wholedocker` command, the built image named as `aliyun/ilogtail:2.0.4` would be stored in local repository. ## Build Pure Go image @@ -32,10 +32,10 @@ If the features that you want to use only in Go part, such as collecting stdout ### Build image - The default {DOCKER_REPOSITORY} is `aliyun/ilogtail`. - - The default {VERSION} is `2.0.0`. + - The default {VERSION} is `2.0.4`. - The default {DOCKER_PUSH} is `false`. When the option is configured as true, the built images would also be pushed to the {DOCKER_REPOSITORY} with {VERSION} tag. ```shell DOCKER_PUSH={DOCKER_PUSH} DOCKER_REPOSITORY={DOCKER_REPOSITORY} VERSION={VERSION} make docker ``` -So when you exec `make docker` command, the built image named as `aliyun/ilogtail:2.0.0` would be stored in local repository. +So when you exec `make docker` command, the built image named as `aliyun/ilogtail:2.0.4` would be stored in local repository. diff --git a/docs/en/guides/How-to-do-manual-test.md b/docs/en/guides/How-to-do-manual-test.md index 508601489b..68e431f2de 100644 --- a/docs/en/guides/How-to-do-manual-test.md +++ b/docs/en/guides/How-to-do-manual-test.md @@ -114,8 +114,8 @@ program written by yourself. ### Run [Logtail AlibabaCloud](https://help.aliyun.com/document_detail/28979.html) on container 1. Run `make docker` to compile [Logtail AlibabaCloud](https://help.aliyun.com/document_detail/28979.html) docker - images named `aliyun/ilogtail:2.0.0`. -2. Rename `aliyun/ilogtail:2.0.0` to a custom name and push to the remotes, such - as `registry.cn-beijing.aliyuncs.com/aliyun/ilogtail:2.0.0`. + images named `aliyun/ilogtail:2.0.4`. +2. Rename `aliyun/ilogtail:2.0.4` to a custom name and push to the remotes, such + as `registry.cn-beijing.aliyuncs.com/aliyun/ilogtail:2.0.4`. 3. Replace the mirror of `logtail-ds` of [ACK](https://www.aliyun.com/product/list/alibabacloudnative) or your self platform and restart. diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh index 6950f956cb..9c1cac6f2c 100755 --- a/scripts/docker_build.sh +++ b/scripts/docker_build.sh @@ -56,7 +56,7 @@ function check_docker_buildkit_support { ARCH=$(arch) CATEGORY=$1 GENERATED_HOME=$2 -VERSION=${3:-2.0.0} +VERSION=${3:-2.0.4} REPOSITORY=${4:-aliyun/ilogtail} PUSH=${5:-false} USE_DOCKER_BUILDKIT=${6:-${DOCKER_BUILD_USE_BUILDKIT:-$(check_docker_buildkit_support)}} diff --git a/scripts/gen_build_scripts.sh b/scripts/gen_build_scripts.sh index 33dfe2e92e..5377a75f6d 100755 --- a/scripts/gen_build_scripts.sh +++ b/scripts/gen_build_scripts.sh @@ -24,7 +24,7 @@ set -o pipefail # e2e: Build plugin dynamic lib with GOC and build the CPP part. CATEGORY=$1 GENERATED_HOME=$2 -VERSION=${3:-2.0.0} +VERSION=${3:-2.0.4} REPOSITORY=${4:-aliyun/ilogtail} OUT_DIR=${5:-output} EXPORT_GO_ENVS=${6:-${DOCKER_BUILD_EXPORT_GO_ENVS:-true}} diff --git a/scripts/plugin_build.sh b/scripts/plugin_build.sh index 088acd2986..61f03a14d9 100755 --- a/scripts/plugin_build.sh +++ b/scripts/plugin_build.sh @@ -27,7 +27,7 @@ function os() { MOD=${1:-mod} BUILDMODE=${2:-default} OUT_DIR=${3:-output} -VERSION=${4:-2.0.0} +VERSION=${4:-2.0.4} PLUGINS_CONFIG_FILE=${5:-${PLUGINS_CONFIG_FILE:-plugins.yml,external_plugins.yml}} GO_MOD_FILE=${6:-${GO_MOD_FILE:-go.mod}} NAME=ilogtail diff --git a/scripts/windows32_build.bat b/scripts/windows32_build.bat index cf240bd253..e53127afe4 100644 --- a/scripts/windows32_build.bat +++ b/scripts/windows32_build.bat @@ -6,7 +6,7 @@ REM 2. Build iLogtail. REM 3. Build iLogtail plugin. REM 4. Make package. -set ILOGTAIL_VERSION=2.0.0 +set ILOGTAIL_VERSION=2.0.4 if not "%1" == "" set ILOGTAIL_VERSION=%1 set CurrentPath=%~dp0 set P1Path= diff --git a/scripts/windows64_build.bat b/scripts/windows64_build.bat index e6bbd64c87..21327025be 100644 --- a/scripts/windows64_build.bat +++ b/scripts/windows64_build.bat @@ -6,7 +6,7 @@ REM 2. Build iLogtail. REM 3. Build iLogtail plugin. REM 4. Make package. -set ILOGTAIL_VERSION=2.0.0 +set ILOGTAIL_VERSION=2.0.4 if not "%1" == "" set ILOGTAIL_VERSION=%1 set CurrentPath=%~dp0 set P1Path= diff --git a/scripts/windows64_dist.bat b/scripts/windows64_dist.bat index 791347c7f7..368ce0671a 100644 --- a/scripts/windows64_dist.bat +++ b/scripts/windows64_dist.bat @@ -5,7 +5,7 @@ REM 1. Set environments. REM 2. Copy output to dist package dir. REM 3. Pack dir to zip archive. -set ILOGTAIL_VERSION=2.0.0 +set ILOGTAIL_VERSION=2.0.4 if not "%1" == "" set ILOGTAIL_VERSION=%1 set CurrentPath=%~dp0 set P1Path= diff --git a/test/engine/boot/compose.go b/test/engine/boot/compose.go index 9d7c06e863..05b1f59f4a 100644 --- a/test/engine/boot/compose.go +++ b/test/engine/boot/compose.go @@ -55,7 +55,7 @@ services: interval: 1s retries: 10 ilogtailC: - image: aliyun/ilogtail:2.0.0 + image: aliyun/ilogtail:2.0.4 hostname: ilogtail privileged: true pid: host