Skip to content

Commit

Permalink
Merge pull request #24 from idealista/develop
Browse files Browse the repository at this point in the history
1.3.2 release
  • Loading branch information
caldito authored Sep 16, 2020
2 parents 1d0e189 + bdc2acb commit 0b33b85
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
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]
## [Unreleased](https://github.com/idealista/grafana-role/tree/develop)
## [1.3.2](https://github.com/idealista/grafana_role/tree/1.3.2)
## [Full Changelog](https://github.com/idealista/grafana_role/compare/1.3.1...1.3.2)
### Fixed
- *[#22](https://github.com/idealista/grafana_role/issues/22) Change response parameter by status_code in uri tasks* @pablogcaldito

## [1.3.1](https://github.com/idealista/grafana_role/tree/1.3.1)
## [Full Changelog](https://github.com/idealista/grafana_role/compare/1.3.0...1.3.1)
Expand Down
6 changes: 3 additions & 3 deletions tasks/datasourceAndOrganization.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
password: "{{ grafana_admin_password }}"
body: "{{ lookup('template', 'templates/datasource.json.j2')}}"
body_format: json
response: 200
status_code: 200
when:
- datasource_check.status != 200
- grafana_service_state in ['started', 'restarted', 'reloaded']
Expand All @@ -49,7 +49,7 @@
password: "{{ grafana_admin_password }}"
body: "{{ lookup('template', 'templates/dashboards/prometheus_stats.json.j2')}}"
body_format: json
response: 200
status_code: 200
when:
- grafana_datasource_type == 'prometheus'
- grafana_service_state == 'started'
Expand All @@ -66,7 +66,7 @@
password: "{{ grafana_admin_password }}"
body: "{{ lookup('template', 'templates/organisation.json.j2')}}"
body_format: json
response: 200
status_code: 200
when:
- grafana_organisation is defined
- grafana_service_state == 'started'

0 comments on commit 0b33b85

Please sign in to comment.