diff --git a/wiki/Context-Aware-Access-Levels.md b/wiki/Context-Aware-Access-Levels.md index 7a95fe3f..d39556cd 100644 --- a/wiki/Context-Aware-Access-Levels.md +++ b/wiki/Context-Aware-Access-Levels.md @@ -3,6 +3,7 @@ - [Notes](#Notes) - [API documentation](#api-documentation) - [Grant Service Account Rights to Manage CAA](#grant-service-account-rights-to-manage-caa) +- [Get Google Cloud organization ID for your workspace](#Get Google Cloud organization ID for your workspace) - [Definitions](#definitions) - [Parameters for Basic Levels](#parameters-for-basic-levels) - [Create an Access Level](#create-an-access-level) @@ -36,6 +37,15 @@ In order for GAM to manage CAA access levels, you need to grant your service acc 10. Click `Save`. It may take 15 minutes or more for the role permissions to propagate. 11. Confirm the role is in place by re-running `gam print caalevels` +## Get Google Cloud organization ID for your workspace +This ID is used by the caalevel commands; to eliminate additional API calls, +you can get the value and store it in the `gam.cfg/gcp_org_id` variable. +``` +$ gam info gcporgid +organizations/906207637890 +$ gam config gcp_org_id organizations/906207637890 save +``` + ## Definitions ``` ::= (json [charset ] ) | (json file [charset ]) | diff --git a/wiki/GamUpdates.md b/wiki/GamUpdates.md index b765d1c0..b0ca9504 100644 --- a/wiki/GamUpdates.md +++ b/wiki/GamUpdates.md @@ -10,6 +10,32 @@ Add the `-s` option to the end of the above commands to suppress creating the `g See [Downloads-Installs-GAM7](https://github.com/GAM-team/GAM/wiki/Downloads-Installs) for Windows or other options, including manual installation +### 7.38.00 + +Added variable `gcp_org_id` to `gam.cfg` that is used by the following commands; +by setting the value, additional API calls are eliminated. +``` +gam create project +gam create gcpfolder +gam create|update|delete caalevel +gam print|show caalevels +gam print|show tokens gcpdetails +``` +You can get and set the `gcp_org_id` value with these commands: +``` +$ gam info gcporgid +organizations/906207637890 +$ gam config gcp_org_id organizations/906207637890 save +``` + +Added the following options to `gam report `. +``` +applicationinfofilter +networkinfofilter +statusfilter +includesensitivedata +``` + ### 7.37.00 Added new client access scopes used by `gam print tokens`. diff --git a/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md b/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md index d5f6a05a..35daef26 100644 --- a/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md +++ b/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md @@ -251,7 +251,7 @@ writes the credentials into the file oauth2.txt. ``` gamteam@server:/Users/gamteam$ rm -f /Users/gamteam/GAMConfig/oauth2.txt gamteam@server:/Users/gamteam$ gam version -GAM 7.37.00 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.38.00 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.14.3 64-bit final macOS Tahoe 26.3.1 arm64 @@ -1034,7 +1034,7 @@ writes the credentials into the file oauth2.txt. ``` C:\>del C:\GAMConfig\oauth2.txt C:\>gam version -GAM 7.37.00 - https://github.com/GAM-team/GAM - pythonsource +GAM 7.38.00 - https://github.com/GAM-team/GAM - pythonsource GAM Team Python 3.14.3 64-bit final Windows 11 10.0.26200 AMD64 diff --git a/wiki/Reports.md b/wiki/Reports.md index 3ef25120..ced2b143 100644 --- a/wiki/Reports.md +++ b/wiki/Reports.md @@ -99,6 +99,8 @@ gam report [todrive *] [event|events ] [ip ] [gmaileventtypes ] [groupidfilter ] [resourcedetailsfilter ] + [networkinfofilter ] [statusfilter ] + [applicationinfofilter ] [includesensitivedata] [notimesort] [maxactivities ] [maxevents ] [maxresults ] [countsonly [bydate|summary] [eventrowfilter]] @@ -154,6 +156,15 @@ Limit to those users that are a member of at least one of a list of groups. Limit based on resource details. * `resourcedetailsfilter ` - See: https://developers.google.com/workspace/admin/reports/reference/rest/v1/activities/list#query-parameters +Limit based on 'regionCode`. +* `networkinfofilter ` - Format: 'regionCode="IN"' + +Limit based on `statusCode`. +* `statusfilter ` - Format: 'statusCode="200"' + +Limit based on `oAuthClientId`. +* `applicationinfofilter ` - Format: 'oAuthClientId="clientId"' + You can use `config csv_output_row_filter` to filter the events if the API filter can't produce the results you want. Limit to a list of specific events. diff --git a/wiki/Users-Tokens.md b/wiki/Users-Tokens.md index ca920466..8469e6cc 100644 --- a/wiki/Users-Tokens.md +++ b/wiki/Users-Tokens.md @@ -1,5 +1,6 @@ # Users - Tokens - [API documentation](#api-documentation) +- [Get Google Cloud organization ID for your workspace](#Get Google Cloud organization ID for your workspace) - [Definitions](#definitions) - [Delete a user's token](#delete-a-users-token) - [Display individual user's tokens](#display-individual-users-tokens) @@ -9,6 +10,15 @@ ## API documentation * [Directory API - Tokens](https://developers.google.com/admin-sdk/directory/reference/rest/v1/tokens) +## Get Google Cloud organization ID for your workspace +This ID is used by `gam print|show token gcpdetails`; to eliminate additional API calls, +you can get the value and store it in the `gam.cfg/gcp_org_id` variable. +``` +$ gam info gcporgid +organizations/906207637890 +$ gam config gcp_org_id organizations/906207637890 save +``` + ## Definitions * [``](Collections-of-Users) diff --git a/wiki/Version-and-Help.md b/wiki/Version-and-Help.md index 06665daa..d9da58d8 100644 --- a/wiki/Version-and-Help.md +++ b/wiki/Version-and-Help.md @@ -3,7 +3,7 @@ Print the current version of Gam with details ``` gam version -GAM 7.37.00 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.38.00 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.14.3 64-bit final macOS Tahoe 26.3.1 arm64 @@ -15,7 +15,7 @@ Time: 2026-02-15T07:51:00-08:00 Print the current version of Gam with details and time offset information ``` gam version timeoffset -GAM 7.37.00 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.38.00 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.14.3 64-bit final macOS Tahoe 26.3.1 arm64 @@ -27,7 +27,7 @@ Your system time differs from www.googleapis.com by less than 1 second Print the current version of Gam with extended details and SSL information ``` gam version extended -GAM 7.37.00 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.38.00 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.14.3 64-bit final macOS Tahoe 26.3.1 arm64 @@ -68,7 +68,7 @@ MacOS High Sierra 10.13.6 x86_64 Path: /Users/gamteam/bin/gam7 Version Check: Current: 5.35.08 - Latest: 7.37.00 + Latest: 7.38.00 echo $? 1 ``` @@ -76,7 +76,7 @@ echo $? Print the current version number without details ``` gam version simple -7.37.00 +7.38.00 ``` In Linux/MacOS you can do: ``` @@ -86,7 +86,7 @@ echo $VER Print the current version of Gam and address of this Wiki ``` gam help -GAM 7.37.00 - https://github.com/GAM-team/GAM +GAM 7.38.00 - https://github.com/GAM-team/GAM GAM Team Python 3.14.3 64-bit final macOS Tahoe 26.3.1 arm64 diff --git a/wiki/gam.cfg.md b/wiki/gam.cfg.md index 356991de..51610499 100644 --- a/wiki/gam.cfg.md +++ b/wiki/gam.cfg.md @@ -375,6 +375,21 @@ extra_args Path to extra_args.txt Default: Blank Data file: extra_args.txt +gcp_org_id + The Google Cloud organization ID for your workspace. + Default: Blank + This value is used by the following commands; + by setting the value, additional API calls are eliminated. + gam create project + gam create gcpfolder + gam create|update|delete caalevel + gam print|show caalevels + gam print|show tokens gcpdetails + + You can get and save the `gcp_org_id` value with these commands: + $ gam info gcporgid + organizations/906207637890 + $ gam config gcp_org_id organizations/906207637890 save gmail_cse_incert_dir Directory for the S/MIME certificate files used by Gmail Client Side Encryption. Default: Blank