feat: update logcli so it tries to load the latest version of the schemaconfig #11852
+190
−45
Conversation
This file contains hidden or 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
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Signed-off-by: Michel Hollands <michel.hollands@grafana.com>
Co-authored-by: Dylan Guedes <djmgguedes@gmail.com>
Co-authored-by: Dylan Guedes <djmgguedes@gmail.com>
MichelHollands
changed the title
vlad-diachenko
requested changes
Mar 15, 2024
pkg/logcli/query/query.go
Outdated
Comment on lines
399
to
406
| searchFor := fmt.Sprintf("%s.yaml", schemaConfigFilename) // schemaconfig.yaml for backwards compatibility | ||
| loadedSchema, err := LoadSchemaUsingObjectClient(client, searchFor) | ||
| if err == nil { | ||
| return loadedSchema, nil | ||
| } | ||
| if err != errNotExists && err != nil { | ||
| return nil, err | ||
| } |
There was a problem hiding this comment.
we need to move this fallback logic to the end of the function.
let's say if we do not have any files with the naming convention schemaconfig-tenant.yaml or schemaconfig-tenant-N.yaml, then we fallback and load schemaconfig.yaml.
with the current implementation, it will always load schemaconfig.yaml even if newer files exist.
There was a problem hiding this comment.
Good catch. This has been moved to the back. Tests have been added as well to check the cases of 1) a single legacy schemaconfig and 2) both a new style one and a legacy one.
Tested it with running logcli against a GCP bucket with bucket retention policy set.
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
vlad-diachenko
approved these changes
Mar 15, 2024
Signed-off-by: Michel Hollands <michel.hollands@gmail.com>
rhnasc
pushed a commit
to inloco/loki
that referenced
this pull request
Apr 12, 2024
…emaconfig (grafana#11852) Signed-off-by: Michel Hollands <michel.hollands@gmail.com> Signed-off-by: Michel Hollands <michel.hollands@grafana.com> Co-authored-by: Dylan Guedes <djmgguedes@gmail.com>
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:
Cloud Logs exporter will write new versions of the schema config in separate files now. This means it will work with object stores that have a policy of write once (ie no updates). Logcli is changed in this PR to take that into account.
Checklist
CONTRIBUTING.mdguide (required)CHANGELOG.mdupdatedadd-to-release-noteslabeldocs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR