From 37e5374e46284c71edf371459440901f22fe0cdd Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 16 Sep 2022 09:21:54 -0400 Subject: [PATCH 1/2] Updated agent syntax and clarified DD example --- docs/application/services.md | 1 + docs/external-services/datadog.md | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/docs/application/services.md b/docs/application/services.md index ffbe50fc..aff32cf9 100644 --- a/docs/application/services.md +++ b/docs/application/services.md @@ -49,6 +49,7 @@ or if your agent needs to open host-level ports then use this format: services: datadog: agent: + enabled: true ports: - 8125/udp - 8126/tcp diff --git a/docs/external-services/datadog.md b/docs/external-services/datadog.md index 50a7458d..36f9b968 100644 --- a/docs/external-services/datadog.md +++ b/docs/external-services/datadog.md @@ -14,23 +14,24 @@ You can deploy the datadog agent as a Convox app with a very simple `convox.yml` ``` services: - agent: + datadog-agent: agent: + enabled: true ports: - 8125/udp - 8126/tcp - image: datadog/agent:latest - environment: - - DD_API_KEY - - DD_APM_ENABLED=true - privileged: true - scale: - cpu: 128 - memory: 128 - volumes: - - /sys/fs/cgroup/:/host/sys/fs/cgroup/ - - /proc/:/host/proc/ - - /var/run/docker.sock:/var/run/docker.sock + image: datadog/agent:latest + environment: + - DD_API_KEY + - DD_APM_ENABLED=true + privileged: true + scale: + cpu: 128 + memory: 128 + volumes: + - /sys/fs/cgroup/:/host/sys/fs/cgroup/ + - /proc/:/host/proc/ + - /var/run/docker.sock:/var/run/docker.sock ``` ### Application Metrics From 48423fdc657b5f4b380c85bf1a278e9dfe7ecc62 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 18 Nov 2022 15:55:01 -0500 Subject: [PATCH 2/2] Updated text for Private Registries --- docs/deployment/private-registries.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deployment/private-registries.md b/docs/deployment/private-registries.md index b6d8adca..4b168415 100644 --- a/docs/deployment/private-registries.md +++ b/docs/deployment/private-registries.md @@ -41,7 +41,7 @@ Once the registry has been added, you can pull private images: latest: Pulling from yourname/postgres
-Note that you do not need to include the `https://` protocol as part of the registry address. Convox will add this for you automatically. +Note that you should NOT include the `https://` protocol as part of the registry address. Doing so can cause errors. Convox will add this for you automatically.
## Removing a registry