From a15db2689eef2654194769c9cab49b478e5f1dda Mon Sep 17 00:00:00 2001
From: Luciano Righetti <luciano.righetti@gmail.com>
Date: Thu, 31 Aug 2023 10:05:47 +0200
Subject: [PATCH 1/2] Update feature-request-form.yml

---
 .github/ISSUE_TEMPLATE/feature-request-form.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/feature-request-form.yml b/.github/ISSUE_TEMPLATE/feature-request-form.yml
index dff651c99..b9abf70bb 100644
--- a/.github/ISSUE_TEMPLATE/feature-request-form.yml
+++ b/.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

From bb2105606deaf0c037dfe29ac5cdd01b47ff71a0 Mon Sep 17 00:00:00 2001
From: Ayush Tomar <ayush.tomar@ellio.tech>
Date: Fri, 8 Sep 2023 17:09:02 +0200
Subject: [PATCH 2/2] new: [feeds] add Ellio threat list

---
 app/files/feed-metadata/defaults.json | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/app/files/feed-metadata/defaults.json b/app/files/feed-metadata/defaults.json
index 2eb88f638..6eca350da 100644
--- a/app/files/feed-metadata/defaults.json
+++ b/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",