From b2ad408adc78c067b13fba6f362c917e852593ab Mon Sep 17 00:00:00 2001
From: Andris Reinman <andris@reinman.eu>
Date: Tue, 28 Nov 2023 09:29:27 +0200
Subject: [PATCH] Updated Github ticket templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 23 +++++++++++++----------
 .github/ISSUE_TEMPLATE/feature_request.md | 20 --------------------
 .github/ISSUE_TEMPLATE/report-an-issue.md |  9 +++++++++
 3 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/report-an-issue.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea782..9278478de 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,7 +4,6 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
 **Describe the bug**
@@ -12,6 +11,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -23,16 +23,19 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+**EmailEngine version**
+Which version of EmailEngine are you using
+
+**Environment**
+How do you run EmailEngine (Docker container, Systemd service, cli app, etc.)
+
+**Redis**
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+-   Redis version
+-   Software (is it Redis or a compatible solution like DragonflyDB or AWS ELastiCache)
+-   Do you run it locally, or is it a managed service
+    -   If you use a managed Redis, is the actual Redis instance in the same DC or not
+-   Redis configuration (do you use AOF, do you use Redis Cluster, Sentinel etc)
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index bbcbbe7d6..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/report-an-issue.md b/.github/ISSUE_TEMPLATE/report-an-issue.md
new file mode 100644
index 000000000..6a6b04fa9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/report-an-issue.md
@@ -0,0 +1,9 @@
+---
+name: Report an issue
+about: Report an issue with EmailEngine
+title: ''
+labels: ''
+assignees: ''
+---
+
+Please file only reproducible bugs. Do not file support request as issues in Github. Instead use the official support channels listed [here](https://emailengine.app/support).