Skip to content

Commit 33c8e82

Browse files
owen-dowen-d
committed
Merge remote-tracking branch 'upstream/main' into blooms/compute-chunks-once
Signed-off-by: Owen Diehl <[email protected]>
2 parents 56eabcc + 282e385 commit 33c8e82

File tree

531 files changed

+52260
-1196
lines changed

Some content is hidden

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

531 files changed

+52260
-1196
lines changed

‎.drone/drone.jsonnet

+1-1
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {
376376
],
377377
};
378378

379-
local build_image_tag = '0.33.1';
379+
local build_image_tag = '0.33.2';
380380
[
381381
pipeline('loki-build-image-' + arch) {
382382
workspace: {

‎.drone/drone.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ steps:
1717
from_secret: docker_password
1818
repo: grafana/loki-build-image
1919
tags:
20-
- 0.33.1-amd64
20+
- 0.33.2-amd64
2121
username:
2222
from_secret: docker_username
2323
when:
@@ -54,7 +54,7 @@ steps:
5454
from_secret: docker_password
5555
repo: grafana/loki-build-image
5656
tags:
57-
- 0.33.1-arm64
57+
- 0.33.2-arm64
5858
username:
5959
from_secret: docker_username
6060
when:
@@ -86,7 +86,7 @@ steps:
8686
password:
8787
from_secret: docker_password
8888
spec: .drone/docker-manifest-build-image.tmpl
89-
target: loki-build-image:0.33.1
89+
target: loki-build-image:0.33.2
9090
username:
9191
from_secret: docker_username
9292
when:
@@ -139,7 +139,7 @@ steps:
139139
depends_on:
140140
- clone
141141
environment: {}
142-
image: grafana/loki-build-image:0.33.1
142+
image: grafana/loki-build-image:0.33.2
143143
name: documentation-helm-reference-check
144144
trigger:
145145
ref:
@@ -1085,7 +1085,7 @@ steps:
10851085
from_secret: docker_password
10861086
DOCKER_USERNAME:
10871087
from_secret: docker_username
1088-
image: grafana/loki-build-image:0.33.1
1088+
image: grafana/loki-build-image:0.33.2
10891089
name: build and push
10901090
privileged: true
10911091
volumes:
@@ -1308,6 +1308,6 @@ kind: secret
13081308
name: gpg_private_key
13091309
---
13101310
kind: signature
1311-
hmac: e0940674c7a2b5ae47c6509b0bc97dc594a054e5b881fd1962b81837d6b1dee6
1311+
hmac: 87480bff973003712122d81a1575e2a62cff6fd4a42b163487cae6c6a67d8e7c
13121312

13131313
...

‎.github/jsonnetfile.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"subdir": "workflows"
99
}
1010
},
11-
"version": "main"
11+
"version": "124c4d996f9625478a79f1884465e29ea082d224"
1212
}
1313
],
1414
"legacyImports": true

‎.github/jsonnetfile.lock.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"subdir": "workflows"
99
}
1010
},
11-
"version": "634945b73e8eed4f5161ec08810178ddeca7505b",
12-
"sum": "BOnwSjzyOjWwv9ikwJSAgPBNnYHTU2PEDJ0PWY6nr7I="
11+
"version": "124c4d996f9625478a79f1884465e29ea082d224",
12+
"sum": "8wrJURq48ZBAtZcReO1W7AiXmvUyLqb932Q9sXyfFVo="
1313
}
1414
],
1515
"legacyImports": false

‎.github/release-workflows.jsonnet

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
local lokiRelease = import 'workflows/main.jsonnet';
22
local build = lokiRelease.build;
33

4-
local releaseLibRef = std.filter(
5-
function(dep) dep.source.git.remote == 'https://github.com/grafana/loki-release.git',
6-
(import 'jsonnetfile.json').dependencies
7-
)[0].version;
4+
local releaseLibRef = 'main';
85

96
local checkTemplate = 'grafana/loki-release/.github/workflows/check.yml@%s' % releaseLibRef;
107

‎.github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.github/workflows/check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
"pull_request": {}
1313
"push":
1414
"branches":
15-
- "main"
15+
- "main"

‎.github/workflows/metrics-collector.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55

