Merge pull request #291 from grafana/dev

Merge dev to main

Author: matiasb

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## v1.0.12 (2022-07-26)
+- Update push-notifications dependency
+- Rework how absolute URLs are built
+- Fix to show maintenance windows per team
+- Logging improvements
+- Internal api to get a schedule final events
+
 ## v1.0.10 (2022-07-22)
 - Speed-up of alert group web caching
 - Internal api for OnCall shifts

engine/apps/alerts/tests/test_alert_receiver_channel.py

@@ -5,6 +5,7 @@
 from django.urls import reverse
 
 from apps.alerts.models import AlertReceiveChannel
+from common.api_helpers.utils import create_engine_url
 
 
 @pytest.mark.django_db
@@ -26,11 +27,7 @@ def test_integration_url(make_organization, make_alert_receive_channel, url, set
         kwargs={"alert_channel_key": alert_receive_channel.token},
     )
 
-    # remove trailing / if present
-    if url[-1] == "/":
-        url = url[:-1]
-
-    assert alert_receive_channel.integration_url == f"{url}{path}"
+    assert alert_receive_channel.integration_url == create_engine_url(path)
 
 
 @pytest.mark.django_db

engine/apps/api/tests/test_schedules.py

@@ -469,13 +469,13 @@ def test_filter_events_calendar(
         "by_day": ["MO", "FR"],
         "schedule": schedule,
     }
-
     on_call_shift = make_on_call_shift(
         organization=organization, shift_type=CustomOnCallShift.TYPE_RECURRENT_EVENT, **data
     )
     on_call_shift.users.add(user)
 
     url = reverse("api-internal:schedule-filter-events", kwargs={"pk": schedule.public_primary_key})
+    url += "?type=rotation"
     response = client.get(url, format="json", **make_user_auth_headers(user, token))
 
     # current week events are expected
