From 2e0e81bd064d192d1ca8fb1c3bc5001918850644 Mon Sep 17 00:00:00 2001 From: Joe Clark <31087804+jc-clark@users.noreply.github.com> Date: Thu, 10 Aug 2023 10:48:23 -0700 Subject: [PATCH] Enterprise bug fixes for the week of July 17th (#39896) Co-authored-by: Jules <19994093+jules-p@users.noreply.github.com> --- .../command-line-utilities.md | 1 + ...k-traffic-to-your-enterprise-with-an-ip-allow-list.md | 5 +++++ ...porting-membership-information-for-your-enterprise.md | 7 ++++++- .../managing-allowed-ip-addresses-for-a-github-app.md | 1 + .../redeeming-a-coupon.md | 9 +++++++-- ...anaging-allowed-ip-addresses-for-your-organization.md | 3 +++ .../ip-address-add-or-remove-caching.md | 5 +++++ src/redirects/lib/static/redirect-exceptions.txt | 3 +++ 8 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 data/reusables/identity-and-permissions/ip-address-add-or-remove-caching.md diff --git a/content/admin/administering-your-instance/command-line-utilities.md b/content/admin/administering-your-instance/command-line-utilities.md index 1695e34d935c..7b63efe65102 100644 --- a/content/admin/administering-your-instance/command-line-utilities.md +++ b/content/admin/administering-your-instance/command-line-utilities.md @@ -962,6 +962,7 @@ ghe-repl-start This utility displays the status of replication on a node, returning an `OK`, `WARNING` or `CRITICAL` status for each datastore's replication stream. For more information, see "[AUTOTITLE](/admin/enterprise-management/configuring-high-availability/monitoring-a-high-availability-configuration)." - If any of the replication channels are in a `WARNING` state, the command will exit with code `1`. +- If you have not started replication, the command will exit with code `1`. - If any of the channels are in a `CRITICAL` state, the command will exit with code `2`. - The output conforms to the expectations of Nagios' check_by_ssh plugin. For more information, see the [check_by_ssh plugin](https://nagios-plugins.org/doc/man/check_by_ssh.html) on the official Nagios plugins page. diff --git a/content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md b/content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md index af41130aaad8..162de125ae22 100644 --- a/content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md +++ b/content/admin/configuration/hardening-security-for-your-enterprise/restricting-network-traffic-to-your-enterprise-with-an-ip-allow-list.md @@ -73,6 +73,7 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth {% data reusables.identity-and-permissions.about-adding-ip-allow-list-entries %} {% data reusables.identity-and-permissions.ipv6-allow-lists %} +{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %} {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} @@ -110,6 +111,8 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth ### Deleting an allowed IP address +{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %} + {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.security-tab %} @@ -184,6 +187,8 @@ To ensure seamless use of the OIDC CAP while still applying the policy to OAuth ## Deleting an allowed IP address +{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %} + {% data reusables.enterprise-accounts.access-enterprise %} {% data reusables.enterprise-accounts.settings-tab %} {% data reusables.enterprise-accounts.security-tab %} diff --git a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md index 68aac65e0ab0..4fd4aed37723 100644 --- a/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md +++ b/content/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/exporting-membership-information-for-your-enterprise.md @@ -17,10 +17,15 @@ You can export aggregated information about your enterprise's members as a membe The membership information report includes the following information. +{% note %} + +**Note:** You can only export the datetime of the user's last activity at the organization level. For more information, see "[AUTOTITLE](/organizations/managing-membership-in-your-organization/exporting-member-information-for-your-organization#about-export-of-membership-information)." + +{% endnote %} + - Username and display name details - Whether the user has two-factor authentication enabled {% ifversion mandatory-2fa-required-overview %}or is required to enable it{% endif %} - Whether the user is an organization owner or member -- Datetime of the user's last activity (for a full list of relevant activity, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/managing-dormant-users)") - Organizations with pending invitations - Optionally, additional information that depends on the enterprise's configuration: - The user's email addresses for a verified domain diff --git a/content/apps/maintaining-github-apps/managing-allowed-ip-addresses-for-a-github-app.md b/content/apps/maintaining-github-apps/managing-allowed-ip-addresses-for-a-github-app.md index d86411057429..c6c282cf6bdf 100644 --- a/content/apps/maintaining-github-apps/managing-allowed-ip-addresses-for-a-github-app.md +++ b/content/apps/maintaining-github-apps/managing-allowed-ip-addresses-for-a-github-app.md @@ -26,6 +26,7 @@ When an organization has an allow list, third-party applications that connect vi ## Adding an IP address allow list to a {% data variables.product.prodname_github_app %} registration {% data reusables.identity-and-permissions.ipv6-allow-lists %} +{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %} {% data reusables.apps.settings-step %} {% data reusables.user-settings.developer_settings %} diff --git a/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md b/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md index d6cbeee36d49..eb31a7b2b96d 100644 --- a/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md +++ b/content/billing/managing-your-github-billing-settings/redeeming-a-coupon.md @@ -10,7 +10,6 @@ redirect_from: - /github/setting-up-and-managing-billing-and-payments-on-github/managing-your-github-billing-settings/redeeming-a-coupon versions: fpt: '*' - ghec: '*' type: how_to topics: - Discounts @@ -22,7 +21,13 @@ topics: {% data reusables.dotcom_billing.coupon-expires %} -You cannot apply coupons to paid plans for {% data variables.product.prodname_marketplace %} apps. +{% note %} + +**Notes:** +- You cannot apply coupons to paid plans for {% data variables.product.prodname_marketplace %} apps. +- You cannot use coupons to pay for {% data variables.product.prodname_ghe_cloud %}. For more information, see "[AUTOTITLE](/enterprise-cloud@latest/billing/managing-your-github-billing-settings/about-billing-for-your-enterprise#about-billing-for-your-enterprise)." + +{% endnote %} ## Redeeming a coupon for your personal account diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md index f83474a14559..1a1f7e81ae4a 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/managing-allowed-ip-addresses-for-your-organization.md @@ -44,6 +44,7 @@ You can also configure allowed IP addresses at the enterprise account level, and {% data reusables.identity-and-permissions.about-adding-ip-allow-list-entries %} {% data reusables.identity-and-permissions.ipv6-allow-lists %} +{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %} {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} @@ -103,6 +104,8 @@ For more information about how to create an allow list for a {% data variables.p ## Deleting an allowed IP address +{% data reusables.identity-and-permissions.ip-address-add-or-remove-caching %} + {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.security %} diff --git a/data/reusables/identity-and-permissions/ip-address-add-or-remove-caching.md b/data/reusables/identity-and-permissions/ip-address-add-or-remove-caching.md new file mode 100644 index 000000000000..268dc3af7463 --- /dev/null +++ b/data/reusables/identity-and-permissions/ip-address-add-or-remove-caching.md @@ -0,0 +1,5 @@ +{% note %} + +**Note:** Due to caching, adding or removing IP addresses can take a few minutes to fully take effect. + +{% endnote %} diff --git a/src/redirects/lib/static/redirect-exceptions.txt b/src/redirects/lib/static/redirect-exceptions.txt index 10d1981fe052..b6b7d7e67fa2 100644 --- a/src/redirects/lib/static/redirect-exceptions.txt +++ b/src/redirects/lib/static/redirect-exceptions.txt @@ -37,3 +37,6 @@ /github-ae@latest/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-advanced-setup-for-code-scanning - /github-ae@latest/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning-for-a-repository + +/billing/managing-your-github-billing-settings/redeeming-a-coupon +- /enterprise-cloud@latest/billing/managing-your-github-billing-settings/redeeming-a-coupon \ No newline at end of file