Merging upstream version 1.45.3+dfsg.

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

2 files changed, 62 insertions, 0 deletions

diff --git a/src/fluent-bit/.github/ISSUE_TEMPLATE/bug_report.md b/src/fluent-bit/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..115354693
--- /dev/null
+++ b/src/fluent-bit/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,40 @@
+---
+name: "\U0001F41B Bug Report"
+about: "If something isn't working as expected \U0001F914."
+title: ''
+labels: 'status: waiting-for-triage'
+assignees: ''
+
+---
+
+## Bug Report
+
+**Describe the bug**
+<!--- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+- Rubular link if applicable:
+- Example log message if applicable:
+```
+{"log":"YOUR LOG MESSAGE HERE","stream":"stdout","time":"2018-06-11T14:37:30.681701731Z"}
+```
+- Steps to reproduce the problem:
+
+**Expected behavior**
+<!--- A clear and concise description of what you expected to happen. -->
+
+**Screenshots**
+<!--- If applicable, add screenshots to help explain your problem. -->
+
+**Your Environment**
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Configuration:
+* Environment name and version (e.g. Kubernetes? What version?):
+* Server type and version:
+* Operating System and version:
+* Filters and plugins:
+
+**Additional context**
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
diff --git a/src/fluent-bit/.github/ISSUE_TEMPLATE/feature_request.md b/src/fluent-bit/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..db207e417
--- /dev/null
+++ b/src/fluent-bit/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!--- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution 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**
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+<!--- Add any other context or screenshots about the feature request here. -->