Skip to content

Commit

Permalink
Merge pull request #23 from idealista/features/22
Browse files Browse the repository at this point in the history
Features/22
  • Loading branch information
sorobon authored Jan 16, 2020
2 parents 40c22c9 + 7273154 commit 213947c
Show file tree
Hide file tree
Showing 24 changed files with 910 additions and 190 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
Have you read Idealista's Code of Conduct? By filling an Issue, you are expected to comply with it,
including treating everyone with respect: https://github.com/idealista/prom2teams-role/blob/master/CODE_OF_CONDUCT.md
including treating everyone with respect: https://github.com/idealista/prom2teams_role/blob/master/CODE_OF_CONDUCT.md
-->

Expand Down
30 changes: 10 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,20 @@
---
dist: xenial
language: python
python: "2.7.13"
group: deprecated-2017Q4

python: "3.7"
sudo: required
group: deprecated-2017Q4

env:
- ansible_version: 2.4.0.0
- ansible_version: 2.4.1.0
- 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

install:
- pip install ansible==${ansible_version}
- pip install molecule==1.25.0
- pip install ansible-lint==3.4.20
- pip install testinfra==1.7.1
- pip install docker
- pip install pipenv
- pipenv sync
env:
matrix:
- DOCKER_BASE_IMAGE=debian:stretch-slim
- DOCKER_BASE_IMAGE=debian:buster-slim
script:
- molecule test --driver docker
- export DOCKER_BASE_IMAGE=${DOCKER_BASE_IMAGE}
- pipenv run molecule test

notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
33 changes: 33 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
# Based on ansible-lint config
extends: default

rules:
braces:
max-spaces-inside: 1
level: error
brackets:
max-spaces-inside: 1
level: error
colons:
max-spaces-after: -1
level: error
commas:
max-spaces-after: -1
level: error
comments: disable
comments-indentation: disable
document-start: disable
empty-lines:
max: 3
level: error
hyphens:
level: error
indentation: disable
key-duplicates: enable
line-length: disable
new-line-at-end-of-file: disable
new-lines:
type: unix
trailing-spaces: disable
truthy: disable
43 changes: 23 additions & 20 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,57 +2,60 @@
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
### Added
- *[#22](https://github.com/idealista/prom2teams_role/issues/22) Renamed role* @frantsao
- *[#22](https://github.com/idealista/prom2teams_role/issues/22) Updated molecule and travis testing; switched to docker* @frantsao

## [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*
14 changes: 14 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]

[packages]
ansible = "==2.9.2"
molecule = "==2.22"
docker = "==4.1.0"

[requires]
python_version = "3"
Loading

0 comments on commit 213947c

Please sign in to comment.