Merge branch 'develop' into paperclypse-patch-2

jest.config.js

@@ -18,5 +18,5 @@ module.exports = {
   setupFiles: ['<rootDir>/loadershim.js'],
   setupFilesAfterEnv: ['<rootDir>/setup-test-env.js'],
   testRegex: '(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$',
-  moduleFileExtensions: ['js', 'ts', 'tsx'],
+  moduleFileExtensions: ['js', 'ts', 'tsx', 'json'],
 };

package.json

@@ -51,7 +51,7 @@
     "react-spring": "9.1.2",
     "react-use": "^15.3.8",
     "react-use-measure": "^2.0.3",
-    "rehype-format": "^4.0.1",
+    "rehype-format": "^3.1.0",
     "rehype-parse": "^7.0.1",
     "rehype-raw": "^5.1.0",
     "rehype-remark": "^8.0.0",

src/content/docs/accounts/accounts-billing/new-relic-one-pricing-billing/core-users-release.mdx

@@ -50,7 +50,6 @@ For a detailed comparison of capabilities, see [the capabilities table](/docs/ac
 
 This pricing version also changes [how billable users are calculated](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/user-count-billing#user-calculation) and [rules on downgrading users](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/user-count-billing#downgrade-rules).
 
-
 ## Availability [#availability]
 
 The core users release is currently available to: 
@@ -59,19 +58,18 @@ The core users release is currently available to:
 
 If your organization has core users or has the ability to add core users, you're on this version. If you don't, you're on the ["New Relic One without core users" version](#overview). For tips on determining which version you're on, see [Pricing versions](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/user-count-billing#pricing-versions).
 
-### Free access to core user capabilities [#free-access] 
+## Details about switching to this pricing version [#nr1core-optin]
 
-For all New Relic organizations, basic users will have free preview access to core user capabilities until February 28, 2022. 
+[Some New Relic organizations](#availability) that existed before January 12, 2022, have an option for opting in to the newer core user release via an acceptance form called the "core amendment." For some organizations, this acceptance process is in the UI, found on the **Manage your plan** UI page. The New Relic user that accepts this amendment from the UI is stating that they're authorized to accept the terms of that amendment for their organization.
 
-## Details about opting in and grace period [#nr1core-optin]
+## Considerations for adjusting users' user type [#changing-users]
 
-[Some New Relic organizations](#availability) that existed before January 12, 2022, have an option for opting in to the newer core user release via an acceptance form called the "core amendment." For some organizations, this acceptance process is in the UI, found on the **Manage your plan** UI page. The New Relic user that accepts this amendment from the UI is stating that they're authorized to accept the terms of that amendment for their organization.
+Here are two important notes regarding your need to adjust your users' user type: 
 
-When an existing organization transitions to the core version of pricing (by accepting either a) the core amendment or b) the addition of core users to an existing [order](/docs/licenses/license-information/product-definitions/new-relic-one-pricing-definitions/#order)), it has a seven-day grace period, during which your users’ user type won't affect billing. This gives you time to [decide which user type to assign your users](/docs/accounts/accounts-billing/new-relic-one-user-management/user-type/#choose-user-type). After the grace period ends, the new [billing calculation rules](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/user-count-billing) apply.  
-
-The grace period is provided only for existing, paying organizations that accept the addition of core users and only happens once, upon initial transition to the core version of pricing. 
+* For all New Relic organizations, basic users have free preview access to core user capabilities until February 28, 2022. **This means that it may make sense to wait to upgrade basic users to core users until March.**
+* Also, when an existing organization transitions to the core version of pricing (by accepting either a) the core amendment or b) the addition of core users to an existing [order](/docs/licenses/license-information/product-definitions/new-relic-one-pricing-definitions/#order)), it has a seven-day grace period, during which your users’ user type won't affect billing. This gives you time to [decide which user type to assign your users](/docs/accounts/accounts-billing/new-relic-one-user-management/user-type/#choose-user-type). After the grace period ends, the new [billing calculation rules](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/user-count-billing) apply. The grace period is provided only for existing, paying organizations that accept the addition of core users and only happens once, upon initial transition to the core version of pricing. 
 
-When you accept the core amendment, you'll probably want to review your users and adjust their user types. How you do this will depend on which user model your users are on: 
+When you are ready to adjust your users' user type, how you do that depends on which user model your users are on ([learn about determining user type](/docs/accounts/original-accounts-billing/original-users-roles/overview-user-models)): 
 
 * [New Relic One user model](/docs/accounts/accounts-billing/new-relic-one-user-management/user-management-ui-and-tasks/#edit-user-type) 
 * [Original user model](/docs/accounts/original-accounts-billing/original-users-roles/users-roles-original-user-model/#update-user-type): Note that if you have multiple accounts, you can't see all users from across all accounts in one place. You must go into each account to see and manage that account's users. 

src/content/docs/accounts/accounts-billing/new-relic-one-user-management/user-type.mdx

@@ -576,8 +576,7 @@ On January 12, 2022, basic users had some log management capabilities removed. T
 
 Log-related capabilities: 
 * **Basic users** can view and search the [log management UI](/docs/logs/get-started/get-started-log-management).
-* **Core users** can see and use all log management UI features, but can't configure log data. They can use [logs in context](/docs/logs/logs-context/configure-logs-context-apm-agents) for any UI they have access to (for example, errors inbox).
-* **Full platform users** can use all log management features, including configuring log data. 
+* **Core users** and **full platform users** have access to all [log management UI features](/docs/logs/ui-data/use-logs-ui) and configuration capabilities, and can see [logs in context](/docs/logs/logs-context/configure-logs-context-apm-agents) for the UI experiences they have access to (for example, core users can see applicable log data in the errors inbox UI).
 
 </Collapser>  
 

src/content/docs/alerts-applied-intelligence/overview.mdx

@@ -24,11 +24,9 @@ redirects:
   - /docs/alerts-applied-intelligence
 ---
 
-Alerts and applied intelligence are a suite of tools and features that proactively notify you when things go wrong–even when they're starting to go wrong.
+Alerts and applied intelligence are a suite of tools and features that proactively notify you when things go wrong... right when they're starting to go wrong.
 
-Alerts lets you define the conditions in your system you want to be notified about, letting you focus on the things you care about most.
-
-Applied intelligence is a machine-learning engine that reduces alert noise, correlates incidents, automatically detects anomalies, and provides root cause analysis. Not only that, it enriches your notifications with metadata to give you greater context of what's happening when you are notified.
+Want to try Alerts & AI? Join us! It's free... forever!
 
 <ButtonGroup>
     <ButtonLink
@@ -39,7 +37,12 @@ Applied intelligence is a machine-learning engine that reduces alert noise, corr
     Sign up for free
     </ButtonLink>
 </ButtonGroup>
-    No credit card required. Already have an account? [Login](http://one.newrelic.com/).
+
+Already have an account? [Login](http://one.newrelic.com/).
+
+Alerts lets you define the conditions in your system you want to be notified about, letting you focus on the things you care about most.
+
+Applied intelligence is a machine-learning engine that reduces alert noise, correlates incidents, automatically detects anomalies, and provides root cause analysis. Not only that, it enriches your notifications with metadata to give you greater context of what's happening when you are notified.
 
 ![Screenshot of the Alerts and AI overview page](./images/alerts-ai-summary.png 'The alerts and applied intelligence overview page')
 

src/content/docs/apm/agents/java-agent/features/jvms-page-java-view-app-server-metrics-jmx.mdx

@@ -211,6 +211,37 @@ This table lists which tabs appear on the JVM page for app servers. If your app
       </td>
     </tr>
 
+    <tr>
+      <td>
+        JBoss 7EAP
+      </td>
+
+      <td>
+        <Icon
+          style={{color: '#328787'}}
+          name="fe-check"
+        />
+      </td>
+
+      <td/>
+
+      <td/>
+
+      <td>
+        <Icon
+          style={{color: '#328787'}}
+          name="fe-check"
+        />
+      </td>
+
+      <td>
+        <Icon
+          style={{color: '#328787'}}
+          name="fe-check"
+        />
+      </td>
+    </tr>
+
     <tr>
       <td>
         JBoss 7AS

src/content/docs/apm/agents/java-agent/getting-started/compatibility-requirements-java-agent.mdx

@@ -298,7 +298,7 @@ The agent automatically instruments these frameworks and libraries:
     * ColdFusion 10
     * Glassfish 3.0 to 5.x
     * JBoss 7.0 to latest
-    * JBoss EAP 6.0 +
+    * JBoss EAP 6.0 to 7.3
     * Jetty 7.0.0.M3 to 9.4.x
     * Mule ESB 3.4 to 3.8.x
     * Netty 3.3.0.Alpha1 to 5.0.0.Alpha1

src/content/docs/distributed-tracing/infinite-tracing/infinite-tracing-configure-span-attribute-trace-filter.mdx

@@ -43,6 +43,6 @@ When you add a custom rule, it takes effect immediately for that trace observer.
 
 ## Rule Priority
 
-When a trace has spans with attributes that match both **Keep** and **Discard** filter rules, the trace is discarded.
+Each rule is evaluated independently. If any rule matches, its observer action, **Keep** or **Discard**, is carried out. When a trace has spans with attributes that match both **Keep** and **Discard** filter rules, the trace is discarded. 
 
 For example, suppose you don't want to save some expected errors that have a certain phrase in the error message. You could create a **Discard** filter rule that targets the error message while still retaining all other traces with an error.