Skip to content

Commit

Permalink
chore: merge 'develop' into translations-bf203ed
Browse files Browse the repository at this point in the history
  • Loading branch information
@MoonlightKomorebi
MoonlightKomorebi committed Nov 1, 2021
2 parents bf203ed + 00d1dc4 commit cd8e067
Show file tree
Hide file tree
Showing 1,547 changed files with 8,431 additions and 12,714 deletions.
1 change: 1 addition & 0 deletions .github/workflows/auto-comment.yml
View file
Expand Up @@ -10,6 +10,7 @@ jobs:
pullRequestOpened: |
Hi @{{ author }} 👋
Thanks for your pull request! Your PR is in a queue, and a writer will take a look soon. We generally publish small edits within one business day, and larger edits within three days.
Gatsby Cloud will automatically generate a preview of your request, and will comment with a link when the preview is ready (usually 20 to 30 minutes).
issuesOpened: |
Hi @{{ author }} 👋
Expand Down
35 changes: 13 additions & 22 deletions gatsby-node.js
View file
Expand Up @@ -79,9 +79,6 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
filter: { fileAbsolutePath: { regex: "/src/content/whats-new/" } }
) {
nodes {
frontmatter {
isFeatured
}
fields {
slug
}
Expand Down Expand Up @@ -266,14 +263,9 @@ exports.createPages = async ({ actions, graphql, reporter }) => {

whatsNewPosts.nodes.forEach((node) => {
const {
frontmatter: { isFeatured },
fields: { slug },
} = node;

if (!isFeatured) {
node.frontmatter.isFeatured = false;
}

createLocalizedRedirect({
locales,
fromPath: slug.replace(/\/\d{4}\/\d{2}/, ''),
Expand All @@ -296,24 +288,17 @@ exports.createSchemaCustomization = ({ actions }) => {
pages: [NavYaml!]!
rootNav: Boolean!
}
type MarkdownRemark implements Node {
frontmatter: Frontmatter
}
type Frontmatter {
isFeatured: Boolean
}
`;

createTypes(typeDefs);
};

exports.createSchemaCustomization = ({ actions }) => {
const { createTypes } = actions;
const typeDefs = `
type MarkdownRemark implements Node {
frontmatter: Frontmatter
}
type Frontmatter {
isFeatured: Boolean
}
`;
createTypes(typeDefs);
};

exports.createResolvers = ({ createResolvers }) => {
createResolvers({
NavYaml: {
Expand All @@ -328,7 +313,13 @@ exports.createResolvers = ({ createResolvers }) => {
},
rootNav: {
resolve: (source) =>
hasOwnProperty(source, 'rootNav') ? source.rootNav : true,
hasOwnProperty(source, 'rootNav') ? source.rootNav : false,
},
},
Frontmatter: {
isFeatured: {
resolve: (source) =>
hasOwnProperty(source, 'isFeatured') ? source.isFeatured : false,
},
},
});
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Expand Up @@ -9,7 +9,7 @@
"@github-docs/frontmatter": "^1.3.1",
"@mdx-js/mdx": "^2.0.0-next.8",
"@mdx-js/react": "^2.0.0-next.8",
"@newrelic/gatsby-theme-newrelic": "^3.2.0",
"@newrelic/gatsby-theme-newrelic": "^3.3.0",
"@splitsoftware/splitio-react": "^1.2.4",
"babel-jest": "^26.3.0",
"common-tags": "^1.8.0",
Expand All @@ -24,7 +24,7 @@
"gatsby-plugin-meta-redirect": "^1.1.1",
"gatsby-plugin-offline": "^4.8.0",
"gatsby-plugin-react-helmet": "^4.8.0",
"gatsby-plugin-sharp": "^3.8.0",
"gatsby-plugin-sharp": "^3.14.1",
"gatsby-remark-autolink-headers": "^4.5.0",
"gatsby-remark-copy-linked-files": "^4.5.0",
"gatsby-remark-images": "^5.5.0",
Expand Down
46 changes: 14 additions & 32 deletions plugins/gatsby-source-nav/gatsby-node.js
View file
Expand Up @@ -101,23 +101,22 @@ exports.onCreatePage = ({ page, actions }) => {
}
};

const createRootNav = async ({ createNodeId, nodeModel }) => {
const nav = await nodeModel.runQuery({
type: 'NavYaml',
query: {
filter: {
rootNav: { eq: true },
},
sort: {
fields: ['title'],
order: ['ASC'],
},
},
});
const createRootNav = async ({ args, createNodeId, nodeModel }) => {
const { slug } = args;

const rootNavYamlNode = nodeModel
.getAllNodes({ type: 'NavYaml' })
.filter((node) => node.rootNav);

const nav = rootNavYamlNode.find((nav) => findPage(nav, slug));

if (!nav) {
return null;
}

return {
...nav,
id: createNodeId('root'),
pages: nav.map((item) => ({ ...item, pages: [] })),
};
};

Expand Down Expand Up @@ -257,26 +256,9 @@ const createNav = async ({ args, createNodeId, nodeModel, locales }) => {
.replace(/\/table-of-contents$/, '')
.replace(new RegExp(`^\\/(${locales.join('|')})(?=\\/)`), '');

const fileNode = await nodeModel.runQuery({
type: 'File',
query: {
filter: {
sourceInstanceName: { eq: 'markdown-pages' },
relativePath: { regex: '/docs/' },
childMdx: {
fields: {
slug: {
eq: slug,
},
},
},
},
firstOnly: true,
},
});

const allNavYamlNodes = nodeModel
.getAllNodes({ type: 'NavYaml' })
.filter((node) => !node.rootNav)
.sort((a, b) => a.title.localeCompare(b.title));

let nav =
Expand Down
19 changes: 6 additions & 13 deletions src/components/RootNavigation.js
View file
Expand Up @@ -3,21 +3,14 @@ import PropTypes from 'prop-types';
import { NavItem } from '@newrelic/gatsby-theme-newrelic';

const RootNavigation = ({ nav }) => {
const pages = nav.pages;

return (
<nav role="navigation" aria-label="Navigation">
{pages.map((page) => (
<NavItem key={page.title} page={page} />
))}
<NavItem page={{ title: 'Release notes', url: '/docs/release-notes' }} />
<NavItem page={{ title: "What's new", url: '/whats-new' }} />
<NavItem
page={{
title: 'See our 370+ integrations',
url: 'https://newrelic.com/integrations',
}}
/>
{nav.pages.map((page) => {
if (page.title === 'section-break') {
return <hr />;
}
return <NavItem key={page.title} page={page} />;
})}
</nav>
);
};
Expand Down
2 changes: 1 addition & 1 deletion .../docs/accounts/accounts-billing/account-setup/create-your-new-relic-account.mdx
View file
Expand Up @@ -38,7 +38,7 @@ As just one example of what you can do with New Relic, imagine you are a Kuberne
Learn more:
* [See pricing details](https://newrelic.com/pricing)
* [Learn what New Relic does](https://docs.newrelic.com/docs/using-new-relic/welcome-new-relic/get-started/introduction-new-relic#get-started-now)
* [Browse our solutions](https://newrelic.com/integrations)
* [Browse our solutions](https://newrelic.com/instant-observability/)

### Next steps [#next-steps]

Expand Down
2 changes: 1 addition & 1 deletion ...ontent/docs/accounts/accounts-billing/account-setup/downgradecancel-account.mdx
View file
Expand Up @@ -25,7 +25,7 @@ To uninstall agents or integrations, here are some recommended procedures:

* [Remove APM, browser, and mobile apps](/docs/apm/new-relic-apm/maintenance/remove-applications-new-relic/)
* [Remove infrastructure agent](/docs/infrastructure/install-infrastructure-agent/update-or-uninstall/uninstall-infrastructure-agent/)
* For how to disable other New Relic tools, see their specific docs. You can [search New Relic integrations here](https://newrelic.com/integrations).
* For how to disable other New Relic tools, see their specific docs. You can [search New Relic quickstarts here](https://newrelic.com/instant-observability/).

## Downgrade organization [#downgrading]

Expand Down
25 changes: 0 additions & 25 deletions ...ccounts-billing/new-relic-one-pricing-billing/new-relic-one-pricing-billing.mdx
View file
Expand Up @@ -28,7 +28,6 @@ For New Relic One pricing, billing is based on these factors:
* The amount of data [ingested](/docs/telemetry-data-platform/get-started/introduction-new-relic-data-ingest-apis-sdks/). 100 GBs per month is free. $0.25 per GB ingested above that.
* The number of provisioned [full users](/docs/accounts/accounts-billing/new-relic-one-pricing-users/users-roles#user-type), who have access to our [more curated UI experiences](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-capabilities). [Basic users](/docs/accounts/accounts-billing/new-relic-one-pricing-users/users-roles#user-type) are free.
* The cost of each full user depends on your edition: [Standard, Pro, or Enterprise](https://newrelic.com/pricing). Standard edition includes one full user for free, and a max of five. Pro and Enterprise give access to more account and user management features, more support, longer data retention, and [other features](https://newrelic.com/pricing).
* For [Applied Intelligence](https://newrelic.com/pricing), our intelligent alert/detection system: the number of incident events above the free 1000 per month. (Note that our alerting functionality is available for free and doesn't count towards this limit.)

For a summary of what's included for free, see [Free edition](#free).

Expand Down Expand Up @@ -61,29 +60,6 @@ For accounts on New Relic One pricing, some high-level billing information is di
For more on how data is ingested, see [Manage data ingest](/docs/telemetry-data-platform/get-data-new-relic/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-users/usage-queries-alerts).
</Collapser>

<Collapser
id="incident-events"
title="Incident Intelligence events"
>
One billing factor is how many [incident events](/docs/licenses/license-information/product-definitions/new-relic-one-pricing-definitions/#incident-event) your organization sends to [Incident Intelligence](/docs/alerts-applied-intelligence/applied-intelligence/incident-intelligence/get-started-incident-intelligence) for correlation and analysis.

If your organization is on [New Relic One pricing](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-changes-pricing-user-model/#pricing-plans), Incident Intelligence comes with a certain number of free incident events per month. (Our [original pricing plan](/docs/accounts/original-accounts-billing/original-product-based-pricing/overview-changes-pricing-user-model/#pricing-plans) doesn't have a free tier.)

You can track usage and cost in two places in the UI:

* In the [usage UI](/docs/accounts/accounts-billing/general-account-settings/introduction-account-settings/#new-relic-one-pricing)
* From the Incident Intelligence system settings UI page: From [one.newrelic.com](https://one.newrelic.com), click **Alerts & AI**, then click **Incident Intelligence**, and then click **System settings**.

### Determine event source [#determine-source]

When you set up Incident Intelligence [data sources](/docs/alerts-applied-intelligence/applied-intelligence/incident-intelligence/get-started-incident-intelligence/#1-configure-sources), the incident events ingested by those sources are what count towards your total. To see the sources affecting your billing, go to the **Sources** page: From [one.newrelic.com](https://one.newrelic.com), click **Alerts & AI**, click **Incident Intelligence**, and then click **Sources**.

### Stop reporting events [#stop-events]

Go to the Incident Intelligence **Sources** UI page and disconnect all the sources you don’t want. If all sources are removed, no data is sent to Incident Intelligence.

</Collapser>

<Collapser
Expand Down Expand Up @@ -149,7 +125,6 @@ If your organization is on [New Relic One pricing](#how-pricing-works) and on th
* A single account (Pro and Enterprise editions can have multiple accounts per organization).
* Up to 100 GBs of ingested data per month.
* One [full user](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type), and unlimited [basic users](/docs/accounts/accounts-billing/new-relic-one-user-management/new-relic-one-user-model-understand-user-structure/#user-type).
* Access to alerts and [Applied Intelligence](https://newrelic.com/platform/applied-intelligence) (up to 1,000 Incident Intelligence events per month).

To upgrade to Pro or Enterprise, or to learn more about pricing, see [New Relic pricing](https://newrelic.com/pricing).

Expand Down
2 changes: 1 addition & 1 deletion ...ccounts/accounts-billing/new-relic-one-pricing-billing/usage-queries-alerts.mdx
View file
Expand Up @@ -252,7 +252,7 @@ Below are some of the important attributes attached to [usage events](#data-type
</td>

<td>
The category of usage. There are four options: `DataPlatform`, `FullStackObservability`, `IncidentIntelligence`, or `ProactiveDetection`. For more details about these categories, see [New Relic platform](https://newrelic.com/platform).
The category of usage. There are three options: `DataPlatform`, `FullStackObservability`, and `ProactiveDetection`. (Starting November 1, 2021, `IncidentIntelligence` is no longer a billing factor). For more details about these categories, see [New Relic platform](https://newrelic.com/platform).
</td>
</tr>

Expand Down

0 comments on commit cd8e067

Please sign in to comment.