Skip to content

urljoin removes path after base url #1342

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.

Sign up for GitHub

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

Merged
arikalon1 merged 1 commit into from
Jan 8, 2026
Merged

urljoin removes path after base url #1342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions holmes/plugins/toolsets/grafana/toolset_grafana.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def health_check(self) -> Tuple[bool, str]:
"""Test connectivity by invoking GetDashboardTags tool."""
tool = GetDashboardTags(self)
try:
_ = tool._make_grafana_request("/api/dashboards/tags", {})
_ = tool._make_grafana_request("api/dashboards/tags", {})
return True, ""
except Exception as e:
return False, f"Failed to connect to Grafana {str(e)}"
Expand Down Expand Up @@ -106,7 +106,10 @@ def _make_grafana_request(
Returns:
StructuredToolResult with the API response data
"""
url = urljoin(get_base_url(self._toolset.grafana_config), endpoint)
base_url = get_base_url(self._toolset.grafana_config)
if not base_url.endswith("/"):
base_url += "/"
url = urljoin(base_url, endpoint)
Comment thread
arikalon1 marked this conversation as resolved.
headers = build_headers(
api_key=self._toolset.grafana_config.api_key,
additional_headers=self._toolset.grafana_config.headers,
Expand Down Expand Up @@ -216,7 +219,7 @@ def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolRes
if params.get("page"):
query_params["page"] = params["page"]

result = self._make_grafana_request("/api/search", params, query_params)
result = self._make_grafana_request("api/search", params, query_params)

config = self._toolset.grafana_config
search_url = _build_grafana_dashboard_url(config, query_params=query_params)
Expand Down Expand Up @@ -258,7 +261,7 @@ def __init__(self, toolset: GrafanaToolset):

def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
uid = params["uid"]
result = self._make_grafana_request(f"/api/dashboards/uid/{uid}", params)
result = self._make_grafana_request(f"api/dashboards/uid/{uid}", params)

dashboard_url = _build_grafana_dashboard_url(
self._toolset.grafana_config, uid=uid
Expand All @@ -282,7 +285,7 @@ def __init__(self, toolset: GrafanaToolset):
)

def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
result = self._make_grafana_request("/api/dashboards/home", params)
result = self._make_grafana_request("api/dashboards/home", params)
config = self._toolset.grafana_config
dashboard_url = None
if isinstance(result.data, dict):
Expand All @@ -308,7 +311,7 @@ def __init__(self, toolset: GrafanaToolset):
)

def _invoke(self, params: dict, context: ToolInvokeContext) -> StructuredToolResult:
result = self._make_grafana_request("/api/dashboards/tags", params)
result = self._make_grafana_request("api/dashboards/tags", params)

config = self._toolset.grafana_config
tags_url = _build_grafana_dashboard_url(config)
Expand Down
Loading