diff --git a/ui/src/config/section/infra/routers.js b/ui/src/config/section/infra/routers.js
index d9ca32f5b7d..c6eeaed22a6 100644
--- a/ui/src/config/section/infra/routers.js
+++ b/ui/src/config/section/infra/routers.js
@@ -91,6 +91,19 @@ export default {
         }
       }
     },
+    {
+      api: 'getDiagnosticsData',
+      icon: 'experiment',
+      label: 'label.action.get.diagnostics',
+      dataView: true,
+      show: (record) => { return record.state === 'Running' },
+      args: ['targetid', 'files'],
+      mapping: {
+        targetid: {
+          value: (record) => { return record.id }
+        }
+      }
+    },
     {
       api: 'destroyRouter',
       icon: 'delete',
diff --git a/ui/src/config/section/infra/systemVms.js b/ui/src/config/section/infra/systemVms.js
index 8c0e93f82b4..b616137cb27 100644
--- a/ui/src/config/section/infra/systemVms.js
+++ b/ui/src/config/section/infra/systemVms.js
@@ -82,6 +82,19 @@ export default {
         }
       }
     },
+    {
+      api: 'getDiagnosticsData',
+      icon: 'experiment',
+      label: 'label.action.get.diagnostics',
+      dataView: true,
+      show: (record) => { return record.state === 'Running' },
+      args: ['targetid', 'files'],
+      mapping: {
+        targetid: {
+          value: (record) => { return record.id }
+        }
+      }
+    },
     {
       api: 'destroySystemVm',
       icon: 'delete',
diff --git a/ui/src/locales/en.json b/ui/src/locales/en.json
index 3dea922da92..ee44080bdc2 100644
--- a/ui/src/locales/en.json
+++ b/ui/src/locales/en.json
@@ -214,6 +214,7 @@
 "externalloadbalanceripaddress": "External load balancer IP address",
 "externalid": "External Id",
 "extra": "Extra Arguments",
+"files":"Alternate Files to Retrieve",
 "fingerprint": "FingerPrint",
 "firewall": "Firewall",
 "firstname": "First Name",
@@ -407,6 +408,7 @@
 "label.action.expunge.instance": "Expunge Instance",
 "label.action.force.reconnect": "Force Reconnect",
 "label.action.generate.keys": "Generate Keys",
+"label.action.get.diagnostics":"Get Diagnostics Data",
 "label.action.lock.account": "Lock account",
 "label.action.manage.cluster": "Manage Cluster",
 "label.action.migrate.router": "Migrate Router",