refactoring (support multiple StorageSystems per ODF)

locales/en/plugin__odf-console.json

@@ -376,9 +376,9 @@
   "Estimating {{formattedEta}} to completion": "Estimating {{formattedEta}} to completion",
   "Object_one": "Object",
   "Object_other": "Object",
+  "NooBaa Bucket": "NooBaa Bucket",
   "Buckets": "Buckets",
   "Buckets card represents the number of S3 buckets managed on Multicloud Object Gateway and the number of ObjectBucketClaims and the ObjectBuckets managed on both Multicloud Object Gateway and RGW (if deployed).": "Buckets card represents the number of S3 buckets managed on Multicloud Object Gateway and the number of ObjectBucketClaims and the ObjectBuckets managed on both Multicloud Object Gateway and RGW (if deployed).",
-  "NooBaa Bucket": "NooBaa Bucket",
   "Cluster-wide": "Cluster-wide",
   "Any NON Object bucket claims that were created via an S3 client or via the NooBaa UI system.": "Any NON Object bucket claims that were created via an S3 client or via the NooBaa UI system.",
   "Break by": "Break by",
@@ -483,13 +483,15 @@
   "Optimise cluster for Regional-DR?": "Optimise cluster for Regional-DR?",
   "Configure the cluster for a Regional-DR setup by migrating OSDs. Migration may take some time depending on several factors. To learn more about OSDs migration best practices and its consequences refer to the documentation.": "Configure the cluster for a Regional-DR setup by migrating OSDs. Migration may take some time depending on several factors. To learn more about OSDs migration best practices and its consequences refer to the documentation.",
   "Optimise": "Optimise",
-  "Filesystem name": "Filesystem name",
-  "Enter filesystem name": "Enter filesystem name",
-  "CephFS filesystem name into which the volume shall be created": "CephFS filesystem name into which the volume shall be created",
   "no compression": "no compression",
   "with compression": "with compression",
   "Replica {{poolSize}} {{compressionText}}": "Replica {{poolSize}} {{compressionText}}",
   "Create New Pool": "Create New Pool",
+  "Storage system": "Storage system",
+  "StorageSystem which will be used for storage needs": "StorageSystem which will be used for storage needs",
+  "Filesystem name": "Filesystem name",
+  "Enter filesystem name": "Enter filesystem name",
+  "CephFS filesystem name into which the volume shall be created": "CephFS filesystem name into which the volume shall be created",
   "Storage Pool": "Storage Pool",
   "Select a Pool": "Select a Pool",
   "Storage pool into which volume data shall be stored": "Storage pool into which volume data shall be stored",
@@ -959,7 +961,6 @@
   "Client onboarding token": "Client onboarding token",
   "Raw Capacity": "Raw Capacity",
   "Add Capacity": "Add Capacity",
-  "External": "External",
   "Cluster details": "Cluster details",
   "Data resiliency": "Data resiliency",
   "Nodes": "Nodes",
@@ -969,8 +970,11 @@
   "Search...": "Search...",
   "Expand to fullscreen": "Expand to fullscreen",
   "Exit fullscreen": "Exit fullscreen",
+  "This view is only supported for Internal mode cluster.": "This view is only supported for Internal mode cluster.",
+  "Show message": "Show message",
+  "Hide message": "Hide message",
   "Back to main view": "Back to main view",
-  "Topology view is not supported for External Mode": "Topology view is not supported for External Mode",
+  "Topology view is not supported for External mode": "Topology view is not supported for External mode",
   "No StorageCluster found": "No StorageCluster found",
   "Set up a storage cluster to view the topology": "Set up a storage cluster to view the topology",
   "A minimal cluster deployment will be performed.": "A minimal cluster deployment will be performed.",
