merge conflict fixes

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,34 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Please tell us about your environment:**
+
+* Operating System:
+* Where is this running ( Local, Cloud Provider)
+* Storage being used (NFS, Hostpath, Gluster, etc):
+* Container Image Tag:
+* PostgreSQL Version:
+* Platform (Docker, Kubernetes, OpenShift):
+* Platform Version:
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/enhancement-request.md

@@ -0,0 +1,23 @@
+---
+name: Enhancement request
+about: Suggest an improvement to a current an existing feature
+
+---
+
+**What is the motivation or use case for the change? **
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Please tell us about your environment:**
+
+* Operating System:
+* Where is this running ( Local, Cloud Provider)
+* Storage being used (NFS, Hostpath, Gluster, etc):
+* Container Image Tag:
+* PostgreSQL Version:
+* Platform (Docker, Kubernetes, OpenShift):
+* Platform Version:
+
+**Additional context**
+Add any other context or screenshots about the enhancement request here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,26 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**What is the motivation or use case for the feature? **
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe any alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Please tell us about your environment:**
+
+* Operating System:
+* Where is this running ( Local , Cloud Provider)
+* Storage being used (NFS, Hostpath, Gluster, etc):
+* Container Image Tag:
+* PostgreSQL Version:
+* Platform (Docker, Kubernetes, OpenShift):
+* Platform Version:
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/support---question-and-answer.md

@@ -0,0 +1,29 @@
+---
+name: Support - Question and Answer
+about: " Have a quick question, let us know."
+
+---
+
+** Which example are you working with? **
+
+**What is the current behavior?**
+
+**What is the expected behavior?**
+
+**Other information** (e.g. detailed explanation, related issues,  etc)
+
+**Please tell us about your environment:**
+
+* Operating System:
+* Where is this running ( Local , Cloud Provider)
+* Storage being used (NFS, Hostpath, Gluster, etc):
+* Container Image Tag:
+* PostgreSQL Version:
+* Platform (Docker, Kubernetes, OpenShift):
+* Platform Version:
+
+If possible please run the following on the kubernetes or Openshit (oc) commands and provide the result:
+ kubectl describe yourPodName
+ kubectl describe pvc
+ kubectl get nodes
+ kubectl log yourPodName

.gitignore

@@ -10,3 +10,4 @@ postgres_exporter.tar.gz*
 bin/sample-app/sample-app
 tools/test-harness/vendor
 tools/pgmonitor/
+public