From 6ca135ebbce28562bddf4de35dee701c3334c0b6 Mon Sep 17 00:00:00 2001
From: Gaudenz Steinlin <gaudenz.steinlin@cloudscale.ch>
Date: Tue, 4 Oct 2016 10:26:53 +0200
Subject: [PATCH] Make ceilometer sample interval configurable

This could already be configured via the ceilometer_pipeline_yaml_overrides
in theory, but in practice this is very unpractical as one would have to
override the whole sources configuration. Only overriding one key in a
list of dicts is not possible.

Change-Id: Ieb5569982f080446295cecc33fb70c6b5d1cb9d6
---
 defaults/main.yml                                         | 7 +++++++
 ...onfigure-polling-sample-interval-54b2fb66140b4220.yaml | 6 ++++++
 templates/pipeline.yaml.j2                                | 8 ++++----
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/configure-polling-sample-interval-54b2fb66140b4220.yaml

diff --git a/defaults/main.yml b/defaults/main.yml
index d3771375..9ecfe7a2 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -122,6 +122,13 @@ sahara_ceilometer_enabled: false
 ceilometer_aodh_enabled: false
 ceilometer_gnocchi_enabled: false
 
+# Sampling interval for ceilometer-polling services
+ceilometer_sample_interval: 600
+ceilometer_meter_sample_interval: "{{ ceilometer_sample_interval }}"
+ceilometer_cpu_source_sample_interval: "{{ ceilometer_sample_interval }}"
+ceilometer_disk_source_sample_interval: "{{ ceilometer_sample_interval }}"
+ceilometer_network_source_sample_interval: "{{ ceilometer_sample_interval }}"
+
 ## Keystone authentication middleware
 ceilometer_keystone_auth_plugin: password
 
diff --git a/releasenotes/notes/configure-polling-sample-interval-54b2fb66140b4220.yaml b/releasenotes/notes/configure-polling-sample-interval-54b2fb66140b4220.yaml
new file mode 100644
index 00000000..1b1c0b9e
--- /dev/null
+++ b/releasenotes/notes/configure-polling-sample-interval-54b2fb66140b4220.yaml
@@ -0,0 +1,6 @@
+---
+feature:
+  - |
+    Support has been added to configure the sampling intervall for
+    ceilometer-polling by setting ``ceilometer_sample_interval``.
+    See the Ceilometer role documentation for per source options.
diff --git a/templates/pipeline.yaml.j2 b/templates/pipeline.yaml.j2
index a5bd5148..7b8e9f58 100644
--- a/templates/pipeline.yaml.j2
+++ b/templates/pipeline.yaml.j2
@@ -1,20 +1,20 @@
 ---
 sources:
     - name: meter_source
-      interval: 600
+      interval: {{ ceilometer_meter_sample_interval }}
       meters:
           - "*"
       sinks:
           - meter_sink
     - name: cpu_source
-      interval: 600
+      interval: {{ ceilometer_cpu_source_sample_interval }}
       meters:
           - "cpu"
       sinks:
           - cpu_sink
           - cpu_delta_sink
     - name: disk_source
-      interval: 600
+      interval: {{ ceilometer_disk_source_sample_interval }}
       meters:
           - "disk.read.bytes"
           - "disk.read.requests"
@@ -27,7 +27,7 @@ sources:
       sinks:
           - disk_sink
     - name: network_source
-      interval: 600
+      interval: {{ ceilometer_network_source_sample_interval }}
       meters:
           - "network.incoming.bytes"
           - "network.incoming.packets"