Skip to content

Commit

Permalink
Merged main into main-es
Browse files Browse the repository at this point in the history
  • Loading branch information
svc-docs-eng-opensource-bot authored Oct 24, 2024
2 parents 1f5fed0 + 27ed5c6 commit 6501248
Show file tree
Hide file tree
Showing 37 changed files with 899 additions and 754 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
4 changes: 2 additions & 2 deletions 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.10.3",
"@newrelic/gatsby-theme-newrelic": "9.10.5",
"@splitsoftware/splitio-react": "^1.2.4",
"ansi-colors": "^4.1.3",
"cockatiel": "^3.0.0-beta.0",
Expand Down Expand Up @@ -237,4 +237,4 @@
"bugs": {
"url": "https://github.com/newrelic/docs-website/issues"
}
}
}
92 changes: 6 additions & 86 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,77 +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',
});
if (searchTerm !== '') {
navigate(`search-results/?query=${searchTerm}&page=1`);
}
}}
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="/search-results/?query=nrql&page=1">
{t('strings.home.search.popularSearches.options.0')},
</Link>
<Link to="/search-results/?query=logs&page=1">
{t('strings.home.search.popularSearches.options.1')},
</Link>
<Link to="/search-results/?query=alert&page=1">
{t('strings.home.search.popularSearches.options.2')},
</Link>
<Link to="/search-results/?query=best practices&page=1">
{t('strings.home.search.popularSearches.options.3')},
</Link>
<Link to="/search-results/?query=kubernetes&page=1">
{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
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.
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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/>
Expand Down Expand Up @@ -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).
Expand All @@ -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).
Loading

0 comments on commit 6501248

Please sign in to comment.