Add service_name and package_name parameters

manifests/init.pp

@@ -22,6 +22,8 @@
 # @param package_source Local path to package file for file (not repo) based installation
 # @param manage_repo Whether to manage the package manager repository
 # @param status Service status
+# @param service_name Service name
+# @param package_name Package name
 # @param kibana_user owner of kibana.yml
 # @param kibana_group group of kibana.yml
 #
@@ -34,6 +36,8 @@
   Boolean $oss,
   Optional[String] $package_source,
   Kibana::Status $status,
+  String[1] $service_name = 'kibana',
+  String[1] $package_name = 'kibana',
   String[1] $kibana_user = 'kibana',
   String[1] $kibana_group = 'kibana',
 ) {

manifests/install.pp

@@ -19,14 +19,14 @@
     }
   }
 
-  $_package_name = $kibana::oss ? {
-    true    => 'kibana-oss',
-    default => 'kibana',
+  $_oss = $kibana::oss ? {
+    true    => '-oss',
+    default => '',
   }
 
   package { 'kibana':
     ensure => $kibana::ensure,
-    name   => $_package_name,
+    name   => "${kibana::package_name}${_oss}",
     source => $kibana::package_source,
   }
 }

manifests/service.pp

@@ -38,7 +38,7 @@
     $_enable = false
   }
 
-  service { 'kibana':
+  service { $kibana::service_name:
     ensure => $_ensure,
     enable => $_enable,
   }

spec/classes/kibana_spec.rb

@@ -184,6 +184,17 @@
             it { is_expected.to contain_file('/etc/kibana/kibana.yml').with(group: 'testgroup') }
           end
 
+          describe 'kibana_service' do
+            let(:params) { { service_name: 'kibana-custom' } }
+
+            it 'enables and starts the custom service' do
+              expect(subject).to contain_service('kibana-custom').with(
+                ensure: true,
+                enable: true
+              )
+            end
+          end
+
           describe 'manage_repo' do
             let(:params) { { manage_repo: false } }
 
@@ -226,6 +237,15 @@
               end
             end
           end
+
+          describe 'kibana_package_name' do
+            let(:params) { { package_name: 'kibana-custom' } }
+
+            it {
+              expect(subject).to contain_package('kibana').
+                with_name('kibana-custom')
+            }
+          end
         end
       end
     end