Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #274 from kevgliss/metric_fix 

Fixing an issue were metrics would not be sent
This commit is contained in:
kevgliss 2016-04-05 10:50:46 -07:00
parent 00b263f345 dbc4964e94
commit 9a8e1534c0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lemur/factory.py
View File

@ -19,7 +19,7 @@ from logging.handlers import RotatingFileHandler
from flask import Flask from flask import Flask
from lemur.common.health import mod as health from lemur.common.health import mod as health
from lemur.extensions import db, migrate, principal, smtp_mail from lemur.extensions import db, migrate, principal, smtp_mail, metrics
DEFAULT_BLUEPRINTS = ( DEFAULT_BLUEPRINTS = (
@ -112,6 +112,7 @@ def configure_extensions(app):
migrate.init_app(app, db) migrate.init_app(app, db)
principal.init_app(app) principal.init_app(app)
smtp_mail.init_app(app) smtp_mail.init_app(app)
metrics.init_app(app)
def configure_blueprints(app, blueprints): def configure_blueprints(app, blueprints):

2
lemur/plugins/base/v1.py
View File

@ -112,7 +112,7 @@ class IPlugin(local):
def get_option(name, options): def get_option(name, options):
for o in options: for o in options:
if o.get('name') == name: if o.get('name') == name:
return o.get('value') return o.get('value', o.get('default'))
class Plugin(IPlugin): class Plugin(IPlugin):