Merge pull request #6 from cloudalchemy/external_labels

prometheus_external_labels variable assignment dynamically
cloudalchemy · Nov 28, 2017 · fb1f9e5 · fb1f9e5
2 parents bbee7a3 + 2898a82
commit fb1f9e5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -22,12 +22,12 @@ prometheus_alertmanager_config: []
 #    proxy_url: "127.0.0.2"
 
 prometheus_global:
-  scrape_interval: 15s
-  scrape_timeout: 10s
+  scrape_interval: 60s
+  scrape_timeout: 15s
   evaluation_interval: 15s
 
 prometheus_external_labels:
-  environment: "{{ ansible_domain }}"
+  environment: "{{ ansible_fqdn | default(ansible_host) | default(inventory_hostname) }}"
 
 prometheus_config_flags_extra: {}