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

software/beremiz-runtime/software.cfg

@@ -37,7 +37,7 @@ post-install =
 [beremiz-source]
 recipe = slapos.recipe.build:gitclone
 repository = https://github.com/beremiz/beremiz.git
-revision = 3c7d3be7b791cd3a421230b1ad00a137d
+revision = caee3ad3b7bb2865c77328de5ffdaeec61dbf49f
 git-executable = ${git:location}/bin/git
 
 [beremiz]

software/fluent-bit/instance-input-schema.json

+{
+  "$schema": "https://json-schema.org/draft/2019-09/schema",
+  "description": "Parameters to instantiate Fluent-bit",
+  "type": "object",
+  "configuration": {
+    "input": {
+      "description": "The desired fluent-bit input, which defines in fluent-bit's configuration the inputs.",
+      "type": "object",
+      "default": ""
+    },
+    "output": {
+      "description": "The desired fluent-bit output, which defines in fluent-bit's configuration the outputs.",
+      "type": "object",
+      "default": ""
+    }
+  }
+}

software/fluent-bit/software.cfg.json

+{
+  "name": "Fluent-bit",
+  "description": "Fluent-bit",
+  "serialisation": "xml",
+  "software-type": {
+    "default": {
+      "title": "Default",
+      "description": "Fluent-bit",
+      "request": "instance-input-schema.json",
+      "index": 0
+    }
+  }
+}