v1.9.42: full Grafana/Prometheus GUI & CLI improvements
Grafana tab: - Datasources table (Name, Type, URL, Default) - Open Grafana button (opens browser) - Switch to AlertManager endpoint for real-time active alerts Prometheus tab: - Quick query buttons (up, CPU, Memory) - Metrics browser popup with filter (loads all metric names) - Rules section (recording + alerting rules Treeview) CLI: - --grafana-datasources ALIAS - --prom-rules ALIAS i18n: 28 new keys (EN/RU/ZH) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
"""
|
||||
Grafana tab — dashboards browser and alerts overview.
|
||||
Grafana tab — dashboards browser, active alerts, and datasources overview.
|
||||
"""
|
||||
|
||||
import threading
|
||||
@@ -9,7 +9,7 @@ from tkinter import ttk
|
||||
import customtkinter as ctk
|
||||
from core.grafana_client import GrafanaClient
|
||||
from core.i18n import t
|
||||
from core.icons import icon_text, make_icon_button, reconfigure_icon_button
|
||||
from core.icons import make_icon_button, reconfigure_icon_button
|
||||
from gui.tabs.query_tab import apply_dark_scrollbar_style
|
||||
|
||||
|
||||
@@ -25,18 +25,23 @@ class GrafanaTab(ctk.CTkFrame):
|
||||
|
||||
def _build_ui(self):
|
||||
apply_dark_scrollbar_style()
|
||||
# ── Header + Refresh ──
|
||||
# ── Header + buttons ──
|
||||
header_frame = ctk.CTkFrame(self, fg_color="transparent")
|
||||
header_frame.pack(fill="x", padx=15, pady=(15, 5))
|
||||
|
||||
title = ctk.CTkLabel(header_frame, text=t("grafana_title"),
|
||||
title = ctk.CTkLabel(header_frame, text="Grafana",
|
||||
font=ctk.CTkFont(size=18, weight="bold"))
|
||||
title.pack(side="left")
|
||||
|
||||
self._refresh_btn = make_icon_button(header_frame, "refresh", t("grafana_refresh"), width=110,
|
||||
self._refresh_btn = make_icon_button(header_frame, "refresh", t("grafana_refresh"), width=100,
|
||||
command=self._refresh)
|
||||
self._refresh_btn.pack(side="right")
|
||||
|
||||
self._open_btn = make_icon_button(header_frame, "browser", t("grafana_open_browser"), width=130,
|
||||
fg_color="#6b7280", hover_color="#4b5563",
|
||||
command=self._open_grafana)
|
||||
self._open_btn.pack(side="right", padx=(0, 5))
|
||||
|
||||
# ── Dashboards section ──
|
||||
dash_label = ctk.CTkLabel(self, text=t("grafana_dashboards"),
|
||||
font=ctk.CTkFont(size=14, weight="bold"), anchor="w")
|
||||
@@ -47,7 +52,7 @@ class GrafanaTab(ctk.CTkFrame):
|
||||
|
||||
columns = ("uid", "title", "folder")
|
||||
self._dash_tree = ttk.Treeview(dash_frame, columns=columns, show="headings",
|
||||
selectmode="browse", height=8)
|
||||
selectmode="browse", height=6)
|
||||
self._dash_tree.heading("uid", text="UID")
|
||||
self._dash_tree.heading("title", text=t("grafana_dash_title"))
|
||||
self._dash_tree.heading("folder", text=t("grafana_dash_folder"))
|
||||
@@ -59,7 +64,6 @@ class GrafanaTab(ctk.CTkFrame):
|
||||
dash_scroll = ttk.Scrollbar(dash_frame, orient="vertical", command=self._dash_tree.yview, style="Dark.Vertical.TScrollbar")
|
||||
dash_scroll.pack(side="right", fill="y")
|
||||
self._dash_tree.configure(yscrollcommand=dash_scroll.set)
|
||||
|
||||
self._dash_tree.bind("<Double-1>", self._on_dashboard_click)
|
||||
|
||||
# ── Alerts section ──
|
||||
@@ -72,7 +76,7 @@ class GrafanaTab(ctk.CTkFrame):
|
||||
|
||||
alert_columns = ("state", "name", "severity")
|
||||
self._alerts_tree = ttk.Treeview(alerts_frame, columns=alert_columns, show="headings",
|
||||
selectmode="browse", height=6)
|
||||
selectmode="browse", height=5)
|
||||
self._alerts_tree.heading("state", text=t("grafana_alert_state"))
|
||||
self._alerts_tree.heading("name", text=t("grafana_alert_name"))
|
||||
self._alerts_tree.heading("severity", text=t("grafana_alert_severity"))
|
||||
@@ -85,6 +89,31 @@ class GrafanaTab(ctk.CTkFrame):
|
||||
alerts_scroll.pack(side="right", fill="y")
|
||||
self._alerts_tree.configure(yscrollcommand=alerts_scroll.set)
|
||||
|
||||
# ── Datasources section ──
|
||||
ds_label = ctk.CTkLabel(self, text=t("grafana_datasources"),
|
||||
font=ctk.CTkFont(size=14, weight="bold"), anchor="w")
|
||||
ds_label.pack(fill="x", padx=15, pady=(10, 3))
|
||||
|
||||
ds_frame = ctk.CTkFrame(self, fg_color="transparent")
|
||||
ds_frame.pack(fill="both", expand=True, padx=15, pady=(0, 5))
|
||||
|
||||
ds_columns = ("name", "type", "url", "default")
|
||||
self._ds_tree = ttk.Treeview(ds_frame, columns=ds_columns, show="headings",
|
||||
selectmode="browse", height=4)
|
||||
self._ds_tree.heading("name", text=t("grafana_ds_name"))
|
||||
self._ds_tree.heading("type", text=t("grafana_ds_type"))
|
||||
self._ds_tree.heading("url", text="URL")
|
||||
self._ds_tree.heading("default", text=t("grafana_ds_default"))
|
||||
self._ds_tree.column("name", width=150, minwidth=100)
|
||||
self._ds_tree.column("type", width=120, minwidth=80)
|
||||
self._ds_tree.column("url", width=250, minwidth=120)
|
||||
self._ds_tree.column("default", width=60, minwidth=40)
|
||||
self._ds_tree.pack(side="left", fill="both", expand=True)
|
||||
|
||||
ds_scroll = ttk.Scrollbar(ds_frame, orient="vertical", command=self._ds_tree.yview, style="Dark.Vertical.TScrollbar")
|
||||
ds_scroll.pack(side="right", fill="y")
|
||||
self._ds_tree.configure(yscrollcommand=ds_scroll.set)
|
||||
|
||||
# ── Status bar ──
|
||||
self._status_bar = ctk.CTkLabel(self, text=t("grafana_no_server"), anchor="w",
|
||||
font=ctk.CTkFont(size=11), text_color="#9ca3af")
|
||||
@@ -93,7 +122,6 @@ class GrafanaTab(ctk.CTkFrame):
|
||||
# ── Public API ──
|
||||
|
||||
def set_server(self, alias: str | None):
|
||||
"""Called when user selects a server in sidebar."""
|
||||
self._current_alias = alias
|
||||
self._client = None
|
||||
self._dashboards.clear()
|
||||
@@ -109,24 +137,26 @@ class GrafanaTab(ctk.CTkFrame):
|
||||
|
||||
def _refresh(self):
|
||||
if not self._current_alias:
|
||||
self._set_status(t("no_server_selected"), "#ef4444")
|
||||
self._set_status(t("grafana_no_server"), "#ef4444")
|
||||
return
|
||||
|
||||
self._refresh_btn.configure(state="disabled", text=t("grafana_loading"))
|
||||
self._refresh_btn.configure(state="disabled")
|
||||
self._set_status(t("grafana_loading"), "#ccaa00")
|
||||
|
||||
def _do():
|
||||
try:
|
||||
client = self._get_client()
|
||||
|
||||
dashboards = client.list_dashboards()
|
||||
alerts = client.list_alerts()
|
||||
alerts = client.get_active_alerts()
|
||||
datasources = client.list_datasources()
|
||||
|
||||
self.after(0, lambda: self._populate_dashboards(dashboards))
|
||||
self.after(0, lambda: self._populate_alerts(alerts))
|
||||
self.after(0, lambda: self._populate_datasources(datasources))
|
||||
self.after(0, lambda: self._set_status(
|
||||
t("grafana_loaded").format(
|
||||
dashboards=len(dashboards), alerts=len(alerts)
|
||||
dashboards=len(dashboards), alerts=len(alerts),
|
||||
datasources=len(datasources)
|
||||
), "#22c55e"))
|
||||
except Exception as e:
|
||||
self.after(0, lambda: self._set_status(f"(error) {e}", "#ef4444"))
|
||||
@@ -160,28 +190,37 @@ class GrafanaTab(ctk.CTkFrame):
|
||||
def _populate_alerts(self, alerts: list[dict]):
|
||||
self._alerts_tree.delete(*self._alerts_tree.get_children())
|
||||
for a in alerts:
|
||||
state = a.get("state", a.get("status", "unknown"))
|
||||
name = a.get("name", a.get("title", ""))
|
||||
severity = a.get("severity", a.get("labels", {}).get("severity", "—"))
|
||||
status = a.get("status", {})
|
||||
state = status.get("state", "unknown") if isinstance(status, dict) else str(status)
|
||||
labels = a.get("labels", {})
|
||||
name = labels.get("alertname", a.get("name", ""))
|
||||
severity = labels.get("severity", "---")
|
||||
tag = ""
|
||||
if state in ("alerting", "firing"):
|
||||
if state in ("active", "firing", "alerting"):
|
||||
tag = "alerting"
|
||||
elif state in ("ok", "normal", "inactive"):
|
||||
elif state in ("suppressed", "resolved", "inactive"):
|
||||
tag = "ok"
|
||||
self._alerts_tree.insert("", "end", values=(state, name, severity), tags=(tag,))
|
||||
|
||||
# Color-code alert states
|
||||
self._alerts_tree.tag_configure("alerting", foreground="#ef4444")
|
||||
self._alerts_tree.tag_configure("ok", foreground="#22c55e")
|
||||
|
||||
def _populate_datasources(self, datasources: list[dict]):
|
||||
self._ds_tree.delete(*self._ds_tree.get_children())
|
||||
for ds in datasources:
|
||||
name = ds.get("name", "")
|
||||
ds_type = ds.get("type", "")
|
||||
url = ds.get("url", "")
|
||||
is_default = "Yes" if ds.get("isDefault", False) else ""
|
||||
self._ds_tree.insert("", "end", values=(name, ds_type, url, is_default))
|
||||
|
||||
def _clear_tables(self):
|
||||
self._dash_tree.delete(*self._dash_tree.get_children())
|
||||
self._alerts_tree.delete(*self._alerts_tree.get_children())
|
||||
self._ds_tree.delete(*self._ds_tree.get_children())
|
||||
|
||||
# ── Events ──
|
||||
|
||||
def _on_dashboard_click(self, _event):
|
||||
"""Open dashboard URL in browser on double-click."""
|
||||
selection = self._dash_tree.selection()
|
||||
if not selection:
|
||||
return
|
||||
@@ -189,20 +228,26 @@ class GrafanaTab(ctk.CTkFrame):
|
||||
uid = item["values"][0] if item["values"] else None
|
||||
if not uid:
|
||||
return
|
||||
|
||||
# Find the dashboard data to get the URL
|
||||
for d in self._dashboards:
|
||||
if d.get("uid") == uid:
|
||||
url = d.get("url", "")
|
||||
if url:
|
||||
try:
|
||||
client = self._get_client()
|
||||
full_url = f"{client.base_url}{url}"
|
||||
webbrowser.open(full_url)
|
||||
webbrowser.open(f"{client.base_url}{url}")
|
||||
except Exception:
|
||||
webbrowser.open(url)
|
||||
break
|
||||
|
||||
def _open_grafana(self):
|
||||
if not self._current_alias:
|
||||
return
|
||||
try:
|
||||
client = self._get_client()
|
||||
webbrowser.open(client.base_url)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# ── Helpers ──
|
||||
|
||||
def _set_status(self, text: str, color: str = "#9ca3af"):
|
||||
|
||||
Reference in New Issue
Block a user