Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 73 additions & 9 deletions content/en/containers/kubernetes/control_plane.md
Original file line number Diff line number Diff line change
Expand Up @@ -319,15 +319,19 @@
## Kubernetes on Amazon EKS {#EKS}
### Using the Operator (v1.18.0+)
### Recommended Method

Check warning on line 322 in content/en/containers/kubernetes/control_plane.md

View workflow job for this annotation

GitHub Actions / vale

Datadog.headings

'Recommended Method' should use sentence-style capitalization.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
### Recommended Method
### Recommended method

<div class="alert alert-info">This feature is in Preview.</div>
The Datadog Operator can automatically configure monitoring for Kubernetes control plane components including the API Server, etcd, Controller Manager, and Scheduler.
Datadog supports monitoring Kubernetes Control Plane components, including the API Server, Controller Manager, and Scheduler.
{{< tabs >}}
{{% tab "Datadog Operator" %}}
#### Prerequisites
1. Datadog Operator v1.18.0+
1. Datadog Agent v7.69+
1. Datadog Operator >= `v1.18.0`
1. Datadog Agent >= `v7.69`

#### General setup

Expand All @@ -347,6 +351,32 @@

Since this feature is enabled by default, you can deploy a minimal DatadogAgent spec.

{{% /tab %}}

{{% tab "Helm" %}}

#### Prerequisites

1. Helm chart version >= `3.150.0`
1. Datadog Agent >= `v7.69`

#### General setup

Enable control plane monitoring using the `providers.eks.controlPlaneMonitoring` option:

{{< code-block lang="yaml" filename="datadog-values.yaml" >}}
datadog:
apiKey: <DATADOG_API_KEY>
appKey: <DATADOG_APP_KEY>
clusterName: <CLUSTER_NAME>
providers:
eks:
controlPlaneMonitoring: true
{{< /code-block >}}

{{% /tab %}}
{{< /tabs >}}

#### Validation
Verify that checks are running:
```shell
Expand Down Expand Up @@ -423,16 +453,17 @@

## Kubernetes on OpenShift 4 {#OpenShift4}

### Using the Operator (v1.18.0+)
<div class="alert alert-info">This feature is in Preview.</div>

The Datadog Operator can automatically configure monitoring for Kubernetes control plane components including the API Server, etcd, Controller Manager, and Scheduler.
Datadog supports monitoring Kubernetes Control Plane components, including the API Server, etcd, Controller Manager, and Scheduler.

#### Prerequisites
{{< tabs >}}
{{% tab "Datadog Operator" %}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noting there are a couple of broken link on this tab:

  1. [datadog-operator Helm chart][12].
  2. Or, for OpenShift users who installed the operator through OperatorHub/Marketplace (the recommended method)

For links that are on a tab, the link reference must be contained within the tab. For example, for [datadog-operator Helm chart][12], you would put [12]: https://github.com/DataDog/helm-charts/tree/main/charts/datadog-operator before the closing {{% /tab %}} element.


1. Datadog Operator v1.18.0+
1. Datadog Agent v7.69+
#### Prerequisites

1. Datadog Operator >= `v1.18.0`
1. Datadog Agent >= `v7.69`

**Note**: `etcd` is not supported on versions 4.0-4.13.

Expand Down Expand Up @@ -472,6 +503,39 @@
oc apply -f -
```

{{% /tab %}}
{{% tab "Helm" %}}

#### Prerequisites

1. Helm chart version >= `3.150.0`
1. Datadog Agent >= `v7.69`

**Note**: `etcd` is not supported on versions 4.0-4.13.

#### General setup

Enable control plane monitoring using the `providers.openshift.controlPlaneMonitoring` option:

{{< code-block lang="yaml" filename="datadog-values.yaml" >}}
datadog:
apiKey: <DATADOG_API_KEY>
appKey: <DATADOG_APP_KEY>
clusterName: <CLUSTER_NAME>
providers:
openshift:
controlPlaneMonitoring: true
{{< /code-block >}}

For OpenShift 4.14 and higher, etcd monitoring requires copying certificates. To copy them into the same namespace the Datadog Agent is running in:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
For OpenShift 4.14 and higher, etcd monitoring requires copying certificates. To copy them into the same namespace the Datadog Agent is running in:
For OpenShift 4.14 and later, etcd monitoring requires you to copy the etcd certificates. To copy them into the same namespace as the Datadog Agent:


```shell
oc get secret etcd-metric-client -n openshift-etcd-operator -o yaml | sed 's/namespace: openshift-etcd-operator/namespace: <datadog agent namespace>/' | oc create -f -
```

{{% /tab %}}
{{< /tabs >}}

#### Validation
Verify that checks are running:
```shell
Expand Down
Loading