Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

show list of offending labels in the error message in many-to-many scenarios #5189

Merged
merged 1 commit into from Feb 9, 2019

Conversation

Projects
None yet
3 participants
@tariq1890
Copy link
Contributor

commented Feb 7, 2019

FIxes #4608

This is an initial stab. Reviews appreciated :) @juliusv @brian-brazil

@tariq1890 tariq1890 force-pushed the tariq1890:dupl_labels branch Feb 7, 2019

Show resolved Hide resolved pkg/labels/labels.go Outdated
Show resolved Hide resolved promql/engine.go Outdated

@tariq1890 tariq1890 force-pushed the tariq1890:dupl_labels branch 2 times, most recently Feb 7, 2019

@tariq1890

This comment has been minimized.

Copy link
Contributor Author

commented Feb 7, 2019

@juliusv Thanks for reviewing. I have updated the PR.

@codesome
Copy link
Member

left a comment

Minor style nits.

Show resolved Hide resolved pkg/labels/labels_test.go Outdated
Show resolved Hide resolved pkg/labels/labels.go Outdated
Show resolved Hide resolved pkg/labels/labels.go Outdated
Show resolved Hide resolved pkg/labels/labels_test.go Outdated
Show resolved Hide resolved pkg/labels/labels_test.go Outdated
Show resolved Hide resolved pkg/labels/labels_test.go Outdated

@tariq1890 tariq1890 force-pushed the tariq1890:dupl_labels branch Feb 7, 2019

@tariq1890

This comment has been minimized.

Copy link
Contributor Author

commented Feb 7, 2019

PR comments addressed. Thanks @codesome ! Ready for more rounds of review .

Show resolved Hide resolved promql/engine.go Outdated

@tariq1890 tariq1890 force-pushed the tariq1890:dupl_labels branch 2 times, most recently Feb 8, 2019

@tariq1890

This comment has been minimized.

Copy link
Contributor Author

commented Feb 8, 2019

@juliusv I have updated the PR to show the duplicate series against the matched group of labels.

I get something like the following :

Error executing query: found multiple series for the match group {instance="localhost:9100"} on the right hand-side of the operation : [{__name__="node_cpu_seconds_total", cpu="0", instance="localhost:9100", job="node", mode="nice"}, {__name__="node_cpu_seconds_total", cpu="0", instance="localhost:9100", job="node", mode="idle"}] ;many-to-many matching not allowed: matching labels must be unique on one side

@tariq1890 tariq1890 force-pushed the tariq1890:dupl_labels branch Feb 8, 2019

Show resolved Hide resolved promql/engine.go Outdated
show list of offending labels in the error message in many-to-many sc…
…enarios

Signed-off-by: tariqibrahim <tariq181290@gmail.com>

@tariq1890 tariq1890 force-pushed the tariq1890:dupl_labels branch to 220c0a1 Feb 8, 2019

@juliusv

This comment has been minimized.

Copy link
Member

commented Feb 9, 2019

👍 Thanks!

@juliusv juliusv merged commit a2a6e24 into prometheus:master Feb 9, 2019

3 checks passed

ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: test Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

yeya24 added a commit to yeya24/prometheus that referenced this pull request Feb 16, 2019

show list of offending labels in the error message in many-to-many sc…
…enarios (prometheus#5189)

Signed-off-by: tariqibrahim <tariq181290@gmail.com>

@simonpasquier simonpasquier referenced this pull request Mar 1, 2019

Merged

*: cut 2.8.0-rc.0 #5287

@tariq1890 tariq1890 deleted the tariq1890:dupl_labels branch Mar 3, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.