diff --git a/agent/cmd/keywarden-agent/main.go b/agent/cmd/keywarden-agent/main.go
index 447e714..4f2f813 100644
--- a/agent/cmd/keywarden-agent/main.go
+++ b/agent/cmd/keywarden-agent/main.go
@@ -144,11 +144,16 @@ func shipLogs(ctx context.Context, apiClient *client.Client, cfg *config.Config)
func reportHost(ctx context.Context, apiClient *client.Client, cfg *config.Config) error {
info := host.Detect()
+ var pingPtr *int
+ if pingMs, err := apiClient.Ping(ctx); err == nil {
+ pingPtr = &pingMs
+ }
return retry(ctx, []time.Duration{250 * time.Millisecond, time.Second, 2 * time.Second}, func() error {
return apiClient.UpdateHost(ctx, cfg.ServerID, client.HeartbeatRequest{
- Host: info.Hostname,
- IPv4: info.IPv4,
- IPv6: info.IPv6,
+ Host: info.Hostname,
+ IPv4: info.IPv4,
+ IPv6: info.IPv6,
+ PingMs: pingPtr,
})
})
}
diff --git a/agent/config.example.json b/agent/config.example.json
index 1c3f8b7..f499b6c 100644
--- a/agent/config.example.json
+++ b/agent/config.example.json
@@ -2,7 +2,7 @@
"server_url": "https://keywarden.dev.ntbx.io/api/v1",
"server_id": "4",
"server_ca_path": "",
- "sync_interval_seconds": 30,
+ "sync_interval_seconds": 5,
"log_batch_size": 500,
"state_dir": "/var/lib/keywarden-agent",
"account_policy": {
diff --git a/agent/internal/client/client.go b/agent/internal/client/client.go
index 6743ea0..0320869 100644
--- a/agent/internal/client/client.go
+++ b/agent/internal/client/client.go
@@ -8,7 +8,9 @@ import (
"encoding/json"
"errors"
"fmt"
+ "net"
"net/http"
+ "net/url"
"os"
"strings"
"time"
@@ -22,6 +24,10 @@ const defaultTimeout = 15 * time.Second
type Client struct {
baseURL string
http *http.Client
+ tlsCfg *tls.Config
+ scheme string
+ host string
+ addr string
}
func New(cfg *config.Config) (*Client, error) {
@@ -62,7 +68,36 @@ func New(cfg *config.Config) (*Client, error) {
Transport: transport,
}
- return &Client{baseURL: baseURL, http: httpClient}, nil
+ parsed, err := url.Parse(baseURL)
+ if err != nil {
+ return nil, fmt.Errorf("parse server url: %w", err)
+ }
+ if parsed.Host == "" {
+ return nil, errors.New("server url missing host")
+ }
+ scheme := parsed.Scheme
+ if scheme == "" {
+ scheme = "https"
+ }
+ host := parsed.Hostname()
+ port := parsed.Port()
+ if port == "" {
+ if scheme == "http" {
+ port = "80"
+ } else {
+ port = "443"
+ }
+ }
+ addr := net.JoinHostPort(host, port)
+
+ return &Client{
+ baseURL: baseURL,
+ http: httpClient,
+ tlsCfg: tlsConfig,
+ scheme: scheme,
+ host: host,
+ addr: addr,
+ }, nil
}
type EnrollRequest struct {
@@ -293,9 +328,10 @@ func (c *Client) SendLogBatch(ctx context.Context, serverID string, payload []by
}
type HeartbeatRequest struct {
- Host string `json:"host,omitempty"`
- IPv4 string `json:"ipv4,omitempty"`
- IPv6 string `json:"ipv6,omitempty"`
+ Host string `json:"host,omitempty"`
+ IPv4 string `json:"ipv4,omitempty"`
+ IPv6 string `json:"ipv6,omitempty"`
+ PingMs *int `json:"ping_ms,omitempty"`
}
func (c *Client) UpdateHost(ctx context.Context, serverID string, reqBody HeartbeatRequest) error {
@@ -318,3 +354,29 @@ func (c *Client) UpdateHost(ctx context.Context, serverID string, reqBody Heartb
}
return nil
}
+
+func (c *Client) Ping(ctx context.Context) (int, error) {
+ if c.addr == "" {
+ return 0, errors.New("server address not configured")
+ }
+ start := time.Now()
+ dialer := &net.Dialer{Timeout: defaultTimeout}
+ if c.scheme == "http" {
+ conn, err := dialer.DialContext(ctx, "tcp", c.addr)
+ if err != nil {
+ return 0, err
+ }
+ _ = conn.Close()
+ return int(time.Since(start).Milliseconds()), nil
+ }
+ cfg := c.tlsCfg.Clone()
+ if cfg.ServerName == "" && c.host != "" {
+ cfg.ServerName = c.host
+ }
+ conn, err := tls.DialWithDialer(dialer, "tcp", c.addr, cfg)
+ if err != nil {
+ return 0, err
+ }
+ _ = conn.Close()
+ return int(time.Since(start).Milliseconds()), nil
+}
diff --git a/agent/keywarden-agent b/agent/keywarden-agent
index efd53d9..63711ec 100755
Binary files a/agent/keywarden-agent and b/agent/keywarden-agent differ
diff --git a/app/apps/servers/templates/servers/_header.html b/app/apps/servers/templates/servers/_header.html
index 94c1651..225428f 100644
--- a/app/apps/servers/templates/servers/_header.html
+++ b/app/apps/servers/templates/servers/_header.html
@@ -70,7 +70,7 @@
Last heartbeat
- {% if server_status.heartbeat_at %}{{ server_status.heartbeat_at|date:"M j, Y H:i" }}{% else %}—{% endif %}
+ {% if server_status.heartbeat_at %}{{ server_status.heartbeat_at|date:"M j, Y H:i:s" }}{% else %}—{% endif %}
diff --git a/app/apps/servers/templates/servers/dashboard.html b/app/apps/servers/templates/servers/dashboard.html
index 115e945..ac3527a 100644
--- a/app/apps/servers/templates/servers/dashboard.html
+++ b/app/apps/servers/templates/servers/dashboard.html
@@ -69,7 +69,7 @@
Last heartbeat
- {% if item.status.heartbeat_at %}{{ item.status.heartbeat_at|date:"M j, Y H:i" }}{% else %}—{% endif %}
+ {% if item.status.heartbeat_at %}{{ item.status.heartbeat_at|date:"M j, Y H:i:s" }}{% else %}—{% endif %}
diff --git a/app/apps/servers/views.py b/app/apps/servers/views.py
index 3e2df27..56d3532 100644
--- a/app/apps/servers/views.py
+++ b/app/apps/servers/views.py
@@ -189,16 +189,18 @@ def _format_age_short(delta: timedelta) -> str:
if seconds < 60:
return f"{seconds}s"
minutes = seconds // 60
+ rem_seconds = seconds % 60
if minutes < 60:
- return f"{minutes}m"
+ return f"{minutes}m {rem_seconds}s"
hours = minutes // 60
+ rem_minutes = minutes % 60
if hours < 48:
- return f"{hours}h"
+ return f"{hours}h {rem_minutes}m {rem_seconds}s"
days = hours // 24
if days < 14:
- return f"{days}d"
+ return f"{days}d {hours % 24}h"
weeks = days // 7
- return f"{weeks}w"
+ return f"{weeks}w {days % 7}d"
def _build_server_status(server: Server, now):