Skip to content

Commit

Permalink
Merge branch 'master' into add_travis
Browse files Browse the repository at this point in the history
  • Loading branch information
cleverCat committed Nov 19, 2018
2 parents c601215 + 3cc24d5 commit 936457e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file.
- [#13](https://github.com/epoch8/airflow-exporter/pull/20): Added test script and travis file by @hydrosquall
- [#13](https://github.com/epoch8/airflow-exporter/pull/27): fix run test in travis @cleverCat

## 0.4.1 - 2018-11-13

- Fix [#24](https://github.com/epoch8/airflow-exporter/issues/24): Unsupported mime-type by @szyn

## 0.4 - 2018-10-15

- Fix [#14](https://github.com/epoch8/airflow-exporter/issues/14): Airflow 1.10 compatibility by @jmcarp
Expand Down
2 changes: 1 addition & 1 deletion prometheus_exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def collect(self):
class Metrics(BaseView):
@expose('/')
def index(self):
return Response(generate_latest(), mimetype='text')
return Response(generate_latest(), mimetype='text/plain')


ADMIN_VIEW = Metrics(category="Prometheus exporter", name="metrics")
Expand Down

0 comments on commit 936457e

Please sign in to comment.