@@ -1023,7 +1027,7 @@
   "No StorageClass selected": "No StorageClass selected",
   "The Arbiter stretch cluster requires a minimum of 4 nodes (2 different zones, 2 nodes per zone). Please choose a different StorageClass or create a new LocalVolumeSet that matches the minimum node requirement.": "The Arbiter stretch cluster requires a minimum of 4 nodes (2 different zones, 2 nodes per zone). Please choose a different StorageClass or create a new LocalVolumeSet that matches the minimum node requirement.",
   "The StorageCluster requires a minimum of 3 nodes. Please choose a different StorageClass or create a new LocalVolumeSet that matches the minimum node requirement.": "The StorageCluster requires a minimum of 3 nodes. Please choose a different StorageClass or create a new LocalVolumeSet that matches the minimum node requirement.",
-  "Adding capacity for <1>{{name}}</1>, may increase your expenses.": "Adding capacity for <1>{{name}}</1>, may increase your expenses.",
+  "Adding capacity for <1>{{ocsClusterName}}</1>, may increase your expenses.": "Adding capacity for <1>{{ocsClusterName}}</1>, may increase your expenses.",
   "Currently Used:": "Currently Used:",
   "Add": "Add",
   "{{availableCapacity}} /  {{replica}} replicas": "{{availableCapacity}} /  {{replica}} replicas",

packages/client/src/components/dashboards/cards/inventory-card.tsx

@@ -30,6 +30,7 @@ const watchResources = {
     kind: StorageClassModel.kind,
   },
 };
