From 6c79e07d8992b27c256e841209b6e289cbd6afc7 Mon Sep 17 00:00:00 2001 From: sarahsanders-docker Date: Thu, 3 Jul 2025 14:32:52 -0400 Subject: [PATCH] admin org freshness 2 --- .../admin/organization/activity-logs.md | 47 +++++- .../admin/organization/deactivate-account.md | 26 ++-- .../admin/organization/general-settings.md | 23 +-- .../manuals/admin/organization/insights.md | 35 +++-- .../admin/organization/manage-products.md | 140 +++++++++--------- layouts/shortcodes/admin-org-audit-log.html | 30 ---- 6 files changed, 162 insertions(+), 139 deletions(-) delete mode 100644 layouts/shortcodes/admin-org-audit-log.html diff --git a/content/manuals/admin/organization/activity-logs.md b/content/manuals/admin/organization/activity-logs.md index 281e3efdbf9..57ea00250a1 100644 --- a/content/manuals/admin/organization/activity-logs.md +++ b/content/manuals/admin/organization/activity-logs.md @@ -1,17 +1,19 @@ --- title: Activity logs weight: 50 -description: Learn about activity logs. -keywords: team, organization, activity, log, audit, activities +description: Learn how to access and interpret Docker activity logs for organizations and repositories. +keywords: audit log, organization activity, Docker business logs, repository activity, track changes Docker, security logs Docker, filter logs, log Docker events aliases: - /docker-hub/audit-log/ --- {{< summary-bar feature_name="Activity logs" >}} -Activity logs display a chronological list of activities that occur at organization and repository levels. It provides a report to owners on all their member activities. +Activity logs display a chronological list of activities that occur at organization and repository levels. The activity log provides organization owners with a record of all +member activities. With activity logs, owners can view and track: + - What changes were made - The date when a change was made - Who initiated the change @@ -20,24 +22,55 @@ For example, activity logs display activities such as the date when a repository Owners can also see the activity logs for their repository if the repository is part of the organization subscribed to a Docker Business or Team subscription. -## Manage activity logs +## Access activity logs {{< tabs >}} {{< tab name="Admin Console" >}} -{{% admin-org-audit-log product="admin" %}} +To view activity logs in the Admin Console: + +1. Sign in to [Docker Home](https://app.docker.com) and select your +organization. +1. Select **Admin Console**, then **Activity logs**. {{< /tab >}} {{< tab name="Docker Hub" >}} {{% include "hub-org-management.md" %}} -{{% admin-org-audit-log product="hub" %}} +To view activity logs in Docker Hub: + +1. Sign in to [Docker Hub](https://hub.docker.com). +1. Select **My Hub**, your organization, and then **Activity**. {{< /tab >}} {{< /tabs >}} -## Event definitions +## Filter and customize activity logs + +By default, the **Activity** tab displays all recorded events. To narrow your +view, use the calendar to select a specific date range. The log updates to +show only the activities that occurred during that period. + +You can also filter by activity type. Use the **All Activities** drop-down to +focus on organization-level, repository-level, or billing-related events. +In Docker Hub, when viewing a repository, the **Activities** tab only shows +events for that repository. + +After selecting a category—**Organization**, **Repository**, or **Billing**—use +the **All Actions** drop-down to refine the results even further by specific +event type. + +> [!NOTE] +> +> Events triggered by Docker Support appear under the username **dockersupport**. + +> [!IMPORTANT] +> +> Docker retains activity logs for three months. To maintain access to older +data, export logs regularly. + +## Types of activity log events Refer to the following section for a list of events and their descriptions: diff --git a/content/manuals/admin/organization/deactivate-account.md b/content/manuals/admin/organization/deactivate-account.md index aee1e720bc8..ed8b0474038 100644 --- a/content/manuals/admin/organization/deactivate-account.md +++ b/content/manuals/admin/organization/deactivate-account.md @@ -1,7 +1,7 @@ --- title: Deactivate an organization -description: Learn how to deactivate a Docker organization. -keywords: Docker Hub, delete, deactivate organization, account, organization management +description: Learn how to deactivate a Docker organization and required prerequisite steps. +keywords: delete, deactivate organization, account, organization management, Admin Console, cancel subscription weight: 42 aliases: - /docker-hub/deactivate-account/ @@ -9,38 +9,44 @@ aliases: {{< summary-bar feature_name="General admin" >}} -You can deactivate an account at any time. This section describes the prerequisites and steps to deactivate an organization account. For information on deactivating a user account, see [Deactivate a user account](../../accounts/deactivate-user-account.md). +Learn how to deactivate a Docker organization, including required prerequisite +steps. For information about deactivating user +accounts, see [Deactivate a user account](../../accounts/deactivate-user-account.md). > [!WARNING] > -> All Docker products and services that use your Docker account or organization account will be inaccessible after deactivating your account. +> All Docker products and services that use your Docker account or organization +account will be inaccessible after deactivating your account. ## Prerequisites -Before deactivating an organization, complete the following: +You must complete all the following steps before you can deactivate your +organization: - Download any images and tags you want to keep: `docker pull -a :`. - If you have an active Docker subscription, [downgrade it to a free subscription](../../subscription/change.md). - Remove all other members within the organization. -- Unlink your [Github and Bitbucket accounts](../../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account). +- Unlink your [GitHub and Bitbucket accounts](../../docker-hub/repos/manage/builds/link-source.md#unlink-a-github-user-account). - For Business organizations, [remove your SSO connection](../../security/for-admins/single-sign-on/manage/#remove-an-organization). ## Deactivate -Once you have completed all the previous steps, you can deactivate your organization. +You can deactivate your organization using either the Admin Console or +Docker Hub. > [!WARNING] > -> This cannot be undone. Be sure you've gathered all the data you need from your organization before deactivating it. +> This cannot be undone. Be sure you've gathered all the data you need from +your organization before deactivating it. {{< tabs >}} {{< tab name="Admin Console" >}} 1. Sign in to [Docker Home](https://app.docker.com) and select the organization you want to deactivate. -1. Select **Admin Console**, then **Deactivate**. If this button is greyed out, -you must complete the [Prerequisites](#prerequisites). +1. Select **Admin Console**, then **Deactivate**. If the **Deactivate** +button is unavailable, confirm you've completed all [Prerequisites](#prerequisites). 1. Enter the organization name to confirm deactivation. 1. Select **Deactivate organization**. diff --git a/content/manuals/admin/organization/general-settings.md b/content/manuals/admin/organization/general-settings.md index c0f5f07ffb6..3b6ad6803f6 100644 --- a/content/manuals/admin/organization/general-settings.md +++ b/content/manuals/admin/organization/general-settings.md @@ -1,13 +1,13 @@ --- -title: Organization settings +title: Organization information weight: 60 description: Learn how to manage settings for organizations using Docker Admin Console. -keywords: organization, settings, Admin Console +keywords: organization, settings, Admin Console, manage, Docker organization, Gravatar, SCIM, SSO setup, domain management, organization settings --- -This section describes how to manage organization settings in the Docker Admin Console. +Learn how to update your organization information using the Admin Console. -## Configure organization information +## Update organization information General organization information appears on your organization landing page in the Admin Console. @@ -17,14 +17,19 @@ This information includes: - Company - Location - Website - - Gravatar email: To add an avatar to your Docker account, create a [Gravatar account](https://gravatar.com/) and create your avatar. Next, add your Gravatar email to your Docker account settings. It may take some time for your avatar to update in Docker. + - Gravatar email: To add an avatar to your Docker account, create a [Gravatar account](https://gravatar.com/) and upload an avatar. Next, add your Gravatar email to your Docker account settings. It may take some time for your avatar to update in Docker. To edit this information: -1. Sign in to the [Admin Console](https://app.docker.com/admin). -1. Select your company on the **Choose profile** page. -1. Specify the organization information and select **Save**. +1. Sign in to the [Admin Console](https://app.docker.com/admin) and +select your organization. +1. Enter or update your organization’s details, then select **Save**. ## Next steps -In the **Organization settings** menu, you can also [configure SSO](../../security/for-admins/single-sign-on/configure/) and [set up SCIM](../../security/for-admins/provisioning/scim.md). If your organization isn't part of a company, from here you can also [manage your domains](/manuals/security/for-admins/domain-management.md) or [create a company](new-company.md). +After configuring your organization information, you can: + +- [Configure single sign-on (SSO)](../../security/for-admins/single-sign-on/configure/) +- [Set up SCIM provisioning](../../security/for-admins/provisioning/scim.md) +- [Manage domains](../../security/for-admins/domain-management.md) +- [Create a company](new-company.md) diff --git a/content/manuals/admin/organization/insights.md b/content/manuals/admin/organization/insights.md index 6de7e567909..7d62e416a7f 100644 --- a/content/manuals/admin/organization/insights.md +++ b/content/manuals/admin/organization/insights.md @@ -1,7 +1,7 @@ --- -description: Gain insights about your organization's users and their Docker usage. -keywords: organization, insights title: Insights +description: Gain insights about your organization's users and their Docker usage. +keywords: organization, insights, Docker Desktop analytics, user usage statistics, Docker Business, track Docker activity --- {{< summary-bar feature_name="Insights" >}} @@ -13,26 +13,29 @@ productivity and efficiency across the organization. Key benefits include: -- Uniform working environment. Establish and maintain standardized +- Uniform working environment: Establish and maintain standardized configurations across teams. -- Best practices. Promote and enforce usage guidelines to ensure optimal +- Best practices: Promote and enforce usage guidelines to ensure optimal performance. -- Increased visibility. Monitor and drive adoption of organizational +- Increased visibility: Monitor and drive adoption of organizational configurations and policies. -- Optimized license use. Ensure that developers have access to advanced +- Optimized license use: Ensure that developers have access to advanced features provided by a Docker subscription. ## Prerequisites +To use Insights, you must meet the following requirements: + - [Docker Business subscription](../../subscription/details.md#docker-business) -- Administrators must [enforce sign-in](/security/for-admins/enforce-sign-in/) for users -- Insights enabled by your Customer Success Manager +- Administrators must [enforce sign-in](/security/for-admins/enforce-sign-in/) +for users +- Your Customer Success Manager must turn on Insights for your organization ## View Insights for organization users -To access Insights, you must contact your Customer Success Manager to have the -feature enabled. Once the feature is enabled, access Insights using the following -steps: +To access Insights, contact your Customer Success Manager to have the +feature turned on. Once the feature is turned on, access Insights using the +following steps: 1. Sign in to [Docker Home](https://app.docker.com/) and choose your organization. @@ -44,7 +47,7 @@ your organization. > Insights page, view the **Last updated** date to understand when the data was > last updated. -You can view data in the following charts: +Insights data is displayed in the following charts: - [Docker Desktop users](#docker-desktop-users) - [Builds](#builds) @@ -187,7 +190,7 @@ installed ## Troubleshoot Insights If you’re experiencing issues with data in Insights, consider the following -solutions to resolve common problems. +solutions to resolve common problems: - Update users to the latest version of Docker Desktop. @@ -195,12 +198,12 @@ solutions to resolve common problems. In addition, older versions may not provide all data. Ensure all users have installed the latest version of Docker Desktop. -- Enable **Send usage statistics** in Docker Desktop for all your users. +- Turn on **Send usage statistics** in Docker Desktop for all your users. If users have opted out of sending usage statistics for Docker Desktop, then their usage data will not be a part of Insights. To manage the setting at scale for all your users, you can use [Settings - Management](/desktop/hardened-desktop/settings-management/) and enable the + Management](/desktop/hardened-desktop/settings-management/) and turn on the `analyticsEnabled` setting. - Ensure users use Docker Desktop and aren't using the standalone @@ -210,7 +213,7 @@ solutions to resolve common problems. Engine outside of Docker Desktop, Docker Engine won't provide data for that user. -- Ensure that users are signing in to an account associated with your +- Make sure users sign in to an account associated with your organization. Users who don’t sign in to an account associated with your organization are diff --git a/content/manuals/admin/organization/manage-products.md b/content/manuals/admin/organization/manage-products.md index b2dc56ec662..5b645bce67a 100644 --- a/content/manuals/admin/organization/manage-products.md +++ b/content/manuals/admin/organization/manage-products.md @@ -1,8 +1,8 @@ --- title: Manage Docker products weight: 45 -description: Learn how to manage Docker products for your organization -keywords: organization, tools, products +description: Learn how to manage access and usage for Docker products for your organization +keywords: organization, tools, products, product access, organization management --- {{< summary-bar feature_name="Admin orgs" >}} @@ -11,99 +11,105 @@ In this section, learn how to manage access and view usage of the Docker products for your organization. For more detailed information about each product, including how to set up and configure them, see the following manuals: -- [Docker Build Cloud](../../build-cloud/_index.md) - [Docker Desktop](../../desktop/_index.md) - [Docker Hub](../../docker-hub/_index.md) +- [Docker Build Cloud](../../build-cloud/_index.md) - [Docker Scout](../../scout/_index.md) - [Testcontainers Cloud](https://testcontainers.com/cloud/docs/#getting-started) -## Manage access to Docker products +## Manage product access for your organization -Access to Docker products included in your subscription is enabled by default -for all users. The included products are: +Access to the Docker products included in your subscription is turned on by +default for all users. For an overview of products included in your +subscription, see +[Docker subscriptions and features](/manuals/subscription/details.md). -- Docker Hub -- Docker Build Cloud -- Docker Desktop -- Docker Scout +{{< tabs >}} +{{< tab name="Docker Desktop" >}} -Testcontainers Cloud is not enabled by default. To enable Testcontainers Cloud, see the Testcontainers [Getting Started](https://testcontainers.com/cloud/docs/#getting-started) guide. +### Manage Docker Desktop access -The following sections describe how to enable or disable access for these products. +To manage Docker Desktop access: -### Manage access to Docker Build Cloud +1. [Enforce sign-in](../../security/for-admins/enforce-sign-in/_index.md). +1. Manage members [manually](./members.md) or use +[provisioning](../../security/for-admins/provisioning/_index.md). -To learn how to initially set up and configure Docker Build Cloud, sign in to -the [Docker Build Cloud Dashboard](https://app.docker.com/build) and follow the -on-screen instructions. +With sign-in enforced, only users who are a member of your organization can +use Docker Desktop after signing in. -To manage access to Docker Build Cloud, sign in to [Docker Build -Cloud](http://app.docker.com/build) as an organization owner, select **Account -settings**, and then manage access under **Lock Docker Build Cloud**. +{{< /tab >}} +{{< tab name="Docker Hub" >}} -### Manage access to Docker Scout +### Manage Docker Hub access -To learn how to initially set up and configure Docker Scout for remote -repositories, sign in to the [Docker Scout Dashboard](https://scout.docker.com/) -and follow the on-screen instructions. +To manage Docker Hub access, sign in to +[Docker Home](https://app.docker.com/) and configure [Registry Access Management](../../security/for-admins/hardened-desktop/registry-access-management.md) +or [Image Access Management](../../security/for-admins/hardened-desktop/image-access-management.md). -To manage access to Docker Scout for use on remote repositories, sign in to the -[Docker Scout Dashboard](https://scout.docker.com/) and configure -[integrations](../../scout/explore/dashboard.md#integrations) and [repository -settings](../../scout/explore/dashboard.md#repository-settings). +{{< /tab >}} +{{< tab name="Docker Build Cloud" >}} -To manage access to Docker Scout for use on local images with Docker Desktop, use -[Settings -Management](../../security/for-admins/hardened-desktop/settings-management/_index.md) -and set `sbomIndexing` to `false` to disable, or to `true` to enable. +### Manage Docker Build Cloud access -### Manage access to Docker Hub +To initially set up and configure Docker Build Cloud, sign in to +[Docker Build Cloud](https://app.docker.com/build) and follow the +on-screen instructions. -To manage access to Docker Hub, sign in to the [Docker Admin Console](https://app.docker.com/admin) and configure [Registry Access -Management](../../security/for-admins/hardened-desktop/registry-access-management.md) -or [Image Access -Management](../../security/for-admins/hardened-desktop/image-access-management.md). +To manage Docker Build Cloud access: -### Manage access to Testcontainers Cloud +1. Sign in to [Docker Build Cloud](http://app.docker.com/build) as an +organization owner. +1. Select **Account settings**. +1. Select **Lock access to Docker Build Account**. -To learn how to initially set up and configure Testcontainers Cloud, sign in to -[Testcontainers Cloud](https://app.testcontainers.cloud/) and follow the -on-screen instructions. +{{< /tab >}} +{{< tab name="Docker Scout" >}} -To manage access to Testcontainers Cloud, sign in to the [Testcontainers Cloud -Settings page](https://app.testcontainers.cloud/dashboard/settings) as -an organization owner, and then manage access under **Lock Testcontainers -Cloud**. +### Manage Docker Scout access -### Manage access to Docker Desktop +To initially set up and configure Docker Scout, sign in to +[Docker Scout](https://scout.docker.com/) and follow the on-screen instructions. -To manage access to Docker Desktop, you can [enforce -sign-in](../../security/for-admins/enforce-sign-in/_index.md), then and manage -members [manually](./members.md) or use -[provisioning](../../security/for-admins/provisioning/_index.md). With sign-in -enforced, only users who are a member of your organization can use Docker -Desktop after signing in. +To manage Docker Scout access: -## View Docker product usage +1. Sign in to [Docker Scout](https://scout.docker.com/) as an organization +owner. +1. Select your organization, then **Settings**. +1. To manage what repositories are enabled for Docker Scout analysis, select +**Repository settings**. For more information on, +see [repository settings](../../scout/explore/dashboard.md#repository-settings). +1. To manage access to Docker Scout for use on local images with Docker Desktop, +use [Settings Management](../../security/for-admins/hardened-desktop/settings-management/_index.md) +and set `sbomIndexing` to `false` to disable, or to `true` to enable. + +{{< /tab >}} +{{< tab name="Testcontainers Cloud" >}} + +### Manage Testcontainers Cloud access + +To initially set up and configure Testcontainers Cloud, sign in to +[Testcontainers Cloud](https://app.testcontainers.cloud/) and follow the +on-screen instructions. -View usage for the products on the following pages: +To manage access to Testcontainers Cloud: -- Docker Build Cloud: View the **Build minutes** page in the [Docker Build Cloud - Dashboard](http://app.docker.com/build). +1. Sign in to the [Testcontainers Cloud](https://app.testcontainers.cloud/) and +select **Account**. +1. Select **Settings**, then **Lock access to Testcontainers Cloud**. -- Docker Scout: View the [**Repository settings** - page](https://scout.docker.com/settings/repos) in the Docker Scout - Dashboard. +{{< /tab >}} +{{< /tabs >}} -- Docker Hub: View the [**Usage** page](https://hub.docker.com/usage) in Docker - Hub. +## Monitor product usage for your organization -- Testcontainers Cloud: View the [**Billing** - page](https://app.testcontainers.cloud/dashboard/billing) in the - Testcontainers Cloud Dashboard. +To view usage for Docker products: -- Docker Desktop: View the **Insights** page in [Docker Home](https://app.docker.com/). For more details, see - [Insights](./insights.md). +- Docker Desktop: View the **Insights** page in [Docker Home](https://app.docker.com/). For more details, see [Insights](./insights.md). +- Docker Hub: View the [**Usage** page](https://hub.docker.com/usage) in Docker Hub. +- Docker Build Cloud: View the **Build minutes** page in [Docker Build Cloud](http://app.docker.com/build). +- Docker Scout: View the [**Repository settings** page](https://scout.docker.com/settings/repos) in Docker Scout. +- Testcontainers Cloud: View the [**Billing** page](https://app.testcontainers.cloud/dashboard/billing) in Testcontainers Cloud. -If your usage exceeds your subscription amount, you can [scale your -subscription](../../subscription/scale.md) to meet your needs. \ No newline at end of file +If your usage or seat count exceeds your subscription amount, you can +[scale your subscription](../../subscription/scale.md) to meet your needs. diff --git a/layouts/shortcodes/admin-org-audit-log.html b/layouts/shortcodes/admin-org-audit-log.html deleted file mode 100644 index a3d0802c591..00000000000 --- a/layouts/shortcodes/admin-org-audit-log.html +++ /dev/null @@ -1,30 +0,0 @@ -{{ $product_link := "[Docker Hub](https://hub.docker.com)" }} -{{ $audit_navigation := "Select **My Hub**, your organization, and then **Activity**." }} - -{{ if eq (.Get "product") "admin" }} - {{ $product_link = "[Docker Home](https://app.docker.com/) and select your organization." }} - {{ $audit_navigation = "Select **Admin Console**, then **Activity logs**." }} -{{ end }} - -### View the activity logs - -To view the activity logs: - -1. Sign in to {{ $product_link }}. -2. {{ $audit_navigation }} - -> [!NOTE] -> -> Docker retains the activity data for a period of three months. - -### Customize the activity logs - -By default, all activities that occur are displayed on the **Activity** tab. Use the calendar option to select a date range and customize your results. After you have selected a date range, the activity logs of all the activities that occurred during that period are displayed. - -> [!NOTE] -> -> Activities created by the Docker Support team as part of resolving customer issues appear in the activity logs as **dockersupport**. - -Select the **All Activities** drop-down to view activities that are specific to an organization, repository, or billing. In Docker Hub, if you select the **Activities** tab from the **Repository** view, you can only filter repository-level activities. - -After choosing **Organization**, **Repository**, or **Billing**, you can further refine the results using the **All Actions** drop-down.