Put Backup coverage and Proxmox Backup Server on one page, in two tabs
Backups → Proxmox backups has a Backup coverage tab and a Proxmox Backup Server tab (?view=pbs), each keeping its own title and buttons. /pbs redirects to the second tab so old links and favourites still work; the sidebar's two entries become one, and the Backup Server's alert and integration links go to the tab. Docs updated. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
4dd7901f1c
commit
07ce2b0305
10 files changed
+41
-16
No files matched your search
@@ -153,6 +153,7 @@ That works on every Duplicati version, needs no login handshake and leaves nothi
|
||||
### Proxmox Backup Server
|
||||
|
||||
- **Config fields:** Proxmox Backup Server URL, API token ID, API token secret, allow self-signed certificate
|
||||
- **Where it shows:** **Backups → Proxmox backups → *Proxmox Backup Server*** tab, next to the *Backup coverage* tab (`/backups?view=pbs`; the old `/pbs` address goes there).
|
||||
- **Auth:** `PBSAPIToken=<tokenId>:<tokenSecret>` header — note the **colon** between the token id and secret; Proxmox
|
||||
VE's own token header uses `=` there instead, so a PVE token/secret pair copied verbatim into this integration's
|
||||
fields will still format correctly (the adapter supplies the colon itself) as long as the id/secret values
|
||||
|
||||
@@ -682,7 +682,9 @@ every few hours, with each day as an all-day event and maintenance with its star
|
||||
calendar; *with names* also gives the name and a link back. Like any share link the address is shown once and can be removed. Tailscale keys are asked for at most every
|
||||
ten minutes, and only those the integration reports as expiring soon are listed.
|
||||
|
||||
**Backup coverage** (Backups → Backup coverage) answers "what isn't backed
|
||||
**Proxmox backups** (Backups → Proxmox backups) is one page with two tabs: *Backup coverage* and
|
||||
*Proxmox Backup Server* (the integration's datastores and verification; the old `/pbs` address goes to
|
||||
that tab). **Backup coverage** answers "what isn't backed
|
||||
up?" for every Proxmox guest: is a backup job covering it, when was it last backed up
|
||||
(from the newest snapshot on a Proxmox Backup Server, or the last successful Proxmox
|
||||
backup task that names the guest), and did that go well — Recent backup, Stale (older
|
||||
|
||||
@@ -41,8 +41,7 @@ page's own top-level link.
|
||||
| Nextcloud | `/nextcloud` | ✅ | ✅ | ✅ |
|
||||
| Authentik | `/authentik` | ✅ | ✅ | ✅ |
|
||||
| **Backups** | | | | |
|
||||
| Backup coverage | `/backups` | ✅ | ✅ | ✅ |
|
||||
| Proxmox Backup | `/pbs` | ✅ | ✅ | ✅ |
|
||||
| Proxmox backups (tabs: Backup coverage, Proxmox Backup Server) | `/backups` | ✅ | ✅ | ✅ |
|
||||
| Duplicati | `/duplicati` | ✅ | ✅ | ✅ |
|
||||
| **Network** | | | | |
|
||||
| DNS (and Domains) | `/dns` | ✅ | ✅ | ✅ |
|
||||
|
||||
@@ -66,7 +66,7 @@ const SOURCES: Record<string, { label: string; link: string }> = {
|
||||
dockhand: { label: "Docker", link: "/docker" },
|
||||
tailscale: { label: "Tailscale", link: "/tailscale" },
|
||||
homelab: { label: "Homelab Manager", link: "/settings/data" },
|
||||
pbs: { label: "Proxmox Backup", link: "/pbs" },
|
||||
pbs: { label: "Proxmox Backup", link: "/backups?view=pbs" },
|
||||
uptimekuma: { label: "Uptime Kuma", link: "/uptime-kuma" },
|
||||
osticket: { label: "osTicket", link: "/osticket" },
|
||||
unifi: { label: "UniFi", link: "/network/devices" },
|
||||
|
||||
+3
-4
@@ -46,7 +46,6 @@ import Gitea from "./pages/Gitea";
|
||||
import Proxmox from "./pages/Proxmox";
|
||||
import Synology from "./pages/Synology";
|
||||
import UptimeKuma from "./pages/UptimeKuma";
|
||||
import PbsBackup from "./pages/PbsBackup";
|
||||
import OsTicket from "./pages/OsTicket";
|
||||
import AdminLinks from "./pages/AdminLinks";
|
||||
import Alerts from "./pages/Alerts";
|
||||
@@ -63,7 +62,7 @@ import Heartbeats from "./pages/Heartbeats";
|
||||
import ComingUp from "./pages/ComingUp";
|
||||
import MonthlyReport from "./pages/MonthlyReport";
|
||||
import ChangeLog from "./pages/ChangeLog";
|
||||
import Backups from "./pages/Backups";
|
||||
import BackupsHub from "./pages/BackupsHub";
|
||||
import Consistency from "./pages/Consistency";
|
||||
import Privacy from "./pages/Privacy";
|
||||
import Settings from "./pages/Settings";
|
||||
@@ -217,7 +216,7 @@ function Shelled({ user }: { user: CurrentUser }) {
|
||||
<Route path="/coming-up" element={<ComingUp user={user} />} />
|
||||
<Route path="/reports" element={<MonthlyReport user={user} />} />
|
||||
<Route path="/changes" element={user.role === "viewer" ? <Navigate to="/" replace /> : <ChangeLog />} />
|
||||
<Route path="/backups" element={<Backups user={user} />} />
|
||||
<Route path="/backups" element={<BackupsHub user={user} />} />
|
||||
<Route path="/docker" element={<Docker user={user} />} />
|
||||
<Route path="/tailscale" element={<Tailscale user={user} />} />
|
||||
<Route path="/semaphore" element={<Semaphore user={user} />} />
|
||||
@@ -225,7 +224,7 @@ function Shelled({ user }: { user: CurrentUser }) {
|
||||
<Route path="/proxmox" element={<Proxmox user={user} />} />
|
||||
<Route path="/synology" element={<Synology user={user} />} />
|
||||
<Route path="/uptime-kuma" element={<UptimeKuma user={user} />} />
|
||||
<Route path="/pbs" element={<PbsBackup user={user} />} />
|
||||
<Route path="/pbs" element={<Navigate to="/backups?view=pbs" replace />} />
|
||||
<Route path="/osticket" element={<OsTicket user={user} />} />
|
||||
<Route path="/admin-links" element={<AdminLinks user={user} />} />
|
||||
<Route path="/alerts" element={<Alerts user={user} />} />
|
||||
|
||||
@@ -47,7 +47,6 @@ import {
|
||||
IconBox,
|
||||
IconHeartbeat,
|
||||
IconGitCommit,
|
||||
IconShieldCheck,
|
||||
IconShieldLock,
|
||||
IconWorldWww,
|
||||
IconVersions,
|
||||
@@ -126,8 +125,7 @@ export const NAV: NavEntry[] = [
|
||||
label: "Backups",
|
||||
icon: <IconCopyCheck size={20} />,
|
||||
items: [
|
||||
{ to: "/backups", label: "Backup coverage", icon: <IconCopyCheck size={20} /> },
|
||||
{ to: "/pbs", label: "Proxmox Backup", icon: <IconShieldCheck size={20} /> },
|
||||
{ to: "/backups", label: "Proxmox backups", icon: <IconCopyCheck size={20} /> },
|
||||
{ to: "/duplicati", label: "Duplicati", icon: <IconDatabaseExport size={20} /> },
|
||||
],
|
||||
},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { removeWithUndo } from "../utils/undoable";
|
||||
import { useEffect, useState } from "react";
|
||||
import { useEffect, useState, type ReactNode } from "react";
|
||||
import { Link, useSearchParams } from "react-router-dom";
|
||||
import { api, type BackupCoverage, type CoverageGuest, type CoverageStatus, type CurrentUser, type RestoreInfo, type RestoreResult, type RestoreStatus, type RestoreTestEntry } from "../api/client";
|
||||
import { toast } from "../utils/toast";
|
||||
@@ -59,7 +59,7 @@ const ageWords = (r: RestoreInfo) => (r.ageDays === null ? "" : r.ageDays === 0
|
||||
* What is and isn't backed up: every Proxmox guest, whether a backup job covers it, when it was last backed up (from Proxmox Backup Server
|
||||
* snapshots and Proxmox's own backup tasks), and whether that went well — one page instead of an alert per gap.
|
||||
*/
|
||||
export default function Backups({ user }: { user?: CurrentUser }) {
|
||||
export default function Backups({ user, tabs }: { user?: CurrentUser; /** The tabs of the page this is one view of (see BackupsHub), shown under the title. */ tabs?: ReactNode }) {
|
||||
const canRecord = user?.role === "admin" || user?.role === "operator";
|
||||
const isAdmin = user?.role === "admin";
|
||||
const [tests, setTests] = useState<RestoreTestEntry[] | null>(null);
|
||||
@@ -178,6 +178,7 @@ export default function Backups({ user }: { user?: CurrentUser }) {
|
||||
{checking ? "Checking…" : "Check now"}
|
||||
</button>
|
||||
</div>
|
||||
{tabs}
|
||||
<p className="text-secondary">
|
||||
Every Proxmox guest: is a backup job covering it, when was it last backed up, and did that go well. {report && trouble > 0 ? `${trouble} need a look.` : ""}
|
||||
</p>
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import { useSearchParams } from "react-router-dom";
|
||||
import type { CurrentUser } from "../api/client";
|
||||
import ViewTabs from "../components/ViewTabs";
|
||||
import Backups from "./Backups";
|
||||
import PbsBackup from "./PbsBackup";
|
||||
|
||||
/**
|
||||
* The Proxmox backups, on one page with a tab for each view: **Backup coverage** (is every guest in a backup job, and when was it last backed up) and **Proxmox Backup Server** (its datastores,
|
||||
* what is stored and whether it verifies). The second is `?view=pbs`; `/pbs` goes there, so a link or a favourite made before they were one page still works.
|
||||
*/
|
||||
export default function BackupsHub({ user }: { user: CurrentUser }) {
|
||||
const [params] = useSearchParams();
|
||||
const view = params.get("view") === "pbs" ? "pbs" : "coverage";
|
||||
const tabs = (
|
||||
<ViewTabs
|
||||
label="Backup view"
|
||||
tabs={[
|
||||
{ to: "/backups", label: "Backup coverage", active: view === "coverage" },
|
||||
{ to: "/backups?view=pbs", label: "Proxmox Backup Server", active: view === "pbs" },
|
||||
]}
|
||||
/>
|
||||
);
|
||||
return view === "pbs" ? <PbsBackup user={user} tabs={tabs} /> : <Backups user={user} tabs={tabs} />;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useState } from "react";
|
||||
import { useEffect, useState, type ReactNode } from "react";
|
||||
import { Link } from "react-router-dom";
|
||||
import {
|
||||
api,
|
||||
@@ -53,7 +53,7 @@ function verificationBadge(d: PbsDatastore) {
|
||||
return <span className="badge bg-green-lt text-green">All verified</span>;
|
||||
}
|
||||
|
||||
export default function PbsBackup({ user: _user }: { user: CurrentUser }) {
|
||||
export default function PbsBackup({ user: _user, tabs }: { user: CurrentUser; /** The tabs of the page this is one view of (see BackupsHub), shown under the title. */ tabs?: ReactNode }) {
|
||||
const [integrations, setIntegrations] = useState<IntegrationSummary[] | null>(null);
|
||||
const [selectedId, setSelectedId] = useState<number | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
@@ -132,6 +132,7 @@ export default function PbsBackup({ user: _user }: { user: CurrentUser }) {
|
||||
return (
|
||||
<>
|
||||
<IntegrationPageTitle title="Proxmox Backup Server" integration={selected} />
|
||||
{tabs}
|
||||
<ErrorNotice error={error} />
|
||||
|
||||
{integrations?.length === 0 ? (
|
||||
|
||||
@@ -47,7 +47,7 @@ export const TYPE_PAGES: Record<IntegrationType, string> = {
|
||||
dockhand: "/docker",
|
||||
uptimekuma: "/uptime-kuma",
|
||||
phpipam: "/ipam",
|
||||
pbs: "/pbs",
|
||||
pbs: "/backups?view=pbs",
|
||||
osticket: "/osticket",
|
||||
unifi: "/network/devices",
|
||||
npm: "/proxy-hosts",
|
||||
|
||||
Reference in new issue
Block a user