From e00758e34f666949353ec2ef73dc94baf07a49d1 Mon Sep 17 00:00:00 2001 From: Miguel Chacon Date: Wed, 29 May 2019 16:45:55 +0200 Subject: [PATCH 1/5] Upgrade package version --- .gitignore | 3 ++- defaults/main.yml | 2 +- requirements-test.txt | 3 +++ templates/prom2teams.ini.j2 | 7 ++++++- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 requirements-test.txt diff --git a/.gitignore b/.gitignore index e9134f4..35dfe3f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ tests/__pycache__ .cache .vagrant tests/roles -.pytest_cache \ No newline at end of file +.pytest_cache +venv/ diff --git a/defaults/main.yml b/defaults/main.yml index 6ee7a3b..eb3bef1 100644 --- 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/requirements-test.txt b/requirements-test.txt new file mode 100644 index 0000000..3efbe18 --- /dev/null +++ b/requirements-test.txt @@ -0,0 +1,3 @@ +molecule<2 +ansible>=2.5,<=2.8 +python-vagrant==0.5.15 diff --git a/templates/prom2teams.ini.j2 b/templates/prom2teams.ini.j2 index 6306ca7..383418a 100644 --- 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 %} \ No newline at end of file +{% endif %} + +{% if prom2teams_ignored_extra_labels is defined %} +[Labels] +Excluded: {{ prom2teams_ignored_extra_labels|join(', ') }} +{% endif %} From 12765b069b986399a6bec070907dee0bee7c5c7c Mon Sep 17 00:00:00 2001 From: Miguel Chacon Date: Wed, 29 May 2019 16:53:05 +0200 Subject: [PATCH 2/5] Update python version --- .travis.yml | 3 ++- requirements-test.txt | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 requirements-test.txt diff --git a/.travis.yml b/.travis.yml index abadc00..27f2337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- language: python -python: "2.7.13" +python: "3.6" group: deprecated-2017Q4 sudo: required @@ -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/requirements-test.txt b/requirements-test.txt deleted file mode 100644 index 3efbe18..0000000 --- a/requirements-test.txt +++ /dev/null @@ -1,3 +0,0 @@ -molecule<2 -ansible>=2.5,<=2.8 -python-vagrant==0.5.15 From 1cf25f9a0a0f1223b8ad74d68bc0b4f7b8fbf85f Mon Sep 17 00:00:00 2001 From: Miguel Chacon Date: Wed, 29 May 2019 17:03:06 +0200 Subject: [PATCH 3/5] Undo python version, too many changes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 27f2337..e9a8d39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ --- language: python -python: "3.6" +python: "2.7.13" group: deprecated-2017Q4 sudo: required From 6a03f8a1c6ac2ec6f372cb9df359f1859b731488 Mon Sep 17 00:00:00 2001 From: Miguel Chacon Date: Wed, 29 May 2019 17:55:22 +0200 Subject: [PATCH 4/5] Update changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c1bc809..e7dfdf7 100644 --- 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.1.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 From 5cb44057b47c4ec0bee69d66127286b96be35efc Mon Sep 17 00:00:00 2001 From: Miguel Chacon Date: Wed, 29 May 2019 17:56:51 +0200 Subject: [PATCH 5/5] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7dfdf7..be68c7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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.1.0) +## [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