66
jobs:
77
main:
8+
if: github.owner == "grafana"
89
runs-on: ubuntu-latest
910
steps:
1011
- name: Checkout Actions

‎.github/workflows/minor-release-pr.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- id: "get_github_app_token"
5959
if: "${{ fromJSON(env.USE_GITHUB_APP_TOKEN) }}"
6060
name: "get github app token"
61-
uses: "actions/github-app-token@v1"
61+
uses: "actions/create-github-app-token@v1"
6262
with:
6363
app-id: "${{ secrets.APP_ID }}"
6464
owner: "${{ github.repository_owner }}"
@@ -753,7 +753,7 @@ jobs:
753753
- id: "get_github_app_token"
754754
if: "${{ fromJSON(env.USE_GITHUB_APP_TOKEN) }}"
755755
name: "get github app token"
756-
uses: "actions/github-app-token@v1"
756+
uses: "actions/create-github-app-token@v1"
757757
with:
758758
app-id: "${{ secrets.APP_ID }}"
759759
owner: "${{ github.repository_owner }}"
@@ -826,4 +826,4 @@ name: "Prepare Minor Release PR from Weekly"
826826
permissions:
827827
contents: "write"
828828
id-token: "write"
829-
pull-requests: "write"
829+
pull-requests: "write"

‎.github/workflows/patch-release-pr.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- id: "get_github_app_token"
5959
if: "${{ fromJSON(env.USE_GITHUB_APP_TOKEN) }}"
6060
name: "get github app token"
61-
uses: "actions/github-app-token@v1"
61+
uses: "actions/create-github-app-token@v1"
6262
with:
6363
app-id: "${{ secrets.APP_ID }}"
6464
owner: "${{ github.repository_owner }}"
@@ -753,7 +753,7 @@ jobs:
753753
- id: "get_github_app_token"
754754
if: "${{ fromJSON(env.USE_GITHUB_APP_TOKEN) }}"
755755
name: "get github app token"
756-
uses: "actions/github-app-token@v1"
756+
uses: "actions/create-github-app-token@v1"
757757
with:
758758
app-id: "${{ secrets.APP_ID }}"
759759
owner: "${{ github.repository_owner }}"
@@ -826,4 +826,4 @@ name: "Prepare Patch Release PR"
826826
permissions:
827827
contents: "write"
828828
id-token: "write"
829-
pull-requests: "write"
829+
pull-requests: "write"

‎.github/workflows/promtail-windows-test.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
name: Promtail Windows Test
22
on:
33
pull_request:
4-
tags: ['v[0-9].[0-9]+.[0-9]+']
5-
branches: [main, k*]
4+
branches: ["main", "k*", "release-[0-9]+.[0-9]+.x"]
5+
push:
6+
tags: ['v[0-9].[0-9]+.[0-9]+']
7+
branches: ["main", "k*", "release-[0-9]+.[0-9]+.x"]
68
jobs:
79
build:
810
runs-on: windows-latest

‎.github/workflows/release.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- id: "get_github_app_token"
4747
if: "${{ fromJSON(env.USE_GITHUB_APP_TOKEN) }}"
4848
name: "get github app token"
49-
uses: "actions/github-app-token@v1"
49+
uses: "actions/create-github-app-token@v1"
5050
with:
5151
app-id: "${{ secrets.APP_ID }}"
5252
owner: "${{ github.repository_owner }}"
@@ -158,7 +158,7 @@ jobs:
158158
- id: "get_github_app_token"
159159
if: "${{ fromJSON(env.USE_GITHUB_APP_TOKEN) }}"
160160
name: "get github app token"
161-
uses: "actions/github-app-token@v1"
161+
uses: "actions/create-github-app-token@v1"
162162
with:
163163
app-id: "${{ secrets.APP_ID }}"
164164
owner: "${{ github.repository_owner }}"
@@ -219,4 +219,4 @@ name: "create release"
219219
permissions:
220220
contents: "write"
221221
id-token: "write"
222-
pull-requests: "write"
222+
pull-requests: "write"

‎.github/workflows/verify-release-workflow.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Verify release workflow updates
2+
on: [pull_request]
3+
jobs:
4+
check-release-changes:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v3
8+
- name: setup go
9+
uses: actions/setup-go@v5
10+
with:
11+
go-version: '1.22.2'
12+
- name: setup jsonnet
13+
run: |
14+
go install github.com/google/go-jsonnet/cmd/[email protected]
15+
go install github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected]
16+
- name: Check that the release workflows have been updated properly
17+
run: |
18+
make BUILD_IN_CONTAINER=false release-workflows-check

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ cmd/loki/loki
1212
cmd/logcli/logcli
1313
clients/cmd/promtail/promtail
1414
cmd/loki/loki-debug
15+
cmd/lokitool/lokitool
1516
clients/cmd/promtail/promtail-debug
1617
clients/cmd/docker-driver/docker-driver
1718
cmd/loki-canary/loki-canary

‎ADOPTERS.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
* [Heureka Group](https://heureka.group)
88
* [Norwegian Refugee Council](https://www.nrc.no/)
99
* [Dropbox](https://www.dropbox.com/)
10+
* [ASML](https://www.asml.com/)

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ Starting with the 3.0 release we began using [conventional commits](https://www.
135135

136136
##### Fixes
137137

138+
* [10708](https://github.com/grafana/loki/pull/10708) **joshuapare**: Fix UDP receiver on syslog transport
138139
* [10631](https://github.com/grafana/loki/pull/10631) **thampiotr**: Fix race condition in cleaning up metrics when stopping to tail files.
139140
* [10798](https://github.com/grafana/loki/pull/10798) **hainenber**: Fix agent panicking after reloaded due to duplicate metric collector registration.
140141
* [10848](https://github.com/grafana/loki/pull/10848) **rgroothuijsen**: Correctly parse list of drop stage sources from YAML.

‎Makefile

+16-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ DOCKER_IMAGE_DIRS := $(patsubst %/Dockerfile,%,$(DOCKERFILES))
3737
BUILD_IN_CONTAINER ?= true
3838

3939
# ensure you run `make drone` after changing this
40-
BUILD_IMAGE_VERSION ?= 0.33.1
40+
BUILD_IMAGE_VERSION ?= 0.33.2
4141

4242
# Docker image info
4343
IMAGE_PREFIX ?= grafana
@@ -204,6 +204,15 @@ loki-querytee: cmd/querytee/querytee ## build loki-querytee executable
204204
cmd/querytee/querytee:
205205
CGO_ENABLED=0 go build $(GO_FLAGS) -o $@ ./$(@D)
206206

207+
############
208+
# lokitool #
209+
############
210+
.PHONY: cmd/lokitool/lokitool
211+
lokitool: cmd/lokitool/lokitool ## build lokitool executable
212+
213+
cmd/lokitool/lokitool:
214+
CGO_ENABLED=0 go build $(GO_FLAGS) -o $@ ./cmd/lokitool
215+
207216
############
208217
# Promtail #
209218
############
@@ -891,3 +900,9 @@ scan-vulnerabilities: trivy snyk
891900
release-workflows:
892901
pushd $(CURDIR)/.github && jb update && popd
893902
jsonnet -SJ .github/vendor -m .github/workflows .github/release-workflows.jsonnet
903+
904+
.PHONY: release-workflows-check
905+
release-workflows-check:
906+
@$(MAKE) release-workflows
907+
@echo "Checking diff"
908+
@git diff --exit-code -- ".github/workflows/*release*" || (echo "Please build release workflows by running 'make release-workflows'" && false)

‎clients/cmd/docker-driver/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.1
1+
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.2
22
# Directories in this file are referenced from the root of the project not this folder
33
# This file is intended to be called from the root like so:
44
# docker build -t grafana/loki -f cmd/loki/Dockerfile .

‎clients/cmd/promtail/Dockerfile

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
FROM golang:1.21.9-bullseye as build
1+
FROM golang:1.22.2-bookworm as build
22

33
COPY . /src/loki
44
WORKDIR /src/loki
5-
# Backports repo required to get a libsystemd version 246 or newer which is required to handle journal +ZSTD compression
6-
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
7-
RUN apt-get update && apt-get install -t bullseye-backports -qy libsystemd-dev
5+
RUN apt-get update && apt-get install -qy libsystemd-dev
86
RUN make clean && make BUILD_IN_CONTAINER=false PROMTAIL_JOURNAL_ENABLED=true promtail
97

108
# Promtail requires debian as the base image to support systemd journal reading
11-
FROM debian:bullseye-slim
9+
FROM debian:12.5-slim
1210
# tzdata required for the timestamp stage to work
13-
# Backports repo required to get a libsystemd version 246 or newer which is required to handle journal +ZSTD compression
14-
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
1511
RUN apt-get update && \
16-
apt-get install -qy \
17-
tzdata ca-certificates
18-
RUN apt-get install -t bullseye-backports -qy libsystemd-dev && \
12+
apt-get install -qy tzdata ca-certificates wget libsystemd-dev && \
1913
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2014
COPY --from=build /src/loki/clients/cmd/promtail/promtail /usr/bin/promtail
2115
COPY clients/cmd/promtail/promtail-docker-config.yaml /etc/promtail/config.yml

‎clients/cmd/promtail/Dockerfile.arm32

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
FROM golang:1.21.9-bullseye as build
1+
FROM golang:1.22.2-bookworm as build
22

33
COPY . /src/loki
44
WORKDIR /src/loki
5-
# Backports repo required to get a libsystemd version 246 or newer which is required to handle journal +ZSTD compression
6-
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
7-
RUN apt-get update && apt-get install -t bullseye-backports -qy libsystemd-dev
5+
RUN apt-get update && apt-get install -qy libsystemd-dev
86
RUN make clean && make BUILD_IN_CONTAINER=false PROMTAIL_JOURNAL_ENABLED=true promtail
97

108
# Promtail requires debian as the base image to support systemd journal reading
11-
FROM debian:bullseye-slim
9+
FROM debian:12.5-slim
1210
# tzdata required for the timestamp stage to work
13-
# Backports repo required to get a libsystemd version 246 or newer which is required to handle journal +ZSTD compression
14-
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
1511
RUN apt-get update && \
16-
apt-get install -qy \
17-
tzdata ca-certificates
18-
RUN apt-get install -t bullseye-backports -qy libsystemd-dev && \
12+
apt-get install -qy tzdata ca-certificates wget libsystemd-dev && \
1913
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2014
COPY --from=build /src/loki/clients/cmd/promtail/promtail /usr/bin/promtail
2115
COPY clients/cmd/promtail/promtail-local-config.yaml /etc/promtail/local-config.yaml

‎clients/cmd/promtail/Dockerfile.cross

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.1
1+
ARG BUILD_IMAGE=grafana/loki-build-image:0.33.2
22
# Directories in this file are referenced from the root of the project not this folder
33
# This file is intended to be called from the root like so:
44
# docker build -t grafana/promtail -f clients/cmd/promtail/Dockerfile .
5-
FROM golang:1.21.9-alpine as goenv
5+
FROM 1.22.2-alpine as goenv
66
RUN go env GOARCH > /goarch && \
77
go env GOARM > /goarm
88

@@ -13,11 +13,10 @@ WORKDIR /src/loki
1313
RUN make clean && GOARCH=$(cat /goarch) GOARM=$(cat /goarm) make BUILD_IN_CONTAINER=false PROMTAIL_JOURNAL_ENABLED=true promtail
1414

1515
# Promtail requires debian as the base image to support systemd journal reading
16-
FROM debian:stretch-slim
16+
FROM debian:12.5-slim
1717
# tzdata required for the timestamp stage to work
1818
RUN apt-get update && \
19-
apt-get install -qy \
20-
tzdata ca-certificates libsystemd-dev && \
19+
apt-get install -qy tzdata ca-certificates wget libsystemd-dev && \
2120
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
2221
COPY --from=build /src/loki/clients/cmd/promtail/promtail /usr/bin/promtail
2322
COPY clients/cmd/promtail/promtail-local-config.yaml /etc/promtail/local-config.yaml

‎clients/cmd/promtail/Dockerfile.debug

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is intended to be called from the root like so:
33
# docker build -t grafana/promtail -f clients/cmd/promtail/Dockerfile.debug .
44

5-
FROM grafana/loki-build-image:0.33.1 as build
5+
FROM grafana/loki-build-image:0.33.2 as build
66
ARG GOARCH="amd64"
77
COPY . /src/loki
88
WORKDIR /src/loki

0 commit comments

Comments
 (0)