eli-420 updating report generation to get data from all environments

eddalmond1 · eddalmond1 · commit ac392a6acd4c · 2025-12-14T15:51:13.000Z
diff --git a/.github/workflows/monthly-capacity-report.yml b/.github/workflows/monthly-capacity-report.yml
@@ -26,26 +26,77 @@ jobs:
         with:
           python-version: "3.11"
 
-      - name: "Configure AWS Credentials"
+      # ----------------------------------------------------------------
+      # 1. Export PROD
+      # ----------------------------------------------------------------
+      - name: "Configure AWS Credentials (Prod)"
         uses: aws-actions/configure-aws-credentials@v5
         with:
           role-to-assume: arn:aws:iam::${{ secrets.AWS_PROD_ACCOUNT_ID }}:role/service-roles/github-actions-api-deployment-role
           aws-region: eu-west-2
 
-      - name: Generate dashboard report
+      - name: Export Dashboard (Prod)
         run: |
           chmod +x scripts/export_dashboard_image.sh
-          ./scripts/export_dashboard_image.sh Demand_And_Capacity_Prod
+          ./scripts/export_dashboard_image.sh Demand_And_Capacity_Prod Prod
         env:
           AWS_REGION: eu-west-2
 
+      # ----------------------------------------------------------------
+      # 2. Export PREPROD
+      # ----------------------------------------------------------------
+      - name: "Configure AWS Credentials (Preprod)"
+        uses: aws-actions/configure-aws-credentials@v5
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_PREPROD_ACCOUNT_ID }}:role/service-roles/github-actions-api-deployment-role
+          aws-region: eu-west-2
+
+      - name: Export Dashboard (Preprod)
+        run: ./scripts/export_dashboard_image.sh Demand_And_Capacity_Preprod Preprod
+        env:
+          AWS_REGION: eu-west-2
+
+      # ----------------------------------------------------------------
+      # 3. Export TEST
+      # ----------------------------------------------------------------
+      - name: "Configure AWS Credentials (Test)"
+        uses: aws-actions/configure-aws-credentials@v5
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_TEST_ACCOUNT_ID }}:role/service-roles/github-actions-api-deployment-role
+          aws-region: eu-west-2
+
+      - name: Export Dashboard (Test)
+        run: ./scripts/export_dashboard_image.sh Demand_And_Capacity_Test Test
+        env:
+          AWS_REGION: eu-west-2
+
+      # ----------------------------------------------------------------
+      # 4. Export DEV
+      # ----------------------------------------------------------------
+      - name: "Configure AWS Credentials (Dev)"
+        uses: aws-actions/configure-aws-credentials@v5
+        with:
+          role-to-assume: arn:aws:iam::${{ secrets.AWS_DEV_ACCOUNT_ID }}:role/service-roles/github-actions-api-deployment-role
+          aws-region: eu-west-2
+
+      - name: Export Dashboard (Dev)
+        run: ./scripts/export_dashboard_image.sh Demand_And_Capacity_Dev Dev
+        env:
+          AWS_REGION: eu-west-2
+
+      # ----------------------------------------------------------------
+      # Generate & Notify
+      # ----------------------------------------------------------------
+      - name: Generate Combined Report
+        run: python3 scripts/generate_dashboard_report.py --input dashboard_exports
+
       - name: Upload report as artifact
         uses: actions/upload-artifact@v4
         with:
           name: capacity-report
           path: |
-            dashboard_exports/*.html
-            dashboard_exports/*.png
+            dashboard_exports/**/*.html
+            dashboard_exports/**/*.png
           retention-days: 90
 
       - name: Send to Slack
@@ -54,21 +105,20 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_D_AND_C_WEBHOOK }}
         run: |
           # Get the latest HTML report
-          REPORT_FILE=$(ls -t dashboard_exports/dashboard_report_*.html | head -1)
+          REPORT_FILE=$(find dashboard_exports -name "dashboard_report_*.html" | head -n 1)
           REPORT_NAME=$(basename "$REPORT_FILE")
 
           # GitHub Actions URL
           GITHUB_URL="${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
 
