update promlog to latest version#4876
Merged
simonpasquier merged 7 commits intoprometheus:masterfrom Nov 23, 2018
alexander-yu:update-promlog
Merged
update promlog to latest version#4876simonpasquier merged 7 commits intoprometheus:masterfrom alexander-yu:update-promlog
simonpasquier merged 7 commits intoprometheus:masterfrom
alexander-yu:update-promlog
Conversation
Signed-off-by: Alex Yu <yu.alex96@gmail.com>
Signed-off-by: Alex Yu <yu.alex96@gmail.com>
Signed-off-by: Alex Yu <yu.alex96@gmail.com>
Member
This is working as intended regarding Go modules. I would say that in general, the old way of mixing different revisions for packages from the same repository (module) was more prone to errors. |
documentation/examples/remote_storage/remote_storage_adapter/main.go
Outdated
Show resolved
Hide resolved
Signed-off-by: Alex Yu <yu.alex96@gmail.com>
Signed-off-by: Alex Yu <yu.alex96@gmail.com>
Signed-off-by: Alex Yu <yu.alex96@gmail.com>
Contributor
Author
|
Updated again so we only need to initialize the config; also modified |
documentation/examples/remote_storage/remote_storage_adapter/main.go
Outdated
Show resolved
Hide resolved
Contributor
|
That looks good bar Simon's comments. |
Signed-off-by: Alex Yu <yu.alex96@gmail.com>
Contributor
Author
|
Cleaned up the imports as per Simon's CR. |
Member
|
LGTM |
Member
|
Merging since Brian already gave approval. Thanks! |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Revendor
prometheus/commonfor the latest promlog version, in order to support changes from prometheus/common#136 (and prometheus/common#156); this resolves #3219 (i.e. adding JSON support for log output format).Note: when revendoring (via
go mod) promlog, this ended up retrieving the latest version of the entireprometheus/commonrepo; is there a good way of having a more granular update? I'm unsure what effects there are for updating the other parts of theprometheus/commonrepo (running tests locally withmake testdidn't seem to cause any errors).