Skip to content

Commit

Permalink
Merge pull request #154 from idealista/develop
Browse files Browse the repository at this point in the history
Release 2.5.2
  • Loading branch information
miguel-chacon authored Oct 15, 2019
2 parents 200812f + f28c050 commit 846d8ff
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch

## [Unreleased](https://github.com/idealista/prom2teams/tree/develop)

## [2.5.2](https://github.com/idealista/prom2teams/tree/2.5.2)
[Full Changelog](https://github.com/idealista/prom2teams/compare/2.5.1...2.5.2)
## Fixed
- *[#151](https://github.com/idealista/prom2teams/issues/151) Favicon not included in source distribution* @miguel-chacon
## Added
- *Log full message on error* @miguel-chacon

## [2.5.1](https://github.com/idealista/prom2teams/tree/2.5.1)
[Full Changelog](https://github.com/idealista/prom2teams/compare/2.5.0...2.5.1)
## Added
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ include requirements.txt
include bin/wsgi.py
include */config/*
recursive-include */resources/ *
recursive-include */app/static/ *
2 changes: 1 addition & 1 deletion helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

image:
repository: idealista/prom2teams
tag: 2.4.0
tag: 2.5.2
pullPolicy: IfNotPresent

resources:
Expand Down
10 changes: 6 additions & 4 deletions prom2teams/app/teams_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@
def post(teams_webhook_url, message):
response = session.post(teams_webhook_url, data=message)
if not response.ok or response.text is not '1':
exception_msg = 'Error performing request to: {}.' \
' Returned status code: {}.' \
' Returned data: {}'
exception_msg = 'Error performing request to: {}.\n' \
' Returned status code: {}.\n' \
' Returned data: {}\n' \
' Sended message: {}\n'
raise MicrosoftTeamsRequestException(exception_msg.format(teams_webhook_url,
str(response.status_code),
str(response.text)),
str(response.text),
str(message)),
code=response.status_code)
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


setup(name='prom2teams',
version='2.5.1',
version='2.5.2',
description='Project that redirects Prometheus Alert Manager '
'notifications to Microsoft Teams',
long_description=readme,
Expand All @@ -24,7 +24,7 @@
'bin/prom2teams_uwsgi'
],
package_data={
'': ['*.ini', '*.j2', 'static/favicon.ico'],
'': ['*.ini', '*.j2', '*.ico'],
},
include_package_data=True,
data_files=[
Expand Down

0 comments on commit 846d8ff

Please sign in to comment.