From badd15fe4f9211c5c12bf13a6a97b74af04dab71 Mon Sep 17 00:00:00 2001
From: Gabriel Bernal <gbernal@redhat.com>
Date: Thu, 18 Dec 2025 13:36:06 +0100
Subject: [PATCH 1/4] fix: request namespaced resources for filter options

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
---
 web/src/attribute-filters.tsx                 | 46 +++++++++++++++++--
 .../filters/attribute-value-data.tsx          |  8 ++--
 web/src/components/filters/filter.types.ts    |  2 +-
 web/src/components/filters/search-select.tsx  |  2 +-
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/web/src/attribute-filters.tsx b/web/src/attribute-filters.tsx
index a22985f38..bcde69915 100644
--- a/web/src/attribute-filters.tsx
+++ b/web/src/attribute-filters.tsx
@@ -142,12 +142,14 @@ const resourceDataSource =
 
     const { request, abort } = cancellableFetch<K8sResourceListResponse>(endpoint);
 
-    const abortFunction = resourceAbort[resource];
+    const abortKey = namespace ? `${resource}-${namespace}` : resource;
+
+    const abortFunction = resourceAbort[abortKey];
     if (abortFunction) {
       abortFunction();
     }
 
-    resourceAbort[resource] = abort;
+    resourceAbort[abortKey] = abort;
 
     const response = await request();
 
