Merge branch '2.4' into develop

.github/ISSUE_TEMPLATE/feature-request-form.yml

@@ -1,7 +1,7 @@
 name: Feature request
 description: Suggest an idea for this project
 title: "Feature Request: "
-labels: ["feature request", "needs triage"]
+labels: ["T: feature request", "needs triage"]
 body:
   - type: textarea
     id: motif

app/files/feed-metadata/defaults.json

@@ -1,4 +1,30 @@
 [
+  {
+    "Feed": {
+      "name": "Ellio:Threat List",
+      "provider": "ellio.tech",
+      "url": "https://cdn.ellio.tech/community-feed",
+      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+      "enabled": true,
+      "distribution": "0",
+      "default": false,
+      "source_format": "freetext",
+      "fixed_event": true,
+      "delta_merge": true,
+      "publish": true,
+      "override_ids": false,
+      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+      "input_source": "network",
+      "delete_local_file": false,
+      "lookup_visible": false
+    },
+    "Tag": {
+      "name": "osint:source-type=\"block-or-filter-list\"",
+      "colour": "#004f89",
+      "exportable": true,
+      "hide_tag": false
+    }
+  },
   {
     "Feed": {
       "name": "CIRCL OSINT Feed",