From f7b5cdfb2bba3a272f60361f6cf0401208e6a310 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Sun, 28 Dec 2025 20:49:38 -0800 Subject: [PATCH] - 7.31.00 Fixed bug in `gam report chrome (user )|(select )` where no activities were returned. `report chrome` does not use the parameter `userKey=` as do other applications but requires parameter `filter DEVICE_USER==`. Updated `gam report admin (user )|(select )` to use parameter `filter USER_EMAIL==` to display activiities affecting the user ``. Use option `userisactor` to use the parameter `userKey=` that displays activities where user `` executed the command that generated the activity. Fixed bug in `gam print cros|filelist|users ... (addcsvdata )+ formatjson` where the `addcsvdata` columns were not displayed but the additional field values were included in the JSON data. Now, the `addcsvdata` columns are displayed but the additional field values are only included in the JSON data when option `includdecsvdatainjson` is specified. Added option `addcsvdata ` to `gam print cigroups|groups` that adds additional columns of data to the CSV file output. Added option `addcsvdata ` to `gam print cigroupmembere|group-members` that adds additional columns of data to the CSV file output. - See [Update History](https://github.com/GAM-team/GAM/wiki/GamUpdates) --- wiki/ChromeOS-Devices.md | 13 +++++++++---- wiki/Cloud-Identity-Groups-Membership.md | 5 +++++ wiki/Cloud-Identity-Groups.md | 7 +++++++ wiki/GamUpdates.md | 20 ++++++++++++++++++++ wiki/Groups-Membership.md | 4 ++++ wiki/Groups.md | 7 +++++++ wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md | 4 ++-- wiki/Reports.md | 6 +++--- wiki/Users-Drive-Files-Display.md | 11 ++++++++--- wiki/Users.md | 9 ++++++--- wiki/Version-and-Help.md | 12 ++++++------ 11 files changed, 77 insertions(+), 21 deletions(-) diff --git a/wiki/ChromeOS-Devices.md b/wiki/ChromeOS-Devices.md index d611978f..3e4a6f3f 100644 --- a/wiki/ChromeOS-Devices.md +++ b/wiki/ChromeOS-Devices.md @@ -544,7 +544,7 @@ gam print cros [todrive *] [start ] [end ] [listlimit ] [reverselists ] [timerangeorder ascending|descending] [showdvrsfp] - (addcsvdata )* + (addcsvdata )* [includecsvdatainjson []] [sortheaders] [formatjson [quotechar ]] ``` @@ -591,9 +591,11 @@ Add additional columns of data from the command line to the output * `addcsvdata ` By default, Gam displays the information as columns of fields; the following option causes the output to be in JSON format: - - `formatjson` - Display the fields in JSON format. +If `formatjson` and `addcsvdata` are specified, the option `includecsvdatainjson` causes GAM to add the +additional field values to the JSON data. + By default, when writing CSV files, Gam uses a quote character of double quote `"`. The quote character is used to enclose columns that contain the quote character itself, the column delimiter (comma by default) and new-line characters. Any quote characters within the column are doubled. When using the `formatjson` option, double quotes are used extensively in the data resulting in hard to read/process output. @@ -612,7 +614,7 @@ gam print cros [todrive *] [start ] [end ] [listlimit ] [reverselists ] [timerangeorder ascending|descending] [showdvrsfp] - (addcsvdata )* + (addcsvdata )* [includecsvdatainjson []] [sortheaders] [formatjson [quotechar ]] @@ -623,6 +625,7 @@ gam print cros [todrive *] select [start ] [end ] [listlimit ] [reverselists ] [timerangeorder ascending|descending] [showdvrsfp] + (addcsvdata )* [includecsvdatainjson []] [sortheaders] [formatjson [quotechar ]] ``` @@ -645,9 +648,11 @@ Add additional columns of data from the command line to the output * `addcsvdata ` By default, Gam displays the information as columns of fields; the following option causes the output to be in JSON format: - - `formatjson` - Display the fields in JSON format. +If `formatjson` and `addcsvdata` are specified, the option `includecsvdatainjson` causes GAM to add the +additional field values to the JSON data. + By default, when writing CSV files, Gam uses a quote character of double quote `"`. The quote character is used to enclose columns that contain the quote character itself, the column delimiter (comma by default) and new-line characters. Any quote characters within the column are doubled. When using the `formatjson` option, double quotes are used extensively in the data resulting in hard to read/process output. diff --git a/wiki/Cloud-Identity-Groups-Membership.md b/wiki/Cloud-Identity-Groups-Membership.md index c41d0429..2d7b84bc 100644 --- a/wiki/Cloud-Identity-Groups-Membership.md +++ b/wiki/Cloud-Identity-Groups-Membership.md @@ -354,6 +354,8 @@ gam print cigroup-members [todrive *] [minimal|basic|full] [(recursive [noduplicates]) | |includederivedmembership] [nogroupeemail] [memberemaildisplaypattern|memberemailskippattern ] + (addcsvdata )* + [formatjson [quotechar ]] ``` By default, the group membership of all groups in the account are displayed, these options allow selection of subsets of groups: * `cimember ` - Limit display to groups that contain `` as a member @@ -414,6 +416,9 @@ has in any constituent group, it is not necessarily its role in the top group. The options `recursive noduplicates` and `includederivedmembership types user` return the same list of users. The `includederivedmembership` option makes less API calls but doesn't show level and subgroup information. +Add additional columns of data from the command line to the output +* `addcsvdata ` + By default, Gam displays the information as columns of fields; the following option causes the output to be in JSON format, * `formatjson` - Display the fields in JSON format. diff --git a/wiki/Cloud-Identity-Groups.md b/wiki/Cloud-Identity-Groups.md index 2af04769..51598cde 100644 --- a/wiki/Cloud-Identity-Groups.md +++ b/wiki/Cloud-Identity-Groups.md @@ -322,6 +322,7 @@ gam print cigroups [todrive *] [types ] [memberemaildisplaypattern|memberemailskippattern ] [convertcrnl] [delimiter ] + (addcsvdata )* [includecsvdatainjson []] [formatjson [quotechar ]] ``` By default, all groups in the account are displayed, these options allow selection of subsets of groups: @@ -385,9 +386,15 @@ Members that have met the above qualifications to be displayed can be further qu * `memberemaildisplaypattern ` - Members with email addresses that match `` will be displayed; others will not be displayed * `memberemailskippattern ` - Members with email addresses that match `` will not be displayed; others will be displayed +Add additional columns of data from the command line to the output +* `addcsvdata ` + By default, Gam displays the information as columns of fields; the following option causes the output to be in JSON format, * `formatjson` - Display the fields in JSON format. +If `formatjson` and `addcsvdata` are specified, the option `includecsvdatainjson` causes GAM to add the +additional field values to the JSON data. + By default, when writing CSV files, Gam uses a quote character of double quote `"`. The quote character is used to enclose columns that contain the quote character itself, the column delimiter (comma by default) and new-line characters. Any quote characters within the column are doubled. When using the `formatjson` option, double quotes are used extensively in the data resulting in hard to read/process output. diff --git a/wiki/GamUpdates.md b/wiki/GamUpdates.md index c6f97e27..f6381437 100644 --- a/wiki/GamUpdates.md +++ b/wiki/GamUpdates.md @@ -10,6 +10,26 @@ 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.31.00 + +Fixed bug in `gam report chrome (user )|(select )` where no activities were returned. +`report chrome` does not use the parameter `userKey=` as do other applications but requires +parameter `filter DEVICE_USER==`. + +Updated `gam report admin (user )|(select )` to use parameter `filter USER_EMAIL==` +to display activiities affecting the user ``. Use option `userisactor` to use the parameter `userKey=` +that displays activities where user `` executed the command that generated the activity. + +Fixed bug in `gam print cros|filelist|users ... (addcsvdata )+ formatjson` where the `addcsvdata` columns +were not displayed but the additional field values were included in the JSON data. Now, the `addcsvdata` columns +are displayed but the additional field values are only included in the JSON data when option `includdecsvdatainjson` is specified. + +Added option `addcsvdata ` to `gam print cigroups|groups` +that adds additional columns of data to the CSV file output. + +Added option `addcsvdata ` to `gam print cigroupmembere|group-members` +that adds additional columns of data to the CSV file output. + ### 7.30.05 Added option `gmaileventtypes ` to `gam report gmail` that can be used to limit the event types displayed. diff --git a/wiki/Groups-Membership.md b/wiki/Groups-Membership.md index 3b55fa4b..4bd3e065 100644 --- a/wiki/Groups-Membership.md +++ b/wiki/Groups-Membership.md @@ -626,6 +626,7 @@ gam print group-members [todrive *] [(recursive [noduplicates])|includederivedmembership] [nogroupemail] [peoplelookup|(peoplelookupuser )] [unknownname ] [cachememberinfo [Boolean]] + (addcsvdata )* [formatjson [quotechar ]] ``` By default, the group membership of all groups in the account are displayed, these options allow selection of subsets of groups: @@ -733,6 +734,9 @@ The options `recursive noduplicates` and `includederivedmembership types user no The `includederivedmembership` option makes less API calls but doesn't show level and subgroup information. Expanding a member of type CUSTOMER may produce a large volume of data as it will display all users in your domain. +Add additional columns of data from the command line to the output +* `addcsvdata ` + By default, Gam displays the information as columns of fields; the following option causes the output to be in JSON format, * `formatjson` - Display the fields in JSON format. diff --git a/wiki/Groups.md b/wiki/Groups.md index 0bf5c07c..18a08ffd 100644 --- a/wiki/Groups.md +++ b/wiki/Groups.md @@ -474,6 +474,7 @@ gam print groups [todrive *] [types ] [memberemaildisplaypattern|memberemailskippattern ] [convertcrnl] [delimiter ] [sortheaders] + (addcsvdata )* [includecsvdatainjson []] [formatjson [quotechar ]] ``` By default, all groups in the account are displayed, these options allow selection of subsets of groups: @@ -569,9 +570,15 @@ Members that have met the above qualifications to be displayed can be further qu * `memberemaildisplaypattern ` - Members with email addresses that match `` will be displayed; others will not be displayed * `memberemailskippattern ` - Members with email addresses that match `` will not be displayed; others will be displayed +Add additional columns of data from the command line to the output +* `addcsvdata ` + By default, Gam displays the information as columns of fields; the following option causes the output to be in JSON format, * `formatjson` - Display the fields in JSON format. +If `formatjson` and `addcsvdata` are specified, the option `includecsvdatainjson` causes GAM to add the +additional field values to the JSON data. + By default, when writing CSV files, Gam uses a quote character of double quote `"`. The quote character is used to enclose columns that contain the quote character itself, the column delimiter (comma by default) and new-line characters. Any quote characters within the column are doubled. When using the `formatjson` option, double quotes are used extensively in the data resulting in hard to read/process output. diff --git a/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md b/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md index 716cdc42..378dbbdb 100644 --- a/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md +++ b/wiki/How-to-Upgrade-Legacy-GAM-to-GAM7.md @@ -252,7 +252,7 @@ writes the credentials into the file oauth2.txt. admin@server:/Users/admin$ rm -f /Users/admin/GAMConfig/oauth2.txt admin@server:/Users/admin$ gam version WARNING: Config File: /Users/admin/GAMConfig/gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: /Users/admin/GAMConfig/oauth2.txt, Not Found -GAM 7.30.05 - https://github.com/GAM-team/GAM - pyinstaller +GAM 7.31.00 - https://github.com/GAM-team/GAM - pyinstaller GAM Team Python 3.14.2 64-bit final macOS Tahoe 26.2 x86_64 @@ -990,7 +990,7 @@ writes the credentials into the file oauth2.txt. C:\>del C:\GAMConfig\oauth2.txt C:\>gam version WARNING: Config File: C:\GAMConfig\gam.cfg, Section: DEFAULT, Item: oauth2_txt, Value: C:\GAMConfig\oauth2.txt, Not Found -GAM 7.30.05 - https://github.com/GAM-team/GAM - pythonsource +GAM 7.31.00 - https://github.com/GAM-team/GAM - pythonsource GAM Team Python 3.14.2 64-bit final Windows 11 10.0.26200 AMD64 diff --git a/wiki/Reports.md b/wiki/Reports.md index 9602821b..2b9732f4 100644 --- a/wiki/Reports.md +++ b/wiki/Reports.md @@ -92,6 +92,7 @@ config csv_output_row_filter "'\"accounts:used_quota_in_mb\":count>15000'" gam report [todrive *] [(user all|)|(orgunit|org|ou [showorgunit])|(select )] + [userisactor] [([start