dsquery: loki results depend on grafana version

Author: peekjef72

grafana_client/elements/datasource.py

@@ -16,6 +16,7 @@
 logger = logging.getLogger(__name__)
 
 VERSION_9 = LooseVersion("9")
+VERSION_7 = LooseVersion("7")
 VERBOSE = False
 
 
@@ -533,9 +534,14 @@ def health_check(self, datasource: Union[DatasourceIdentifier, Dict]) -> Datasou
                     message = f"Invalid response. {reason}"
 
             elif datasource_type == "loki":
-                if "status" in response and response["status"] == "success":
-                    message = "Success"
-                    success = True
+                if self.api.version:
+                    if LooseVersion(self.api.version) == VERSION_7:
+                        if "status" in response and response["status"] == "success":
+                            message = "Success"
+                            success = True
+                    elif "results" in response and "test" in response["results"]:
+                        message = "Success"
+                        success = True
                 else:
                     message = response["message"]