Merge pull request #41 from fromedwin/develop

Releave v0.9.2

CHANGELOG.md

@@ -20,6 +20,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 See for sample https://raw.githubusercontent.com/favoloso/conventional-changelog-emoji/master/CHANGELOG.md
 -->
+
+## [0.9.2] - 2024-05-20
+### Improvements
+- Fix incident duration calculation (#29)
+- Minor modification to README.md (#34)
+- Update dependencies (#36)
+- Minor updates on website (#37)
+
 ## [0.9.1] - 2023-09-26
 ### 🛠 Improvements
 - Make SSL alert shorter (#30)

README.md

@@ -11,16 +11,28 @@ Metrics are focused on **availability**, with future integration for **performan
 ```bash
 python3 -m venv apps
 source apps/bin/activate
+
+# psycopg2 lib Apple silicon specific
+# brew install openssl
+# export LIBRARY_PATH=$LIBRARY_PATH:/opt/homebrew/opt/openssl/lib
+
 pip install -r django/requirements.txt
 
 # Generate random SECRET_KEY and inject in .env file
 SECRET_KEY=$(LC_CTYPE=C tr -dc 'a-zA-Z0-9' < /dev/urandom | head -c 32)
+# Or 
+# SECRET_KEY=$(openssl rand -base64 64)
+
 echo "SECRET_KEY=$SECRET_KEY" >> .env
 
-# Create superuser to access django admin panel
-python django/manage.py createsuperuser
+# For development, add DEBUG=1 in .env file
+# echo "DEBUG=1" >> .env
 
+# For a first setup, run migrate and createsuperuser
 python django/manage.py migrate
+# Create superuser to access django admin panel (migrate first for the first setup)
+python django/manage.py createsuperuser
+
 python django/manage.py tailwind install
 ```
 

django/core/decorators.py

@@ -0,0 +1,20 @@
+from functools import wraps
+from django.contrib import messages
+from django.shortcuts import redirect
+from django.http import HttpResponse
+from django.shortcuts import render
+
+def user_approved_in_waiting_list(user):
+    if user.is_staff:
+        return True
+    return False
+
+def waiting_list_approved_only():
+    def decorator(view):
+        @wraps(view)
+        def _wrapped_view(request, *args, **kwargs):
+            if not user_approved_in_waiting_list(request.user):
+                return render(request, 'waiting_list.html')
+            return view(request, *args, **kwargs)
+        return _wrapped_view
+    return decorator

django/core/middleware.py

@@ -10,6 +10,7 @@ def middleware(request):
             and request.user.projects.count() == 0\
             and request.path != '/welcome/'\
             and request.path != '/logout/'\
+            and request.path != '/settings/user/delete'\
             and not request.path.startswith('/admin/')\
             and request.path != '/restricted/':
             response = HttpResponseRedirect('/welcome/')

django/core/settings.py

@@ -31,7 +31,7 @@
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
 
-VERSION = [0, 9, 1]
+VERSION = [0, 9, 2]
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = os.environ.get('SECRET_KEY')
@@ -46,6 +46,7 @@
 
 IS_SERVICE_DOWN_SCRAPE_INTERVAL_SECONDS = 60
 IS_SERVICE_DOWN_TRIGGER_OUTRAGE_MINUTES = 5
+IS_SERVICE_DOWN_TRIGGER_WARNING_MINUTES = 2
 # Run Lighthouse every 60 minutes
 LIGHTHOUSE_SCRAPE_INTERVAL_MINUTES = int(os.environ.get('LIGHTHOUSE_SCRAPE_INTERVAL_MINUTES', 60))
 
@@ -151,6 +152,7 @@
 ]
 
 MIDDLEWARE = (
+    'allauth.account.middleware.AccountMiddleware',
     'django_prometheus.middleware.PrometheusBeforeMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',

django/core/templates/waiting_list.html

@@ -0,0 +1,30 @@
+{% extends 'base.html' %}
+{% load socialaccount account tailwind_tags %}
+
+{% block body %}
+
+<div class="flex w-screen h-screen items-center justify-center">
+  <form method="post" class="py-5 space-y-8 divide-y divide-gray-200">
+    <div class="bg-white shadow sm:rounded-lg">
+      <div class="px-4 py-5 sm:p-6">
+        <h3 class="text-lg leading-6 font-medium text-gray-900">
+
+        </h3>
+        <div class="mt-2 max-w-xl text-sm text-gray-500">
+          <p>
+            You are currently on waiting list You can cancel at any time.
+          </p>
+        </div>
+        <div class="mt-5 flex justify-between gap-8">
+          <a href="{% url 'user_delete' %}" class="whitespace-nowrap font-medium text-red-700 hover:text-red-600">
+            Delete your account
+          </a>
+          <a href="{% url 'logout' %}?next=/" class="whitespace-nowrap font-medium text-black-700 hover:text-black-600">
+            Logout
+          </a>
+        </div>
+      </div>
+    </div>
+  </form>
+</div>
+{% endblock %}

django/dashboard/views.py

@@ -9,10 +9,13 @@
 from allauth.socialaccount.models import SocialApp
 from rest_framework.authtoken.models import Token
 
+from core.decorators import waiting_list_approved_only
+
 from workers.models import Server
 from incidents.models import Incident
 
 @login_required
+@waiting_list_approved_only()
 def dashboard(request):
 
     # If user has no project we redirect to /welcome/

django/incidents/handler.py

@@ -28,7 +28,7 @@ def handleAlert(request, alert):
 
     incident = Incident(
         alert_name = alert["labels"]["alertname"],
-        starts_at = getStartsAt(alert),
+        starts_at = getStartsAt(alert, settings),
         ends_at = getEndsAt(alert),
         status = getStatus(alert),
         severity = getSeverity(alert),

django/incidents/utils.py

@@ -19,8 +19,14 @@ def getSeverity(alert):
         return INCIDENT_SEVERITY['CRITICAL']
     return INCIDENT_SEVERITY['UNKNOWN'] 
 
-def getStartsAt(alert):
+def getStartsAt(alert, settings):
     starts_at = timezone.make_aware(timezone.datetime.strptime(alert["startsAt"].split(".")[0], "%Y-%m-%dT%H:%M:%S"))
+    # Based on the severity, we update starting time to include the time before the alert
+    severity = getSeverity(alert)
+    if severity == INCIDENT_SEVERITY['CRITICAL']:
+        starts_at = starts_at - timedelta(minutes=settings.IS_SERVICE_DOWN_TRIGGER_OUTRAGE_MINUTES)
+    elif severity == INCIDENT_SEVERITY['WARNING']:
+        starts_at = starts_at - timedelta(minutes=settings.IS_SERVICE_DOWN_TRIGGER_WARNING_MINUTES)
     return starts_at
 
 def getEndsAt(alert):

django/incidents/views.py

@@ -11,13 +11,15 @@
 from rest_framework.decorators import api_view
 from rest_framework.response import Response
 
+from core.decorators import waiting_list_approved_only
 from .models import Incident
 from projects.models import Project
 from availability.models import Service
 
 from constants import INCIDENT_SEVERITY, INCIDENT_STATUS
 
 @login_required
+@waiting_list_approved_only()
 def incidents(request, id, year=None, month=None, day=None):
     """
     List of incidents for a specific projects
@@ -93,6 +95,7 @@ def incidents(request, id, year=None, month=None, day=None):
 
 
 @login_required
+@waiting_list_approved_only()
 def incidents_force_online(request, service_id):
 
     service = get_object_or_404(Service, pk=service_id)

django/notifications/views.py

@@ -13,9 +13,11 @@
 from projects.models import Project
 from incidents.models import Incident
 
+from core.decorators import waiting_list_approved_only
 from django.conf import settings
 
 @login_required
+@waiting_list_approved_only()
 def project_notifications(request, id):
     """
     Show current project status
@@ -40,6 +42,7 @@ def project_notifications(request, id):
     })
 
 @login_required
+@waiting_list_approved_only()
 def email_form(request, application_id, email_id=None):
 
     email = None
@@ -73,6 +76,7 @@ def email_form(request, application_id, email_id=None):
     })
 
 @login_required
+@waiting_list_approved_only()
 def email_delete(request, application_id, email_id):
 
     email = get_object_or_404(Emails, pk=email_id)
@@ -81,6 +85,7 @@ def email_delete(request, application_id, email_id):
     return redirect(reverse('project_notifications', args=[application_id]))
 
 @login_required
+@waiting_list_approved_only()
 def messages(request):
 
     # If user has no project we redirect to /welcome/

django/performances/urls.py

@@ -20,6 +20,4 @@
     path('api/request/<uuid:server_id>/performance', fetch_performance, name='fetch_performance'),
     # Report lighthouse performance
     path('api/report/<uuid:server_id>/performance/<int:performance_id>', save_report, name='fetch_performance'),
-    # Report lighthouse performance
-
 ]

django/performances/views.py

@@ -10,6 +10,7 @@
 from projects.models import Project
 from .models import Performance, Report
 from .forms import PerformanceForm
+from core.decorators import waiting_list_approved_only
 
 def get_domaines_from_performances(performances_list):
     domains = {}
@@ -66,6 +67,7 @@ def find_page(pages, performance, depth=0, path_parent=''):
     return domains
 
 @login_required
+@waiting_list_approved_only()
 def project_performances(request, id):
     """
     Show current project status
@@ -81,6 +83,7 @@ def project_performances(request, id):
     })
 
 @login_required
+@waiting_list_approved_only()
 def performance_form(request, application_id, performance_id=None):
     """
         Create or edit service model
@@ -118,6 +121,7 @@ def performance_form(request, application_id, performance_id=None):
     })
 
 @login_required
