Merge branch 'develop' into clark/86-lightbox

package.json

@@ -10,7 +10,7 @@
     "@emotion/styled": "^11.3.0",
     "@mdx-js/mdx": "2.0.0-next.8",
     "@mdx-js/react": "2.0.0-next.8",
-    "@newrelic/gatsby-theme-newrelic": "9.8.1",
+    "@newrelic/gatsby-theme-newrelic": "9.10.3",
     "@splitsoftware/splitio-react": "^1.2.4",
     "ansi-colors": "^4.1.3",
     "cockatiel": "^3.0.0-beta.0",

scripts/actions/webdriver-desktop.mjs

@@ -98,7 +98,9 @@ const navTest = async () => {
 };
 
 const searchTest = async () => {
-  const [searchInput] = await waitForXPath('//aside//input');
+  const [searchInput] = await waitForXPath(
+    './/input[@placeholder="Search docs"]'
+  );
   console.log('\nClicking search input');
   await searchInput.click();
   const activeEl = await driver.executeScript('return document.activeElement');

scripts/actions/webdriver-mobile.mjs

@@ -47,7 +47,8 @@ const main = async () => {
   await driver.get(testUrl + 'docs/mdx-test-page/');
   await navTest();
   await collapserTest();
-  await searchTest();
+  // TODO: reenable after fixing mobile search focus behavior
+  // await searchTest();
 
   // this step isn't necessary in synthetics
   await driver.quit();
@@ -106,7 +107,7 @@ const navTest = async () => {
 };
 
 const searchTest = async () => {
-  const [searchButton] = await waitForXPath('//a[contains(@href, "?q=")]');
+  const [searchButton] = await waitForXPath('.//*[@id="mobile-search-expand"]');
   console.log('\nClicking search input');
   await searchButton.click();
   // sleep is required here on mobile to account for the click delay

src/components/HomepageBanner.js

@@ -78,7 +78,9 @@ const HomepageBanner = () => {
             searchTerm,
             searchLocation: 'homepage',
           });
-          navigate(`?q=${searchTerm || ''}`);
+          if (searchTerm !== '') {
+            navigate(`search-results/?query=${searchTerm}&page=1`);
+          }
         }}
         css={css`
           max-width: 880px;
@@ -116,19 +118,19 @@ const HomepageBanner = () => {
         `}
       >
         <p>{t('strings.home.search.popularSearches.title')}: </p>
-        <Link to="?q=nrql">
+        <Link to="/search-results/?query=nrql&page=1">
           {t('strings.home.search.popularSearches.options.0')},
         </Link>
-        <Link to="?q=logs">
+        <Link to="/search-results/?query=logs&page=1">
           {t('strings.home.search.popularSearches.options.1')},
         </Link>
-        <Link to="?q=alert">
+        <Link to="/search-results/?query=alert&page=1">
           {t('strings.home.search.popularSearches.options.2')},
         </Link>
-        <Link to="?q=best practices">
+        <Link to="/search-results/?query=best practices&page=1">
           {t('strings.home.search.popularSearches.options.3')},
         </Link>
-        <Link to="?q=kubernetes">
+        <Link to="/search-results/?query=kubernetes&page=1">
           {t('strings.home.search.popularSearches.options.4')}
         </Link>
       </div>

src/components/Navigation.js

