Updates for webhooks (#25806)

To support these dogfooding changes: fleetdm/confidential#9198
fleetdm · Jan 29, 2025 · 52d5632 · 52d5632
1 parent 2d5784e
commit 52d5632
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/dogfood-gitops.yml b/.github/workflows/dogfood-gitops.yml
@@ -66,7 +66,6 @@ jobs:
           DOGFOOD_FAILING_POLICIES_WEBHOOK_URL: ${{ secrets.DOGFOOD_FAILING_POLICIES_WEBHOOK_URL }}
           DOGFOOD_VULNERABILITIES_WEBHOOK_URL: ${{ secrets.DOGFOOD_VULNERABILITIES_WEBHOOK_URL }}
           DOGFOOD_WORKSTATIONS_ENROLL_SECRET: ${{ secrets.DOGFOOD_WORKSTATIONS_ENROLL_SECRET }}
-          DOGFOOD_WORKSTATIONS_CANARY_CALENDAR_WEBHOOK_URL: ${{ secrets.DOGFOOD_WORKSTATIONS_CANARY_CALENDAR_WEBHOOK_URL }}
           DOGFOOD_WORKSTATIONS_CANARY_ENROLL_SECRET: ${{ secrets.DOGFOOD_WORKSTATIONS_CANARY_ENROLL_SECRET }}
           DOGFOOD_SERVERS_ENROLL_SECRET: ${{ secrets.DOGFOOD_SERVERS_ENROLL_SECRET }}
           DOGFOOD_SERVERS_CANARY_ENROLL_SECRET: ${{ secrets.DOGFOOD_SERVERS_CANARY_ENROLL_SECRET }}
@@ -78,6 +77,8 @@ jobs:
           FLEET_SECRET_MANAGED_CHROME_ENROLLMENT_TOKEN: ${{ secrets.CLOUD_MANAGEMENT_ENROLLMENT_TOKEN }}
           DOGFOOD_PERSONALLY_OWNED_IPHONES_ENROLL_SECRET: ${{ secrets.DOGFOOD_PERSONALLY_OWNED_IPHONES_ENROLL_SECRET }}
           DOGFOOD_ACTIVITIES_WEBHOOK_URL: ${{ secrets.DOGFOOD_ACTIVITIES_WEBHOOK_URL }}
+          DOGFOOD_CALENDAR_WEBHOOK_URL: ${{ secrets.DOGFOOD_CALENDAR_WEBHOOK_URL }}
+          DOGFOOD_HOST_STATUS_WEBHOOK_URL: ${{ secrets.DOGFOOD_HOST_STATUS_WEBHOOK_URL }}
 
       - name: Notify on Gitops failure
         if: failure() && github.ref_name == 'main'

diff --git a/it-and-security/default.yml b/it-and-security/default.yml
@@ -63,19 +63,19 @@ org_settings:
     metadata_url: ""
   webhook_settings:
     failing_policies_webhook:
-      destination_url: ""
-      enable_failing_policies_webhook: false
+      destination_url: $DOGFOOD_FAILING_POLICIES_WEBHOOK_URL
+      enable_failing_policies_webhook: true
       host_batch_size: 0
-      policy_ids: []
+      policy_ids:
     host_status_webhook:
-      days_count: 1
-      destination_url: ""
-      enable_host_status_webhook: false
-      host_percentage: 25
-    interval: 1m0s
+      days_count: 5
+      destination_url: $DOGFOOD_HOST_STATUS_WEBHOOK_URL
+      enable_host_status_webhook: true
+      host_percentage: 20
+    interval: 360m0s
     vulnerabilities_webhook:
-      destination_url: ""
-      enable_vulnerabilities_webhook: false
+      destination_url: $DOGFOOD_VULNERABILITIES_WEBHOOK_URL
+      enable_vulnerabilities_webhook: true
       host_batch_size: 0
     activities_webhook:
       destination_url: $DOGFOOD_ACTIVITIES_WEBHOOK_URL

diff --git a/it-and-security/teams/workstations-canary.yml b/it-and-security/teams/workstations-canary.yml
@@ -11,7 +11,7 @@ team_settings:
   integrations:
     google_calendar:
       enable_calendar_events: true
-      webhook_url: $DOGFOOD_WORKSTATIONS_CANARY_CALENDAR_WEBHOOK_URL
+      webhook_url: $DOGFOOD_CALENDAR_WEBHOOK_URL
 agent_options:
   config:
     decorators:

diff --git a/it-and-security/teams/workstations.yml b/it-and-security/teams/workstations.yml
@@ -11,7 +11,7 @@ team_settings:
   integrations:
     google_calendar:
       enable_calendar_events: true
-      webhook_url: $DOGFOOD_WORKSTATIONS_CANARY_CALENDAR_WEBHOOK_URL
+      webhook_url: $DOGFOOD_CALENDAR_WEBHOOK_URL
 agent_options:
   config:
     decorators: