fix(api): also filter disks by fs type filter

MauriceNino · Jan 5, 2023 · 0a97265 · 0a97265
1 parent 477a435
commit 0a97265
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/apps/api/__TESTS__/test-cases.ts b/apps/api/__TESTS__/test-cases.ts
@@ -2452,11 +2452,8 @@ export const TEST_CASE_8 = {
       group: undefined,
     },
   ],
-  layout: [
-    { brand: 'vda', device: 'vda', size: 53687091200, type: 'HDD' },
-    { brand: 'vdb', device: 'vdb', size: 485376, type: 'HDD' },
-  ],
-  output: { layout: [{ load: 17542520832 }, { load: 0 }] },
+  layout: [{ brand: 'vda', device: 'vda', size: 53687091200, type: 'HDD' }],
+  output: { layout: [{ load: 17542520832 }] },
 } as any as TestCase;
 
 // https://github.com/MauriceNino/dashdot/issues/188

diff --git a/apps/api/src/config.ts b/apps/api/src/config.ts
@@ -18,7 +18,7 @@ export const CONFIG: Config = {
   use_network_interface: penv('USE_NETWORK_INTERFACE') ?? '',
   fs_device_filter: lst(penv('FS_DEVICE_FILTER') ?? ''),
   fs_type_filter: lst(
-    penv('FS_TYPE_FILTER') ?? 'cifs,9p,fuse.rclone,fuse.mergerfs,nfs4'
+    penv('FS_TYPE_FILTER') ?? 'cifs,9p,fuse.rclone,fuse.mergerfs,nfs4,iso9660'
   ),
   fs_virtual_mounts: lst(penv('FS_VIRTUAL_MOUNTS') ?? ''),
   disable_integrations: penv('DISABLE_INTEGRATIONS') === 'true',

diff --git a/apps/api/src/data/storage/static.ts b/apps/api/src/data/storage/static.ts
@@ -11,7 +11,8 @@ const getDiskBlocks = (blocks: Block[]) =>
     block =>
       block.type === 'disk' &&
       block.size > 0 &&
-      !CONFIG.fs_device_filter.includes(block.name)
+      !CONFIG.fs_device_filter.includes(block.name) &&
+      !CONFIG.fs_type_filter.includes(block.fsType)
   );
 
 const getNativeDisk = (disks: Disk[], block: Block) =>

diff --git a/apps/docs/docs/config/features.mdx b/apps/docs/docs/config/features.mdx
@@ -67,7 +67,7 @@ Please also create a [bug ticket](https://github.com/MauriceNino/dashdot/issues/
 repository though, so that we can fix this problem for everyone.
 
 - type: `string (comma separated list)`
-- default: `cifs,9p,fuse.rclone,fuse.mergerfs,nfs4`
+- default: `cifs,9p,fuse.rclone,fuse.mergerfs,nfs4,iso9660`
 
 ## `DASHDOT_FS_VIRTUAL_MOUNTS`