Skip to content

Commit 8ecb36f

Browse files
EKS Fargate formatting fixes (#20994)
* Fixes to unify tabs, broken links, and version disclaimer * Fix Operator overrides -> override * Adjust log container collect all wording
1 parent 6a9f0b1 commit 8ecb36f

File tree

1 file changed

+41
-28
lines changed

1 file changed

+41
-28
lines changed

eks_fargate/README.md

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -885,10 +885,10 @@ spec:
885885

886886
Monitor EKS Fargate logs using the Datadog Agent to collect logs from the kubelet and ship them to Datadog.
887887

888-
1. The most convenient way to enable native kubelet logging is through the Cluster Agent's Admission Controller sidecar injection feature. When configured, all subsequent injected Agent containers automatically have kubelet logging enabled. This feature can also be configured manually in your Application's manifest.
888+
1. The most convenient way to enable native kubelet logging is through the Cluster Agent's Admission Controller sidecar injection feature. When configured, all subsequent injected Agent containers automatically have kubelet logging enabled. This requires Cluster Agent `7.68.0` or above. This feature can also be configured manually in your Application's manifest.
889889

890890
<!-- xxx tabs xxx -->
891-
<!-- xxx tab "Enable Logging - Datdog Operator" xxx -->
891+
<!-- xxx tab "Admission Controller - Datadog Operator" xxx -->
892892

893893
Set the `DD_ADMISSION_CONTROLLER_AGENT_SIDECAR_KUBELET_API_LOGGING_ENABLED` Cluster Agent environment variable to `true`, so newly injected Agent containers will have kubelet logging enabled.
894894

@@ -899,27 +899,36 @@ Monitor EKS Fargate logs using the Datadog Agent to collect logs from the kubele
899899
name: datadog
900900
namespace: datadog
901901
spec:
902-
overrides:
902+
features:
903+
admissionController:
904+
agentSidecarInjection:
905+
enabled: true
906+
provider: fargate
907+
override:
903908
clusterAgent:
904909
env:
905910
- name: DD_ADMISSION_CONTROLLER_AGENT_SIDECAR_KUBELET_API_LOGGING_ENABLED
906911
value: "true"
907912
```
908913

909914
<!-- xxz tab xxx -->
910-
<!-- xxx tab "Enable Logging - Helm" xxx -->
915+
<!-- xxx tab "Admission Controller - Helm" xxx -->
911916

912917
Set the `DD_ADMISSION_CONTROLLER_AGENT_SIDECAR_KUBELET_API_LOGGING_ENABLED` Cluster Agent environment variable to `true`, so newly injected Agent containers will have kubelet logging enabled.
913918

914919
```yaml
915920
clusterAgent:
921+
admissionController:
922+
agentSidecarInjection:
923+
enabled: true
924+
provider: fargate
916925
env:
917926
- name: DD_ADMISSION_CONTROLLER_AGENT_SIDECAR_KUBELET_API_LOGGING_ENABLED
918927
value: true
919928
```
920929

921930
<!-- xxz tab xxx -->
922-
<!-- xxx tab "Enable Logging - Manual" xxx -->
931+
<!-- xxx tab "Manual" xxx -->
923932

924933
To enable Agent logging manually, you must:
925934
1. Attach an [emptyDir][29] volume to your pod and mount it inside the Agent container. This prevents duplicate logs should the Agent container restart.
@@ -940,7 +949,10 @@ Monitor EKS Fargate logs using the Datadog Agent to collect logs from the kubele
940949
- name: agent-option
941950
emptyDir: {}
942951
containers:
943-
#(...)
952+
# Your original container
953+
- name: "<CONTAINER_NAME>"
954+
image: "<CONTAINER_IMAGE>"
955+
944956
# Running the Agent as a sidecar
945957
- name: datadog-agent
946958
image: gcr.io/datadoghq/agent:7
@@ -969,10 +981,10 @@ Monitor EKS Fargate logs using the Datadog Agent to collect logs from the kubele
969981
<!-- xxz tab xxx -->
970982
<!-- xxz tabs xxx -->
971983

972-
2. You can configure the injected Agents to automatically collect logs for all containers by enabling `CONTAINER_COLLECT_ALL`. Alternatively, logs can be filtered through the standard Kubernetes [Autodiscovery annotations](https://docs.datadoghq.com/containers/kubernetes/log/?tab=helm#autodiscovery-annotations).
984+
2. You can configure the Agent sidecar to automatically collect logs for all of the containers in its pod by enabling `DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL`. Alternatively, the log integration can be setup per container with the standard Kubernetes [Autodiscovery annotations][30].
973985

974986
<!-- xxx tabs xxx -->
975-
<!-- xxx tab "Configure Logging - Datdog Operator" xxx -->
987+
<!-- xxx tab "Admission Controller - Datadog Operator" xxx -->
976988

977989
```yaml
978990
#(...)
@@ -990,7 +1002,7 @@ Monitor EKS Fargate logs using the Datadog Agent to collect logs from the kubele
9901002
```
9911003

9921004
<!-- xxz tab xxx -->
993-
<!-- xxx tab "Configure Logging - Helm" xxx -->
1005+
<!-- xxx tab "Admission Controller - Helm" xxx -->
9941006

9951007
```yaml
9961008
clusterAgent:
@@ -1005,7 +1017,7 @@ Monitor EKS Fargate logs using the Datadog Agent to collect logs from the kubele
10051017
```
10061018

10071019
<!-- xxz tab xxx -->
1008-
<!-- xxx tab "Configure Logging - Manual" xxx -->
1020+
<!-- xxx tab "Manual" xxx -->
10091021

10101022
```yaml
10111023
apiVersion: apps/v1
@@ -1028,7 +1040,7 @@ Monitor EKS Fargate logs using the Datadog Agent to collect logs from the kubele
10281040
- name: DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL
10291041
value: "true"
10301042
#(...)
1031-
```
1043+
```
10321044

10331045
<!-- xxz tab xxx -->
10341046
<!-- xxz tabs xxx -->
@@ -1039,22 +1051,22 @@ Monitor EKS Fargate logs by using [Fluent Bit][14] to route EKS logs to CloudWat
10391051

10401052
1. To configure Fluent Bit to send logs to CloudWatch, create a Kubernetes ConfigMap that specifies CloudWatch Logs as its output. The ConfigMap specifies the log group, region, prefix string, and whether to automatically create the log group.
10411053

1042-
```yaml
1043-
kind: ConfigMap
1044-
apiVersion: v1
1045-
metadata:
1046-
name: aws-logging
1047-
namespace: aws-observability
1048-
data:
1049-
output.conf: |
1050-
[OUTPUT]
1051-
Name cloudwatch_logs
1052-
Match *
1053-
region us-east-1
1054-
log_group_name awslogs-https
1055-
log_stream_prefix awslogs-firelens-example
1056-
auto_create_group true
1057-
```
1054+
```yaml
1055+
kind: ConfigMap
1056+
apiVersion: v1
1057+
metadata:
1058+
name: aws-logging
1059+
namespace: aws-observability
1060+
data:
1061+
output.conf: |
1062+
[OUTPUT]
1063+
Name cloudwatch_logs
1064+
Match *
1065+
region us-east-1
1066+
log_group_name awslogs-https
1067+
log_stream_prefix awslogs-firelens-example
1068+
auto_create_group true
1069+
```
10581070
2. Use the [Datadog Forwarder][15] to collect logs from CloudWatch and send them to Datadog.
10591071

10601072
## Trace collection
@@ -1258,4 +1270,5 @@ Additional helpful documentation, links, and articles:
12581270
[26]: https://kubernetes.io/docs/concepts/configuration/secret/
12591271
[27]: https://helm.sh/docs/intro/install/
12601272
[28]: https://docs.datadoghq.com/tracing/trace_collection/proxy_setup/apigateway
1261-
[29]: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir
1273+
[29]: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir
1274+
[30]: https://docs.datadoghq.com/containers/kubernetes/log/?tab=helm#autodiscovery-annotations

0 commit comments

Comments
 (0)