Skip to content

Commit 7e16bb5

Browse files
author
Christopher M. Neill
committed
tag entire role
1 parent 98f540f commit 7e16bb5

6 files changed

Lines changed: 5 additions & 16 deletions

File tree

ansible/docks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
roles:
1111
- { role: docker, tags: "docker" }
1212
- { role: iptables, tags: "iptables, security" }
13-
- { role: datadog }
13+
- { role: datadog, tags: "datadog" }
1414

1515
- include: krain.yml
1616
- include: filibuster.yml

ansible/mongo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
- { role: notify, tags: "notify" }
77
- { role: database }
88
- { role: container_kill_start, tags: "deploy" }
9-
- { role: datadog }
9+
- { role: datadog, tags: "datadog" }

ansible/rabbitmq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
- { role: database }
88
- { role: rabbitmq }
99
- { role: container_kill_start, tags: "deploy" }
10-
- { role: datadog }
10+
- { role: datadog, tags: datadog }

ansible/redis-slave.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
- { role: container_kill_start,
1010
container_run_args: "redis-server --slaveof {{ redis_host_address }} 6379",
1111
tags: "deploy" }
12-
- { role: datadog }
12+
- { role: datadog, tags: "datadog" }

ansible/redis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
- { role: notify, tags: "notify" }
77
- { role: database, tags: "deploy" }
88
- { role: container_kill_start, tags: "deploy" }
9-
- { role: datadog }
9+
- { role: datadog, tags: "datadog" }
Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,38 @@
11
---
22
- name: add https transport
3-
tags: ['datadog']
43
sudo: yes
54
apt:
65
name=apt-transport-https
76
state=latest
87

98
- name: add datadog apt key
10-
tags: ['datadog']
119
sudo: yes
1210
apt_key:
1311
id=C7A7DA52
1412
keyserver=keyserver.ubuntu.com
1513
state=present
1614

1715
- name: add datadog repository
18-
tags: ['datadog']
1916
sudo: yes
2017
apt_repository:
2118
repo='deb http://apt.datadoghq.com/ stable main'
2219
state=present
2320
update_cache=yes
2421

2522
- name: install dd agent
26-
tags: ['datadog']
2723
sudo: yes
2824
apt:
2925
name=datadog-agent
3026
state=latest
3127

3228
- name: add docker to dd-agent group
33-
tags: ['datadog']
3429
sudo: yes
3530
when: no_dd_monitoring != false
3631
user:
3732
name=dd-agent
3833
groups=docker
3934

4035
- name: create dd configdir
41-
tags: ['datadog']
4236
sudo: yes
4337
file:
4438
path=/etc/dd-agent/conf.d
@@ -47,15 +41,13 @@
4741
state=directory
4842

4943
- name: Create main Datadog agent configuration file
50-
tags: ['datadog']
5144
sudo: yes
5245
template:
5346
src=datadog.conf.j2
5447
dest=/etc/dd-agent/datadog.conf
5548
notify: restart datadog-agent
5649

5750
- name: install network checks for dock services
58-
tags: ['datadog']
5951
sudo: yes
6052
when: docker_config == "docks"
6153
template:
@@ -64,7 +56,6 @@
6456
notify: restart datadog-agent
6557

6658
- name: install docker integration
67-
tags: ['datadog']
6859
sudo: yes
6960
when: no_dd_monitoring != false
7061
template:
@@ -74,15 +65,13 @@
7465

7566
# assumes a config for {{ name }} exists
7667
- name: install datadog integrations
77-
tags: ['datadog']
7868
sudo: yes
7969
template:
8070
src="{{ name }}.yaml.j2"
8171
dest="/etc/dd-agent/conf.d/{{ name }}.yaml"
8272
notify: restart datadog-agent
8373

8474
- name: force restart
85-
tags: ['datadog']
8675
command: echo restart datadog
8776
when: force_restart is defined
8877
notify: restart datadog-agent

0 commit comments

Comments
 (0)