Skip to content

NETOBSERV-1914 improved status message #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2024
Merged

NETOBSERV-1914 improved status message #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/locales/en/plugin__netobserv-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
"Can't find any namespace label in your Loki storage.": "Can't find any namespace label in your Loki storage.",
"Can't find any namespace label in your Prometheus storage.": "Can't find any namespace label in your Prometheus storage.",
"If this is the first time you run the operator, check FlowCollector status and health dashboard to ensure there is no error and flows are ingested. This can take some time.": "If this is the first time you run the operator, check FlowCollector status and health dashboard to ensure there is no error and flows are ingested. This can take some time.",
"Loki and Prometheus storages are not consistent. Check health dashboard for errors.": "Loki and Prometheus storages are not consistent. Check health dashboard for errors.",
"Loki and Prometheus storages are diverging. The number of captured namespaces does't match. Check health dashboard for errors.": "Loki and Prometheus storages are diverging. The number of captured namespaces does't match. Check health dashboard for errors.",
"Zoom in / zoom out the histogram displayed time range. The selected time range in the top right corner will adapt accordingly. You can also use the plus or minus buttons while the histogram is focused.": "Zoom in / zoom out the histogram displayed time range. The selected time range in the top right corner will adapt accordingly. You can also use the plus or minus buttons while the histogram is focused.",
"Move the selected range to filter the table below as time based pagination. You can also use the page up or down buttons while the histogram is focused.": "Move the selected range to filter the table below as time based pagination. You can also use the page up or down buttons while the histogram is focused.",
"Shift the histogram displayed time range. The selected time range in the top right corner will adapt accordingly. You can also use the arrow left or right buttons while the histogram is focused.": "Shift the histogram displayed time range. The selected time range in the top right corner will adapt accordingly. You can also use the arrow left or right buttons while the histogram is focused.",
Expand Down
11 changes: 9 additions & 2 deletions web/src/components/messages/status-texts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,22 @@ export const StatusTexts: React.FC<StatusProps> = ({ status }) => {
</Text>
)}
{status &&
// Loki is operationnal and not returning error
status.loki.isEnabled &&
status.loki.isReady &&
!status.loki.error &&
// Prometheus is operationnal and not returning error
status.prometheus.isEnabled &&
status.prometheus.isReady &&
!status.prometheus.error &&
status.loki.namespacesCount !== status.prometheus.namespacesCount && (
// One of the storage is empty when the other is not
// This ensure the message is not displayed because of retention config
((status.loki.namespacesCount > 0 && status.prometheus.namespacesCount === 0) ||
(status.loki.namespacesCount === 0 && status.prometheus.namespacesCount > 0)) && (
<Text component={TextVariants.blockquote}>
{t(`Loki and Prometheus storages are not consistent. Check health dashboard for errors.`)}
{t(
`Loki and Prometheus storages are diverging. The number of captured namespaces does't match. Check health dashboard for errors.`
)}
</Text>
)}
</>
Expand Down
Loading