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

Fixes unit in stats request log. #2093

Merged
merged 2 commits into from
May 19, 2020

Conversation

cyriltovena
Copy link
Contributor

Mistakes were made

/cc @slim-bean

@cyriltovena
Copy link
Contributor Author

hum one old commit slip into this. let me see.

🤦

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

👀 LGTM

@slim-bean
Copy link
Collaborator

LOL at least you were consistent in your tests being wrong too :)

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
@codecov-commenter
Copy link

Codecov Report

Merging #2093 into master will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2093   +/-   ##
=======================================
  Coverage   61.28%   61.28%           
=======================================
  Files         146      146           
  Lines       11187    11187           
=======================================
  Hits         6856     6856           
  Misses       3785     3785           
  Partials      546      546           
Impacted Files Coverage Δ
pkg/logql/metrics.go 90.90% <100.00%> (ø)

@slim-bean slim-bean merged commit c81be66 into grafana:master May 19, 2020
cyriltovena added a commit to cyriltovena/loki that referenced this pull request May 19, 2020
* Fix unit conversion in stats log.

🤦

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Fix the tests because you know ! you know ?

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

wip

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
cyriltovena added a commit that referenced this pull request May 19, 2020
* Fixes unit in stats request log. (#2093)

* Fix unit conversion in stats log.

🤦

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Fix the tests because you know ! you know ?

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

wip

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Add backtick for the quoted  string token lexer.

This allows to pass unescaped string to Loki.

For example we now support this :

`` {name="cassandra"} |~  `error=\w+` ``
`` {name!~`mysql-\d+`} ``

As you can see no escape is required when using ` quoted strings.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Fixes newlines.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Add back missing test.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
cyriltovena pushed a commit to cyriltovena/loki that referenced this pull request Jun 11, 2021
…grafana#2093)

* add option to configure approved password authenticators in Cassandra

Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>

* update docs and change log

Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>

* update field name to custom_authenticators

Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants