Merge branch 'main' into rel-210

ansible-collections · Aug 7, 2024 · ab8326d · ab8326d
2 parents 60c6332 + e878b5a
commit ab8326d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/changelogs/fragments/392-dashboard-lookup-apikey.yml b/changelogs/fragments/392-dashboard-lookup-apikey.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Fixed check if grafana_api_key is defined for `grafana_dashboard` lookup
diff --git a/plugins/lookup/grafana_dashboard.py b/plugins/lookup/grafana_dashboard.py
@@ -152,7 +152,7 @@ def grafana_switch_organisation(self, headers):
 
     def grafana_headers(self):
         headers = {"content-type": "application/json; charset=utf8"}
-        if self.grafana_api_key.get("grafana_api_key", None):
+        if self.grafana_api_key:
             headers["Authorization"] = "Bearer %s" % self.grafana_api_key
         else:
             headers["Authorization"] = basic_auth_header(
@@ -222,9 +222,9 @@ def run(self, terms, variables=None, **kwargs):
             grafana_dict[key] = value
 
         grafana = GrafanaAPI(
-            **grafana_dict,
             validate_certs=self.get_option("validate_certs"),
             ca_path=self.get_option("ca_path"),
+            **grafana_dict,
         )
 
         ret = grafana.grafana_list_dashboards()