From fed136aadae595a1621a2eaf3ccb48d62193dca3 Mon Sep 17 00:00:00 2001 From: aarya-16 Date: Tue, 15 Oct 2024 03:13:41 +0530 Subject: [PATCH 1/2] Added groups to history page --- history.html.theme | 35 ++++++++++++++++++++++------------- tinystatus.py | 19 ++++++++++++------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/history.html.theme b/history.html.theme index e12403b..cb531e1 100644 --- a/history.html.theme +++ b/history.html.theme @@ -45,11 +45,13 @@ color: var(--heading-color); text-align: center; } + .history-group { + margin-bottom: 40px; + } .history-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); gap: 20px; - margin-bottom: 40px; } .history-item { background: var(--card-bg); @@ -59,7 +61,7 @@ max-height: 300px; overflow: auto; } - .history-item h2 { + .history-item h3 { font-size: 1.2rem; margin: 0; } @@ -86,21 +88,28 @@

TinyStatus History

-
- {% for service, entries in history.items() %} -
-

{{ service }}

- {% for entry in entries|reverse %} -
- {{ entry.timestamp.split('T')[0] }} {{ entry.timestamp.split('T')[1][:8] }} - - {{ 'Up' if entry.status else 'Down' }} - + + {% for group in history.groups %} +
+

{{ group.title }}

+
+ {% for service, entries in group.checks.items() %} +
+

{{ service }}

+ {% for entry in entries|reverse %} +
+ {{ entry.timestamp.split('T')[0] }} {{ entry.timestamp.split('T')[1][:8] }} + + {{ 'Up' if entry.status else 'Down' }} + +
+ {% endfor %}
{% endfor %}
- {% endfor %}
+ {% endfor %} +

Last updated: {{ last_updated }}

Back to Current Status

diff --git a/tinystatus.py b/tinystatus.py index 327ff76..7b6ef38 100644 --- a/tinystatus.py +++ b/tinystatus.py @@ -107,15 +107,20 @@ def save_history(history): def update_history(results): - # TODO: Configure groups in history page history = load_history() current_time = datetime.now().isoformat() - for group in results.keys(): - for check in results[group]: - if check['name'] not in history: - history[check['name']] = [] - history[check['name']].append({'timestamp': current_time, 'status': check['status']}) - history[check['name']] = history[check['name']][-MAX_HISTORY_ENTRIES:] + if 'groups' not in history: + history['groups'] = [] + for group_title, checks in results.items(): + group_found = next((group for group in history['groups'] if group['title'] == group_title), None) + if group_found is None: + group_found = {'title': group_title, 'checks': {}} + history['groups'].append(group_found) + for check in checks: + if check['name'] not in group_found['checks']: + group_found['checks'][check['name']] = [] + group_found['checks'][check['name']].append({'timestamp': current_time, 'status': check['status']}) + group_found['checks'][check['name']] = group_found['checks'][check['name']][-MAX_HISTORY_ENTRIES:] save_history(history) From aadc2c0fa7ed0696a0dfb945d5ffbb445aad064f Mon Sep 17 00:00:00 2001 From: aarya-16 Date: Tue, 15 Oct 2024 20:39:20 +0530 Subject: [PATCH 2/2] Update tinystatus.py --- tinystatus.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tinystatus.py b/tinystatus.py index 7b6ef38..383b994 100644 --- a/tinystatus.py +++ b/tinystatus.py @@ -150,11 +150,13 @@ async def monitor_services(): update_history(results) + history = load_history() + html = template.render(groups=results, incidents=incidents, last_updated=datetime.now().strftime("%Y-%m-%d %H:%M:%S")) with open(os.path.join(HTML_OUTPUT_DIRECTORY, 'index.html'), 'w') as f: f.write(html) - history_html = history_template.render(history=load_history(), last_updated=datetime.now().strftime("%Y-%m-%d %H:%M:%S")) + history_html = history_template.render(history=history, last_updated=datetime.now().strftime("%Y-%m-%d %H:%M:%S")) with open(os.path.join(HTML_OUTPUT_DIRECTORY, 'history.html'), 'w') as f: f.write(history_html)