Merge pull request #18 from idealista/develop

Develop
idealista · May 29, 2019 · 1834214 · 1834214
2 parents fd43bbd + 5cb4405
commit 1834214
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ tests/__pycache__
 .cache
 .vagrant
 tests/roles
-.pytest_cache
+.pytest_cache
+venv/
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ env:
   - ansible_version: 2.4.2.0
   - ansible_version: 2.4.3.0
   - ansible_version: 2.5.0.0
+  - ansible_version: 2.8.0.0
 
 services:
   - docker

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 
 ## [Unreleased](https://github.com/idealista/prom2teams-role/tree/develop)
 
+## [2.2.0](https://github.com/idealista/prom2teams-role/tree/2.2.0)
+[Full Changelog](https://github.com/idealista/prom2teams-role/compare/2.1.0...2.2.0)
+### Changed
+- *Update prom2teams version to 2.3.1* @miguel-chacon
+
 ## [2.1.0](https://github.com/idealista/prom2teams-role/tree/2.1.0)
 [Full Changelog](https://github.com/idealista/prom2teams-role/compare/2.0.1...2.1.0)
 ### Changed

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 ## General
-prom2teams_version: 2.3.0
+prom2teams_version: 2.3.1
 prom2teams_required_libs:
   - python3
   - python3-pip

diff --git a/templates/prom2teams.ini.j2 b/templates/prom2teams.ini.j2
@@ -21,4 +21,9 @@ Path: {{ prom2teams_template_path }} # default: app resources template
 {% if prom2teams_groupalertsby is defined %}
 [Group Alerts]
 Field: {{ prom2teams_groupalertsby }}
-{% endif %}
+{% endif %}
+
+{% if prom2teams_ignored_extra_labels is defined %}
+[Labels]
+Excluded: {{ prom2teams_ignored_extra_labels|join(', ') }}
+{% endif %}