@@ -32,7 +32,7 @@ const Navigation = ({ nav, className }) => {
       css={css`
         height: 100%;
         overflow: auto;
-        margin: 16px 0;
+        margin: 0 0 16px;
         -ms-overflow-style: none;
         scrollbar-width: none;
         &::-webkit-scrollbar {

src/content/docs/accounts/accounts-billing/new-relic-one-pricing-billing/add-on-billing.mdx

@@ -6,16 +6,18 @@ tags:
   - New Relic pricing and billing
 
 metaDescription: "Add-ons are an optional billing factor"
-freshnessValidatedDate: 2024-02-21
+freshnessValidatedDate: 2024-10-23
 ---
 
-In addition to the primary billing factors of ingest and billable users, you can also use optional billable add-ons to enhance your experience with New Relic:
+In addition to the primary billing factors of GB Ingested and billable users, you can also use optional billable add-ons to extend your experience with New Relic. 
 
-* <DNT>**Compute Add On**</DNT>: This add-on applies to usage-based billing for queries you run against interactive application security testing, live archives, and other add-ons as made available. It measures your usage based on [Compute Capacity Units (CCUs)](/docs/licenses/license-information/product-definitions/new-relic-one-pricing-definitions#compute-capacity-unit).
-* <DNT>**EU Data Center for New Relic - Data, and New Relic - Data Plus**</DNT>: This add-on applies when you select the European Union as your data region, as available.
-* <DNT>**Extended Retention for New Relic - Data, and New Relic - Data Plus**</DNT>: This add-on applies if you exceed the default length of time your data is retained. This applies to all your data—not just logs—and is a good option if you need to make a lot of small queries or make queries on large volumes of data.
-* <DNT>**Live Archives**</DNT>: Extend your log storage duration by at least 90 days more than standard retention. This add-on is best if you need to keep logs that you'll query infrequently. Live archives also requires Compute Add On.
-* <DNT>**New Relic Synthetic Checks**</DNT>: This add-on applies if your Checks exceed the default number of synthetic monitor checks.
-* <DNT>**Vulnerability Management**</DNT>: This feature is included with Data Plus, but the add-on applies if you use the Vulnerability Management feature without Data Plus.
+* **Advanced Compute (formerly Add-on Compute)**: This add-on applies to usage-based billing for actions you run related to Codestream, Live Archives, and other features as made available. You are measured and billed based on your usage of [Advanced CCUs](/docs/licenses/license-information/product-definitions/new-relic-one-pricing-definitions/#compute-capacity-unit).
 
-To get started with any of these optional add-ons, get in touch with your New Relic account team.
+  <Callout variant="tip"> 
+    Your use of CodeStream under Advanced Compute will incur CCU charges, regardless of user type. This means that even free Basic users can now access CodeStream at a very low monthly cost of just the Advanced CCUs.
+</Callout>
+* **EU Data Center for Original Data or Data Plus**: This add-on applies to your data option (original Data or Data Plus) when you select the European Union as your data region, as available.
+* **Extended Retention for Original Data or Data Plus**: This add-on applies if you exceed the default length of time your data is retained. This applies to all your data—not just logs—and is a good option if you need to make a lot of small queries or make queries on large volumes of data.
+* **Live Archives**: Extend your log storage duration up to seven years. Live Archives also requires Advanced Compute.
+* **New Relic Synthetic Checks**: This add-on applies if your Checks exceed the default number of synthetic monitor checks.
+* **Vulnerability Management**: This feature is included with Data Plus, but the add-on applies if you use the Vulnerability Management feature without Data Plus.

src/content/docs/accounts/accounts-billing/new-relic-one-pricing-billing/data-ingest-billing.mdx

@@ -1,13 +1,13 @@
 ---
-title: "Data ingest: Billing and rules"
+title: "Data: Billing and rules"
 tags:
   - Accounts
   - Accounts and billing
   - New Relic pricing and billing
 translate:
   - jp
 metaDescription: "For New Relic pricing, an explanation of how data ingest is calculated for billing purposes."
-freshnessValidatedDate: never
+freshnessValidatedDate: 2024-10-23
 ---
 
 For New Relic pricing, the data ingested by your New Relic organization is one billing factor.
@@ -70,32 +70,32 @@ Here's a table with comparisons of the two options. Prices and limits are monthl
 
     <tr>
       <td>
-        Data ingest free limit
+        Data free limit
       </td>
 
       <td>
-        100 GB
+        100 GB Ingested
       </td>
 
       <td>
-        100 GB
+        100 GB Ingested
       </td>
 
       <td/>
     </tr>
 
     <tr>
       <td>
-        Data ingest price <br/>
+        Data price <br/>
         (beyond free limit)
       </td>
 
       <td>
-        $0.35/GB
+        $0.35/GB Ingested
       </td>
 
       <td>
-        $0.55/GB
+        $0.55/GB Ingested
       </td>
 
       <td/>
@@ -340,16 +340,16 @@ With the [Azure Native New Relic Service](/docs/infrastructure/microsoft-azure-i
 
 To upgrade to Data Plus, go to the [<DNT>**Data retention**</DNT> UI](/docs/data-apis/manage-data/manage-data-retention/#adjust-retention) in the data management hub and click <DNT>**Upgrade retention**</DNT>.
 
-* Note: You may see an <DNT>**Edit data retention**</DNT> button, but that is different that the <DNT>**Upgrade retention**</DNT> button.
+* Note: You may see an <DNT>**Edit data retention**</DNT> button, but that is different than the <DNT>**Upgrade retention**</DNT> button.
 * To see the <DNT>**Upgrade retention**</DNT> button, you need to have [Billing permissions](/docs/accounts/accounts-billing/new-relic-one-user-management/user-management-concepts/#admin-settings). If you meet the requirements and still don't see the <DNT>**Upgrade retention**</DNT> option, talk to your New Relic account representative.
 
-## What counts as billable ingested data? [#usage-calculation]
+## What counts as billable GB Ingested? [#usage-calculation]
 
 In the context of the [New Relic pricing plan](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing), "ingested data" refers to the data saved to New Relic by your organization after we apply various data trimming and data transformation rules. In other words, it's not the amount of raw data sent to New Relic, but the size of the data that actually ends up being stored.
 
-In general, data that we generate to provide our features doesn't count towards your ingest. Examples of features and feature-related data that don't count towards ingest include:
+In general, data that we generate to provide our features doesn't count towards your GB Ingested. Examples of features and feature-related data that don't count towards GB Ingested include:
 
-* [Basic alerting functionality](/docs/alerts-applied-intelligence/new-relic-alerts/learn-alerts/alerts-concepts-workflow). For example, `NrAiIncident`, an event used to generate these features, doesn't count towards ingest.
+* [Basic alerting functionality](/docs/alerts-applied-intelligence/new-relic-alerts/learn-alerts/alerts-concepts-workflow). For example, `NrAiIncident`, an event used to generate these features, doesn't count towards GB Ingested.
 * Data created by aggregated raw data (for example, [aggregated infrastructure data](/docs/data-apis/manage-data/manage-data-retention/#infrastructure-data) or [dimensional metric data](/data-apis/manage-data/manage-data-retention/#dimensional-metrics)).
 * [Golden metrics](/docs/apis/nerdgraph/examples/golden-metrics-entities-nerdgraph-api-tutorial) (for more on golden metrics, see our [entity definitions](https://github.com/newrelic/entity-definitions)).
 * Synthetic monitor checks. For details on synthetics billing, see [Synthetics limits and pricing](/docs/synthetics/synthetic-monitoring/using-monitors/monitor-limits).
@@ -361,14 +361,13 @@ To understand your usage, see the [usage UI](/docs/accounts/accounts-billing/new
 ## Other calculation details [#calculation-details]
 
 * In the context of our pricing model, a GB is defined as 1 billion bytes.
-* Monthly data ingested is rounded down to the nearest integer. For example, if your organization uses 100.9 GBs during a month, that's counted as 100 GBs.
+* Monthly GB Ingested is rounded down to the nearest integer. For example, if your organization uses 100.9 GBs during a month, that's counted as 100 GBs.
 
 ## Free edition [#free-tier-limits]
 
-For details about data ingest for our Free edition, see [Free edition](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing/#free).
+For details about GB Ingested for our Free edition, see [Free edition](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing/#free).
 
 ## Learn more [#related-docs]
 
-* For more on how to manage ingest, see [Manage data ingest](/docs/data-apis/manage-data/manage-data-coming-new-relic).
-* For how to estimate data ingest, see [Data ingest estimator](https://newrelic.com/blog/nerdlog/estimate-data-cost).
+* For more on how to manage GB Ingested, see [Manage data ingest](/docs/data-apis/manage-data/manage-data-coming-new-relic).
 * For how to query usage, see [Query and alert on usage](/docs/accounts/accounts-billing/new-relic-one-pricing-billing/usage-queries-alerts).