Update from upstream repository #166
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
**What this PR does / why we need it**:
A run of the protobuf encoding for the querier showed a spike in memory
usage in the `codec.MergeResponse` method. The routine was allocating a
lot of memory for the `series.String()` method which is then hashed.
Instead, we can use a `uint64` hash.
```
› go test -v -run=^$ -bench "Benchmark_MergeResponses$" -count=10 ./pkg/querier/queryrange
...
│ before.txt │ after.txt │
│ sec/op │ sec/op vs base │
_MergeResponses-16 4.563 ± 1% 1.197 ± 1% -73.77% (p=0.000 n=10)
│ before.txt │ after.txt │
│ B/op │ B/op vs base │
_MergeResponses-16 6578.715Mi ± 0% 2.362Mi ± 0% -99.96% (p=0.000 n=10)
│ before.txt │ after.txt │
│ allocs/op │ allocs/op vs base │
_MergeResponses-16 40500.1k ± 0% 100.1k ± 0% -99.75% (p=0.000 n=10)
```
**Checklist**
- [ ] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [x] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/upgrading/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e)
I realized that I should have moved the Best Practices topic as part of #8711, since most of the content is best practices for using labels. This PR: * Splits the file into two parts (Best practices for labels and best practices for configuration) * Moves the two files to Get Started and Configure, respectively. * Updates page weights for both sections as needed.
**What this PR does / why we need it**: Loki build image with go 1.20.6 and previous version of golangci. **Which issue(s) this PR fixes**: See the Included README.md --------- Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Co-authored-by: Periklis Tsirakidis <periklis@redhat.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: periklis The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
Bumps [go.uber.org/atomic](https://github.com/uber-go/atomic) from 1.10.0 to 1.11.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/uber-go/atomic/releases">go.uber.org/atomic's releases</a>.</em></p> <blockquote> <h2>v1.11.0</h2> <h3>Fixed</h3> <ul> <li>Fix <code>Swap</code> and <code>CompareAndSwap</code> for <code>Value</code> wrappers without initialization.</li> </ul> <h3>Added</h3> <ul> <li>Add <code>String</code> method to <code>atomic.Pointer[T]</code> type allowing users to safely print underlying values of pointers.</li> </ul> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/uber-go/atomic/blob/master/CHANGELOG.md">go.uber.org/atomic's changelog</a>.</em></p> <blockquote> <h2><a href="https://github.com/uber-go/atomic/compare/v1.10.0...v1.11.0">1.11.0</a> - 2023-05-02</h2> <h3>Fixed</h3> <ul> <li>Fix <code>Swap</code> and <code>CompareAndSwap</code> for <code>Value</code> wrappers without initialization.</li> </ul> <h3>Added</h3> <ul> <li>Add <code>String</code> method to <code>atomic.Pointer[T]</code> type allowing users to safely print underlying values of pointers.</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/uber-go/atomic/commit/76f817c8b7e771cdffc2b9f11a7ebb80333ca92b"><code>76f817c</code></a> Update CHANGELOG.md</li> <li><a href="https://github.com/uber-go/atomic/commit/2a750c4499768bad159ee94efa197ba13bf29852"><code>2a750c4</code></a> Preparing release v1.11.0</li> <li><a href="https://github.com/uber-go/atomic/commit/544d6aa5c2660469459c390a8e3d2a3db58d182c"><code>544d6aa</code></a> Minimize permissions to CI workflows (<a href="https://redirect.github.com/uber-go/atomic/issues/133">#133</a>)</li> <li><a href="https://github.com/uber-go/atomic/commit/1505d282ac345ac771ed8e4315e1ee6d10024336"><code>1505d28</code></a> Fix Swap and CompareAndSwap for Value wrappers (<a href="https://redirect.github.com/uber-go/atomic/issues/130">#130</a>)</li> <li><a href="https://github.com/uber-go/atomic/commit/78a3b8ec6cb2e156b91140c7d53b16e12b7b3f91"><code>78a3b8e</code></a> Implement String method for pointers (<a href="https://redirect.github.com/uber-go/atomic/issues/122">#122</a>)</li> <li><a href="https://github.com/uber-go/atomic/commit/159e329dd89a1dcdc41df85041312fa497d308b2"><code>159e329</code></a> chore(gen-*): Move templates into external files (<a href="https://redirect.github.com/uber-go/atomic/issues/121">#121</a>)</li> <li>See full diff in <a href="https://github.com/uber-go/atomic/compare/v1.10.0...v1.11.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
**What this PR does / why we need it**: In #9700, we support encoding and decoding metadata for each entry into the chunks. In this PR we: - Update the bytes processed stats to account for the bytes from those non-indexed labels - Add new stats for bytes processed for those non-indexed labels - Add new ingestion metrics to track ingested non-indexed bytes **Checklist** - [ ] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [ ] Documentation added - [x] Tests updated - [ ] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/upgrading/_index.md` - [ ] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](d10549e)
**What this PR does / why we need it**: Allows changing the label name at the canary in the helm chart. **Which issue(s) this PR fixes**: Idk, none? **Special notes for your reviewer**: This is a very trivial change. **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [x] Tests updated - [x] `CHANGELOG.md` updated - [x] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [x] Changes that require user attention or interaction to upgrade are documented in `docs/sources/upgrading/_index.md` - [x] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](d10549e) --------- Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com> Co-authored-by: Travis Patterson <travis.patterson@grafana.com>
### issue: According to the issue #9917 Adding Grafana Loki Enterprise to Grafana Apps Enterprise needs access to the GEL `/config` API path for cluster configuration if GEL Apps in Grafana doesn't have an access to this path, client won't be able to see `/Cluster Configuration` and also won't be able to create a data source in the Apps with the related Grafana Enterprise logs plugin. ### more information: `HOME/Apps/Grfana Enterprise Logs/Cluster Configuration` ``` A note about this cluster configuration page The parameter values shown below are those returned by http://example.com:30519/config. If you have configured other components in your cluster with different parameter values, those will not be reflected below. For documentation on the function of each configuration parameter, see [Configuration reference](https://grafana.com/docs/enterprise-logs/latest/config/reference/). ``` <img width="712" alt="Screenshot 1402-04-30 at 03 17 34" src="https://github.com/grafana/loki/assets/53074289/48170dce-345d-42d8-bbaa-1bdf4d7bd2f3"> This commit will add `/config` to nginx gateway on SSD mode loki helm chart deployment --------- Signed-off-by: Michel Hollands <michel.hollands@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Michel Hollands <42814411+MichelHollands@users.noreply.github.com> Co-authored-by: Joao Marcal <jmarcal@redhat.com> Co-authored-by: Periklis Tsirakidis <periklis@redhat.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Salva Corts <salva.corts@grafana.com>
|
@periklis: all tests passed! Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refs: