Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
4070691407
|
|||
|
6dfd56dcd4
|
|||
|
17b5557e23
|
|||
|
dc27547ffb
|
|||
|
83ec6bee42
|
|||
|
d538aad18e
|
|||
|
ab0a69d06b
|
@@ -52,3 +52,38 @@ jobs:
|
||||
GORELEASER_FORCE_TOKEN: gitea
|
||||
GITEA_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
||||
GITEA_API_URL: http://gitea:3000/api/v1
|
||||
|
||||
# GoReleaser publishes to exactly one SCM (Gitea). The push mirror
|
||||
# carries git refs but not release artifacts, so relay the release to
|
||||
# the GitHub mirror — README install links point there.
|
||||
- name: Mirror release to GitHub
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.GH_MIRROR_TOKEN }}
|
||||
run: |
|
||||
if [ -z "$GH_TOKEN" ]; then
|
||||
echo "GH_MIRROR_TOKEN not set — skipping GitHub release relay"
|
||||
exit 0
|
||||
fi
|
||||
apk add --no-cache github-cli
|
||||
TAG="${{ github.ref_name }}"
|
||||
|
||||
# Nudge the push mirror, then wait for the tag to land on GitHub.
|
||||
curl -sf -X POST \
|
||||
-H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
|
||||
"http://gitea:3000/api/v1/repos/lerkolabs/uptop/push_mirrors-sync" || true
|
||||
for i in $(seq 1 30); do
|
||||
if gh api "repos/lerkolabs/uptop/git/ref/tags/${TAG}" >/dev/null 2>&1; then
|
||||
break
|
||||
fi
|
||||
sleep 10
|
||||
done
|
||||
|
||||
PRERELEASE=""
|
||||
case "$TAG" in *-*) PRERELEASE="--prerelease";; esac
|
||||
gh release create "$TAG" \
|
||||
--repo lerkolabs/uptop \
|
||||
--verify-tag \
|
||||
--title "$TAG" \
|
||||
--notes-file /tmp/release-notes.md \
|
||||
$PRERELEASE \
|
||||
dist/*.tar.gz dist/*.zip dist/*.deb dist/*.rpm dist/checksums.txt
|
||||
|
||||
@@ -193,7 +193,7 @@ Export your Kuma backup JSON, then:
|
||||
|
||||
```bash
|
||||
curl -X POST http://localhost:8080/api/import/kuma \
|
||||
-H "X-Upkeep-Secret: your-secret" \
|
||||
-H "X-Uptop-Secret: your-secret" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d @kuma-backup.json
|
||||
```
|
||||
|
||||
+1
-1
@@ -81,5 +81,5 @@ Set via `UPTOP_AGG_STRATEGY` on the leader.
|
||||
## Security
|
||||
|
||||
- Set `UPTOP_CLUSTER_SECRET` on all nodes. Without it, cluster API endpoints are unauthenticated.
|
||||
- Secrets are sent in HTTP headers (`X-Upkeep-Secret`). Use TLS or a reverse proxy for production.
|
||||
- Secrets are sent in HTTP headers (`X-Uptop-Secret`). Use TLS or a reverse proxy for production.
|
||||
- uptop warns on startup if the cluster secret is missing or if cluster mode is active without TLS.
|
||||
|
||||
@@ -52,7 +52,7 @@ func runFollowerLoop(ctx context.Context, cfg Config, eng *monitor.Engine) {
|
||||
|
||||
req, _ := http.NewRequest("GET", cfg.PeerURL+"/api/health", nil)
|
||||
if cfg.SharedKey != "" {
|
||||
req.Header.Set("X-Upkeep-Secret", cfg.SharedKey)
|
||||
req.Header.Set("X-Uptop-Secret", cfg.SharedKey)
|
||||
}
|
||||
|
||||
resp, err := client.Do(req)
|
||||
|
||||
@@ -113,7 +113,7 @@ func TestFollowerLoop_SendsSecret(t *testing.T) {
|
||||
var receivedSecret string
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
mu.Lock()
|
||||
receivedSecret = r.Header.Get("X-Upkeep-Secret")
|
||||
receivedSecret = r.Header.Get("X-Uptop-Secret")
|
||||
mu.Unlock()
|
||||
w.WriteHeader(200)
|
||||
w.Write([]byte("OK"))
|
||||
|
||||
@@ -90,7 +90,7 @@ func probeRegister(ctx context.Context, client *http.Client, cfg ProbeConfig) er
|
||||
return err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("X-Upkeep-Secret", cfg.SharedKey)
|
||||
req.Header.Set("X-Uptop-Secret", cfg.SharedKey)
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -108,7 +108,7 @@ func probeFetchAssignments(ctx context.Context, client *http.Client, cfg ProbeCo
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("X-Upkeep-Secret", cfg.SharedKey)
|
||||
req.Header.Set("X-Uptop-Secret", cfg.SharedKey)
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -180,7 +180,7 @@ func probeReportResults(ctx context.Context, client *http.Client, cfg ProbeConfi
|
||||
return err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("X-Upkeep-Secret", cfg.SharedKey)
|
||||
req.Header.Set("X-Uptop-Secret", cfg.SharedKey)
|
||||
resp, err := client.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -0,0 +1,210 @@
|
||||
package importer
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func writeTemp(t *testing.T, content string) string {
|
||||
t.Helper()
|
||||
path := filepath.Join(t.TempDir(), "backup.json")
|
||||
if err := os.WriteFile(path, []byte(content), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return path
|
||||
}
|
||||
|
||||
func TestLoadKumaFileMissingFile(t *testing.T) {
|
||||
_, err := LoadKumaFile(filepath.Join(t.TempDir(), "nope.json"))
|
||||
if err == nil {
|
||||
t.Fatal("expected error for missing file")
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadKumaFileMalformedInput(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
body string
|
||||
}{
|
||||
{"empty file", ""},
|
||||
{"truncated JSON", `{"version": "1.23", "monitorList": [`},
|
||||
{"not JSON", "definitely not json"},
|
||||
{"wrong root type", `[1, 2, 3]`},
|
||||
{"monitorList wrong type", `{"monitorList": {"a": 1}}`},
|
||||
{"monitor field wrong type", `{"monitorList": [{"id": "not-an-int"}]}`},
|
||||
{"notificationList wrong type", `{"notificationList": "oops"}`},
|
||||
}
|
||||
for _, tc := range cases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
_, err := LoadKumaFile(writeTemp(t, tc.body))
|
||||
if err == nil {
|
||||
t.Fatalf("expected parse error for %s", tc.name)
|
||||
}
|
||||
if !strings.Contains(err.Error(), "parse JSON") {
|
||||
t.Fatalf("expected wrapped parse error, got: %v", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadKumaFileNullLists(t *testing.T) {
|
||||
kb, err := LoadKumaFile(writeTemp(t, `{"version": "1.23", "monitorList": null, "notificationList": null}`))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
backup := ConvertKuma(kb)
|
||||
if len(backup.Sites) != 0 || len(backup.Alerts) != 0 {
|
||||
t.Fatalf("expected empty backup, got %d sites %d alerts", len(backup.Sites), len(backup.Alerts))
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertKumaSkipsMalformedNotificationConfig(t *testing.T) {
|
||||
kb := &KumaBackup{
|
||||
NotificationList: []KumaNotifEntry{
|
||||
{ID: 1, Name: "broken", Config: "{not json"},
|
||||
{ID: 2, Name: "good", Config: `{"type": "discord", "ntfyserverurl": "https://example.com/hook"}`},
|
||||
},
|
||||
MonitorList: []KumaMonitor{
|
||||
{ID: 10, Name: "site", Type: "http", URL: "https://example.com", NotificationIDs: map[string]bool{"1": true}},
|
||||
},
|
||||
}
|
||||
backup := ConvertKuma(kb)
|
||||
if len(backup.Alerts) != 1 {
|
||||
t.Fatalf("expected broken notification skipped, got %d alerts", len(backup.Alerts))
|
||||
}
|
||||
if backup.Alerts[0].Type != "discord" {
|
||||
t.Fatalf("expected discord alert, got %q", backup.Alerts[0].Type)
|
||||
}
|
||||
if backup.Sites[0].AlertID != 0 {
|
||||
t.Fatalf("site referencing skipped notification should keep AlertID 0, got %d", backup.Sites[0].AlertID)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertKumaNtfyNotification(t *testing.T) {
|
||||
kb := &KumaBackup{
|
||||
NotificationList: []KumaNotifEntry{
|
||||
{ID: 3, Name: "ntfy", Config: `{
|
||||
"type": "ntfy",
|
||||
"ntfyserverurl": "https://ntfy.example.com/",
|
||||
"ntfytopic": "uptime",
|
||||
"ntfyPriority": 4,
|
||||
"ntfyAuthenticationMethod": "usernamePassword",
|
||||
"ntfyusername": "u",
|
||||
"ntfypassword": "p"
|
||||
}`},
|
||||
},
|
||||
}
|
||||
backup := ConvertKuma(kb)
|
||||
if len(backup.Alerts) != 1 {
|
||||
t.Fatalf("expected 1 alert, got %d", len(backup.Alerts))
|
||||
}
|
||||
a := backup.Alerts[0]
|
||||
if a.Type != "ntfy" {
|
||||
t.Fatalf("expected ntfy, got %q", a.Type)
|
||||
}
|
||||
if a.Settings["url"] != "https://ntfy.example.com" {
|
||||
t.Fatalf("expected trailing slash trimmed, got %q", a.Settings["url"])
|
||||
}
|
||||
if a.Settings["topic"] != "uptime" || a.Settings["priority"] != "4" {
|
||||
t.Fatalf("unexpected settings: %v", a.Settings)
|
||||
}
|
||||
if a.Settings["username"] != "u" || a.Settings["password"] != "p" {
|
||||
t.Fatalf("expected credentials mapped, got %v", a.Settings)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertKumaUnknownNotificationFallsBackToWebhook(t *testing.T) {
|
||||
kb := &KumaBackup{
|
||||
NotificationList: []KumaNotifEntry{
|
||||
{ID: 4, Name: "matrix", Config: `{"type": "matrix", "ntfyserverurl": "https://example.com/hook"}`},
|
||||
},
|
||||
}
|
||||
backup := ConvertKuma(kb)
|
||||
if len(backup.Alerts) != 1 || backup.Alerts[0].Type != "webhook" {
|
||||
t.Fatalf("expected webhook fallback, got %+v", backup.Alerts)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertKumaHTTPMonitor(t *testing.T) {
|
||||
kb := &KumaBackup{
|
||||
NotificationList: []KumaNotifEntry{
|
||||
{ID: 1, Name: "hook", Config: `{"type": "slack", "ntfyserverurl": "https://example.com/hook"}`},
|
||||
},
|
||||
MonitorList: []KumaMonitor{{
|
||||
ID: 7,
|
||||
Name: "web",
|
||||
Type: "http",
|
||||
URL: "https://example.com",
|
||||
Interval: 60,
|
||||
Timeout: 30,
|
||||
MaxRetries: 2,
|
||||
Method: "GET",
|
||||
AcceptedCodes: []string{"200", "301"},
|
||||
IgnoreTLS: true,
|
||||
ExpiryNotif: true,
|
||||
Active: false,
|
||||
NotificationIDs: map[string]bool{"1": true},
|
||||
}},
|
||||
}
|
||||
backup := ConvertKuma(kb)
|
||||
if len(backup.Sites) != 1 {
|
||||
t.Fatalf("expected 1 site, got %d", len(backup.Sites))
|
||||
}
|
||||
s := backup.Sites[0]
|
||||
if s.URL != "https://example.com" || !s.CheckSSL || !s.IgnoreTLS {
|
||||
t.Fatalf("http fields not mapped: %+v", s)
|
||||
}
|
||||
if !s.Paused {
|
||||
t.Fatal("inactive monitor should import paused")
|
||||
}
|
||||
if s.AcceptedCodes != "200,301" {
|
||||
t.Fatalf("expected joined accepted codes, got %q", s.AcceptedCodes)
|
||||
}
|
||||
if s.AlertID != 1 {
|
||||
t.Fatalf("expected alert mapped, got %d", s.AlertID)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertKumaPushMonitorGetsToken(t *testing.T) {
|
||||
kb := &KumaBackup{
|
||||
MonitorList: []KumaMonitor{{ID: 1, Name: "push", Type: "push", Active: true}},
|
||||
}
|
||||
backup := ConvertKuma(kb)
|
||||
token := backup.Sites[0].Token
|
||||
if len(token) != 32 {
|
||||
t.Fatalf("expected 32-char hex token, got %q", token)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertKumaNonNumericNotificationID(t *testing.T) {
|
||||
kb := &KumaBackup{
|
||||
MonitorList: []KumaMonitor{{
|
||||
ID: 1,
|
||||
Name: "site",
|
||||
Type: "http",
|
||||
NotificationIDs: map[string]bool{"abc": true},
|
||||
}},
|
||||
}
|
||||
backup := ConvertKuma(kb)
|
||||
if backup.Sites[0].AlertID != 0 {
|
||||
t.Fatalf("non-numeric notification ID should not map, got %d", backup.Sites[0].AlertID)
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertKumaGroupAndChildren(t *testing.T) {
|
||||
kb := &KumaBackup{
|
||||
MonitorList: []KumaMonitor{
|
||||
{ID: 1, Name: "grp", Type: "group", Active: true},
|
||||
{ID: 2, Name: "ping", Type: "ping", Hostname: "10.0.0.1", Parent: 1, Active: true},
|
||||
},
|
||||
}
|
||||
backup := ConvertKuma(kb)
|
||||
if backup.Sites[0].Type != "group" {
|
||||
t.Fatalf("expected group type, got %q", backup.Sites[0].Type)
|
||||
}
|
||||
if backup.Sites[1].ParentID != 1 || backup.Sites[1].Hostname != "10.0.0.1" {
|
||||
t.Fatalf("child not mapped: %+v", backup.Sites[1])
|
||||
}
|
||||
}
|
||||
@@ -115,10 +115,14 @@ func newEngine(s store.Store, allowPrivateTargets bool) *Engine {
|
||||
}
|
||||
}
|
||||
|
||||
// SetInsecureSkipVerify must be called before Start: the field is read by
|
||||
// checker goroutines without synchronization.
|
||||
func (e *Engine) SetInsecureSkipVerify(skip bool) {
|
||||
e.insecureSkipVerify = skip
|
||||
}
|
||||
|
||||
// SetMaintRetention must be called before Start: the field is read by the
|
||||
// maintenance prune goroutine without synchronization.
|
||||
func (e *Engine) SetMaintRetention(d time.Duration) {
|
||||
e.maintRetention = d
|
||||
}
|
||||
@@ -1043,6 +1047,8 @@ func (e *Engine) EnqueueProbeCheck(siteID int, nodeID string, latencyNs int64, i
|
||||
e.enqueueWrite(writeProbeCheck{siteID: siteID, nodeID: nodeID, latencyNs: latencyNs, isUp: isUp})
|
||||
}
|
||||
|
||||
// SetAggStrategy must be called before Start: the field is read by the probe
|
||||
// aggregation path without synchronization.
|
||||
func (e *Engine) SetAggStrategy(strategy AggregationStrategy) {
|
||||
e.aggStrategy = strategy
|
||||
}
|
||||
|
||||
@@ -127,7 +127,7 @@ func (s *Server) routes() http.Handler {
|
||||
}
|
||||
|
||||
func (s *Server) requireAuth(r *http.Request) bool {
|
||||
return s.cfg.ClusterKey != "" && checkSecret(r.Header.Get("X-Upkeep-Secret"), s.cfg.ClusterKey)
|
||||
return s.cfg.ClusterKey != "" && checkSecret(r.Header.Get("X-Uptop-Secret"), s.cfg.ClusterKey)
|
||||
}
|
||||
|
||||
func (s *Server) handlePush(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -159,7 +159,7 @@ func (s *Server) handleHealth(w http.ResponseWriter, r *http.Request) {
|
||||
http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
|
||||
return
|
||||
}
|
||||
if s.cfg.ClusterKey != "" && !checkSecret(r.Header.Get("X-Upkeep-Secret"), s.cfg.ClusterKey) {
|
||||
if s.cfg.ClusterKey != "" && !checkSecret(r.Header.Get("X-Uptop-Secret"), s.cfg.ClusterKey) {
|
||||
http.Error(w, "Unauthorized", http.StatusUnauthorized)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ func authReq(method, url, secret string, body []byte) (*http.Response, error) {
|
||||
return nil, err
|
||||
}
|
||||
if secret != "" {
|
||||
req.Header.Set("X-Upkeep-Secret", secret)
|
||||
req.Header.Set("X-Uptop-Secret", secret)
|
||||
}
|
||||
return http.DefaultClient.Do(req)
|
||||
}
|
||||
|
||||
@@ -104,7 +104,7 @@ func (m *Model) refreshLive() {
|
||||
ordered = filterSites(ordered, m.filterText)
|
||||
}
|
||||
m.sites = ordered
|
||||
m.logViewport.SetContent(strings.Join(m.engine.GetLogs(), "\n"))
|
||||
m.refreshLogContent()
|
||||
|
||||
if m.currentTab == 0 && m.selectedID != 0 {
|
||||
for i, s := range m.sites {
|
||||
|
||||
+18
-12
@@ -82,18 +82,15 @@ func (m Model) renderLogLine(line string) string {
|
||||
return fmt.Sprintf(" %s %s", tag, msg)
|
||||
}
|
||||
|
||||
func (m Model) viewLogsTab() string {
|
||||
content := m.logViewport.View()
|
||||
if strings.TrimSpace(content) == "" || content == "Waiting for logs..." {
|
||||
return m.emptyState("No log entries yet.", "Logs appear as monitors run checks")
|
||||
}
|
||||
|
||||
lines := strings.Split(content, "\n")
|
||||
// refreshLogContent rebuilds the log viewport from the full engine log list,
|
||||
// filtering before windowing so the entry count and "(n hidden)" reflect all
|
||||
// logs, not just the visible viewport slice.
|
||||
func (m *Model) refreshLogContent() {
|
||||
var rendered []string
|
||||
total := 0
|
||||
shown := 0
|
||||
|
||||
for _, line := range lines {
|
||||
for _, line := range m.engine.GetLogs() {
|
||||
if strings.TrimSpace(line) == "" {
|
||||
continue
|
||||
}
|
||||
@@ -106,18 +103,27 @@ func (m Model) viewLogsTab() string {
|
||||
rendered = append(rendered, m.renderLogLine(line))
|
||||
}
|
||||
|
||||
m.logTotal = total
|
||||
m.logShown = shown
|
||||
m.logViewport.SetContent(strings.Join(rendered, "\n"))
|
||||
}
|
||||
|
||||
func (m Model) viewLogsTab() string {
|
||||
if m.logTotal == 0 {
|
||||
return m.emptyState("No log entries yet.", "Logs appear as monitors run checks")
|
||||
}
|
||||
|
||||
filterLabel := "All"
|
||||
if m.logFilterImportant {
|
||||
filterLabel = "Important"
|
||||
}
|
||||
|
||||
header := m.st.subtleStyle.Render(fmt.Sprintf(
|
||||
" %d entries Filter: %s", shown, filterLabel))
|
||||
" %d entries Filter: %s", m.logShown, filterLabel))
|
||||
|
||||
if m.logFilterImportant && shown < total {
|
||||
header += m.st.subtleStyle.Render(fmt.Sprintf(" (%d hidden)", total-shown))
|
||||
if m.logFilterImportant && m.logShown < m.logTotal {
|
||||
header += m.st.subtleStyle.Render(fmt.Sprintf(" (%d hidden)", m.logTotal-m.logShown))
|
||||
}
|
||||
|
||||
m.logViewport.SetContent(strings.Join(rendered, "\n"))
|
||||
return "\n" + header + "\n\n" + m.logViewport.View()
|
||||
}
|
||||
|
||||
@@ -121,6 +121,8 @@ type Model struct {
|
||||
|
||||
logViewport viewport.Model
|
||||
logFilterImportant bool
|
||||
logTotal int
|
||||
logShown int
|
||||
|
||||
historyViewport viewport.Model
|
||||
historyChanges []models.StateChange
|
||||
|
||||
@@ -527,6 +527,7 @@ func (m *Model) handleDashboardKey(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
|
||||
case "f":
|
||||
if m.state == stateLogs {
|
||||
m.logFilterImportant = !m.logFilterImportant
|
||||
m.refreshLogContent()
|
||||
return m, nil
|
||||
}
|
||||
case "tab":
|
||||
|
||||
Reference in New Issue
Block a user