Skip to content

Commit

Permalink
Merge branch 'develop' into sunny/refactor-verify-mdx
Browse files Browse the repository at this point in the history
  • Loading branch information
clarkmcadoo authored Nov 6, 2024
2 parents 9575663 + bd82264 commit a6902ca
Show file tree
Hide file tree
Showing 928 changed files with 36,490 additions and 28,893 deletions.
2 changes: 1 addition & 1 deletion gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ module.exports = {
resolve: 'gatsby-remark-images',
options: {
maxWidth: 850,
linkImagesToOriginal: false,
linkImagesToOriginal: true,
backgroundColor: 'transparent',
disableBgImageOnAlpha: true,
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.6",
"@splitsoftware/splitio-react": "^1.2.4",
"ansi-colors": "^4.1.3",
"cockatiel": "^3.0.0-beta.0",
Expand Down
4 changes: 3 additions & 1 deletion scripts/actions/webdriver-desktop.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
5 changes: 3 additions & 2 deletions scripts/actions/webdriver-mobile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions scripts/releaseNotes.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ const INCLUDE_AGENTS = new Set([
'infrastructure',
'ios',
'java',
'kubernetes',
'node',
'nodejs',
'php',
Expand Down Expand Up @@ -137,9 +138,8 @@ const validateReleaseNotesAgents = (releaseNotes) => {
const errors = [];

JSON_AGENTS.forEach((agent) => {
const agentsCount = releaseNotes.filter(
(note) => note.agent === agent
).length;
const agentsCount = releaseNotes.filter((note) => note.agent === agent)
.length;
if (agentsCount < 1) {
const message = `\n😵 No release notes found for ${agent}`;
errors.push(message);
Expand Down
90 changes: 6 additions & 84 deletions src/components/HomepageBanner.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
import React, { useState } from 'react';
import { navigate } from '@reach/router';
import React from 'react';

import { css } from '@emotion/react';
import {
Link,
SearchInput,
useTranslation,
addPageAction,
} from '@newrelic/gatsby-theme-newrelic';
import { useTranslation } from '@newrelic/gatsby-theme-newrelic';
import bannerBackground from 'images/bannerBackground.svg';

const HomepageBanner = () => {
const bannerHeight = '250px';
const bannerHeight = '200px';
const mobileBreakpoint = '450px';
const { t } = useTranslation();
const [searchTerm, setSearchTerm] = useState('');

return (
<section
Expand All @@ -26,30 +19,28 @@ const HomepageBanner = () => {
background-size: cover;
background-position: center;
display: flex;
flex-direction: column;
align-items: center;
min-height: ${bannerHeight};
justify-content: center;
@media screen and (max-width: 550px) {
justify-content: center;
background-size: 150%;
background-position: center 20px;
}
@media screen and (max-width: ${mobileBreakpoint}) {
min-height: 200px;
background-size: 200%;
background-position: center 8px;
}
`}
>
<h1
css={css`
font-size: 2.5rem;
font-size: 3rem;
font-weight: 500;
color: #1ce783;
padding-top: 3rem;
margin-bottom: 1.5rem;
text-align: center;
margin: 0 20px;
line-height: 1;
@media screen and (max-width: 550px) {
Expand All @@ -63,75 +54,6 @@ const HomepageBanner = () => {
>
{t('strings.home.pageTitle')}
</h1>
<SearchInput
placeholder={t('strings.home.search.placeholder')}
size={SearchInput.SIZE.MEDIUM}
value={searchTerm || ''}
iconName={SearchInput.ICONS.SEARCH}
isIconClickable
alignIcon={SearchInput.ICON_ALIGNMENT.RIGHT}
onChange={(e) => setSearchTerm(e.target.value)}
onSubmit={() => {
addPageAction({
eventName: 'swiftypeSearchInput',
category: 'SearchInput',
searchTerm,
searchLocation: 'homepage',
});
navigate(`?q=${searchTerm || ''}`);
}}
css={css`
max-width: 880px;
width: 80%;
svg {
color: var(--primary-text-color);
}
`}
/>
<div
css={css`
margin-top: 0.75rem;
width: 40%;
color: white;
display: flex;
align-items: baseline;
justify-content: center;
width: 100%;
flex-wrap: wrap;
font-weight: 500;
font-size: 1rem;
a {
margin-left: 0.25rem;
&:hover {
color: var(--brand-button-primary-accent);
}
}
@media screen and (max-width: 550px) {
font-size: 0.75rem;
}
@media screen and (max-width: ${mobileBreakpoint}) {
display: none;
}
`}
>
<p>{t('strings.home.search.popularSearches.title')}: </p>
<Link to="?q=nrql">
{t('strings.home.search.popularSearches.options.0')},
</Link>
<Link to="?q=logs">
{t('strings.home.search.popularSearches.options.1')},
</Link>
<Link to="?q=alert">
{t('strings.home.search.popularSearches.options.2')},
</Link>
<Link to="?q=best practices">
{t('strings.home.search.popularSearches.options.3')},
</Link>
<Link to="?q=kubernetes">
{t('strings.home.search.popularSearches.options.4')}
</Link>
</div>
</section>
);
};
Expand Down
62 changes: 37 additions & 25 deletions src/components/MDXContainer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {
ExternalLink,
Link,
Lightbox,
MDXLink,
MDX,
MarkdownContainer,
Expand Down Expand Up @@ -53,30 +52,43 @@ const defaultComponents = {
}
/>
) : (
<Lightbox>
<img
width={props.width ? props.width : 'auto'}
src={props.src}
// this prevents images from stretching if the width is set to a percent value
className={cx(props.className, props.width && 'unbound')}
alt={props.alt ? props.alt : 'Docs site'}
title={props.title}
style={
props.style
? {
...props.style,
borderRadius: '0.25rem',
maxWidth: '100%',
margin: '0 0.25rem',
}
: {
borderRadius: '0.25rem',
maxWidth: '100%',
margin: '0 0.25rem',
}
}
/>
</Lightbox>
<span
style={{
position: 'relative',
display: 'block',
textAlign: 'center',
margin: '1em 0',
}}
>
<a
href={props.src}
target="_blank"
rel="noreferrer"
style={{ display: 'inline-block' }}
>
<img
width={props.width ? props.width : 'auto'}
src={props.src}
alt={props.alt ? props.alt : 'Docs site'}
title={props.title}
style={
props.style
? {
...props.style,
borderRadius: '0.25rem',
maxWidth: '100%',
margin: '0 0.25rem',
}
: {
borderRadius: '0.25rem',
maxWidth: '100%',
margin: '0 0.25rem',
}
}
loading="lazy"
/>
</a>
</span>
),
DocTile: (props) => (
<DocTile
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ Before trying to delete your organization, please confirm the following:
* Your organization only has one account. If your organization has more than one account:
1. Cancel additional accounts using our [Nerdgraph API](/docs/apis/nerdgraph/examples/manage-accounts-nerdgraph) (see [Cancel an account](#cancel-account)).
2. After you've cancelled all but one account, contact [New Relic support](/docs/using-new-relic/welcome-new-relic/get-started/find-help-use-support-portal) to remove any cancelled accounts.
* Your organization only has one authentication domain. If your organization has more than one authentication domain, contact [New Relic support](/docs/using-new-relic/welcome-new-relic/get-started/find-help-use-support-portal) so we can help you close your organization.
* Your organization only has one authentication domain.
* If you've created additional authentication domains and want to delete them, you must remove users from domains first and then delete the domain [directly in the UI](https://forum.newrelic.com/s/hubtopic/aAXPh0000006Wd7OAE/delete-authentication-domains) or [with Nerdgraph](https://forum.newrelic.com/s/hubtopic/aAXPh000000664LOAQ/api-endpoint-to-delete-authentication-domains).
* Your organization only has one user. If you have more than one user, you can delete users via the [User management UI](/docs/accounts/accounts-billing/new-relic-one-user-management/user-management-ui-and-tasks/#delete-users) or via [Nerdgraph](/docs/apis/nerdgraph/examples/nerdgraph-manage-users/#delete-users).
* Your organization is on our newer pricing model.
* If you're not sure which model you're on, see [Pricing models](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-pricing-models/#determine-pricing) for how to determine that.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Loading

0 comments on commit a6902ca

Please sign in to comment.