diff --git a/.goreleaser.yml b/.goreleaser.yml index ec43edd7..4efbbdd3 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -5,6 +5,7 @@ project_name: beszel before: hooks: - go mod tidy + - go generate -run fetchsmartctl ./agent builds: - id: beszel diff --git a/Makefile b/Makefile index abb3370b..4d55c5ba 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SKIP_WEB ?= false # Set executable extension based on target OS EXE_EXT := $(if $(filter windows,$(OS)),.exe,) -.PHONY: tidy build-agent build-hub build-hub-dev build clean lint dev-server dev-agent dev-hub dev generate-locales +.PHONY: tidy build-agent build-hub build-hub-dev build clean lint dev-server dev-agent dev-hub dev generate-locales fetch-smartctl-conditional .DEFAULT_GOAL := build clean: @@ -46,8 +46,14 @@ build-dotnet-conditional: fi; \ fi +# Download smartctl.exe at build time for Windows (skips if already present) +fetch-smartctl-conditional: + @if [ "$(OS)" = "windows" ]; then \ + go generate -run fetchsmartctl ./agent; \ + fi + # Update build-agent to include conditional .NET build -build-agent: tidy build-dotnet-conditional +build-agent: tidy build-dotnet-conditional fetch-smartctl-conditional GOOS=$(OS) GOARCH=$(ARCH) go build -o ./build/beszel-agent_$(OS)_$(ARCH)$(EXE_EXT) -ldflags "-w -s" ./internal/cmd/agent build-hub: tidy $(if $(filter false,$(SKIP_WEB)),build-web-ui) diff --git a/agent/gpu_intel.go b/agent/gpu_intel.go index 31c982c3..2d5f9370 100644 --- a/agent/gpu_intel.go +++ b/agent/gpu_intel.go @@ -134,7 +134,9 @@ func (gm *GPUManager) parseIntelHeaders(header1 string, header2 string) (engineN powerIndex = -1 // Initialize to -1, will be set to actual index if found // Collect engine names from header1 for _, col := range h1 { - key := strings.TrimRightFunc(col, func(r rune) bool { return r >= '0' && r <= '9' }) + key := strings.TrimRightFunc(col, func(r rune) bool { + return (r >= '0' && r <= '9') || r == '/' + }) var friendly string switch key { case "RCS": diff --git a/agent/gpu_test.go b/agent/gpu_test.go index 748037b7..7361e945 100644 --- a/agent/gpu_test.go +++ b/agent/gpu_test.go @@ -1439,6 +1439,15 @@ func TestParseIntelHeaders(t *testing.T) { wantPowerIndex: 4, // "gpu" is at index 4 wantPreEngineCols: 8, // 17 total cols - 3*3 = 8 }, + { + name: "basic headers with RCS BCS VCS using index in name", + header1: "Freq MHz IRQ RC6 Power W IMC MiB/s RCS/0 BCS/1 VCS/2", + header2: " req act /s % gpu pkg rd wr % se wa % se wa % se wa", + wantEngineNames: []string{"RCS", "BCS", "VCS"}, + wantFriendlyNames: []string{"Render/3D", "Blitter", "Video"}, + wantPowerIndex: 4, // "gpu" is at index 4 + wantPreEngineCols: 8, // 17 total cols - 3*3 = 8 + }, { name: "headers with only RCS", header1: "Freq MHz IRQ RC6 Power W IMC MiB/s RCS", diff --git a/agent/smart.go b/agent/smart.go index fb6563c1..a81c894c 100644 --- a/agent/smart.go +++ b/agent/smart.go @@ -1,3 +1,6 @@ +//go:generate -command fetchsmartctl go run ./tools/fetchsmartctl +//go:generate fetchsmartctl -out ./smartmontools/smartctl.exe -url https://static.beszel.dev/bin/smartctl/smartctl-nc.exe -sha 3912249c3b329249aa512ce796fd1b64d7cbd8378b68ad2756b39163d9c30b47 + package agent import ( @@ -5,7 +8,9 @@ import ( "encoding/json" "errors" "fmt" + "os" "os/exec" + "runtime" "strconv" "strings" "sync" @@ -23,6 +28,7 @@ type SmartManager struct { SmartDevices []*DeviceInfo refreshMutex sync.Mutex lastScanTime time.Time + binPath string } type scanOutput struct { @@ -160,7 +166,7 @@ func (sm *SmartManager) ScanDevices(force bool) error { ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() - cmd := exec.CommandContext(ctx, "smartctl", "--scan", "-j") + cmd := exec.CommandContext(ctx, sm.binPath, "--scan", "-j") output, err := cmd.Output() var ( @@ -382,7 +388,7 @@ func (sm *SmartManager) CollectSmart(deviceInfo *DeviceInfo) error { // Try with -n standby first if we have existing data args := sm.smartctlArgs(deviceInfo, true) - cmd := exec.CommandContext(ctx, "smartctl", args...) + cmd := exec.CommandContext(ctx, sm.binPath, args...) output, err := cmd.CombinedOutput() // Check if device is in standby (exit status 2) @@ -395,7 +401,7 @@ func (sm *SmartManager) CollectSmart(deviceInfo *DeviceInfo) error { ctx2, cancel2 := context.WithTimeout(context.Background(), 2*time.Second) defer cancel2() args = sm.smartctlArgs(deviceInfo, false) - cmd = exec.CommandContext(ctx2, "smartctl", args...) + cmd = exec.CommandContext(ctx2, sm.binPath, args...) output, err = cmd.CombinedOutput() } @@ -875,13 +881,33 @@ func (sm *SmartManager) parseSmartForNvme(output []byte) (bool, int) { } // detectSmartctl checks if smartctl is installed, returns an error if not -func (sm *SmartManager) detectSmartctl() error { - if _, err := exec.LookPath("smartctl"); err == nil { - slog.Debug("smartctl found") - return nil +func (sm *SmartManager) detectSmartctl() (string, error) { + isWindows := runtime.GOOS == "windows" + + // Load embedded smartctl.exe for Windows amd64 builds. + if isWindows && runtime.GOARCH == "amd64" { + if path, err := ensureEmbeddedSmartctl(); err == nil { + return path, nil + } } - slog.Debug("smartctl not found") - return errors.New("smartctl not found") + + if path, err := exec.LookPath("smartctl"); err == nil { + return path, nil + } + locations := []string{} + if isWindows { + locations = append(locations, + "C:\\Program Files\\smartmontools\\bin\\smartctl.exe", + ) + } else { + locations = append(locations, "/opt/homebrew/bin/smartctl") + } + for _, location := range locations { + if _, err := os.Stat(location); err == nil { + return location, nil + } + } + return "", errors.New("smartctl not found") } // NewSmartManager creates and initializes a new SmartManager @@ -889,9 +915,12 @@ func NewSmartManager() (*SmartManager, error) { sm := &SmartManager{ SmartDataMap: make(map[string]*smart.SmartData), } - if err := sm.detectSmartctl(); err != nil { + path, err := sm.detectSmartctl() + if err != nil { + slog.Debug(err.Error()) return nil, err } - + slog.Debug("smartctl", "path", path) + sm.binPath = path return sm, nil } diff --git a/agent/smart_nonwindows.go b/agent/smart_nonwindows.go new file mode 100644 index 00000000..cb3ca1ea --- /dev/null +++ b/agent/smart_nonwindows.go @@ -0,0 +1,9 @@ +//go:build !windows + +package agent + +import "errors" + +func ensureEmbeddedSmartctl() (string, error) { + return "", errors.ErrUnsupported +} diff --git a/agent/smart_windows.go b/agent/smart_windows.go new file mode 100644 index 00000000..6f297d84 --- /dev/null +++ b/agent/smart_windows.go @@ -0,0 +1,40 @@ +//go:build windows + +package agent + +import ( + _ "embed" + "fmt" + "os" + "path/filepath" + "sync" +) + +//go:embed smartmontools/smartctl.exe +var embeddedSmartctl []byte + +var ( + smartctlOnce sync.Once + smartctlPath string + smartctlErr error +) + +func ensureEmbeddedSmartctl() (string, error) { + smartctlOnce.Do(func() { + destDir := filepath.Join(os.TempDir(), "beszel", "smartmontools") + if err := os.MkdirAll(destDir, 0o755); err != nil { + smartctlErr = fmt.Errorf("failed to create smartctl directory: %w", err) + return + } + + destPath := filepath.Join(destDir, "smartctl.exe") + if err := os.WriteFile(destPath, embeddedSmartctl, 0o755); err != nil { + smartctlErr = fmt.Errorf("failed to write embedded smartctl: %w", err) + return + } + + smartctlPath = destPath + }) + + return smartctlPath, smartctlErr +} diff --git a/agent/tools/fetchsmartctl/main.go b/agent/tools/fetchsmartctl/main.go new file mode 100644 index 00000000..3d3efebb --- /dev/null +++ b/agent/tools/fetchsmartctl/main.go @@ -0,0 +1,130 @@ +package main + +import ( + "crypto/sha1" + "crypto/sha256" + "encoding/hex" + "flag" + "fmt" + "hash" + "io" + "net/http" + "os" + "path/filepath" + "strings" + "time" +) + +// Download smartctl.exe from the given URL and save it to the given destination. +// This is used to embed smartctl.exe in the Windows build. + +func main() { + url := flag.String("url", "", "URL to download smartctl.exe from (required)") + out := flag.String("out", "", "Destination path for smartctl.exe (required)") + sha := flag.String("sha", "", "Optional SHA1/SHA256 checksum for integrity validation") + force := flag.Bool("force", false, "Force re-download even if destination exists") + flag.Parse() + + if *url == "" || *out == "" { + fatalf("-url and -out are required") + } + + if !*force { + if info, err := os.Stat(*out); err == nil && info.Size() > 0 { + fmt.Println("smartctl.exe already present, skipping download") + return + } + } + + if err := downloadFile(*url, *out, *sha); err != nil { + fatalf("download failed: %v", err) + } +} + +func downloadFile(url, dest, shaHex string) error { + // Prepare destination + if err := os.MkdirAll(filepath.Dir(dest), 0o755); err != nil { + return fmt.Errorf("create dir: %w", err) + } + + // HTTP client + client := &http.Client{Timeout: 60 * time.Second} + req, err := http.NewRequest(http.MethodGet, url, nil) + if err != nil { + return fmt.Errorf("new request: %w", err) + } + req.Header.Set("User-Agent", "beszel-fetchsmartctl/1.0") + + resp, err := client.Do(req) + if err != nil { + return fmt.Errorf("http get: %w", err) + } + defer resp.Body.Close() + + if resp.StatusCode < 200 || resp.StatusCode >= 300 { + return fmt.Errorf("unexpected HTTP status: %s", resp.Status) + } + + tmp := dest + ".tmp" + f, err := os.OpenFile(tmp, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0o644) + if err != nil { + return fmt.Errorf("open tmp: %w", err) + } + + // Determine hash algorithm based on length (SHA1=40, SHA256=64) + var hasher hash.Hash + if shaHex := strings.TrimSpace(shaHex); shaHex != "" { + cleanSha := strings.ToLower(strings.ReplaceAll(shaHex, " ", "")) + switch len(cleanSha) { + case 40: + hasher = sha1.New() + case 64: + hasher = sha256.New() + default: + f.Close() + os.Remove(tmp) + return fmt.Errorf("unsupported hash length: %d (expected 40 for SHA1 or 64 for SHA256)", len(cleanSha)) + } + } + + var mw io.Writer = f + if hasher != nil { + mw = io.MultiWriter(f, hasher) + } + if _, err := io.Copy(mw, resp.Body); err != nil { + f.Close() + os.Remove(tmp) + return fmt.Errorf("write tmp: %w", err) + } + if err := f.Close(); err != nil { + os.Remove(tmp) + return fmt.Errorf("close tmp: %w", err) + } + + if hasher != nil && shaHex != "" { + cleanSha := strings.ToLower(strings.ReplaceAll(strings.TrimSpace(shaHex), " ", "")) + got := strings.ToLower(hex.EncodeToString(hasher.Sum(nil))) + if got != cleanSha { + os.Remove(tmp) + return fmt.Errorf("hash mismatch: got %s want %s", got, cleanSha) + } + } + + // Make executable and move into place + if err := os.Chmod(tmp, 0o755); err != nil { + os.Remove(tmp) + return fmt.Errorf("chmod: %w", err) + } + if err := os.Rename(tmp, dest); err != nil { + os.Remove(tmp) + return fmt.Errorf("rename: %w", err) + } + + fmt.Println("smartctl.exe downloaded to", dest) + return nil +} + +func fatalf(format string, a ...any) { + fmt.Fprintf(os.Stderr, format+"\n", a...) + os.Exit(1) +} diff --git a/beszel.go b/beszel.go index fec75167..0dc2dd11 100644 --- a/beszel.go +++ b/beszel.go @@ -6,7 +6,7 @@ import "github.com/blang/semver" const ( // Version is the current version of the application. - Version = "0.15.3" + Version = "0.15.4" // AppName is the name of the application. AppName = "beszel" ) diff --git a/internal/site/package-lock.json b/internal/site/package-lock.json index a13cb8e8..91b18f26 100644 --- a/internal/site/package-lock.json +++ b/internal/site/package-lock.json @@ -1,12 +1,12 @@ { "name": "beszel", - "version": "0.15.3", + "version": "0.15.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "beszel", - "version": "0.15.3", + "version": "0.15.4", "dependencies": { "@henrygd/queue": "^1.0.7", "@henrygd/semaphore": "^0.0.2", diff --git a/internal/site/package.json b/internal/site/package.json index ba7f91fe..50fe1d71 100644 --- a/internal/site/package.json +++ b/internal/site/package.json @@ -1,7 +1,7 @@ { "name": "beszel", "private": true, - "version": "0.15.3", + "version": "0.15.4", "type": "module", "scripts": { "dev": "vite --host", diff --git a/internal/site/src/components/charts/area-chart.tsx b/internal/site/src/components/charts/area-chart.tsx index 94f34003..2a1e1d69 100644 --- a/internal/site/src/components/charts/area-chart.tsx +++ b/internal/site/src/components/charts/area-chart.tsx @@ -30,6 +30,7 @@ export default function AreaChartDefault({ domain, legend, itemSorter, + showTotal = false, reverseStackOrder = false, hideYAxis = false, }: // logRender = false, @@ -42,6 +43,7 @@ export default function AreaChartDefault({ dataPoints?: DataPoint[] domain?: [number, number] legend?: boolean + showTotal?: boolean itemSorter?: (a: any, b: any) => number reverseStackOrder?: boolean hideYAxis?: boolean @@ -65,18 +67,25 @@ export default function AreaChartDefault({ "ps-4": hideYAxis, })} > - + - {!hideYAxis && updateYAxisWidth(tickFormatter(value, index))} - tickLine={false} - axisLine={false} - />} + {!hideYAxis && ( + updateYAxisWidth(tickFormatter(value, index))} + tickLine={false} + axisLine={false} + /> + )} {xAxis(chartData)} formatShortDate(data[0].payload.created)} contentFormatter={contentFormatter} + showTotal={showTotal} /> } /> @@ -114,5 +124,5 @@ export default function AreaChartDefault({ ) - }, [chartData.systemStats.at(-1), yAxisWidth, maxToggled]) + }, [chartData.systemStats.at(-1), yAxisWidth, maxToggled, showTotal]) } diff --git a/internal/site/src/components/charts/container-chart.tsx b/internal/site/src/components/charts/container-chart.tsx index 2093fc27..0b301375 100644 --- a/internal/site/src/components/charts/container-chart.tsx +++ b/internal/site/src/components/charts/container-chart.tsx @@ -139,7 +139,7 @@ export default memo(function ContainerChart({ labelFormatter={(_, data) => formatShortDate(data[0].payload.created)} // @ts-expect-error itemSorter={(a, b) => b.value - a.value} - content={} + content={} /> {Object.keys(chartConfig).map((key) => { const filtered = filteredKeys.has(key) diff --git a/internal/site/src/components/charts/mem-chart.tsx b/internal/site/src/components/charts/mem-chart.tsx index 90b65b25..98dd05a3 100644 --- a/internal/site/src/components/charts/mem-chart.tsx +++ b/internal/site/src/components/charts/mem-chart.tsx @@ -61,6 +61,7 @@ export default memo(function MemChart({ chartData, showMax }: { chartData: Chart const { value: convertedValue, unit } = formatBytes(value * 1024, false, Unit.Bytes, true) return decimalString(convertedValue, convertedValue >= 100 ? 1 : 2) + " " + unit }} + showTotal={true} /> } /> diff --git a/internal/site/src/components/containers-table/containers-table.tsx b/internal/site/src/components/containers-table/containers-table.tsx index 8e963dd0..5fc913bd 100644 --- a/internal/site/src/components/containers-table/containers-table.tsx +++ b/internal/site/src/components/containers-table/containers-table.tsx @@ -35,6 +35,7 @@ import { getPagePath } from "@nanostores/router" const syntaxTheme = "github-dark-dimmed" export default function ContainersTable({ systemId }: { systemId?: string }) { + const loadTime = Date.now() const [data, setData] = useState([]) const [sorting, setSorting] = useBrowserStorage( `sort-c-${systemId ? 1 : 0}`, @@ -47,56 +48,53 @@ export default function ContainersTable({ systemId }: { systemId?: string }) { const [globalFilter, setGlobalFilter] = useState("") useEffect(() => { - const pbOptions = { - fields: "id,name,image,cpu,memory,net,health,status,system,updated", - } - - const fetchData = (lastXMs: number) => { - const updated = Date.now() - lastXMs - let filter: string - if (systemId) { - filter = pb.filter("system={:system} && updated > {:updated}", { system: systemId, updated }) - } else { - filter = pb.filter("updated > {:updated}", { updated }) - } + function fetchData(systemId?: string) { pb.collection("containers") .getList(0, 2000, { - ...pbOptions, - filter, + fields: "id,name,image,cpu,memory,net,health,status,system,updated", + filter: systemId ? pb.filter("system={:system}", { system: systemId }) : undefined, }) - .then(({ items }) => setData((curItems) => { - const containerIds = new Set(items.map(item => item.id)) - const now = Date.now() - for (const item of curItems) { - if (!containerIds.has(item.id) && now - item.updated < 70_000) { - items.push(item) + .then(({ items }) => items.length && setData((curItems) => { + const lastUpdated = Math.max(items[0].updated, items.at(-1)?.updated ?? 0) + const containerIds = new Set() + const newItems = [] + for (const item of items) { + if (Math.abs(lastUpdated - item.updated) < 70_000) { + containerIds.add(item.id) + newItems.push(item) } } - return items + for (const item of curItems) { + if (!containerIds.has(item.id) && lastUpdated - item.updated < 70_000) { + newItems.push(item) + } + } + return newItems })) } // initial load - fetchData(70_000) + fetchData(systemId) - // if no systemId, poll every 10 seconds + // if no systemId, pull system containers after every system update if (!systemId) { - // poll every 10 seconds - const intervalId = setInterval(() => fetchData(10_500), 10_000) - // clear interval on unmount - return () => clearInterval(intervalId) + return $allSystemsById.listen((_value, _oldValue, systemId) => { + // exclude initial load of systems + if (Date.now() - loadTime > 500) { + fetchData(systemId) + } + }) } // if systemId, fetch containers after the system is updated return listenKeys($allSystemsById, [systemId], (_newSystems) => { - const changeTime = Date.now() - setTimeout(() => fetchData(Date.now() - changeTime + 1000), 100) + fetchData(systemId) }) }, []) const table = useReactTable({ data, - columns: containerChartCols.filter(col => systemId ? col.id !== "system" : true), + columns: containerChartCols.filter((col) => (systemId ? col.id !== "system" : true)), getCoreRowModel: getCoreRowModel(), getSortedRowModel: getSortedRowModel(), getFilteredRowModel: getFilteredRowModel(), @@ -164,77 +162,78 @@ export default function ContainersTable({ systemId }: { systemId?: string }) { ) } -const AllContainersTable = memo( - function AllContainersTable({ table, rows, colLength }: { table: TableType; rows: Row[]; colLength: number }) { - // The virtualizer will need a reference to the scrollable container element - const scrollRef = useRef(null) - const activeContainer = useRef(null) - const [sheetOpen, setSheetOpen] = useState(false) - const openSheet = (container: ContainerRecord) => { - activeContainer.current = container - setSheetOpen(true) - } - - const virtualizer = useVirtualizer({ - count: rows.length, - estimateSize: () => 54, - getScrollElement: () => scrollRef.current, - overscan: 5, - }) - const virtualRows = virtualizer.getVirtualItems() - - const paddingTop = Math.max(0, virtualRows[0]?.start ?? 0 - virtualizer.options.scrollMargin) - const paddingBottom = Math.max(0, virtualizer.getTotalSize() - (virtualRows[virtualRows.length - 1]?.end ?? 0)) - - return ( -
2) && "min-h-50" - )} - ref={scrollRef} - > - {/* add header height to table size */} -
- - - - {rows.length ? ( - virtualRows.map((virtualRow) => { - const row = rows[virtualRow.index] - return ( - - ) - }) - ) : ( - - - No results. - - - )} - -
-
- -
- ) +const AllContainersTable = memo(function AllContainersTable({ + table, + rows, + colLength, +}: { + table: TableType + rows: Row[] + colLength: number +}) { + // The virtualizer will need a reference to the scrollable container element + const scrollRef = useRef(null) + const activeContainer = useRef(null) + const [sheetOpen, setSheetOpen] = useState(false) + const openSheet = (container: ContainerRecord) => { + activeContainer.current = container + setSheetOpen(true) } -) + const virtualizer = useVirtualizer({ + count: rows.length, + estimateSize: () => 54, + getScrollElement: () => scrollRef.current, + overscan: 5, + }) + const virtualRows = virtualizer.getVirtualItems() + + const paddingTop = Math.max(0, virtualRows[0]?.start ?? 0 - virtualizer.options.scrollMargin) + const paddingBottom = Math.max(0, virtualizer.getTotalSize() - (virtualRows[virtualRows.length - 1]?.end ?? 0)) + + return ( +
2) && "min-h-50" + )} + ref={scrollRef} + > + {/* add header height to table size */} +
+ + + + {rows.length ? ( + virtualRows.map((virtualRow) => { + const row = rows[virtualRow.index] + return + }) + ) : ( + + + No results. + + + )} + +
+
+ +
+ ) +}) async function getLogsHtml(container: ContainerRecord): Promise { try { - const [{ highlighter }, logsHtml] = await Promise.all([import('@/lib/shiki'), pb.send<{ logs: string }>("/api/beszel/containers/logs", { - system: container.system, - container: container.id, - })]) + const [{ highlighter }, logsHtml] = await Promise.all([ + import("@/lib/shiki"), + pb.send<{ logs: string }>("/api/beszel/containers/logs", { + system: container.system, + container: container.id, + }), + ]) return logsHtml.logs ? highlighter.codeToHtml(logsHtml.logs, { lang: "log", theme: syntaxTheme }) : t`No results.` } catch (error) { console.error(error) @@ -244,10 +243,13 @@ async function getLogsHtml(container: ContainerRecord): Promise { async function getInfoHtml(container: ContainerRecord): Promise { try { - let [{ highlighter }, { info }] = await Promise.all([import('@/lib/shiki'), pb.send<{ info: string }>("/api/beszel/containers/info", { - system: container.system, - container: container.id, - })]) + let [{ highlighter }, { info }] = await Promise.all([ + import("@/lib/shiki"), + pb.send<{ info: string }>("/api/beszel/containers/info", { + system: container.system, + container: container.id, + }), + ]) try { info = JSON.stringify(JSON.parse(info), null, 2) } catch (_) { } @@ -258,7 +260,15 @@ async function getInfoHtml(container: ContainerRecord): Promise { } } -function ContainerSheet({ sheetOpen, setSheetOpen, activeContainer }: { sheetOpen: boolean, setSheetOpen: (open: boolean) => void, activeContainer: RefObject }) { +function ContainerSheet({ + sheetOpen, + setSheetOpen, + activeContainer, +}: { + sheetOpen: boolean + setSheetOpen: (open: boolean) => void + activeContainer: RefObject +}) { const container = activeContainer.current if (!container) return null @@ -297,14 +307,14 @@ function ContainerSheet({ sheetOpen, setSheetOpen, activeContainer }: { sheetOpe useEffect(() => { setLogsDisplay("") - setInfoDisplay(""); + setInfoDisplay("") if (!container) return - (async () => { - const [logsHtml, infoHtml] = await Promise.all([getLogsHtml(container), getInfoHtml(container)]) - setLogsDisplay(logsHtml) - setInfoDisplay(infoHtml) - setTimeout(scrollLogsToBottom, 20) - })() + ; (async () => { + const [logsHtml, infoHtml] = await Promise.all([getLogsHtml(container), getInfoHtml(container)]) + setLogsDisplay(logsHtml) + setInfoDisplay(infoHtml) + setTimeout(scrollLogsToBottom, 20) + })() }, [container]) return ( @@ -328,7 +338,9 @@ function ContainerSheet({ sheetOpen, setSheetOpen, activeContainer }: { sheetOpe {container.name} - {$allSystemsById.get()[container.system]?.name ?? ""} + + {$allSystemsById.get()[container.system]?.name ?? ""} + {container.status} @@ -350,19 +362,20 @@ function ContainerSheet({ sheetOpen, setSheetOpen, activeContainer }: { sheetOpe disabled={isRefreshingLogs} > - -
+
@@ -376,15 +389,18 @@ function ContainerSheet({ sheetOpen, setSheetOpen, activeContainer }: { sheetOpe
-
+
-
- ) } @@ -406,39 +422,51 @@ function ContainersTableHead({ table }: { table: TableType }) { ) } -const ContainerTableRow = memo( - function ContainerTableRow({ - row, - virtualRow, - openSheet, - }: { - row: Row - virtualRow: VirtualItem - openSheet: (container: ContainerRecord) => void - }) { - return ( - openSheet(row.original)} - > - {row.getVisibleCells().map((cell) => ( - - {flexRender(cell.column.columnDef.cell, cell.getContext())} - - ))} - - ) - } -) +const ContainerTableRow = memo(function ContainerTableRow({ + row, + virtualRow, + openSheet, +}: { + row: Row + virtualRow: VirtualItem + openSheet: (container: ContainerRecord) => void +}) { + return ( + openSheet(row.original)} + > + {row.getVisibleCells().map((cell) => ( + + {flexRender(cell.column.columnDef.cell, cell.getContext())} + + ))} + + ) +}) -function LogsFullscreenDialog({ open, onOpenChange, logsDisplay, containerName, onRefresh, isRefreshing }: { open: boolean, onOpenChange: (open: boolean) => void, logsDisplay: string, containerName: string, onRefresh: () => void | Promise, isRefreshing: boolean }) { +function LogsFullscreenDialog({ + open, + onOpenChange, + logsDisplay, + containerName, + onRefresh, + isRefreshing, +}: { + open: boolean + onOpenChange: (open: boolean) => void + logsDisplay: string + containerName: string + onRefresh: () => void | Promise + isRefreshing: boolean +}) { const outerContainerRef = useRef(null) useEffect(() => { @@ -471,16 +499,24 @@ function LogsFullscreenDialog({ open, onOpenChange, logsDisplay, containerName, title={t`Refresh`} aria-label={t`Refresh`} > - + ) } -function InfoFullscreenDialog({ open, onOpenChange, infoDisplay, containerName }: { open: boolean, onOpenChange: (open: boolean) => void, infoDisplay: string, containerName: string }) { +function InfoFullscreenDialog({ + open, + onOpenChange, + infoDisplay, + containerName, +}: { + open: boolean + onOpenChange: (open: boolean) => void + infoDisplay: string + containerName: string +}) { return ( diff --git a/internal/site/src/components/routes/system.tsx b/internal/site/src/components/routes/system.tsx index c46e6427..a4996bde 100644 --- a/internal/site/src/components/routes/system.tsx +++ b/internal/site/src/components/routes/system.tsx @@ -699,6 +699,7 @@ export default memo(function SystemDetail({ id }: { id: string }) { const { value: convertedValue, unit } = formatBytes(value, true, userSettings.unitDisk, false) return `${decimalString(convertedValue, convertedValue >= 100 ? 1 : 2)} ${unit}` }} + showTotal={true} /> @@ -752,6 +753,7 @@ export default memo(function SystemDetail({ id }: { id: string }) { const { value, unit } = formatBytes(data.value, true, userSettings.unitNet, false) return `${decimalString(value, value >= 100 ? 1 : 2)} ${unit}` }} + showTotal={true} /> diff --git a/internal/site/src/components/ui/chart.tsx b/internal/site/src/components/ui/chart.tsx index 614d6d12..3e3d120e 100644 --- a/internal/site/src/components/ui/chart.tsx +++ b/internal/site/src/components/ui/chart.tsx @@ -1,8 +1,10 @@ import type { JSX } from "react" +import { useLingui } from "@lingui/react/macro" import * as React from "react" import * as RechartsPrimitive from "recharts" import { chartTimeData, cn } from "@/lib/utils" import type { ChartData } from "@/types" +import { Separator } from "./separator" // Format: { THEME_NAME: CSS_SELECTOR } const THEMES = { light: "", dark: ".dark" } as const @@ -100,6 +102,8 @@ const ChartTooltipContent = React.forwardRef< filter?: string contentFormatter?: (item: any, key: string) => React.ReactNode | string truncate?: boolean + showTotal?: boolean + totalLabel?: React.ReactNode } >( ( @@ -121,11 +125,16 @@ const ChartTooltipContent = React.forwardRef< itemSorter, contentFormatter: content = undefined, truncate = false, + showTotal = false, + totalLabel, }, ref ) => { // const { config } = useChart() const config = {} + const { t } = useLingui() + const totalLabelNode = totalLabel ?? t`Total` + const totalName = typeof totalLabelNode === "string" ? totalLabelNode : t`Total` React.useMemo(() => { if (filter) { @@ -141,6 +150,76 @@ const ChartTooltipContent = React.forwardRef< } }, [itemSorter, payload]) + const totalValueDisplay = React.useMemo(() => { + if (!showTotal || !payload?.length) { + return null + } + + let totalValue = 0 + let hasNumericValue = false + const aggregatedNestedValues: Record = {} + + for (const item of payload) { + const numericValue = typeof item.value === "number" ? item.value : Number(item.value) + if (Number.isFinite(numericValue)) { + totalValue += numericValue + hasNumericValue = true + } + + if (content && item?.payload) { + const payloadKey = `${nameKey || item.name || item.dataKey || "value"}` + const nestedPayload = (item.payload as Record | undefined)?.[payloadKey] + + if (nestedPayload && typeof nestedPayload === "object") { + for (const [nestedKey, nestedValue] of Object.entries(nestedPayload)) { + if (typeof nestedValue === "number" && Number.isFinite(nestedValue)) { + aggregatedNestedValues[nestedKey] = (aggregatedNestedValues[nestedKey] ?? 0) + nestedValue + } + } + } + } + } + + if (!hasNumericValue) { + return null + } + + const totalKey = "__total__" + const totalItem: any = { + value: totalValue, + name: totalName, + dataKey: totalKey, + color, + } + + if (content) { + const basePayload = + payload[0]?.payload && typeof payload[0].payload === "object" + ? { ...(payload[0].payload as Record) } + : {} + totalItem.payload = { + ...basePayload, + [totalKey]: aggregatedNestedValues, + } + } + + if (typeof formatter === "function") { + return formatter( + totalValue, + totalName, + totalItem, + payload.length, + totalItem.payload ?? payload[0]?.payload + ) + } + + if (content) { + return content(totalItem, totalKey) + } + + return `${totalValue.toLocaleString()}${unit ?? ""}` + }, [color, content, formatter, nameKey, payload, showTotal, totalName, unit]) + const tooltipLabel = React.useMemo(() => { if (hideLabel || !payload?.length) { return null @@ -242,6 +321,15 @@ const ChartTooltipContent = React.forwardRef<
) })} + {totalValueDisplay ? ( + <> + +
+ {totalLabelNode} + {totalValueDisplay} +
+ + ) : null}
) diff --git a/internal/site/src/locales/ar/ar.po b/internal/site/src/locales/ar/ar.po index 211f4e91..7220840c 100644 --- a/internal/site/src/locales/ar/ar.po +++ b/internal/site/src/locales/ar/ar.po @@ -1199,6 +1199,11 @@ msgstr "تسمح الرموز المميزة للوكلاء بالاتصال و msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "تُستخدم الرموز المميزة والبصمات للمصادقة على اتصالات WebSocket إلى المحور." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "الإجمالي" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "إجمالي البيانات المستلمة لكل واجهة" diff --git a/internal/site/src/locales/bg/bg.po b/internal/site/src/locales/bg/bg.po index 39757dd4..cc83ca69 100644 --- a/internal/site/src/locales/bg/bg.po +++ b/internal/site/src/locales/bg/bg.po @@ -1199,6 +1199,11 @@ msgstr "Токените позволяват на агентите да се с msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Токените и пръстовите отпечатъци се използват за удостоверяване на WebSocket връзките към концентратора." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Общо" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Общо получени данни за всеки интерфейс" diff --git a/internal/site/src/locales/cs/cs.po b/internal/site/src/locales/cs/cs.po index c35e0814..872dac96 100644 --- a/internal/site/src/locales/cs/cs.po +++ b/internal/site/src/locales/cs/cs.po @@ -1199,6 +1199,11 @@ msgstr "Tokeny umožňují agentům připojení a registraci. Otisky jsou stabil msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Tokeny a otisky slouží k ověření připojení WebSocket k uzlu." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Celkem" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Celkový přijatý objem dat pro každé rozhraní" diff --git a/internal/site/src/locales/da/da.po b/internal/site/src/locales/da/da.po index 60836b72..9a626b43 100644 --- a/internal/site/src/locales/da/da.po +++ b/internal/site/src/locales/da/da.po @@ -1199,6 +1199,11 @@ msgstr "Nøgler tillader agenter at oprette forbindelse og registrere. Fingeraft msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Nøgler og fingeraftryk bruges til at godkende WebSocket-forbindelser til hubben." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Samlet" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Samlet modtaget data for hver interface" diff --git a/internal/site/src/locales/de/de.po b/internal/site/src/locales/de/de.po index 2ffa21bd..ca4c0f44 100644 --- a/internal/site/src/locales/de/de.po +++ b/internal/site/src/locales/de/de.po @@ -1199,6 +1199,11 @@ msgstr "Tokens ermöglichen es Agents, sich zu verbinden und zu registrieren. Fi msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Tokens und Fingerabdrücke werden verwendet, um WebSocket-Verbindungen zum Hub zu authentifizieren." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Gesamt" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Empfangene Gesamtdatenmenge je Schnittstelle " diff --git a/internal/site/src/locales/en/en.po b/internal/site/src/locales/en/en.po index c44850bb..eda90a1a 100644 --- a/internal/site/src/locales/en/en.po +++ b/internal/site/src/locales/en/en.po @@ -1194,6 +1194,11 @@ msgstr "Tokens allow agents to connect and register. Fingerprints are stable ide msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Total" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Total data received for each interface" diff --git a/internal/site/src/locales/es/es.po b/internal/site/src/locales/es/es.po index 2847aa7b..62bcc8d7 100644 --- a/internal/site/src/locales/es/es.po +++ b/internal/site/src/locales/es/es.po @@ -8,7 +8,7 @@ msgstr "" "Language: es\n" "Project-Id-Version: beszel\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2025-11-01 17:41\n" +"PO-Revision-Date: 2025-11-04 22:13\n" "Last-Translator: \n" "Language-Team: Spanish\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -123,7 +123,7 @@ msgstr "Agente" #: src/components/routes/settings/alerts-history-data-table.tsx #: src/components/routes/settings/layout.tsx msgid "Alert History" -msgstr "Historial de Alertas" +msgstr "Historial de alertas" #: src/components/alerts/alert-button.tsx #: src/components/alerts/alerts-sheet.tsx @@ -142,7 +142,7 @@ msgstr "Todos los contenedores" #: src/components/systems-table/systems-table.tsx #: src/components/systems-table/systems-table.tsx msgid "All Systems" -msgstr "Todos los Sistemas" +msgstr "Todos los sistemas" #: src/components/systems-table/systems-table-columns.tsx msgid "Are you sure you want to delete {name}?" @@ -746,7 +746,7 @@ msgstr "Instrucciones manuales de configuración" #. Chart select field. Please try to keep this short. #: src/components/routes/system.tsx msgid "Max 1 min" -msgstr "Máx 1 min" +msgstr "Máx. 1 min" #: src/components/containers-table/containers-table-columns.tsx #: src/components/systems-table/systems-table-columns.tsx @@ -756,11 +756,11 @@ msgstr "Memoria" #: src/components/routes/system.tsx #: src/lib/alerts.ts msgid "Memory Usage" -msgstr "Uso de Memoria" +msgstr "Uso de memoria" #: src/components/routes/system.tsx msgid "Memory usage of docker containers" -msgstr "Uso de memoria de los contenedores de Docker" +msgstr "Uso de memoria de los contenedores Docker" #: src/components/routes/system/smart-table.tsx msgid "Model" @@ -779,7 +779,7 @@ msgstr "Red" #: src/components/routes/system.tsx msgid "Network traffic of docker containers" -msgstr "Tráfico de red de los contenedores de Docker" +msgstr "Tráfico de red de los contenedores Docker" #: src/components/routes/system.tsx #: src/components/routes/system/network-sheet.tsx @@ -897,7 +897,7 @@ msgstr "Pausado ({pausedSystemsLength})" #: src/components/routes/system/cpu-sheet.tsx #: src/components/routes/system/cpu-sheet.tsx msgid "Per-core average utilization" -msgstr "Utilización promedio por núcleo" +msgstr "Uso promedio por núcleo" #: src/components/routes/system/cpu-sheet.tsx msgid "Percentage of time spent in each state" @@ -905,36 +905,36 @@ msgstr "Porcentaje de tiempo dedicado a cada estado" #: src/components/routes/settings/notifications.tsx msgid "Please <0>configure an SMTP server to ensure alerts are delivered." -msgstr "Por favor, <0>configure un servidor SMTP para asegurar que las alertas sean entregadas." +msgstr "Por favor, <0>configura un servidor SMTP para asegurar que las alertas sean entregadas." #: src/components/alerts/alerts-sheet.tsx msgid "Please check logs for more details." -msgstr "Por favor, revise los registros para más detalles." +msgstr "Por favor, revisa los registros para más detalles." #: src/components/login/auth-form.tsx #: src/components/login/forgot-pass-form.tsx msgid "Please check your credentials and try again" -msgstr "Por favor, verifique sus credenciales e intente de nuevo" +msgstr "Por favor, verifica tus credenciales e inténtalo de nuevo" #: src/components/login/login.tsx msgid "Please create an admin account" -msgstr "Por favor, cree una cuenta de administrador" +msgstr "Por favor, crea una cuenta de administrador" #: src/components/login/auth-form.tsx msgid "Please enable pop-ups for this site" -msgstr "Por favor, habilite las ventanas emergentes para este sitio" +msgstr "Por favor, habilita las ventanas emergentes para este sitio" #: src/lib/api.ts msgid "Please log in again" -msgstr "Por favor, inicie sesión de nuevo" +msgstr "Por favor, inicia sesión de nuevo" #: src/components/login/auth-form.tsx msgid "Please see <0>the documentation for instructions." -msgstr "Por favor, consulte <0>la documentación para obtener instrucciones." +msgstr "Por favor, consulta <0>la documentación para obtener instrucciones." #: src/components/login/login.tsx msgid "Please sign in to your account" -msgstr "Por favor, inicie sesión en su cuenta" +msgstr "Por favor, inicia sesión en tu cuenta" #: src/components/add-system.tsx msgid "Port" @@ -952,12 +952,12 @@ msgstr "Utilización precisa en el momento registrado" #: src/components/routes/settings/general.tsx msgid "Preferred Language" -msgstr "Idioma Preferido" +msgstr "Idioma preferido" #. Use 'Key' if your language requires many more characters #: src/components/add-system.tsx msgid "Public Key" -msgstr "Clave Pública" +msgstr "Clave pública" #. Disk read #: src/components/routes/system.tsx @@ -984,7 +984,7 @@ msgstr "Solicitar OTP" #: src/components/login/forgot-pass-form.tsx msgid "Reset Password" -msgstr "Restablecer Contraseña" +msgstr "Restablecer contraseña" #: src/components/alerts-history-columns.tsx #: src/components/alerts-history-columns.tsx @@ -1014,7 +1014,7 @@ msgstr "Autoprueba S.M.A.R.T." #: src/components/routes/settings/notifications.tsx msgid "Save address using enter key or comma. Leave blank to disable email notifications." -msgstr "Guarde la dirección usando la tecla enter o coma. Deje en blanco para desactivar las notificaciones por correo." +msgstr "Guarda la dirección usando la tecla enter o coma. Deja en blanco para desactivar las notificaciones por correo." #: src/components/routes/settings/general.tsx #: src/components/routes/settings/notifications.tsx @@ -1035,7 +1035,7 @@ msgstr "Buscar sistemas o configuraciones..." #: src/components/alerts/alerts-sheet.tsx msgid "See <0>notification settings to configure how you receive alerts." -msgstr "Consulte <0>configuración de notificaciones para configurar cómo recibe alertas." +msgstr "Consulta <0>configuración de notificaciones para configurar cómo recibe alertas." #: src/components/routes/system.tsx msgid "Sent" @@ -1090,7 +1090,7 @@ msgstr "Espacio de swap utilizado por el sistema" #: src/components/routes/system.tsx msgid "Swap Usage" -msgstr "Uso de Swap" +msgstr "Uso de swap" #: src/components/alerts-history-columns.tsx #: src/components/containers-table/containers-table-columns.tsx @@ -1110,7 +1110,7 @@ msgstr "Sistemas" #: src/components/routes/settings/config-yaml.tsx msgid "Systems may be managed in a <0>config.yml file inside your data directory." -msgstr "Los sistemas pueden ser gestionados en un archivo <0>config.yml dentro de su directorio de datos." +msgstr "Los sistemas pueden ser gestionados en un archivo <0>config.yml dentro de tu directorio de datos." #: src/components/systems-table/systems-table.tsx msgid "Table" @@ -1145,7 +1145,7 @@ msgstr "Notificación de prueba enviada" #: src/components/login/forgot-pass-form.tsx msgid "Then log into the backend and reset your user account password in the users table." -msgstr "Luego inicie sesión en el backend y restablezca la contraseña de su cuenta de usuario en la tabla de usuarios." +msgstr "Luego inicia sesión en el backend y restablece la contraseña de tu cuenta de usuario en la tabla de usuarios." #: src/components/systems-table/systems-table-columns.tsx msgid "This action cannot be undone. This will permanently delete all current records for {name} from the database." @@ -1189,7 +1189,7 @@ msgstr "Token" #: src/components/routes/settings/layout.tsx #: src/components/routes/settings/tokens-fingerprints.tsx msgid "Tokens & Fingerprints" -msgstr "Tokens y Huellas Digitales" +msgstr "Tokens y huellas digitales" #: src/components/routes/settings/tokens-fingerprints.tsx msgid "Tokens allow agents to connect and register. Fingerprints are stable identifiers unique to each system, set on first connection." @@ -1199,6 +1199,11 @@ msgstr "Los tokens permiten que los agentes se conecten y registren. Las huellas msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Los tokens y las huellas digitales se utilizan para autenticar las conexiones WebSocket al hub." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Total" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Datos totales recibidos por cada interfaz" @@ -1321,7 +1326,7 @@ msgstr "Ver más" #: src/components/routes/settings/alerts-history-data-table.tsx msgid "View your 200 most recent alerts." -msgstr "Ver sus 200 alertas más recientes." +msgstr "Ver tus 200 alertas más recientes." #: src/components/systems-table/systems-table.tsx msgid "Visible Fields" @@ -1333,7 +1338,7 @@ msgstr "Esperando suficientes registros para mostrar" #: src/components/routes/settings/general.tsx msgid "Want to help improve our translations? Check <0>Crowdin for details." -msgstr "¿Quieres ayudarnos a mejorar nuestras traducciones? Consulta <0>Crowdin para más detalles." +msgstr "¿Quieres ayudar a mejorar nuestras traducciones? Consulta <0>Crowdin para más detalles." #: src/components/routes/settings/general.tsx msgid "Warning (%)" @@ -1373,4 +1378,4 @@ msgstr "Configuración YAML" #: src/components/routes/settings/layout.tsx msgid "Your user settings have been updated." -msgstr "Su configuración de usuario ha sido actualizada." +msgstr "Tu configuración de usuario ha sido actualizada." diff --git a/internal/site/src/locales/fa/fa.po b/internal/site/src/locales/fa/fa.po index f9b1c3ca..c4f43c5b 100644 --- a/internal/site/src/locales/fa/fa.po +++ b/internal/site/src/locales/fa/fa.po @@ -1199,6 +1199,11 @@ msgstr "توکن‌ها به عامل‌ها اجازه اتصال و ثبت‌ msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "توکن‌ها و اثرات انگشت برای احراز هویت اتصالات WebSocket به هاب استفاده می‌شوند." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "کل" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "داده‌های کل دریافت شده برای هر رابط" diff --git a/internal/site/src/locales/fr/fr.po b/internal/site/src/locales/fr/fr.po index 29140196..1d057bc7 100644 --- a/internal/site/src/locales/fr/fr.po +++ b/internal/site/src/locales/fr/fr.po @@ -1199,6 +1199,11 @@ msgstr "Les tokens permettent aux agents de se connecter et de s'enregistrer. Le msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Les tokens et les empreintes sont utilisés pour authentifier les connexions WebSocket vers le hub." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Total" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Données totales reçues pour chaque interface" diff --git a/internal/site/src/locales/he/he.po b/internal/site/src/locales/he/he.po index b7689ac1..b87ec8ff 100644 --- a/internal/site/src/locales/he/he.po +++ b/internal/site/src/locales/he/he.po @@ -1199,6 +1199,11 @@ msgstr "Tokens מאפשרים לסוכנים להתחבר ולהירשם. טבי msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Tokens וטביעות אצבע משמשים לאימות חיבורי WebSocket ל-hub." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "כולל" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "סך נתונים שהתקבלו עבור כל ממשק" diff --git a/internal/site/src/locales/hr/hr.po b/internal/site/src/locales/hr/hr.po index 6b989d25..12f2efd3 100644 --- a/internal/site/src/locales/hr/hr.po +++ b/internal/site/src/locales/hr/hr.po @@ -1199,6 +1199,11 @@ msgstr "Tokeni dopuštaju agentima prijavu i registraciju. Otisci su stabilni id msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Tokeni se uz otiske koriste za autentifikaciju WebSocket veza prema središnjoj kontroli." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Ukupno" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Ukupni podaci primljeni za svako sučelje" diff --git a/internal/site/src/locales/hu/hu.po b/internal/site/src/locales/hu/hu.po index f3be11f6..1861e1f3 100644 --- a/internal/site/src/locales/hu/hu.po +++ b/internal/site/src/locales/hu/hu.po @@ -1199,6 +1199,11 @@ msgstr "" msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "" +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Összesen" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Összes fogadott adat minden interfészenként" diff --git a/internal/site/src/locales/it/it.po b/internal/site/src/locales/it/it.po index 166127af..72a71de0 100644 --- a/internal/site/src/locales/it/it.po +++ b/internal/site/src/locales/it/it.po @@ -1199,6 +1199,11 @@ msgstr "I token consentono agli agenti di connettersi e registrarsi. Le impronte msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "I token e le impronte digitali vengono utilizzati per autenticare le connessioni WebSocket all'hub." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Totale" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Dati totali ricevuti per ogni interfaccia" diff --git a/internal/site/src/locales/ja/ja.po b/internal/site/src/locales/ja/ja.po index 87b4462e..bd753c48 100644 --- a/internal/site/src/locales/ja/ja.po +++ b/internal/site/src/locales/ja/ja.po @@ -1199,6 +1199,11 @@ msgstr "トークンはエージェントの接続と登録を可能にします msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "トークンとフィンガープリントは、ハブへのWebSocket接続の認証に使用されます。" +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "総数" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "各インターフェースの総受信データ量" diff --git a/internal/site/src/locales/ko/ko.po b/internal/site/src/locales/ko/ko.po index 879622eb..7b79fcfa 100644 --- a/internal/site/src/locales/ko/ko.po +++ b/internal/site/src/locales/ko/ko.po @@ -1199,6 +1199,11 @@ msgstr "토큰은 에이전트가 연결하고 등록할 수 있도록 합니다 msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "토큰과 지문은 허브에 대한 WebSocket 연결을 인증하는 데 사용됩니다." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "총" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "각 인터페이스별 총합 다운로드 데이터량" diff --git a/internal/site/src/locales/nl/nl.po b/internal/site/src/locales/nl/nl.po index 277e0e97..bba8d1f9 100644 --- a/internal/site/src/locales/nl/nl.po +++ b/internal/site/src/locales/nl/nl.po @@ -1199,6 +1199,11 @@ msgstr "Tokens staan agenten toe om verbinding te maken met en te registreren. V msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Tokens en vingerafdrukken worden gebruikt om WebSocket verbindingen te verifiëren naar de hub." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Totaal" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Totaal ontvangen gegevens per interface" diff --git a/internal/site/src/locales/no/no.po b/internal/site/src/locales/no/no.po index b78c2c94..bfba2e9a 100644 --- a/internal/site/src/locales/no/no.po +++ b/internal/site/src/locales/no/no.po @@ -1199,6 +1199,11 @@ msgstr "Tokens lar agenter koble til og registrere seg selv. Fingeravtrykk er st msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Tokens og fingeravtrykk blir brukt for å autentisere WebSocket-tilkoblinger til huben." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Total" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Totalt mottatt data for hvert grensesnitt" diff --git a/internal/site/src/locales/pl/pl.po b/internal/site/src/locales/pl/pl.po index eace1fee..7e6a91fb 100644 --- a/internal/site/src/locales/pl/pl.po +++ b/internal/site/src/locales/pl/pl.po @@ -1199,6 +1199,11 @@ msgstr "Tokeny umożliwiają agentom łączenie się i rejestrację. Odciski pal msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Tokeny i odciski palców (fingerprinty) służą do uwierzytelniania połączeń WebSocket z hubem." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Łącznie" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Całkowita ilość danych odebranych dla każdego interfejsu" diff --git a/internal/site/src/locales/pt/pt.po b/internal/site/src/locales/pt/pt.po index 071a0c7b..0b0c9876 100644 --- a/internal/site/src/locales/pt/pt.po +++ b/internal/site/src/locales/pt/pt.po @@ -8,7 +8,7 @@ msgstr "" "Language: pt\n" "Project-Id-Version: beszel\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2025-10-30 21:52\n" +"PO-Revision-Date: 2025-11-04 22:13\n" "Last-Translator: \n" "Language-Team: Portuguese\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -134,7 +134,7 @@ msgstr "Alertas" #: src/components/containers-table/containers-table.tsx #: src/components/routes/containers.tsx msgid "All Containers" -msgstr "Todos os contentores" +msgstr "Todos os Contêineres" #: src/components/alerts/alerts-sheet.tsx #: src/components/command-palette.tsx @@ -372,11 +372,11 @@ msgstr "CPU" #: src/components/routes/system/cpu-sheet.tsx msgid "CPU Cores" -msgstr "Núcleos da CPU" +msgstr "Núcleos de CPU" #: src/components/routes/system/cpu-sheet.tsx msgid "CPU Time Breakdown" -msgstr "Detalhamento do tempo da CPU" +msgstr "Distribuição do Tempo de CPU" #: src/components/routes/system.tsx #: src/components/routes/system.tsx @@ -606,7 +606,7 @@ msgstr "Impressão digital" #: src/components/routes/system/smart-table.tsx msgid "Firmware" -msgstr "" +msgstr "Firmware" #: src/components/alerts/alerts-sheet.tsx msgid "For <0>{min} {min, plural, one {minute} other {minutes}}" @@ -764,7 +764,7 @@ msgstr "Uso de memória dos contêineres Docker" #: src/components/routes/system/smart-table.tsx msgid "Model" -msgstr "" +msgstr "Modelo" #: src/components/add-system.tsx #: src/components/alerts-history-columns.tsx @@ -1199,6 +1199,11 @@ msgstr "Os tokens permitem que os agentes se conectem e registrem. As impressõe msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Tokens e impressões digitais são usados para autenticar conexões WebSocket ao hub." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Total" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Dados totais recebidos para cada interface" diff --git a/internal/site/src/locales/ru/ru.po b/internal/site/src/locales/ru/ru.po index 7cabe379..f1682cd7 100644 --- a/internal/site/src/locales/ru/ru.po +++ b/internal/site/src/locales/ru/ru.po @@ -1199,6 +1199,11 @@ msgstr "Токены позволяют агентам подключаться msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Токены и отпечатки используются для аутентификации соединений WebSocket с хабом." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Итого" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Общий объем полученных данных для каждого интерфейса" diff --git a/internal/site/src/locales/sl/sl.po b/internal/site/src/locales/sl/sl.po index 93075c86..f25e9a3a 100644 --- a/internal/site/src/locales/sl/sl.po +++ b/internal/site/src/locales/sl/sl.po @@ -1199,6 +1199,11 @@ msgstr "Žetoni omogočajo agentom povezavo in registracijo. Prstni odtisi so st msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Žetoni in prstni odtisi se uporabljajo za preverjanje pristnosti WebSocket povezav do vozlišča." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Skupaj" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Skupni prejeti podatki za vsak vmesnik" diff --git a/internal/site/src/locales/sv/sv.po b/internal/site/src/locales/sv/sv.po index 791e7318..ff9498fb 100644 --- a/internal/site/src/locales/sv/sv.po +++ b/internal/site/src/locales/sv/sv.po @@ -1199,6 +1199,11 @@ msgstr "Tokens tillåter agenter att ansluta och registrera. Fingeravtryck är s msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Tokens och fingeravtryck används för att autentisera WebSocket-anslutningar till hubben." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Total" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Totalt mottagen data för varje gränssnitt" diff --git a/internal/site/src/locales/tr/tr.po b/internal/site/src/locales/tr/tr.po index 9a2e1be1..1eac8cfd 100644 --- a/internal/site/src/locales/tr/tr.po +++ b/internal/site/src/locales/tr/tr.po @@ -1199,6 +1199,11 @@ msgstr "Token'lar agentların bağlanıp kaydolmasına izin verir. Parmak izleri msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Token'lar ve parmak izleri hub'a WebSocket bağlantılarını doğrulamak için kullanılır." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Toplam" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Her arayüz için alınan toplam veri" diff --git a/internal/site/src/locales/uk/uk.po b/internal/site/src/locales/uk/uk.po index 2099ce27..e05cf85b 100644 --- a/internal/site/src/locales/uk/uk.po +++ b/internal/site/src/locales/uk/uk.po @@ -1199,6 +1199,11 @@ msgstr "Токени дозволяють агентам підключатис msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Токени та відбитки використовуються для автентифікації WebSocket з'єднань до хабу." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Разом" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Загальний обсяг отриманих даних для кожного інтерфейсу" diff --git a/internal/site/src/locales/vi/vi.po b/internal/site/src/locales/vi/vi.po index 5b7626e8..14e49d30 100644 --- a/internal/site/src/locales/vi/vi.po +++ b/internal/site/src/locales/vi/vi.po @@ -1199,6 +1199,11 @@ msgstr "Token cho phép các tác nhân kết nối và đăng ký. Vân tay là msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "Token và vân tay được sử dụng để xác thực các kết nối WebSocket đến trung tâm." +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "Tổng" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "Tổng dữ liệu nhận được cho mỗi giao diện" diff --git a/internal/site/src/locales/zh-CN/zh-CN.po b/internal/site/src/locales/zh-CN/zh-CN.po index 008092ba..dc2d45d8 100644 --- a/internal/site/src/locales/zh-CN/zh-CN.po +++ b/internal/site/src/locales/zh-CN/zh-CN.po @@ -1199,6 +1199,11 @@ msgstr "令牌允许客户端连接和注册。指纹是每个系统唯一的稳 msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "令牌与指纹用于验证到中心的 WebSocket 连接。" +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "总计" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "每个接口的总接收数据量" diff --git a/internal/site/src/locales/zh-HK/zh-HK.po b/internal/site/src/locales/zh-HK/zh-HK.po index b0e17c72..19337f7d 100644 --- a/internal/site/src/locales/zh-HK/zh-HK.po +++ b/internal/site/src/locales/zh-HK/zh-HK.po @@ -1199,6 +1199,11 @@ msgstr "令牌允許代理程式連接和註冊。指紋是每個系統唯一的 msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "令牌和指紋用於驗證到中心的WebSocket連接。" +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "總計" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "每個介面的總接收資料量" diff --git a/internal/site/src/locales/zh/zh.po b/internal/site/src/locales/zh/zh.po index 58e8f07e..28292f2e 100644 --- a/internal/site/src/locales/zh/zh.po +++ b/internal/site/src/locales/zh/zh.po @@ -1199,6 +1199,11 @@ msgstr "令牌允許代理程式連線和註冊。指紋是每個系統的唯一 msgid "Tokens and fingerprints are used to authenticate WebSocket connections to the hub." msgstr "令牌和指紋被用於驗證到 Hub 的 WebSocket 連線。" +#: src/components/ui/chart.tsx +#: src/components/ui/chart.tsx +msgid "Total" +msgstr "總計" + #: src/components/routes/system/network-sheet.tsx msgid "Total data received for each interface" msgstr "每個介面的總接收資料量" diff --git a/supplemental/CHANGELOG.md b/supplemental/CHANGELOG.md index e700799b..40783e7c 100644 --- a/supplemental/CHANGELOG.md +++ b/supplemental/CHANGELOG.md @@ -1,3 +1,17 @@ +## 0.15.4 + +- Refactor containers table to fix clock issue causing no results. (#1337) + +- Fix Windows extra disk detection. (#1361) + +- Add total line to the tooltip of charts with multiple values. (#1280) + +- Add fallback paths for `smartctl` lookup. (#1362, #1363) + +- Fix `intel_gpu_top` parsing when engine instance id is in column. (#1230) + +- Update `henrygd/beszel-agent-nvidia` Dockerfile to build latest smartmontools. (#1335) + ## 0.15.3 - Add CPU state details and per-core usage. (#1356) diff --git a/supplemental/licenses/smartmontools/LICENSE b/supplemental/licenses/smartmontools/LICENSE new file mode 100644 index 00000000..ecbc0593 --- /dev/null +++ b/supplemental/licenses/smartmontools/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. \ No newline at end of file