Merge branch 'develop' into chore/update-npm-config-options

src/content/docs/alerts-applied-intelligence/new-relic-alerts/advanced-alerts/understand-technical-concepts/streaming-alerts-key-terms-concepts.mdx

@@ -18,6 +18,13 @@ There are three methods for aggregating the data filtered through your NRQL cond
 * Event timer
 * Cadence
 
+<Video
+  type="wistia"
+  id="n6nei987ln"
+/>
+
+<figcaption>This short video describes the three aggregation method (5:31).</figcaption>
+
 ## Why it matters [#why]
 
 Understanding how streaming alerts works will help you fine-tune your NRQL conditions to be notified about what's important to you. 

src/content/docs/alerts-applied-intelligence/new-relic-alerts/alert-conditions/create-nrql-alert-conditions.mdx

@@ -559,7 +559,7 @@ Here are some tips for creating and using a NRQL condition:
       </td>
 
       <td>
-        NRQL alert conditions don't affect an entity's [health status display](/docs/alerts-applied-intelligence/new-relic-alerts/alert-conditions/view-entity-health-status-find-entities-without-alert-conditions).
+        In order for a NRQL alert condition [health status display](/docs/alerts-applied-intelligence/new-relic-alerts/alert-conditions/view-entity-health-status-find-entities-without-alert-conditions) to function properly, use a FACET clause to scope each signal to a single entity (for example, `FACET hostname` or `FACET appname`). 
       </td>
     </tr>
 

src/content/docs/alerts-applied-intelligence/notifications/destinations.mdx

@@ -24,7 +24,7 @@ The supported destination platforms include:
 * ServiceNow
 * Slack
 * Webhook
-* Coming soon: Email 
+* Email 
 
 
 For more on these and other destinations, see [notification integrations](/docs/alerts-applied-intelligence/notifications/notification-integrations).

src/content/docs/alerts-applied-intelligence/notifications/message-templates.mdx

