chore(issues): update Bug report & Feature request templates [ski…

…p ci]

* Automated using myii/ssf-formula#58

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,41 +14,55 @@ Notes:
 3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
 -->
 
-#### Describe the bug
-<!-- A clear and concise description of what the bug is. -->
+## Your setup
+### Formula commit hash / release tag
+<!-- Please specify the formula's commit hash and/or release tag that you are using. -->
+
+
+
+### Versions reports (master & minion)
+<!-- Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions. -->
 
 
 
-#### Setup
+### Pillar / config used
 <!-- Provide links to the SLS files and/or relevant configs (be sure to remove sensitive info). -->
 
 
 
-#### Steps to reproduce the bug
+---
+
+## Bug details
+### Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+
+
+### Steps to reproduce the bug
 <!-- Include debug logs if possible and relevant, e.g. using `salt-minion -l debug`. -->
 <!-- Alternatively, linking to Kitchen debug logs is useful, e.g. via. Travis CI. -->
 <!-- Most useful is providing a failing InSpec test, which can be used to verify any proposed fix. -->
 
 
 
-#### Expected behaviour
+### Expected behaviour
 <!-- A clear and concise description of what you expected to happen. -->
 
 
 
-#### Versions report
-<!-- Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions. -->
+### Attempts to fix the bug
+<!-- Please mention any attempts you have made to fix the bug and what the results were. -->
 
 
 
-#### Additional context
+### Additional context
 <!-- Add any other context about the problem here. -->
 
 
 
 ---
 
-#### Optional: How can this template be improved?
+### Meta: How can this template be improved?
 <!-- Feel free to suggest how this template can be improved. -->
 
 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -14,29 +14,29 @@ Notes:
 3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
 -->
 
-#### Is your feature request related to a problem?
+### Is your feature request related to a problem?
 <!-- A clear and concise description of what the problem is. -->
 
 
 
-#### Describe the solution you'd like
+### Describe the solution you'd like
 <!-- A clear and concise description of what you want to happen. -->
 
 
 
-#### Describe alternatives you've considered
+### Describe alternatives you've considered
 <!-- Describe any alternative solutions or features you've considered. -->
 
 
 
-#### Additional context
+### Additional context
 <!-- Add any other context about the feature request here. -->
 
 
 
 ---
 
-#### Optional: How can this template be improved?
+### Meta: How can this template be improved?
 <!-- Feel free to suggest how this template can be improved. -->
 
 

telegraf/defaults.yaml

@@ -5,6 +5,7 @@ telegraf:
   config: /etc/telegraf/telegraf.conf
   system_user: root
   system_group: root
+  toml_pkg: python-pytoml
   pkg:
     name: telegraf
   service:

telegraf/map.jinja

@@ -47,3 +47,18 @@
 %}
 
 {%- set telegraf = config %}
+
+{#- Post-processing for specific non-YAML customisations #}
+{%- if grains.pythonversion[0] == 2 %}
+{%-   if grains.os in ['Fedora'] %}
+{%-     do telegraf.update({'toml_pkg': 'python2-toml'}) %}
+{%-   elif grains.os in ['openSUSE', 'SUSE'] %}
+{%-     do telegraf.update({'toml_pkg': 'python2-pytoml'}) %}
+{%-   endif %}
+{%- elif grains.pythonversion[0] == 3 %}
+{%-   if grains.os in ['CentOS'] %}
+{%-     do telegraf.update({'toml_pkg': 'python36-pytoml'}) %}
+{%-   else %}
+{%-     do telegraf.update({'toml_pkg': 'python3-pytoml'}) %}
+{%-   endif %}
+{%- endif %}

telegraf/osfamilymap.yaml

@@ -32,4 +32,5 @@ Suse:
     name: go
     enabled: 1
     gpgautoimport: true
+    # yamllint disable-line rule:line-length
     baseurl: https://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Leap_$releasever

telegraf/osfingermap.yaml

@@ -10,66 +10,11 @@
 # you will need to provide at least an empty dict in this file, e.g.
 # osfingermap: {}
 ---
-Debian-10:
-{% if grains['pythonversion'][0] == 3 %}
-  toml_pkg: python3-pytoml
-{% else %}
-  toml_pkg: python-pytoml
-{% endif %}
-
-Debian-9:
-{% if grains['pythonversion'][0] == 3 %}
-  toml_pkg: python3-pytoml
-{% else %}
-  toml_pkg: python-pytoml
-{% endif %}
-
-Debian-8:
-  toml_pkg: python-pytoml
-
-Ubuntu-18.04:
-  toml_pkg: python3-pytoml
-
-Ubuntu-16.04:
-  toml_pkg: python-pytoml
-
-CentOS Linux-7:
-{% if grains['pythonversion'][0] == 3 %}
-  toml_pkg: python36-pytoml
-{% else %}
-  toml_pkg: python-pytoml
-{% endif %}
-
-Fedora-29:
-{% if grains['pythonversion'][0] == 3 %}
-  toml_pkg: python3-pytoml
-{% else %}
-  toml_pkg: python2-toml
-{% endif %}
-
-Fedora-28:
-{% if grains['pythonversion'][0] == 3 %}
-  toml_pkg: python3-pytoml
-{% else %}
-  toml_pkg: python2-pytoml
-{% endif %}
-
-Leap-15:
-{% if grains['pythonversion'][0] == 3 %}
-  toml_pkg: python3-pytoml
-{% else %}
-  toml_pkg: python2-pytoml
-{% endif %}
-
 Leap-42:
-{% if grains['pythonversion'][0] == 3 %}
-  toml_pkg: python3-pytoml
-{% else %}
-  toml_pkg: python-pytoml
-{% endif %}
   repo_python:
     humanname: Python backports
     name: python-backports
     enabled: 1
     gpgautoimport: true
+    # yamllint disable-line rule:line-length
     baseurl: https://download.opensuse.org/repositories/devel:/languages:/python:/backports/openSUSE_Leap_$releasever