Commit 29056814 authored by Amy Qualls's avatar Amy Qualls

Merge branch 'russell/document-seat-usage-listing' into 'master'

Document seat usage listing

See merge request gitlab-org/gitlab!50702
parents 1f9cce7f aaf5f3a8
...@@ -107,14 +107,29 @@ to the **Billing** section of the relevant namespace: ...@@ -107,14 +107,29 @@ to the **Billing** section of the relevant namespace:
The following table describes details of your subscription for groups: The following table describes details of your subscription for groups:
| Field | Description | | Field | Description |
|-------------------------|-----------------------------------------------------------------------------------------------------------------------------------------| |-----------------------------|-------------|
| **Seats in subscription** | If this is a paid plan, represents the number of seats you've paid to support in your group. | | **Seats in subscription** | If this is a paid plan, represents the number of seats you've bought for this group. |
| **Seats currently in use** | Number of seats in use. | | **Seats currently in use** | Number of seats in use. Select **See usage** to see a list of the users using these seats. For more details, see [Seat usage](#seat-usage). |
| **Max seats used** | Highest number of seats you've used. If this exceeds the seats in subscription, you may owe an additional fee for the additional users. | | **Max seats used** | Highest number of seats you've used. |
| **Seats owed** | If your maximum seats used exceeds the seats in your subscription, you owe an additional fee for the users you've added. | | **Seats owed** | _Seats owed_ = _Max seats used_ - _Seats in subscription_. |
| **Subscription start date** | Date your subscription started. If this is for a Free plan, is the date you transitioned off your group's paid plan. | | **Subscription start date** | Date your subscription started. If this is for a Free plan, it's the date you transitioned off your group's paid plan. |
| **Subscription end date** | Date your current subscription ends. Does not apply to Free plans. | | **Subscription end date** | Date your current subscription ends. Does not apply to Free plans. |
| **Billable users list** | List of users that belong to your group subscription. Does not apply to Free plans. |
## Seat usage
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/216899) in GitLab 13.5.
> - [Updated](https://gitlab.com/gitlab-org/gitlab/-/issues/292086) in GitLab 13.8 to include public
email address.
The **Seat usage** page lists all users occupying seats. Details for each user include:
- Full name
- Username
- Public email address (if they have provided one in their [profile settings](../../user/profile/index.md#profile-settings))
The Seat usage listing is updated live, but the usage statistics on the billing page are updated
only once per day. For this reason there can be a minor difference between the seat usage listing
and the billing page.
## Renew your GitLab.com subscription ## Renew your GitLab.com subscription
......
...@@ -38,8 +38,10 @@ For examples of how you can use a project access token to authenticate with the ...@@ -38,8 +38,10 @@ For examples of how you can use a project access token to authenticate with the
## Project bot users ## Project bot users
For each project access token created, a bot user will also be created and added to the project with Project bot users are [GitLab-created service accounts](../../../subscriptions/self_managed/index.md#billable-users) and do not count as licensed seats.
["Maintainer" level permissions](../../permissions.md#project-members-permissions).
For each project access token created, a bot user is created and added to the project with
[Maintainer level permissions](../../permissions.md#project-members-permissions).
For the bot: For the bot:
...@@ -49,15 +51,15 @@ For the bot: ...@@ -49,15 +51,15 @@ For the bot:
API calls made with a project access token are associated with the corresponding bot user. API calls made with a project access token are associated with the corresponding bot user.
These users will appear in **Members** but can not be modified. These bot users are included in a project's **Members** list but cannot be modified. Also, a bot
Furthermore, the bot user can not be added to any other project. user cannot be added to any other project.
- The username is set to `project_{project_id}_bot` for the first access token, such as `project_123_bot`. - The username is set to `project_{project_id}_bot` for the first access token, such as `project_123_bot`.
- The username is set to `project_{project_id}_bot{bot_count}` for further access tokens, such as `project_123_bot1`. - The username is set to `project_{project_id}_bot{bot_count}` for further access tokens, such as `project_123_bot1`.
When the project access token is [revoked](#revoking-a-project-access-token) the bot user is then deleted and all records are moved to a system-wide user with the username "Ghost User". For more information, see [Associated Records](../../profile/account/delete_account.md#associated-records). When the project access token is [revoked](#revoking-a-project-access-token) the bot user is deleted
and all records are moved to a system-wide user with the username "Ghost User". For more
Project bot users are [GitLab-created service accounts](../../../subscriptions/self_managed/index.md#billable-users) and do not count as licensed seats. information, see [Associated Records](../../profile/account/delete_account.md#associated-records).
## Revoking a project access token ## Revoking a project access token
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment