Merge branch 'develop' into remove-dummy-doc-redirect

.github/workflows/build-cache.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    name: Gatsby Build
+    name: Gatsby Build and Cache
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

.github/workflows/check-translations-and-deserialize.yml

@@ -49,6 +49,7 @@ jobs:
 
       - name: Commit changes
         id: commit-changes
+        if: steps.fetch-deserialize.outputs.batchesToDeserialize != 0
         run: |
           git config --local user.email "${{ env.BOT_EMAIL }}"
           git config --local user.name "${{ env.BOT_NAME }}"
@@ -57,6 +58,7 @@ jobs:
           echo "::set-output name=commit::true"
 
       - name: Create Pull Request
+        if: steps.fetch-deserialize.outputs.batchesToDeserialize != 0
         uses: peter-evans/create-pull-request@v3
         with:
           token: ${{ secrets.OPENSOURCE_BOT_TOKEN }}
@@ -69,6 +71,7 @@ jobs:
           delete-branch: true
 
       - name: Checkout repository
+        if: steps.fetch-deserialize.outputs.batchesToDeserialize != 0
         uses: actions/checkout@v2
 
       - name: Setup Node.js
@@ -85,6 +88,7 @@ jobs:
         run: yarn install --frozen-lockfile
 
       - name: Remove Completed Batches From Queue
+        if: steps.fetch-deserialize.outputs.batchesToDeserialize != 0
         id: remove-batches
         run: |
           node ./scripts/actions/remove-completed-batch.js ${{steps.fetch-deserialize.outputs.batchUids}} ${{steps.fetch-deserialize.outputs.deserializedFileUris}}

.github/workflows/release.yml

@@ -16,15 +16,36 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       tag: ${{ steps.get-tag.outputs.tag }}
+      last: ${{ steps.get-last-tag.outputs.last }}
+      notes: ${{ steps.get-release-notes.outputs.notes }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-
+        with:
+          fetch-depth: '0'
+
       - name: Get release tag
         id: get-tag
         run: |
           MERGES=$(gh pr list -B main -s merged --search "closed:>2021-02-28" -L 9999 | wc -l | awk '{print $1}')
           echo "::set-output name=tag::release-$MERGES"
+          
+      - name: Get last release
+        id: get-last-tag
+        run: |
+          LAST=$(gh release list -L 1 | awk '{print $1}')
+          echo "::set-output name=last::$LAST"
+          
+      - name: Get release notes
+        id: get-release-notes
+        run: |
+          NOTES=$(git log ${{ steps.get-last-tag.outputs.last }}..HEAD --pretty="%an - %b (%s)[%h]" --merges | sed -e 's!Merge pull request !!')
+          NOTES="${NOTES//'%'/'%25'}"
+          NOTES="${NOTES//$'\n'/'%0A'}"
+          NOTES="${NOTES//$'\r'/'%0D'}"
+          echo "::set-output name=notes::$NOTES"
+          
+      
 
       - name: Create release
-        run: gh release create ${{ steps.get-tag.outputs.tag }} -t ${{ steps.get-tag.outputs.tag }}
+        run: gh release create ${{ steps.get-tag.outputs.tag }} -t ${{ steps.get-tag.outputs.tag }} -n "${{ steps.get-release-notes.outputs.notes }}"

.github/workflows/send-content-to-translate.yml

@@ -3,8 +3,8 @@ name: Send content to be translated
 on:
   workflow_dispatch:
   schedule:
-    # 1am every Thursday
-    - cron: '0 1 * * 4'
+    # At 1 am on the 1st and 15th day of a month
+    - cron: '0 1 1,15 * *'
 
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.github/workflows/validate-pr.yml

@@ -13,7 +13,6 @@ env:
 jobs:
   build:
     name: Gatsby Build
-    if: github.base_ref == 'develop'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository

README.md

@@ -2,15 +2,15 @@
 
 # docs.newrelic.com
 
-Welcome! 👋  This is the repo for the `NEW` New Relic Docs site. This repo contains all the Docs website source code and Markdown source files we use to build our Docs site: `docs.newrelic.com`.
+Welcome! 👋  This is the repo for [docs.newrelic.com](https://docs.newrelic.com). This repo contains all the source code and Markdown source files we use to build our docs site.
 
 Read on to learn more about who we are and how you can contribute to the New Relic Docs site.
 
 ## We'd like your help
 
-From early on, our Docs site has been managed by a team of writers. We've always welcomed contributions from anyone at New Relic and now we're open sourcing our docs to invite input from anyone at all. We credit our technical accuracy and comprehensive documentation to this openness.
+From the start, we've welcomed contributions from anyone at New Relic, not just writers. Now, we're open sourcing our docs to invite input from anyone at all. We credit our technical accuracy and comprehensive documentation to this openness.
 
-In a sense, it's documentation as conversation. By making our docs open source, we hope to expand this conversation. Open sourcing our docs seemed like a great way to expand this conversation beyond New Relic.
+In a sense, it's documentation as conversation. By making our docs open source, we hope to expand this conversation.
 
 We're here working every day to improve our docs and we'd love to hear from you. Come join the conversation.
 
@@ -20,9 +20,7 @@ On each page of our docs, you can [create an issue](https://github.com/newrelic/
 
 ### Create an issue
 
-Issues are a quick way to give us feedback about our docs. We'll review your issue and follow up with you if we have any questions.
-You can create an issue to let us know when you find an error or notice something missing. You can also let us know about things you'd like to see.
-Go here to [create an issue](https://github.com/newrelic/docs-website/issues/new/choose).
+Issues are a quick way to give us feedback about our docs. We'll review your issue and follow up with you if we have any questions. You can create an issue to let us know when you find an error or notice something missing. You can also let us know about things you'd like to see. Go here to [create an issue](https://github.com/newrelic/docs-website/issues/new/choose).
 
 ### Edit a page
 
@@ -34,12 +32,10 @@ If you'd like to get more directly involved, you can edit the docs yourself! Her
 
 If you'd like more information on how to edit our docs, see our [content contribution guide](/docs/style-guide/writing-guidelines/create-edit-content/). Additionally, our [Style guide](https://docs.newrelic.com/docs/style-guide) will give you some insight into how we think about writing and documentation, as well as our flavor of Markdown.
 
-If you'd like to go deeper, see our [Contributors guide](CONTRIBUTING.md) for information on how to fork our site, build it locally, and submit pull requests.
-
-
-
 Reading the style guide is totally optional! Our writers are here to make sure everything is formatted and worded right. We're looking your technical insight and knowhow. Let us handle the little details for you.
 
+If you'd like to go deeper with development, see our [Contributors guide](CONTRIBUTING.md) for information on how to fork our site, build it locally, and submit pull requests.
+
 ## 🚧 Contributing
 
 We welcome contributions to the New Relic Docs Site. Please review our [Contributors Guide](CONTRIBUTING.md) prior to submitting any code.

amplify.yml

@@ -9,9 +9,9 @@ frontend:
       commands:
         - |
           if [ "${AWS_BRANCH}" = "main" ]; then
-            GATSBY_EXPERIMENTAL_PAGE_BUILD_ON_DATA_CHANGES=true yarn run build:production --log-pages;
+            GATSBY_EXPERIMENTAL_PAGE_BUILD_ON_DATA_CHANGES=true yarn run build:production
           else
-            GATSBY_EXPERIMENTAL_PAGE_BUILD_ON_DATA_CHANGES=true yarn run build:staging --log-pages;
+            GATSBY_EXPERIMENTAL_PAGE_BUILD_ON_DATA_CHANGES=true yarn run build:staging
           fi
   artifacts:
     baseDirectory: public

gatsby-config.js

@@ -1,5 +1,5 @@
-const parse = require('rehype-parse');
 const fs = require('fs');
+const parse = require('rehype-parse');
 const path = require('path');
 const unified = require('unified');
 const rehypeStringify = require('rehype-stringify');

package.json

@@ -15,7 +15,7 @@
     "common-tags": "^1.8.0",
     "date-fns": "^2.17.0",
     "front-matter": "^4.0.2",
-    "gatsby": "^3.5.0",
+    "gatsby": "^3.5.1",
     "gatsby-image": "^3.3.0",
     "gatsby-plugin-gatsby-cloud": "^2.5.0",
     "gatsby-plugin-json-output": "^1.2.0",

scripts/actions/add-files-to-translation-queue.js

@@ -21,6 +21,7 @@ const getUpdatedQueue = async (url, queue) => {
     const mdxFiles = files
       ? files
           .filter((file) => path.extname(file.filename) === '.mdx')
+          .filter((file) => file.status !== 'removed')
           .reduce((files, file) => {
             const contents = fs.readFileSync(
               path.join(process.cwd(), file.filename)
@@ -33,17 +34,15 @@ const getUpdatedQueue = async (url, queue) => {
           }, [])
       : [];
 
-    const addedMdxFiles = mdxFiles
-      .filter((f) => f.status !== 'removed')
-      .reduce((files, file) => {
-        return file.locales.reduce(
-          (acc, locale) => ({
-            ...acc,
-            [locale]: [...(acc[locale] || []), file.filename],
-          }),
-          files
-        );
-      }, {});
+    const addedMdxFiles = mdxFiles.reduce((files, file) => {
+      return file.locales.reduce(
+        (acc, locale) => ({
+          ...acc,
+          [locale]: [...(acc[locale] || []), file.filename],
+        }),
+        files
+      );
+    }, {});
 
     const removedMdxFileNames = mdxFiles
       .filter((f) => f.status === 'removed')

scripts/actions/check-job-progress.js

@@ -65,6 +65,11 @@ const main = async () => {
     console.log(
       `[*] ${batchesToDeserialize.length} batches ready to be deserialized`
     );
+
+    console.log(
+      `::set-output name=batchesToDeserialize::${batchesToDeserialize.length}`
+    );
+
     await Promise.all(
       batchesToDeserialize.map(fetchAndDeserialize(accessToken))
     );

src/content/docs/accounts/accounts-billing/account-setup/troubleshoot-new-relics-password-email-address-login-problems.mdx

@@ -21,6 +21,11 @@ If you have problems with your email address or password when [logging in to New
   To learn about factors affecting access to features and data, see [Factors affecting access](/docs/factors-affecting-access-features-data).
 </Callout>
 
+## Account access issues [#account-access]
+
+
+If you're logged into New Relic but don't see the accounts or data you expect, see [Factors affecting access](/docs/accounts/accounts-billing/general-account-settings/factors-affecting-access-features-data#account-access). 
+
 ## Password solutions [#solution]
 
 New Relic requires a valid email address and a [valid password](/docs/accounts-partnerships/accounts/account-maintenance/change-passwords-user-preferences#requirements) in order for you to log in and to receive information from New Relic. If you are unable to create your account successfully, or if you have password or other login problems, review these troubleshooting suggestions to try to identify a resolution.
@@ -129,7 +134,7 @@ New Relic requires a valid email address and a [valid password](/docs/accounts-p
 
   <Collapser
     id="verify-email"
-    title="Asked to verify email during login"
+    title="Asked to verify email during login."
   >
     If your email is associated with multiple accounts, you will be given the option to verify your email during login. This will allow you to choose which account to access. If you do not verify your email address, New Relic will attempt to log you in with the most recently created user record associated with your email address.
 
@@ -139,12 +144,13 @@ New Relic requires a valid email address and a [valid password](/docs/accounts-p
 
 ## General system solutions [#solution-system]
 
-For general system problems, try these suggestions.
+Some general system problems and solutions: 
 
 <CollapserGroup>
+
   <Collapser
     id="delete-account"
-    title="Delete an unnecessary account."
+    title="Delete an account you recently created."
   >
     If you created a New Relic account unnecessarily and want to delete it, and if that account is a simple one, you may be able to delete it yourself. See [Delete simple organization](/docs/accounts/accounts-billing/account-setup/downgradecancel-account/#cancel-simple-org).
   </Collapser>

src/content/docs/accounts/accounts-billing/general-account-settings/factors-affecting-access-features-data.mdx

@@ -37,20 +37,17 @@ User-related settings can impact what features or data you have access to. Poten
 
 ## Account access [#account-access]
 
-New Relic gives you a cross-account view of data from accounts within the same organization. But there can be boundaries between accounts that result in some data being obfuscated. For example, a user may see missing or obfuscated data if they don't have permissions for the account that data is coming from. For more on assigning permissions, see [User permissions](#user-permissions).
+If you're logged in to New Relic and don't see the account or data you expect to see, some causes and solutions include: 
 
-Some New Relic users have an email address associated with more than one New Relic account. This may result in you being in the “wrong” account and looking for data that isn’t there. For more on having multiple associated accounts, see [Login issues](/docs/accounts/accounts-billing/account-setup/troubleshoot-new-relics-password-email-address-login-problems/#verify-email).
-
-Options for switching between accounts:
-
-* Log out and log back in to a different account. If you're having trouble getting into an older account, see this [Explorers Hub post about multiple account access](https://discuss.newrelic.com/t/relic-solution-so-youve-created-a-new-account-and-cant-seem-to-access-your-old-account/113122).
-* Use the account switcher, located at the top of the New Relic UI, to switch to a different account.
+* If your organization has multiple accounts, there's an account switcher at the top left of most New Relic UI pages. Check to see if you can use that to switch accounts. 
+* You may have more than one login associated with the same email address. If you think this may be the case, log out and log back in. When you input your email address, the login UI tells you if you have multiple logins and gives you [an option for seeing all accounts associated with that email](/docs/accounts/accounts-billing/account-setup/troubleshoot-new-relics-password-email-address-login-problems/#verify-email). If you're having trouble accessing an older account, see this [Explorers Hub post about multiple account access](https://discuss.newrelic.com/t/relic-solution-so-youve-created-a-new-account-and-cant-seem-to-access-your-old-account/113122).
+* It's possible an admin user in your organization changed [your permissions](#user-permissions) for an account. 
 
 Related docs:
 
 * [Account structure](/docs/accounts/accounts-billing/new-relic-one-pricing-users/account-user-structure)
 * [Login and password troubleshooting](/docs/accounts/install-new-relic/account-setup/troubleshoot-password-email-address-login-problems)
-* [Delete account created accidentally](/docs/accounts/accounts-billing/account-setup/downgradecancel-account#cancel-single-account)
+* [Delete accounts](/docs/accounts/accounts-billing/account-setup/downgradecancel-account#cancel-single-account)
 
 ## Pricing plan or edition [#pricing]
 

src/content/docs/accounts/accounts-billing/new-relic-one-pricing-users/new-relic-account-structure.mdx

@@ -16,8 +16,7 @@ Some tips for understanding New Relic account/user structure:
 
 * At the top level of New Relic's account hierarchy is the concept of the "organization." A New Relic customer's group of related accounts are considered to be inside a single "New Relic organization."
 * For accounts with [New Relic One pricing](/docs/accounts/accounts-billing/new-relic-one-pricing-users/pricing-billing):
-  * The Standard [pricing edition](https://newrelic.com/pricing) of Full Stack Observability allows for a single account per organization. The Pro and Enterprise [editions](https://newrelic.com/pricing) allows [master/sub-account structures](/docs/accounts/install-new-relic/account-setup/manage-apps-or-users-sub-accounts) within an organization.
+  * The [Standard edition](https://newrelic.com/pricing) allows for a single account per organization. [Pro and Enterprise editions](https://newrelic.com/pricing) allows for [multiple accounts](/docs/accounts/accounts-billing/account-structure/mastersub-account-structure/#users) and more complex account configuration. 
 * New Relic offers you a view of data from across accounts in the same organization. For more details, see [Account access](/docs/factors-affecting-access-features-data#account-access).
-* You may have access to multiple New Relic accounts, with multiple associated email addresses. For more on issues related to this, see [Account access](/docs/factors-affecting-access-features-data#account-access).
-* Some organizations can have [master/sub-account structures](/docs/accounts/install-new-relic/account-setup/manage-apps-or-users-sub-accounts).
-* Billing-related usage is calculated at the level of the organization. This can mean that usage data may not display organization-level usage when viewed at a sub-account level.
+* It's possible for a single email address to be associated with multiple organizations and logins. For more on this, see [Account access](/docs/factors-affecting-access-features-data#account-access).
+* Billing-related usage is calculated at the level of the organization. This can mean that usage data may not display organization-level usage if being viewed at a sub-account level.

src/content/docs/accounts/accounts-billing/new-relic-one-user-management/add-manage-users-groups-roles.mdx

@@ -45,10 +45,10 @@ To see if you can access these user management features, go to the [user managem
 For users on the [New Relic One user model](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-changes-pricing-user-model/#user-models), to find your user management options: From the [account dropdown](/docs/using-new-relic/welcome-new-relic/get-started/glossary#account-dropdown), select **Administration**. There are two user management UI pages there: 
 
 * **User management**: Use this to add users, update user information, and approve [upgrade requests](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#session-mgmt).
-* **Organization and access**: Use this page to create and manage groups, roles, and access grants.
+* **Organization and access**: Use this page to create and manage groups, roles, and access grants, and to set up [SAML SSO and SCIM provisioning](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more).
 
 <Callout variant="important">
-  If you can't use or access these UI pages, it may be because your users are on our [original user model](/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model) or because you don't have the [required user management role](#requirements).
+  If you can't see these UI pages, it may be because you're on our [original user model](/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model) or because you don't have the [required user management role](#requirements).
 </Callout>
 
 ## Overview of user management concepts [#understand-concepts]