Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ content/en/developers/integrations/*.md
content/en/developers/amazon_cloudformation.md

# Agent section
content/en/agent/basic_agent_usage/ansible.md
content/en/agent/basic_agent_usage/chef.md
content/en/agent/basic_agent_usage/heroku.md
content/en/agent/basic_agent_usage/puppet.md

Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ build_live:
variables:
CONFIG: ${LIVE_CONFIG}
URL: ${LIVE_DOMAIN}
UNTRACKED_EXTRAS: "data,content/en/integrations,content/en/agent/basic_agent_usage/heroku.md,content/en/agent/basic_agent_usage/puppet.md,content/en/developers/integrations,content/en/developers/amazon_cloudformation.md"
UNTRACKED_EXTRAS: "data,content/en/integrations,content/en/agent/basic_agent_usage/heroku.md,content/en/agent/basic_agent_usage/ansible.md,content/en/agent/basic_agent_usage/chef.md,content/en/agent/basic_agent_usage/puppet.md,content/en/developers/integrations,content/en/developers/amazon_cloudformation.md"
CONFIGURATION_FILE: "./local/bin/py/build/configurations/pull_config.yaml"
LOCAL: "False"
script:
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ clean-integrations: ## Remove built integrations files.
clean-auto-doc: ##Remove all doc automatically created
@if [ -d content/en/developers/integrations ]; then \
find ./content/en/developers/integrations -type f -maxdepth 1 -exec rm -rf {} \; ;fi
@if [ content/en/agent/basic_agent_usage/ansible.md ]; then \
rm -f content/en/agent/basic_agent_usage/ansible.md ;fi
@if [ content/en/agent/basic_agent_usage/chef.md ]; then \
rm -f content/en/agent/basic_agent_usage/chef.md ;fi
@if [ content/en/agent/basic_agent_usage/heroku.md ]; then \
rm -f content/en/agent/basic_agent_usage/heroku.md ;fi
@if [ content/en/agent/basic_agent_usage/puppet.md ]; then \
Expand Down
32 changes: 21 additions & 11 deletions config/_default/menus/menus.en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,60 +144,70 @@ main:
url: "agent/basic_agent_usage/amazonlinux/"
weight: 102
parent: "basic_agent_usage"
- name: "Ansible"
identifier: "basic_agent_usage_ansible"
url: "agent/basic_agent_usage/ansible/"
weight: 103
- name: "CentOS"
identifier: "basic_agent_usage_centos"
url: "agent/basic_agent_usage/centos/"
weight: 103
weight: 104
parent: "basic_agent_usage"
- name: "Chef"
identifier: "basic_agent_usage_chef"
url: "agent/basic_agent_usage/chef/"
weight: 105
parent: "basic_agent_usage"
- name: "Debian"
identifier: "basic_agent_usage_deb"
url: "agent/basic_agent_usage/deb/"
weight: 104
weight: 106
parent: "basic_agent_usage"
- name: "Fedora"
identifier: "basic_agent_usage_fedora"
url: "agent/basic_agent_usage/fedora/"
weight: 106
weight: 107
parent: "basic_agent_usage"
- name: "Heroku"
identifier: "basic_agent_usage_heroku"
url: "agent/basic_agent_usage/heroku/"
weight: 107
weight: 108
parent: "basic_agent_usage"
- name: "Mac OS X"
identifier: "basic_agent_usage_osx"
url: "agent/basic_agent_usage/osx/"
weight: 108
weight: 109
parent: "basic_agent_usage"
- name: "Puppet"
identifier: "basic_agent_usage_puppet"
url: "agent/basic_agent_usage/puppet/"
weight: 109
weight: 110
parent: "basic_agent_usage"
- name: "Red Hat"
identifier: "basic_agent_usage_redhat"
url: "agent/basic_agent_usage/redhat/"
weight: 110
weight: 111
parent: "basic_agent_usage"
# SALT WILL GO HERE
- name: "SUSE"
identifier: "basic_agent_usage_suse"
url: "agent/basic_agent_usage/suse/"
weight: 111
weight: 113
parent: "basic_agent_usage"
- name: "Ubuntu"
identifier: "basic_agent_usage_ubuntu"
url: "agent/basic_agent_usage/ubuntu/"
weight: 112
weight: 114
parent: "basic_agent_usage"
- name: "Windows"
identifier: "basic_agent_usage_windows"
url: "agent/basic_agent_usage/windows/"
weight: 113
weight: 115
parent: "basic_agent_usage"
- name: "From Source"
identifier: "basic_agent_usage_source"
url: "agent/basic_agent_usage/source/"
weight: 114
weight: 116
parent: "basic_agent_usage"

## AGENT - Docker
Expand Down
28 changes: 14 additions & 14 deletions content/en/agent/cluster_agent/clusterchecks.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ Enable the `clusterchecks` configuration provider on the Datadog **Node** Agent.

[Restart the Agent][5] to apply the configuration change.

**Note**: The [Datadog Helm Chart][12] offers the possibility to deploy, via the `clusterChecksRunner` field, a set of Datadog Agents configured to run cluster checks only.
**Note**: The [Datadog Helm Chart][6] offers the possibility to deploy, via the `clusterChecksRunner` field, a set of Datadog Agents configured to run cluster checks only.

### Custom checks

Running [custom Agent checks][6] as cluster checks is supported, as long as all node-based Agents are able to run it. This means your checks' code:
Running [custom Agent checks][7] as cluster checks is supported, as long as all node-based Agents are able to run it. This means your checks' code:

- Must be installed on all node-based Agents where the `clusterchecks` config provider is enabled.
- Must **not** depend on local resources that are not accessible to all Agents.
Expand Down Expand Up @@ -108,7 +108,7 @@ When the IP of a given resource is constant (eg. external service endpoint, publ

#### Example: MySQL check on a CloudSQL database

After setting up a CloudSQL instance and a [Datadog user][7], mount a `/conf.d/mysql.yaml` file in the Cluster Agent container with the following content:
After setting up a CloudSQL instance and a [Datadog user][8], mount a `/conf.d/mysql.yaml` file in the Cluster Agent container with the following content:

```yaml
cluster_check: true
Expand All @@ -124,19 +124,19 @@ The `cluster_check` field informs the Cluster Agent to delegate this check to on

### Template Source: Kubernetes Service Annotations

You can annotate services with the following syntax, similar to the syntax for [annotating Kubernetes Pods][8]:
You can annotate services with the following syntax, similar to the syntax for [annotating Kubernetes Pods][9]:

```yaml
ad.datadoghq.com/service.check_names: '[<INTEGRATION_NAME>]'
ad.datadoghq.com/service.init_configs: '[<INIT_CONFIG>]'
ad.datadoghq.com/service.instances: '[<INSTANCE_CONFIG>]'
```

The `%%host%%` [template variable][9] is supported and is replaced by the service's IP. The `kube_namespace` and `kube_service` tags are automatically added to the instance.
The `%%host%%` [template variable][10] is supported and is replaced by the service's IP. The `kube_namespace` and `kube_service` tags are automatically added to the instance.

#### Example: HTTP check on an NGINX-backed service

The following Service definition exposes the Pods from the `my-nginx` deployment and runs an [HTTP check][10] to measure the latency of the load balanced service:
The following Service definition exposes the Pods from the `my-nginx` deployment and runs an [HTTP check][11] to measure the latency of the load balanced service:

```yaml
apiVersion: v1
Expand Down Expand Up @@ -164,7 +164,7 @@ spec:
run: my-nginx
```

In addition, each pod should be monitored with the [NGINX check][11], as it enables the monitoring of each worker as well as the aggregated service.
In addition, each pod should be monitored with the [NGINX check][12], as it enables the monitoring of each worker as well as the aggregated service.

## Troubleshooting

Expand Down Expand Up @@ -301,10 +301,10 @@ The Agent `status` command should show the check instance running and reporting
[3]: /agent/cluster_agent/setup
[4]: /agent/autodiscovery/integrations
[5]: /agent/guide/agent-commands
[6]: /developers/write_agent_check
[7]: /integrations/mysql
[8]: /agent/autodiscovery/integrations/?tab=kubernetes#configuration
[9]: /agent/autodiscovery/template_variables
[10]: /integrations/http_check
[11]: /integrations/nginx
[12]: https://github.com/helm/charts/tree/master/stable/datadog
[6]: https://github.com/helm/charts/tree/master/stable/datadog
[7]: /developers/write_agent_check
[8]: /integrations/mysql
[9]: /agent/autodiscovery/integrations/?tab=kubernetes#configuration
[10]: /agent/autodiscovery/template_variables
[11]: /integrations/http_check
[12]: /integrations/nginx
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ For Agent v6.11+, the Datadog Agent can auto-detect the Kubernetes cluster name
**Note**: You can manually set this cluster name value with Agent v6.5+ thanks to the Agent configuration parameter [`clusterName`][11] or the `DD_CLUSTER_NAME` environment variable.

[10]: /integrations/amazon_ec2/#configuration
[11]: https://github.com/helm/charts/blob/a744ff8c90730d6d36698412150875fa96882b9d/stable/datadog/values.yaml#L58
[11]: https://github.com/helm/charts/blob/a744ff8c90730d6d36698412150875fa96882b9d/stable/datadog/values.yaml#L58
2 changes: 1 addition & 1 deletion content/en/tracing/troubleshooting/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,8 @@ Logs files are saved in the following directories by default. The `DD_TRACE_LOG_

For more details on how to configure the .NET Tracer, see the [Configuration][1] section.

[1]: /tracing/setup/dotnet#configuration

[1]: /tracing/setup/dotnet#configuration
{{% /tab %}}
{{% tab "PHP" %}}

Expand Down
6 changes: 6 additions & 0 deletions data/partials/platforms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,15 @@ platforms:
- name: amazonlinux
link: "agent/basic_agent_usage/amazonlinux/"
image: "platform_amazonlinux.png"
- name: ansible
link: "agent/basic_agent_usage/ansible/"
image: "platform_ansible.png"
- name: centos
link: "agent/basic_agent_usage/centos/"
image: "platform_centos.png"
- name: chef
link: "agent/basic_agent_usage/chef/"
image: "platform_chef.png"
- name: deb
link: "agent/basic_agent_usage/deb/"
image: "platform_debian.png"
Expand Down
30 changes: 30 additions & 0 deletions local/bin/py/build/configurations/pull_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,36 @@
- "*/assets/service_checks.json"
- "*/README.md"

