From b5f7f3d65d813d79e3ab5fdcd3420d14350aeef8 Mon Sep 17 00:00:00 2001 From: Sergei Antipov Date: Thu, 28 Jul 2016 13:22:27 +0700 Subject: [PATCH] Updated default config part --- tasks/configuration.yml | 1 + templates/etc/prometheus/prometheus.yml.j2 | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/tasks/configuration.yml b/tasks/configuration.yml index c01c11a..3c31757 100644 --- a/tasks/configuration.yml +++ b/tasks/configuration.yml @@ -39,6 +39,7 @@ owner: "{{ prometheus_user }}" group: "{{ prometheus_group }}" mode: 0644 + delimiter: '\n### START FRAGMENT ###' validate: "{{ prometheus_bin_dir }}/promtool check-config %s" notify: - reload prometheus diff --git a/templates/etc/prometheus/prometheus.yml.j2 b/templates/etc/prometheus/prometheus.yml.j2 index 40c1000..692f648 100644 --- a/templates/etc/prometheus/prometheus.yml.j2 +++ b/templates/etc/prometheus/prometheus.yml.j2 @@ -13,9 +13,3 @@ rule_files: # A list of scrape configurations. scrape_configs: - - - job_name: 'prometheus' - scrape_interval: {{ prometheus_self_scrape_interval }} - scrape_timeout: {{ prometheus_self_evaluation_interval }} - static_configs: - - targets: ['localhost:9090']