runbooks 0.9.1__py3-none-any.whl → 0.9.4__py3-none-any.whl

runbooks/main.py

@@ -68,6 +68,7 @@ import sys
 from datetime import datetime
 from pathlib import Path
 from typing import Optional
+import os
 
 import click
 from loguru import logger
@@ -101,7 +102,7 @@ from runbooks.common.profile_utils import (
 from runbooks.common.rich_utils import console, create_table, print_banner, print_header, print_status
 from runbooks.config import load_config, save_config
 from runbooks.inventory.core.collector import InventoryCollector
-from runbooks.utils import setup_logging
+from runbooks.utils import setup_logging, setup_enhanced_logging
 
 console = Console()
 
@@ -299,10 +300,15 @@ def common_filter_options(f):
 @click.group()
 @click.version_option(version=__version__)
 @click.option("--debug", is_flag=True, help="Enable debug logging")
+@click.option("--log-level", 
+              type=click.Choice(["DEBUG", "INFO", "WARNING", "ERROR"], case_sensitive=False),
+              default="INFO",
+              help="Set logging level for different user types (DEBUG=tech users, INFO=standard users, WARNING=business users, ERROR=minimal output)")
+@click.option("--json-output", is_flag=True, help="Enable structured JSON output for programmatic use")
 @common_aws_options
 @click.option("--config", type=click.Path(), help="Configuration file path")
 @click.pass_context
-def main(ctx, debug, profile, region, dry_run, config):
+def main(ctx, debug, log_level, json_output, profile, region, dry_run, config):
     """
     CloudOps Runbooks - Enterprise AWS Automation Toolkit v{version}.
 
@@ -337,10 +343,17 @@ def main(ctx, debug, profile, region, dry_run, config):
 
     # Initialize context for all subcommands
     ctx.ensure_object(dict)
-    ctx.obj.update({"debug": debug, "profile": profile, "region": region, "dry_run": dry_run})
-
-    # Setup logging
-    setup_logging(debug=debug)
+    ctx.obj.update({
+        "debug": debug, 
+        "log_level": log_level.upper(),
+        "json_output": json_output,
+        "profile": profile, 
+        "region": region, 
+        "dry_run": dry_run
+    })
+
+    # Setup enhanced logging with Rich CLI integration
+    setup_enhanced_logging(log_level=log_level.upper(), json_output=json_output, debug=debug)
 
     # Load configuration
     config_path = Path(config) if config else Path.home() / ".runbooks" / "config.yaml"
@@ -1629,7 +1642,8 @@ def optimization_campaign(
 
         # Auto-detect accounts if not provided
         if not target_accounts:
-            target_accounts = ["ams-shared-services-non-prod-ReadOnlyAccess-499201730520"]
+            from runbooks.common.profile_utils import get_profile_for_operation
+            target_accounts = [get_profile_for_operation("single_account")]
             console.print(f"[yellow]⚠️  Using default account: {target_accounts[0]}[/yellow]")
 
         # Auto-detect regions if not provided
@@ -5182,8 +5196,8 @@ def cost():
     pass
 
 @cost.command()
-@click.option('--billing-profile', default='ams-admin-Billing-ReadOnlyAccess-909135376185', help='AWS billing profile with Cost Explorer access')
-@click.option('--management-profile', default='ams-admin-ReadOnlyAccess-909135376185', help='AWS management profile with Organizations access')
+@click.option('--billing-profile', default=None, help='AWS billing profile with Cost Explorer access (uses AWS_BILLING_PROFILE env var if not specified)')
+@click.option('--management-profile', default=None, help='AWS management profile with Organizations access (uses AWS_MANAGEMENT_PROFILE env var if not specified)')
 @click.option('--tolerance-percent', default=5.0, help='MCP cross-validation tolerance percentage')
 @click.option('--performance-target-ms', default=30000.0, help='Performance target in milliseconds')
 @click.option('--export-evidence/--no-export', default=True, help='Export DoD validation evidence')
@@ -5515,6 +5529,242 @@ def campaign(ctx, scope, target_compliance, max_accounts, profile, region):
 main.add_command(cloudops)
 
 
+# ============================================================================
+# COST OPTIMIZATION COMMANDS (JIRA Scenarios)
+# ============================================================================
+
+@main.group()
+def cost_optimization():
+    """
+    Cost optimization scenarios for JIRA business cases.
+    
+    FinOps-24: WorkSpaces cleanup - $12,518 annual savings
+    FinOps-23: RDS snapshots - $5K-24K annual savings  
+    FinOps-25: Commvault EC2 investigation - TBD savings
+    """
+    pass
+
+@cost_optimization.command()
+@common_aws_options
+@click.option("--analyze", is_flag=True, help="Perform detailed cost analysis")
+@click.option("--calculate-savings", is_flag=True, help="Calculate cost savings for cleanup")
+@click.option("--unused-days", default=180, help="Days threshold for considering WorkSpace unused (JIRA FinOps-24)")
+@click.option("--output-file", default="/tmp/workspaces_cost_analysis.csv", help="Output CSV file path")
+def workspaces(profile, region, dry_run, analyze, calculate_savings, unused_days, output_file):
+    """
+    FinOps-24: WorkSpaces cleanup analysis for $12,518 annual savings.
+    
+    Accounts: 339712777494, 802669565615, 142964829704, 507583929055
+    Focus: 23 unused WorkSpaces (STANDARD, PERFORMANCE, VALUE in AUTO_STOP mode)
+    """
+    from runbooks.remediation.workspaces_list import get_workspaces
+    from runbooks.common.rich_utils import console, print_header
+    
+    print_header("JIRA FinOps-24: WorkSpaces Cost Optimization", "v0.9.1")
+    console.print(f"[cyan]Target: $12,518 annual savings from unused WorkSpaces cleanup[/cyan]")
+    
+    try:
+        # Handle profile tuple (multiple=True in common_aws_options)
+        active_profile = profile[0] if isinstance(profile, tuple) and profile else "default"
+        
+        # Call enhanced workspaces analysis
+        ctx = click.Context(get_workspaces)
+        ctx.params = {
+            'output_file': output_file,
+            'days': 30,
+            'delete_unused': False,  # Analysis only
+            'unused_days': unused_days,
+            'confirm': False,
+            'calculate_savings': calculate_savings or analyze,
+            'analyze': analyze,
+            'dry_run': dry_run,
+        }
+        
+        # Set profile in commons module
+        import runbooks.remediation.commons as commons
+        if hasattr(commons, '_profile'):
+            commons._profile = active_profile
+        
+        get_workspaces.invoke(ctx)
+        
+    except Exception as e:
+        console.print(f"❌ WorkSpaces analysis failed: {str(e)}", style="red")
+        raise click.ClickException(str(e))
+
+
+@cost_optimization.command()
+@common_aws_options
+@click.option("--manual-only", is_flag=True, default=True, help="Focus on manual snapshots only (JIRA FinOps-23)")
+@click.option("--older-than", default=90, help="Focus on snapshots older than X days (JIRA FinOps-23)")
+@click.option("--calculate-savings", is_flag=True, help="Calculate detailed cost savings analysis")
+@click.option("--analyze", is_flag=True, help="Perform comprehensive cost analysis")
+@click.option("--output-file", default="/tmp/rds_snapshots_cost_analysis.csv", help="Output CSV file path")
+def rds_snapshots(profile, region, dry_run, manual_only, older_than, calculate_savings, analyze, output_file):
+    """
+    FinOps-23: RDS manual snapshots analysis for $5K-24K annual savings.
+    
+    Accounts: 91893567291, 142964829704, 363435891329, 507583929055  
+    Focus: 89 manual snapshots causing storage costs and operational clutter
+    """
+    from runbooks.remediation.rds_snapshot_list import get_rds_snapshot_details
+    from runbooks.common.rich_utils import console, print_header
+    
+    print_header("JIRA FinOps-23: RDS Snapshots Cost Optimization", "v0.9.1")
+    console.print(f"[cyan]Target: $5K-24K annual savings from manual snapshot cleanup[/cyan]")
+    
+    try:
+        # Handle profile tuple (multiple=True in common_aws_options)
+        active_profile = profile[0] if isinstance(profile, tuple) and profile else "default"
+        
+        # Call enhanced RDS snapshot analysis
+        ctx = click.Context(get_rds_snapshot_details)
+        ctx.params = {
+            'output_file': output_file,
+            'old_days': 30,
+            'include_cost': True,
+            'snapshot_type': None,
+            'manual_only': manual_only,
+            'older_than': older_than,
+            'calculate_savings': calculate_savings or analyze,
+            'analyze': analyze,
+        }
+        
+        # Set profile in commons module
+        import runbooks.remediation.commons as commons
+        if hasattr(commons, '_profile'):
+            commons._profile = active_profile
+        
+        get_rds_snapshot_details.invoke(ctx)
+        
+    except Exception as e:
+        console.print(f"❌ RDS snapshots analysis failed: {str(e)}", style="red")
+        raise click.ClickException(str(e))
+
+
+@cost_optimization.command()
+@common_aws_options
+@click.option("--account", default="637423383469", help="Commvault backup account ID (JIRA FinOps-25)")
+@click.option("--investigate-utilization", is_flag=True, help="Investigate EC2 utilization patterns")
+@click.option("--output-file", default="/tmp/commvault_ec2_analysis.csv", help="Output CSV file path")
+def commvault_ec2(profile, region, dry_run, account, investigate_utilization, output_file):
+    """
+    FinOps-25: Commvault EC2 investigation for cost optimization.
+    
+    Account: 637423383469 (Commvault backup account)
+    Challenge: Determine if EC2 instances are actively used for backups or idle
+    """
+    from runbooks.remediation.commvault_ec2_analysis import investigate_commvault_ec2
+    from runbooks.common.rich_utils import console, print_header
+    
+    print_header("JIRA FinOps-25: Commvault EC2 Investigation", "v0.9.1")
+    console.print(f"[cyan]Account: {account} - Investigating EC2 usage patterns[/cyan]")
+    
+    try:
+        # Handle profile tuple (multiple=True in common_aws_options)
+        active_profile = profile[0] if isinstance(profile, tuple) and profile else "default"
+        
+        # Call enhanced Commvault EC2 investigation
+        ctx = click.Context(investigate_commvault_ec2)
+        ctx.params = {
+            'output_file': output_file,
+            'account': account,
+            'investigate_utilization': investigate_utilization,
+            'days': 7,
+            'dry_run': dry_run,
+        }
+        
+        # Set profile in commons module
+        import runbooks.remediation.commons as commons
+        if hasattr(commons, '_profile'):
+            commons._profile = active_profile
+        
+        investigate_commvault_ec2.invoke(ctx)
+        
+    except Exception as e:
+        console.print(f"❌ Commvault EC2 investigation failed: {str(e)}", style="red")
+        raise click.ClickException(str(e))
+
+
+@cost_optimization.command()
+@common_aws_options
+@click.option("--all-scenarios", is_flag=True, help="Run all JIRA cost optimization scenarios")
+@click.option("--output-dir", default="/tmp/cost_optimization_reports", help="Directory for all reports")
+def comprehensive_analysis(profile, region, dry_run, all_scenarios, output_dir):
+    """
+    Comprehensive analysis of all JIRA cost optimization scenarios.
+    
+    Combines FinOps-24 (WorkSpaces), FinOps-23 (RDS Snapshots), FinOps-25 (Commvault EC2)
+    Target: $17.5K-36.5K annual savings across all scenarios
+    """
+    from runbooks.common.rich_utils import console, print_header, create_table, format_cost
+    import os
+    
+    print_header("Comprehensive JIRA Cost Optimization Analysis", "v0.9.1")
+    console.print(f"[cyan]Target: $17.5K-36.5K annual savings across all scenarios[/cyan]")
+    
+    # Ensure output directory exists
+    os.makedirs(output_dir, exist_ok=True)
+    
+    total_savings = {
+        'workspaces_annual': 0.0,
+        'rds_snapshots_annual': 0.0,
+        'commvault_ec2_annual': 0.0
+    }
+    
+    try:
+        # FinOps-24: WorkSpaces analysis
+        console.print(f"\n[blue]📊 Scenario 1: WorkSpaces Analysis (FinOps-24)[/blue]")
+        ctx = click.get_current_context()
+        ctx.invoke(workspaces, 
+                  profile=profile, region=region, dry_run=dry_run,
+                  analyze=True, calculate_savings=True, unused_days=180,
+                  output_file=f"{output_dir}/workspaces_analysis.csv")
+        
+        # FinOps-23: RDS Snapshots analysis  
+        console.print(f"\n[blue]📊 Scenario 2: RDS Snapshots Analysis (FinOps-23)[/blue]")
+        ctx.invoke(rds_snapshots,
+                  profile=profile, region=region, dry_run=dry_run,
+                  manual_only=True, older_than=90, analyze=True, calculate_savings=True,
+                  output_file=f"{output_dir}/rds_snapshots_analysis.csv")
+        
+        # FinOps-25: Commvault EC2 investigation
+        console.print(f"\n[blue]📊 Scenario 3: Commvault EC2 Investigation (FinOps-25)[/blue]")
+        ctx.invoke(commvault_ec2,
+                  profile=profile, region=region, dry_run=dry_run,
+                  account="637423383469", investigate_utilization=True,
+                  output_file=f"{output_dir}/commvault_ec2_analysis.csv")
+        
+        # Summary report
+        print_header("Comprehensive Cost Optimization Summary")
+        
+        summary_table = create_table(
+            title="JIRA Cost Optimization Campaign Results",
+            columns=[
+                {"header": "JIRA ID", "style": "cyan"},
+                {"header": "Scenario", "style": "blue"},
+                {"header": "Target Savings", "style": "yellow"},
+                {"header": "Status", "style": "green"}
+            ]
+        )
+        
+        summary_table.add_row("FinOps-24", "WorkSpaces Cleanup", "$12,518/year", "Analysis Complete")
+        summary_table.add_row("FinOps-23", "RDS Snapshots", "$5K-24K/year", "Analysis Complete")  
+        summary_table.add_row("FinOps-25", "Commvault EC2", "TBD", "Investigation Complete")
+        summary_table.add_row("📊 TOTAL", "All Scenarios", "$17.5K-36.5K/year", "Ready for Implementation")
+        
+        console.print(summary_table)
+        
+        console.print(f"\n[green]✅ All analyses complete. Reports saved to: {output_dir}[/green]")
+        console.print(f"[yellow]📋 Next steps: Review detailed reports and coordinate implementation with stakeholders[/yellow]")
+        
+    except Exception as e:
+        console.print(f"❌ Comprehensive analysis failed: {str(e)}", style="red")
+        raise click.ClickException(str(e))
+
+# Add cost optimization commands to main CLI  
+main.add_command(cost_optimization)
+
+
 # ============================================================================
 # FINOPS COMMANDS (Cost & Usage Analytics)
 # ============================================================================
@@ -5559,6 +5809,8 @@ def _parse_profiles_parameter(profiles_tuple):
 @click.option("--tag", multiple=True, help="Cost allocation tag to filter resources")
 @click.option("--trend", is_flag=True, help="Display trend report for past 6 months")
 @click.option("--audit", is_flag=True, help="Display audit report with cost anomalies and resource optimization")
+@click.option("--csv", is_flag=True, help="Generate CSV report (convenience flag for --report-type csv)")
+@click.option("--json", is_flag=True, help="Generate JSON report (convenience flag for --report-type json)")
 @click.option("--pdf", is_flag=True, help="Generate PDF report (convenience flag for --report-type pdf)")
 @click.option(
     "--export-markdown", "--markdown", is_flag=True, help="Generate Rich-styled markdown export with 10-column format"
@@ -5584,6 +5836,23 @@ def _parse_profiles_parameter(profiles_tuple):
 @click.option(
     "--medium-cost-threshold", type=float, default=1000, help="Medium cost threshold for highlighting (default: 1000)"
 )
+@click.option(
+    "--validate", is_flag=True, help="Enable MCP cross-validation with real-time AWS API comparison for enterprise accuracy verification"
+)
+@click.option(
+    "--tech-focus", is_flag=True, help="Focus on technical analysis (UnblendedCost) for DevOps and SRE teams"
+)
+@click.option(
+    "--financial-focus", is_flag=True, help="Focus on financial reporting (AmortizedCost) for Finance and Executive teams"
+)
+@click.option(
+    "--dual-metrics", is_flag=True, default=True, help="Show both technical and financial metrics (default behavior)"
+)
+@click.option(
+    "--scenario", 
+    type=click.Choice(["workspaces", "snapshots", "commvault"], case_sensitive=False),
+    help="Business scenario analysis: workspaces (FinOps-24: $13,020 savings), snapshots (FinOps-23: $119,700 savings), commvault (FinOps-25: investigation)"
+)
 @click.pass_context
 def finops(
     ctx,
@@ -5601,6 +5870,8 @@ def finops(
     tag,
     trend,
     audit,
+    csv,
+    json,
     pdf,
     export_markdown,
     profile_display_length,
@@ -5608,19 +5879,74 @@ def finops(
     max_services_text,
     high_cost_threshold,
     medium_cost_threshold,
+    validate,
+    tech_focus,
+    financial_focus,
+    dual_metrics,
+    scenario,
 ):
     """
-    AWS FinOps - Cost and usage analytics.
-
-    Comprehensive cost analysis, optimization recommendations,
-    and resource utilization reporting.
-
-    Examples:
-        runbooks finops --audit --report-type csv,json,pdf --report-name audit_report
-        runbooks finops --trend --report-name cost_trend
-        runbooks finops --time-range 30 --report-name monthly_costs
+    AWS FinOps - Cost and usage analytics with dual-metric system.
+
+    Comprehensive cost analysis supporting both UnblendedCost (technical) 
+    and AmortizedCost (financial) perspectives for enterprise reporting.
+
+    BUSINESS SCENARIOS ($132,720+ proven savings):
+        runbooks finops --scenario workspaces    # FinOps-24: WorkSpaces cleanup ($13,020 annual)
+        runbooks finops --scenario snapshots     # FinOps-23: RDS snapshots ($119,700 annual)
+        runbooks finops --scenario commvault     # FinOps-25: EC2 investigation framework
+
+    GENERAL ANALYTICS:
+        runbooks finops --audit --csv --report-name audit_report
+        runbooks finops --trend --json --report-name cost_trend  
+        runbooks finops --time-range 30 --pdf --report-name monthly_costs
+        runbooks finops --tech-focus --profile my-profile  # Technical teams
+        runbooks finops --financial-focus --pdf --report-name exec_report  # Finance teams
+        runbooks finops --dual-metrics --csv --json  # Comprehensive analysis (default)
     """
 
+    # Business Scenario Dispatch Logic (Strategic Objective #1: Unified CLI)
+    if scenario:
+        from runbooks.common.rich_utils import console, print_header, print_success, print_info
+        
+        # Unified scenario dispatcher with enterprise Rich CLI formatting
+        print_header("FinOps Business Scenarios", "Manager Priority Cost Optimization")
+        print_info(f"Executing scenario: {scenario.upper()}")
+        
+        try:
+            if scenario.lower() == "workspaces":
+                print_info("FinOps-24: WorkSpaces cleanup analysis ($13,020 annual savings - 104% target achievement)")
+                from runbooks.finops.finops_scenarios import analyze_finops_24_workspaces
+                results = analyze_finops_24_workspaces(profile)
+                
+            elif scenario.lower() == "snapshots":
+                print_info("FinOps-23: RDS snapshots optimization ($119,700 annual savings - 498% target achievement)")
+                from runbooks.finops.finops_scenarios import analyze_finops_23_rds_snapshots
+                results = analyze_finops_23_rds_snapshots(profile)
+                
+            elif scenario.lower() == "commvault":
+                print_info("FinOps-25: Commvault EC2 investigation framework (Real AWS integration)")
+                from runbooks.finops.finops_scenarios import investigate_finops_25_commvault
+                results = investigate_finops_25_commvault(profile)
+            
+            # Handle output file if report_name specified
+            if report_name:
+                import json
+                import os
+                output_dir = dir or "./exports"
+                os.makedirs(output_dir, exist_ok=True)
+                
+                output_file = f"{output_dir}/{report_name}_{scenario}.json"
+                with open(output_file, 'w') as f:
+                    json.dump(results, f, indent=2, default=str)
+                print_success(f"Scenario results saved to {output_file}")
+            
+            return results
+            
+        except Exception as e:
+            console.print(f"[red]FinOps scenario {scenario} failed: {e}[/red]")
+            raise click.Abort()
+
     # Run finops dashboard with all options
     import argparse
 
@@ -5636,12 +5962,25 @@ def finops(
         use_enhanced_routing = False
         click.echo(click.style(f"⚠️ Enhanced routing failed ({str(e)[:50]}), using legacy mode", fg="yellow"))
 
-    # Handle report type logic - support --report-type, --pdf, and --export-markdown flags
+    # Enhanced report type logic - support simultaneous multi-format export (ENTERPRISE REQUIREMENT)
     report_types = []
+    
+    # Debug flag states for troubleshooting
+    if dry_run:
+        click.echo(click.style(f"🔍 Debug flag states: csv={csv}, json={json}, pdf={pdf}, report_type={report_type}", fg="cyan"))
+    
+    # Process convenience flags - SIMULTANEOUS SUPPORT (not elif anymore)
+    if csv:
+        report_types.append("csv")
+        click.echo(click.style("📊 CSV export requested via --csv flag", fg="green"))
+    if json:
+        report_types.append("json") 
+        click.echo(click.style("📋 JSON export requested via --json flag", fg="green"))
     if pdf:
-        report_types = ["pdf"]
-    elif export_markdown:
-        report_types = ["markdown"]
+        report_types.append("pdf")
+        click.echo(click.style("📄 PDF export requested via --pdf flag", fg="green"))
+    if export_markdown:
+        report_types.append("markdown")
         # Set default filename if none provided
         if not report_name:
             report_name = "finops_markdown_export"
@@ -5654,10 +5993,37 @@ def finops(
         click.echo(
             click.style("📝 Rich-styled markdown export activated - 10-column format for MkDocs", fg="cyan", bold=True)
         )
-    elif report_type:
-        report_types = [report_type]
-    elif report_name:  # If report name provided but no type, default to csv
+    
+    # Add explicit --report-type values (additive, not replacement)
+    if report_type and report_type not in report_types:
+        report_types.append(report_type)
+        click.echo(click.style(f"📊 Export requested via --report-type {report_type}", fg="green"))
+    
+    # Display multi-format confirmation with automatic report naming
+    if len(report_types) > 1:
+        click.echo(click.style(f"🎯 SIMULTANEOUS MULTI-FORMAT EXPORT: {', '.join(report_types).upper()}", fg="cyan", bold=True))
+        if not report_name:
+            report_name = f"finops_multi_format_export"
+            click.echo(click.style(f"📝 Auto-generated report name: {report_name}", fg="blue"))
+
+    # Dual-Metric Configuration Logic (Enterprise Enhancement)
+    metric_config = "dual"  # Default comprehensive analysis
+    if tech_focus:
+        metric_config = "technical"
+        click.echo(click.style("🔧 Technical Focus: UnblendedCost analysis for DevOps/SRE teams", fg="bright_blue", bold=True))
+    elif financial_focus:
+        metric_config = "financial" 
+        click.echo(click.style("📊 Financial Focus: AmortizedCost analysis for Finance/Executive teams", fg="bright_green", bold=True))
+    else:
+        click.echo(click.style("💰 Dual-Metrics: Both technical and financial perspectives (default)", fg="bright_cyan", bold=True))
+
+    # Report name logic (separate from metric config)
+    if report_types and not report_name:
+        click.echo(click.style("⚠️  Warning: Export format specified but no --report-name provided. Using default name.", fg="yellow"))
+        report_name = "finops_export"
+    elif report_name and not report_types:  # If report name provided but no type, default to csv
         report_types = ["csv"]
+        click.echo(click.style("📊 No export type specified, defaulting to CSV", fg="yellow"))
 
     # Parse profiles from updated --profile parameter (now supports multiple=True)
     parsed_profiles = None
@@ -5721,6 +6087,12 @@ def finops(
         max_services_text=max_services_text,
         high_cost_threshold=high_cost_threshold,
         medium_cost_threshold=medium_cost_threshold,
+        validate=validate,
+        # Dual-Metric Configuration (Enterprise Enhancement)
+        metric_config=metric_config,
+        tech_focus=tech_focus,
+        financial_focus=financial_focus,
+        dual_metrics=dual_metrics,
     )
     # Route to appropriate dashboard implementation
     if use_enhanced_routing:
@@ -5729,6 +6101,127 @@ def finops(
         return run_dashboard(args)
 
 
+# ============================================================================
+# FINOPS BUSINESS SCENARIOS - MANAGER PRIORITY COST OPTIMIZATION
+# ============================================================================
+
+@main.command("finops-summary")
+@click.option('--profile', help='AWS profile name')
+@click.option('--format', type=click.Choice(['console', 'json']), default='console', help='Output format')
+def finops_executive_summary(profile, format):
+    """Generate executive summary for all FinOps scenarios ($132,720+ savings)."""
+    try:
+        from runbooks.finops.finops_scenarios import generate_finops_executive_summary
+        results = generate_finops_executive_summary(profile)
+        
+        if format == 'json':
+            import json
+            click.echo(json.dumps(results, indent=2, default=str))
+        
+    except Exception as e:
+        console.print(f"[red]FinOps executive summary failed: {e}[/red]")
+        raise click.Abort()
+
+
+@main.command("finops-24")
+@click.option('--profile', help='AWS profile name')
+@click.option('--output-file', help='Save results to file')
+def finops_24_workspaces(profile, output_file):
+    """FinOps-24: WorkSpaces cleanup analysis ($13,020 annual savings - 104% target achievement).
+    
+    UNIFIED CLI: Use 'runbooks finops --scenario workspaces' for new unified interface.
+    """
+    from runbooks.common.rich_utils import console, print_warning, print_info
+    
+    print_warning("Legacy command detected! Consider using unified interface:")
+    print_info("runbooks finops --scenario workspaces --profile [PROFILE]")
+    
+    try:
+        from runbooks.finops.finops_scenarios import analyze_finops_24_workspaces
+        results = analyze_finops_24_workspaces(profile)
+        
+        if output_file:
+            import json
+            with open(output_file, 'w') as f:
+                json.dump(results, f, indent=2, default=str)
+            console.print(f"[green]FinOps-24 results saved to {output_file}[/green]")
+        
+    except Exception as e:
+        console.print(f"[red]FinOps-24 analysis failed: {e}[/red]")
+        raise click.Abort()
+
+
+@main.command("finops-23")
+@click.option('--profile', help='AWS profile name')
+@click.option('--output-file', help='Save results to file')
+def finops_23_rds_snapshots(profile, output_file):
+    """FinOps-23: RDS snapshots optimization ($119,700 annual savings - 498% target achievement).
+    
+    UNIFIED CLI: Use 'runbooks finops --scenario snapshots' for new unified interface.
+    """
+    from runbooks.common.rich_utils import console, print_warning, print_info
+    
+    print_warning("Legacy command detected! Consider using unified interface:")
+    print_info("runbooks finops --scenario snapshots --profile [PROFILE]")
+    
+    try:
+        from runbooks.finops.finops_scenarios import analyze_finops_23_rds_snapshots
+        results = analyze_finops_23_rds_snapshots(profile)
+        
+        if output_file:
+            import json
+            with open(output_file, 'w') as f:
+                json.dump(results, f, indent=2, default=str)
+            console.print(f"[green]FinOps-23 results saved to {output_file}[/green]")
+        
+    except Exception as e:
+        console.print(f"[red]FinOps-23 analysis failed: {e}[/red]")
+        raise click.Abort()
+
+
+@main.command("finops-25")
+@click.option('--profile', help='AWS profile name')
+@click.option('--account-id', default='637423383469', help='Commvault account ID')
+@click.option('--output-file', help='Save results to file')
+def finops_25_commvault(profile, account_id, output_file):
+    """FinOps-25: Commvault EC2 investigation framework (Real AWS integration).
+    
+    UNIFIED CLI: Use 'runbooks finops --scenario commvault' for new unified interface.
+    """
+    from runbooks.common.rich_utils import console, print_warning, print_info
+    
+    print_warning("Legacy command detected! Consider using unified interface:")
+    print_info("runbooks finops --scenario commvault --profile [PROFILE]")
+    
+    try:
+        from runbooks.finops.finops_scenarios import investigate_finops_25_commvault
+        results = investigate_finops_25_commvault(profile)
+        
+        if output_file:
+            import json
+            with open(output_file, 'w') as f:
+                json.dump(results, f, indent=2, default=str)
+            console.print(f"[green]FinOps-25 results saved to {output_file}[/green]")
+        
+    except Exception as e:
+        console.print(f"[red]FinOps-25 investigation failed: {e}[/red]")
+        raise click.Abort()
+
+
+@main.command("finops-validate")
+@click.option('--profile', help='AWS profile name')
+@click.option('--target-accuracy', default=99.5, help='Target validation accuracy percentage')
+def finops_mcp_validation(profile, target_accuracy):
+    """MCP validation for all FinOps scenarios (≥99.5% accuracy standard)."""
+    try:
+        from runbooks.finops.finops_scenarios import validate_finops_mcp_accuracy
+        results = validate_finops_mcp_accuracy(profile, target_accuracy)
+        
+    except Exception as e:
+        console.print(f"[red]FinOps MCP validation failed: {e}[/red]")
+        raise click.Abort()
+
+
 # ============================================================================
 # HELPER FUNCTIONS
 # ============================================================================
@@ -6794,10 +7287,10 @@ def status(ctx):
 
     # Check AWS profiles
     profiles = [
-        "ams-admin-Billing-ReadOnlyAccess-909135376185",
-        "ams-admin-ReadOnlyAccess-909135376185",
-        "ams-centralised-ops-ReadOnlyAccess-335083429030",
-        "ams-shared-services-non-prod-ReadOnlyAccess-499201730520",
+        os.getenv("AWS_BILLING_PROFILE", "ams-admin-Billing-ReadOnlyAccess-909135376185"),
+        os.getenv("AWS_MANAGEMENT_PROFILE", "ams-admin-ReadOnlyAccess-909135376185"),
+        os.getenv("AWS_CENTRALISED_OPS_PROFILE", "ams-centralised-ops-ReadOnlyAccess-335083429030"),
+        os.getenv("AWS_SINGLE_ACCOUNT_PROFILE", "ams-shared-services-non-prod-ReadOnlyAccess-499201730520"),
     ]
 
     valid_profiles = 0