@forge/cli

Index: package/out/command-line/register-log-commands.js
===================================================================
--- package/out/command-line/register-log-commands.js
+++ package/out/command-line/register-log-commands.js
@@ -115,16 +115,20 @@
     cmd
         .command('logs')
         .requireAppId()
         .description(cli_shared_3.Text.logs.cmd)
-        .option('-c, --containers', cli_shared_3.Text.logs.optionContainers, false)
         .environmentOption()
         .option('-i, --invocation <invocation>', cli_shared_3.Text.logs.optionInvocation)
         .option('-n, --limit <limit>', cli_shared_3.Text.logs.optionLimit)
         .option('-s, --since <since>', cli_shared_3.Text.logs.optionSince)
         .option('-g, --grouped', cli_shared_3.Text.logs.optionGroup, false)
-        .action(async ({ environment, invocation, limit: limitStr, grouped, since, containers }) => {
+        .option('-c, --containerKey <containerKey>', cli_shared_3.Text.logs.optionContainer)
+        .option('--instance <instance>', cli_shared_3.Text.logs.optionContainerInstance)
+        .option('--serviceKey <serviceKey>', cli_shared_3.Text.logs.optionService)
+        .option('-f, --functionKey <functionKey>', cli_shared_3.Text.logs.optionFunction)
+        .action(async ({ environment, invocation, limit: limitStr, grouped, since, containerKey, instance, serviceKey, functionKey }) => {
         const limit = limitStr ? parseLimit(limitStr) : DEFAULT_LIMIT;
+        const containers = Boolean(containerKey || instance || serviceKey);
         if (invocation) {
             if (containers) {
                 ui.error(new LogsCommandError(cli_shared_3.Text.logs.invalidOptionWithContainersCmd('-i')));
                 ui.emptyLine();
@@ -147,12 +151,15 @@
                 ui.warn(cli_shared_3.Text.logs.invalidSinceOption(since));
             }
             const logs = await viewAppLogsCommand.getAll({
                 environmentKey: environment,
+                containerKey,
+                containerInstance: instance,
+                serviceKey,
+                functionKey,
                 limit,
                 startTime,
-                grouped,
-                containers
+                grouped
             });
             [...logs].forEach((log) => logInvocation(ui, log, grouped, containers));
         }
     });