+@waiting_list_approved_only()
 def performance_delete(request, application_id, performance_id):
     """
         Delete service model
@@ -129,6 +133,7 @@ def performance_delete(request, application_id, performance_id):
     return redirect(reverse('project_performances', args=[application_id]))
 
 @login_required
+@waiting_list_approved_only()
 def performance_rerun(request, application_id, performance_id):
     """
         Delete service model
@@ -141,6 +146,7 @@ def performance_rerun(request, application_id, performance_id):
     return redirect(reverse('project_performances', args=[application_id])+'#noanimations')
 
 @login_required
+@waiting_list_approved_only()
 def project_performances_report_viewer(request, id, report_id):
     """
     Show current project status
@@ -158,6 +164,7 @@ def project_performances_report_viewer(request, id, report_id):
     })
 
 @login_required
+@waiting_list_approved_only()
 def performances_all(request):
 
     domains = {}

django/projects/views.py

@@ -16,6 +16,7 @@
 
 from .forms import ProjectForm, ProjectCreateForm
 
+from core.decorators import waiting_list_approved_only
 from projects.models import Project
 from availability.models import Service, HTTPCodeService, HTTPMockedCodeService
 from workers.models import Server
@@ -24,6 +25,7 @@
 from performances.models import Performance
 
 @login_required
+@waiting_list_approved_only()
 def project(request, id):
     """
     Show current project status
@@ -53,6 +55,7 @@ def project(request, id):
     })
 
 @login_required
+@waiting_list_approved_only()
 def project_performances(request, id):
     """
     Show current project status
@@ -65,6 +68,7 @@ def project_performances(request, id):
     })
 
 @login_required
+@waiting_list_approved_only()
 def projects_form(request, id=None):
     """
         Create or edit project model
@@ -96,6 +100,7 @@ def projects_form(request, id=None):
     })
 
 @login_required
+@waiting_list_approved_only()
 def projects_delete(request, id=None):
     """
         Delete project model
@@ -106,6 +111,7 @@ def projects_delete(request, id=None):
     return redirect(reverse('dashboard'))
 
 @login_required
+@waiting_list_approved_only()
 def projects_add(request):
     """
         Create or edit project model
@@ -125,6 +131,7 @@ def projects_add(request):
     })
 
 @login_required
+@waiting_list_approved_only()
 def projects_welcome(request):
     """
         Create or edit project model