diff --git a/components/accelerator/nvidia/clock-speed/component.go b/components/accelerator/nvidia/clock-speed/component.go index 72f296aa..50947e5f 100644 --- a/components/accelerator/nvidia/clock-speed/component.go +++ b/components/accelerator/nvidia/clock-speed/component.go @@ -4,7 +4,6 @@ package clockspeed import ( "context" "database/sql" - "errors" "fmt" "time" @@ -61,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -85,7 +84,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "nvidia-smi query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeySMIExists: fmt.Sprintf("%v", allOutput.SMIExists), diff --git a/components/accelerator/nvidia/clock/component.go b/components/accelerator/nvidia/clock/component.go index b8590d2c..76f6b195 100644 --- a/components/accelerator/nvidia/clock/component.go +++ b/components/accelerator/nvidia/clock/component.go @@ -4,7 +4,6 @@ package clock import ( "context" "database/sql" - "errors" "fmt" "time" @@ -61,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -85,7 +84,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "nvidia-smi query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeySMIExists: fmt.Sprintf("%v", allOutput.SMIExists), diff --git a/components/accelerator/nvidia/clock/component_output.go b/components/accelerator/nvidia/clock/component_output.go index 3a363da4..6f0ab784 100644 --- a/components/accelerator/nvidia/clock/component_output.go +++ b/components/accelerator/nvidia/clock/component_output.go @@ -115,7 +115,6 @@ func (o *Output) States() ([]components.State, error) { { Name: StateNameHWSlowdown, Healthy: true, - Error: nil, Reason: rm, ExtraInfo: map[string]string{ StateKeyHWSlowdownData: string(b), diff --git a/components/accelerator/nvidia/ecc/component.go b/components/accelerator/nvidia/ecc/component.go index b5be6c7a..a223f6aa 100644 --- a/components/accelerator/nvidia/ecc/component.go +++ b/components/accelerator/nvidia/ecc/component.go @@ -4,7 +4,6 @@ package ecc import ( "context" "database/sql" - "errors" "fmt" "time" @@ -61,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -85,7 +84,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "nvidia-smi query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeySMIExists: fmt.Sprintf("%v", allOutput.SMIExists), diff --git a/components/accelerator/nvidia/error/component.go b/components/accelerator/nvidia/error/component.go index 0085cca9..756ab4fb 100644 --- a/components/accelerator/nvidia/error/component.go +++ b/components/accelerator/nvidia/error/component.go @@ -3,7 +3,6 @@ package error import ( "context" - "errors" "fmt" "time" @@ -56,7 +55,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -80,7 +79,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "nvidia-smi query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeySMIExists: fmt.Sprintf("%v", allOutput.SMIExists), diff --git a/components/accelerator/nvidia/fabric-manager/component.go b/components/accelerator/nvidia/fabric-manager/component.go index 91713272..94192fc6 100644 --- a/components/accelerator/nvidia/fabric-manager/component.go +++ b/components/accelerator/nvidia/fabric-manager/component.go @@ -3,7 +3,6 @@ package fabricmanager import ( "context" - "errors" "fmt" "time" @@ -72,7 +71,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -105,7 +104,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "fabric manager query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeyFabricManagerExists: fmt.Sprintf("%v", allOutput.FabricManagerExists), diff --git a/components/accelerator/nvidia/infiniband/component.go b/components/accelerator/nvidia/infiniband/component.go index c2bbb83c..17e87155 100644 --- a/components/accelerator/nvidia/infiniband/component.go +++ b/components/accelerator/nvidia/infiniband/component.go @@ -55,7 +55,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/accelerator/nvidia/info/component.go b/components/accelerator/nvidia/info/component.go index 4185aef8..19a1bdfe 100644 --- a/components/accelerator/nvidia/info/component.go +++ b/components/accelerator/nvidia/info/component.go @@ -3,7 +3,6 @@ package info import ( "context" - "errors" "fmt" "time" @@ -56,7 +55,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -80,7 +79,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "nvidia-smi query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeySMIExists: fmt.Sprintf("%v", allOutput.SMIExists), diff --git a/components/accelerator/nvidia/memory/component.go b/components/accelerator/nvidia/memory/component.go index 2c52fff3..d5af4160 100644 --- a/components/accelerator/nvidia/memory/component.go +++ b/components/accelerator/nvidia/memory/component.go @@ -4,7 +4,6 @@ package memory import ( "context" "database/sql" - "errors" "fmt" "time" @@ -61,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -85,7 +84,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "nvidia-smi query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeySMIExists: fmt.Sprintf("%v", allOutput.SMIExists), diff --git a/components/accelerator/nvidia/nvlink/component.go b/components/accelerator/nvidia/nvlink/component.go index c4390ff2..ad1e905e 100644 --- a/components/accelerator/nvidia/nvlink/component.go +++ b/components/accelerator/nvidia/nvlink/component.go @@ -60,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/accelerator/nvidia/peermem/component.go b/components/accelerator/nvidia/peermem/component.go index 5e9f1fd4..212154c8 100644 --- a/components/accelerator/nvidia/peermem/component.go +++ b/components/accelerator/nvidia/peermem/component.go @@ -2,7 +2,6 @@ package peermem import ( "context" - "errors" "fmt" "time" @@ -55,7 +54,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -79,7 +78,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "lsmod peermem query failed with " + e, }) } diff --git a/components/accelerator/nvidia/power/component.go b/components/accelerator/nvidia/power/component.go index 67d76d14..482c2355 100644 --- a/components/accelerator/nvidia/power/component.go +++ b/components/accelerator/nvidia/power/component.go @@ -4,7 +4,6 @@ package power import ( "context" "database/sql" - "errors" "fmt" "time" @@ -61,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -85,7 +84,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "nvidia-smi query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeySMIExists: fmt.Sprintf("%v", allOutput.SMIExists), diff --git a/components/accelerator/nvidia/processes/component.go b/components/accelerator/nvidia/processes/component.go index 157acf2e..3072746d 100644 --- a/components/accelerator/nvidia/processes/component.go +++ b/components/accelerator/nvidia/processes/component.go @@ -4,7 +4,6 @@ package processes import ( "context" "database/sql" - "errors" "fmt" "time" @@ -61,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -85,7 +84,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "nvidia-smi query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeySMIExists: fmt.Sprintf("%v", allOutput.SMIExists), diff --git a/components/accelerator/nvidia/temperature/component.go b/components/accelerator/nvidia/temperature/component.go index d48e1e8d..fa122f95 100644 --- a/components/accelerator/nvidia/temperature/component.go +++ b/components/accelerator/nvidia/temperature/component.go @@ -4,7 +4,6 @@ package temperature import ( "context" "database/sql" - "errors" "fmt" "time" @@ -61,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -85,7 +84,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "nvidia-smi query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeySMIExists: fmt.Sprintf("%v", allOutput.SMIExists), diff --git a/components/accelerator/nvidia/utilization/component.go b/components/accelerator/nvidia/utilization/component.go index decb1c5e..864b74f4 100644 --- a/components/accelerator/nvidia/utilization/component.go +++ b/components/accelerator/nvidia/utilization/component.go @@ -4,7 +4,6 @@ package utilization import ( "context" "database/sql" - "errors" "fmt" "time" @@ -61,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { return []components.State{ { Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil @@ -85,7 +84,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { cs = append(cs, components.State{ Name: Name, Healthy: false, - Error: errors.New(e), + Error: e, Reason: "nvidia-smi query failed with " + e, ExtraInfo: map[string]string{ nvidia_query.StateKeySMIExists: fmt.Sprintf("%v", allOutput.SMIExists), diff --git a/components/components.go b/components/components.go index 66ed1c4e..57f42108 100644 --- a/components/components.go +++ b/components/components.go @@ -68,7 +68,7 @@ type State struct { Name string `json:"name,omitempty"` Healthy bool `json:"healthy,omitempty"` Reason string `json:"reason,omitempty"` // a detailed and processed reason on why the component is not healthy - Error error `json:"error,omitempty"` // the unprocessed error returned from the component + Error string `json:"error,omitempty"` // the unprocessed error returned from the component ExtraInfo map[string]string `json:"extra_info,omitempty"` // any extra information the component may want to expose } diff --git a/components/containerd/pod/component.go b/components/containerd/pod/component.go index 2833d6eb..b75782a4 100644 --- a/components/containerd/pod/component.go +++ b/components/containerd/pod/component.go @@ -55,7 +55,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/cpu/component.go b/components/cpu/component.go index badb04a8..ac60b58e 100644 --- a/components/cpu/component.go +++ b/components/cpu/component.go @@ -60,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/disk/component.go b/components/disk/component.go index 737d4a9c..b203fbd3 100644 --- a/components/disk/component.go +++ b/components/disk/component.go @@ -60,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/docker/container/component.go b/components/docker/container/component.go index cd352feb..b0ec6708 100644 --- a/components/docker/container/component.go +++ b/components/docker/container/component.go @@ -55,7 +55,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/fd/component.go b/components/fd/component.go index 3c15e9d2..dfc52e57 100644 --- a/components/fd/component.go +++ b/components/fd/component.go @@ -60,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/k8s/pod/component.go b/components/k8s/pod/component.go index ab5541ff..8d2f5095 100644 --- a/components/k8s/pod/component.go +++ b/components/k8s/pod/component.go @@ -58,7 +58,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/memory/component.go b/components/memory/component.go index 5ba5684e..7ff68a3c 100644 --- a/components/memory/component.go +++ b/components/memory/component.go @@ -60,7 +60,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/network/latency/component.go b/components/network/latency/component.go index daa69451..c6eee298 100644 --- a/components/network/latency/component.go +++ b/components/network/latency/component.go @@ -51,7 +51,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/os/component.go b/components/os/component.go index 49686235..97702a36 100644 --- a/components/os/component.go +++ b/components/os/component.go @@ -55,7 +55,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/power-supply/component.go b/components/power-supply/component.go index 22446ece..4dda7cc3 100644 --- a/components/power-supply/component.go +++ b/components/power-supply/component.go @@ -55,7 +55,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/systemd/component.go b/components/systemd/component.go index 54ee20b5..82f2cde0 100644 --- a/components/systemd/component.go +++ b/components/systemd/component.go @@ -59,7 +59,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/components/tailscale/component.go b/components/tailscale/component.go index 6cb78ef0..c955fdc8 100644 --- a/components/tailscale/component.go +++ b/components/tailscale/component.go @@ -55,7 +55,7 @@ func (c *component) States(ctx context.Context) ([]components.State, error) { { Name: Name, Healthy: false, - Error: last.Error, + Error: last.Error.Error(), Reason: "last query failed", }, }, nil diff --git a/internal/server/root.html b/internal/server/root.html index 58638fef..1fef4813 100644 --- a/internal/server/root.html +++ b/internal/server/root.html @@ -738,8 +738,6 @@ workloadsData.forEach(component => { const statesList = document.createElement('ul'); component.states.forEach(state => { - console.log(state); - workloadsTotalStates++; const stateItem = document.createElement('li');