Initial yaml support draft

Author: deric

data/common.yaml

@@ -1,4 +1,5 @@
 ---
+fluentbit::format: classic
 fluentbit::manage_package_repo: true
 fluentbit::package_ensure: present
 fluentbit::package_name: fluent-bit

manifests/config_yaml.pp

@@ -0,0 +1,48 @@
+# @summary Configures fluentbit using YAML config
+#
+# @param config_dir
+#   Absolute path to main configuration directory
+# @param plugins_path
+# @param scripts_path
+#
+# @private
+class fluentbit::config_yaml (
+  Stdlib::Absolutepath $config_dir = $fluentbit::config_dir,
+  Stdlib::Absolutepath $plugins_path = $fluentbit::plugins_path,
+  Stdlib::Absolutepath $scripts_path = $fluentbit::scripts_path,
+) {
+  assert_private()
+
+  File {
+    ensure  => file,
+    mode    => $fluentbit::config_file_mode,
+  }
+
+  if $fluentbit::manage_config_dir {
+    file { $config_dir:
+      ensure  => directory,
+      purge   => true,
+      recurse => true,
+      mode    => $fluentbit::config_folder_mode,
+    }
+  }
+
+  $config_hash = {
+    'env' => $fluentbit::variables,
+    'service' => {
+      'flush' => $fluentbit::flush,
+      'log_level' => $fluentbit::log_level,
+      'http_server' => bool2str($fluentbit::http_server, 'on', 'off'),
+    },
+    'pipeline' => {
+      'inputs' => $fluentbit::inputs,
+      'outputs' => $fluentbit::outputs,
+      'filters' => $fluentbit::filters,
+    }
+  } + $fluentbit::yaml
+
+  file { "$config_dir/fluent-bit.yaml":
+    mode    => $fluentbit::config_file_mode,
+    content => stdlib::to_yaml($config_hash),
+  }
+}

manifests/init.pp

@@ -1,6 +1,7 @@
 # @summary Manage fluentbit installation
 #
 # @see https://docs.fluentbit.io/manual/
+# @param format Configuration files format, either `classic` or `yaml`.
 #
 # @param manage_package_repo Installs the package repositories
 # @param inputs Hash of the INPUT plugins to be configured
@@ -197,9 +198,11 @@
 #   macro definitions to use in the configuration file
 #   the will be registered using the *@SET* command or using Env section in YAML syntax.
 #
+# @param yaml Configuration that will be converted to yaml (requires `fluentbit:format` set to `yaml`).
 # @example
 #   include fluentbit
 class fluentbit (
+  Enum['classic', 'yaml'] $format,
   Boolean                 $manage_package_repo,
   String[1]               $package_ensure,
   String[1]               $package_name,
@@ -268,31 +271,42 @@
   Fluentbit::Stream           $streams = {},
   Array[Stdlib::Absolutepath] $plugins = [],
   Optional[String[1]]         $memory_max = undef,
+  Hash                        $yaml = {},
 ) {
   $plugins_path = "${config_dir}/${plugins_dir}"
   $scripts_path = "${config_dir}/${scripts_dir}"
 
   contain fluentbit::repo
   contain fluentbit::install
-  contain fluentbit::config
   contain fluentbit::service
 
-  Class['fluentbit::repo']
-  -> Class['fluentbit::install']
-  -> Class['fluentbit::config']
-  ~> Class['fluentbit::service']
+  if $format == 'classic' {
+    contain fluentbit::config
 
-  $inputs.each |$name, $conf| {
-    create_resources(fluentbit::pipeline, { $name => { 'pipeline' => 'input' } + $conf })
-  }
+    Class['fluentbit::repo']
+    -> Class['fluentbit::install']
+    -> Class['fluentbit::config']
+    ~> Class['fluentbit::service']
 
-  $outputs.each |$name, $conf| {
-    create_resources(fluentbit::pipeline, { $name => { 'pipeline' => 'output' } + $conf })
-  }
+    $inputs.each |$name, $conf| {
+      create_resources(fluentbit::pipeline, { $name => { 'pipeline' => 'input' } + $conf })
+    }
 
-  $filters.each |$name, $conf| {
-    create_resources(fluentbit::pipeline, { $name => { 'pipeline' => 'filter' } + $conf })
-  }
+    $outputs.each |$name, $conf| {
+      create_resources(fluentbit::pipeline, { $name => { 'pipeline' => 'output' } + $conf })
+    }
 
-  create_resources(fluentbit::upstream, $upstreams)
+    $filters.each |$name, $conf| {
+      create_resources(fluentbit::pipeline, { $name => { 'pipeline' => 'filter' } + $conf })
+    }
+
+    create_resources(fluentbit::upstream, $upstreams)
+  } else {
+    contain fluentbit::config_yaml
+
+    Class['fluentbit::repo']
+    -> Class['fluentbit::install']
+    -> Class['fluentbit::config_yaml']
+    ~> Class['fluentbit::service']
+  }
 }

spec/classes/fluentbit_spec.rb

@@ -181,4 +181,47 @@
         .with_content(%r{MemoryMax=2G})
     }
   end
+
+  describe 'with yaml config' do
+    context 'with default parameters' do
+      let(:params) do
+        {
+          format: 'yaml',
+        }
+      end
+
+      it { is_expected.to compile.with_all_deps }
+      it { is_expected.to contain_class('fluentbit::config_yaml') }
+      it { is_expected.not_to contain_class('fluentbit::config') }
+
+      it {
+        is_expected.to contain_file('/etc/fluent-bit/fluent-bit.yaml')
+          .with_ensure('file')
+          .with_content(%r{^---\n})
+      }
+    end
+
+    context 'configure outputs' do
+      let(:params) do
+        {
+          format: 'yaml',
+          outputs: {
+            'prometheus': {
+              'plugin': 'prometheus_exporter',
+              'properties': {
+                'match': 'nginx.metrics.*',
+                'host': '0.0.0.0',
+                'port': '2021',
+              }
+            }
+          },
+        }
+      end
+
+      it {
+        is_expected.to contain_file('/etc/fluent-bit/fluent-bit.yaml')
+          .with_content(%r{outputs:\n\s+prometheus:})
+      }
+    end
+  end
 end