Merging upstream version 10.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 78 insertions, 97 deletions

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 895e8ad..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,97 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: triage
-assignees: ''
-
----
-
-<!--
-
-*** ATTENTION ***
-
-YOU MUST READ THIS TO HAVE YOUR ISSUE ADDRESSED
-
-PLEASE READ AND FILL OUT THIS TEMPLATE
-
-NEGLECTING TO PROVIDE INFORMATION REQUESTED HERE WILL RESULT IN
-SIGNIFICANT DELAYS ADDRESSING YOUR ISSUE
-
-ALWAYS PROVIDE:
-- FRR VERSION
-- OPERATING SYSTEM VERSION
-- KERNEL VERSION
-
-FAILURE TO PROVIDE THIS MAY RESULT IN YOUR ISSUE BEING IGNORED
-
-FOLLOW THESE GUIDELINES:
-
-- When reporting a crash, provide a backtrace
-- When pasting configs, logs, shell output, backtraces, and other large chunks
-  of text, surround this text with triple backtics
-
-  ```
-  like this
-  ```
-
-- Include the FRR version; if you built from Git, please provide the commit
-  hash
-- Write your issue in English
-
--->
-
----------------
-
-**Describe the bug**
-<!--
-A clear and concise description of what the bug is.
-
-Put "x" in "[ ]" if you already tried following:
--->
-
-- [ ] Did you check if this is a duplicate issue?
-- [ ] Did you test it on the latest FRRouting/frr master branch?
-
-
-**To Reproduce**
-<!--
-Describe the steps to reproduce the behavior.
-Be as descriptive as possible.
-
-For example:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
--->
-
-**Expected behavior**
-<!--
-Write here a clear and concise description of what you expected to happen when
-using the reproduction steps you provided above
--->
-
-**Screenshots**
-<!--
-If applicable, add screenshots to help explain your problem.
--->
-
-**Versions**
-<!--
-Include your operating system type and version here
-
-FAILURE TO PROVIDE THIS MAY RESULT IN YOUR ISSUE BEING IGNORED
--->
-<!-- e.g. Fedora 24, Debian 10] -->
- - OS Version:
-<!-- [e.g. Linux 5.4, OpenBSD 6.6] -->
- - Kernel:
-<!-- e.g. 6.0, 7.4 -->
- - FRR Version:
-
-**Additional context**
-<!--
-Add any other context about the problem here.
--->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..7319550
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,78 @@
+name: Bug report
+description: Report a bug in the FRRouting software
+labels: triage
+body:
+  - type: markdown
+    attributes:
+      value: >
+        **This form is only for reporting a bug in the FRRouting software.**
+        If you need help troubleshooting your configuration, have a problem
+        building or installing the software, or want to ask a question or
+        discuss the project, learn how to [connect with the FRRouting
+        community](https://frrouting.org/community/).
+
+
+        **Do not include sensitive information in this report.** IP addresses
+        should be masked (example: 192.XXX.XXX.32/24).
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Provide a clear and concise description of the bug.
+    validations:
+      required: true
+  - type: textarea
+    id: version
+    attributes:
+      label: Version
+      description: >
+        Run the `show version` command in the VTY shell, and provide the output
+        here. (If possible, test the current development version of FRRouting
+        for this bug.)
+      render: text
+    validations:
+      required: true
+  - type: textarea
+    id: how-to-reproduce
+    attributes:
+      label: How to reproduce
+      description: >
+        Give a list of steps that someone else can follow to observe
+        the bug. Be as descriptive as possible, including any relevant
+        configuration files and commands used. Topology diagrams are
+        helpful when the bug involves more than one router.
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected behavior
+      description: >
+        What do you expect to happen when following the steps above?
+    validations:
+      required: true
+  - type: textarea
+    id: actual-behavior
+    attributes:
+      label: Actual behavior
+      description: >
+        What actually happens when following the steps above? Include
+        screenshots, log file snippets, and/or platform routing tables
+        as appropriate. If a crash occurs, provide a backtrace.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: >
+        Include any other relevant information about this bug here.
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Checklist
+      options:
+        - label: I have searched the open issues for this bug.
+          required: true
+        - label: I have not included sensitive information in this report.
+          required: true