+
 export const InventoryCard: React.FC = () => {
   const { t } = useCustomTranslation();
 

packages/mco/components/mco-dashboard/queries.ts

@@ -27,11 +27,11 @@ export const LAST_SYNC_TIME_QUERY = 'ramen_sync_duration_seconds';
 export const getLastSyncPerClusterQuery = () =>
   `${LAST_SYNC_TIME_QUERY}{${DRPC_OBJECT_TYPE}, ${RAMEN_HUB_OPERATOR_METRICS_SERVICE}}`;
 
-// ToDo (epic 4422): Need to update as per updates in the metrics
 export const CAPACITY_QUERIES = {
-  // ToDo (epic 4422): For 4.15, Assuming "managedBy" is unique for each StorageSystem. Need to add "target_namesapce" as an another key.
-  [StorageDashboard.TOTAL_CAPACITY_FILE_BLOCK]: `(label_replace(odf_system_map, "managedBy", "$1", "target_name", "(.*)"))  * on (namespace, managedBy, cluster) group_right(storage_system, target_kind, target_namespace) ${TOTAL_CAPACITY_FILE_BLOCK_METRIC}`,
-  [StorageDashboard.USED_CAPACITY_FILE_BLOCK]: `(label_replace(odf_system_map, "managedBy", "$1", "target_name", "(.*)"))  * on (namespace, managedBy, cluster) group_right(storage_system, target_kind, target_namespace) ${USED_CAPACITY_FILE_BLOCK_METRIC}`,
+  // ToDo (epic 4422): Need to update as per updates in the metrics (if needed/once confirmed).
+  // Assuming "namespace" in "odf_system.*"" metrics (except "odf_system_map" which is pushed by ODF opr and already has "target_namespace") is where system is deployed.
+  [StorageDashboard.TOTAL_CAPACITY_FILE_BLOCK]: `(label_replace(odf_system_map, "managedBy", "$1", "target_name", "(.*)"))  * on (target_namespace, managedBy, cluster) group_right(storage_system, target_kind) (label_replace(${TOTAL_CAPACITY_FILE_BLOCK_METRIC}, "target_namespace", "$1", "namespace", "(.*)"))`,
+  [StorageDashboard.USED_CAPACITY_FILE_BLOCK]: `(label_replace(odf_system_map, "managedBy", "$1", "target_name", "(.*)"))  * on (target_namespace, managedBy, cluster) group_right(storage_system, target_kind) (label_replace(${USED_CAPACITY_FILE_BLOCK_METRIC}, "target_namespace", "$1", "namespace", "(.*)"))`,
 };
 
 export const getRBDSnapshotUtilizationQuery = (
@@ -46,10 +46,10 @@ export const getRBDSnapshotUtilizationQuery = (
   return queries[queryName];
 };
 
-// ToDo (epic 4422): Need to update as per updates in the metrics
 export const STATUS_QUERIES = {
-  // ToDo (epic 4422): For 4.15, Assuming "managedBy" is unique for each StorageSystem. Need to add "target_namesapce" as an another key.
-  [StorageDashboard.SYSTEM_HEALTH]: `(label_replace(odf_system_map, "managedBy", "$1", "target_name", "(.*)"))  * on (namespace, managedBy, cluster) group_right(storage_system, target_kind, target_namespace) ${SYSTEM_HEALTH_METRIC}`,
+  // ToDo (epic 4422): Need to update as per updates in the metrics (if needed/once confirmed).
+  // Assuming "namespace" in "odf_system.*"" metrics (except "odf_system_map" which is pushed by ODF opr and already has "target_namespace") is where system is deployed.
+  [StorageDashboard.SYSTEM_HEALTH]: `(label_replace(odf_system_map, "managedBy", "$1", "target_name", "(.*)"))  * on (target_namespace, managedBy, cluster) group_right(storage_system, target_kind) (label_replace(${SYSTEM_HEALTH_METRIC}, "target_namespace", "$1", "namespace", "(.*)"))`,
   [StorageDashboard.HEALTH]: SYSTEM_HEALTH_METRIC,
   [StorageDashboard.CSV_STATUS]: `csv_succeeded{name=~"${ODF_OPERATOR}.*"}`,
   [StorageDashboard.CSV_STATUS_ALL_WHITELISTED]: 'csv_succeeded',

packages/mco/components/mco-dashboard/storage-system/status-card/status-card.tsx

@@ -56,6 +56,8 @@ const setSubSystemMap = (
   subSysHealthData: PrometheusResponse,
   subSystemMap: SubSystemMap
 ) =>
+  // ToDo (epic 4422): Assuming "namespace" in "odf_system.*"" metrics (except "odf_system_map" which is pushed by ODF opr and already has "target_namespace")
+  // is where system is deployed (update query if needed).
   subSysHealthData?.data?.result?.forEach(
     (item: PrometheusResult) =>
       !item?.metric.managedBy &&
@@ -70,6 +72,8 @@ const setHealthData = (
   healthData: SystemHealthMap[],
   subSystemMap: SubSystemMap
 ) =>
+  // ToDo (epic 4422): Assuming "namespace" in "odf_system.*"" metrics (except "odf_system_map" which is pushed by ODF opr and already has "target_namespace")
+  // is where system is deployed (update query if needed).
   sysHealthData?.data?.result?.forEach((item: PrometheusResult) => {
     const { apiGroup } = getGVK(item?.metric.target_kind);
     const healthVal = item?.value[1];

packages/mco/components/mco-dashboard/storage-system/system-capacity-card/capacity-card.tsx

@@ -151,12 +151,20 @@ const headerColumns = (t: TFunction) => [
 ];
 
 const getRow: GetRow = (
-  { systemName, targetKind, clusterName, totalValue, usedValue, clusterURL },
+  {
+    systemName,
+    namespace: systemNamespace,
+    targetKind,
+    clusterName,
+    totalValue,
+    usedValue,
+    clusterURL,
+  },
   index
 ) => {
   const { apiGroup, apiVersion, kind } = getGVK(targetKind);
   const systemKind = referenceForGroupVersionKind(apiGroup)(apiVersion)(kind);
-  const systemPath = getDashboardLink(systemKind, systemName);
+  const systemPath = getDashboardLink(systemKind, systemName, systemNamespace);
   const isPercentage = !!totalValue;
   const progress = isPercentage ? getPercentage(usedValue, totalValue) : 100;
   const value = isPercentage
@@ -280,6 +288,8 @@ const SystemCapacityCard: React.FC = () => {
       !loadingUsedCapacity && !errorUsedCapacity
         ? usedCapacity?.data?.result?.reduce(
             (acc: CapacityMetricDatumMap, usedMetric: PrometheusResult) => {
+              // ToDo (epic 4422): Assuming "namespace" in "odf_system.*"" metrics (except "odf_system_map" which is pushed by ODF opr and already has "target_namespace")
+              // is where system is deployed (update query if needed).
               const systemName = usedMetric?.metric?.storage_system;
               const namespace = usedMetric?.metric?.target_namespace;
               const targetKind = usedMetric?.metric?.target_kind;
@@ -305,6 +315,8 @@ const SystemCapacityCard: React.FC = () => {
     !loadingTotalCapacity &&
       !errorTotalCapacity &&
       totalCapacity?.data?.result?.forEach((totalMetric: PrometheusResult) => {
+        // ToDo (epic 4422): Assuming "namespace" in "odf_system.*"" metrics (except "odf_system_map" which is pushed by ODF opr and already has "target_namespace")
+        // is where system is deployed (update query if needed).
         const dataMapKey = getUniqueKey(
           totalMetric?.metric?.storage_system,
           totalMetric?.metric?.target_namespace,

packages/ocs/block-pool/BlockPoolDetailsPage.tsx

@@ -1,12 +1,11 @@
 import * as React from 'react';
-import { useSafeK8sWatchResource } from '@odf/core/hooks';
-import { useODFNamespaceSelector } from '@odf/core/redux';
 import DetailsPage from '@odf/shared/details-page/DetailsPage';
 import { Kebab } from '@odf/shared/kebab/kebab';
 import { ModalKeys } from '@odf/shared/modals/types';
 import { useCustomTranslation } from '@odf/shared/useCustomTranslationHook';
 import { referenceForModel } from '@odf/shared/utils';
 import { EventStreamWrapped, YAMLEditorWrapped } from '@odf/shared/utils/Tabs';
+import { useK8sWatchResource } from '@openshift-console/dynamic-plugin-sdk';
 import { useParams, useLocation } from 'react-router-dom-v5-compat';
 import { BlockPoolDashboard } from '../dashboards/block-pool/block-pool-dashboard';
 import { CephBlockPoolModel, CephClusterModel } from '../models';
@@ -21,20 +20,16 @@ export const cephClusterResource = {
 export const BlockPoolDetailsPage: React.FC<{}> = () => {
   const { t } = useCustomTranslation();
 
-  const { poolName } = useParams();
+  const { poolName, namespace: poolNs } = useParams();
   const location = useLocation();
   const kind = referenceForModel(CephBlockPoolModel);
 
-  const { odfNamespace, isODFNsLoaded, odfNsLoadError } =
-    useODFNamespaceSelector();
-
-  const [resource, loaded, loadError] =
-    useSafeK8sWatchResource<StoragePoolKind>((ns: string) => ({
-      kind,
-      name: poolName,
-      namespace: ns,
-      isList: false,
-    }));
+  const [resource, loaded, loadError] = useK8sWatchResource<StoragePoolKind>({
+    kind,
+    name: poolName,
+    namespace: poolNs,
+    isList: false,
+  });
 
   const breadcrumbs = [
     {
@@ -58,7 +53,7 @@ export const BlockPoolDetailsPage: React.FC<{}> = () => {
         extraProps={{
           resource,
           resourceModel: CephBlockPoolModel,
-          namespace: odfNamespace,
+          namespace: poolNs,
         }}
         customKebabItems={[
           {
@@ -78,12 +73,12 @@ export const BlockPoolDetailsPage: React.FC<{}> = () => {
         ]}
       />
     );
-  }, [resource, odfNamespace, t]);
+  }, [resource, poolNs, t]);
 
   return (
     <DetailsPage
-      loaded={loaded && isODFNsLoaded}
-      loadError={loadError || odfNsLoadError}
+      loaded={loaded}
+      loadError={loadError}
       breadcrumbs={breadcrumbs}
       actions={actions}
       resourceModel={CephBlockPoolModel}