[pull] main from erikdarlingdata:main

.github/sql/ci_validate_installation.sql

@@ -30,7 +30,7 @@ IF SCHEMA_ID(N'report')  IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: sche
 PRINT '';
 
 /*
-Procedures in collect schema (36)
+Procedures in collect schema (38)
 */
 PRINT 'Checking collect procedures...';
 
@@ -70,21 +70,21 @@ IF OBJECT_ID(N'collect.database_configuration_collector', N'P') IS NULL BEGIN SE
 IF OBJECT_ID(N'collect.configuration_issues_analyzer', N'P')    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.configuration_issues_analyzer'; END;    SET @checked += 1;
 IF OBJECT_ID(N'collect.scheduled_master_collector', N'P')       IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.scheduled_master_collector'; END;       SET @checked += 1;
 IF OBJECT_ID(N'collect.running_jobs_collector', N'P')           IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.running_jobs_collector'; END;           SET @checked += 1;
+IF OBJECT_ID(N'collect.database_size_stats_collector', N'P')   IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.database_size_stats_collector'; END;   SET @checked += 1;
+IF OBJECT_ID(N'collect.server_properties_collector', N'P')     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: collect.server_properties_collector'; END;     SET @checked += 1;
 
 PRINT '';
 
 /*
-Procedures in config schema (10)
+Procedures in config schema (8)
 */
 PRINT 'Checking config procedures...';
 
 IF OBJECT_ID(N'config.ensure_config_tables', N'P')       IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.ensure_config_tables'; END;       SET @checked += 1;
 IF OBJECT_ID(N'config.ensure_collection_table', N'P')    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.ensure_collection_table'; END;    SET @checked += 1;
 IF OBJECT_ID(N'config.update_collector_frequency', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.update_collector_frequency'; END; SET @checked += 1;
 IF OBJECT_ID(N'config.set_collector_enabled', N'P')      IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.set_collector_enabled'; END;      SET @checked += 1;
-IF OBJECT_ID(N'config.enable_realtime_monitoring', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.enable_realtime_monitoring'; END; SET @checked += 1;
-IF OBJECT_ID(N'config.enable_consulting_analysis', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.enable_consulting_analysis'; END; SET @checked += 1;
-IF OBJECT_ID(N'config.enable_baseline_monitoring', N'P') IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.enable_baseline_monitoring'; END; SET @checked += 1;
+IF OBJECT_ID(N'config.apply_collection_preset', N'P')    IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.apply_collection_preset'; END;    SET @checked += 1;
 IF OBJECT_ID(N'config.show_collection_schedule', N'P')   IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.show_collection_schedule'; END;   SET @checked += 1;
 IF OBJECT_ID(N'config.data_retention', N'P')             IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.data_retention'; END;             SET @checked += 1;
 IF OBJECT_ID(N'config.check_hung_collector_job', N'P')   IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: config.check_hung_collector_job'; END;   SET @checked += 1;
@@ -102,7 +102,7 @@ IF OBJECT_ID(N'config.server_info', N'V')     IS NULL BEGIN SET @missing += 1; P
 PRINT '';
 
 /*
-Views in report schema (37)
+Views in report schema (41)
 Note: report.query_snapshots and report.query_snapshots_blocking are created
 dynamically by collect.query_snapshots_create_views, so they are not checked here.
 */
@@ -144,6 +144,10 @@ IF OBJECT_ID(N'report.scheduler_cpu_analysis', N'V')              IS NULL BEGIN
 IF OBJECT_ID(N'report.critical_issues', N'V')                     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.critical_issues'; END;                     SET @checked += 1;
 IF OBJECT_ID(N'report.memory_usage_trends', N'V')                 IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.memory_usage_trends'; END;                 SET @checked += 1;
 IF OBJECT_ID(N'report.running_jobs', N'V')                        IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.running_jobs'; END;                        SET @checked += 1;
+IF OBJECT_ID(N'report.finops_database_resource_usage', N'V')     IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.finops_database_resource_usage'; END;     SET @checked += 1;
+IF OBJECT_ID(N'report.finops_utilization_efficiency', N'V')      IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.finops_utilization_efficiency'; END;      SET @checked += 1;
+IF OBJECT_ID(N'report.finops_peak_utilization', N'V')            IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.finops_peak_utilization'; END;            SET @checked += 1;
+IF OBJECT_ID(N'report.finops_application_resource_usage', N'V')  IS NULL BEGIN SET @missing += 1; PRINT '  MISSING: report.finops_application_resource_usage'; END;  SET @checked += 1;
 
 PRINT '';
 
@@ -180,7 +184,7 @@ WHERE OBJECT_SCHEMA_NAME(t.object_id) = N'config';
 PRINT '  collect schema tables: ' + CONVERT(varchar(10), @collect_tables);
 PRINT '  config schema tables: ' + CONVERT(varchar(10), @config_tables);
 
-IF @collect_tables < 19 BEGIN SET @missing += 1; PRINT '  MISSING: expected >= 20 collect tables, found ' + CONVERT(varchar(10), @collect_tables); END; SET @checked += 1;
+IF @collect_tables < 21 BEGIN SET @missing += 1; PRINT '  MISSING: expected >= 21 collect tables, found ' + CONVERT(varchar(10), @collect_tables); END; SET @checked += 1;
 IF @config_tables < 5  BEGIN SET @missing += 1; PRINT '  MISSING: expected >= 5 config tables, found ' + CONVERT(varchar(10), @config_tables); END;  SET @checked += 1;
 
 PRINT '';

.github/workflows/build.yml

@@ -10,6 +10,8 @@ on:
 
 permissions:
   contents: write
+  id-token: write
+  actions: read
 
 jobs:
   build:
@@ -78,6 +80,82 @@ jobs:
 
           Compress-Archive -Path 'publish/Installer/*' -DestinationPath "releases/PerformanceMonitorInstaller-$version.zip" -Force
 
+      - name: Upload Dashboard for signing
+        if: github.event_name == 'release'
+        id: upload-dashboard
+        uses: actions/upload-artifact@v4
+        with:
+          name: Dashboard-unsigned
+          path: publish/Dashboard/
+
+      - name: Upload Lite for signing
+        if: github.event_name == 'release'
+        id: upload-lite
+        uses: actions/upload-artifact@v4
+        with:
+          name: Lite-unsigned
+          path: publish/Lite/
+
+      - name: Upload Installer for signing
+        if: github.event_name == 'release'
+        id: upload-installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: Installer-unsigned
+          path: publish/Installer/
+
+      - name: Sign Dashboard
+        if: github.event_name == 'release'
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: '7969f8b6-d946-4a74-9bac-a55856d8b8e0'
+          project-slug: 'PerformanceMonitor'
+          signing-policy-slug: 'test-signing'
+          artifact-configuration-slug: 'Dashboard'
+          github-artifact-id: '${{ steps.upload-dashboard.outputs.artifact-id }}'
+          wait-for-completion: true
+          output-artifact-directory: 'signed/Dashboard'
+
+      - name: Sign Lite
+        if: github.event_name == 'release'
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: '7969f8b6-d946-4a74-9bac-a55856d8b8e0'
+          project-slug: 'PerformanceMonitor'
+          signing-policy-slug: 'test-signing'
+          artifact-configuration-slug: 'Lite'
+          github-artifact-id: '${{ steps.upload-lite.outputs.artifact-id }}'
+          wait-for-completion: true
+          output-artifact-directory: 'signed/Lite'
+
+      - name: Sign Installer
+        if: github.event_name == 'release'
+        uses: signpath/github-action-submit-signing-request@v1
+        with:
+          api-token: '${{ secrets.SIGNPATH_API_TOKEN }}'
+          organization-id: '7969f8b6-d946-4a74-9bac-a55856d8b8e0'
+          project-slug: 'PerformanceMonitor'
+          signing-policy-slug: 'test-signing'
+          artifact-configuration-slug: 'Installers'
+          github-artifact-id: '${{ steps.upload-installer.outputs.artifact-id }}'
+          wait-for-completion: true
+          output-artifact-directory: 'signed/Installer'
+
+      - name: Replace with signed artifacts
+        if: github.event_name == 'release'
+        shell: pwsh
+        run: |
+          $version = "${{ steps.version.outputs.VERSION }}"
+          # Re-zip signed files into release archives
+          Remove-Item "releases/PerformanceMonitorDashboard-$version.zip" -ErrorAction SilentlyContinue
+          Compress-Archive -Path 'signed/Dashboard/*' -DestinationPath "releases/PerformanceMonitorDashboard-$version.zip" -Force
+          Remove-Item "releases/PerformanceMonitorLite-$version.zip" -ErrorAction SilentlyContinue
+          Compress-Archive -Path 'signed/Lite/*' -DestinationPath "releases/PerformanceMonitorLite-$version.zip" -Force
+          Remove-Item "releases/PerformanceMonitorInstaller-$version.zip" -ErrorAction SilentlyContinue
+          Compress-Archive -Path 'signed/Installer/*' -DestinationPath "releases/PerformanceMonitorInstaller-$version.zip" -Force
+
       - name: Generate checksums
         if: github.event_name == 'release'
         shell: pwsh

.github/workflows/check-version-bump.yml

@@ -0,0 +1,48 @@
+name: Check version bump
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  check-version:
+    if: github.head_ref == 'dev'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+
+      - name: Get PR version
+        id: pr
+        shell: pwsh
+        run: |
+          $version = ([xml](Get-Content Dashboard/Dashboard.csproj)).Project.PropertyGroup.Version | Where-Object { $_ }
+          echo "VERSION=$version" >> $env:GITHUB_OUTPUT
+          Write-Host "PR version: $version"
+
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          path: main-branch
+
+      - name: Get main version
+        id: main
+        shell: pwsh
+        run: |
+          $version = ([xml](Get-Content main-branch/Dashboard/Dashboard.csproj)).Project.PropertyGroup.Version | Where-Object { $_ }
+          echo "VERSION=$version" >> $env:GITHUB_OUTPUT
+          Write-Host "Main version: $version"
+
+      - name: Compare versions
+        env:
+          PR_VERSION: ${{ steps.pr.outputs.VERSION }}
+          MAIN_VERSION: ${{ steps.main.outputs.VERSION }}
+        run: |
+          echo "Main version: $MAIN_VERSION"
+          echo "PR version:   $PR_VERSION"
+          if [ "$PR_VERSION" == "$MAIN_VERSION" ]; then
+            echo "::error::Version in Dashboard.csproj ($PR_VERSION) has not changed from main. Bump the version before merging to main."
+            exit 1
+          fi
+          echo "✅ Version bumped: $MAIN_VERSION → $PR_VERSION"

.github/workflows/sql-validation.yml

@@ -3,10 +3,10 @@ name: SQL Validation
 on:
   push:
     branches: [dev]
-    paths: ['install/**']
+    paths: ['install/**', '.github/sql/**', '.github/workflows/sql-validation.yml']
   pull_request:
     branches: [dev]
-    paths: ['install/**']
+    paths: ['install/**', '.github/sql/**', '.github/workflows/sql-validation.yml']
 
 jobs:
   validate-sql:

.gitignore

@@ -54,4 +54,5 @@ nul
 
 # Lite runtime configuration (user-specific)
 Lite/config/servers.json
+Lite/servers.json
 Lite/collection_schedule.json