From 1a588769ddbe6b11ad0d87f51fd48ca2f9d07437 Mon Sep 17 00:00:00 2001
From: shaofeng_cheng <chengsf@winhong.com>
Date: Wed, 19 Jul 2017 15:30:59 +0800
Subject: [PATCH] Add evaluation_interval option

In ceilometer.conf there is a setting evaluation_interval.

The default is set to 60 seconds.

In pipeline.yaml,there is an interval set for those sources as well,
default value 300 seconds.

The evaluation_interval must be set >= the source interval in pipeline.yaml
or else when the evaluator runs it wont find any recent data
and set the state to insufficient data.

see:
https://docs.openstack.org/ocata/config-reference/telemetry/alarming-config-options.html

Change-Id: I82f061d1affc5c3ade75496684fe66e17928e1f3
Closes-Bug: #1704328
---
 ansible/roles/ceilometer/templates/ceilometer.conf.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ansible/roles/ceilometer/templates/ceilometer.conf.j2 b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
index 93ea7b99b4..20d5876ea3 100644
--- a/ansible/roles/ceilometer/templates/ceilometer.conf.j2
+++ b/ansible/roles/ceilometer/templates/ceilometer.conf.j2
@@ -5,6 +5,10 @@ log_dir = /var/log/kolla/ceilometer
 
 transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
 
+{% if enable_aodh | bool %}
+evaluation_interval = 300
+{% endif %}
+
 [keystone_authtoken]
 auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
 project_domain_name = {{ default_project_domain_name }}