Skip to content

Commit c3558a5

Browse files
AndrewChubatiukAndrewChubatiuk
authored
Merge branch 'master' into vmalert-proxy
2 parents 3b1598e + 6cf542d commit c3558a5

File tree

768 files changed

+36171
-33786
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

768 files changed

+36171
-33786
lines changed

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@ name: build
33
on:
44
push:
55
branches:
6-
- cluster
76
- master
87
paths:
98
- '**.go'
10-
- '**/Dockerfile*' # The trailing * is for app/vmui/Dockerfile-*.
9+
- '**/Dockerfile'
1110
- '**/Makefile'
11+
- '!app/vmui/Makefile'
12+
- '.github/workflows/build.yml'
1213
pull_request:
1314
branches:
14-
- cluster
1515
- master
1616
paths:
1717
- '**.go'
18-
- '**/Dockerfile*' # The trailing * is for app/vmui/Dockerfile-*.
18+
- '**/Dockerfile'
1919
- '**/Makefile'
20+
- '!app/vmui/Makefile'
21+
- '.github/workflows/build.yml'
2022

2123
permissions:
2224
contents: read
@@ -31,7 +33,7 @@ jobs:
3133
runs-on: ubuntu-latest
3234
steps:
3335
- name: Code checkout
34-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3537

3638
- name: Setup Go
3739
id: go

‎.github/workflows/check-licenses.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Code checkout
18-
uses: actions/checkout@master
18+
uses: actions/checkout@v5
1919

2020
- name: Setup Go
2121
id: go

‎.github/workflows/codeql-analysis-go.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ name: 'CodeQL Go'
33
on:
44
push:
55
branches:
6-
- cluster
76
- master
87
paths:
98
- '**.go'
109
pull_request:
1110
branches:
12-
- cluster
1311
- master
1412
paths:
1513
- '**.go'
@@ -29,7 +27,7 @@ jobs:
2927

3028
steps:
3129
- name: Checkout repository
32-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3331

3432
- name: Set up Go
3533
id: go

‎.github/workflows/codeql-analysis-js-ts.yml‎

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎.github/workflows/docs.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Code checkout
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v5
2020
with:
2121
path: __vm
2222

2323
- name: Checkout private code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525
with:
2626
repository: VictoriaMetrics/vmdocs
2727
token: ${{ secrets.VM_BOT_GH_TOKEN }}
@@ -51,7 +51,7 @@ jobs:
5151
git config --global user.email "${{ steps.import-gpg.outputs.email }}"
5252
if [[ -n $(git status --porcelain) ]]; then
5353
git add .
54-
git commit -S -m "sync docs with VictoriaMetrics/VictoriaMetrics commit: ${{ steps.update.outputs.SHORT_SHA }}"
54+
git commit -S -m "sync docs with VictoriaMetrics/VictoriaLogs commit: ${{ steps.update.outputs.SHORT_SHA }}"
5555
git push
5656
fi
5757
working-directory: __vm-docs

‎.github/workflows/main.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ name: main
33
on:
44
push:
55
branches:
6-
- cluster
76
- master
87
paths:
98
- '**.go'
9+
- 'go.*'
10+
- '.github/workflows/main.yml'
1011
pull_request:
1112
branches:
12-
- cluster
1313
- master
1414
paths:
1515
- '**.go'
16+
- 'go.*'
17+
- '.github/workflows/main.yml'
1618

1719
permissions:
1820
contents: read
@@ -27,7 +29,7 @@ jobs:
2729
runs-on: ubuntu-latest
2830
steps:
2931
- name: Code checkout
30-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3133

3234
- name: Setup Go
3335
id: go
@@ -65,7 +67,7 @@ jobs:
6567

6668
steps:
6769
- name: Code checkout
68-
uses: actions/checkout@v4
70+
uses: actions/checkout@v5
6971

7072
- name: Setup Go
7173
id: go
@@ -99,7 +101,7 @@ jobs:
99101

100102
steps:
101103
- name: Code checkout
102-
uses: actions/checkout@v4
104+
uses: actions/checkout@v5
103105

104106
- name: Setup Go
105107
id: go

‎.github/workflows/vmui.yml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: vmui
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
paths:
8+
- 'app/vmui/packages/vmui/**'
9+
- '.github/workflows/vmui.yml'
10+
pull_request:
11+
branches:
12+
- master
13+
paths:
14+
- 'app/vmui/packages/vmui/**'
15+
- '.github/workflows/vmui.yml'
16+
17+
permissions:
18+
contents: read
19+
packages: read
20+
pull-requests: read
21+
checks: write
22+
23+
concurrency:
24+
cancel-in-progress: true
25+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
26+
27+
jobs:
28+
vmui-checks:
29+
name: VMUI Checks (lint, test, typecheck)
30+
runs-on: ubuntu-latest
31+
steps:
32+
- name: Code checkout
33+
uses: actions/checkout@v5
34+
35+
- name: Setup Node
36+
uses: actions/setup-node@v4
37+
with:
38+
node-version: '24.x'
39+
40+
- name: Cache node-modules
41+
uses: actions/cache@v4
42+
with:
43+
path: |
44+
app/vmui/packages/vmui/node_modules
45+
key: vmui-artifacts-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
46+
restore-keys: vmui-artifacts-${{ runner.os }}-
47+
48+
- name: Run lint
49+
id: lint
50+
run: make vmui-lint
51+
continue-on-error: true
52+
53+
- name: Run tests
54+
id: test
55+
run: make vmui-test
56+
continue-on-error: true
57+
58+
- name: Run typecheck
59+
id: typecheck
60+
run: make vmui-typecheck
61+
continue-on-error: true
62+
63+
- name: Annotate Code Linting Results
64+
uses: ataylorme/eslint-annotate-action@v3
65+
with:
66+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67+
report-json: app/vmui/packages/vmui/vmui-lint-report.json
68+
69+
- name: Check overall status
70+
run: |
71+
echo "Lint status: ${{ steps.lint.outcome }}"
72+
echo "Test status: ${{ steps.test.outcome }}"
73+
echo "Typecheck status: ${{ steps.typecheck.outcome }}"
74+
75+
if [[ "${{ steps.lint.outcome }}" == "failure" || "${{ steps.test.outcome }}" == "failure" || "${{ steps.typecheck.outcome }}" == "failure" ]]; then
76+
echo "One or more checks failed"
77+
exit 1
78+
else
79+
echo "All checks passed"
80+
fi

‎.golangci.yml‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
1-
run:
2-
timeout: 2m
3-
1+
version: "2"
42
linters:
5-
enable:
6-
- revive
7-
8-
issues:
9-
exclude-rules:
10-
- linters:
11-
- staticcheck
12-
text: "SA(4003|1019|5011):"
13-
include:
14-
- EXC0012
15-
- EXC0014
16-
17-
linters-settings:
18-
errcheck:
19-
exclude-functions:
20-
- "fmt.Fprintf"
21-
- "fmt.Fprint"
22-
- "(net/http.ResponseWriter).Write"
3+
settings:
4+
errcheck:
5+
exclude-functions:
6+
- fmt.Fprintf
7+
- fmt.Fprint
8+
- (net/http.ResponseWriter).Write
9+
exclusions:
10+
generated: lax
11+
presets:
12+
- common-false-positives
13+
- legacy
14+
- std-error-handling
15+
rules:
16+
- linters:
17+
- staticcheck
18+
text: '(SA(4003|1019|5011)|QF1001):'
19+
paths:
20+
- third_party$
21+
- builtin$
22+
- examples$
23+
formatters:
24+
exclusions:
25+
generated: lax
26+
paths:
27+
- third_party$
28+
- builtin$
29+
- examples$

‎Makefile‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ ifeq ($(PKG_TAG),)
1111
PKG_TAG := $(BUILDINFO_TAG)
1212
endif
1313

14-
GO_BUILDINFO = -X '$(PKG_PREFIX)/lib/buildinfo.Version=$(APP_NAME)-$(DATEINFO_TAG)-$(BUILDINFO_TAG)'
14+
GO_BUILDINFO = -X 'github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=$(APP_NAME)-$(DATEINFO_TAG)-$(BUILDINFO_TAG)'
1515
TAR_OWNERSHIP ?= --owner=1000 --group=1000
1616

