Skip to content

Commit

Permalink
Merge branch 'develop' into homelessbirds-patch-7
Browse files Browse the repository at this point in the history
  • Loading branch information
homelessbirds committed Apr 15, 2024
2 parents 96fa88b + e6a2270 commit 2be86b1
Show file tree
Hide file tree
Showing 2,540 changed files with 308,370 additions and 37,353 deletions.
33 changes: 0 additions & 33 deletions .github/workflows/attribute-dictionary-comment.yml

This file was deleted.

52 changes: 52 additions & 0 deletions .github/workflows/protected-file-comment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Protected file updates

on:
pull_request:
branches:
- develop

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
deny-protected-file-changes:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Prevent attribute dictionary file change
id: attribute-dictionary
uses: xalvarez/prevent-file-change-action@v1.5.1
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
pattern: .*attribute-dictionary\.json$
trustedAuthors: svc-docs-eng-opensource-bot

- name: Prevent ruby config file change
id: ruby-config
uses: xalvarez/prevent-file-change-action@v1.5.1
with:
githubToken: ${{ secrets.GITHUB_TOKEN }}
pattern: .*src/content/docs/apm/agents/ruby-agent/configuration/ruby-agent-configuration.mdx
trustedAuthors: newrelic-ruby-agent-bot,kaylareopelle,hannahramadan,tannalynn,fallwith

