Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions pythonkuma/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,13 @@ class UptimeKumaMonitor(UptimeKumaBaseModel):
monitor_url: str | None = field(
metadata={"deserialize": lambda v: None if v == "null" else v}
)
monitor_uptime_ratio_1d: float | None = None
monitor_uptime_ratio_30d: float | None = None
monitor_uptime_ratio_365d: float | None = None

monitor_response_time_seconds_1d: float | None = None
monitor_response_time_seconds_30d: float | None = None
monitor_response_time_seconds_365d: float | None = None


@dataclass
Expand Down
8 changes: 6 additions & 2 deletions pythonkuma/uptimekuma.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,14 @@ async def metrics(self) -> dict[str | int, UptimeKumaMonitor]:
else sample.labels["monitor_name"]
)

monitors.setdefault(key, sample.labels).update(
{sample.name: sample.value}
name = (
f"{sample.name}_{window}"
if (window := sample.labels.get("window"))
else sample.name
)

monitors.setdefault(key, sample.labels).update({name: sample.value})

return {
key: UptimeKumaMonitor.from_dict(value)
for key, value in monitors.items()
Expand Down
Loading