Skip to content

Commit

Permalink
k8s: clarify v3 is included in chart v4
Browse files Browse the repository at this point in the history
  • Loading branch information
roobre committed Jan 31, 2022
1 parent f978fd7 commit 93edcb2
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ Please note that this only applies to the API Server and that etcd, the schedule

This section covers how to configure control plane monitoring on versions 2 and earlier of the integration.

Please note that these versions had a less flexible autodiscovery options, and did not support external endpoints. We strongly recommend you to update to the v3 version at your earliest convenience. [See what's changed](/docs/kubernetes-pixie/kubernetes-integration/get-started/changes-since-v3).
Please note that these versions had a less flexible autodiscovery options, and did not support external endpoints. We strongly recommend you to update to the [version 3](/docs/kubernetes-pixie/kubernetes-integration/get-started/changes-since-v3) at your earliest convenience. [See what's changed](/docs/kubernetes-pixie/kubernetes-integration/get-started/changes-since-v3).

<CollapserGroup>
<Collapser
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ newrelic-infrastructure:
```

<Callout variant="tip">
Notice we are specifying `--tls --port 10250`. Earlier versions of the integration might have worked without this, but it is mandatory since v3 as we now connect to the Kubelet using the nodeIP rather than `localhost`.
Notice we are specifying `--tls --port 10250`. Earlier versions of the integration might have worked without this, but it is mandatory since [version 3](/docs/kubernetes-pixie/kubernetes-integration/get-started/changes-since-v3) as we now connect to the Kubelet using the nodeIP rather than `localhost`.
</Callout>

Integrations targeting other pods should have their own section next to `redis-sampleapp.yaml`.
Expand Down Expand Up @@ -282,7 +282,7 @@ This automatic discovery works the same as the [container auto-discovery](/docs/

### Add a service YAML to the Kubernetes integration config [#configmap]

In order for the snippet above to be recognized by the integration, it must be placed inside the designated ConfigMap. If you are using our Kubernetes Integration v3, a ConfigMap should already be generated, with a name ending in `-integrations-cfg`. Locate the config map and add the modified snippet to it, so it ends up looking like this:
In order for the snippet above to be recognized by the integration, it must be placed inside the designated ConfigMap. If you are using our [Kubernetes integration v3](/docs/kubernetes-pixie/kubernetes-integration/get-started/changes-since-v3), a ConfigMap should already be generated, with a name ending in `-integrations-cfg`. Locate the config map and add the modified snippet to it, so it ends up looking like this:

```yaml
---
Expand Down Expand Up @@ -313,10 +313,10 @@ data:
METRICS: 1
```

If you are using our Kubernetes Integration v3, this ConfigMap will already be mounted in the required container.
If you are using our [Kubernetes integration v3](/docs/kubernetes-pixie/kubernetes-integration/get-started/changes-since-v3), this ConfigMap will already be mounted in the required container.

<Callout variant="important">
For the Kubernetes Integration v2, you will need to add an entry for this ConfigMap in the `volumes` and `volumeMounts` section of the DaemonSet's `spec`, to ensure all the files in the ConfigMap are mounted in `/etc/newrelic-infra/integrations.d/`.
For the Kubernetes Integration version 2, you will need to add an entry for this ConfigMap in the `volumes` and `volumeMounts` section of the DaemonSet's `spec`, to ensure all the files in the ConfigMap are mounted in `/etc/newrelic-infra/integrations.d/`.
</Callout>

Please note that the same ConfigMap can hold multiple config files, which is recommended to keep modifications to the manifests at a minimum.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ redirects:
---

<Callout variant="tip">
This tutorial applies to the Kubernetes Integration v3 [installed using Helm](/docs/kubernetes-pixie/kubernetes-integration/installation/install-kubernetes-integration-using-helm). For instructions on how to do this on v2 using helm please check [this section](/docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/monitor-services/monitor-services-running-kubernetes#config-details#configure-values-v2). To check how to configure services on top of plain manifest, check out [this other page](/docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/monitor-services/monitor-services-running-kubernetes#config-details).
This tutorial applies to the [Kubernetes integration v3](/docs/kubernetes-pixie/kubernetes-integration/get-started/changes-since-v3) [installed using Helm](/docs/kubernetes-pixie/kubernetes-integration/installation/install-kubernetes-integration-using-helm). For instructions on how to do this on v2 using helm please check [this section](/docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/monitor-services/monitor-services-running-kubernetes#config-details#configure-values-v2). To check how to configure services on top of plain manifest, check out [this other page](/docs/kubernetes-pixie/kubernetes-integration/advanced-configuration/monitor-services/monitor-services-running-kubernetes#config-details).
</Callout>

If you have a service running on Kubernetes, and it's a [service we support](/docs/monitor-service-running-kubernetes#integration-configs), you can enable monitoring of that service by adding a configuration section for that integration to the Kubernetes integration's config.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ metaDescription: Changes introduced in Kubernetes Integration version 3
---

<Callout title="v3 BETA">
Kubernetes integration v3 is currently in a last stage beta, and we expect to make it generally available during Spring 2022. We encourage you to give it a try and let us know what you think!
Kubernetes integration v3 is currently in a late stage beta, and we expect to make it generally available during Spring 2022. We encourage you to give it a try and let us know what you think!
</Callout>

<Callout title="Integration version and Chart version">
The Kubernetes integration v3 (`appVersion`) is included on the `nri-bundle` chart `version` 4.
</Callout>

## Overview [#overview]
Expand Down

0 comments on commit 93edcb2

Please sign in to comment.