From 5cabed68443f7abf278033a67d71f095ded3fa69 Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@thingsboard.io>
Date: Tue, 26 May 2020 15:19:19 +0300
Subject: [PATCH] Update issue templates

---
 .github/ISSUE_TEMPLATE/---bug-report.md   | 60 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md |  6 +--
 .github/ISSUE_TEMPLATE/question.md        | 25 ++++++++++
 3 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/---bug-report.md
 create mode 100644 .github/ISSUE_TEMPLATE/question.md

diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
new file mode 100644
index 0000000000..bffb88ebb7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -0,0 +1,60 @@
+---
+name: "\U0001F41E Bug report"
+about: Create a report to help us improve
+title: "[Bug] "
+labels: bug
+assignees: ashvayka, vvlladd28
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Your Server Environment**
+<!-- 🔅🔅🔅🔅🔅🔅🔅 Choose one of the following or write your own 🔅🔅🔅🔅🔅🔅🔅-->
+* demo.thingsboard.io
+* cloud.thingsboard.io
+* own setup
+  * cloud or local infrastructure or docker deployment
+  * ThingsBoard Version
+  * OS Name and Version
+
+**Your Client Environment**
+<!-- 🔅🔅🔅🔅🔅🔅🔅 Choose one of the following or write your own 🔅🔅🔅🔅🔅🔅🔅-->
+**Desktop (please complete the following information):**
+
+* OS: [e.g. iOS]
+* Browser [e.g. chrome, safari]
+* Version [e.g. 22]
+
+**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]
+
+**Your Device**
+
+* Connectivity
+  * MQTT
+  * HTTP
+  * CoAP
+  * Gateway
+  * Integration: (Specify name) 
+* Device vendor and model
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**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
index bbcbbe7d61..8730336bba 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,9 +1,9 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
+title: "[Feature Request]"
+labels: feature
+assignees: ikulikov
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 0000000000..99d82ca698
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,25 @@
+---
+name: Question
+about: Describe your questions in details
+title: "[Question] your title here"
+labels: question
+assignees: ashvayka
+
+---
+
+**Component**
+
+<!-- Choose one of the following and delete all others. -->
+ * UI
+ * Rule Engine
+ * Installation
+ * Generic
+
+**Description**
+A clear and concise details.
+
+**Environment**
+<!-- Add information about your environment and ThingsBoard version if applicable -->
+ * OS:  name and version
+ * ThingsBoard: version
+ * Browser: name and version