Upgrade golangci-lint and fix linting errors
#9601
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
trevorwhitney
changed the title
golangci-lint run --fix
|
@trevorwhitney Can we exclude the operator subdirectory for now? I believe we have two deviating configurations for golangci-lint in action, one in the root-level Loki directory and one in the operator subdirectory. |
|
@periklis can do 👍 |
jeschkies
requested changes
Jun 6, 2023
There was a problem hiding this comment.
Awesome. Did you run the formatter? If so could change make check-format so that it runs on all files? See
Line 757 in 2c7309e
I'd not ignore the unused parameter. It catches bugs.
I know it's a lot of work but ideally they are replaced with _.
|
I successfully recreated the errors I was seeing locally in commit 0eddf36 by upgrading the version of golangci-lint we are using in CI: https://drone.grafana.net/grafana/loki/24068/3/9 I will now commit the changes to make the linter pass. |
trevorwhitney
force-pushed
the
trevorwhitney/fix-linting
branch
from
6302ec9
to
f806c84
Compare
trevorwhitney
changed the title
golangci-lint run --fixgolangci-lint and fix linting errors
slim-bean
reviewed
Jun 7, 2023
| @@ -50,7 +50,7 @@ GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD) | |||
|
|
|||
| # We don't want find to scan inside a bunch of directories, to accelerate the | |||
| # 'make: Entering directory '/src/loki' phase. | |||
| DONT_FIND := -name tools -prune -o -name vendor -prune -o -name .git -prune -o -name .cache -prune -o -name .pkg -prune -o | |||
| DONT_FIND := -name tools -prune -o -name vendor -prune -o -name operator -prune -o -name .git -prune -o -name .cache -prune -o -name .pkg -prune -o | |||
There was a problem hiding this comment.
other there any implications here for removing the operator directory? like do they lose linting?
There was a problem hiding this comment.
it does have it's own .golangci-lint.yml, and the concern was we may need to make formatting decisions based on the top level linting that won't agree with operator linting. that being said this may be YAGNI, so I'll remove it for now and wait for it to be a problem.
slim-bean
reviewed
Jun 7, 2023
Makefile
Outdated
| @@ -298,6 +298,7 @@ publish: packages | |||
| lint: ## run linters | |||
| go version | |||
| golangci-lint version | |||
| GO111MODULE=on golangci-lint cache clean -v | |||
There was a problem hiding this comment.
won't this make linting incredibly slow if we always clean the cache?
There was a problem hiding this comment.
one argument is that linting should be slow on CI in order to be complete. I don't have a strong opinion though. I added this when I was struggling with some differences I was seeing on CI vs local but it ended up being something different. I'm happy to remove.
Merged
jeschkies
approved these changes
Jun 8, 2023
jeschkies
reviewed
Jun 8, 2023
Makefile
Outdated
| @@ -755,7 +755,7 @@ format: | |||
|
|
|||
| GIT_TARGET_BRANCH ?= main | |||
| check-format: format | |||
| git diff --name-only HEAD origin/$(GIT_TARGET_BRANCH) -- "*.go" | xargs --no-run-if-empty git diff --exit-code -- \ | |||
| find . $(DONT_FIND) -name operator -prune -o -type f -name "*.go" | xargs --no-run-if-empty git diff --exit-code -- \ | |||
There was a problem hiding this comment.
This excludes the operator files but not the folder 🙈 So the git diff runs on ./operator. You need to exclude it somehow.
trevorwhitney
force-pushed
the
trevorwhitney/fix-linting
branch
from
e20b960
to
54b9bce
Compare
github-actions
bot
added
area/helm
type/docs
commit 065bee7 Author: Travis Patterson <travis.patterson@grafana.com> Date: Mon Jun 12 10:21:58 2023 -0600 Label Volume Endpoint (#9588) For a given set of matchers, returns the top N associated label/value pairs by volume. A query for `{cluster=prod}` will return ``` cluster=prod: size (total logs matching this matcher) . . . nth-label=nth-value ``` This is to service use cases where users want to understand where their log volume has come from by label without making multiple requests to the stats endpoint. Note: This PR is a monster but it's mostly plumbing. I've pointed out the most interesting bits that actually get the volumes from ingesters/indexs commit 4d997a5 Author: Piotr <17101802+thampiotr@users.noreply.github.com> Date: Mon Jun 12 16:24:26 2023 +0100 Fix promtail cluster template not finding all clusters. (#9684) **What this PR does / why we need it**: In promtail-mixin, the dropdown template for clusters would only include clusters that run loki. So if a cluster only run promtail and not loki, it doesn't appear. commit 57f9452 Author: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com> Date: Mon Jun 12 15:21:08 2023 +0200 Revert 9217 chaudum/tsdb chunkrefs pool (#9685) Revert #9217 (potential bug in query result) --------- Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com> commit 73ac208 Author: Salva Corts <salva.corts@grafana.com> Date: Mon Jun 12 10:46:30 2023 +0200 Improve docs for empty value in cache compression config (#9649) **What this PR does / why we need it**: Follow up PR for #9535 (comment) **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] 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) commit f239435 Author: Christophe Collot <52134228+CCOLLOT@users.noreply.github.com> Date: Fri Jun 9 15:00:31 2023 +0200 feat(lambda-promtail): add cloudfront log file ingestion support (#9573) **What this PR does / why we need it**: This PR enables ingesting logs from Cloudfront log files stored in s3 (batch). The current setup only supports streaming Cloudfront logs through AWS Kinesis, whereas this PR implements the same flow as for VPC Flow logs, Load Balancer logs, and Cloudtrail logs (s3 --> SQS (optional) --> Lambda Promtail --> Loki) **Special notes for your reviewer**: + The Cloudfront log file format is different from the already implemented services, meaning we had to build yet another regex. AWS never bothered making all services follow the same log file naming convention but the "good" thing is that it's now very unlikely they will change it in the future. + The Cloudfront file name does not have any mention of the AWS account or the time of log it contains, it means we have to infer the log type from the filename format instead of finding the exact string "cloudfront" in the filename. This is why in `getLabels`, if no `type` parameter is found in the regex, we use the key corresponding to the name of the matching parser. + I introduced a new `parser` struct to group together several parameters specific to a type of log (and avoid relying too much on map key string matching and / or if statements for specific use cases) + I've been successfully running this code in several AWS environments for days. + I corrected a typo from my previous PR #9497 (wrong PR number in Changelog.md) **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] 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> commit c6fbff2 Author: Salva Corts <salva.corts@grafana.com> Date: Fri Jun 9 14:40:36 2023 +0200 Add config to avoid caching stats for recent data (#9537) **What this PR does / why we need it**: When we query the stats for recent data, we query both the ingesters and the index gateways for the stats. https://github.com/grafana/loki/blob/ebdb2b18007e024d56105afc5230383165ca1650/pkg/storage/async_store.go#L112-L114 https://github.com/grafana/loki/blob/ebdb2b18007e024d56105afc5230383165ca1650/pkg/storage/async_store.go#L126-L127 Then we merge all the responses, which means summing up all the stats https://github.com/grafana/loki/blob/ebdb2b18007e024d56105afc5230383165ca1650/pkg/storage/async_store.go#L157-L158 https://github.com/grafana/loki/blob/ebdb2b18007e024d56105afc5230383165ca1650/pkg/storage/stores/index/stats/stats.go#L23-L26 Because we have a replication factor of 3, this means that we will get the stats from the ingesters repeated up to 3 times, hence inflating the stats. In the stats cache, we store the stats for a given matcher set for the whole day, then we extract the stats from the cache by the factor of time from the request that is stored in the cache: https://github.com/grafana/loki/blob/336283acadb34f5fda9abce4e6fcef1dca9965d8/pkg/querier/queryrange/index_stats_cache.go#L33 https://github.com/grafana/loki/blob/336283acadb34f5fda9abce4e6fcef1dca9965d8/pkg/querier/queryrange/index_stats_cache.go#L40 Inflated stats for recent data will be cached, so subsequent stats extracted from the cache will be inflated regardless of the time. This PR adds a new per-tenant limit `max_stats_cache_freshness` to not cache requests with an end time that falls within Now minus this duration. Here's a scenario illustrating this. The graphs below show the bytes stats queried in the sharding middleware. We are running a log filter query that won't match any log, every 5 seconds with a length of 3h.  As can be seen, after enabling the stats cache and configuring`do_not_cache_request_within` to not cache stats for requests within 30m, the bytes stats used in the sharding middleware stopped increasing. In both cases the stats cache hit ration was 100%.  **Special notes for your reviewer**: - Blocked by #9535 - Note that this PR doesn't fix the root issue of inflated stats form the ingesters, but rather buys us some time to work on that. **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [x] Tests updated - [ ] `CHANGELOG.md` updated - [ ] 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) commit 22779e1 Author: Michel Hollands <42814411+MichelHollands@users.noreply.github.com> Date: Fri Jun 9 13:33:15 2023 +0100 Fix date template function with epoch times (#8886) **What this PR does / why we need it**: Adds new toUnixEpoch... functions to convert from a string with a Unix/Epoch time to an integer that can be used in the existing `toDate` function. Note that these are the opposites of some of the functions introduced in #8774. **Which issue(s) this PR fixes**: Fixes #8624. **Special notes for your reviewer**: **Checklist** - [ ] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [X] Documentation added - [X] Tests updated - [ ] `CHANGELOG.md` updated - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/upgrading/_index.md` --------- Signed-off-by: Michel Hollands <michel.hollands@grafana.com> commit 1b410db Author: Bruno FERNANDO <bruno.fernando@jobteaser.com> Date: Fri Jun 9 13:48:42 2023 +0200 feat(promtail): add CF ClientRequestSource field (#9669) **What this PR does / why we need it**: Hey folks 👋 Little contribution here to add a useful log field for cloudflare users. Indeed I add the [ClientRequestSource field](https://developers.cloudflare.com/logs/reference/clientrequestsource/ ) which is pretty useful when debugging some specific traffic handled by cloudflare Extra: Since I was on the documentation I fixed an indentation issue that I spotted Don't hesitate to reach me if you have any questions Cheers 😉 **Which issue(s) this PR fixes**: Fixes #<issue number> **Special notes for your reviewer**: Loki rocks 🚀 **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] 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) commit b1917a6 Author: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Date: Fri Jun 9 13:38:21 2023 +0200 add "alignLeft" and "alignRight" functions (#9672) Fixes #9667 commit 98d1307 Author: Ashwanth <iamashwanth@gmail.com> Date: Fri Jun 9 12:46:38 2023 +0530 config: ensure storage config defaults apply to named stores (#9650) **What this PR does / why we need it**: Since named store config does not register any flags, storage configs defined under it do not get the defaults. For example [aws_storage_config](https://grafana.com/docs/loki/latest/configuration/#aws_storage_config) sets the default `storage_class` to `STANDARD`, but the same doesn't get applied by default when using named stores. This PR ensures that named storage configs are always assigned default values when they are unmarshalled by implementing `yaml.Unmarshaler` interface commit 4cebc2d Author: Pepe Cano <825430+ppcano@users.noreply.github.com> Date: Thu Jun 8 21:44:00 2023 +0200 Docs: replace `k6 Cloud` mention (#9599) k6 is now available as a managed service on Grafana Cloud. This is a small doc changes to remove the mention of `k6 Cloud`. --------- Co-authored-by: J Stickler <julie.stickler@grafana.com> commit 1db560f Author: Danny Kopping <danny.kopping@grafana.com> Date: Thu Jun 8 14:19:58 2023 +0200 Adding background cache (en|de)queue counters (#9665) **What this PR does / why we need it**: The background writeback cache exposes gauge metric currently for the current queue size. Gauges can be useful, but they are susceptible to sample errors because they only represent the point in time as the time of the scrape. Exposing counters for the bytes (en|de)queued to/from the cache will be more useful because they can be aggregated. Signed-off-by: Danny Kopping <danny.kopping@grafana.com> commit 609bc22 Author: Dylan Guedes <djmgguedes@gmail.com> Date: Thu Jun 8 09:04:45 2023 -0300 Distributor: Make key configurable when logging failures (#9659) **What this PR does / why we need it**: Make appending `insight=true` key-value pair to log failures configurable. **Which issue(s) this PR fixes**: N/A commit d581258 Author: Nils Griebner <nils@nils-griebner.de> Date: Thu Jun 8 11:30:52 2023 +0200 Make table manager retention options configurable in helm chart values (#9647) **What this PR does / why we need it**: Configuration options for table manager retention are hard-coded in the helm chart values at the moment so that it's not possible to enable retention deletes. **Which issue(s) this PR fixes**: Fixes #8676 **Special notes for your reviewer**: - **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] 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>
commit 065bee7 Author: Travis Patterson <travis.patterson@grafana.com> Date: Mon Jun 12 10:21:58 2023 -0600 Label Volume Endpoint (#9588) For a given set of matchers, returns the top N associated label/value pairs by volume. A query for `{cluster=prod}` will return ``` cluster=prod: size (total logs matching this matcher) . . . nth-label=nth-value ``` This is to service use cases where users want to understand where their log volume has come from by label without making multiple requests to the stats endpoint. Note: This PR is a monster but it's mostly plumbing. I've pointed out the most interesting bits that actually get the volumes from ingesters/indexs commit 4d997a5 Author: Piotr <17101802+thampiotr@users.noreply.github.com> Date: Mon Jun 12 16:24:26 2023 +0100 Fix promtail cluster template not finding all clusters. (#9684) **What this PR does / why we need it**: In promtail-mixin, the dropdown template for clusters would only include clusters that run loki. So if a cluster only run promtail and not loki, it doesn't appear. commit 57f9452 Author: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com> Date: Mon Jun 12 15:21:08 2023 +0200 Revert 9217 chaudum/tsdb chunkrefs pool (#9685) Revert #9217 (potential bug in query result) --------- Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com> commit 73ac208 Author: Salva Corts <salva.corts@grafana.com> Date: Mon Jun 12 10:46:30 2023 +0200 Improve docs for empty value in cache compression config (#9649) **What this PR does / why we need it**: Follow up PR for #9535 (comment) **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] 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) commit f239435 Author: Christophe Collot <52134228+CCOLLOT@users.noreply.github.com> Date: Fri Jun 9 15:00:31 2023 +0200 feat(lambda-promtail): add cloudfront log file ingestion support (#9573) **What this PR does / why we need it**: This PR enables ingesting logs from Cloudfront log files stored in s3 (batch). The current setup only supports streaming Cloudfront logs through AWS Kinesis, whereas this PR implements the same flow as for VPC Flow logs, Load Balancer logs, and Cloudtrail logs (s3 --> SQS (optional) --> Lambda Promtail --> Loki) **Special notes for your reviewer**: + The Cloudfront log file format is different from the already implemented services, meaning we had to build yet another regex. AWS never bothered making all services follow the same log file naming convention but the "good" thing is that it's now very unlikely they will change it in the future. + The Cloudfront file name does not have any mention of the AWS account or the time of log it contains, it means we have to infer the log type from the filename format instead of finding the exact string "cloudfront" in the filename. This is why in `getLabels`, if no `type` parameter is found in the regex, we use the key corresponding to the name of the matching parser. + I introduced a new `parser` struct to group together several parameters specific to a type of log (and avoid relying too much on map key string matching and / or if statements for specific use cases) + I've been successfully running this code in several AWS environments for days. + I corrected a typo from my previous PR #9497 (wrong PR number in Changelog.md) **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] 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> commit c6fbff2 Author: Salva Corts <salva.corts@grafana.com> Date: Fri Jun 9 14:40:36 2023 +0200 Add config to avoid caching stats for recent data (#9537) **What this PR does / why we need it**: When we query the stats for recent data, we query both the ingesters and the index gateways for the stats. https://github.com/grafana/loki/blob/ebdb2b18007e024d56105afc5230383165ca1650/pkg/storage/async_store.go#L112-L114 https://github.com/grafana/loki/blob/ebdb2b18007e024d56105afc5230383165ca1650/pkg/storage/async_store.go#L126-L127 Then we merge all the responses, which means summing up all the stats https://github.com/grafana/loki/blob/ebdb2b18007e024d56105afc5230383165ca1650/pkg/storage/async_store.go#L157-L158 https://github.com/grafana/loki/blob/ebdb2b18007e024d56105afc5230383165ca1650/pkg/storage/stores/index/stats/stats.go#L23-L26 Because we have a replication factor of 3, this means that we will get the stats from the ingesters repeated up to 3 times, hence inflating the stats. In the stats cache, we store the stats for a given matcher set for the whole day, then we extract the stats from the cache by the factor of time from the request that is stored in the cache: https://github.com/grafana/loki/blob/336283acadb34f5fda9abce4e6fcef1dca9965d8/pkg/querier/queryrange/index_stats_cache.go#L33 https://github.com/grafana/loki/blob/336283acadb34f5fda9abce4e6fcef1dca9965d8/pkg/querier/queryrange/index_stats_cache.go#L40 Inflated stats for recent data will be cached, so subsequent stats extracted from the cache will be inflated regardless of the time. This PR adds a new per-tenant limit `max_stats_cache_freshness` to not cache requests with an end time that falls within Now minus this duration. Here's a scenario illustrating this. The graphs below show the bytes stats queried in the sharding middleware. We are running a log filter query that won't match any log, every 5 seconds with a length of 3h.  As can be seen, after enabling the stats cache and configuring`do_not_cache_request_within` to not cache stats for requests within 30m, the bytes stats used in the sharding middleware stopped increasing. In both cases the stats cache hit ration was 100%.  **Special notes for your reviewer**: - Blocked by #9535 - Note that this PR doesn't fix the root issue of inflated stats form the ingesters, but rather buys us some time to work on that. **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [x] Tests updated - [ ] `CHANGELOG.md` updated - [ ] 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) commit 22779e1 Author: Michel Hollands <42814411+MichelHollands@users.noreply.github.com> Date: Fri Jun 9 13:33:15 2023 +0100 Fix date template function with epoch times (#8886) **What this PR does / why we need it**: Adds new toUnixEpoch... functions to convert from a string with a Unix/Epoch time to an integer that can be used in the existing `toDate` function. Note that these are the opposites of some of the functions introduced in #8774. **Which issue(s) this PR fixes**: Fixes #8624. **Special notes for your reviewer**: **Checklist** - [ ] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [X] Documentation added - [X] Tests updated - [ ] `CHANGELOG.md` updated - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/upgrading/_index.md` --------- Signed-off-by: Michel Hollands <michel.hollands@grafana.com> commit 1b410db Author: Bruno FERNANDO <bruno.fernando@jobteaser.com> Date: Fri Jun 9 13:48:42 2023 +0200 feat(promtail): add CF ClientRequestSource field (#9669) **What this PR does / why we need it**: Hey folks 👋 Little contribution here to add a useful log field for cloudflare users. Indeed I add the [ClientRequestSource field](https://developers.cloudflare.com/logs/reference/clientrequestsource/ ) which is pretty useful when debugging some specific traffic handled by cloudflare Extra: Since I was on the documentation I fixed an indentation issue that I spotted Don't hesitate to reach me if you have any questions Cheers 😉 **Which issue(s) this PR fixes**: Fixes #<issue number> **Special notes for your reviewer**: Loki rocks 🚀 **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] 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) commit b1917a6 Author: Gregor Zeitlinger <gregor.zeitlinger@grafana.com> Date: Fri Jun 9 13:38:21 2023 +0200 add "alignLeft" and "alignRight" functions (#9672) Fixes #9667 commit 98d1307 Author: Ashwanth <iamashwanth@gmail.com> Date: Fri Jun 9 12:46:38 2023 +0530 config: ensure storage config defaults apply to named stores (#9650) **What this PR does / why we need it**: Since named store config does not register any flags, storage configs defined under it do not get the defaults. For example [aws_storage_config](https://grafana.com/docs/loki/latest/configuration/#aws_storage_config) sets the default `storage_class` to `STANDARD`, but the same doesn't get applied by default when using named stores. This PR ensures that named storage configs are always assigned default values when they are unmarshalled by implementing `yaml.Unmarshaler` interface commit 4cebc2d Author: Pepe Cano <825430+ppcano@users.noreply.github.com> Date: Thu Jun 8 21:44:00 2023 +0200 Docs: replace `k6 Cloud` mention (#9599) k6 is now available as a managed service on Grafana Cloud. This is a small doc changes to remove the mention of `k6 Cloud`. --------- Co-authored-by: J Stickler <julie.stickler@grafana.com> commit 1db560f Author: Danny Kopping <danny.kopping@grafana.com> Date: Thu Jun 8 14:19:58 2023 +0200 Adding background cache (en|de)queue counters (#9665) **What this PR does / why we need it**: The background writeback cache exposes gauge metric currently for the current queue size. Gauges can be useful, but they are susceptible to sample errors because they only represent the point in time as the time of the scrape. Exposing counters for the bytes (en|de)queued to/from the cache will be more useful because they can be aggregated. Signed-off-by: Danny Kopping <danny.kopping@grafana.com> commit 609bc22 Author: Dylan Guedes <djmgguedes@gmail.com> Date: Thu Jun 8 09:04:45 2023 -0300 Distributor: Make key configurable when logging failures (#9659) **What this PR does / why we need it**: Make appending `insight=true` key-value pair to log failures configurable. **Which issue(s) this PR fixes**: N/A commit d581258 Author: Nils Griebner <nils@nils-griebner.de> Date: Thu Jun 8 11:30:52 2023 +0200 Make table manager retention options configurable in helm chart values (#9647) **What this PR does / why we need it**: Configuration options for table manager retention are hard-coded in the helm chart values at the moment so that it's not possible to enable retention deletes. **Which issue(s) this PR fixes**: Fixes #8676 **Special notes for your reviewer**: - **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] 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>
trevorwhitney
force-pushed
the
trevorwhitney/fix-linting
branch
from
4245472
to
077f922
Compare
github-actions
bot
removed
type/docs
salvacorts
pushed a commit
that referenced
this pull request
Jun 13, 2023
**What this PR does / why we need it**: Upgrade `golangci-lint` and fixes all the errors. The upgrade includes some stricter linting.
salvacorts
pushed a commit
that referenced
this pull request
Jun 16, 2023
**What this PR does / why we need it**: Upgrade `golangci-lint` and fixes all the errors. The upgrade includes some stricter linting.
salvacorts
added a commit
that referenced
this pull request
Jun 16, 2023
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.
What this PR does / why we need it:
I discovered out linting was a bit out of date when I ran
make lintlocally with a slightly newer version ofgolangci-lintinstalled (1.52.2 instead of 1.51.2). Going above1.51.2produced a sea of red using the same linters we currently have enabled.The majority of these errors are
unused parametererrors from therevivelinter.This PR upgrades to the latest
golangci-lintand fixes all the errors.Checklist
CONTRIBUTING.mdguide (required)CHANGELOG.mdupdateddocs/sources/upgrading/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PR