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

software/fluent-bit/README.md

+# Fluent-bit
+
+## When instantiating Fluent-bit you can use the following example config:
+```
+release="https://lab.nexedi.com/nexedi/slapos/raw/master/software/fluent-bit/software.cfg"
+supply(release, "COMP-****")
+partition_parameter_kw = {
+    "service": {
+        "flush": 5,
+        "daemon": "off",
+        "log_level": "debug"
+    },
+    "input": {
+        "name": "mqtt",
+        "tag": "data",
+        "port": 1883
+    },
+    "output": {
+        "name": "forward",
+        "match": "*",
+        "host": "127.0.0.1",
+        "port": 24224
+    }
+}
+filter_kw = {"computer_guid": "COMP-****"}
+request(software_release = release, partition_reference='****', partition_parameter_kw=partition_parameter_kw, filter_kw = filter_kw)
+```

software/fluent-bit/buildout.hash.cfg

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

software/fluent-bit/instance.cfg.in

 [buildout]
 parts =
+  directory
+  fluent-bit-config-file
   fluent-bit-service
-  
-eggs-directory = {{ buildout['eggs-directory'] }}
-develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
+
+eggs-directory = {{ buildout["eggs-directory"] }}
+develop-eggs-directory = {{ buildout["develop-eggs-directory"] }}
 offline = true
 
+[instance-parameter]
+recipe = slapos.cookbook:slapconfiguration
+computer = ${slap-connection:computer-id}
+partition = ${slap-connection:partition-id}
+url = ${slap-connection:server-url}
+key = ${slap-connection:key-file}
+cert = ${slap-connection:cert-file}
+
 [directory]
 recipe = slapos.cookbook:mkdirectory
 home = ${buildout:directory}
@@ -17,8 +27,29 @@ promise = ${:etc}/promise/
 log = ${:var}/log
 bin = ${:home}/bin
 
+[fluent-bit-config-file]
+recipe = slapos.recipe.build
+location = ${directory:etc}/${:_buildout_section_name_}.cfg
+ip = ${instance-parameter:ipv4-random}
+install =
+  config = open(self.options["location"], "w")
+  ip = self.options["ip"]
+  input = ${instance-parameter:configuration.input}
+  output = ${instance-parameter:configuration.output}
+  config.write(f"[INPUT]\n")
+
+  for key in input:
+    config.write(f"    {str(key).capitalize()} {input[key]}\n")
+
+  config.write(f"    Listen {ip}\n")
+  config.write("\n")
+  config.write(f"[OUTPUT]\n")
+
+  for key in output:
+    config.write(f"    {str(key).capitalize()} {output[key]}\n")
+
 [fluent-bit-service]
 recipe  = slapos.cookbook:wrapper
-command-line = {{ fluent_bit_location }}/bin/fluent-bit -i cpu -o stdout
+command-line = {{ fluent_bit_location }}/bin/fluent-bit -c ${fluent-bit-config-file:location}
 wrapper-path = ${directory:service}/fluentbit-service
 output = $${:wrapper-path}