diff --git a/web/locales/en/plugin__netobserv-plugin.json b/web/locales/en/plugin__netobserv-plugin.json index 186ad70c7..58238099c 100644 --- a/web/locales/en/plugin__netobserv-plugin.json +++ b/web/locales/en/plugin__netobserv-plugin.json @@ -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.", diff --git a/web/src/components/messages/status-texts.tsx b/web/src/components/messages/status-texts.tsx index 9c2019509..3178a251f 100644 --- a/web/src/components/messages/status-texts.tsx +++ b/web/src/components/messages/status-texts.tsx @@ -61,15 +61,22 @@ export const StatusTexts: React.FC = ({ status }) => { )} {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)) && ( - {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.` + )} )}