From 89c4dc1d8d9417e94f1b4182e13a3e20fb9491a0 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sun, 12 May 2024 16:38:01 +0200 Subject: [PATCH 1/5] docs/VictoriaLogs/CHANGELOG.md: cut v0.6.0-victorialogs --- docs/VictoriaLogs/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/VictoriaLogs/CHANGELOG.md b/docs/VictoriaLogs/CHANGELOG.md index da407a1df..1318af4a3 100644 --- a/docs/VictoriaLogs/CHANGELOG.md +++ b/docs/VictoriaLogs/CHANGELOG.md @@ -19,6 +19,10 @@ according to [these docs](https://docs.victoriametrics.com/VictoriaLogs/QuickSta ## tip +## [v0.6.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v0.6.0-victorialogs) + +Released at 2024-05-12 + * FEATURE: return all the log fields by default in query results. Previously only [`_stream`](https://docs.victoriametrics.com/victorialogs/keyconcepts/#stream-fields), [`_time`](https://docs.victoriametrics.com/victorialogs/keyconcepts/#time-field) and [`_msg`](https://docs.victoriametrics.com/victorialogs/keyconcepts/#message-field) fields were returned by default. * FEATURE: add support for returning only the requested log [fields](https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model). See [these docs](https://docs.victoriametrics.com/victorialogs/logsql/#fields-pipe). * FEATURE: add support for calculating various stats over [log fields](https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model). Grouping by arbitrary set of [log fields](https://docs.victoriametrics.com/victorialogs/keyconcepts/#data-model) is supported. See [these docs](https://docs.victoriametrics.com/victorialogs/logsql/#stats-pipe) for details. From 8466ab109c1d4da2f1924dd626c3be0e2969ec95 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sun, 12 May 2024 16:45:24 +0200 Subject: [PATCH 2/5] docs/VictoriaLogs/LogsQL.md: cross-reference uniq pipe with uniq_values stats function --- docs/VictoriaLogs/LogsQL.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/VictoriaLogs/LogsQL.md b/docs/VictoriaLogs/LogsQL.md index 7faa4d0c3..05ee16bb9 100644 --- a/docs/VictoriaLogs/LogsQL.md +++ b/docs/VictoriaLogs/LogsQL.md @@ -1232,6 +1232,10 @@ This allows limiting memory usage. For example, the following query returns up t _time:5m | uniq by (host, path) limit 100 ``` +See also: + +- [`uniq_values` stats function](#uniq_values-stats) + ### stats pipe `| stats ...` pipe allows calculating various stats over the selected logs. For example, the following LogsQL query @@ -1553,6 +1557,7 @@ _time:5m | stats uniq_values(ip) limit 100 as unique_ips_100 See also: +- [`uniq` pipe](#uniq-pipe) - [`values`](#values-stats) - [`count_uniq`](#count_uniq-stats) - [`count`](#count-stats) From cb19335a9faf33865b71fac792254b8169005291 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sun, 12 May 2024 22:23:28 +0200 Subject: [PATCH 3/5] deployment/docker/Makefile: rename EXTRA_ENVS to EXTRA_DOCKER_ENVS The purpose of EXTRA_DOCKER_ENVS name is more clear than EXTRA_ENVS. While at it, make the following small fixes: - Pass GOARM=5 to Docker builder when building Docker packages for GOARCH=arm in the same way it is passed to the builder when building production binaries for GOARCH=arm. See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4965 - Set GCO_ENABLED=1 for package-via-docker-amd64, which has been accidentally removed in 07496d7d922ed36e6f71e41ff129bfa48d8812b4 - Consistently use 'CGO_ENABLED=... GOARCH=...' order of env vars at package-via-docker-*, because this order is used in app-via-docker-* Updates https://github.com/VictoriaMetrics/VictoriaMetrics/pull/6158 Updates https://github.com/VictoriaMetrics/VictoriaMetrics/pull/6172 This is a follow-up for 07496d7d922ed36e6f71e41ff129bfa48d8812b4 and 7958f3886467aef1a386e3111136f1d3c59f7149 --- deployment/docker/Makefile | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index 929166cd3..cbef2582c 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -102,22 +102,22 @@ run-via-docker: package-via-docker app-via-docker-goos-goarch: APP_SUFFIX='-$(GOOS)-$(GOARCH)' \ - DOCKER_OPTS='--env CGO_ENABLED=$(CGO_ENABLED) --env GOOS=$(GOOS) --env GOARCH=$(GOARCH) $(foreach v,$(EXTRA_ENVS),--env $(v))' \ + DOCKER_OPTS='--env CGO_ENABLED=$(CGO_ENABLED) --env GOOS=$(GOOS) --env GOARCH=$(GOARCH) $(foreach v,$(EXTRA_DOCKER_ENVS),--env $(v))' \ $(MAKE) app-via-docker app-via-docker-pure: APP_SUFFIX='-pure' DOCKER_OPTS='--env CGO_ENABLED=0' $(MAKE) app-via-docker app-via-docker-linux-amd64: - EXTRA_ENVS='CC=/opt/cross-builder/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc' \ + EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc' \ CGO_ENABLED=1 GOOS=linux GOARCH=amd64 $(MAKE) app-via-docker-goos-goarch app-via-docker-linux-arm: - EXTRA_ENVS='GOARM=5' \ + EXTRA_DOCKER_ENVS='GOARM=5' \ CGO_ENABLED=0 GOOS=linux GOARCH=arm $(MAKE) app-via-docker-goos-goarch app-via-docker-linux-arm64: - EXTRA_ENVS='CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc' \ + EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc' \ CGO_ENABLED=1 GOOS=linux GOARCH=arm64 $(MAKE) app-via-docker-goos-goarch app-via-docker-linux-ppc64le: @@ -145,28 +145,29 @@ app-via-docker-windows-amd64: package-via-docker-goarch: APP_SUFFIX='-$(GOARCH)' \ - DOCKER_OPTS='--env CGO_ENABLED=$(CGO_ENABLED) --env GOOS=linux --env GOARCH=$(GOARCH) $(foreach v,$(EXTRA_ENVS),--env $(v))' \ + DOCKER_OPTS='--env CGO_ENABLED=$(CGO_ENABLED) --env GOOS=linux --env GOARCH=$(GOARCH) $(foreach v,$(EXTRA_DOCKER_ENVS),--env $(v))' \ $(MAKE) package-via-docker package-via-docker-pure: APP_SUFFIX='-pure' DOCKER_OPTS='--env CGO_ENABLED=0' $(MAKE) package-via-docker package-via-docker-amd64: - EXTRA_ENVS='CC=/opt/cross-builder/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc' \ - GOARCH=amd64 GOARCH=amd64 $(MAKE) package-via-docker-goarch + EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc' \ + CO_ENABLED=1 GOARCH=amd64 $(MAKE) package-via-docker-goarch package-via-docker-arm: - GOARCH=arm CGO_ENABLED=0 $(MAKE) package-via-docker-goarch + EXTRA_DOCKER_ENVS='GOARM=5' \ + CGO_ENABLED=0 GOARCH=arm $(MAKE) package-via-docker-goarch package-via-docker-arm64: - EXTRA_ENVS='CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc' \ + EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc' \ CGO_ENABLED=1 GOARCH=arm64 $(MAKE) package-via-docker-goarch package-via-docker-ppc64le: - GOARCH=ppc64le CGO_ENABLED=0 $(MAKE) package-via-docker-goarch + CGO_ENABLED=0 GOARCH=ppc64le $(MAKE) package-via-docker-goarch package-via-docker-386: - GOARCH=386 CGO_ENABLED=0 $(MAKE) package-via-docker-goarch + CGO_ENABLED=0 GOARCH=386 $(MAKE) package-via-docker-goarch remove-docker-images: docker image ls --format '{{.ID}}' | xargs docker image rm -f From bd75c0a898ff8e3daefb067ed828dd5f85f6f492 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sun, 12 May 2024 23:09:55 +0200 Subject: [PATCH 4/5] deployment/docker/Makefile: group app-via-docker-* and package-via-docker-* rules with CGO_ENABLED=1 together for better maintainability --- deployment/docker/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index cbef2582c..c7f1d18c9 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -112,14 +112,14 @@ app-via-docker-linux-amd64: EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc' \ CGO_ENABLED=1 GOOS=linux GOARCH=amd64 $(MAKE) app-via-docker-goos-goarch -app-via-docker-linux-arm: - EXTRA_DOCKER_ENVS='GOARM=5' \ - CGO_ENABLED=0 GOOS=linux GOARCH=arm $(MAKE) app-via-docker-goos-goarch - app-via-docker-linux-arm64: EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc' \ CGO_ENABLED=1 GOOS=linux GOARCH=arm64 $(MAKE) app-via-docker-goos-goarch +app-via-docker-linux-arm: + EXTRA_DOCKER_ENVS='GOARM=5' \ + CGO_ENABLED=0 GOOS=linux GOARCH=arm $(MAKE) app-via-docker-goos-goarch + app-via-docker-linux-ppc64le: CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le $(MAKE) app-via-docker-goos-goarch @@ -155,14 +155,14 @@ package-via-docker-amd64: EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc' \ CO_ENABLED=1 GOARCH=amd64 $(MAKE) package-via-docker-goarch -package-via-docker-arm: - EXTRA_DOCKER_ENVS='GOARM=5' \ - CGO_ENABLED=0 GOARCH=arm $(MAKE) package-via-docker-goarch - package-via-docker-arm64: EXTRA_DOCKER_ENVS='CC=/opt/cross-builder/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc' \ CGO_ENABLED=1 GOARCH=arm64 $(MAKE) package-via-docker-goarch +package-via-docker-arm: + EXTRA_DOCKER_ENVS='GOARM=5' \ + CGO_ENABLED=0 GOARCH=arm $(MAKE) package-via-docker-goarch + package-via-docker-ppc64le: CGO_ENABLED=0 GOARCH=ppc64le $(MAKE) package-via-docker-goarch From de9868848980197f1214d74d9569bc7f0d31b2dc Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sun, 12 May 2024 23:22:47 +0200 Subject: [PATCH 5/5] deployment: update VictoriaLogs Docker image from v0.5.2-victorialogs to v0.6.0-victorialogs See https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v0.6.0-victorialogs --- deployment/docker/docker-compose-victorialogs.yml | 2 +- .../docker/victorialogs/filebeat-docker/docker-compose.yml | 2 +- .../docker/victorialogs/filebeat-syslog/docker-compose.yml | 2 +- .../docker/victorialogs/fluentbit-docker/docker-compose.yml | 2 +- deployment/docker/victorialogs/logstash/docker-compose.yml | 2 +- deployment/docker/victorialogs/promtail/docker-compose.yml | 2 +- .../docker/victorialogs/vector-docker/docker-compose.yml | 2 +- deployment/logs-benchmark/docker-compose.yml | 2 +- docs/VictoriaLogs/QuickStart.md | 6 +++--- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deployment/docker/docker-compose-victorialogs.yml b/deployment/docker/docker-compose-victorialogs.yml index 4dcebb7d6..bf249056b 100644 --- a/deployment/docker/docker-compose-victorialogs.yml +++ b/deployment/docker/docker-compose-victorialogs.yml @@ -43,7 +43,7 @@ services: # storing logs and serving read queries. victorialogs: container_name: victorialogs - image: docker.io/victoriametrics/victoria-logs:v0.5.2-victorialogs + image: docker.io/victoriametrics/victoria-logs:v0.6.0-victorialogs command: - "--storageDataPath=/vlogs" - "--httpListenAddr=:9428" diff --git a/deployment/docker/victorialogs/filebeat-docker/docker-compose.yml b/deployment/docker/victorialogs/filebeat-docker/docker-compose.yml index 57b9d8e0c..ef6950b7e 100644 --- a/deployment/docker/victorialogs/filebeat-docker/docker-compose.yml +++ b/deployment/docker/victorialogs/filebeat-docker/docker-compose.yml @@ -22,7 +22,7 @@ services: - -beat.uri=http://filebeat-victorialogs:5066 victorialogs: - image: docker.io/victoriametrics/victoria-logs:v0.5.2-victorialogs + image: docker.io/victoriametrics/victoria-logs:v0.6.0-victorialogs volumes: - victorialogs-filebeat-docker-vl:/vlogs ports: diff --git a/deployment/docker/victorialogs/filebeat-syslog/docker-compose.yml b/deployment/docker/victorialogs/filebeat-syslog/docker-compose.yml index 66fee9c63..a3ac64f34 100644 --- a/deployment/docker/victorialogs/filebeat-syslog/docker-compose.yml +++ b/deployment/docker/victorialogs/filebeat-syslog/docker-compose.yml @@ -13,7 +13,7 @@ services: - "5140:5140" victorialogs: - image: docker.io/victoriametrics/victoria-logs:v0.5.2-victorialogs + image: docker.io/victoriametrics/victoria-logs:v0.6.0-victorialogs volumes: - victorialogs-filebeat-syslog-vl:/vlogs ports: diff --git a/deployment/docker/victorialogs/fluentbit-docker/docker-compose.yml b/deployment/docker/victorialogs/fluentbit-docker/docker-compose.yml index 343aa3d10..2336ceca7 100644 --- a/deployment/docker/victorialogs/fluentbit-docker/docker-compose.yml +++ b/deployment/docker/victorialogs/fluentbit-docker/docker-compose.yml @@ -11,7 +11,7 @@ services: - "5140:5140" victorialogs: - image: docker.io/victoriametrics/victoria-logs:v0.5.2-victorialogs + image: docker.io/victoriametrics/victoria-logs:v0.6.0-victorialogs volumes: - victorialogs-fluentbit-vl:/vlogs ports: diff --git a/deployment/docker/victorialogs/logstash/docker-compose.yml b/deployment/docker/victorialogs/logstash/docker-compose.yml index 6138c65ac..f8c3c9af0 100644 --- a/deployment/docker/victorialogs/logstash/docker-compose.yml +++ b/deployment/docker/victorialogs/logstash/docker-compose.yml @@ -14,7 +14,7 @@ services: - "5140:5140" victorialogs: - image: docker.io/victoriametrics/victoria-logs:v0.5.2-victorialogs + image: docker.io/victoriametrics/victoria-logs:v0.6.0-victorialogs volumes: - victorialogs-logstash-vl:/vlogs ports: diff --git a/deployment/docker/victorialogs/promtail/docker-compose.yml b/deployment/docker/victorialogs/promtail/docker-compose.yml index f29a157ed..377fad395 100644 --- a/deployment/docker/victorialogs/promtail/docker-compose.yml +++ b/deployment/docker/victorialogs/promtail/docker-compose.yml @@ -12,7 +12,7 @@ services: - "5140:5140" vlogs: - image: docker.io/victoriametrics/victoria-logs:v0.5.2-victorialogs + image: docker.io/victoriametrics/victoria-logs:v0.6.0-victorialogs volumes: - victorialogs-promtail-docker:/vlogs ports: diff --git a/deployment/docker/victorialogs/vector-docker/docker-compose.yml b/deployment/docker/victorialogs/vector-docker/docker-compose.yml index 366a942d0..ef2034584 100644 --- a/deployment/docker/victorialogs/vector-docker/docker-compose.yml +++ b/deployment/docker/victorialogs/vector-docker/docker-compose.yml @@ -22,7 +22,7 @@ services: condition: service_healthy victorialogs: - image: docker.io/victoriametrics/victoria-logs:v0.5.2-victorialogs + image: docker.io/victoriametrics/victoria-logs:v0.6.0-victorialogs volumes: - victorialogs-vector-docker-vl:/vlogs ports: diff --git a/deployment/logs-benchmark/docker-compose.yml b/deployment/logs-benchmark/docker-compose.yml index ebb781957..1cd90bfbf 100644 --- a/deployment/logs-benchmark/docker-compose.yml +++ b/deployment/logs-benchmark/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: # Run `make package-victoria-logs` to build victoria-logs image vlogs: - image: docker.io/victoriametrics/victoria-logs:v0.5.2-victorialogs + image: docker.io/victoriametrics/victoria-logs:v0.6.0-victorialogs volumes: - vlogs:/vlogs ports: diff --git a/docs/VictoriaLogs/QuickStart.md b/docs/VictoriaLogs/QuickStart.md index 495e75689..503f0da7e 100644 --- a/docs/VictoriaLogs/QuickStart.md +++ b/docs/VictoriaLogs/QuickStart.md @@ -34,8 +34,8 @@ Just download archive for the needed Operating system and architecture, unpack i For example, the following commands download VictoriaLogs archive for Linux/amd64, unpack and run it: ```sh -curl -L -O https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v0.5.2-victorialogs/victoria-logs-linux-amd64-v0.5.2-victorialogs.tar.gz -tar xzf victoria-logs-linux-amd64-v0.5.2-victorialogs.tar.gz +curl -L -O https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v0.6.0-victorialogs/victoria-logs-linux-amd64-v0.6.0-victorialogs.tar.gz +tar xzf victoria-logs-linux-amd64-v0.6.0-victorialogs.tar.gz ./victoria-logs-prod ``` @@ -59,7 +59,7 @@ Here is the command to run VictoriaLogs in a Docker container: ```sh docker run --rm -it -p 9428:9428 -v ./victoria-logs-data:/victoria-logs-data \ - docker.io/victoriametrics/victoria-logs:v0.5.2-victorialogs + docker.io/victoriametrics/victoria-logs:v0.6.0-victorialogs ``` See also: