From bdde282558bf0de3226ffcfffffbd7c2091e2bd7 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 25 Apr 2022 08:51:35 +0900
Subject: [PATCH] Add support for [statsd] creator

Change-Id: I719ff8386c7ea73cbaeae4d7db8cc6ed82b8cf79
---
 manifests/statsd.pp                              | 16 +++++++++++-----
 .../notes/statsd-creator-4dd4b95ac66cef5a.yaml   |  4 ++++
 spec/classes/gnocchi_statsd_spec.rb              | 11 +++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/statsd-creator-4dd4b95ac66cef5a.yaml

diff --git a/manifests/statsd.pp b/manifests/statsd.pp
index 78dbcfe0..c61dc2aa 100644
--- a/manifests/statsd.pp
+++ b/manifests/statsd.pp
@@ -17,6 +17,14 @@
 #   (optional) Delay between flushes.
 #   Defaults to $::os_service_default
 #
+# [*archive_policy_name*]
+#   (optional) Archive policy name to use when creating metrics.
+#   Defaults to $::os_service_default.
+#
+# [*creator*]
+#   (required) Creator value to use to identify statsd in Gnocchi.
+#   Defaults to $::os_service_default.
+#
 # [*enabled*]
 #   (optional) Should the service be enabled.
 #   Defaults to true
@@ -29,16 +37,13 @@
 #   (optional) Whether the service should be managed by Puppet.
 #   Defaults to true.
 #
-# [*archive_policy_name*]
-#   (optional) Archive policy name to use when creating metrics.
-#   Defaults to $::os_service_default.
-#
 class gnocchi::statsd (
   $resource_id,
   $host                = $::os_service_default,
   $port                = $::os_service_default,
   $flush_delay         = $::os_service_default,
   $archive_policy_name = $::os_service_default,
+  $creator             = $::os_service_default,
   $manage_service      = true,
   $enabled             = true,
   $package_ensure      = 'present',
@@ -73,8 +78,9 @@ class gnocchi::statsd (
     'statsd/resource_id'         : value => $resource_id;
     'statsd/host'                : value => $host;
     'statsd/port'                : value => $port;
-    'statsd/archive_policy_name' : value => $archive_policy_name;
     'statsd/flush_delay'         : value => $flush_delay;
+    'statsd/archive_policy_name' : value => $archive_policy_name;
+    'statsd/creator'             : value => $creator;
   }
 
 }
diff --git a/releasenotes/notes/statsd-creator-4dd4b95ac66cef5a.yaml b/releasenotes/notes/statsd-creator-4dd4b95ac66cef5a.yaml
new file mode 100644
index 00000000..0652141b
--- /dev/null
+++ b/releasenotes/notes/statsd-creator-4dd4b95ac66cef5a.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``gnocchi::statsd::creator`` parameter has been added.
diff --git a/spec/classes/gnocchi_statsd_spec.rb b/spec/classes/gnocchi_statsd_spec.rb
index 0bb6205e..5b3757df 100644
--- a/spec/classes/gnocchi_statsd_spec.rb
+++ b/spec/classes/gnocchi_statsd_spec.rb
@@ -28,6 +28,7 @@ describe 'gnocchi::statsd' do
       is_expected.to contain_gnocchi_config('statsd/port').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_gnocchi_config('statsd/flush_delay').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_gnocchi_config('statsd/archive_policy_name').with_value('<SERVICE DEFAULT>')
+      is_expected.to contain_gnocchi_config('statsd/creator').with_value('<SERVICE DEFAULT>')
     end
 
     [{:enabled => true}, {:enabled => false}].each do |param_hash|
@@ -94,6 +95,16 @@ describe 'gnocchi::statsd' do
         is_expected.to contain_gnocchi_config('statsd/archive_policy_name').with_value('high')
       end
     end
+
+    context 'with creator' do
+      before do
+        params.merge!({ :creator => 'creator' })
+      end
+
+      it 'configures the parameter' do
+        is_expected.to contain_gnocchi_config('statsd/creator').with_value('creator')
+      end
+    end
   end
 
   on_supported_os({