Merge remote-tracking branch 'upstream/master' into zope4py2

component/mca/buildout.cfg

@@ -12,8 +12,8 @@ parts =
 
 [mca]
 recipe = slapos.recipe.cmmi
-url = https://lab.nexedi.com/nexedi/metadata-collect-agent/-/archive/v0.3.0/metadata-collect-agent-v0.3.0.tar.gz
-md5sum = 9c1f6582848be94e99af10d31dd5e0ba
+url = https://lab.nexedi.com/nexedi/metadata-collect-agent/-/archive/v0.3.1/metadata-collect-agent-v0.3.1.tar.gz
+md5sum = cbd6cf10f83c760cebc19bb9c1455f8e
 configure-command = :
 make-targets =
   no-dracut

software/fluent-bit/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = b2845159dd53f942f32c4d4348934ce2
+md5sum = b548a209f2846921c3dd969c9059f28c

software/fluent-bit/instance.cfg.in

@@ -50,6 +50,6 @@ install =
 
 [fluent-bit-service]
 recipe  = slapos.cookbook:wrapper
-command-line = {{ fluent_bit_location }}/bin/fluent-bit -c ${fluent-bit-config-file:location}
+command-line = {{ fluent_bit_location }}/bin/fluent-bit -e {{ fluentbit_plugin_wendelin_location }}/lib/libfluentbit_wendelin.so -c ${fluent-bit-config-file:location}
 wrapper-path = ${directory:service}/fluentbit-service
 output = $${:wrapper-path}

software/fluent-bit/software.cfg

@@ -3,12 +3,17 @@ extends =
   buildout.hash.cfg
   ../../stack/slapos.cfg
   ../../stack/monitor/buildout.cfg
-  ../../component/fluent-bit/buildout.cfg
+  ../../component/fluent-bit/buildout.cfg  
+  ../../component/fluentbit-plugin-wendelin/buildout.cfg
 
 parts =
   slapos-cookbook
   instance-profile
 
+[fluentbit-plugin-wendelin]
+url = https://lab.nexedi.com/nexedi/fluentbit-plugin-wendelin/-/archive/v0.1%D0%B0-wendelin/fluentbit-plugin-wendelin-v0.1%D0%B0-wendelin.tar.gz
+md5sum = 9ae13adf8406b368e4acb029c73ce8b8
+
 [instance-profile]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance.cfg.in
@@ -16,3 +21,4 @@ rendered = ${buildout:directory}/instance.cfg
 context =
   section buildout buildout
   key fluent_bit_location fluent-bit:location
+  key fluentbit_plugin_wendelin_location fluentbit-plugin-wendelin:location