- name: Comment if JSON file is modified
if: ${{ failure() && steps.attribute-dictionary.outcome == 'failure' }}
uses: thollander/actions-comment-pull-request@v2
with:
message: |
> [!WARNING]
> `attribute-dictionary.json` is an autogenerated file.
>
> Changes to attribute dictionary should be made through the `attribute-dictionary` repo in GHE.
- name: Comment if ruby config file is modified
if: ${{ failure() && steps.ruby-config.outcome == 'failure' }}
uses: thollander/actions-comment-pull-request@v2
with:
message: |
> [!WARNING]
> `ruby-agent-configuration.mdx` is an autogenerated file.
>
> To change the Ruby agent configuration file, please submit an issue or open a PR in the [`newrelic/newrelic-ruby-agent`](https://github.com/newrelic/newrelic-ruby-agent) repo.
1 change: 1 addition & 0 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ module.exports = {
'md',
'java',
'razor',
'hcl'
],
},
newrelic: {
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.4.3",
"@newrelic/gatsby-theme-newrelic": "9.5.0",
"@splitsoftware/splitio-react": "^1.2.4",
"ansi-colors": "^4.1.3",
"cockatiel": "^3.0.0-beta.0",
Expand Down
10 changes: 7 additions & 3 deletions src/components/MachineTranslationCallout.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const MachineTranslationCallout = ({ englishHref }) => {
variant="important"
title=" "
css={css`
margin: 2em 0;
margin-bottom: 2em;
padding: 0.5em;
`}
>
Expand All @@ -40,8 +40,12 @@ const MachineTranslationCallout = ({ englishHref }) => {
}
`}
>
<Icon name="globe" size="2em" />
<div>
<Icon name="globe" size="3em" />
<div
css={css`
font-size: 0.875em;
`}
>
<h4>{t('machineTranslation.calloutHeading')}</h4>
<Trans i18nKey="machineTranslation.calloutBody" parent="p">
In the event of any inconsistency between the English version and
Expand Down
5 changes: 5 additions & 0 deletions src/components/PageTitle.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ const PageTitle = (props) => (
<h1
css={css`
grid-area: page-title;
&::before {
content: '';
display: block;
margin-top: -5px;
}
`}
{...props}
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Factors affecting your access to New Relic features or data
title: Troubleshoot access to features and data
tags:
- Accounts
- Accounts and billing
Expand Down Expand Up @@ -72,7 +72,7 @@ Other related docs:
* [Login and password troubleshooting](/docs/accounts/install-new-relic/account-setup/troubleshoot-password-email-address-login-problems)
* [Organization and account structure](/docs/accounts/accounts-billing/new-relic-one-pricing-users/account-user-structure)

## Error messages for lacking access [#entity-not-found]
## Error messages about feature access [#entity-not-found]

You might encounter an error screen in the New Relic UI for one of several reasons, including:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ In addition to the primary billing factors of ingest and billable users, you can
* <DoNotTranslate>**Compute Add On**</DoNotTranslate>: 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).
* <DoNotTranslate>**EU Data Center for New Relic - Data, and New Relic - Data Plus**</DoNotTranslate>: This add-on applies when you select the European Union as your data region, as available.
* <DoNotTranslate>**Extended Retention for New Relic - Data, and New Relic - Data Plus**</DoNotTranslate>: This add-on applies if you exceed the default length of time your data is retained. This applies to all your data&mdash;not just logs&mdash;and is a good option if you need to make a lot of small queries or make queries on large volumes of data.
* <DoNotTranslate>**Live Archives Storage**</DoNotTranslate>: 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.
* <DoNotTranslate>**Live Archives**</DoNotTranslate>: 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.
* <DoNotTranslate>**New Relic Synthetic Checks**</DoNotTranslate>: This add-on applies if your Checks exceed the default number of synthetic monitor checks.
* <DoNotTranslate>**Vulnerability Management**</DoNotTranslate>: This feature is included with Data Plus, but the add-on applies if you use the Vulnerability Management feature without Data Plus.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ Here's a table with comparisons of the two options. Prices and limits are monthl
All editions
</td>
<td>
Requires Pro or Enterprise
Requires Standard, Pro, or Enterprise

(We note below if a feature is specific to an edition)
</td>
<td>
</td>
Expand Down Expand Up @@ -218,11 +220,8 @@ Here's a table with comparisons of the two options. Prices and limits are monthl
+$0.10/GB <br/>
(beyond free limit)
</td>
<td style="text-align:center">
<Icon
style={{color: '#328787'}}
name="fe-check"
/>
<td>
Standard, Pro, and Enterprise
</td>
<td>
Identify vulnerabilities and address risks at every stage of the software lifecycle.
Expand All @@ -231,8 +230,8 @@ Here's a table with comparisons of the two options. Prices and limits are monthl

<tr>
<td>
[FedRAMP Moderate](/docs/security/security-privacy/compliance/fedramp-compliant-endpoints) and [HIPAA](/docs/security/security-privacy/compliance/hipaa-readiness-new-relic) eligibility <br/>
(Enterprise edition only)
[FedRAMP Moderate](/docs/security/security-privacy/compliance/fedramp-compliant-endpoints) and [HIPAA](/docs/security/security-privacy/compliance/hipaa-readiness-new-relic) eligibility

</td>

<td style="text-align:center">
Expand All @@ -241,11 +240,8 @@ Here's a table with comparisons of the two options. Prices and limits are monthl
name="fe-x-circle"
/>
</td>
<td style="text-align:center">
<Icon
style={{color: '#328787'}}
name="fe-check"
/>
<td>
Enterprise
</td>
<td>
Achieve security compliance through configurations that help you meet your FedRAMP and HIPAA requirements.
Expand All @@ -263,11 +259,8 @@ Here's a table with comparisons of the two options. Prices and limits are monthl
name="fe-x-circle"
/>
</td>
<td style="text-align:center">
<Icon
style={{color: '#328787'}}
name="fe-check"
/>
<td>
Standard, Pro, and Enterprise
</td>
<td>
Configure rules to simultaneously export telemetry data to your AWS or Azure storage of choice. Additional export fees to the cloud provider will apply.
Expand All @@ -278,18 +271,14 @@ Here's a table with comparisons of the two options. Prices and limits are monthl
<td>
[Historical data export](/docs/apis/nerdgraph/examples/nerdgraph-historical-data-export)
</td>

<td style="text-align:center">
<Icon
style={{color: '#328787'}}
name="fe-x-circle"
/>
</td>
<td style="text-align:center">
<Icon
style={{color: '#328787'}}
name="fe-check"
/>
<td>
Standard, Pro, and Enterprise
</td>
<td>
Run larger queries with no timeout for historical analysis and modeling, long-term storage, and integration with other data analytics platforms.
Expand All @@ -306,11 +295,8 @@ Here's a table with comparisons of the two options. Prices and limits are monthl
name="fe-x-circle"
/>
</td>
<td style="text-align:center">
<Icon
style={{color: '#328787'}}
name="fe-check"
/> <br/>
<td>
Standard, Pro, and Enterprise <br/>
([with some limitations](#azure-native-data-plus))

</td>
Expand All @@ -336,7 +322,7 @@ With the [Azure Native New Relic Service](/docs/infrastructure/microsoft-azure-i

To upgrade to Data Plus, go to the [<DoNotTranslate>**Data retention**</DoNotTranslate> UI](/docs/data-apis/manage-data/manage-data-retention/#adjust-retention) in the data management hub and click <DoNotTranslate>**Upgrade retention**</DoNotTranslate>.
* Note: You may see an <DoNotTranslate>**Edit data retention**</DoNotTranslate> button, but that is different that the <DoNotTranslate>**Upgrade retention**</DoNotTranslate> button.
* Seeing the <DoNotTranslate>**Upgrade retention**</DoNotTranslate> button requires you to have [Billing permissions](/docs/accounts/accounts-billing/new-relic-one-user-management/user-management-concepts/#admin-settings). If you meet the requirements and don't see the <DoNotTranslate>**Upgrade retention**</DoNotTranslate> option, talk to your New Relic account representative.
* To see the <DoNotTranslate>**Upgrade retention**</DoNotTranslate> 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 <DoNotTranslate>**Upgrade retention**</DoNotTranslate> option, talk to your New Relic account representative.

## What counts as billable ingested data? [#usage-calculation]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ Ideas for checking that your users are configured correctly:
* Have some of your users see if they can log in and access the accounts they expect to see.

Ideas for next steps:
* [Set up more New Relic integrations](/docs/using-new-relic/welcome-new-relic/get-started/intro-new-relic#get-started-now)
* [Set up more New Relic integrations](/docs/using-new-relic/welcome-new-relic/get-started/intro-new-relic)
* Add more users

</Step>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ These permissions pertain to [<InlinePopover type="browser" />](/docs/browser/br
id="data-retention"
title="Data retention"
>
* <DoNotTranslate>**Insights event retention**</DoNotTranslate>: for users on our original user model, this governs managing [data retention](/docs/data-apis/manage-data/manage-data-retention). (For users on our newer user model, data retention requires the [<DoNotTranslate>**Billing**</DoNotTranslate> administration setting](/docs/accounts/accounts-billing/new-relic-one-user-management/user-management-concepts#admin-settings).)
* <DoNotTranslate>**Insights event retention**</DoNotTranslate>: This governs the ability to manage [data retention](/docs/data-apis/manage-data/manage-data-retention) values within the bounds of a contract for specific data namepsaces.

</Collapser>

Expand Down Expand Up @@ -291,6 +291,7 @@ These permissions pertain to [synthetics monitoring](/docs/synthetics/synthetic-
* <DoNotTranslate>**Configure private locations**</DoNotTranslate>: relates to [private locations](/docs/synthetics/synthetic-monitoring/private-locations/private-locations-overview-monitor-internal-sites-add-new-locations).
* <DoNotTranslate>**Monitor downtimes**</DoNotTranslate>: relates to [monitor downtimes](/docs/synthetics/synthetic-monitoring/using-monitors/monitor-downtimes-disable-monitoring-during-scheduled-maintenance-times).
* <DoNotTranslate>**Monitor scripts**</DoNotTranslate>: relates to [scripted monitors](/docs/synthetics/synthetic-monitoring/getting-started/types-synthetic-monitors) (scripted browser monitors and scripted API test monitors).
* <DoNotTranslate>**Monitors**</DoNotTranslate>: relates to ability to configure [synthetic monitors](/docs/synthetics/synthetic-monitoring/getting-started/types-synthetic-monitors) (for example, name, period, and locations). The bulk runtime upgrade permission allows you to make runtime changes using the [runtime upgrades UI](/docs/synthetics/synthetic-monitoring/using-monitors/runtime-upgrade-ui/).
* <DoNotTranslate>**Monitors**</DoNotTranslate>: relates to ability to configure [synthetic monitors](/docs/synthetics/synthetic-monitoring/getting-started/types-synthetic-monitors) (for example, name, period, locations).
* <DoNotTranslate>**Secure credentials**</DoNotTranslate>: relates to [secure credentials](/docs/synthetics/synthetic-monitoring/using-monitors/store-secure-credentials-scripted-browsers-api-tests).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ To use automated user management to import users from your identity provider:
3. If you use Azure AD, Okta, or OneLogin, use the applicable guide: [Azure AD](/docs/azure-scimsso-application-configuration) \| [Okta](/docs/okta-scimsso-application-configuration) \| [OneLogin](/docs/onelogin-scimsso-application-configuration).
4. If you <DoNotTranslate>**don't**</DoNotTranslate> use one of the above services, you'll need to:

* Use the authentication domain UI to [enable SCIM as the source of users](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#source-users).
* Use our [SCIM API](/docs/accounts/accounts/automated-user-management/scim-support-automated-user-management) to integrate with your identity provider service. See [the SCIM API tutorial](/docs/accounts/accounts/automated-user-management/tutorial-manage-users-groups-scim) for all the steps involved.
* Use the authentication domain UI to [enable SCIM as the source of users](/docs/accounts/accounts-billing/new-relic-one-user-management/authentication-domains-saml-sso-scim-more/#source-users).
* Use our [SCIM API](/docs/accounts/accounts/automated-user-management/scim-support-automated-user-management) to integrate with your identity provider service. See [the SCIM API tutorial](/docs/accounts/accounts/automated-user-management/tutorial-manage-users-groups-scim) for all the steps involved.

5. <DoNotTranslate>**Recommended**</DoNotTranslate>: Set a time zone in your identity provider. How this is done depends on the service you use. If you don't set a time zone, our UI uses UTC time zone (specified in IANA format, also known as the "Olson" format: for example, "America/Los_Angeles"). Your users also have an option to override your settings and [set their own time zone](/docs/accounts/accounts-billing/general-account-settings/default-time-zone-setting).

Expand Down
Loading

0 comments on commit 2be86b1

Please sign in to comment.