Skip to content

Commit 2e45678

Browse files
authored
Merge branch 'main' into renovate/major-github-actions-dependency-actionsupload-artifact
2 parents d66e155 + a521398 commit 2e45678

73 files changed

Lines changed: 723 additions & 242 deletions

File tree

Some content is hidden

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

.github/workflows/autolock.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
action:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
19+
- uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
2020
with:
2121
pr-inactive-days: 14
2222
issue-inactive-days: 14

.github/workflows/check-linux-build-image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ jobs:
3232
rm -rf /opt/hostedtoolcache
3333
3434
- name: Setup QEMU
35-
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
35+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
3636

3737
- name: Set up Docker Buildx
38-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
38+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
3939

4040
- name: Create test Linux build image
41-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
41+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
4242
with:
4343
platforms: linux/amd64,linux/arm64
4444
context: ./tools/build-image

.github/workflows/create_build_image.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ jobs:
4242
uses: grafana/shared-workflows/actions/dockerhub-login@081a366728379fd0426b9cfef190e9a21c2d5418 # dockerhub-login/v1.0.3
4343

4444
- name: Setup QEMU
45-
uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
45+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
4646

4747
- name: Set up Docker Buildx
48-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
48+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
4949

5050
- name: Create Linux build image
51-
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
51+
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
5252
with:
5353
platforms: linux/amd64,linux/arm64
5454
context: ./tools/build-image

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
cache: false
2424

2525
- name: Lint alloy module
26-
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
26+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
2727
with:
2828
# renovate: datasource=github-releases packageName=golangci/golangci-lint
2929
version: v2.4.0
3030

3131
- name: Lint syntax module
32-
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
32+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
3333
with:
3434
# renovate: datasource=github-releases packageName=golangci/golangci-lint
3535
version: v2.4.0
@@ -73,7 +73,7 @@ jobs:
7373
persist-credentials: false
7474

7575
- name: Set up Node.js
76-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
76+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
7777
with:
7878
node-version-file: internal/web/ui/.nvmrc
7979

.github/workflows/release-lint-pr-title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Validate PR title 🔎
20-
uses: amannn/action-semantic-pull-request@e32d7e603df1aa1ba07e981f2a23455dee596825 # v5
20+
uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6
2121
env:
2222
GITHUB_TOKEN: ${{ github.token }}
2323
with:

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
persist-credentials: false
4040

4141
- name: Setup Node.js 🏗️
42-
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
42+
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
4343
with:
4444
node-version-file: tools/release/release-please-runner/.nvmrc
4545
package-manager-cache: false

docs/sources/reference/components/loki/loki.secretfilter.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ You can use the following arguments with `loki.secretfilter`:
5252
| `drop_on_timeout` | `bool` | When true, drop entries that exceed `processing_timeout` instead of forwarding them unredacted. | `false` | no |
5353
| `gitleaks_config` | `string` | Path to a custom Gitleaks TOML config file. If empty, the default Gitleaks config is used. | `""` | no |
5454
| `label_timed_out` | `bool` | When true, adds `secretfilter="timed-out"` to entries forwarded after a processing timeout. | `false` | no |
55-
| `origin_label` | `string` | Loki label to use for the `secrets_redacted_by_origin` metric. If empty, that metric is not registered. | `""` | no |
55+
| `origin_label` | `string` | Loki label to use as the `origin` dimension in `secrets_redacted_by_origin` and `secrets_redacted_by_category_total`. If empty, `secrets_redacted_by_origin` is not registered and the `origin` label on `secrets_redacted_by_category_total` is set to `""`. | `""` | no |
5656
| `processing_timeout` | `duration` | Maximum time allowed to process a single log entry. `0` disables the timeout. | `0` | no |
5757
| `rate` | `float` | Entry sampling rate in `[0.0, 1.0]` where `1` processes all entries. Unsampled entries are forwarded unchanged. | `1.0` | no |
5858
| `redact_percent` | `uint` | When `redact_with` is not set: percent of the secret to redact (1–100), where 100 is full redaction. | `80` | no |
@@ -67,6 +67,8 @@ The default configuration may change between {{< param "PRODUCT_NAME" >}} versio
6767
For consistent behavior, use an external configuration file via `gitleaks_config`.
6868
{{< /admonition >}}
6969

70+
If you leave `origin_label` empty, the component doesn't register `secrets_redacted_by_origin` and sets the origin label on `secrets_redacted_by_category_total` to `""`.
71+
7072
**Redaction behavior:**
7173

7274
- If `redact_with` is set, it is used as the replacement string for every detected secret.
@@ -82,7 +84,9 @@ Entries that {{< param "PRODUCT_NAME" >}} does not select based on the sampling
8284
Use a value below `1.0`, for example, `0.1` for 10%, to reduce CPU usage when processing high-volume logs.
8385
Monitor `loki_secretfilter_entries_bypassed_total` to observe how many entries were skipped.
8486

85-
**Origin metric:** The `origin_label` argument specifies which Loki label to use for the `secrets_redacted_by_origin` metric, so you can track how many secrets were redacted per source or environment.
87+
**Origin metric:** The `origin_label` argument specifies the Loki label the component uses as the origin dimension in the `secrets_redacted_by_origin` and `secrets_redacted_by_category_total` metrics.
88+
You can track how many secrets were redacted per source or environment.
89+
When `origin_label` isn’t set, the component doesn’t register `secrets_redacted_by_origin`, and the `origin` label on `secrets_redacted_by_category_total` defaults to an empty string.
8690

8791
**Processing timeout:** The `processing_timeout` argument sets a maximum duration for processing each log entry.
8892
When the timeout is exceeded, the `loki_secretfilter_lines_timed_out_total` metric is incremented.
@@ -131,6 +135,7 @@ The following fields are exported and can be referenced by other components:
131135
| `loki_secretfilter_secrets_redacted_total` | Counter | Total number of secrets redacted. |
132136
| `loki_secretfilter_secrets_redacted_by_rule_total` | Counter | Number of secrets redacted, partitioned by rule name. |
133137
| `loki_secretfilter_secrets_redacted_by_origin` | Counter | Number of secrets redacted, partitioned by origin label, when `origin_label` is set. |
138+
| `loki_secretfilter_secrets_redacted_by_category_total` | Counter | Number of secrets redacted, partitioned by rule name and origin label value. The `origin` label is empty when `origin_label` is not set or the label is absent on the entry. |
134139

135140
## Example
136141

0 commit comments

Comments
 (0)