@@ -30,13 +30,13 @@ Message templates are written in a simple templating language called [Handlebars
 
 ## The variables menu [#variables-menu]
 
-All of the New Relic variable names are listed in the message template variables menu. The variables are grouped into subcategories.
+The New Relic variable names are listed in the message template variables menu. The variables are grouped into subcategories. 
 
 In the variables menu, type `{{` to select from a list of variables. As you type, variable names appear via autocomplete. The variable type is written on the right-hand side. You can add enriched data to these variables.
 
 ![A screenshot of the variables menu that. shows the breadth of variable options available.](./images/notification-custom-variables.png "The variables menu that shows the breadth of variable options available.")
 
-<figcaption>The variables menu shows all of the options you have when mapping New Relic notification fields onto the fields in your external service.</figcaption>
+<figcaption>The variables menu shows the options you have when mapping New Relic notification fields onto the fields in your external service.</figcaption>
 
 ## Use the Handlebars syntax [#handlebars-syntax]
 
@@ -46,7 +46,7 @@ The Handlebars language provides many features in addition to basic variable rep
 
 ## Helper functions [#help-functions]
 
-Our message templates support all of the Handlebars [built-in helpers](https://handlebarsjs.com/guide/builtin-helpers.html).
+Our message templates support the Handlebars [built-in helpers](https://handlebarsjs.com/guide/builtin-helpers.html).
 
 In addition, we've added other helpers that might be useful to you.
 
@@ -99,7 +99,7 @@ Compares variables a and b, renders 'yes' or 'no':
 
 {{#eq a b}} yes {{else}} no {{/eq}}
 
-Compares String value "a" to variable b, renders 'yes' or 'no':
+Compares string value "a" to variable b, renders 'yes' or 'no':
 
 {{#eq "a" b}} yes {{else}} no {{/eq}}
 
@@ -249,13 +249,13 @@ This would return the first value from the array:
 
 ### Iterate through an array [#iterate-array]
 
-Iterate a variable of type array and aggregate the values such as:
+Iterate a variable of type array and aggregate the values into a string:
 
 ```handlebars
 {{#each tags}}{{this}}{{#unless @last}}, {{/unless}}{{/each}}
 ```
 
-This would return all of the values from each tag:
+The result contains the tags, seperated by commas (the trailing comma is omitted):
 
 ```shell
 infra, team
@@ -275,7 +275,7 @@ This would return a JSON such as:
 }
 ```
 
-Iterate the `data` variable, then aggregate the object’s entries to a String:
+Iterate the `data` variable, then aggregate the object’s entries to a string:
 
 ```handlebars
 {{#each data}}{{@key}}: {{this}}{{#unless @last}}, {{/unless}}{{/each}}

src/content/docs/alerts-applied-intelligence/notifications/notification-integrations.mdx

@@ -267,5 +267,28 @@ If the webhook payload conforms a valid Json, you can send a test notification t
 
 <figcaption>We recommend sending a test notification to make sure that everything's connected correctly.</figcaption>
 
+  </Collapser>
+    <Collapser
+    className="freq-link"
+    id="email"
+    title="Email"
+  >
+**Send email notifications to users.**
+
+## Configure the email settings [#configure-email-settings]
+
+Add one or more recipients. Users with New Relic accounts can be found via autocomplete when searching for their name or email address.
+
+To add a user without a New Relic account or email distribution list, add the full email address.
+
+Every recipient will be translated into a 'destination'. You can follow the email notifications per destination in the [notifications-log](/docs/alerts-applied-intelligence/notifications/destinations/#notifications-log)
+
+![A screenshot of the email settings.](./images/email_settings.png "Email settings")
+
+### Send a test notification [#email-test]
+
+You can send a test notification to make sure the email notifications reach the inbox.
+
+
   </Collapser>
 </CollapserGroup>

src/content/docs/distributed-tracing/concepts/how-new-relic-distributed-tracing-works.mdx

@@ -27,7 +27,7 @@ Here are some technical details about how New Relic [distributed tracing](/docs/
 
 ## Trace sampling [#sampling]
 
-How your traces are sampled will depend on your setup and the New Relic tracing tool you're using. For example, you may be using a [third-party telemetry service](/docs/integrations/open-source-telemetry-integrations) (like OpenTelemetry) to implement sampling of traces before your data gets to us. Or, if you're using [Infinite Tracing](/docs/understand-dependencies/distributed-tracing/infinite-tracing/introduction-infinite-tracing), you'd probably send us all your trace data and use our sampling.
+How your traces are sampled will depend on your setup and the New Relic tracing tool you're using. For example, you may be using a [third-party telemetry service](/docs/more-integrations/open-source-telemetry-integrations/get-started/introduction-new-relics-open-source-telemetry-integrations/) (like OpenTelemetry) to implement sampling of traces before your data gets to us. Or, if you're using [Infinite Tracing](/docs/understand-dependencies/distributed-tracing/infinite-tracing/introduction-infinite-tracing), you'd probably send us all your trace data and use our sampling.
 
 We have a few sampling strategies available:
 

src/content/docs/infrastructure/amazon-integrations/troubleshooting/metric-data-delays-amazon-aws-integrations.mdx

@@ -62,6 +62,7 @@ Depending on the Amazon AWS integration, New Relic Infrastructure may experience
         Explicit delays may come from these Infrastructure Amazon integrations:
 
         * [ALB](/docs/aws-alb-integration): 5 minutes
+        * [ELB](/docs/aws-elb-integration): 5 minutes
         * [CloudFront](/docs/infrastructure/amazon-integrations/amazon-integrations/aws-cloudfront-monitoring-integration): 1 minute
         * [RDS](/docs/infrastructure/amazon-integrations/amazon-integrations/aws-rds-monitoring-integration): 5 minutes
         * [SNS](/docs/infrastructure/amazon-integrations/amazon-integrations/aws-sns-monitoring-integration): 10 minutes

src/content/docs/kubernetes-pixie/kubernetes-integration/installation/install-kubernetes-integration-using-helm.mdx

@@ -36,7 +36,7 @@ To install the Kubernetes integration using Helm, you will need your New Relic a
 kubectl config current-context
 ```
 
-Note this values somewhere safe as you will need them later during the installation process.
+Note these values somewhere safe, as you will need them later during the installation process.
 
 ## Install Kubernetes integration with Helm [#install-k8-helm]
 
@@ -56,7 +56,7 @@ Additionally, New Relic provides [`nri-bundle`](https://github.com/newrelic/helm
 
 While it is possible to install those charts separately, we strongly recommend using the [`nri-bundle`](https://github.com/newrelic/helm-charts/tree/master/charts/nri-bundle) chart for Kubernetes deployments, as it ensures that values across all the charts are consistent and provides full control over which components are installed, as well as the possibility to configure all of them as [Helm dependencies](https://helm.sh/docs/chart_template_guide/subcharts_and_globals/#overriding-values-from-a-parent-chart). This is the same chart that is used and referenced by our automated installer.
 
-#### Installing and configuring `nri-bundle` with Helm
+### Installing and configuring `nri-bundle` with Helm
 
 1. Ensure you are using the appropriate context in the machine where you will run Helm and `kubectl`:
 
@@ -342,3 +342,13 @@ COLLECT_INTERVAL_SEC: 15
 ```
 
 The default settings for these parameters and others can be found in the [newrelic-pixie-integration](https://github.com/newrelic/newrelic-pixie-integration) Github repo.
+
+## Uninstall Kubernetes integration [#uninstall]
+
+To uninstall the Kubernetes integration using Helm, run the following command. Replace `some-manifest-file.yml` with your specific filename.
+
+```
+helm --uninstall newrelic newrelic/nri-bundle
+if kubectl then :
+kubectl delete -f some-manifest-file.yml
+```

src/content/docs/kubernetes-pixie/kubernetes-integration/troubleshooting/kubernetes-integration-troubleshooting-not-seeing-data.mdx

@@ -22,13 +22,12 @@ You have completed the [installation procedure](/docs/kubernetes-monitoring-inte
   Effective Wednesday, 12 August 2020, Kubernetes integration v1.7 or lower will be deprecated. To avoid losing data, [upgrade to the latest version](/docs/integrations/kubernetes-integration/installation/kubernetes-installation-configuration#update). For more information, read our [New Relic Explorers Hub post](https://discuss.newrelic.com/t/important-end-of-life-kubernetes-integrations-v1-7-or-older/102167) or contact your New Relic account team.
 </Callout>
 
-If you have [deployed the infrastructure agent](#install) and completed the [Kubernetes installation procedure](/docs/kubernetes-monitoring-integration#install) but are not seeing any information in the Kubernetes dashboard, follow these steps:
+If you have [deployed the infrastructure agent](/docs/infrastructure/install-infrastructure-agent/get-started/install-infrastructure-agent/#install) and completed the [Kubernetes installation procedure](/docs/kubernetes-monitoring-integration#install) but are not seeing any information in the Kubernetes dashboard, follow these steps:
 
 1. Check if you've access to this feature. See [Factors affecting access to features and data](/docs/accounts/accounts-billing/general-account-settings/factors-affecting-access-features-data).
 2. Confirm you have configured the `CLUSTER_NAME` and `NRI_LICENSE_KEY` variables in the deployment file before running it. See the [installation procedures](/docs/integrations/host-integrations/host-integrations-list/kubernetes-monitoring-integration#install) for more information.
 3. Confirm the deployment was successful by running:
-
-   ```
-   kubectl get pods --all-namespaces -o wide | grep newrelic
-   ```
+  ```
+  kubectl get pods --all-namespaces -o wide | grep newrelic
+  ```
 4. [Retrieve the logs from the infrastructure agent](/docs/integrations/kubernetes-integration/troubleshooting/get-logs-version) and ensure there are no [error messages](/docs/integrations/host-integrations/troubleshooting/kubernetes-integration-troubleshooting-error-messages).

src/content/docs/mlops/integrations/aporia-mlops-integration.mdx

@@ -23,21 +23,25 @@ Aporia allows you to connect alerts generated by Aporia’s monitors to New Reli
 
 2. **Login into your New Relic account:** Log into **[one.newrelic.com](https://one.newrelic.com)** and click on **Explorer**. On the upper hand corner, on the main navigation menu, click on **+Add more data**.     
 
-3. **Click on Aporia:** In the search bar, type **Aporia** or scroll down to the MLOps Integration section and click on the **Aporia icon**.  
+3. **Click on Aporia:** In the search bar, type **Aporia** or scroll down to the MLOps Integration section and click on the **Aporia icon**.
+
+4. **Select your account ID:** Select the account ID you want Aporia to integrate with. 
 
-4. **Get an API key:** Once you click on the Aporia icon, follow step one by clicking **Select** or **Create API key**, under **Prediction data**. You need to create a new API key or use an existing one. 
+5. **Get an API key:** Once you click on the Aporia icon, follow step one by clicking **Select** or **Create API key**, under **Prediction data**. You need to create a new API key or use an existing one. 
+
+6. **Get an Auth Token:** Optionally, you can also send metric alerts from Aporia to New Relic for intelligent correlation. To do this, copy the auth token by clicking on the **Copy icon** under **Model quality metric alerts**.
 
-5. **Copy and paste the token in Aporia:** Copy the token by clicking on the **Copy icon** next to the API Key. On Aporia’s dashboard, under the New Relic Integration screen, paste the token under **New Relic insert token** and click **Save**.
+7. **Paste the key and token in Aporia:** Now go to Aporia’s dashboard and under the New Relic Integration screen and paste the key under **New Relic insert token**. If you also copied the Auth Token, you can paste this key under **New Relic Incident Intelligence Token**. Once pasted, click **Save**.
 
-6. **Verify the tokens:** In the Aporia dashboard, click on the **Verify tokens** button to verify both tokens are working properly. **Green** check marks or **Red** error marks should appear to indicate the status. 
+8. **Verify the tokens:** In the Aporia dashboard, click on the **Verify tokens** button to verify both the key and token are working properly. **Green** check marks or **Red** error marks should appear to indicate the status. 
 
 ## Monitor your machine learning models with Aporia
 
 Now that you’ve integrated New Relic and Aporia, you can monitor your data using [dashboards](/docs/query-your-data/explore-query-data/dashboards/introduction-dashboards/) with automated charts created by Aporia. 
 
 1. **Go to the integration dashboard:** Once you’ve verified your tokens and confirmed the integration is set up correctly, return to the New Relic integration dashboard and click on **See your data**. This will redirect you to an automatically generated dashboard displaying data reported to Aporia in New Relic. 
 
-2. **Analyze Aporia's dashboard.** Aporia’s dashboard contains 6 charts: 
+2. **Analyze Aporia's dashboard.** Aporia’s dashboard populated in New Relic contains 6 charts: 
 * The **Most active models** chart displays the different models which reported predictions in the selected timeframe.
 * The **Most active model versions** chart displays the different versions which reported predictions in the selected timeframe. 
 * The **Model inferences** graph displays the number of unique predictions reported for each model and version. 

src/content/docs/mlops/integrations/comet-mlops-integration.mdx

@@ -18,7 +18,7 @@ Use New Relic's Comet integration to get data and insights that help you build b
 
 To setup the integration, follow these steps:
 
-1. **Log into your New Relic account**: Log into **[one.newrelic.com](https://one.newrelic.com)** and click on **Explorer**. At the upper hand corner, on the main navigation menu, click **+Add more data**.
+1. **Log into your New Relic account**: Log into **[one.newrelic.com](https://one.newrelic.com)** and click on **Explorer**. In the upper hand corner, on the main navigation menu, click **+Add more data**.
 
 2. **Click on Comet**: Type **Comet** in the search bar, or scroll down to the MLOps Integration section and click on the **Comet** icon.  
 
@@ -28,7 +28,7 @@ To setup the integration, follow these steps:
 
 ![Create API key.](./images/comet01.png "Create API key")
 
-5. **Contact Comet**: To set up the integration and view the Model Production Monitoring dashboard in Comet, you need to [contact Comet](mailto:sales@comet.ml). The Comet team will walk you through each step of the integration process and get you all set up.
+5. **Contact Comet**: For the next step to set up the integration and view the Model Production Monitoring dashboard in Comet, you'll need to [contact Comet](mailto:sales@comet.ml). The Comet team will walk you through each step of the integration process and get you all set up.
 
 ![Model Production Monitoring dashboard.](./images/comet02.png "Model Production Monitoring dashboard")
 

src/content/docs/mlops/integrations/dagshub-mlops-integration.mdx

@@ -22,10 +22,10 @@ Integrating DagsHub and New Relic enables you to analyze and monitor machine lea
 In order to receive data from DagsHub into New Relic, you need your account number and a special key which you can obtain as follows:
 
 1. **Log into your New Relic account**: Go to [one.newrelic.com](https://one.newrelic.com), and click **Explorer**. On the upper hand right corner, on the main navigation menu, click on **+Add more data**.
-2. Click on DagsHub: Type DagsHub in the search bar, or scroll down to the MLOps Integration section, and click the **DagsHub** icon.
+2. **Click on DagsHub:** Type DagsHub in the search bar, or scroll down to the MLOps Integration section, and click the **DagsHub** icon.
 3. **Select the account ID** you want DagsHub to integrate with.
-4. **Create an access token**: Once you've selected an account ID, under real-time insert metrics, click **Create an API key** . This will be your new telemetry API key. Keep the New Relic page open for future steps. 
-5. Log into the **DagsHub portal** and select the repository you're working on. Click **Settings**, and select the integrations button from the left hand menu. Click on the **New Relic** tile. 
+4. **Create an access token**: Once you've selected an account ID, under **real-time training metrics**, click **Create an API key** . This will be your new telemetry API key. Keep the New Relic page open for future steps. 
+5. **Log into the DagsHub portal:** Once logged in, select the repository you're working on. Click **Settings**, and select the **integrations** button from the left hand menu. Click on the **New Relic** tile. 
 6. **Copy and paste the token in DagsHub**. Go back to the New Relic integration dashboard and copy the token you created by clicking on the **copy** icon next to the insert key. On the DagsHub’s portal, paste the insert key under **New Relic Insight insert key**, and finish by clicking **Next**. The token will be verified, and a confirmation screen will appear.
 
 ## View and explore your DagsHub models in New Relic dashboards [#view-explore]
@@ -38,7 +38,7 @@ Once you configure the New Relic integration in DagsHub, all the training metric
 ![Analyze Dagshub dashboard.](./images/dagshub1.png "Analyze Dagshub dashboard")
 
 3. **Display customized metrics**: You can easily customize training metrics coming from DagsHub. For more information on using NRQL and creating queries to track your data, refer to [NRQL syntax, clauses, and functions](/docs/query-your-data/nrql-new-relic-query-language/get-started/nrql-syntax-clauses-functions/).
-4. **Set up alerts notifications**: Once you've created some dashboards, you can [get alerted on your data](/docs/alerts-applied-intelligence/new-relic-alerts/alert-policies/create-edit-or-find-alert-policy/). To create NRQL alerts conditions from a chart, click the **...** chart menu, then click **Create alert condition**. Once you've named and customized your condition, you can add it to an existing policy, or create a new one.
+4. **Set up alerts notifications**: Once you've created some charts inside a Dashboard(s), you can [get alerted on your data](/docs/alerts-applied-intelligence/new-relic-alerts/alert-policies/create-edit-or-find-alert-policy/). To create NRQL alerts conditions from a chart, click the **...** chart menu, then click **Create alert condition**. Once you've named and customized your condition, you can add it to an existing policy, or create a new one.
 5. **Get notified**: Once you've created an alerts condition, you can choose how you want to be notified. See our docs on [how to set up notification channels](/docs/alerts-applied-intelligence/new-relic-alerts/alert-notifications/notification-channels-control-where-send-alerts/).
 
-You’ve now successfully integrated New Relic with DagsHub. Newly created alerts are correlated with your New Relic alerts, and you'll see data about newly reported predictions. 
+You’ve now successfully integrated New Relic with DagsHub. Newly created alerts are correlated with your New Relic alerts, and you'll see data about newly reported predictions.