Fix for errors in prometheus connector when backquotes are used for fieldnames in aggregations. #1041
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
Codecov Report
@@ Coverage Diff @@
## 2.4 #1041 +/- ##
============================================
- Coverage 98.26% 95.68% -2.58%
- Complexity 3326 3332 +6
============================================
Files 324 334 +10
Lines 8400 9071 +671
Branches 553 672 +119
============================================
+ Hits 8254 8680 +426
- Misses 142 334 +192
- Partials 4 57 +53
Flags with carried forward coverage won't be shown. Click here to find out more.
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
|
Backquotes could be used to wrap any identifier. Could you, please, test a more complex scenario? source=`prometheus`.`promhttp_metric` | stats avg(@value) as `agg` by span(@timestamp, 15s), `instance`, `handler`, `job` |
vamsi-amazon
force-pushed
the
backquote-fix
branch
2 times, most recently
from
63df9f9
to
2c6d0d2
Compare
Sure |
vamsi-amazon
force-pushed
the
backquote-fix
branch
from
2c6d0d2
to
acce058
Compare
ps48
previously approved these changes
Nov 8, 2022
penghuo
reviewed
Nov 8, 2022
YANG-DB
previously approved these changes
Nov 8, 2022
anirudha
previously approved these changes
Nov 8, 2022
vamsi-amazon
dismissed stale reviews from anirudha, YANG-DB, and ps48
via
77588fd
vamsi-amazon
force-pushed
the
backquote-fix
branch
from
acce058
to
77588fd
Compare
Signed-off-by: vamsi-amazon <reddyvam@amazon.com>
vamsi-amazon
force-pushed
the
backquote-fix
branch
from
77588fd
to
0cc5dc7
Compare
joshuali925
approved these changes
Nov 8, 2022
ps48
approved these changes
Nov 8, 2022
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Nov 8, 2022
Signed-off-by: vamsi-amazon <reddyvam@amazon.com> (cherry picked from commit d3bb902)
vamsi-amazon
added a commit
that referenced
this pull request
Nov 8, 2022
dai-chen
added a commit
that referenced
this pull request
Nov 9, 2022
* Fix `FLOAT` -> `DOUBLE` cast. (#1025) Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com> * Fix error messaging from prometheus. (#1029) (#1037) Signed-off-by: vamsi-amazon <reddyvam@amazon.com> (cherry picked from commit 4a9cef3) Co-authored-by: vamsi-amazon <reddyvam@amazon.com> * Add `query` function as alternate syntax to `query_string` function (#1010) This maintains backwards compatibility with the v1 engine. * Update DATE and TIME functions to parse string input as datetime (#991) Add option to accept datetime like string in both TIME and DATE (eg. accept "1999-01-02 12:12:12" for both TIME and DATE. Strict check on date for testing for valid dates (eg. Don't accept Feb 30th as a valid date) and throws a SemanticCheckException. Co-authored-by: Yury-Fridlyand <yuryf@bitquilltech.com> Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> * back quote fix (#1041) (#1050) Signed-off-by: vamsi-amazon <reddyvam@amazon.com> (cherry picked from commit d3bb902) Co-authored-by: vamsi-amazon <reddyvam@amazon.com> * Catalog to Datasource changes (#1027) (#1049) Signed-off-by: vamsi-amazon <reddyvam@amazon.com> (cherry picked from commit 3e30379) * Bump jackson to 2.14.0 (#1058) Signed-off-by: Joshua Li <joshuali925@gmail.com> (cherry picked from commit 5a1adb2) * Add valueOf() to Expression (#1055) Signed-off-by: Joshua Li <joshuali925@gmail.com> Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com> Signed-off-by: MitchellGale-BitQuill <mitchellg@bitquilltech.com> Signed-off-by: Joshua Li <joshuali925@gmail.com> Signed-off-by: Chen Dai <daichen@amazon.com> Co-authored-by: Yury-Fridlyand <yuryf@bitquilltech.com> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: vamsi-amazon <reddyvam@amazon.com> Co-authored-by: GabeFernandez310 <64448015+GabeFernandez310@users.noreply.github.com> Co-authored-by: MitchellGale-BitQuill <104795536+MitchellGale-BitQuill@users.noreply.github.com> Co-authored-by: Joshua Li <joshuali925@gmail.com>
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.
Signed-off-by: vamsi-amazon reddyvam@amazon.com
Description
Backquotes in stats groupby list is causing errors in prometheus connector.
Eg command:
source=prometheus.promhttp_metric | stats avg(@value) by span(@timestamp, 15s), `instance`
Issues Resolved
[List any issues this PR will resolve]
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.