-          # Send Slack notification with simple variables for Workflow Automation
+          # Send Slack notification
           curl -X POST "$SLACK_WEBHOOK_URL" \
             -H 'Content-Type: application/json' \
             -d @- <<EOF
           {
-            "report_title": "📊 Monthly Demand & Capacity Report - EliD - Prod",
+            "report_title": "📊 Monthly Demand & Capacity Report - EliD - All Envs",
             "report_period": "Last 8 weeks",
             "generated_date": "$(date +'%Y-%m-%d %H:%M UTC')",
-            "widgets_count": "7",
             "github_url": "$GITHUB_URL",
             "report_name": "$REPORT_NAME"
           }
diff --git a/scripts/export_dashboard_image.sh b/scripts/export_dashboard_image.sh
@@ -4,7 +4,9 @@
 set -e
 
 DASHBOARD_NAME="${1:-Demand_And_Capacity_Prod}"
-OUTPUT_DIR="dashboard_exports"
+ENVIRONMENT="${2:-Prod}"
+OUTPUT_BASE="dashboard_exports"
+OUTPUT_DIR="${OUTPUT_BASE}/${ENVIRONMENT}"
 TIMESTAMP=$(date +%Y%m%d_%H%M%S)
 REGION="${AWS_REGION:-eu-west-2}"
 
@@ -15,6 +17,7 @@ echo "========================================="
 echo "CloudWatch Dashboard Image Export"
 echo "========================================="
 echo "Dashboard: $DASHBOARD_NAME"
+echo "Environment: $ENVIRONMENT"
 echo "Region: $REGION"
 echo "Output: $OUTPUT_DIR"
 echo ""
@@ -49,7 +52,7 @@ import sys
 import os
 
 # Read dashboard definition
-with open(f"dashboard_exports/dashboard_definition_{os.environ['TIMESTAMP']}.json") as f:
+with open(f"{os.environ['OUTPUT_DIR']}/dashboard_definition_{os.environ['TIMESTAMP']}.json") as f:
     dashboard_data = json.load(f)
 
 # Parse the dashboard body
@@ -133,10 +136,4 @@ print("========================================")
 PYTHON_SCRIPT
 
 echo ""
-echo "Generating HTML report..."
-python3 scripts/generate_dashboard_report.py --input "${OUTPUT_DIR}"
-
-echo ""
-echo "✓ Complete! Check the ${OUTPUT_DIR}/ directory for:"
-echo "  - Individual widget images (PNG files)"
-echo "  - Combined HTML report (dashboard_report_*.html)"
+echo "✓ Export for $ENVIRONMENT complete!"
diff --git a/scripts/generate_dashboard_report.py b/scripts/generate_dashboard_report.py
@@ -36,31 +36,63 @@ def get_widget_description(title):
 
     return " ".join(description_parts)
 
-def generate_html_report(images_dir='dashboard_exports', output_file=None):
+def generate_section_html(env_name, images_dir):
     """
-    Generate an HTML report with all dashboard widget images.
-    Images are embedded as base64 for portability.
+    Generate HTML for a specific environment section.
     """
-
     images_path = Path(images_dir)
-
     if not images_path.exists():
-        print(f"Error: Directory {images_dir} not found")
-        return None
+        return f"<p>No data found for {env_name}</p>"
 
-    # Find all PNG images
     image_files = sorted(images_path.glob('*.png'))
-
     if not image_files:
-        print(f"Error: No PNG images found in {images_dir}")
-        return None
+        return f"<p>No images found for {env_name}</p>"
 
