diff --git a/web/frontend/src/Job.root.svelte b/web/frontend/src/Job.root.svelte index 3cd65f9a..a393995f 100644 --- a/web/frontend/src/Job.root.svelte +++ b/web/frontend/src/Job.root.svelte @@ -352,7 +352,7 @@ Missing Metric -

No dataset returned for {item.metric}.

+

No dataset(s) returned for {item.metric}.

Metric was not found in metric store for cluster {$initq.data.job.cluster}.

@@ -387,17 +387,17 @@ {#if missingMetrics.length > 0}

- No data at all is available for the metrics: {missingMetrics.join( + No datasets were returned for the metrics: {missingMetrics.join( ", ", - )} + )}

{/if} {#if missingHosts.length > 0} -

Some metrics are missing for the following hosts:

+

Metrics are missing for the following hosts:

diff --git a/web/frontend/src/generic/joblist/JobListRow.svelte b/web/frontend/src/generic/joblist/JobListRow.svelte index 4b71991a..17a160e1 100644 --- a/web/frontend/src/generic/joblist/JobListRow.svelte +++ b/web/frontend/src/generic/joblist/JobListRow.svelte @@ -230,8 +230,10 @@ > {:else} -

No dataset returned for {metrics[i]}

-

Metric was not found in metric store for cluster {job.cluster}.

+

No dataset(s) returned for {metrics[i]}

+

Metric or host was not found in metric store for cluster {job.cluster}:

+

Identical messages in {metrics[i]} column: Metric not found.

+

Identical messages in job {job.jobId} row: Host not found.

{/if} diff --git a/web/frontend/src/job/statstab/StatsTable.svelte b/web/frontend/src/job/statstab/StatsTable.svelte index e7ec216a..d5fad2a8 100644 --- a/web/frontend/src/job/statstab/StatsTable.svelte +++ b/web/frontend/src/job/statstab/StatsTable.svelte @@ -205,8 +205,8 @@ /> {:else} -

No dataset returned for {metric}.

-

Metric was not found in metric store for cluster.

+

No dataset(s) returned for {metric}.

+

Metric was not found in metric store for host {host}.

{/if} {/each} diff --git a/web/frontend/src/systems/NodeOverview.svelte b/web/frontend/src/systems/NodeOverview.svelte index 68c4feb9..4622898c 100644 --- a/web/frontend/src/systems/NodeOverview.svelte +++ b/web/frontend/src/systems/NodeOverview.svelte @@ -159,30 +159,42 @@ {item?.state? item.state : 'notindb'} - {#if item.disabled === true} - Metric disabled for subcluster {selectedMetric}:{item.subCluster} - {:else if item.disabled === false} - - - {#key item.data[0].metric.series[0].data.length} - - {/key} - {:else if item.disabled === null} - - Global Metric List Not Initialized - Can not determine {selectedMetric} availability: Please Reload Page + {#if item?.data} + {#if item.disabled === true} + Metric disabled for subcluster {selectedMetric}:{item.subCluster} + {:else if item.disabled === false} + + + {#key item.data[0].metric.series[0].data.length} + + {/key} + {:else if item.disabled === null} + + Global Metric List Not Initialized + Can not determine {selectedMetric} availability: Please Reload Page + + {/if} + {:else} + + + Missing Metric + + +

No dataset(s) returned for {selectedMetric}.

+

Metric was not found in metric store for host {item.host}.

+
{/if} @@ -196,7 +208,7 @@ Missing Metric -

No dataset returned for {selectedMetric}.

+

No datasets returned for {selectedMetric}.

Metric was not found in metric store for cluster {cluster}.

diff --git a/web/frontend/src/systems/nodelist/NodeListRow.svelte b/web/frontend/src/systems/nodelist/NodeListRow.svelte index 23508e93..6c542cba 100644 --- a/web/frontend/src/systems/nodelist/NodeListRow.svelte +++ b/web/frontend/src/systems/nodelist/NodeListRow.svelte @@ -178,7 +178,7 @@ > {:else if !metricData?.data} -

No dataset returned for {selectedMetrics[i]}

+

No dataset(s) returned for {selectedMetrics[i]}

Metric was not found in metric store for cluster {cluster}.

{:else if !metricData?.data?.name}