Updated templates

.github/ISSUE_TEMPLATE.md

@@ -1,16 +0,0 @@
-Read before posting: 
-
-- Questions should be posted to https://community.grafana.com. Please search there and here on GitHub for similar issues before creating a new issue. 
-- Checkout FAQ: https://community.grafana.com/c/howto/faq
-- Checkout How to troubleshoot metric query issues: https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50
-
-Please include this information:
-### What Grafana version are you using?
-### What datasource are you using?
-### What OS are you running grafana on?
-### What did you do?
-### What was the expected result?
-### What happened instead?
-### If related to metric query / data viz:
-### Include raw network request & response: get by opening Chrome Dev Tools (F12, Ctrl+Shift+I on windows, Cmd+Opt+I on Mac), go the network tab.
- 

.github/ISSUE_TEMPLATE/1-bug_report.md

@@ -1,31 +1,29 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Report a bug you found when using Grafana
 title: ''
-labels: ''
+labels: 'type: bug'
 assignees: ''
-
 ---
 
-Read before posting:
+<!--
+Please use this template while reporting a bug and provide as much info as possible.
+Questions should be posted to https://community.grafana.com
+Use Query Inspector to troubleshoot issues: https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630
+-->
 
-- Questions should be posted to https://community.grafana.com
-- Search/filter through opened and closed issues for existing similar bug reports: https://github.com/grafana/grafana/issues?utf8=%E2%9C%93&q=is%3Aissue
-- Checkout FAQ: https://community.grafana.com/c/howto/faq
-- Checkout How to troubleshoot metric query issues: https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50
-- Checkout Using Grafana’s Query Inspector to troubleshoot issues: https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630
+**What happened**:
 
-Please answer and include relevant information below:
+**What you expected to happen**:
 
-### What Grafana version are you using?
-### What datasource are you using?
-### What OS are you running grafana on?
-### What did you do?
-### What was the expected result?
-### What happened instead?
-### If related to metric query / data viz
-### Include raw network request & response
-See Using Grafana’s Query Inspector to troubleshoot issues and/or How to troubleshoot metric query issues above.
+**How to reproduce it (as minimally and precisely as possible)**:
 
-### Additional context
-Add any other relevant context, like browser, platform and/or screenshots about the bug report here.
+**Anything else we need to know?**:
+
+**Environment**:
+- Grafana version:
+- Data source type & version:
+- OS Grafana is installed on:
+- User OS & Browser:
+- Grafana plugins:
+- Others:

.github/ISSUE_TEMPLATE/2-feature_request.md

@@ -1,28 +1,13 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
+name: Enhancement Request
+about: Suggest an enhancement or new feature for the Grafana project
 title: ''
-labels: ''
+labels: 'type: feature request'
 assignees: ''
-
 ---
 
-Read before posting:
+<!-- Please only use this template for submitting feature requests -->
 
-- Questions should be posted to https://community.grafana.com
-- Search through opened and closed issues for existing similar feature requests: https://github.com/grafana/grafana/issues?utf8=%E2%9C%93&q=is%3Aissue
-- Write a short and descriptive title describing your feature, e.g. Support X in area Y
+**What would you like to be added**:
 
-Please answer and include below information:
-
-### Is your feature request related to a problem? Please describe.
-A clear and concise description of what the problem is, e.g. I'm always frustrated when [...]
-
-### Describe possible solutions 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 relevant context, like Grafana version, browser, platform and/or screenshots about the feature request here.
+**Why is this needed**:

.github/ISSUE_TEMPLATE/3-accessibility.md

@@ -0,0 +1,26 @@
+---
+name: Accessibility problem or improvement request
+about: Help make Grafana be better at keyboard navigation, screen-readable and accessible to all.
+labels: 'type: accessibility'
+---
+
+<!--
+Please only use this template for submitting accessibility issues.
+
+This is a new feature area for Grafana that we want to improve. We have long way to go
+to really improve accessibility and would like your help to know where to start.
+-->
+
+**Steps to reproduce**:
+
+**Actual Result**:
+
+**Expected Result**
+
+**Relevant WCAG Criteria:** [#.#.# WCAG Criterion](link to https://www.w3.org/WAI/WCAG21/quickref/?versions=2.0)
+
+**Environment**:
+- Grafana version:
+- Data source type & version:
+- User OS & Browser:
+- Others:

.github/ISSUE_TEMPLATE/3-question.md

@@ -1,10 +0,0 @@
----
-name: Question
-about: 'Questions should be posted to https://community.grafana.com/'
-title: ''
-labels: ''
-assignees: ''
-
----
-
-Please ask questions on our community site, https://community.grafana.com/. Github are mainly for feature requests and bug reports.

.github/ISSUE_TEMPLATE/4-question.md

@@ -0,0 +1,14 @@
+---
+name: Question / Support request
+about: 'Question or support request relating to using Grafana'
+title: ''
+labels: ''
+assignees: ''
+---
+
+STOP -- PLEASE READ!
+
+GitHub is not the right place for questions and support requests.
+
+Please ask questions on our community site: [https://community.grafana.com/](https://community.grafana.com/)
+