-    print(f"Found {len(image_files)} images to include in report")
+    html = f"""
+    <div class="env-section">
+        <h2 class="env-title">{env_name}</h2>
+    """
+
+    for idx, image_file in enumerate(image_files, 1):
+        filename = image_file.stem
+        title = filename.split('_', 1)[1] if '_' in filename else filename
+        title = title.replace('_', ' ')
+        description = get_widget_description(title)
+
+        with open(image_file, 'rb') as f:
+            image_data = base64.b64encode(f.read()).decode('utf-8')
+
+        html += f"""
+        <div class="widget-card">
+            <div class="widget-header">
+                <div class="widget-title">{idx}. {title}</div>
+                <div class="widget-description">{description}</div>
+            </div>
+            <div class="widget-image-container">
+                <img class="widget-image"
+                    src="data:image/png;base64,{image_data}"
+                    alt="{title}">
+            </div>
+        </div>
+        """
+
+    html += "</div>"
+    return html
+
+def generate_html_report(base_dir='dashboard_exports', output_file=None):
+    """
+    Generate an HTML report with all dashboard widget images from multiple environments.
+    """
+    base_path = Path(base_dir)
+
+    if not base_path.exists():
+        print(f"Error: Base directory {base_dir} not found")
+        return None
 
     # Default output filename
     if output_file is None:
         timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
-        output_file = f'{images_dir}/dashboard_report_{timestamp}.html'
+        output_file = f'{base_dir}/dashboard_report_{timestamp}.html'
 
     # Get dashboard name and timestamp from definition file
     dashboard_name = "Monthly Demand And Capacity Report - EliD"
@@ -136,6 +168,32 @@ def generate_html_report(images_dir='dashboard_exports', output_file=None):
             padding-bottom: 48px;
         }}
 
+        .section-header {{
+            background: var(--nhs-white);
+            padding: 16px 24px;
+            margin-bottom: 24px;
+            border-left: 8px solid var(--nhs-blue);
+            box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+        }}
+
+        .section-header h2 {{
+            font-size: 24px;
+            color: var(--nhs-blue);
+            margin: 0;
+        }}
+
+        .env-section {{
+            margin-bottom: 48px;
+        }}
+
+        .env-title {{
+            font-size: 20px;
+            color: var(--nhs-dark-grey);
+            margin-bottom: 20px;
+            padding-bottom: 8px;
+            border-bottom: 2px solid #d8dde0;
+        }}
+
         .widget-card {{
             background: var(--nhs-white);
             border: 1px solid #d8dde0;
@@ -199,6 +257,11 @@ def generate_html_report(images_dir='dashboard_exports', output_file=None):
                 border: none;
                 border-bottom: 1px solid #ccc;
             }}
+            .section-header {{
+                border: none;
+                padding: 0;
+                margin-bottom: 16px;
+            }}
         }}
     </style>
 </head>
@@ -216,34 +279,28 @@ def generate_html_report(images_dir='dashboard_exports', output_file=None):
     <div class="nhs-container content">
 """
 
-    # Add each widget image
-    for idx, image_file in enumerate(image_files, 1):
-        # Extract widget title from filename (remove number prefix and extension)
-        filename = image_file.stem
-        # Remove leading number and underscore (e.g., "01_")
-        title = filename.split('_', 1)[1] if '_' in filename else filename
-        # Replace underscores with spaces
-        title = title.replace('_', ' ')
-
-        description = get_widget_description(title)
-
-        # Read and encode image
-        with open(image_file, 'rb') as f:
-            image_data = base64.b64encode(f.read()).decode('utf-8')
+    # ---------------------------------------------------------
+    # Section 1: Production
+    # ---------------------------------------------------------
+    html_content += """
+        <div class="section-header">
+            <h2>Production Environment</h2>
+        </div>
+    """
+    html_content += generate_section_html("Prod", base_path / "Prod")
 
-        html_content += f"""
-        <div class="widget-card">
-            <div class="widget-header">
-                <div class="widget-title">{idx}. {title}</div>
-                <div class="widget-description">{description}</div>
-            </div>
-            <div class="widget-image-container">
-                <img class="widget-image"
-                    src="data:image/png;base64,{image_data}"
-                    alt="{title}">
-            </div>
+    # ---------------------------------------------------------
+    # Section 2: Preprod Environments
+    # ---------------------------------------------------------
+    html_content += """
+        <div class="section-header" style="margin-top: 48px;">
+            <h2>Preprod Environments</h2>
         </div>
-"""
+    """
+
+    # Order: Preprod, Test, Dev
+    for env in ["Preprod", "Test", "Dev"]:
+        html_content += generate_section_html(env, base_path / env)
 
     # Close HTML
     html_content += """
