Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit c6ab6b3
Author: Trevor Whitney <trevorjwhitney@gmail.com>
Date:   Mon Aug 12 11:09:43 2024 -0600

    chore: remove initial metric aggregation experiment (#13729)

commit 3c0e3e2
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Aug 12 12:00:51 2024 -0400

    fix(deps): update module github.com/baidubce/bce-sdk-go to v0.9.186 (#13864)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 6f79194
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Aug 12 10:20:34 2024 -0400

    fix(deps): update module github.com/aliyun/aliyun-oss-go-sdk to v2.2.10+incompatible (#13861)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit ad60738
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Aug 12 09:53:11 2024 -0400

    chore(deps): update grafana/loki-build-image docker tag to v0.33.6 (#13859)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 292f911
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Aug 12 09:46:36 2024 -0400

    chore(deps): update helm/chart-testing-action action to v2.6.1 (#13855)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit e0bde12
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Aug 12 09:45:49 2024 -0400

    chore(deps): update grafana/promtail docker tag to v1.6.1 (#13851)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit a9cd5e5
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Aug 12 09:42:53 2024 -0400

    chore(deps): update grafana/promtail docker tag to v2.9.10 (#13854)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 0c28cc7
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Aug 12 09:42:21 2024 -0400

    chore(deps): update dependency go to v1.22.6 (#13842)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com>

commit c3a5141
Author: Paul Rogers <129207811+paul1r@users.noreply.github.com>
Date:   Mon Aug 12 09:29:19 2024 -0400

    chore: Update loki build image to go 1.22.6 (#13857)

commit 717623b
Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com>
Date:   Mon Aug 12 15:47:29 2024 +0300

    chore:  manual changelog backport (#13852)

    Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>

commit f933a3b
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Aug 12 08:40:39 2024 -0400

    chore(deps): update grafana/loki docker tag to v2.9.10 (#13848)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com>

commit ea6395a
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Aug 12 08:33:10 2024 -0400

    chore(deps): update golang docker tag to v1.22.6 (#13847)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 53c0c48
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Mon Aug 12 08:32:08 2024 -0400

    chore(deps): update grafana/loki-build-image docker tag to v0.33.5 (#13849)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 9315b3d
Author: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
Date:   Fri Aug 9 12:38:47 2024 +0200

    chore(ci): Update yaml file `./production/helm/loki/values.yaml` (+1 other) (#13832)

    Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>
    Co-authored-by: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com>

commit 66d7138
Author: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
Date:   Thu Aug 8 17:31:41 2024 +0200

    chore: [main] chore(release-3.1.x): release 3.1.1 (#13817)

    Co-authored-by: loki-gh-app[bot] <160051081+loki-gh-app[bot]@users.noreply.github.com>

commit d5718eb
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Aug 8 10:49:41 2024 -0400

    fix(deps): update github.com/grafana/jsonparser digest to ea80629 (#13814)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit f253db5
Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com>
Date:   Thu Aug 8 17:12:11 2024 +0300

    fix(ci): fixed release-please manifest (#13810)

    Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>

commit a93f38c
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Aug 8 09:48:10 2024 -0400

    fix(deps): update github.com/c2h5oh/datasize digest to aa82cc1 (#13807)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com>

commit e5a3994
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Aug 8 09:39:56 2024 -0400

    fix(deps): update github.com/docker/go-plugins-helpers digest to 45e2431 (#13808)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 67295e0
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Aug 8 09:33:48 2024 -0400

    fix(deps): update github.com/axiomhq/hyperloglog digest to af9851f (#13806)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit c9b0343
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Thu Aug 8 09:32:02 2024 -0400

    chore(deps): update github.com/grafana/regexp digest to a468a5b (#13805)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit 5bb928e
Author: Paul Rogers <129207811+paul1r@users.noreply.github.com>
Date:   Thu Aug 8 08:52:50 2024 -0400

    chore: Turn off renovate on non-main branches (#13803)

commit 217f928
Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com>
Date:   Thu Aug 8 15:31:43 2024 +0300

    fix(ci): add cleanup step into job `dist` (#13801)

    Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>

commit 00e686d
Author: benclive <ben.clive@grafana.com>
Date:   Thu Aug 8 10:40:16 2024 +0100

    chore: Add metastore client as dep for rf1 querier & ignore auth for ListBlocks (#13786)

commit df61482
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Wed Aug 7 18:12:13 2024 -0400

    fix(deps): update module golang.org/x/text to v0.17.0 (main) (#13794)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit f523530
Author: Periklis Tsirakidis <periklis@redhat.com>
Date:   Wed Aug 7 20:05:42 2024 +0200

    fix(operator): Don't overwrite annotations for LokiStack ingress resources (#13708)

commit 5ef83a7
Author: Ned Andreev <n@andreev.sh>
Date:   Wed Aug 7 19:44:43 2024 +0300

    fix: panic when parsing and extracting JSON key values (#13790)

commit bb257f5
Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com>
Date:   Wed Aug 7 17:39:04 2024 +0300

    feat(loki):  add ability to disable AWS S3 dualstack endpoints usage  (#13785)

    Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>

commit 1bf9791
Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com>
Date:   Wed Aug 7 16:10:34 2024 +0300

    fix(helm): fixed memcached and provisioner templates (#13788)

    Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>

commit 638f59f
Author: benclive <ben.clive@grafana.com>
Date:   Wed Aug 7 14:06:28 2024 +0100

    chore: Remove unused stream index from RF1 ingester (#13758)

commit 7683a79
Author: Ned Andreev <n@andreev.sh>
Date:   Tue Aug 6 20:26:10 2024 +0300

    fix: Include whitespaces in extracted tokens (#13738)

    Co-authored-by: Travis Patterson <travis.patterson@grafana.com>

commit da63ca7
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Aug 6 12:41:48 2024 -0400

    chore(deps): update module golang.org/x/net to v0.23.0 [security] (main) (#13763)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    Co-authored-by: Paul Rogers <129207811+paul1r@users.noreply.github.com>

commit f8bf3bb
Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Date:   Tue Aug 6 12:29:47 2024 -0400

    fix(deps): update module github.com/docker/docker to v27.1.1+incompatible [security] (main) (#13762)

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

commit b88583d
Author: Marco Pracucci <marco@pracucci.com>
Date:   Tue Aug 6 16:04:28 2024 +0200

    feat: upgrade prometheus (#13671)

    Signed-off-by: Marco Pracucci <marco@pracucci.com>
    Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>
    Co-authored-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>

commit 3be5a45
Author: Dylan Guedes <djmgguedes@gmail.com>
Date:   Mon Aug 5 17:59:21 2024 -0300

    fix(break): helm: Fix how we set imagePullSecrets for enterprise-gateway and admin-api. (#13761)

commit bdfc86b
Author: Vladyslav Diachenko <82767850+vlad-diachenko@users.noreply.github.com>
Date:   Mon Aug 5 13:46:10 2024 +0300

    chore(helm-chart): added SSE config into AWS storage config (#13746)

    Signed-off-by: Vladyslav Diachenko <vlad.diachenko@grafana.com>

commit 7e224d5
Author: Sandeep Sukhani <sandeep.d.sukhani@gmail.com>
Date:   Sun Aug 4 19:28:29 2024 +0530

    fix: try reading chunks which have incorrect offset for blocks (#13720)

commit 629671e
Author: J Stickler <julie.stickler@grafana.com>
Date:   Fri Aug 2 16:58:41 2024 -0400

    docs: Update the Visualize topic (#13742)

commit 917053a
Author: Cyril Tovena <cyril.tovena@gmail.com>
Date:   Fri Aug 2 18:07:17 2024 +0200

    feat: Introduce wal segment read path. (#13695)

    Co-authored-by: Ben Clive <ben.clive@grafana.com>

commit 7c50b43
Author: Paul Rogers <129207811+paul1r@users.noreply.github.com>
Date:   Fri Aug 2 08:47:33 2024 -0400

    build: Update loki-build-image to Alpine 3.20.2 (#13744)

commit 6dd6b65
Author: jackyin <yincong@baidu.com>
Date:   Fri Aug 2 01:30:11 2024 +0800

    fix: ast left cycular reference result in oom (#13501)

    Co-authored-by: Travis Patterson <travis.patterson@grafana.com>

commit e81345e
Author: J Stickler <julie.stickler@grafana.com>
Date:   Thu Aug 1 11:29:38 2024 -0400

    docs: fix broken links due to Alloy docs reorg (#13715)

commit 40e8352
Author: Jack Baldry <jack.baldry@grafana.com>
Date:   Thu Aug 1 15:41:48 2024 +0100

    docs: rewrite quickstart with Killercoda metadata (#13234)

    Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
    Co-authored-by: J Stickler <julie.stickler@grafana.com>
    Co-authored-by: Jay Clifford <45856600+Jayclifford345@users.noreply.github.com>
  • Loading branch information
@trevorwhitney
trevorwhitney committed Aug 12, 2024
1 parent c65ba1f commit b9e647f
Show file tree
Hide file tree
Showing 1,538 changed files with 292,846 additions and 267,087 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"image": "grafana/loki-build-image:0.33.4",
"image": "grafana/loki-build-image:0.33.6",
"containerEnv": {
"BUILD_IN_CONTAINER": "false"
},
Expand Down
6 changes: 3 additions & 3 deletions .drone/drone.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ steps:
depends_on:
- clone
environment: {}
image: grafana/loki-build-image:0.33.4
image: grafana/loki-build-image:0.33.6
name: documentation-helm-reference-check
trigger:
ref:
Expand Down Expand Up @@ -1085,7 +1085,7 @@ steps:
from_secret: docker_password
DOCKER_USERNAME:
from_secret: docker_username
image: grafana/loki-build-image:0.33.4
image: grafana/loki-build-image:0.33.6
name: build and push
privileged: true
volumes:
Expand Down Expand Up @@ -1308,6 +1308,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: 335170654951c8fdd9cb1b96b4290febb74b86ebab07cfe65d680299faa767bf
hmac: 3b3b039769ab8c44318749efec569ffe50c4cfb173f577422ec9d514054f0a9e

...
2 changes: 1 addition & 1 deletion .github/jsonnetfile.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"subdir": "workflows"
}
},
"version": "adca1c07a2199374e1646e62331926509699368b"
"version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56"
}
],
"legacyImports": true
Expand Down
4 changes: 2 additions & 2 deletions .github/jsonnetfile.lock.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"subdir": "workflows"
}
},
"version": "adca1c07a2199374e1646e62331926509699368b",
"sum": "/6NMt3DFr1mpaBxncbwBJVV5vBpAMIyP3XNOoFArz5Q="
"version": "87cb5090c36b5332e7f21b5c59e136962d5f4f56",
"sum": "kVlVZPpPz8d/D6UGK9Hto+NeGy7z8NvGygcB1QboxWw="
}
],
"legacyImports": false
Expand Down
2 changes: 1 addition & 1 deletion .github/renovate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
],
"labels": ["dependencies"],
"prHourlyLimit": 4,
"baseBranches": ["main", "release-2.9.x", "release-2.8.x"],
"baseBranches": ["main"],
"packageRules": [
{
"matchBaseBranches": ["release-2.9.x","release-2.8.x"],
Expand Down
1 change: 1 addition & 0 deletions .github/vendor/github.com/grafana/loki-release/workflows/build.libsonnet
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .github/vendor/github.com/grafana/loki-release/workflows/common.libsonnet
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/check.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"check":
"uses": "grafana/loki-release/.github/workflows/check.yml@main"
"with":
"build_image": "grafana/loki-build-image:0.33.4"
"build_image": "grafana/loki-build-image:0.33.6"
"golang_ci_lint_version": "v1.55.1"
"release_lib_ref": "main"
"skip_validation": false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/helm-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
python-version: 3.7

- name: Set up chart-testing
uses: helm/chart-testing-action@v2.6.0
uses: helm/chart-testing-action@v2.6.1

- name: Run chart-testing (list-changed)
id: list-changed
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/minor-release-pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
check:
uses: "grafana/loki-release/.github/workflows/check.yml@main"
with:
build_image: "grafana/loki-build-image:0.33.4"
build_image: "grafana/loki-build-image:0.33.6"
golang_ci_lint_version: "v1.55.1"
release_lib_ref: "main"
skip_validation: false
Expand Down Expand Up @@ -101,6 +101,8 @@ jobs:
version: "${{ needs.version.outputs.version }}"
runs-on: "ubuntu-latest"
steps:
- name: "clean up build tools cache"
run: "rm -rf /opt/hostedtoolcache"
- name: "pull code to release"
uses: "actions/checkout@v4"
with:
Expand Down Expand Up @@ -141,7 +143,7 @@ jobs:
--env SKIP_ARM \
--volume .:/src/loki \
--workdir /src/loki \
--entrypoint /bin/sh "grafana/loki-build-image:0.33.4"
--entrypoint /bin/sh "grafana/loki-build-image:0.33.6"
git config --global --add safe.directory /src/loki
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
make dist packages
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/patch-release-pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
check:
uses: "grafana/loki-release/.github/workflows/check.yml@main"
with:
build_image: "grafana/loki-build-image:0.33.4"
build_image: "grafana/loki-build-image:0.33.6"
golang_ci_lint_version: "v1.55.1"
release_lib_ref: "main"
skip_validation: false
Expand Down Expand Up @@ -101,6 +101,8 @@ jobs:
version: "${{ needs.version.outputs.version }}"
runs-on: "ubuntu-latest"
steps:
- name: "clean up build tools cache"
run: "rm -rf /opt/hostedtoolcache"
- name: "pull code to release"
uses: "actions/checkout@v4"
with:
Expand Down Expand Up @@ -141,7 +143,7 @@ jobs:
--env SKIP_ARM \
--volume .:/src/loki \
--workdir /src/loki \
--entrypoint /bin/sh "grafana/loki-build-image:0.33.4"
--entrypoint /bin/sh "grafana/loki-build-image:0.33.6"
git config --global --add safe.directory /src/loki
echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
make dist packages
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
".": "3.0.0",
".": "3.1.1",
"operator": "0.6.1"
}
Loading

0 comments on commit b9e647f

Please sign in to comment.