17+
GOLANGCI_LINT_VERSION := 2.4.0
18+
1719
.PHONY: $(MAKECMDGOALS)
1820

1921
include app/*/Makefile
@@ -116,19 +118,14 @@ vlutils-crossbuild: \
116118
vlutils-openbsd-amd64 \
117119
vlutils-windows-amd64
118120

119-
publish-final-images:
120-
PKG_TAG=$(TAG) APP_NAME=victoria-logs $(MAKE) publish-via-docker-from-rc && \
121-
PKG_TAG=$(TAG) APP_NAME=vlagent $(MAKE) publish-via-docker-from-rc && \
122-
PKG_TAG=$(TAG) APP_NAME=vlogscli $(MAKE) publish-via-docker-from-rc && \
123-
PKG_TAG=$(TAG) $(MAKE) publish-latest
124-
125121
publish-latest:
126122
PKG_TAG=$(TAG) APP_NAME=victoria-logs $(MAKE) publish-via-docker-latest
127123
PKG_TAG=$(TAG) APP_NAME=vlogscli $(MAKE) publish-via-docker-latest
128124

129125
publish-release:
130126
rm -rf bin/*
131-
git checkout $(TAG) && $(MAKE) release && $(MAKE) publish
127+
git checkout $(TAG) && $(MAKE) release && $(MAKE) publish && \
128+
git checkout $(TAG)-enterprise && $(MAKE) release && $(MAKE) publish
132129

133130
release: \
134131
release-victoria-logs \
@@ -291,8 +288,12 @@ test-full:
291288
test-full-386:
292289
GOEXPERIMENT=synctest GOARCH=386 go test -coverprofile=coverage.txt -covermode=atomic ./lib/... ./app/...
293290

294-
integration-test: victoria-logs vlagent vlogscli
295-
go test ./apptest/... -skip="^TestCluster.*"
291+
integration-test:
292+
$(MAKE) apptest
293+
294+
apptest:
295+
$(MAKE) victoria-logs vlagent vlogscli
296+
go test ./apptest/...
296297

297298
benchmark:
298299
GOEXPERIMENT=synctest go test -bench=. ./lib/...
@@ -305,7 +306,7 @@ benchmark-pure:
305306
vendor-update:
306307
go get -u ./lib/...
307308
go get -u ./app/...
308-
go mod tidy -compat=1.24
309+
go mod tidy -compat=1.25
309310
go mod vendor
310311

311312
app-local:
@@ -330,7 +331,7 @@ golangci-lint: install-golangci-lint
330331
GOEXPERIMENT=synctest golangci-lint run
331332

332333
install-golangci-lint:
333-
which golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.64.7
334+
which golangci-lint && (golangci-lint --version | grep -q $(GOLANGCI_LINT_VERSION)) || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v$(GOLANGCI_LINT_VERSION)
334335

335336
remove-golangci-lint:
336337
rm -rf `which golangci-lint`

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ VictoriaLogs is a fast easy to use database for logs.
1414

1515
Here are some resources and information about VictoriaLogs:
1616

17+
- Playgrounds: [playground for the built-in web UI](https://play-vmlogs.victoriametrics.com/), [playground for Grafana plugin for VictoriaLogs](https://play-grafana.victoriametrics.com/d/be5zidev72m80f/k8s-logs-via-victorialogs)
1718
- [Documentation](https://docs.victoriametrics.com/victorialogs/)
1819
- Available: [Binary releases](https://github.com/VictoriaMetrics/VictoriaLogs/releases/latest), docker images [Docker Hub](https://hub.docker.com/r/victoriametrics/victoria-logs/) and [Quay](https://quay.io/repository/victoriametrics/victoria-logs), [Source code](https://github.com/VictoriaMetrics/VictoriaLogs)
1920
- Deployment types: [Single-node version](https://docs.victoriametrics.com/victorialogs/), [Cluster version](https://docs.victoriametrics.com/victorialogs/cluster/)

0 commit comments

Comments
 (0)