@@ -295,14 +297,22 @@ export const availableAttributes = ({
       name: 'Pods',
       label: podLabel,
       id: 'pod',
-      options: getPodAttributeOptions(tenant, config, schema),
+      options: (filters) => {
+        const selectedNamespaces = filters?.namespace ? Array.from(filters.namespace) : undefined;
+
+        return getPodAttributeOptions(tenant, config, schema, selectedNamespaces)();
+      },
       valueType: 'checkbox-select',
     },
     {
       name: 'Containers',
       label: containerLabel,
       id: 'container',
-      options: getContainerAttributeOptions(tenant, config, schema),
+      options: (filters) => {
+        const selectedNamespaces = filters?.namespace ? Array.from(filters.namespace) : undefined;
+
+        return getContainerAttributeOptions(tenant, config, schema, selectedNamespaces)();
+      },
       expandSelection: (selections) => {
         const podSelections = new Set<string>();
         const containerSelections = new Set<string>();
@@ -775,9 +785,17 @@ const getPodAttributeOptions = (
   tenant: string,
   config: Config,
   schema: Schema,
+  namespaces?: Array<string>,
 ): (() => Promise<Option[]>) => {
   const { podLabel } = getAttributeLabels(schema);
 
+  const namespacedPodsResources: Array<Promise<Option[]>> = [];
+
+  // get pods in selected namespaces for users that have restricted access
+  for (const ns of namespaces || []) {
+    namespacedPodsResources.push(resourceDataSource({ resource: 'pods', namespace: ns })());
+  }
+
   return () =>
     Promise.allSettled<Promise<Option[]>>([
       lokiLabelValuesDataSource({
@@ -786,6 +804,7 @@ const getPodAttributeOptions = (
         labelName: podLabel,
       })(),
       resourceDataSource({ resource: 'pods' })(),
+      ...namespacedPodsResources,
     ]).then((results) => {
       const podOptions: Set<string> = new Set();
       results.forEach((result) => {
@@ -803,11 +822,29 @@ const getContainerAttributeOptions = (
   tenant: string,
   config: Config,
   schema: Schema,
+  namespaces?: Array<string>,
 ): (() => Promise<Option[]>) => {
   const { containerLabel, podLabel } = getAttributeLabels(schema);
 
   const seriesQuery = `{ ${containerLabel}!="", ${podLabel}!="" }`;
 
+  const namespacedPodsResources: Array<Promise<Option[]>> = [];
+
+  // get containers in selected namespaces for users that have restricted access
+  for (const ns of namespaces || []) {
+    namespacedPodsResources.push(
+      resourceDataSource({
+        resource: 'pods',
+        namespace: ns,
+        mapper: (resource) =>
+          resource?.spec?.containers.map((container) => ({
+            option: `${resource?.metadata?.name} / ${container.name}`,
+            value: `${resource?.metadata?.name} / ${container.name}`,
+          })) ?? [],
+      })(),
+    );
+  }
+
   return () =>
     Promise.allSettled<Promise<Option[]>>([
       lokiSeriesDataSource({
@@ -837,6 +874,7 @@ const getContainerAttributeOptions = (
             value: `${resource?.metadata?.name} / ${container.name}`,
           })) ?? [],
       })(),
+      ...namespacedPodsResources,
     ]).then((results) => {
       const uniqueContainers = new Set<string>();
       results.forEach((result) => {
diff --git a/web/src/components/filters/attribute-value-data.tsx b/web/src/components/filters/attribute-value-data.tsx
index 097f7c706..c1794f44a 100644
--- a/web/src/components/filters/attribute-value-data.tsx
+++ b/web/src/components/filters/attribute-value-data.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
-import { Attribute, Option } from './filter.types';
+import { Attribute, Filters, Option } from './filter.types';
 import { useBoolean } from '../../hooks/useBoolean';
 
 type UseAttributeValueDataHookResult = {
-  getAttributeOptions: (searchQuery?: string) => void;
+  getAttributeOptions: (filters?: Filters) => void;
   attributeOptions: Array<Option>;
   attributeError: Error | undefined;
   attributeLoading: boolean;
@@ -21,7 +21,7 @@ export const useAttributeValueData = (attribute: Attribute): UseAttributeValueDa
   const [attributeError, setAttributeError] = React.useState<Error | undefined>();
 
   const getAttributeOptions = React.useCallback(
-    (searchQuery?: string) => {
+    (filters?: Filters) => {
       setAttributeError(undefined);
       if (attribute.options) {
         if (Array.isArray(attribute.options)) {
@@ -29,7 +29,7 @@ export const useAttributeValueData = (attribute: Attribute): UseAttributeValueDa
           setAttributeOptions(uniqueOptions(attribute.options));
         } else {
           attribute
-            .options(searchQuery)
+            .options(filters)
             .then((asyncOptions) => {
               setAttributeOptions(uniqueOptions(asyncOptions ?? []));
             })
diff --git a/web/src/components/filters/filter.types.ts b/web/src/components/filters/filter.types.ts
index c7abe4369..31cb95057 100644
--- a/web/src/components/filters/filter.types.ts
+++ b/web/src/components/filters/filter.types.ts
@@ -6,7 +6,7 @@ export type Attribute = {
   label?: string;
   name: string;
   id: string;
-  options?: Array<Option> | ((searchQuery?: string) => Promise<Array<Option>>);
+  options?: Array<Option> | ((filters?: Filters) => Promise<Array<Option>>);
   valueType: 'text' | 'select' | 'checkbox-select';
   // upon selection of an option, this function is called to expand filters into other attributes
   expandSelection?: (value: Set<string>) => Map<string, Set<string>>;
diff --git a/web/src/components/filters/search-select.tsx b/web/src/components/filters/search-select.tsx
index 468bc35af..fc581ec92 100644
--- a/web/src/components/filters/search-select.tsx
+++ b/web/src/components/filters/search-select.tsx
@@ -238,7 +238,7 @@ export const SearchSelect: React.FC<SearchSelectProps> = ({
   };
 
   React.useEffect(() => {
-    getAttributeOptions();
+    getAttributeOptions(filters);
   }, [tenant]);
 
   const resetActiveAndFocusedItem = () => {

From 806b747ee19c1da26e3e402be649e0e1b2c01878 Mon Sep 17 00:00:00 2001
From: Gabriel Bernal <gbernal@redhat.com>
Date: Mon, 22 Dec 2025 14:35:45 +0100
Subject: [PATCH 2/4] fix: filter pods by tenant allowed namespaces

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
---
 web/src/attribute-filters.tsx | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/web/src/attribute-filters.tsx b/web/src/attribute-filters.tsx
index bcde69915..8a2f21325 100644
--- a/web/src/attribute-filters.tsx
+++ b/web/src/attribute-filters.tsx
@@ -803,7 +803,19 @@ const getPodAttributeOptions = (
         tenant,
         labelName: podLabel,
       })(),
-      resourceDataSource({ resource: 'pods' })(),
+      resourceDataSource({
+        resource: 'pods',
+        filter: (resource) => {
+          switch (tenant) {
+            case 'infrastructure':
+              return namespaceBelongsToInfrastructureTenant(resource.metadata?.namespace || '');
+            case 'application':
+              return !namespaceBelongsToInfrastructureTenant(resource.metadata?.namespace || '');
+          }
+
+          return true;
+        },
+      })(),
       ...namespacedPodsResources,
     ]).then((results) => {
       const podOptions: Set<string> = new Set();
@@ -868,6 +880,16 @@ const getContainerAttributeOptions = (
       })(),
       resourceDataSource({
         resource: 'pods',
+        filter: (resource) => {
+          switch (tenant) {
+            case 'infrastructure':
+              return namespaceBelongsToInfrastructureTenant(resource.metadata?.namespace || '');
+            case 'application':
+              return !namespaceBelongsToInfrastructureTenant(resource.metadata?.namespace || '');
+          }
+
+          return true;
+        },
         mapper: (resource) =>
           resource?.spec?.containers.map((container) => ({
             option: `${resource?.metadata?.name} / ${container.name}`,

From 4c066f57ca9df2bb9c5f750bc86400cf2082b64d Mon Sep 17 00:00:00 2001
From: Gabriel Bernal <gbernal@redhat.com>
Date: Mon, 22 Dec 2025 18:55:32 +0100
Subject: [PATCH 3/4] fix: filter pods and containers based on the current
 namespace selection

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
---
 hack/docker-compose/loki/promtail-config.yml  |   4 +-
 .../en/plugin__logging-view-plugin.json       |  14 ++-
 web/src/attribute-filters.tsx                 | 115 ++++++++++++------
 .../components/filters/attribute-filter.tsx   |   9 +-
 web/src/components/filters/filter.types.ts    |   1 +
 web/src/components/filters/search-select.tsx  |  22 ++++
 web/src/hooks/useURLState.ts                  |   6 +-
 7 files changed, 126 insertions(+), 45 deletions(-)

diff --git a/hack/docker-compose/loki/promtail-config.yml b/hack/docker-compose/loki/promtail-config.yml
index 585d71f81..60e47d3ec 100644
--- a/hack/docker-compose/loki/promtail-config.yml
+++ b/hack/docker-compose/loki/promtail-config.yml
@@ -46,5 +46,5 @@ scrape_configs:
           k8s_namespace_name: kube-public
           log_type: application
           __path__: /var/log/*log
-          kubernetes_pod_name: alertmanager-main-0
-          kubernetes_container_name: test-container
+          kubernetes_pod_name: kube-public-0
+          kubernetes_container_name: test-container-kube
diff --git a/web/locales/en/plugin__logging-view-plugin.json b/web/locales/en/plugin__logging-view-plugin.json
index 5e174ac01..e6a4683a3 100644
--- a/web/locales/en/plugin__logging-view-plugin.json
+++ b/web/locales/en/plugin__logging-view-plugin.json
@@ -1,6 +1,11 @@
 {
-  "Label {{tenantKey}} is required to display the alert metrics": "label {{tenantKey}} is required to display the alert metrics",
-  "You do not have permission to view logs in the selected namespace.": "You do not have permissions to view logs in the selected namespace.",
+  "No namespaces found": "No namespaces found",
+  "No pods found in the selected namespace(s)": "No pods found in the selected namespace(s)",
+  "No pods found": "No pods found",
+  "No containers found in the selected namespace(s)": "No containers found in the selected namespace(s)",
+  "No containers found": "No containers found",
+  "Label {{tenantKey}} is required to display the alert metrics": "Label {{tenantKey}} is required to display the alert metrics",
+  "You do not have permission to view logs in the selected namespace.": "You do not have permission to view logs in the selected namespace.",
   "Try selecting a different namespace that you have access to, or ask your administrator to grant you the required role": "Try selecting a different namespace that you have access to, or ask your administrator to grant you the required role",
   "Try selecting a specific namespace": "Try selecting a specific namespace",
   "you may have access to view logs in specific namespaces but not cluster-wide.": "you may have access to view logs in specific namespaces but not cluster-wide.",
@@ -23,6 +28,7 @@
   "Explain Log Volume": "Explain Log Volume",
   "Search by {{attributeName}}": "Search by {{attributeName}}",
   "Attribute": "Attribute",
+  "No results found": "No results found",
   "No results found for": "No results found for",
   "No options available": "No options available",
   "Filter by {{attributeName}}": "Filter by {{attributeName}}",
@@ -133,11 +139,11 @@
   "Last 2 days": "Last 2 days",
   "Last 1 week": "Last 1 week",
   "Last 2 weeks": "Last 2 weeks",
-  "Save": "Save",
-  "Cancel": "Cancel",
   "From": "From",
   "To": "To",
   "Invalid date range": "Invalid date range",
+  "Save": "Save",
+  "Cancel": "Cancel",
   "Select timezone": "Select timezone",
   "Clear input value": "Clear input value",
   "All Timezones": "All Timezones",
diff --git a/web/src/attribute-filters.tsx b/web/src/attribute-filters.tsx
index 8a2f21325..f11e84278 100644
--- a/web/src/attribute-filters.tsx
+++ b/web/src/attribute-filters.tsx
@@ -107,7 +107,11 @@ const lokiSeriesDataSource =
     mapper: (data: SeriesResponse) => Array<{ option: string; value: string }>;
   }) =>
   async (): Promise<Array<{ option: string; value: string }>> => {
-    const { abort, request } = executeSeries({ match, tenant, config });
+    const { abort, request } = executeSeries({
+      match: match.filter(notEmptyString),
+      tenant,
+      config,
+    });
 
     if (resourceAbort.lokiSeries) {
       resourceAbort.lokiSeries();
@@ -266,10 +270,12 @@ export const availableAttributes = ({
   tenant,
   config,
   schema,
+  t,
 }: {
   tenant: string;
   config: Config;
   schema: Schema;
+  t: (key: string) => string;
 }): AttributeList => {
   const { namespaceLabel, podLabel, containerLabel } = getAttributeLabels(schema);
 
@@ -292,6 +298,7 @@ export const availableAttributes = ({
       id: 'namespace',
       options: getNamespaceAttributeOptions(tenant, config, schema),
       valueType: 'checkbox-select',
+      emptyStateMessage: t('No namespaces found'),
     },
     {
       name: 'Pods',
@@ -303,6 +310,13 @@ export const availableAttributes = ({
         return getPodAttributeOptions(tenant, config, schema, selectedNamespaces)();
       },
       valueType: 'checkbox-select',
+      emptyStateMessage: (filters) => {
+        const selectedNamespaces = filters?.namespace ? Array.from(filters.namespace) : undefined;
+        if (selectedNamespaces && selectedNamespaces.length > 0) {
+          return t('No pods found in the selected namespace(s)');
+        }
+        return t('No pods found');
+      },
     },
     {
       name: 'Containers',
@@ -364,6 +378,13 @@ export const availableAttributes = ({
         return filters.pod.has(pod) && filters.container.has(container);
       },
       valueType: 'checkbox-select',
+      emptyStateMessage: (filters) => {
+        const selectedNamespaces = filters?.namespace ? Array.from(filters.namespace) : undefined;
+        if (selectedNamespaces && selectedNamespaces.length > 0) {
+          return t('No containers found in the selected namespace(s)');
+        }
+        return t('No containers found');
+      },
     },
   ];
 };
@@ -796,27 +817,40 @@ const getPodAttributeOptions = (
     namespacedPodsResources.push(resourceDataSource({ resource: 'pods', namespace: ns })());
   }
 
+  const namespaceLabel = getStreamLabelsFromSchema(schema).Namespace;
+  const namespacesQuery =
+    namespaces && namespaces.length > 0 ? `${namespaceLabel}=~"${namespaces.join('|')}"` : '';
+
+  const podResource =
+    namespaces && namespaces.length > 0
+      ? namespacedPodsResources
+      : [
+          resourceDataSource({
+            resource: 'pods',
+            filter: (resource) => {
+              switch (tenant) {
+                case 'infrastructure':
+                  return namespaceBelongsToInfrastructureTenant(resource.metadata?.namespace || '');
+                case 'application':
+                  return !namespaceBelongsToInfrastructureTenant(
+                    resource.metadata?.namespace || '',
+                  );
+              }
+
+              return true;
+            },
+          })(),
+        ];
+
   return () =>
     Promise.allSettled<Promise<Option[]>>([
       lokiLabelValuesDataSource({
         config,
         tenant,
         labelName: podLabel,
+        query: namespacesQuery ? `{ ${namespacesQuery} }` : undefined,
       })(),
-      resourceDataSource({
-        resource: 'pods',
-        filter: (resource) => {
-          switch (tenant) {
-            case 'infrastructure':
-              return namespaceBelongsToInfrastructureTenant(resource.metadata?.namespace || '');
-            case 'application':
-              return !namespaceBelongsToInfrastructureTenant(resource.metadata?.namespace || '');
-          }
-
-          return true;
-        },
-      })(),
-      ...namespacedPodsResources,
+      ...podResource,
     ]).then((results) => {
       const podOptions: Set<string> = new Set();
       results.forEach((result) => {
@@ -857,12 +891,41 @@ const getContainerAttributeOptions = (
     );
   }
 
+  const namespaceLabel = getStreamLabelsFromSchema(schema).Namespace;
+  const namespacesQuery = namespaces ? `${namespaceLabel}=~"${namespaces.join('|')}"` : '';
+
+  const podResource =
+    namespaces && namespaces.length > 0
+      ? namespacedPodsResources
+      : [
+          resourceDataSource({
+            resource: 'pods',
+            filter: (resource) => {
+              switch (tenant) {
+                case 'infrastructure':
+                  return namespaceBelongsToInfrastructureTenant(resource.metadata?.namespace || '');
+                case 'application':
+                  return !namespaceBelongsToInfrastructureTenant(
+                    resource.metadata?.namespace || '',
+                  );
+              }
+
+              return true;
+            },
+            mapper: (resource) =>
+              resource?.spec?.containers.map((container) => ({
+                option: `${resource?.metadata?.name} / ${container.name}`,
+                value: `${resource?.metadata?.name} / ${container.name}`,
+              })) ?? [],
+          })(),
+        ];
+
   return () =>
     Promise.allSettled<Promise<Option[]>>([
       lokiSeriesDataSource({
         config,
         tenant,
-        match: [seriesQuery],
+        match: [seriesQuery, namespacesQuery ? `{ ${namespacesQuery} }` : ''],
         mapper: (response) => {
           const uniqueContainers = new Set<string>();
 
@@ -878,25 +941,7 @@ const getContainerAttributeOptions = (
           }));
         },
       })(),
-      resourceDataSource({
-        resource: 'pods',
-        filter: (resource) => {
-          switch (tenant) {
-            case 'infrastructure':
-              return namespaceBelongsToInfrastructureTenant(resource.metadata?.namespace || '');
-            case 'application':
-              return !namespaceBelongsToInfrastructureTenant(resource.metadata?.namespace || '');
-          }
-
-          return true;
-        },
-        mapper: (resource) =>
-          resource?.spec?.containers.map((container) => ({
-            option: `${resource?.metadata?.name} / ${container.name}`,
-            value: `${resource?.metadata?.name} / ${container.name}`,
-          })) ?? [],
-      })(),
-      ...namespacedPodsResources,
+      ...podResource,
     ]).then((results) => {
       const uniqueContainers = new Set<string>();
       results.forEach((result) => {
diff --git a/web/src/components/filters/attribute-filter.tsx b/web/src/components/filters/attribute-filter.tsx
index 4483da1a7..44c0abf1c 100644
--- a/web/src/components/filters/attribute-filter.tsx
+++ b/web/src/components/filters/attribute-filter.tsx
@@ -170,12 +170,15 @@ export const AttributeFilter: React.FC<AttributeFilterProps> = ({
     </MenuToggle>
   );
 
+  const namespaces = filters['namespace'] ? Array.from(filters['namespace']) : [];
+  const namespacesKey = namespaces.sort().join('-');
+
   const renderAttributeValueComponent = (attribute: Attribute) => {
     switch (attribute.valueType) {
       case 'text': {
         return (
           <TextInput
-            key={`text-${attribute.id}`}
+            key={`text-${attribute.id}-${namespacesKey}`}
             placeholder={t('Search by {{attributeName}}', {
               attributeName: attribute.name,
             })}
@@ -191,7 +194,7 @@ export const AttributeFilter: React.FC<AttributeFilterProps> = ({
       case 'select':
         return (
           <SearchSelect
-            key={`select-${attribute.id}`}
+            key={`select-${attribute.id}-${namespacesKey}`}
             attribute={attribute}
             onSelect={handleAttributeValueChange}
             filters={filters}
@@ -201,7 +204,7 @@ export const AttributeFilter: React.FC<AttributeFilterProps> = ({
       case 'checkbox-select':
         return (
           <SearchSelect
-            key={`checkbox-select-${attribute.id}`}
+            key={`checkbox-select-${attribute.id}-${namespacesKey}`}
             attribute={attribute}
             onSelect={handleAttributeValueChange}
             filters={filters}
diff --git a/web/src/components/filters/filter.types.ts b/web/src/components/filters/filter.types.ts
index 31cb95057..ae9f05837 100644
--- a/web/src/components/filters/filter.types.ts
+++ b/web/src/components/filters/filter.types.ts
@@ -12,6 +12,7 @@ export type Attribute = {
   expandSelection?: (value: Set<string>) => Map<string, Set<string>>;
   // determines if an option is selected based on other filters
   isItemSelected?: (value: string, filters: Filters) => boolean;
+  emptyStateMessage?: ((filters: Filters) => string) | string;
 };
 
 export type AttributeList = Array<Attribute>;
diff --git a/web/src/components/filters/search-select.tsx b/web/src/components/filters/search-select.tsx
index fc581ec92..26ed51072 100644
--- a/web/src/components/filters/search-select.tsx
+++ b/web/src/components/filters/search-select.tsx
@@ -42,7 +42,10 @@ const getOptionComponents = (
   selections: Array<string>,
   focusedItemIndex: number | null,
   onInputKeyDown: (event: React.KeyboardEvent) => void,
+  emptyStateMessage?: string | null,
 ) => {
+  const { t } = useTranslation('plugin__logging-view-plugin');
+
   if (attributeLoading) {
     return [
       <SelectOption isLoading key="custom-loading" value="loading" hasCheckbox={false}>
@@ -80,6 +83,19 @@ const getOptionComponents = (
     return String(a.value).localeCompare(String(b.value));
   });
 
+  if (sortedOptions.length === 0) {
+    return [
+      <SelectOption key="no-results" value={NO_RESULTS} isAriaDisabled>
+        <Alert
+          variant="warning"
+          isInline
+          isPlain
+          title={emptyStateMessage || t('No results found')}
+        />
+      </SelectOption>,
+    ];
+  }
+
   return sortedOptions.map((attributeOption, index) => (
     <SelectOption
       key={attributeOption.value || attributeOption.children}
@@ -237,6 +253,11 @@ export const SearchSelect: React.FC<SearchSelectProps> = ({
     textInputRef?.current?.focus();
   };
 
+  const emptyStateMessage =
+    typeof attribute.emptyStateMessage === 'function'
+      ? attribute.emptyStateMessage(filters)
+      : attribute.emptyStateMessage;
+
   React.useEffect(() => {
     getAttributeOptions(filters);
   }, [tenant]);
@@ -383,6 +404,7 @@ export const SearchSelect: React.FC<SearchSelectProps> = ({
             selections,
             focusedItemIndex,
             onInputKeyDown,
+            emptyStateMessage,
           )}
         </SelectList>
       </Select>
diff --git a/web/src/hooks/useURLState.ts b/web/src/hooks/useURLState.ts
index d6f6e323e..5db3b5f11 100644
--- a/web/src/hooks/useURLState.ts
+++ b/web/src/hooks/useURLState.ts
@@ -9,6 +9,7 @@ import { intervalFromTimeRange } from '../time-range';
 import { getSchema } from '../value-utils';
 import { useLogsConfig } from './LogsConfigProvider';
 import { useQueryParams } from './useQueryParams';
+import { useTranslation } from 'react-i18next';
 
 interface UseURLStateHook {
   defaultTenant?: string;
@@ -17,10 +18,12 @@ interface UseURLStateHook {
     tenant,
     config,
     schema,
+    t,
   }: {
     tenant: string;
     config: Config;
     schema: Schema;
+    t: (key: string) => string;
   }) => AttributeList | undefined;
   attributesDependencies?: DependencyList;
 }
@@ -63,6 +66,7 @@ export const useURLState = ({
   getAttributes,
   attributesDependencies,
 }: UseURLStateHook) => {
+  const { t } = useTranslation('plugin__logging-view-plugin');
   const queryParams = useQueryParams();
   const navigate = useNavigate();
   const location = useLocation();
@@ -101,7 +105,7 @@ export const useURLState = ({
   const [tenant, setTenant] = React.useState(initialTenant);
   const [schema, setSchema] = React.useState(initialSchema);
   const attributes = React.useMemo<AttributeList>(
-    () => (getAttributes ? getAttributes({ tenant, config, schema }) ?? [] : []),
+    () => (getAttributes ? getAttributes({ tenant, config, schema, t }) ?? [] : []),
     [tenant, config, schema, ...(attributesDependencies || [])],
   );
   const [filters, setFilters] = React.useState<Filters | undefined>(

From 45df94283d55682c5f1539400239ef6a3c97c0b6 Mon Sep 17 00:00:00 2001
From: Gabriel Bernal <gbernal@redhat.com>
Date: Tue, 21 Apr 2026 20:06:33 +0200
Subject: [PATCH 4/4] fix: filter namespaces for dev console

Signed-off-by: Gabriel Bernal <gbernal@redhat.com>
---
 .../e2e/integration/logs-dev-page.cy.ts       |   4 +
 web/src/attribute-filters.tsx                 | 138 +++++++++++-------
 web/src/pages/logs-dev-page.tsx               |   2 +-
 3 files changed, 90 insertions(+), 54 deletions(-)

diff --git a/web/cypress/e2e/integration/logs-dev-page.cy.ts b/web/cypress/e2e/integration/logs-dev-page.cy.ts
index 6255f5169..851d377e3 100644
--- a/web/cypress/e2e/integration/logs-dev-page.cy.ts
+++ b/web/cypress/e2e/integration/logs-dev-page.cy.ts
@@ -291,6 +291,10 @@ describe('Logs Dev Page', () => {
       statusCode: 403,
       body: 'You are not authorized to list pods in this namespace',
     }).as('resourceQuery');
+    cy.intercept('/api/kubernetes/api/v1/namespaces/my-namespace/pods', {
+      statusCode: 403,
+      body: 'You are not authorized to list pods in this namespace',
+    }).as('k8sPodsQuery');
 
     cy.visit(LOGS_DEV_PAGE_URL);
 
diff --git a/web/src/attribute-filters.tsx b/web/src/attribute-filters.tsx
index f11e84278..3f7a7142b 100644
--- a/web/src/attribute-filters.tsx
+++ b/web/src/attribute-filters.tsx
@@ -183,6 +183,35 @@ const getAttributeLabels = (schema: Schema) => {
   return { namespaceLabel, podLabel, containerLabel };
 };
 
+const getTenantNamespaceQuery = (tenant: string, namespaceLabel: string): string | undefined => {
+  const infraPattern = 'openshift-.*|openshift|default|kube-.*';
+  switch (tenant) {
+    case 'infrastructure':
+      return `${namespaceLabel}=~"${infraPattern}"`;
+    case 'application':
+      return `${namespaceLabel}!~"${infraPattern}"`;
+    default:
+      return undefined;
+  }
+};
+
+const mergeSettledResults = (results: Array<PromiseSettledResult<Option[]>>): Option[] => {
+  const allRejected = results.every((r) => r.status === 'rejected');
+  if (allRejected && results.length > 0) {
+    throw (results[0] as PromiseRejectedResult).reason;
+  }
+
+  const uniqueValues = new Set<string>();
+  results.forEach((result) => {
+    if (result.status === 'fulfilled') {
+      result.value.forEach((option) => uniqueValues.add(option.value));
+    }
+  });
+  return Array.from(uniqueValues)
+    .sort()
+    .map((v) => ({ option: v, value: v }));
+};
+
 const getNamespaceAttributeOptions = (
   tenant: string,
   config: Config,
@@ -219,19 +248,7 @@ const getNamespaceAttributeOptions = (
     })().then((options) => options.filter((opt) => lokiTenantFilter(opt.value)));
 
     return Promise.allSettled<Option[]>([filteredProjectList, filteredLokiNamespaceList]).then(
-      (results) => {
-        const namespaceOptions: Set<string> = new Set();
-        results.forEach((result) => {
-          if (result.status === 'fulfilled') {
-            result.value.forEach((option) => {
-              namespaceOptions.add(option.value);
-            });
-          }
-        });
-        return Array.from(namespaceOptions)
-          .sort()
-          .map((ns) => ({ option: ns, value: ns }));
-      },
+      mergeSettledResults,
     );
   };
 };
@@ -393,6 +410,7 @@ export const availableDevConsoleAttributes = (
   tenant: string,
   config: Config,
   schema: Schema,
+  namespace?: string,
 ): AttributeList => {
   const { namespaceLabel, podLabel, containerLabel } = getAttributeLabels(schema);
 
@@ -407,6 +425,8 @@ export const availableDevConsoleAttributes = (
     return [contentAttribute];
   }
 
+  const lokiNamespaceQuery = namespace ? `{ ${namespaceLabel}="${namespace}" }` : undefined;
+
   return [
     contentAttribute,
     {
@@ -429,22 +449,50 @@ export const availableDevConsoleAttributes = (
       name: 'Pods',
       label: podLabel,
       id: 'pod',
-      options: lokiLabelValuesDataSource({
-        config,
-        tenant,
-        labelName: podLabel,
-      }),
+      options: () => {
+        const sources: Array<Promise<Option[]>> = [
+          lokiLabelValuesDataSource({
+            config,
+            tenant,
+            labelName: podLabel,
+            query: lokiNamespaceQuery,
+          })(),
+        ];
+        if (namespace) {
+          sources.push(resourceDataSource({ resource: 'pods', namespace })());
+        }
+        return Promise.allSettled(sources).then(mergeSettledResults);
+      },
       valueType: 'checkbox-select',
     },
     {
       name: 'Containers',
       label: containerLabel,
       id: 'container',
-      options: lokiLabelValuesDataSource({
-        config,
-        tenant,
-        labelName: containerLabel,
-      }),
+      options: () => {
+        const sources: Array<Promise<Option[]>> = [
+          lokiLabelValuesDataSource({
+            config,
+            tenant,
+            labelName: containerLabel,
+            query: lokiNamespaceQuery,
+          })(),
+        ];
+        if (namespace) {
+          sources.push(
+            resourceDataSource({
+              resource: 'pods',
+              namespace,
+              mapper: (resource) =>
+                resource?.spec?.containers.map((c) => ({
+                  option: c.name,
+                  value: c.name,
+                })) ?? [],
+            })(),
+          );
+        }
+        return Promise.allSettled(sources).then(mergeSettledResults);
+      },
       valueType: 'checkbox-select',
     },
   ];
@@ -819,7 +867,9 @@ const getPodAttributeOptions = (
 
   const namespaceLabel = getStreamLabelsFromSchema(schema).Namespace;
   const namespacesQuery =
-    namespaces && namespaces.length > 0 ? `${namespaceLabel}=~"${namespaces.join('|')}"` : '';
+    namespaces && namespaces.length > 0
+      ? `${namespaceLabel}=~"${namespaces.join('|')}"`
+      : getTenantNamespaceQuery(tenant, namespaceLabel) ?? '';
 
   const podResource =
     namespaces && namespaces.length > 0
@@ -851,17 +901,7 @@ const getPodAttributeOptions = (
         query: namespacesQuery ? `{ ${namespacesQuery} }` : undefined,
       })(),
       ...podResource,
-    ]).then((results) => {
-      const podOptions: Set<string> = new Set();
-      results.forEach((result) => {
-        if (result.status === 'fulfilled') {
-          result.value.forEach((option) => {
-            podOptions.add(option.value);
-          });
-        }
-      });
-      return Array.from(podOptions).map((pod) => ({ option: pod, value: pod }));
-    });
+    ]).then(mergeSettledResults);
 };
 
 const getContainerAttributeOptions = (
@@ -872,8 +912,6 @@ const getContainerAttributeOptions = (
 ): (() => Promise<Option[]>) => {
   const { containerLabel, podLabel } = getAttributeLabels(schema);
 
-  const seriesQuery = `{ ${containerLabel}!="", ${podLabel}!="" }`;
-
   const namespacedPodsResources: Array<Promise<Option[]>> = [];
 
   // get containers in selected namespaces for users that have restricted access
@@ -892,7 +930,14 @@ const getContainerAttributeOptions = (
   }
 
   const namespaceLabel = getStreamLabelsFromSchema(schema).Namespace;
-  const namespacesQuery = namespaces ? `${namespaceLabel}=~"${namespaces.join('|')}"` : '';
+  const namespacesQuery =
+    namespaces && namespaces.length > 0
+      ? `${namespaceLabel}=~"${namespaces.join('|')}"`
+      : getTenantNamespaceQuery(tenant, namespaceLabel) ?? '';
+
+  const seriesQuery = namespacesQuery
+    ? `{ ${containerLabel}!="", ${podLabel}!="", ${namespacesQuery} }`
+    : `{ ${containerLabel}!="", ${podLabel}!="" }`;
 
   const podResource =
     namespaces && namespaces.length > 0
@@ -925,7 +970,7 @@ const getContainerAttributeOptions = (
       lokiSeriesDataSource({
         config,
         tenant,
-        match: [seriesQuery, namespacesQuery ? `{ ${namespacesQuery} }` : ''],
+        match: [seriesQuery],
         mapper: (response) => {
           const uniqueContainers = new Set<string>();
 
@@ -942,18 +987,5 @@ const getContainerAttributeOptions = (
         },
       })(),
       ...podResource,
-    ]).then((results) => {
-      const uniqueContainers = new Set<string>();
-      results.forEach((result) => {
-        if (result.status === 'fulfilled') {
-          result.value.forEach((option) => {
-            uniqueContainers.add(option.value);
-          });
-        }
-      });
-      return Array.from(uniqueContainers).map((container) => ({
-        option: container,
-        value: container,
-      }));
-    });
+    ]).then(mergeSettledResults);
 };
diff --git a/web/src/pages/logs-dev-page.tsx b/web/src/pages/logs-dev-page.tsx
index 8abc4ddb3..380161d87 100644
--- a/web/src/pages/logs-dev-page.tsx
+++ b/web/src/pages/logs-dev-page.tsx
@@ -90,7 +90,7 @@ const LogsDevPage: React.FC<LogsDevPageProps> = ({ ns: namespaceFromProps }) =>
   } = useURLState({
     defaultTenant: tenant,
     getAttributes: ({ config: c, schema: s }) =>
-      availableDevConsoleAttributes(getInitialTenantFromNamespace(namespace), c, s),
+      availableDevConsoleAttributes(getInitialTenantFromNamespace(namespace), c, s, namespace),
     attributesDependencies: [namespace],
   });