Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More updates to MS Compliance partner API endpoints #27856

Merged
merged 3 commits into from
Apr 4, 2025
Merged

More updates to MS Compliance partner API endpoints #27856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd9cf31
Update compliance partner APIs
lucasmrod Apr 3, 2025
24838b0
Add some more changes
lucasmrod Apr 4, 2025
3cbf3d4
Update docs/Contributing/API-for-contributors.md
rachaelshaw Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions docs/Configuration/yaml-files.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,12 +571,11 @@ org_settings:
At the team level, there is the additional option to enable conditional access, which blocks third party app sign-ins on hosts failing policies. (Available in Fleet Premium for managed cloud customers. Must have Microsoft Entra connected.)

```yaml
integrations:
conditional_access_enabled: true
team_settings:
integrations:
conditional_access_enabled: true
Comment on lines +574 to +576
Copy link
Member Author

@lucasmrod lucasmrod Apr 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See:

fleet/it-and-security/teams/workstations.yml

Lines 2 to 14 in 82a5b80

team_settings:
features:
enable_host_users: true
enable_software_inventory: true
host_expiry_settings:
host_expiry_enabled: false
host_expiry_window: 0
secrets:
- secret: $DOGFOOD_WORKSTATIONS_ENROLL_SECRET
integrations:
google_calendar:
enable_calendar_events: true
webhook_url: $DOGFOOD_CALENDAR_WEBHOOK_URL

```



For secrets, you can add [GitHub environment variables](https://docs.github.com/en/actions/learn-github-actions/variables#defining-environment-variables-for-a-single-workflow)

#### google_calendar
Expand Down
10 changes: 5 additions & 5 deletions docs/Contributing/API-for-contributors.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4565,13 +4565,14 @@ Kick off authentication with Microsoft Entra to configure conditional access.
| ---------- | ------ | ---- | --------------------------------------------------------------------------------------------------------------------------- |
| microsoft_tenant_id | string | body | **Required.** The Microsoft Entra tenant ID. |


- If the same `microsoft_tenant_id` was already configured, then the POST is a NOP.
- If there's already a different tenant ID configured but its setup is not completed, then the POST will replace the existing one.
- If there's already a different tenant ID configured and its setup is completed, then the POST will fail. You need to use the `DELETE /api/v1/conditional-access/microsoft` endpoint to delete the integration and create a new one.

##### Request body

```json
{
"fleet_license_key": "<LICENSE KEY>",
"microsoft_tenant_id": "<TENANT ID>"
}
```
Expand All @@ -4584,15 +4585,14 @@ Kick off authentication with Microsoft Entra to configure conditional access.
{
"microsoft_authentication_url": "https://login.microsoftonline.com/<TENANT ID>/adminconsent?client_id=<CLIENT ID>"
}

```


### Confirm Microsoft Entra conditional access configuration

`GET /api/v1/conditional-access/confirm`
`POST /api/v1/conditional-access/microsoft/confirm`

Confirm whether admin consent has been granted in Microsoft Entra.
Finalize setup and confirm whether admin consent has been granted in Microsoft Entra.

#### Parameters

Expand Down
Loading