Skip to content

Commit 007d1e0

Browse files
author
Christopher M. Neill
committed
Fixing some typos, misnamed files and passing in vars.
1 parent 4b36ef7 commit 007d1e0

4 files changed

Lines changed: 25 additions & 25 deletions

File tree

ansible/roles/datadog/tasks/main.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
11
---
2-
- name: install dd agent
3-
tags: ['datadog']
4-
sudo: yes
5-
apt:
6-
name=datadog-agent
7-
state=latest
8-
9-
- name: create dd configdir
10-
tags: ['datadog']
11-
sudo: yes
12-
file:
13-
path=/etc/dd-agent/conf.d
14-
owner=root
15-
mode=0555
16-
state=directory
17-
182
- name: add https transport
193
tags: ['datadog']
204
sudo: yes
@@ -38,6 +22,22 @@
3822
state=present
3923
update_cache=yes
4024

25+
- name: install dd agent
26+
tags: ['datadog']
27+
sudo: yes
28+
apt:
29+
name=datadog-agent
30+
state=latest
31+
32+
- name: create dd configdir
33+
tags: ['datadog']
34+
sudo: yes
35+
file:
36+
path=/etc/dd-agent/conf.d
37+
owner=root
38+
mode=0555
39+
state=directory
40+
4141
- name: Create main Datadog agent configuration file
4242
tags: ['datadog']
4343
sudo: yes
@@ -55,13 +55,13 @@
5555
dest=/etc/dd-agent/conf.d/tcp_check.yaml
5656
notify: restart datadog-agent
5757

58-
# assumes a config for {{ app_name }} exists
58+
# assumes a config for {{ name }} exists
5959
- name: install datadog integrations
6060
tags: ['datadog']
6161
sudo: yes
6262
template:
63-
src="{{ app_name }}.yaml.j2"
64-
dest="/etc/dd-agent/conf.d/{{ app_name }}.yaml.j2"
63+
src="{{ name }}.yaml.j2"
64+
dest="/etc/dd-agent/conf.d/{{ name }}.yaml"
6565
notify: restart datadog-agent
6666

6767
- name: force restart
File renamed without changes.

ansible/roles/datadog/templates/rabbitmq.conf.j2

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
init_config:
2+
3+
instances:
4+
- {{ name }}_api_url: http://localhost:15672/api/
5+
{{ name }}_user: {{ rabbit_username }}
6+
{{ name }}_pass: {{ rabbit_password }}

0 commit comments

Comments
 (0)