@@ -525,6 +525,7 @@ def test_filter_events_calendar(
 @pytest.mark.django_db
 def test_filter_events_range_calendar(
     make_organization_and_user_with_plugin_token,
+    make_user_for_organization,
     make_user_auth_headers,
     make_schedule,
     make_on_call_shift,
@@ -540,6 +541,9 @@ def test_filter_events_range_calendar(
 
     now = timezone.now().replace(microsecond=0)
     start_date = now - timezone.timedelta(days=7)
+    mon_start = now - timezone.timedelta(days=start_date.weekday())
+    request_date = mon_start + timezone.timedelta(days=2)
+
     data = {
         "start": start_date,
         "rotation_start": start_date,
@@ -549,17 +553,27 @@ def test_filter_events_range_calendar(
         "by_day": ["MO", "FR"],
         "schedule": schedule,
     }
-
     on_call_shift = make_on_call_shift(
         organization=organization, shift_type=CustomOnCallShift.TYPE_RECURRENT_EVENT, **data
     )
     on_call_shift.users.add(user)
 
-    mon_start = now - timezone.timedelta(days=start_date.weekday())
-    request_date = mon_start + timezone.timedelta(days=2)
+    # add override shift
+    override_start = request_date + timezone.timedelta(seconds=3600)
+    override_data = {
+        "start": override_start,
+        "rotation_start": override_start,
+        "duration": timezone.timedelta(seconds=3600),
+        "schedule": schedule,
+    }
+    override = make_on_call_shift(
+        organization=organization, shift_type=CustomOnCallShift.TYPE_OVERRIDE, **override_data
+    )
+    other_user = make_user_for_organization(organization)
+    override.users.add(other_user)
 
     url = reverse("api-internal:schedule-filter-events", kwargs={"pk": schedule.public_primary_key})
-    url += "?date={}&days=3".format(request_date.strftime("%Y-%m-%d"))
+    url += "?date={}&days=3&type=rotation".format(request_date.strftime("%Y-%m-%d"))
     response = client.get(url, format="json", **make_user_auth_headers(user, token))
 
     # only friday occurrence is expected
@@ -590,6 +604,215 @@ def test_filter_events_range_calendar(
     assert response.data == expected_result
 
 
+@pytest.mark.django_db
+def test_filter_events_overrides(
+    make_organization_and_user_with_plugin_token,
+    make_user_for_organization,
+    make_user_auth_headers,
+    make_schedule,
+    make_on_call_shift,
+):
+    organization, user, token = make_organization_and_user_with_plugin_token()
+    client = APIClient()
+
+    schedule = make_schedule(
+        organization,
+        schedule_class=OnCallScheduleWeb,
+        name="test_web_schedule",
+    )
+
+    now = timezone.now().replace(microsecond=0)
+    start_date = now - timezone.timedelta(days=7)
+    mon_start = now - timezone.timedelta(days=start_date.weekday())
+    request_date = mon_start + timezone.timedelta(days=2)
+
+    data = {
+        "start": start_date,
+        "rotation_start": start_date,
+        "duration": timezone.timedelta(seconds=7200),
+        "priority_level": 1,
+        "frequency": CustomOnCallShift.FREQUENCY_WEEKLY,
+        "by_day": ["MO", "FR"],
+        "schedule": schedule,
+    }
+    on_call_shift = make_on_call_shift(
+        organization=organization, shift_type=CustomOnCallShift.TYPE_RECURRENT_EVENT, **data
+    )
+    on_call_shift.users.add(user)
+
+    # add override shift
+    override_start = request_date + timezone.timedelta(seconds=3600)
+    override_data = {
+        "start": override_start,
+        "rotation_start": override_start,
+        "duration": timezone.timedelta(seconds=3600),
+        "schedule": schedule,
+    }
+    override = make_on_call_shift(
+        organization=organization, shift_type=CustomOnCallShift.TYPE_OVERRIDE, **override_data
+    )
+    other_user = make_user_for_organization(organization)
+    override.add_rolling_users([[other_user]])
+
+    url = reverse("api-internal:schedule-filter-events", kwargs={"pk": schedule.public_primary_key})
+    url += "?date={}&days=3&type=override".format(request_date.strftime("%Y-%m-%d"))
+    response = client.get(url, format="json", **make_user_auth_headers(user, token))
+
+    # only override occurrence is expected
+    expected_result = {
+        "id": schedule.public_primary_key,
+        "name": "test_web_schedule",
+        "type": 2,
+        "events": [
+            {
+                "all_day": False,
+                "start": override_start,
+                "end": override_start + override.duration,
+                "users": [{"display_name": other_user.username, "pk": other_user.public_primary_key}],
+                "missing_users": [],
+                "priority_level": None,
+                "source": "api",
+                "calendar_type": OnCallSchedule.OVERRIDES,
+                "is_empty": False,
+                "is_gap": False,
+                "shift": {
+                    "pk": override.public_primary_key,
+                },
+            }
+        ],
+    }
+    assert response.status_code == status.HTTP_200_OK
+    assert response.data == expected_result
+
+
+@pytest.mark.django_db
+def test_filter_events_final_schedule(
+    make_organization_and_user_with_plugin_token,
+    make_user_for_organization,
+    make_user_auth_headers,
+    make_schedule,
+    make_on_call_shift,
+):
+    organization, user, token = make_organization_and_user_with_plugin_token()
+    client = APIClient()
+
+    schedule = make_schedule(
+        organization,
+        schedule_class=OnCallScheduleWeb,
+        name="test_web_schedule",
+    )
+
+    now = timezone.now().replace(hour=0, minute=0, second=0, microsecond=0)
+    start_date = now - timezone.timedelta(days=7)
+    request_date = start_date
+
+    user_a, user_b, user_c, user_d, user_e = (make_user_for_organization(organization, username=i) for i in "ABCDE")
+
+    shifts = (
+        # user, priority, start time (h), duration (hs)
+        (user_a, 1, 10, 5),  # r1-1: 10-15 / A
+        (user_b, 1, 11, 2),  # r1-2: 11-13 / B
+        (user_a, 1, 16, 3),  # r1-3: 16-19 / A
+        (user_a, 1, 21, 1),  # r1-4: 21-22 / A
+        (user_b, 1, 22, 2),  # r1-5: 22-00 / B
+        (user_c, 2, 12, 2),  # r2-1: 12-14 / C
+        (user_d, 2, 14, 1),  # r2-2: 14-15 / D
+        (user_d, 2, 17, 1),  # r2-3: 17-18 / D
+        (user_d, 2, 20, 3),  # r2-4: 20-23 / D
+    )
+    for user, priority, start_h, duration in shifts:
+        data = {
+            "start": start_date + timezone.timedelta(hours=start_h),
+            "rotation_start": start_date,
+            "duration": timezone.timedelta(hours=duration),
+            "priority_level": priority,
+            "frequency": CustomOnCallShift.FREQUENCY_DAILY,
+            "schedule": schedule,
+        }
+        on_call_shift = make_on_call_shift(
+            organization=organization, shift_type=CustomOnCallShift.TYPE_RECURRENT_EVENT, **data
+        )
+        on_call_shift.users.add(user)
+
+    # override: 22-23 / E
+    override_data = {
+        "start": start_date + timezone.timedelta(hours=22),
+        "rotation_start": start_date,
+        "duration": timezone.timedelta(hours=1),
+        "schedule": schedule,
+    }
+    override = make_on_call_shift(
+        organization=organization, shift_type=CustomOnCallShift.TYPE_OVERRIDE, **override_data
+    )
+    override.add_rolling_users([[user_e]])
+
+    url = reverse("api-internal:schedule-filter-events", kwargs={"pk": schedule.public_primary_key})
+    url += "?date={}&days=1".format(request_date.strftime("%Y-%m-%d"))
+    response = client.get(url, format="json", **make_user_auth_headers(user, token))
+    assert response.status_code == status.HTTP_200_OK
+
+    expected = (
+        # start (h), duration (H), user, priority, is_gap, is_override
+        (0, 10, None, None, True, False),  # 0-10 gap
+        (10, 2, "A", 1, False, False),  # 10-12 A
+        (11, 1, "B", 1, False, False),  # 11-12 B
+        (12, 2, "C", 2, False, False),  # 12-14 C
+        (14, 1, "D", 2, False, False),  # 14-15 D
+        (15, 1, None, None, True, False),  # 15-16 gap
+        (16, 1, "A", 1, False, False),  # 16-17 A
+        (17, 1, "D", 2, False, False),  # 17-18 D
+        (18, 1, "A", 1, False, False),  # 18-19 A
+        (19, 1, None, None, True, False),  # 19-20 gap
+        (20, 2, "D", 2, False, False),  # 20-22 D
+        (22, 1, "E", None, False, True),  # 22-23 E (override)
+        (23, 1, "B", 1, False, False),  # 23-00 B
+    )
+    expected_events = [
+        {
+            "calendar_type": 1 if is_override else None if is_gap else 0,
+            "end": start_date + timezone.timedelta(hours=start + duration),
+            "is_gap": is_gap,
+            "priority_level": priority,
+            "start": start_date + timezone.timedelta(hours=start, milliseconds=1 if start == 0 else 0),
+            "user": user,
+        }
+        for start, duration, user, priority, is_gap, is_override in expected
+    ]
+    returned_events = [
+        {
+            "calendar_type": e["calendar_type"],
+            "end": e["end"],
+            "is_gap": e["is_gap"],
+            "priority_level": e["priority_level"],
+            "start": e["start"],
+            "user": e["users"][0]["display_name"] if e["users"] else None,
+        }
+        for e in response.data["events"]
+    ]
+    assert returned_events == expected_events
+
+
+@pytest.mark.django_db
+def test_filter_events_invalid_type(
+    make_organization_and_user_with_plugin_token,
+    make_user_auth_headers,
+    make_schedule,
+):
+    organization, user, token = make_organization_and_user_with_plugin_token()
+    client = APIClient()
+
+    schedule = make_schedule(
+        organization,
+        schedule_class=OnCallScheduleWeb,
+        name="test_web_schedule",
+    )
+
+    url = reverse("api-internal:schedule-filter-events", kwargs={"pk": schedule.public_primary_key})
+    url += "?type=invalid"
+    response = client.get(url, format="json", **make_user_auth_headers(user, token))
+    assert response.status_code == status.HTTP_400_BAD_REQUEST
+
+
 @pytest.mark.django_db
 @pytest.mark.parametrize(
     "role,expected_status",

engine/apps/api/urls.py

@@ -39,6 +39,7 @@
 from .views.subscription import SubscriptionView
 from .views.team import TeamViewSet
 from .views.telegram_channels import TelegramChannelViewSet
+from .views.test_insight_logs import TestInsightLogsAPIView
 from .views.user import CurrentUserView, UserView
 from .views.user_group import UserGroupViewSet
 
@@ -108,6 +109,7 @@
         "preview_template_options", PreviewTemplateOptionsView.as_view(), name="preview_template_options"
     ),
     optional_slash_path("route_regex_debugger", RouteRegexDebuggerView.as_view(), name="route_regex_debugger"),
+    optional_slash_path("insight_logs_test", TestInsightLogsAPIView.as_view(), name="insight-logs-test"),
 ]
 
 urlpatterns += [

engine/apps/api/views/maintenance.py

@@ -43,9 +43,11 @@ class MaintenanceAPIView(APIView):
 
     def get(self, request):
         organization = self.request.auth.organization
+        team = self.request.user.current_team
+
         response = []
         integrations_under_maintenance = AlertReceiveChannel.objects.filter(
-            maintenance_mode__isnull=False, organization=organization
+            maintenance_mode__isnull=False, organization=organization, team=team
         ).order_by("maintenance_started_at")
 
         if organization.maintenance_mode is not None: