From c54bd02f2d1e0a5587a3df255f50c3120f26ecf5 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Thu, 27 Apr 2017 09:04:25 +1000 Subject: [PATCH] Add some datadog host tags Tags are done with a key:value seperated syntax so that you can pick between various things like environ: to group them. --- inventory/host_vars/bastion.opentechsjc.bonnyci.org | 5 +++++ inventory/host_vars/elk.opentechsjc.bonnyci.org | 5 +++++ inventory/host_vars/logs.opentechsjc.bonnyci.org | 5 +++++ inventory/host_vars/merger01.v2.opentechsjc.bonnyci.org | 5 +++++ inventory/host_vars/nodepool.v2.opentechsjc.bonnyci.org | 5 +++++ inventory/host_vars/nodepool.v3.opentechsjc.bonnyci.org | 5 +++++ inventory/host_vars/zuul.v2.opentechsjc.bonnyci.org | 5 +++++ inventory/host_vars/zuul.v3.opentechsjc.bonnyci.org | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/inventory/host_vars/bastion.opentechsjc.bonnyci.org b/inventory/host_vars/bastion.opentechsjc.bonnyci.org index def21f7b..842fdbbc 100644 --- a/inventory/host_vars/bastion.opentechsjc.bonnyci.org +++ b/inventory/host_vars/bastion.opentechsjc.bonnyci.org @@ -26,6 +26,11 @@ ansible_runner_tasks: user: cideploy ansible_remote_user: ubuntu +datadog_tags: + - environ:common + - role:bastion + - deploy:production + dns_subdomain: internal.opentechsjc.bonnyci.org bonnyci_bastion_ssl: true diff --git a/inventory/host_vars/elk.opentechsjc.bonnyci.org b/inventory/host_vars/elk.opentechsjc.bonnyci.org index 0f37316a..8e91adff 100644 --- a/inventory/host_vars/elk.opentechsjc.bonnyci.org +++ b/inventory/host_vars/elk.opentechsjc.bonnyci.org @@ -1,3 +1,8 @@ --- ansible_host: elk.internal.opentechsjc.bonnyci.org ansible_user: ubuntu + +datadog_tags: + - environ:common + - role:elk + - deploy:production diff --git a/inventory/host_vars/logs.opentechsjc.bonnyci.org b/inventory/host_vars/logs.opentechsjc.bonnyci.org index 46747752..4e2b989c 100644 --- a/inventory/host_vars/logs.opentechsjc.bonnyci.org +++ b/inventory/host_vars/logs.opentechsjc.bonnyci.org @@ -2,5 +2,10 @@ ansible_host: logs.internal.opentechsjc.bonnyci.org ansible_user: ubuntu +datadog_tags: + - environ:common + - role:elk + - deploy:production + letsencrypt_csr_cn: logs.bonnyci.org bonnyci_logs_ssl: yes diff --git a/inventory/host_vars/merger01.v2.opentechsjc.bonnyci.org b/inventory/host_vars/merger01.v2.opentechsjc.bonnyci.org index cb56b6dc..e783eb1c 100644 --- a/inventory/host_vars/merger01.v2.opentechsjc.bonnyci.org +++ b/inventory/host_vars/merger01.v2.opentechsjc.bonnyci.org @@ -2,5 +2,10 @@ ansible_host: merger01.internal.opentechsjc.bonnyci.org ansible_user: ubuntu +datadog_tags: + - environ:v2 + - role:zuul + - deploy:production + zuul_components: - zuul-merger diff --git a/inventory/host_vars/nodepool.v2.opentechsjc.bonnyci.org b/inventory/host_vars/nodepool.v2.opentechsjc.bonnyci.org index b9751268..e777b116 100644 --- a/inventory/host_vars/nodepool.v2.opentechsjc.bonnyci.org +++ b/inventory/host_vars/nodepool.v2.opentechsjc.bonnyci.org @@ -2,4 +2,9 @@ ansible_host: nodepool.internal.opentechsjc.bonnyci.org ansible_user: ubuntu +datadog_tags: + - environ:v2 + - role:nodepool + - deploy:production + zookeeper_myid: 1 diff --git a/inventory/host_vars/nodepool.v3.opentechsjc.bonnyci.org b/inventory/host_vars/nodepool.v3.opentechsjc.bonnyci.org index acd58dc8..a326d7fd 100644 --- a/inventory/host_vars/nodepool.v3.opentechsjc.bonnyci.org +++ b/inventory/host_vars/nodepool.v3.opentechsjc.bonnyci.org @@ -2,4 +2,9 @@ ansible_host: nodepool.internal.v3.opentechsjc.bonnyci.org ansible_user: ubuntu +datadog_tags: + - environ:v3 + - role:nodepool + - deploy:production + zookeeper_myid: 1 diff --git a/inventory/host_vars/zuul.v2.opentechsjc.bonnyci.org b/inventory/host_vars/zuul.v2.opentechsjc.bonnyci.org index 086d704b..e17edf41 100644 --- a/inventory/host_vars/zuul.v2.opentechsjc.bonnyci.org +++ b/inventory/host_vars/zuul.v2.opentechsjc.bonnyci.org @@ -2,6 +2,11 @@ ansible_host: zuul.internal.opentechsjc.bonnyci.org ansible_user: ubuntu +datadog_tags: + - environ:v2 + - role:zuul + - deploy:production + letsencrypt_csr_cn: zuul.bonnyci.org bonnyci_zuul_webapp_ssl: yes diff --git a/inventory/host_vars/zuul.v3.opentechsjc.bonnyci.org b/inventory/host_vars/zuul.v3.opentechsjc.bonnyci.org index a13c5657..b913b66d 100644 --- a/inventory/host_vars/zuul.v3.opentechsjc.bonnyci.org +++ b/inventory/host_vars/zuul.v3.opentechsjc.bonnyci.org @@ -2,6 +2,11 @@ ansible_host: zuul.internal.v3.opentechsjc.bonnyci.org ansible_user: ubuntu +datadog_tags: + - environ:v3 + - role:zuul + - deploy:production + letsencrypt_csr_cn: zuul.v3.opentechsjc.bonnyci.org bonnyci_zuul_webapp_ssl: yes