From deadb36c9272ae605e5c0435ca33aac2cbfdb27f Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Fri, 21 May 2021 12:02:07 -0400 Subject: [PATCH] Adding metrics tag to all nodeexporter/prometheus/grafana roles. --- ansible/playbooks/setup_app.yml | 4 ++-- ansible/playbooks/setup_consul_manager.yml | 2 +- ansible/playbooks/setup_debug.yml | 2 +- ansible/playbooks/setup_discovery.yml | 2 +- ansible/playbooks/setup_elasticsearch.yml | 2 +- ansible/playbooks/setup_metrics.yml | 6 +++--- ansible/playbooks/setup_mongo.yml | 2 +- ansible/playbooks/setup_node.yml | 2 +- ansible/playbooks/setup_postgres.yml | 2 +- ansible/playbooks/setup_redis.yml | 2 +- ansible/playbooks/setup_staging.yml | 6 +++--- ansible/playbooks/setup_task.yml | 2 +- ansible/playbooks/setup_www.yml | 2 +- ansible/setup.yml | 2 -- 14 files changed, 18 insertions(+), 20 deletions(-) diff --git a/ansible/playbooks/setup_app.yml b/ansible/playbooks/setup_app.yml index 6b019d928..ff38a4e13 100644 --- a/ansible/playbooks/setup_app.yml +++ b/ansible/playbooks/setup_app.yml @@ -15,7 +15,7 @@ - {role: 'dnsmasq', tags: 'dnsmasq'} - {role: 'consul', tags: 'consul'} - {role: 'consul-client', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'web', tags: 'web'} - {role: 'nginx', tags: 'nginx'} - # - {role: 'netdata', tags: 'netdata'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} diff --git a/ansible/playbooks/setup_consul_manager.yml b/ansible/playbooks/setup_consul_manager.yml index b5999d0f6..67cd76ec7 100644 --- a/ansible/playbooks/setup_consul_manager.yml +++ b/ansible/playbooks/setup_consul_manager.yml @@ -15,4 +15,4 @@ - {role: 'dnsmasq', tags: 'dnsmasq'} - {role: 'consul', tags: 'consul'} - {role: 'consul-manager', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} diff --git a/ansible/playbooks/setup_debug.yml b/ansible/playbooks/setup_debug.yml index 5fb91c177..3722df9b4 100644 --- a/ansible/playbooks/setup_debug.yml +++ b/ansible/playbooks/setup_debug.yml @@ -15,7 +15,7 @@ - {role: 'dnsmasq', tags: 'dnsmasq'} - {role: 'consul', tags: 'consul'} - {role: 'consul-client', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} - {role: 'web', tags: 'web'} - {role: 'node', tags: 'node'} - {role: 'nginx', tags: 'nginx'} diff --git a/ansible/playbooks/setup_discovery.yml b/ansible/playbooks/setup_discovery.yml index 3d2627748..80235e54f 100644 --- a/ansible/playbooks/setup_discovery.yml +++ b/ansible/playbooks/setup_discovery.yml @@ -15,6 +15,6 @@ # - {role: 'dnsmasq', tags: 'dnsmasq'} # - {role: 'consul', tags: 'consul'} # - {role: 'consul-client', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} - {role: 'docker-compose', tags: 'docker-compose'} - {role: 'backups', tags: 'backups'} diff --git a/ansible/playbooks/setup_elasticsearch.yml b/ansible/playbooks/setup_elasticsearch.yml index add593661..c87c4978d 100644 --- a/ansible/playbooks/setup_elasticsearch.yml +++ b/ansible/playbooks/setup_elasticsearch.yml @@ -14,6 +14,6 @@ - {role: 'dnsmasq', tags: 'dnsmasq'} - {role: 'consul', tags: 'consul'} - {role: 'consul-client', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} - {role: 'elasticsearch', tags: 'elasticsearch'} - {role: 'monitor', tags: 'monitor'} diff --git a/ansible/playbooks/setup_metrics.yml b/ansible/playbooks/setup_metrics.yml index ceb08098d..e198a662e 100644 --- a/ansible/playbooks/setup_metrics.yml +++ b/ansible/playbooks/setup_metrics.yml @@ -16,6 +16,6 @@ - {role: 'consul', tags: 'consul'} - {role: 'consul-client', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} - - {role: 'prometheus', tags: 'prometheus'} - - {role: 'grafana', tags: 'grafana'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} + - {role: 'prometheus', tags: ['prometheus', 'metrics']} + - {role: 'grafana', tags: ['grafana', 'metrics']} diff --git a/ansible/playbooks/setup_mongo.yml b/ansible/playbooks/setup_mongo.yml index 637b8e3a9..3ffd1b576 100644 --- a/ansible/playbooks/setup_mongo.yml +++ b/ansible/playbooks/setup_mongo.yml @@ -15,7 +15,7 @@ - {role: 'dnsmasq', tags: 'dnsmasq'} - {role: 'consul', tags: 'consul'} - {role: 'consul-client', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} - {role: 'mongo', tags: 'mongo'} - {role: 'monitor', tags: 'monitor'} - {role: 'benchmark', tags: 'benchmark'} diff --git a/ansible/playbooks/setup_node.yml b/ansible/playbooks/setup_node.yml index 2254558d1..4acb0af85 100644 --- a/ansible/playbooks/setup_node.yml +++ b/ansible/playbooks/setup_node.yml @@ -15,6 +15,6 @@ - {role: 'dnsmasq', tags: 'dnsmasq'} - {role: 'consul', tags: 'consul'} - {role: 'consul-client', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} - {role: 'node', tags: 'node'} diff --git a/ansible/playbooks/setup_postgres.yml b/ansible/playbooks/setup_postgres.yml index f14db2672..601523a4b 100644 --- a/ansible/playbooks/setup_postgres.yml +++ b/ansible/playbooks/setup_postgres.yml @@ -15,6 +15,6 @@ - {role: 'dnsmasq', tags: 'dnsmasq'} - {role: 'consul', tags: 'consul'} - {role: 'consul-client', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} - {role: 'postgres', tags: 'postgres'} - {role: 'monitor', tags: 'monitor'} diff --git a/ansible/playbooks/setup_redis.yml b/ansible/playbooks/setup_redis.yml index a857efbd8..4bee96d70 100644 --- a/ansible/playbooks/setup_redis.yml +++ b/ansible/playbooks/setup_redis.yml @@ -14,6 +14,6 @@ - {role: 'dnsmasq', tags: 'dnsmasq'} - {role: 'consul', tags: 'consul'} - {role: 'consul-client', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} - {role: 'redis', tags: 'redis'} - {role: 'monitor', tags: 'monitor'} diff --git a/ansible/playbooks/setup_staging.yml b/ansible/playbooks/setup_staging.yml index 650006a52..9b4a0f95b 100644 --- a/ansible/playbooks/setup_staging.yml +++ b/ansible/playbooks/setup_staging.yml @@ -22,6 +22,6 @@ - {role: 'web', tags: 'web'} - {role: 'nginx', tags: 'nginx'} - {role: 'node', tags: 'node'} - - {role: 'node-exporter', tags: 'node-exporter'} - - {role: 'prometheus', tags: 'prometheus'} - - {role: 'grafana', tags: 'grafana'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} + - {role: 'prometheus', tags: ['prometheus', 'metrics']} + - {role: 'grafana', tags: ['grafana', 'metrics']} diff --git a/ansible/playbooks/setup_task.yml b/ansible/playbooks/setup_task.yml index 1457b4dfe..f52595491 100644 --- a/ansible/playbooks/setup_task.yml +++ b/ansible/playbooks/setup_task.yml @@ -16,5 +16,5 @@ - {role: 'consul-client', tags: 'consul'} - {role: 'apns', tags: 'apns'} # - {role: 'netdata', tags: 'netdata'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} - {role: 'celery_task', tags: 'celery'} diff --git a/ansible/playbooks/setup_www.yml b/ansible/playbooks/setup_www.yml index 61672b312..afde42513 100644 --- a/ansible/playbooks/setup_www.yml +++ b/ansible/playbooks/setup_www.yml @@ -15,7 +15,7 @@ - {role: 'dnsmasq', tags: 'dnsmasq'} - {role: 'consul', tags: 'consul'} - {role: 'consul-client', tags: 'consul'} - - {role: 'node-exporter', tags: 'node-exporter'} + - {role: 'node-exporter', tags: ['node-exporter', 'metrics']} - {role: 'monitor', tags: 'monitor'} - {role: 'letsencrypt', tags: 'letsencrypt'} - {role: 'haproxy', tags: 'haproxy'} diff --git a/ansible/setup.yml b/ansible/setup.yml index 454c80bdb..fe896ba00 100644 --- a/ansible/setup.yml +++ b/ansible/setup.yml @@ -15,8 +15,6 @@ when: "'elasticsearch' in group_names" - import_playbook: playbooks/setup_task.yml when: "'task' in group_names" -# - import_playbook: playbooks/setup_debug.yml -# when: "'debugs' in group_names" - import_playbook: playbooks/setup_consul_manager.yml when: "'consul' in group_names" - import_playbook: playbooks/setup_staging.yml