From 139df049cf42b705a068e0e1d7b90b09b0756158 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 5 Nov 2021 09:27:42 +0900
Subject: [PATCH] Add support for [polling] batch_size

Conflicts:
	manifests/agent/polling.pp
	spec/classes/ceilometer_agent_polling_spec.rb

Change-Id: I44f07afcdd5a723afda8a9fb2abd698508694278
(cherry picked from commit c3c1afb8bd9d446a4be2c96f640f44e10f45541e)
(cherry picked from commit e08fc271332aa35a9c1c64b118caf6af84e37b69)
---
 manifests/agent/polling.pp                               | 9 +++++++++
 .../notes/polling-batch_size-95f15dc9d96b96b4.yaml       | 5 +++++
 spec/classes/ceilometer_agent_polling_spec.rb            | 9 +++++++++
 3 files changed, 23 insertions(+)
 create mode 100644 releasenotes/notes/polling-batch_size-95f15dc9d96b96b4.yaml

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 4d17e56..8dbb70c 100644
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -67,6 +67,10 @@
 #   This is used only if manage_polling is true.
 #   Defaults to undef
 #
+# [*batch_size*]
+#   (Optional) Batch size of samples to send to notification agent.
+#   Defaults to $::os_service_default
+#
 class ceilometer::agent::polling (
   $manage_service            = true,
   $enabled                   = true,
@@ -82,6 +86,7 @@ class ceilometer::agent::polling (
   $polling_interval          = 600,
   $polling_meters            = $::ceilometer::params::polling_meters,
   $polling_config            = undef,
+  $batch_size                = $::os_service_default,
 ) inherits ceilometer {
 
   include ceilometer::deps
@@ -140,6 +145,10 @@ class ceilometer::agent::polling (
     }
   }
 
+  ceilometer_config {
+    'polling/batch_size': value => $batch_size
+  }
+
   if $manage_service {
     if $enabled {
       $service_ensure = 'running'
diff --git a/releasenotes/notes/polling-batch_size-95f15dc9d96b96b4.yaml b/releasenotes/notes/polling-batch_size-95f15dc9d96b96b4.yaml
new file mode 100644
index 0000000..403871e
--- /dev/null
+++ b/releasenotes/notes/polling-batch_size-95f15dc9d96b96b4.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The ``ceilometer::agent::polling`` class now suppports the new
+    ``batch_size`` parameter.
diff --git a/spec/classes/ceilometer_agent_polling_spec.rb b/spec/classes/ceilometer_agent_polling_spec.rb
index 4f38d87..3f1fdf4 100644
--- a/spec/classes/ceilometer_agent_polling_spec.rb
+++ b/spec/classes/ceilometer_agent_polling_spec.rb
@@ -53,6 +53,7 @@ describe 'ceilometer::agent::polling' do
       )}
 
       it { should contain_ceilometer_config('coordination/backend_url').with_value('<SERVICE DEFAULT>') }
+      it { should contain_ceilometer_config('polling/batch_size').with_value('<SERVICE DEFAULT>') }
       it { should_not contain_file('polling') }
     end
 
@@ -232,6 +233,14 @@ sources:
 
       it { should contain_ceilometer_config('coordination/backend_url').with_value('redis://localhost:6379') }
     end
+
+    context 'when batch_size is set' do
+      before do
+        params.merge!( :batch_size => 50 )
+      end
+
+      it { should contain_ceilometer_config('polling/batch_size').with_value(50) }
+    end
   end
 
   on_supported_os({
-- 
2.45.2