From 2b754703cc3bf19e2b8195f7d5e8da52e6913492 Mon Sep 17 00:00:00 2001
From: Lior Kamrat <likamrat@microsoft.com>
Date: Thu, 13 Feb 2025 11:11:57 -0800
Subject: [PATCH] updating templates

---
 .github/ISSUE_TEMPLATE/bug_report.md          | 38 +++++++++++++------
 .github/ISSUE_TEMPLATE/feature_request.md     |  2 +-
 .../pull_request_template_bootstrap.md        |  3 +-
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 82445b3745..ec34cf0756 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,20 +1,29 @@
 ---
-name: "\U0001F41BBug report"
+name: "🐛Bug report"
 about: Create a report to help us improve
 title: ''
-labels: 'triage'
+labels: ['triage', 'bug']
 assignees: ''
 
 ---
-<!--- 🛑 Please check existing issues first before continuing: https://github.com/microsoft/azure_arc/issues --->
+<!--- 🛑 Please check existing issues first: https://github.com/microsoft/azure_arc/issues --->
 
 <!--- Disclaimer: The intent of this "Bug report" template is to address feature requests related to the various Arc Jumpstart solution. The Arc Jumpstart team does not handle and/or support Azure Arc upstream core product related issues, bugs and feature requests and will try to assist on a best effort basis. For a core product issue or feature request/feedback, please create an official [Azure support ticket](https://azure.microsoft.com/support/create-ticket/) or [general feedback request](https://feedback.azure.com). --->
 
+> **Note:** If your bug report is related to documentation, we kindly ask you to open both an issue and a PR in our [documentation repository](https://github.com/Azure/arc_jumpstart_docs).
+
 > **Note:** For ease of issues and pull requests management and tracking, we kindly ask you to provide a meaningful and concise title to this issue and answer all questions to the best of your ability.
 
+**Scenario Type**
+- [ ] Jumpstart scenario
+- [ ] ArcBox
+- [ ] HCIBox
+- [ ] Agora
+- [ ] Drops
+- [ ] Other (please specify)
 
-**Is your issue related to a Jumpstart scenario, ArcBox, HCIBox, or Agora?**
-<!--- A link to the Jumpstart scenario you are working on. --->
+**Scenario Link**
+<!--- Provide the link to the specific scenario you're working with --->
 
 **Describe the issue or the bug**
 <!--- A clear and concise description of what the issue or the bug is. --->
@@ -29,13 +38,18 @@ assignees: ''
 **Expected behavior**
 <!--- A clear and concise description of what you expected to happen. --->
 
-**Environment summary**
-<!--- Please provide:
-- Azure CLI version (`az --version`)
-- Operating system and version
-- Deployed region
-- Any other relevant version information
---->
+**Environment Details**
+- Azure CLI version: <!-- output of `az --version` -->
+- Operating System: <!-- e.g., Windows 11, Ubuntu 22.04 -->
+- Deployed Region: <!-- e.g., eastus -->
+- Kubernetes Version (if applicable):
+
+**Deployment Method Used**
+- [ ] Azure Portal
+- [ ] Azure CLI
+- [ ] Bicep
+- [ ] ARM Template
+- [ ] Other (please specify)
 
 **Have you looked at the Troubleshooting and Logs section?**
 <!---Relevant logs retrieval instructions can be found in the Troubleshooting section.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 224f83547f..96867dea64 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,5 @@
 ---
-name: "\U0001F680Feature request"
+name: "Feature request"
 about: Suggest an idea for this project
 title: ''
 labels: ''
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template_bootstrap.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template_bootstrap.md
index 0e239fc8fe..fa2003b485 100644
--- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template_bootstrap.md
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template_bootstrap.md
@@ -7,6 +7,8 @@
 <!--- If fixing a bug or implementing a feature, please link to the issue here: -->
 Fixes # (issue)
 
+> **Note:** If your pull request is related to documentation, we kindly ask you to open both an issue and a PR in our [documentation repository](https://github.com/Azure/arc_jumpstart_docs).
+
 ## How Has This Been Tested?
 
 - Please describe in detail how you tested your changes
@@ -18,7 +20,6 @@ Fixes # (issue)
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to change)
-- [ ] Documentation update
 
 ## Validation Checklist
 - [ ] My code follows the code style of this project