From 311be8896966c824f3075161837c2505d488c688 Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Fri, 10 Sep 2021 10:08:30 +0200
Subject: [PATCH] chore(github-issue_flow): address some remarks

---
 .../{asserts => assets}/issue-handling.png          | Bin
 .../{asserts => assets}/issue-handling.uml          |   0
 .github/ISSUE_TEMPLATE/bug-report.md                |   9 +++++----
 .github/ISSUE_TEMPLATE/feature-request.md           |   2 +-
 .github/ISSUE_TEMPLATE/support-needed.md            |   7 +++++--
 5 files changed, 11 insertions(+), 7 deletions(-)
 rename .github/ISSUE_TEMPLATE/{asserts => assets}/issue-handling.png (100%)
 rename .github/ISSUE_TEMPLATE/{asserts => assets}/issue-handling.uml (100%)

diff --git a/.github/ISSUE_TEMPLATE/asserts/issue-handling.png b/.github/ISSUE_TEMPLATE/assets/issue-handling.png
similarity index 100%
rename from .github/ISSUE_TEMPLATE/asserts/issue-handling.png
rename to .github/ISSUE_TEMPLATE/assets/issue-handling.png
diff --git a/.github/ISSUE_TEMPLATE/asserts/issue-handling.uml b/.github/ISSUE_TEMPLATE/assets/issue-handling.uml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/asserts/issue-handling.uml
rename to .github/ISSUE_TEMPLATE/assets/issue-handling.uml
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 188d9c821..825992ce8 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -2,7 +2,7 @@
 name: Bug Report
 about: Create a report to help us improve
 title: ''
-labels: "Support, needs-triage"
+labels: needs-triage
 
 ---
 
@@ -10,13 +10,16 @@ labels: "Support, needs-triage"
 <!-- 请使用英文描述问题 -->
 <!-- Note, lacking of information will delay the handling of issue
      See our github issue handling flow here:
-     https://github.com/emqx/emqx/blob/master/.github/ISSUE_TEMPLATE/asserts/issue-handling.png
+     https://github.com/emqx/emqx/blob/master/.github/ISSUE_TEMPLATE/assets/issue-handling.png
 -->
 
 ### Subject of the issue
 Describe your issue here.
 
 ### Your environment
+
+For EMQ X 4.3 or newer, please provide the log archive generated by [node_dump tool](https://github.com/emqx/emqx/blob/master/bin/node_dump) 
+
 - EMQ X version (e.g. `emqx_ctl status`): 
 - Hardware configuration (e.g. `lscpu`):
 - OS (e.g. `cat /etc/os-release`):
@@ -27,8 +30,6 @@ Describe your issue here.
 ### Steps to reproduce
 Tell us how to reproduce this issue. 
 
-It would be great if you can attach the log archive generated by [node_dump tool](https://github.com/emqx/emqx/blob/master/bin/node_dump) 
-
 ### Expected behaviour
 Tell us what should happen
 
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
index ce45b054a..2f55bcfb8 100644
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -9,7 +9,7 @@ labels: "Feature, needs-triage"
 <!-- Please only use this template for submitting enhancement requests -->
 <!-- Note, lacking of information will delay the handling of issue
      See our github issue handling flow here:
-     https://github.com/emqx/emqx/blob/master/.github/ISSUE_TEMPLATE/asserts/issue-handling.png
+     https://github.com/emqx/emqx/blob/master/.github/ISSUE_TEMPLATE/assets/issue-handling.png
 -->
 
 
diff --git a/.github/ISSUE_TEMPLATE/support-needed.md b/.github/ISSUE_TEMPLATE/support-needed.md
index 68e59bdbc..49ba5a913 100644
--- a/.github/ISSUE_TEMPLATE/support-needed.md
+++ b/.github/ISSUE_TEMPLATE/support-needed.md
@@ -8,7 +8,7 @@ labels: "Support, needs-triage"
 
 <!-- Note, lacking of information will delay the handling of issue
      See our github issue handling flow here:
-     https://github.com/emqx/emqx/blob/master/.github/ISSUE_TEMPLATE/asserts/issue-handling.png
+     https://github.com/emqx/emqx/blob/master/.github/ISSUE_TEMPLATE/assets/issue-handling.png
 -->
 
 ### Subject of the support
@@ -17,6 +17,10 @@ Describe your issue here.
 Error/Warning printout if any. 
 
 ### Your environment
+
+For EMQ X 4.3 or newer, please provide the log archive generated by [node_dump tool](https://github.com/emqx/emqx/blob/master/bin/node_dump) 
+
+Otherwise please provide below info:
 - EMQ X version (e.g. `emqx_ctl status`):
 - If cluster (e.g. 3 X 4Core16GB):
 - Hardware configuration (e.g. `lscpu`):
@@ -26,6 +30,5 @@ Error/Warning printout if any.
 - Others:
 
 ### LOG File
-It would be great if you can attach the log archive generated by [node_dump tool](https://github.com/emqx/emqx/blob/master/bin/node_dump)
 
 Missing log file can delay the handling of the issue.