- repo_name: ansible-datadog
contents:

- action: pull-and-push-file
branch: master
globs:
- README.md
options:
dest_path: '/agent/basic_agent_usage/'
file_name: 'ansible.md'
front_matters:
title: Ansible
kind: documentation
dependencies: ["https://github.com/DataDog/ansible-datadog/blob/master/README.md"]

- repo_name: chef-datadog
contents:

- action: pull-and-push-file
branch: master
globs:
- README.md
options:
dest_path: '/agent/basic_agent_usage/'
file_name: 'chef.md'
front_matters:
title: Chef
kind: documentation
dependencies: ["https://github.com/DataDog/chef-datadog/blob/master/README.md"]

- repo_name: heroku-buildpack-datadog
contents:

Expand Down
30 changes: 30 additions & 0 deletions local/bin/py/build/configurations/pull_config_preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,36 @@
- "*/assets/service_checks.json"
- "*/README.md"

- repo_name: ansible-datadog
contents:

- action: pull-and-push-file
branch: master
globs:
- README.md
options:
dest_path: '/agent/basic_agent_usage/'
file_name: 'ansible.md'
front_matters:
title: Ansible
kind: documentation
dependencies: ["https://github.com/DataDog/ansible-datadog/blob/master/README.md"]

- repo_name: chef-datadog
contents:

- action: pull-and-push-file
branch: master
globs:
- README.md
options:
dest_path: '/agent/basic_agent_usage/'
file_name: 'chef.md'
front_matters:
title: Chef
kind: documentation
dependencies: ["https://github.com/DataDog/chef-datadog/blob/master/README.md"]

- repo_name: heroku-buildpack-datadog
contents:

Expand Down