mirror of
https://github.com/FAUSheppy/icinga-webhook-gateway
synced 2026-06-19 03:32:37 +02:00
Compare commits
4 Commits
b0752c2984
...
34378a66b5
| Author | SHA1 | Date | |
|---|---|---|---|
| 34378a66b5 | |||
| 1e1458c0f3 | |||
| 35bf34a406 | |||
| a40f12a5d6 |
@@ -16,7 +16,7 @@ from flask_wtf import FlaskForm
|
||||
from wtforms import StringField, SubmitField, BooleanField, DecimalField, HiddenField, SelectField
|
||||
from wtforms.validators import DataRequired, Length
|
||||
|
||||
from sqlalchemy import Column, Integer, String, Boolean, or_, and_
|
||||
from sqlalchemy import Column, Integer, String, Boolean, or_, and_, desc
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from sqlalchemy.exc import IntegrityError
|
||||
from sqlalchemy.sql import func
|
||||
@@ -198,8 +198,17 @@ def service_details():
|
||||
if service.owner and str(service.owner) != user:
|
||||
return ("Services is not owned by {}".format(user))
|
||||
|
||||
two_weeks_ago_ts = int((datetime.datetime.now() - datetime.timedelta(days=14)).timestamp())
|
||||
status_list_query = db.session.query(Status).filter(Status.service==service.service)
|
||||
status_list = status_list_query.order_by(sqlalchemy.desc(Status.timestamp)).limit(200).all()
|
||||
recent_query = (
|
||||
status_list_query
|
||||
.filter(Status.timestamp >= two_weeks_ago_ts, Status.service==service.service)
|
||||
.order_by(desc(Status.timestamp))
|
||||
).limit(1000)
|
||||
status_list = recent_query.all()
|
||||
|
||||
if not status_list:
|
||||
status_list = status_list_query.order_by(sqlalchemy.desc(Status.timestamp)).limit(1000).all()
|
||||
|
||||
# build status tupel (repeats, status) #
|
||||
current_tupel = None
|
||||
|
||||
Reference in New Issue
Block a user