Skip to content

Fix cortex query seconds total #3589

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

Merged
merged 15 commits into from
Dec 11, 2020

Conversation

Wing924
Copy link
Contributor

@Wing924 Wing924 commented Dec 11, 2020

What this PR does:
bugfix: Query-Frontend: cortex_query_seconds_total now return seconds not nanoseconds.

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]
…oseconds.

Signed-off-by: Wing924 <weihe924stephen@gmail.com>
@Wing924 Wing924 force-pushed the fix_cortex_query_seconds_total branch from 3fb66d6 to a91330e Compare December 11, 2020 10:16
@Wing924
Copy link
Contributor Author

Wing924 commented Dec 11, 2020

before:
スクリーンショット 2020-12-11 17 58 57
after:
スクリーンショット 2020-12-11 19 17 35

Signed-off-by: Wing924 <weihe924stephen@gmail.com>
Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, Thanks!

@pstibrany
Copy link
Contributor

@jtlisi Worth including in Cortex 1.6.0?

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fix!

@jtlisi
Copy link
Contributor

jtlisi commented Dec 11, 2020

@jtlisi Worth including in Cortex 1.6.0?

I think so. I'll make a note to cherry pick this for rc.1

Copy link
Contributor

@jtlisi jtlisi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@pracucci pracucci merged commit d37c887 into cortexproject:master Dec 11, 2020
@Wing924 Wing924 deleted the fix_cortex_query_seconds_total branch December 11, 2020 12:00
jtlisi pushed a commit that referenced this pull request Dec 19, 2020
* Fixes `-config.expand-env` requires argument.
Fixes #3082

Signed-off-by: Wing924 <weihe924stephen@gmail.com>

* fix

Signed-off-by: Wing924 <weihe924stephen@gmail.com>

* Query-Frontend: cortex_query_seconds_total now return seconds not nanoseconds.

Signed-off-by: Wing924 <weihe924stephen@gmail.com>

* fix

Signed-off-by: Wing924 <weihe924stephen@gmail.com>

* Update CHANGELOG.md

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Co-authored-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
@jtlisi jtlisi mentioned this pull request Dec 19, 2020
jtlisi added a commit that referenced this pull request Dec 19, 2020
* Fixes `-config.expand-env` requires argument.
Fixes #3082

Signed-off-by: Wing924 <weihe924stephen@gmail.com>

* fix

Signed-off-by: Wing924 <weihe924stephen@gmail.com>

* Query-Frontend: cortex_query_seconds_total now return seconds not nanoseconds.

Signed-off-by: Wing924 <weihe924stephen@gmail.com>

* fix

Signed-off-by: Wing924 <weihe924stephen@gmail.com>

* Update CHANGELOG.md

Signed-off-by: Marco Pracucci <marco@pracucci.com>

Co-authored-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>

Co-authored-by: Wei He <weihe924stephen@gmail.com>
Co-authored-by: Marco Pracucci <marco@pracucci.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4 participants