Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into aim-ga
Browse files Browse the repository at this point in the history
  • Loading branch information
akristen committed Mar 18, 2024
2 parents 4ebbfca + 3b41092 commit 78e7cc2
Show file tree
Hide file tree
Showing 231 changed files with 85,342 additions and 1,377 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-comment.yml
Expand Up @@ -12,7 +12,7 @@ jobs:
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).
We will automatically generate a preview of your request, and will comment with a link when the preview is ready (usually 10 to 20 minutes). If you add any more commits, you can comment `netlify build` on this PR to update the preview.
issuesOpened: |
Hi @{{ author }} 👋
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-notification.yml
Expand Up @@ -15,7 +15,7 @@ on:
options:
- building
- ready
- failed
- error
deployUrl:
description: URL of live branch deploy
required: false
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
END
)
;;
"failed")
"error")
comment_body=$(cat <<-END
### <span aria-hidden="true">❌</span> Deploy Preview failed!
Expand Down Expand Up @@ -92,8 +92,8 @@ jobs:
-f context='netlify/build' \
/repos/${{ env.repo }}/statuses/${{ inputs.sha }}
- name: update PR check - failed
if: ${{ inputs.buildStatus == 'failed' }}
- name: update PR check - error
if: ${{ inputs.buildStatus == 'error' }}
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
Expand Down
17 changes: 11 additions & 6 deletions .github/workflows/manual-deploy-comment.yml
Expand Up @@ -3,10 +3,20 @@ name: Netlify build manual deploy comment
on:
issue_comment:
types: [created]
pull_request:
types: [opened]

jobs:
deploy-preview:
# when a contributor comments 'netlify build',
# but only on pull requests, not issues.
# or if a contributor opens a PR for the first time.
if: |
(github.event.comment.body == 'netlify build'
&& github.event.issue.pull_request)
|| github.event.action == 'opened'
runs-on: ubuntu-latest

steps:
# we use `jq` to parse the GH API response
- name: setup jq
Expand All @@ -15,13 +25,8 @@ jobs:
- name: send request to Netlify build hook
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# when a contributor comments 'netlify build',
# but only on pull requests, not issues
if: |
contains(github.event.comment.body, 'netlify build')
&& ${{ github.event.issue.pull_request }}
run: |
gh_api_url=$(echo ${{ github.event.issue.pull_request.url }} | sed 's/https:\/\/api.github.com//')
gh_api_url=$(echo ${{ github.event.issue.pull_request.url || github.event.pull_request.url }} | sed 's/https:\/\/api.github.com//')
gh_api_response=$(gh api $gh_api_url)
branch_name=$(echo $gh_api_response | jq -r .head.ref)
sha=$(echo $gh_api_response | jq -r .head.sha)
Expand Down
10 changes: 6 additions & 4 deletions CONTRIBUTING.md
Expand Up @@ -105,8 +105,9 @@ If the workflows are enabled and running, you will want to disable them. You can
2. Make your changes.
3. Test your changes! Review the project's [READ ME](README.md) for instructions on how to build and run tests locally.
4. Submit a `Pull Request` to this project with your changes.
5. If/when your `PR` is accepted, the automation in this project will build the site and deploy a new version of the code to `docs.newrelic.com`.
6. And you are done!
5. A preview will start building automatically when a PR is opened. To update the preview after further commits, leave a comment on the PR that says `netlify build`.
6. If/when your `PR` is accepted, the automation in this project will build the site and deploy a new version of the code to `docs.newrelic.com`.
7. And you are done!

### Submitting a PR from a cloned repo

Expand All @@ -116,8 +117,9 @@ If the workflows are enabled and running, you will want to disable them. You can
3. Make your changes.
4. Test your changes! Review the project's [READ ME](README.md) for instructions on how to build and run tests locally.
5. Submit a `Pull Request` to this project with your changes.
6. If/when your `PR` is accepted, the automation in this project will build the site and deploy a new version of the code to `docs.newrelic.com`.
7. And you are done!
6. A preview will start building automatically when a PR is opened. To update the preview after further commits, leave a comment on the PR that says `netlify build`.
7. If/when your `PR` is accepted, the automation in this project will build the site and deploy a new version of the code to `docs.newrelic.com`.
8. And you are done!

### Using the `develop` branch

Expand Down
37 changes: 17 additions & 20 deletions src/@newrelic/gatsby-theme-newrelic/components/NavItem.js
Expand Up @@ -87,26 +87,18 @@ const NavItem = ({
--nav-link-padding: 1rem;
display: ${matchesSearch || !searchTerm ? 'block' : 'none'};
padding-left: ${parent == null ? '8px' : 'var(--nav-link-padding)'};
border-left: ${parent == null ? 'none' : 'solid #0D374A 2px'};
span {
font-weight: 700;
}
${depth > 0 &&
css`
span {
font-weight: 600;
}
`}
${depth > 1 &&
border-left: ${parent == null
? 'none'
: 'solid var(--system-background-hover-dark) 2px'};
${isExpanded &&
depth === 0 &&
css`
border-left: solid rgba(231, 246, 246, 0.1) 2px;
span {
font-weight: 500;
}
span,
svg {
color: white;
opacity: 1;
`}
a > div > span {
font-weight: 400;
}
${mobileBreakpoint &&
css`
Expand Down Expand Up @@ -138,7 +130,9 @@ const NavItem = ({
padding-left: ${root?.icon
? 'calc(var(--icon-size) + var(--icon-spacing))'
: 'var(--nav-link-padding)'};
&:hover {
background: var(--system-background-hover-dark);
}
${mobileBreakpoint &&
css`
@media screen and (max-width: ${mobileBreakpoint}) {
Expand All @@ -149,7 +143,10 @@ const NavItem = ({
`}
${isCurrentPage &&
css`
background: #0d374a;
background: var(--system-background-hover-dark);
span {
font-weight: 600;
}
`}
`}
>
Expand Down
1 change: 0 additions & 1 deletion src/@newrelic/gatsby-theme-newrelic/components/NavLink.js
Expand Up @@ -45,7 +45,6 @@ const NavLink = ({
margin: 0 calc(var(--nav-link-padding) * -1);
font-size: 0.875rem;
text-decoration: none;
border-radius: 0.25rem;
&:hover {
color: var(--secondary-text-color);
Expand Down
7 changes: 5 additions & 2 deletions src/components/Navigation.js
Expand Up @@ -38,7 +38,8 @@ const Navigation = ({ nav, className }) => {
}
span,
svg {
color: #afe2e3;
color: var(--system-text-primary-dark);
opacity: 0.8;
}
`}
id="nav"
Expand All @@ -54,9 +55,11 @@ const Navigation = ({ nav, className }) => {
<Flipped flipId={page.flipId} translate>
<p
css={css`
color: #1dcad3;
color: var(--system-text-primary-dark);
opacity: 0.8;
margin: 0;
font-size: 14px;
font-weight: 500;
margin-top: 1rem;
`}
>
Expand Down
Expand Up @@ -119,7 +119,7 @@ The `channels` query allows you to paginate through all of your channels per acc
actor {
account(id: YOUR_ACCOUNT_ID) {
aiNotifications {
channels(cursor: "") {
channels(cursor: "/8o0y2qiR54m6thkdgHgwg==:jZTXDFKbTkhKwvMx+CtsPVM=") {
nextCursor
entities {
id
Expand Down
Expand Up @@ -480,7 +480,7 @@ Use SqlClient from [System.Data.SqlClient](https://www.nuget.org/packages/System

<DoNotTranslate>**Microsoft.Data.SqlClient**</DoNotTranslate>
* Minimum supported version: 1.0.19239.1
* Verified compatible versions: 1.0.19239.1, 2.1.5, 3.1.1, 4.1.1, 5.0.1, 5.1.1
* Verified compatible versions: 1.0.19239.1, 2.1.5, 3.1.1, 4.1.1, 5.0.1, 5.1.1, 5.2.0
</td>
</tr>

Expand Down Expand Up @@ -521,7 +521,7 @@ Prior versions of Npgsql may also be instrumented, but duplicate and/or missing
<td>
Minimum supported version: 2.3.0

Verified compatible versions: 2.3.0, 2.8.1, 2.13.1, 2.14.1, 2.17.1, 2.19.0, 2.20.0, 2.21.0, 2.22.0, 2.23.0, 2.23.1
Verified compatible versions: 2.3.0, 2.8.1, 2.13.1, 2.14.1, 2.17.1, 2.19.0, 2.20.0, 2.21.0, 2.22.0, 2.23.0, 2.23.1, 2.24.0

Beginning in agent version 10.12.0, the following methods added in or after driver version 2.7 are instrumented:
* IMongoCollection.CountDocuments[Async]
Expand Down Expand Up @@ -573,7 +573,7 @@ Use [MySql.Data](https://www.nuget.org/packages/MySql.Data/) or [MySQL Connector
<td>
Minimum supported version: .0.488

Verified compatible versions: 1.0.488, 1.1.608, 1.2.6, 2.0.601, 2.1.58, 2.2.88, 2.6.66, 2.6.116, 2.7.4, 2.7.10, 2.7.17
Verified compatible versions: 1.0.488, 1.1.608, 1.2.6, 2.0.601, 2.1.58, 2.2.88, 2.6.66, 2.6.116, 2.7.4, 2.7.10, 2.7.17, 2.7.33
</td>
</tr>

Expand Down Expand Up @@ -796,7 +796,7 @@ Use [Elastic.Clients.Elasticsearch](https://www.nuget.org/packages/Elastic.Clien
9.7.0
</td>
<td>
2.0.10, 2.0.12, 2.0.13, 2.0.14
2.0.10, 2.0.12, 2.0.13, 2.0.14, 2.0.16
</td>

</tr>
Expand Down
Expand Up @@ -548,7 +548,7 @@ Use SqlClient from [System.Data.SqlClient](https://www.nuget.org/packages/System

<DoNotTranslate>**Microsoft.Data.SqlClient**</DoNotTranslate>
* Minimum supported version: 1.0.19239.1
* Verified compatible versions: 1.0.19239.1, 2.1.5, 3.1.1, 4.1.1, 5.0.1, 5.1.1
* Verified compatible versions: 1.0.19239.1, 2.1.5, 3.1.1, 4.1.1, 5.0.1, 5.1.1, 5.2.0

<DoNotTranslate>**System.Data**</DoNotTranslate>
* Minimum supported version: .NET Framework 4.6.2
Expand Down Expand Up @@ -591,7 +591,7 @@ Known incompatible versions: Instance details aren't available in lower version
<td>
Minimum supported version: 2.3.0

Verified compatible versions: 2.3.0, 2.8.1, 2.13.1, 2.14.1, 2.17.1, 2.19.0, 2.20.0, 2.21.0, 2.22.0, 2.23.0, 2.23.1
Verified compatible versions: 2.3.0, 2.8.1, 2.13.1, 2.14.1, 2.17.1, 2.19.0, 2.20.0, 2.21.0, 2.22.0, 2.23.0, 2.23.1. 2.24.0

Beginning in agent version 10.12.0, the following methods added in or after driver version 2.7 are instrumented:
* `IMongoCollection.CountDocuments[Async]`
Expand Down Expand Up @@ -695,7 +695,7 @@ Prior versions of Npgsql may also be instrumented, but duplicate and/or missing
</td>
<td>
* Minimum supported version: 1.0.488
* Verified compatible versions: 1.0.488, 1.1.608, 1.2.6, 2.0.601, 2.1.58, 2.2.88, 2.6.66, 2.6.116, 2.7.4, 2.7.10, 2.7.17
* Verified compatible versions: 1.0.488, 1.1.608, 1.2.6, 2.0.601, 2.1.58, 2.2.88, 2.6.66, 2.6.116, 2.7.4, 2.7.10, 2.7.17, 2.7.33
</td>
</tr>

Expand Down Expand Up @@ -863,7 +863,7 @@ Use [Elastic.Clients.Elasticsearch](https://www.nuget.org/packages/Elastic.Clien
9.7.0
</td>
<td>
1.2.10, 2.0.5, 2.0.14
1.2.10, 2.0.5, 2.0.14, 2.0.16
</td>
</tr>

Expand Down
15 changes: 14 additions & 1 deletion src/content/docs/data-apis/custom-data/aws-privatelink.mdx
Expand Up @@ -211,11 +211,23 @@ These are the New Relic endpoint services available via AWS PrivateLink:
`com.amazonaws.vpce.us-east-2.vpce-svc-0bf91fb637cf37b4f`
</td>
</tr>

<tr>
<td>
Synthetics job manager
</td>
<td>
`synthetics-horde.nr-data.net`
</td>
<td>
`com.amazonaws.vpce.us-east-2.vpce-svc-09230bb8d16a9171e`
</td>
</tr>
</tbody>
</table>

<Callout variant="important">
Review the following constraints when configuring the `identity-api.newrelic.com` and `infrastructure-command-api.newrelic.com` hostnames:
Review the following constraints when configuring the `identity-api.newrelic.com`, `infrastructure-command-api.newrelic.com` or `synthetics-horde.nr-data.net` hostnames:
- These are only exposed in the `us-east-2` (Ohio) region.
- The endpoint service does not have an associated DNS private name. Create a PrivateLink connected to this service endpoint, and create the Private Hosted Zone (PHZ) for each hostname.
</Callout>
Expand Down Expand Up @@ -335,6 +347,7 @@ These are the New Relic endpoint services available via AWS PrivateLink:
`com.amazonaws.vpce.eu-central-1.vpce-svc-04308d96cf1012913`
</td>
</tr>

</tbody>
</table>

Expand Down
Expand Up @@ -96,6 +96,7 @@ To enable and use custom attributes for APM, follow the procedure for your <Inli
title="Java"
>
Custom attribute collection is enabled by default in Java. You can collect custom attributes using XML and the Java agent APIs. These two methods can be used in conjunction with each other.
Note that collecting custom attributes requires that the [New Relic Java API jar](/docs/apm/agents/java-agent/api-guides/guide-using-java-agent-api) be in the application's classpath.

<table>
<thead>
Expand Down
Expand Up @@ -21,7 +21,7 @@ Our JMX [integration](/docs/integrations/host-integrations/getting-started/intro
Before installing the integration, make sure that you meet the following requirements:

* A New Relic account. Don't have one? [Sign up for free!](https://newrelic.com/signup) No credit card required.
* Java versions 8 or higher.
* Java version 8 or higher.
* If you need to use a different Java version than the one configured in `PATH`, follow [New Relic's configuration documentation on GitHub](https://github.com/newrelic/nrjmx#configuring-java-version).
* This integration does not support the IIOP protocol.

Expand Down
Expand Up @@ -1555,7 +1555,7 @@ Metrics can also be enriched with extended cloud metadata (including custom reso
<td>
Linux: `etc/newrelic-infra/integrations.d/`

Windows: `\Program Files\NewRelic\newrelic-infra\inregrations.d`
Windows: `\Program Files\NewRelic\newrelic-infra\integrations.d`
</td>

<td>
Expand Down
Expand Up @@ -84,22 +84,27 @@ Fluent Bit needs to know the location of the New Relic plugin and the New Relic
Name tail
Tag my.tag
Path /PATH/TO/YOUR/LOG/FILE
# If you have multiple sources, just add another [INPUT] section like this:
# [INPUT]
# Name tail
# Tag my.other.tag
# Path /PATH/TO/SOME/OTHER/LOG/FILE
# having multiple [FILTER] blocks allows one to control the flow of changes as they read top down.
# Having multiple [FILTER] blocks allows you to control the flow of changes as they read top down.
[FILTER]
Name modify
# here we only match on one tag, my.tag, defined in the [INPUT] section earlier
# Here we only match on one tag, my.tag, defined in the [INPUT] section earlier
Match my.tag
# below, we're renaming the host.cpu attribute to CPU
# Below, we're renaming the host.cpu attribute to CPU
Rename host.cpu CPU
[FILTER]
Name record_modifier
# match on all tags, *, so all logs get decorated per the Record clauses below. Record adds attributes + their values to each record.
# Match on all tags, *, so all logs get decorated per the Record clauses below. Record adds attributes + their values to each record.
Match *
# adding a logtype attribute ensures your logs will be automatically parsed by our built-in parsing rules
# Adding a logtype attribute ensures your logs will be automatically parsed by our built-in parsing rules
Record logtype nginx
# add the server's hostname to all logs generated
# Add the server's hostname to all logs generated
Record hostname ${HOSTNAME}
[OUTPUT]
Expand Down

0 comments on commit 78e7cc2

Please sign in to comment.