Improve smartquery and query_factory beyond data source health checks
#112
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
amotl
changed the title
smartquery and query_factory beyond data source health checks
Codecov Report
@@ Coverage Diff @@
## main #112 +/- ##
==========================================
- Coverage 95.88% 95.15% -0.73%
==========================================
Files 25 25
Lines 1531 1590 +59
==========================================
+ Hits 1468 1513 +45
- Misses 63 77 +14
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
now returns dict containing all info to request Grafana API.
fix smart_query for check_health
amotl
force-pushed
the
datasource-smartquery-improvements
branch
from
ce855a9
to
878ca42
Compare
amotl
force-pushed
the
datasource-smartquery-improvements
branch
from
878ca42
to
5782066
Compare
amotl
commented
Sep 15, 2023
Comment on lines
492
to
503
| elif datasource_type == "loki": | ||
| if "status" in response and response["status"] == "success": | ||
| if self.api.version and VERSION_7 <= LooseVersion(self.api.version) < VERSION_8: | ||
| if "status" in response and response["status"] == "success": | ||
| message = "Success" | ||
| success = True | ||
| else: | ||
| message = response.get("message", "Unknown error") | ||
| elif "results" in response and "test" in response["results"]: | ||
| message = "Success" | ||
| success = True | ||
| else: | ||
| elif "message" in response: | ||
| message = response["message"] |
There was a problem hiding this comment.
I've adjusted this a bit, compared to your version, @peekjef72. When anything is wrong, please send fixes. 🌻
| @@ -403,6 +440,7 @@ def health_check(self, datasource: Union[DatasourceIdentifier, Dict]) -> Datasou | |||
| expression = get_healthcheck_expression(datasource_type, datasource_dialect) | |||
|
|
|||
| start = time.time() | |||
| message = "Unknown error" | |||
There was a problem hiding this comment.
I discovered cases where this was needed. Apparently, not all code paths have been covering this before.
Comment on lines
+378
to
+397
| elif datasource_type in ("prometheus", "loki") and LooseVersion(self.api.version) <= VERSION_7: | ||
| if ( | ||
| "queries" in request["data"] | ||
| and len(request["data"]["queries"]) > 0 | ||
| and "instant" in request["data"]["queries"][0] | ||
| and request["data"]["queries"][0]["instant"] | ||
| ): | ||
| return self.query( | ||
| datasource.get("id"), | ||
| request["expr"], | ||
| request["data"]["to"], | ||
| ) | ||
| else: | ||
| return self.query_range( | ||
| datasource.get("id"), | ||
| request["expr"], | ||
| request["data"]["from"], | ||
| request["data"]["to"], | ||
| request["data"]["step"], | ||
| ) |
There was a problem hiding this comment.
We don't have tests for those yet. Do you think you can add some?
Comment on lines
+154
to
+159
| if "time_from" in model: | ||
| query["from"] = model["time_from"] | ||
| if "time_to" in model: | ||
| query["until"] = model["time_to"] | ||
|
|
||
| request["data"] = query |
There was a problem hiding this comment.
This spot also lacks testing.
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.
Hi there,
this patch by @peekjef72 (thanks!) will improve the datasource query interface, which is an experimental subsystem of grafana-client, aiming to provide a unified interface for querying data sources "behind" Grafana.
Dear @peekjef72, I am handing in your patch from GH-38 separately, to have something to compare against in the case something went wrong with the rebasing, and for your and future references.
I will continue here to add corresponding adjustments to the test suite, in order to integrate this patch.
With kind regards,
Andreas.