Skip to content

Commit 75b3a74

Browse files
QuentinBissonQuentinBisson
authored
Merge branch 'main' into add-mixin-for-backend-resources
2 parents 615d413 + 15c8b45 commit 75b3a74

File tree

915 files changed

+208846
-19878
lines changed

Some content is hidden

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

915 files changed

+208846
-19878
lines changed

‎.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"image": "grafana/loki-build-image:0.33.1",
2+
"image": "grafana/loki-build-image:0.33.4",
33
"containerEnv": {
44
"BUILD_IN_CONTAINER": "false"
55
},

‎.drone/drone.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ steps:
139139
depends_on:
140140
- clone
141141
environment: {}
142-
image: grafana/loki-build-image:0.33.3
142+
image: grafana/loki-build-image:0.33.4
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.3
1088+
image: grafana/loki-build-image:0.33.4
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: 33b9d2962b6dfcf1136ef7602d29e3f32f03b0d90dfd579652cbaf0a4ef2de4b
1311+
hmac: 335170654951c8fdd9cb1b96b4290febb74b86ebab07cfe65d680299faa767bf
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": "124c4d996f9625478a79f1884465e29ea082d224"
11+
"version": "adca1c07a2199374e1646e62331926509699368b"
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": "124c4d996f9625478a79f1884465e29ea082d224",
12-
"sum": "8wrJURq48ZBAtZcReO1W7AiXmvUyLqb932Q9sXyfFVo="
11+
"version": "adca1c07a2199374e1646e62331926509699368b",
12+
"sum": "/6NMt3DFr1mpaBxncbwBJVV5vBpAMIyP3XNOoFArz5Q="
1313
}
1414
],
1515
"legacyImports": false

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

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

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

+158-45
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
@@ -2,7 +2,7 @@
22
"check":
33
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
44
"with":
5-
"build_image": "grafana/loki-build-image:0.33.3"
5+
"build_image": "grafana/loki-build-image:0.33.4"
66
"golang_ci_lint_version": "v1.55.1"
77
"release_lib_ref": "main"
88
"skip_validation": false

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check:
1717
uses: "grafana/loki-release/.github/workflows/check.yml@main"
1818
with:
19-
build_image: "grafana/loki-build-image:0.33.3"
19+
build_image: "grafana/loki-build-image:0.33.4"
2020
golang_ci_lint_version: "v1.55.1"
2121
release_lib_ref: "main"
2222
skip_validation: false
@@ -141,7 +141,7 @@ jobs:
141141
--env SKIP_ARM \
142142
--volume .:/src/loki \
143143
--workdir /src/loki \
144-
--entrypoint /bin/sh "grafana/loki-build-image:0.33.3"
144+
--entrypoint /bin/sh "grafana/loki-build-image:0.33.4"
145145
git config --global --add safe.directory /src/loki
146146
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
147147
make dist packages

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
check:
1717
uses: "grafana/loki-release/.github/workflows/check.yml@main"
1818
with:
19-
build_image: "grafana/loki-build-image:0.33.3"
19+
build_image: "grafana/loki-build-image:0.33.4"
2020
golang_ci_lint_version: "v1.55.1"
2121
release_lib_ref: "main"
2222
skip_validation: false
@@ -141,7 +141,7 @@ jobs:
141141
--env SKIP_ARM \
142142
--volume .:/src/loki \
143143
--workdir /src/loki \
144-
--entrypoint /bin/sh "grafana/loki-build-image:0.33.3"
144+
--entrypoint /bin/sh "grafana/loki-build-image:0.33.4"
145145
git config --global --add safe.directory /src/loki
146146
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
147147
make dist packages

‎.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
- name: "download images"
139139
run: |
140140
echo "downloading images to $(pwd)/images"
141-
gsutil cp -r gs://loki-build-artifacts/${{ needs.createRelease.outputs.sha }}/images .
141+
gsutil cp -r gs://${BUILD_ARTIFACTS_BUCKET}/${{ needs.createRelease.outputs.sha }}/images .
142142
- name: "publish docker images"
143143
uses: "./lib/actions/push-images"
144144
with:

‎.release-please-manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
".": "3.0.0",
3-
"operator": "0.6.0"
3+
"operator": "0.6.1"
44
}

‎CHANGELOG.md

+21-1
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,28 @@ Starting with the 3.0 release we began using [conventional commits](https://www.
110110
* **loki** Background Cache: Fixes a bug that is causing the background queue size to be incremented twice for each enqueued item. [11776](https://github.com/grafana/loki/pull/11776)
111111
* **loki**: Parsing: String array elements were not being parsed correctly in JSON processing [11921](https://github.com/grafana/loki/pull/11921)
112112

113-
## [2.9.7](https://github.com/grafana/loki/compare/v2.9.6...v2.9.7) (2024-04-10)
113+
## [2.9.9](https://github.com/grafana/loki/compare/v2.9.8...v2.9.9) (2024-07-04)
114+
115+
### All Changes
116+
117+
#### Loki
118+
119+
##### Fixes
120+
121+
* [12925](https://github.com/grafana/loki/pull/12925) **grobinson-grafana** Ingester: Add ingester_chunks_flush_failures_total
122+
* [13140](https://github.com/grafana/loki/pull/13140) **grobinson-grafana** Ingester: Add backoff to flush op
123+
124+
## [2.9.8](https://github.com/grafana/loki/compare/v2.9.7...v2.9.8) (2024-05-03)
114125

126+
### All Changes
127+
128+
#### Loki
129+
130+
##### Fixes
131+
132+
* update module golang.org/x/net to v0.23.0 [security] (release-2.9.x) ([#12865](https://github.com/grafana/loki/issues/12865)) ([94e0029](https://github.com/grafana/loki/commit/94e00299ec9b36ad97c147641566b6922268c54e))
133+
134+
## [2.9.7](https://github.com/grafana/loki/compare/v2.9.6...v2.9.7) (2024-04-10)
115135

116136
### Bug Fixes
117137

‎Makefile

+8-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` and `make release-workflows` after changing this
40-
BUILD_IMAGE_VERSION ?= 0.33.3
40+
BUILD_IMAGE_VERSION ?= 0.33.4
4141

4242
# Docker image info
4343
IMAGE_PREFIX ?= grafana
@@ -906,6 +906,13 @@ release-workflows:
906906

907907
.PHONY: release-workflows-check
908908
release-workflows-check:
909+
ifeq ($(BUILD_IN_CONTAINER),true)
910+
$(SUDO) docker run $(RM) $(TTY) -i \
911+
-v $(shell go env GOPATH)/pkg:/go/pkg$(MOUNT_FLAGS) \
912+
-v $(shell pwd):/src/loki$(MOUNT_FLAGS) \
913+
$(IMAGE_PREFIX)/loki-build-image:$(BUILD_IMAGE_VERSION) $@;
914+
else
909915
@$(MAKE) release-workflows
910916
@echo "Checking diff"
911917
@git diff --exit-code -- ".github/workflows/*release*" || (echo "Please build release workflows by running 'make release-workflows'" && false)
918+
endif

0 commit comments

Comments
 (0)