[sync part2] Moved client prometheus code to separate promclient package. #729
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
bwplotka
commented
Jan 14, 2019
| @@ -606,117 +605,6 @@ func runRule( | |||
| return nil | |||
| } | |||
|
|
|||
| // Scalar response consists of array with mixed types so it needs to be | |||
| // unmarshaled separatelly. | |||
| func convertScalarJSONToVector(scalarJSONResult json.RawMessage) (model.Vector, error) { | |||
There was a problem hiding this comment.
Those two are 1:1 moved, nothing changed.
bwplotka
commented
Jan 14, 2019
| ) | ||
|
|
||
| func TestRule_UnmarshalScalarResponse(t *testing.T) { |
bwplotka
commented
Jan 14, 2019
| @@ -357,45 +338,3 @@ func (s *metadata) Timestamps() (mint int64, maxt int64) { | |||
|
|
|||
| return s.mint, s.maxt | |||
| } | |||
|
|
|||
| func queryExternalLabels(ctx context.Context, logger log.Logger, base *url.URL) (labels.Labels, error) { | |||
bwplotka
commented
Jan 14, 2019
| "github.com/improbable-eng/thanos/pkg/testutil" | ||
| ) | ||
|
|
||
| func TestSidecar_queryExternalLabels(t *testing.T) { |
bwplotka
changed the title
domgreen
reviewed
Jan 22, 2019
bwplotka
force-pushed
the
bucket-usage-simplify
branch
2 times, most recently
from
e8933b0 to
fd8d951
Compare
|
Addressed. Will rebase later, as it should not affect it much, conflict is because of imports... |
bwplotka
force-pushed
the
bucket-usage-simplify
branch
from
fd8d951 to
7b72b6d
Compare
bwplotka
force-pushed
the
promclient
branch
2 times, most recently
from
126de42 to
8c4cc0c
Compare
domgreen
approved these changes
Jan 30, 2019
FUSAKLA
approved these changes
Jan 30, 2019
bwplotka
force-pushed
the
promclient
branch
3 times, most recently
from
ef254d1 to
02b0186
Compare
Nothing changed, except fixed IsWALDirAccessible (as WAL is actually a dir). Otherwise just moved code. Signed-off-by: Bartek Plotka <[email protected]>
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.
Allows to reuse Prometheus client methods cleanly.
Nothing changed, except fixed IsWALDirAccessible (as WAL is actually a dir). Otherwise just moved code.
This is prerequisite for #731