jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

metrics: remove circular import

Browse source
This commit is contained in:
Iain Learmonth 2022-11-02 13:24:02 +00:00
parent 8aad3368af
commit 28c07b7d82
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/__init__.py
View file

@ -30,9 +30,9 @@ app.register_blueprint(tfstate, url_prefix="/tfstate")
if 'nose' not in sys.modules.keys() and sys.argv[1] != "db": if 'nose' not in sys.modules.keys() and sys.argv[1] != "db":
from app.metrics import DefinedProxiesCollector, BlockedProxiesCollector, AutomationCollector from app.metrics import DefinedProxiesCollector, BlockedProxiesCollector, AutomationCollector
REGISTRY.register(DefinedProxiesCollector()) # type: ignore[no-untyped-call] REGISTRY.register(DefinedProxiesCollector(app)) # type: ignore[no-untyped-call]
REGISTRY.register(BlockedProxiesCollector()) # type: ignore[no-untyped-call] REGISTRY.register(BlockedProxiesCollector(app)) # type: ignore[no-untyped-call]
REGISTRY.register(AutomationCollector()) # type: ignore[no-untyped-call] REGISTRY.register(AutomationCollector(app)) # type: ignore[no-untyped-call]
@app.route('/') @app.route('/')

18
app/metrics.py
View file

@ -1,16 +1,24 @@
from typing import Iterator from typing import Iterator, Optional
from flask import Flask
from prometheus_client.metrics_core import GaugeMetricFamily, CounterMetricFamily, Metric from prometheus_client.metrics_core import GaugeMetricFamily, CounterMetricFamily, Metric
from sqlalchemy import text from sqlalchemy import text
from app import app
from app.extensions import db from app.extensions import db
from app.models.automation import Automation, AutomationState from app.models.automation import Automation, AutomationState
class FlaskCollector:
def __init__(self, app=None):
self.app: Optional[Flask] = None
def init_app(self, app):
self.app = app
class DefinedProxiesCollector: class DefinedProxiesCollector:
def collect(self) -> Iterator[Metric]: def collect(self) -> Iterator[Metric]:
with app.app_context(): with self.app.app_context():
conn = db.engine.connect() conn = db.engine.connect()
result = conn.execute(text(""" result = conn.execute(text("""
SELECT origin.group_id, "group".group_name, proxy.provider, proxy.pool_id, pool.pool_name, SELECT origin.group_id, "group".group_name, proxy.provider, proxy.pool_id, pool.pool_name,
@ -32,7 +40,7 @@ class DefinedProxiesCollector:
class BlockedProxiesCollector: class BlockedProxiesCollector:
def collect(self) -> Iterator[Metric]: def collect(self) -> Iterator[Metric]:
with app.app_context(): with self.app.app_context():
with db.engine.connect() as conn: with db.engine.connect() as conn:
result = conn.execute(text(""" result = conn.execute(text("""
SELECT origin.group_id, "group".group_name, proxy.provider, proxy.pool_id, pool.pool_name, SELECT origin.group_id, "group".group_name, proxy.provider, proxy.pool_id, pool.pool_name,
@ -56,7 +64,7 @@ class BlockedProxiesCollector:
class AutomationCollector: class AutomationCollector:
def collect(self) -> Iterator[Metric]: def collect(self) -> Iterator[Metric]:
with app.app_context(): with self.app.app_context():
c = GaugeMetricFamily("automation_state", "The automation state (0: idle, 1: running, 2: error)", c = GaugeMetricFamily("automation_state", "The automation state (0: idle, 1: running, 2: error)",
labels=['automation_name']) # type: ignore[no-untyped-call] labels=['automation_name']) # type: ignore[no-untyped-call]
automations = Automation.query.all() automations = Automation.query.all()