From 18c85556d1953da4d5286882d304e7b9cee8a645 Mon Sep 17 00:00:00 2001 From: Fran Tsao Date: Fri, 3 Jan 2020 11:37:47 +0100 Subject: [PATCH] #22 renamed role; fix template ansible_managed comment --- .github/ISSUE_TEMPLATE.md | 2 +- CHANGELOG.md | 40 ++++++++++++++++++------------------- README.md | 14 ++++++------- handlers/main.yml | 2 +- templates/prom2teams.ini.j2 | 2 +- templates/prom2teams.j2 | 2 +- templates/uwsgi.ini.j2 | 2 +- tests/playbook.yml | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 7b09226..c33d89e 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,7 +1,7 @@ diff --git a/CHANGELOG.md b/CHANGELOG.md index 74b380b..da3cf91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,57 +2,57 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog). -## [Unreleased](https://github.com/idealista/prom2teams-role/tree/develop) +## [Unreleased](https://github.com/idealista/prom2teams_role/tree/develop) ### Fixed - *Update prom2teams.ini template for python3 compatibility* @miguel-chacon -## [2.3.0](https://github.com/idealista/prom2teams-role/tree/2.3.0) -[Full Changelog](https://github.com/idealista/prom2teams-role/compare/2.2.0...2.3.0) +## [2.3.0](https://github.com/idealista/prom2teams_role/tree/2.3.0) +[Full Changelog](https://github.com/idealista/prom2teams_role/compare/2.2.0...2.3.0) ### Added - *Ability to configure Prometheus metrics endpoint* @jnogol ### Changed - *Update prom2teams version to 2.4.0* @jnogol -## [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) +## [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) +## [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 - *Update prom2teams version to 2.3.0* @dortegau -## [2.0.1](https://github.com/idealista/prom2teams-role/tree/2.0.1) -[Full Changelog](https://github.com/idealista/prom2teams-role/compare/2.0.0...2.0.1) +## [2.0.1](https://github.com/idealista/prom2teams_role/tree/2.0.1) +[Full Changelog](https://github.com/idealista/prom2teams_role/compare/2.0.0...2.0.1) ### Changed - *Update prom2teams version to 2.2.2* @jnogol - *Notify handler when installing task changed* @jnogol -## [2.0.0](https://github.com/idealista/prom2teams-role/tree/2.0.0) -[Full Changelog](https://github.com/idealista/prom2teams-role/compare/1.3.0...2.0.0) +## [2.0.0](https://github.com/idealista/prom2teams_role/tree/2.0.0) +[Full Changelog](https://github.com/idealista/prom2teams_role/compare/1.3.0...2.0.0) ### Added -- *[#9](https://github.com/idealista/prom2teams-role/issues/9) Ability of providing templates via playbook* @jnogol +- *[#9](https://github.com/idealista/prom2teams_role/issues/9) Ability of providing templates via playbook* @jnogol ### Changed - *Update prom2teams version to 2.2.0* @jnogol - *Update `.travis.yml` to test Ansible 2.4.x and 2.5.0.0* @jnogol - *Ansible minimum version 2.4.0.0* @jnogol -## [1.3.0](https://github.com/idealista/prom2teams-role/tree/1.3.0) -[Full Changelog](https://github.com/idealista/prom2teams-role/compare/1.2.0...1.3.0) +## [1.3.0](https://github.com/idealista/prom2teams_role/tree/1.3.0) +[Full Changelog](https://github.com/idealista/prom2teams_role/compare/1.2.0...1.3.0) ### Changed -- *[#5](https://github.com/idealista/prom2teams-role/issues/5) Run service using uwsgi* @jmonterrubio +- *[#5](https://github.com/idealista/prom2teams_role/issues/5) Run service using uwsgi* @jmonterrubio -## [1.2.0](https://github.com/idealista/prom2teams-role/tree/1.2.0) -[Full Changelog](https://github.com/idealista/prom2teams-role/compare/1.1.0...1.2.0) +## [1.2.0](https://github.com/idealista/prom2teams_role/tree/1.2.0) +[Full Changelog](https://github.com/idealista/prom2teams_role/compare/1.1.0...1.2.0) ### Changed - *Update prom2teams version* @jnogol -## [1.1.0](https://github.com/idealista/prom2teams-role/tree/1.1.0) -[Full Changelog](https://github.com/idealista/prom2teams-role/compare/1.0.0...1.1.0) +## [1.1.0](https://github.com/idealista/prom2teams_role/tree/1.1.0) +[Full Changelog](https://github.com/idealista/prom2teams_role/compare/1.0.0...1.1.0) ### Changed - *Update prom2teams version* @jnogol -## [1.0.0](https://github.com/idealista/prom2teams-role/tree/1.0.0) +## [1.0.0](https://github.com/idealista/prom2teams_role/tree/1.0.0) ### Added - *First release* diff --git a/README.md b/README.md index b64038c..3d7712e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -![Logo](https://raw.githubusercontent.com/idealista/prom2teams-role/master/logo.gif) +![Logo](https://raw.githubusercontent.com/idealista/prom2teams_role/master/logo.gif) -[![Build Status](https://travis-ci.org/idealista/prom2teams-role.png)](https://travis-ci.org/idealista/prom2teams-role) +[![Build Status](https://travis-ci.org/idealista/prom2teams_role.png)](https://travis-ci.org/idealista/prom2teams_role) # prom2teams Ansible role @@ -33,16 +33,16 @@ For testing purposes, [Molecule](https://molecule.readthedocs.io/) with [Vagrant Create or add to your roles dependency file (e.g requirements.yml) from GitHub: ``` -- src: http://github.com/idealista/prom2teams-role.git +- src: http://github.com/idealista/prom2teams_role.git scm: git version: 1.0.0 name: prom2teams ``` -or using [Ansible Galaxy](https://galaxy.ansible.com/idealista/prom2teams-role/) as origin if you prefer: +or using [Ansible Galaxy](https://galaxy.ansible.com/idealista/prom2teams_role/) as origin if you prefer: ``` -- src: idealista.prom2teams-role +- src: idealista.prom2teams_role version: 1.0.0 name: prom2teams ``` @@ -88,7 +88,7 @@ See `molecule.yml` to check possible testing platforms. ## Versioning -For the versions available, see the [tags on this repository](https://github.com/idealista/prom2teams-role/tags). +For the versions available, see the [tags on this repository](https://github.com/idealista/prom2teams_role/tags). Additionaly you can see what change in each version in the [CHANGELOG.md](CHANGELOG.md) file. @@ -96,7 +96,7 @@ Additionaly you can see what change in each version in the [CHANGELOG.md](CHANGE * **Idealista** - *Work with* - [idealista](https://github.com/idealista) -See also the list of [contributors](https://github.com/idealista/prom2teams-role/contributors) who participated in this project. +See also the list of [contributors](https://github.com/idealista/prom2teams_role/contributors) who participated in this project. ## License diff --git a/handlers/main.yml b/handlers/main.yml index 669d8fc..eacfd58 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,5 +1,5 @@ --- -# handlers file for prom2teams-role +# handlers file for prom2teams_role - name: restart prom2teams systemd: diff --git a/templates/prom2teams.ini.j2 b/templates/prom2teams.ini.j2 index 791b284..ce559b5 100644 --- a/templates/prom2teams.ini.j2 +++ b/templates/prom2teams.ini.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} [Microsoft Teams] {% for name, webhook in prom2teams_webhook_urls.items() %} {{ name }}: {{ webhook }} diff --git a/templates/prom2teams.j2 b/templates/prom2teams.j2 index 007c76d..0e17693 100644 --- a/templates/prom2teams.j2 +++ b/templates/prom2teams.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} # Prom2Teams Environment APP_ENVIRONMENT={{ prom2teams_environment }} APP_CONFIG_FILE={{ prom2teams_config_file }} diff --git a/templates/uwsgi.ini.j2 b/templates/uwsgi.ini.j2 index a497e5f..2b3f150 100644 --- a/templates/uwsgi.ini.j2 +++ b/templates/uwsgi.ini.j2 @@ -1,4 +1,4 @@ -# {{ ansible_managed }} +{{ ansible_managed | }} [uwsgi] master = true processes = {{ prom2teams_uwsgi_processes }} diff --git a/tests/playbook.yml b/tests/playbook.yml index 0da52dd..29a0b91 100644 --- a/tests/playbook.yml +++ b/tests/playbook.yml @@ -2,4 +2,4 @@ - hosts: prom2teams roles: - - role: prom2teams-role + - role: prom2teams_role