Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Keep absent CORE memory diagnostic and explicit HTTP fixtures intact

pulse-triage[bot]0eda03321efc
diff --git a/internal/truenas/client.go b/internal/truenas/client.go
index 82fe8f1714..281a680650 100644
--- a/internal/truenas/client.go
+++ b/internal/truenas/client.go
@@ -289,7 +289,7 @@ func (c *Client) getSystemTelemetryREST(ctx context.Context) (*SystemInfo, error
}
history := parseSystemMetricHistory(liveReportingResponses(response, end))
system := systemInfoFromMetricHistory(history)
- memory, memoryErr := c.getCORE13RealtimeMemory(ctx)
+ memory, _ := c.getCORE13RealtimeMemory(ctx)
if memory != nil {
if system == nil {
system = &SystemInfo{Telemetry: &SystemTelemetryAvailability{}}
@@ -303,9 +303,6 @@ func (c *Client) getSystemTelemetryREST(ctx context.Context) (*SystemInfo, error
}
}
if system == nil {
- if memoryErr != nil {
- return nil, memoryErr
- }
return nil, errNoSystemTelemetry
}
return system, nil
diff --git a/internal/truenas/client_test.go b/internal/truenas/client_test.go
index bc412df94d..8549452307 100644
--- a/internal/truenas/client_test.go
+++ b/internal/truenas/client_test.go
@@ -2025,7 +2025,7 @@ func legacyRESTReportingMemoryBody() string {
func newLegacyRESTReportingClient(t *testing.T, routes alertArgsTransport) *Client {
t.Helper()
- client, err := NewClient(ClientConfig{Host: "http://truenas.invalid", APIKey: "synthetic"})
+ client, err := NewClient(ClientConfig{Host: "http://truenas.invalid", Port: 80, APIKey: "synthetic"})
if err != nil {
t.Fatal(err)
}
diff --git a/internal/truenas/core_realtime_memory_test.go b/internal/truenas/core_realtime_memory_test.go
index 24558f77cf..c82c50b5d7 100644
--- a/internal/truenas/core_realtime_memory_test.go
+++ b/internal/truenas/core_realtime_memory_test.go
@@ -8,7 +8,9 @@ import (
"fmt"
"net/http"
"net/http/httptest"
+ "net/url"
"os"
+ "strconv"
"strings"
"sync/atomic"
"testing"
@@ -203,6 +205,14 @@ func coreMemoryClient(t *testing.T, scenario *coreMemoryScenario, config ClientC
}
t.Cleanup(server.Close)
config.Host = server.URL
+ parsed, err := url.Parse(server.URL)
+ if err != nil {
+ t.Fatal(err)
+ }
+ config.Port, err = strconv.Atoi(parsed.Port())
+ if err != nil {
+ t.Fatal(err)
+ }
if !scenario.plaintext {
sum := sha256.Sum256(server.TLS.Certificates[0].Certificate[0])
config.Fingerprint = hex.EncodeToString(sum[:])