bar
" + else: + assert response.data["preview"] == "bar" + + @pytest.mark.django_db @pytest.mark.parametrize( "role,expected_status", @@ -669,3 +707,68 @@ def test_get_alert_receive_channels_direct_paging_present_for_filters( # Check direct paging integration is in the response assert response.status_code == status.HTTP_200_OK assert response.json()[0]["value"] == alert_receive_channel.public_primary_key + + +@pytest.mark.django_db +def test_start_maintenance_integration( + make_user_auth_headers, + make_organization_and_user_with_plugin_token, + make_escalation_chain, + make_alert_receive_channel, +): + + organization, user, token = make_organization_and_user_with_plugin_token() + make_escalation_chain(organization) + alert_receive_channel = make_alert_receive_channel(organization) + + client = APIClient() + + url = reverse( + "api-internal:alert_receive_channel-start-maintenance", kwargs={"pk": alert_receive_channel.public_primary_key} + ) + + data = { + "mode": AlertReceiveChannel.MAINTENANCE, + "duration": AlertReceiveChannel.DURATION_ONE_HOUR.total_seconds(), + "type": "alert_receive_channel", + } + response = client.post(url, data=data, format="json", **make_user_auth_headers(user, token)) + + alert_receive_channel.refresh_from_db() + assert response.status_code == status.HTTP_200_OK + assert alert_receive_channel.maintenance_mode == AlertReceiveChannel.MAINTENANCE + assert alert_receive_channel.maintenance_duration == AlertReceiveChannel.DURATION_ONE_HOUR + assert alert_receive_channel.maintenance_uuid is not None + assert alert_receive_channel.maintenance_started_at is not None + assert alert_receive_channel.maintenance_author is not None + + +@pytest.mark.django_db +def test_stop_maintenance_integration( + mock_start_disable_maintenance_task, + make_user_auth_headers, + make_organization_and_user_with_plugin_token, + make_escalation_chain, + make_alert_receive_channel, +): + organization, user, token = make_organization_and_user_with_plugin_token() + make_escalation_chain(organization) + alert_receive_channel = make_alert_receive_channel(organization) + client = APIClient() + mode = AlertReceiveChannel.MAINTENANCE + duration = AlertReceiveChannel.DURATION_ONE_HOUR.seconds + alert_receive_channel.start_maintenance(mode, duration, user) + url = reverse( + "api-internal:alert_receive_channel-stop-maintenance", kwargs={"pk": alert_receive_channel.public_primary_key} + ) + data = { + "type": "alert_receive_channel", + } + response = client.post(url, data=data, format="json", **make_user_auth_headers(user, token)) + alert_receive_channel.refresh_from_db() + assert response.status_code == status.HTTP_200_OK + assert alert_receive_channel.maintenance_mode is None + assert alert_receive_channel.maintenance_duration is None + assert alert_receive_channel.maintenance_uuid is None + assert alert_receive_channel.maintenance_started_at is None + assert alert_receive_channel.maintenance_author is None diff --git a/engine/apps/api/tests/test_alert_receive_channel_template.py b/engine/apps/api/tests/test_alert_receive_channel_template.py index 1b2a1d6a..e00f75b9 100644 --- a/engine/apps/api/tests/test_alert_receive_channel_template.py +++ b/engine/apps/api/tests/test_alert_receive_channel_template.py @@ -376,4 +376,7 @@ def test_update_alert_receive_channel_templates( # check if updated templates are applied updated_templates_data = response.json() for template_name, prev_template_value in existing_templates_data.items(): - assert updated_templates_data[template_name] == template_update_func(prev_template_value) + if template_name.endswith("_is_default"): + assert updated_templates_data[template_name] is False + else: + assert updated_templates_data[template_name] == template_update_func(prev_template_value) diff --git a/engine/apps/api/tests/test_channel_filter.py b/engine/apps/api/tests/test_channel_filter.py index fe02e97b..d22b7040 100644 --- a/engine/apps/api/tests/test_channel_filter.py +++ b/engine/apps/api/tests/test_channel_filter.py @@ -502,3 +502,67 @@ def test_channel_filter_update_invalid_notification_backends( assert response.status_code == status.HTTP_400_BAD_REQUEST assert response.json() == {"notification_backends": ["Invalid messaging backend"]} assert channel_filter.notification_backends is None + + +@pytest.mark.django_db +@pytest.mark.parametrize( + "role,expected_status", + [ + (LegacyAccessControlRole.ADMIN, status.HTTP_200_OK), + (LegacyAccessControlRole.EDITOR, status.HTTP_403_FORBIDDEN), + (LegacyAccessControlRole.VIEWER, status.HTTP_403_FORBIDDEN), + ], +) +def test_channel_filter_convert_from_regex_to_jinja2( + make_organization_and_user_with_plugin_token, + make_alert_receive_channel, + make_channel_filter, + make_user_auth_headers, + role, + expected_status, +): + organization, user, token = make_organization_and_user_with_plugin_token(role) + alert_receive_channel = make_alert_receive_channel(organization) + + make_channel_filter(alert_receive_channel, is_default=True) + + # r"..." used to keep this string as raw string + regex_filtering_term = r"\".*\": \"This alert was sent by user for the demonstration purposes\"" + final_filtering_term = r'{{ payload | json_dumps | regex_search("\".*\": \"This alert was sent by user for the demonstration purposes\"") }}' + payload = {"description": "This alert was sent by user for the demonstration purposes"} + + regex_channel_filter = make_channel_filter( + alert_receive_channel, + filtering_term=regex_filtering_term, + is_default=False, + ) + # Check if the filtering term is a regex + assert regex_channel_filter.filtering_term_type == regex_channel_filter.FILTERING_TERM_TYPE_REGEX + # Check if the alert is matched to the channel filter (route) regex + assert bool(regex_channel_filter.is_satisfying(payload)) is True + + client = APIClient() + url = reverse("api-internal:channel_filter-detail", kwargs={"pk": regex_channel_filter.public_primary_key}) + + response = client.get(url, format="json", **make_user_auth_headers(user, token)) + + assert response.status_code == status.HTTP_200_OK + # Check if preview of the filtering term migration is correct + assert response.json()["filtering_term_as_jinja2"] == final_filtering_term + + url = reverse( + "api-internal:channel_filter-convert-from-regex-to-jinja2", + kwargs={"pk": regex_channel_filter.public_primary_key}, + ) + response = client.post(url, **make_user_auth_headers(user, token)) + # Only admins can convert from regex to jinja2 + assert response.status_code == expected_status + if expected_status == status.HTTP_200_OK: + regex_channel_filter.refresh_from_db() + # Regex is now converted to jinja2 + jinja2_channel_filter = regex_channel_filter + # Check if the filtering term is a jinja2, and if it is correct + assert jinja2_channel_filter.filtering_term_type == jinja2_channel_filter.FILTERING_TERM_TYPE_JINJA2 + assert jinja2_channel_filter.filtering_term == final_filtering_term + # Check if the same alert is matched to the channel filter (route) new jinja2 + assert bool(jinja2_channel_filter.is_satisfying(payload)) is True diff --git a/engine/apps/api/views/alert_group.py b/engine/apps/api/views/alert_group.py index a0a290be..96420041 100644 --- a/engine/apps/api/views/alert_group.py +++ b/engine/apps/api/views/alert_group.py @@ -657,5 +657,5 @@ class AlertGroupView( ) # This method is required for PreviewTemplateMixin - def get_alert_to_template(self): + def get_alert_to_template(self, payload=None): return self.get_object().alerts.first() diff --git a/engine/apps/api/views/alert_receive_channel.py b/engine/apps/api/views/alert_receive_channel.py index 8675d95f..ced06e18 100644 --- a/engine/apps/api/views/alert_receive_channel.py +++ b/engine/apps/api/views/alert_receive_channel.py @@ -8,7 +8,8 @@ from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response from rest_framework.viewsets import ModelViewSet -from apps.alerts.models import AlertReceiveChannel +from apps.alerts.models import Alert, AlertGroup, AlertReceiveChannel +from apps.alerts.models.maintainable_object import MaintainableObject from apps.api.permissions import RBACPermission from apps.api.serializers.alert_receive_channel import ( AlertReceiveChannelSerializer, @@ -21,12 +22,13 @@ from common.api_helpers.exceptions import BadRequest from common.api_helpers.filters import ByTeamModelFieldFilterMixin, TeamModelMultipleChoiceFilter from common.api_helpers.mixins import ( FilterSerializerMixin, + PreviewTemplateException, PreviewTemplateMixin, PublicPrimaryKeyMixin, TeamFilteringMixin, UpdateSerializerMixin, ) -from common.exceptions import TeamCanNotBeChangedError, UnableToSendDemoAlert +from common.exceptions import MaintenanceCouldNotBeStartedError, TeamCanNotBeChangedError, UnableToSendDemoAlert from common.insight_log import EntityEvent, write_resource_insight_log @@ -95,6 +97,8 @@ class AlertReceiveChannelView( "destroy": [RBACPermission.Permissions.INTEGRATIONS_WRITE], "change_team": [RBACPermission.Permissions.INTEGRATIONS_WRITE], "filters": [RBACPermission.Permissions.INTEGRATIONS_READ], + "start_maintenance": [RBACPermission.Permissions.INTEGRATIONS_WRITE], + "stop_maintenance": [RBACPermission.Permissions.INTEGRATIONS_WRITE], } def create(self, request, *args, **kwargs): @@ -149,9 +153,19 @@ class AlertReceiveChannelView( @action(detail=True, methods=["post"], throttle_classes=[DemoAlertThrottler]) def send_demo_alert(self, request, pk): - instance = AlertReceiveChannel.objects.get(public_primary_key=pk) + alert_receive_channel = AlertReceiveChannel.objects.get(public_primary_key=pk) + demo_alert_payload = request.data.get("demo_alert_payload", None) + + if not demo_alert_payload: + # If no payload provided, use the demo payload for backword compatibility + payload = alert_receive_channel.config.example_payload + else: + if type(demo_alert_payload) != dict: + raise BadRequest(detail="Payload for demo alert must be a valid json object") + payload = demo_alert_payload + try: - instance.send_demo_alert() + alert_receive_channel.send_demo_alert(payload=payload) except UnableToSendDemoAlert as e: raise BadRequest(detail=str(e)) return Response(status=status.HTTP_200_OK) @@ -215,9 +229,16 @@ class AlertReceiveChannelView( return Response(response) # This method is required for PreviewTemplateMixin - def get_alert_to_template(self): + def get_alert_to_template(self, payload=None): try: - return self.get_object().alert_groups.last().alerts.first() + if payload is None: + return self.get_object().alert_groups.last().alerts.first() + else: + if type(payload) != dict: + raise PreviewTemplateException("Payload must be a valid json object") + # Build Alert and AlertGroup objects to pass to templater without saving them to db + alert_group_to_template = AlertGroup(channel=self.get_object()) + return Alert(raw_request_data=payload, group=alert_group_to_template) except AttributeError: return None @@ -239,3 +260,40 @@ class AlertReceiveChannelView( filter_options = list(filter(lambda f: filter_name in f["name"], filter_options)) return Response(filter_options) + + @action(detail=True, methods=["post"]) + def start_maintenance(self, request, pk): + instance = self.get_queryset(eager=False).get(public_primary_key=pk) + + mode = request.data.get("mode", None) + duration = request.data.get("duration", None) + try: + mode = int(mode) + except (ValueError, TypeError): + raise BadRequest(detail={"mode": ["Invalid mode"]}) + if mode not in [MaintainableObject.DEBUG_MAINTENANCE, MaintainableObject.MAINTENANCE]: + raise BadRequest(detail={"mode": ["Unknown mode"]}) + try: + duration = int(duration) + except (ValueError, TypeError): + raise BadRequest(detail={"duration": ["Invalid duration"]}) + if duration not in MaintainableObject.maintenance_duration_options_in_seconds(): + raise BadRequest(detail={"mode": ["Unknown duration"]}) + + try: + instance.start_maintenance(mode, duration, request.user) + except MaintenanceCouldNotBeStartedError as e: + if type(instance) == AlertReceiveChannel: + detail = {"alert_receive_channel_id": ["Already on maintenance"]} + else: + detail = str(e) + raise BadRequest(detail=detail) + + return Response(status=status.HTTP_200_OK) + + @action(detail=True, methods=["post"]) + def stop_maintenance(self, request, pk): + instance = self.get_queryset(eager=False).get(public_primary_key=pk) + user = request.user + instance.force_disable_maintenance(user) + return Response(status=status.HTTP_200_OK) diff --git a/engine/apps/api/views/channel_filter.py b/engine/apps/api/views/channel_filter.py index adfe534f..2341c003 100644 --- a/engine/apps/api/views/channel_filter.py +++ b/engine/apps/api/views/channel_filter.py @@ -41,6 +41,7 @@ class ChannelFilterView( "destroy": [RBACPermission.Permissions.INTEGRATIONS_WRITE], "move_to_position": [RBACPermission.Permissions.INTEGRATIONS_WRITE], "send_demo_alert": [RBACPermission.Permissions.INTEGRATIONS_TEST], + "convert_from_regex_to_jinja2": [RBACPermission.Permissions.INTEGRATIONS_WRITE], } model = ChannelFilter @@ -137,9 +138,23 @@ class ChannelFilterView( @action(detail=True, methods=["post"], throttle_classes=[DemoAlertThrottler]) def send_demo_alert(self, request, pk): + """Deprecated action. May be used in the older version of the plugin.""" instance = ChannelFilter.objects.get(public_primary_key=pk) try: instance.send_demo_alert() except UnableToSendDemoAlert as e: raise BadRequest(detail=str(e)) return Response(status=status.HTTP_200_OK) + + @action(detail=True, methods=["post"]) + def convert_from_regex_to_jinja2(self, request, pk): + instance = self.get_queryset().get(public_primary_key=pk) + if not instance.filtering_term_type == ChannelFilter.FILTERING_TERM_TYPE_REGEX: + raise BadRequest(detail="Only regex filtering term type is supported") + + serializer_class = self.serializer_class + + instance.filtering_term = serializer_class(instance).get_filtering_term_as_jinja2(instance) + instance.filtering_term_type = ChannelFilter.FILTERING_TERM_TYPE_JINJA2 + instance.save() + return Response(status=status.HTTP_200_OK, data=serializer_class(instance).data) diff --git a/engine/apps/api/views/maintenance.py b/engine/apps/api/views/maintenance.py index 29042acb..c875d65c 100644 --- a/engine/apps/api/views/maintenance.py +++ b/engine/apps/api/views/maintenance.py @@ -39,6 +39,8 @@ class GetObjectMixin: class MaintenanceAPIView(APIView): + """Deprecated. Maintenance management is now performed on integrations page (alert_receive_channel/ endpoint))""" + authentication_classes = (PluginAuthentication,) permission_classes = (IsAuthenticated, RBACPermission) @@ -101,6 +103,8 @@ class MaintenanceAPIView(APIView): class MaintenanceStartAPIView(GetObjectMixin, APIView): + """Deprecated. Maintenance management is now performed on integrations page (alert_receive_channel/ endpoint))""" + authentication_classes = (PluginAuthentication,) permission_classes = (IsAuthenticated, RBACPermission) rbac_permissions = { @@ -137,6 +141,8 @@ class MaintenanceStartAPIView(GetObjectMixin, APIView): class MaintenanceStopAPIView(GetObjectMixin, APIView): + """Deprecated. Maintenance management is now performed on integrations page (alert_receive_channel/ endpoint))""" + authentication_classes = (PluginAuthentication,) permission_classes = (IsAuthenticated, RBACPermission) rbac_permissions = { diff --git a/engine/apps/api/views/telegram_channels.py b/engine/apps/api/views/telegram_channels.py index 7fd9975d..c7bd6d50 100644 --- a/engine/apps/api/views/telegram_channels.py +++ b/engine/apps/api/views/telegram_channels.py @@ -8,7 +8,7 @@ from apps.api.permissions import RBACPermission from apps.api.serializers.telegram import TelegramToOrganizationConnectorSerializer from apps.auth_token.auth import PluginAuthentication from common.api_helpers.mixins import PublicPrimaryKeyMixin -from common.insight_log.chatops_insight_logs import ChatOpsEvent, ChatOpsType, write_chatops_insight_log +from common.insight_log.chatops_insight_logs import ChatOpsEvent, ChatOpsTypePlug, write_chatops_insight_log class TelegramChannelViewSet( @@ -47,7 +47,7 @@ class TelegramChannelViewSet( write_chatops_insight_log( author=user, event_name=ChatOpsEvent.CHANNEL_DISCONNECTED, - chatops_type=ChatOpsType.TELEGRAM, + chatops_type=ChatOpsTypePlug.TELEGRAM.value, channel_name=instance.channel_name, ) instance.delete() diff --git a/engine/apps/api/views/user.py b/engine/apps/api/views/user.py index b5ddcafa..ab9d05c0 100644 --- a/engine/apps/api/views/user.py +++ b/engine/apps/api/views/user.py @@ -49,7 +49,7 @@ from common.api_helpers.paginators import HundredPageSizePaginator from common.api_helpers.utils import create_engine_url from common.insight_log import ( ChatOpsEvent, - ChatOpsType, + ChatOpsTypePlug, EntityEvent, write_chatops_insight_log, write_resource_insight_log, @@ -417,7 +417,7 @@ class UserView( write_chatops_insight_log( author=request.user, event_name=ChatOpsEvent.USER_UNLINKED, - chatops_type=ChatOpsType.SLACK, + chatops_type=ChatOpsTypePlug.SLACK.value, linked_user=user.username, linked_user_id=user.public_primary_key, ) @@ -433,7 +433,7 @@ class UserView( write_chatops_insight_log( author=request.user, event_name=ChatOpsEvent.USER_UNLINKED, - chatops_type=ChatOpsType.TELEGRAM, + chatops_type=ChatOpsTypePlug.TELEGRAM.value, linked_user=user.username, linked_user_id=user.public_primary_key, ) diff --git a/engine/apps/public_api/serializers/integrations.py b/engine/apps/public_api/serializers/integrations.py index 2c42da5d..26af0fe8 100644 --- a/engine/apps/public_api/serializers/integrations.py +++ b/engine/apps/public_api/serializers/integrations.py @@ -80,6 +80,7 @@ class IntegrationSerializer(EagerLoadingMixin, serializers.ModelSerializer, Main templates = serializers.DictField(required=False) default_route = serializers.DictField(required=False) heartbeat = serializers.SerializerMethodField() + description_short = serializers.CharField(max_length=250, required=False) PREFETCH_RELATED = ["channel_filters"] SELECT_RELATED = ["organization", "integration_heartbeat"] @@ -89,6 +90,7 @@ class IntegrationSerializer(EagerLoadingMixin, serializers.ModelSerializer, Main fields = MaintainableObjectSerializerMixin.Meta.fields + [ "id", "name", + "description_short", "team_id", "link", "type", diff --git a/engine/apps/public_api/tests/test_integrations.py b/engine/apps/public_api/tests/test_integrations.py index d508e15a..6bbea4ae 100644 --- a/engine/apps/public_api/tests/test_integrations.py +++ b/engine/apps/public_api/tests/test_integrations.py @@ -17,7 +17,7 @@ def test_get_list_integrations( make_integration_heartbeat, ): organization, user, token = make_organization_and_user_with_token() - integration = make_alert_receive_channel(organization, verbal_name="grafana") + integration = make_alert_receive_channel(organization, verbal_name="grafana", description_short="Some description") default_channel_filter = make_channel_filter(integration, is_default=True) make_integration_heartbeat(integration) @@ -31,6 +31,7 @@ def test_get_list_integrations( "id": integration.public_primary_key, "team_id": None, "name": "grafana", + "description_short": "Some description", "link": integration.integration_url, "type": "grafana", "default_route": { @@ -162,6 +163,7 @@ def test_update_integration_template( "id": integration.public_primary_key, "team_id": None, "name": "grafana", + "description_short": None, "link": integration.integration_url, "type": "grafana", "default_route": { @@ -223,6 +225,7 @@ def test_update_integration_template_messaging_backend( "id": integration.public_primary_key, "team_id": None, "name": "grafana", + "description_short": None, "link": integration.integration_url, "type": "grafana", "default_route": { @@ -300,6 +303,7 @@ def test_update_resolve_signal_template( "id": integration.public_primary_key, "team_id": None, "name": "grafana", + "description_short": None, "link": integration.integration_url, "type": "grafana", "default_route": { @@ -409,6 +413,7 @@ def test_update_sms_template_with_empty_dict( "id": integration.public_primary_key, "team_id": None, "name": "grafana", + "description_short": None, "link": integration.integration_url, "type": "grafana", "default_route": { @@ -470,6 +475,69 @@ def test_update_integration_name( "id": integration.public_primary_key, "team_id": None, "name": "grafana_updated", + "description_short": None, + "link": integration.integration_url, + "type": "grafana", + "default_route": { + "escalation_chain_id": None, + "id": default_channel_filter.public_primary_key, + "slack": {"channel_id": None, "enabled": True}, + "telegram": {"id": None, "enabled": False}, + TEST_MESSAGING_BACKEND_FIELD: {"id": None, "enabled": False}, + }, + "heartbeat": { + "link": f"{integration.integration_url}heartbeat/", + }, + "templates": { + "grouping_key": None, + "resolve_signal": None, + "acknowledge_signal": None, + "source_link": None, + "slack": {"title": None, "message": None, "image_url": None}, + "web": {"title": None, "message": None, "image_url": None}, + "sms": { + "title": None, + }, + "phone_call": { + "title": None, + }, + "telegram": { + "title": None, + "message": None, + "image_url": None, + }, + TEST_MESSAGING_BACKEND_FIELD: { + "title": None, + "message": None, + "image_url": None, + }, + }, + "maintenance_mode": None, + "maintenance_started_at": None, + "maintenance_end_at": None, + } + url = reverse("api-public:integrations-detail", args=[integration.public_primary_key]) + response = client.put(url, data=data_for_update, format="json", HTTP_AUTHORIZATION=f"{token}") + assert response.status_code == status.HTTP_200_OK + assert response.data == expected_response + + +@pytest.mark.django_db +def test_update_integration_name_and_description_short( + make_organization_and_user_with_token, make_alert_receive_channel, make_channel_filter, make_integration_heartbeat +): + organization, user, token = make_organization_and_user_with_token() + integration = make_alert_receive_channel(organization, verbal_name="grafana", description_short="Some description") + default_channel_filter = make_channel_filter(integration, is_default=True) + make_integration_heartbeat(integration) + + client = APIClient() + data_for_update = {"name": "grafana_updated"} + expected_response = { + "id": integration.public_primary_key, + "team_id": None, + "name": "grafana_updated", + "description_short": "Some description", "link": integration.integration_url, "type": "grafana", "default_route": { @@ -534,6 +602,7 @@ def test_set_default_template( "id": integration.public_primary_key, "team_id": None, "name": "grafana", + "description_short": None, "link": integration.integration_url, "type": "grafana", "default_route": { @@ -601,6 +670,7 @@ def test_set_default_messaging_backend_template( "id": integration.public_primary_key, "team_id": None, "name": "grafana", + "description_short": None, "link": integration.integration_url, "type": "grafana", "default_route": { diff --git a/engine/apps/schedules/models/on_call_schedule.py b/engine/apps/schedules/models/on_call_schedule.py index 1fde3070..8896811f 100644 --- a/engine/apps/schedules/models/on_call_schedule.py +++ b/engine/apps/schedules/models/on_call_schedule.py @@ -687,7 +687,7 @@ class OnCallSchedule(PolymorphicModel): result["notification_frequency"] = self.get_notify_oncall_shift_freq_display() result["current_shift_notification"] = self.mention_oncall_start result["next_shift_notification"] = self.mention_oncall_next - result["notify_empty_oncall"] = self.get_notify_empty_oncall_display + result["notify_empty_oncall"] = self.get_notify_empty_oncall_display() return result @property diff --git a/engine/apps/slack/models/slack_team_identity.py b/engine/apps/slack/models/slack_team_identity.py index 2c8bc4a8..969f097e 100644 --- a/engine/apps/slack/models/slack_team_identity.py +++ b/engine/apps/slack/models/slack_team_identity.py @@ -9,7 +9,7 @@ from apps.slack.constants import SLACK_INVALID_AUTH_RESPONSE, SLACK_WRONG_TEAM_N from apps.slack.slack_client import SlackClientWithErrorHandling from apps.slack.slack_client.exceptions import SlackAPIException, SlackAPITokenException from apps.user_management.models.user import User -from common.insight_log.chatops_insight_logs import ChatOpsEvent, ChatOpsType, write_chatops_insight_log +from common.insight_log.chatops_insight_logs import ChatOpsEvent, ChatOpsTypePlug, write_chatops_insight_log logger = logging.getLogger(__name__) @@ -65,7 +65,7 @@ class SlackTeamIdentity(models.Model): self.installed_via_granular_permissions = True self.save() write_chatops_insight_log( - author=user, event_name=ChatOpsEvent.WORKSPACE_CONNECTED, chatops_type=ChatOpsType.SLACK + author=user, event_name=ChatOpsEvent.WORKSPACE_CONNECTED, chatops_type=ChatOpsTypePlug.SLACK.value ) def get_cached_channels(self, search_term=None, slack_id=None): diff --git a/engine/apps/slack/views.py b/engine/apps/slack/views.py index a6659e07..829c7c49 100644 --- a/engine/apps/slack/views.py +++ b/engine/apps/slack/views.py @@ -53,7 +53,7 @@ from apps.slack.scenarios.slack_usergroup import STEPS_ROUTING as SLACK_USERGROU from apps.slack.slack_client import SlackClientWithErrorHandling from apps.slack.slack_client.exceptions import SlackAPIException, SlackAPITokenException from apps.slack.tasks import clean_slack_integration_leftovers, unpopulate_slack_user_identities -from common.insight_log import ChatOpsEvent, ChatOpsType, write_chatops_insight_log +from common.insight_log import ChatOpsEvent, ChatOpsTypePlug, write_chatops_insight_log from common.oncall_gateway import delete_slack_connector from .models import SlackMessage, SlackTeamIdentity, SlackUserIdentity @@ -555,7 +555,7 @@ class ResetSlackView(APIView): write_chatops_insight_log( author=request.user, event_name=ChatOpsEvent.WORKSPACE_DISCONNECTED, - chatops_type=ChatOpsType.SLACK, + chatops_type=ChatOpsTypePlug.SLACK.value, ) unpopulate_slack_user_identities(organization.pk, True) response = Response(status=200) diff --git a/engine/apps/social_auth/pipeline.py b/engine/apps/social_auth/pipeline.py index 4c53c9fd..96aa4bc0 100644 --- a/engine/apps/social_auth/pipeline.py +++ b/engine/apps/social_auth/pipeline.py @@ -14,7 +14,7 @@ from common.constants.slack_auth import ( SLACK_AUTH_SLACK_USER_ALREADY_CONNECTED_ERROR, SLACK_AUTH_WRONG_WORKSPACE_ERROR, ) -from common.insight_log import ChatOpsEvent, ChatOpsType, write_chatops_insight_log +from common.insight_log import ChatOpsEvent, ChatOpsTypePlug, write_chatops_insight_log from common.oncall_gateway import check_slack_installation_possible, create_slack_connector logger = logging.getLogger(__name__) @@ -74,7 +74,7 @@ def connect_user_to_slack(response, backend, strategy, user, organization, *args write_chatops_insight_log( author=user, event_name=ChatOpsEvent.USER_LINKED, - chatops_type=ChatOpsType.SLACK, + chatops_type=ChatOpsTypePlug.SLACK.value, linked_user=user.username, linked_user_id=user.public_primary_key, ) diff --git a/engine/apps/telegram/models/connectors/channel.py b/engine/apps/telegram/models/connectors/channel.py index 75190f6b..fc3c7794 100644 --- a/engine/apps/telegram/models/connectors/channel.py +++ b/engine/apps/telegram/models/connectors/channel.py @@ -10,7 +10,7 @@ from telegram import error from apps.alerts.models import AlertGroup from apps.telegram.client import TelegramClient from apps.telegram.models import TelegramMessage -from common.insight_log.chatops_insight_logs import ChatOpsEvent, ChatOpsType, write_chatops_insight_log +from common.insight_log.chatops_insight_logs import ChatOpsEvent, ChatOpsTypePlug, write_chatops_insight_log from common.public_primary_keys import generate_public_primary_key, increase_public_primary_key_length logger = logging.getLogger(__name__) @@ -102,7 +102,7 @@ class TelegramToOrganizationConnector(models.Model): write_chatops_insight_log( author=author, event_name=ChatOpsEvent.DEFAULT_CHANNEL_CHANGED, - chatops_type=ChatOpsType.TELEGRAM, + chatops_type=ChatOpsTypePlug.TELEGRAM.value, prev_channel=old_default_channel.channel_name if old_default_channel else None, new_channel=self.channel_name, ) diff --git a/engine/apps/telegram/models/verification/channel.py b/engine/apps/telegram/models/verification/channel.py index 1b24bb6e..f9e530ba 100644 --- a/engine/apps/telegram/models/verification/channel.py +++ b/engine/apps/telegram/models/verification/channel.py @@ -6,7 +6,7 @@ from django.db import models from django.utils import timezone from apps.telegram.models import TelegramToOrganizationConnector -from common.insight_log.chatops_insight_logs import ChatOpsEvent, ChatOpsType, write_chatops_insight_log +from common.insight_log.chatops_insight_logs import ChatOpsEvent, ChatOpsTypePlug, write_chatops_insight_log class TelegramChannelVerificationCode(models.Model): @@ -66,14 +66,14 @@ class TelegramChannelVerificationCode(models.Model): write_chatops_insight_log( author=code_instance.author, event_name=ChatOpsEvent.CHANNEL_CONNECTED, - chatops_type=ChatOpsType.TELEGRAM, + chatops_type=ChatOpsTypePlug.TELEGRAM.value, channel_name=channel_name, ) if not connector_exists: write_chatops_insight_log( author=code_instance.author, event_name=ChatOpsEvent.DEFAULT_CHANNEL_CHANGED, - chatops_type=ChatOpsType.TELEGRAM, + chatops_type=ChatOpsTypePlug.TELEGRAM.value, prev_channel=None, new_channel=channel_name, ) diff --git a/engine/apps/telegram/models/verification/personal.py b/engine/apps/telegram/models/verification/personal.py index 323b990a..e61664b2 100644 --- a/engine/apps/telegram/models/verification/personal.py +++ b/engine/apps/telegram/models/verification/personal.py @@ -6,7 +6,7 @@ from django.db import IntegrityError, models from django.utils import timezone from apps.telegram.models import TelegramToUserConnector -from common.insight_log import ChatOpsEvent, ChatOpsType, write_chatops_insight_log +from common.insight_log import ChatOpsEvent, ChatOpsTypePlug, write_chatops_insight_log class TelegramVerificationCode(models.Model): @@ -48,7 +48,7 @@ class TelegramVerificationCode(models.Model): write_chatops_insight_log( author=user, event_name=ChatOpsEvent.USER_LINKED, - chatops_type=ChatOpsType.TELEGRAM, + chatops_type=ChatOpsTypePlug.TELEGRAM.value, linked_user=user.username, linked_user_id=user.public_primary_key, ) diff --git a/engine/apps/user_management/models/organization.py b/engine/apps/user_management/models/organization.py index 73e3f9c3..151bfb34 100644 --- a/engine/apps/user_management/models/organization.py +++ b/engine/apps/user_management/models/organization.py @@ -14,7 +14,7 @@ from apps.alerts.models import MaintainableObject from apps.alerts.tasks import disable_maintenance from apps.slack.utils import post_message_to_channel from apps.user_management.subscription_strategy import FreePublicBetaSubscriptionStrategy -from common.insight_log import ChatOpsEvent, ChatOpsType, write_chatops_insight_log +from common.insight_log import ChatOpsEvent, ChatOpsTypePlug, write_chatops_insight_log from common.oncall_gateway import create_oncall_connector, delete_oncall_connector, delete_slack_connector from common.public_primary_keys import generate_public_primary_key, increase_public_primary_key_length @@ -302,7 +302,7 @@ class Organization(MaintainableObject): write_chatops_insight_log( author=user, event_name=ChatOpsEvent.DEFAULT_CHANNEL_CHANGED, - chatops_type=ChatOpsType.SLACK, + chatops_type=ChatOpsTypePlug.SLACK.value, prev_channel=old_channel_name, new_channel=channel_name, ) diff --git a/engine/apps/webhooks/models/webhook.py b/engine/apps/webhooks/models/webhook.py index 6407b04c..11713eaa 100644 --- a/engine/apps/webhooks/models/webhook.py +++ b/engine/apps/webhooks/models/webhook.py @@ -274,4 +274,5 @@ class WebhookResponse(models.Model): content = models.TextField(null=True, default=None) def json(self): - return json.loads(self.content) + if self.content: + return json.loads(self.content) diff --git a/engine/apps/webhooks/tests/test_trigger_webhook.py b/engine/apps/webhooks/tests/test_trigger_webhook.py index 4fd1ee48..9380f560 100644 --- a/engine/apps/webhooks/tests/test_trigger_webhook.py +++ b/engine/apps/webhooks/tests/test_trigger_webhook.py @@ -297,6 +297,7 @@ def test_execute_webhook_using_responses_data( public_primary_key="response-1", ), trigger_type=Webhook.TRIGGER_FIRING, + status_code=200, content=json.dumps({"id": "third-party-id"}), ) make_webhook_response( @@ -306,8 +307,20 @@ def test_execute_webhook_using_responses_data( public_primary_key="response-2", ), trigger_type=Webhook.TRIGGER_ACKNOWLEDGE, + status_code=200, content=json.dumps({"id": "third-party-id", "status": "updated"}), ) + # webhook wasn't executed because of some error, there is no content or status_code + make_webhook_response( + alert_group=alert_group, + webhook=make_custom_webhook( + organization=organization, + public_primary_key="response-3", + ), + trigger_type=Webhook.TRIGGER_SILENCE, + content=None, + status_code=None, + ) mock_response = MockResponse() with patch("apps.webhooks.utils.socket.gethostbyname") as mock_gethostbyname: diff --git a/engine/common/api_helpers/custom_fields.py b/engine/common/api_helpers/custom_fields.py index d7114b67..28bc9e30 100644 --- a/engine/common/api_helpers/custom_fields.py +++ b/engine/common/api_helpers/custom_fields.py @@ -101,35 +101,6 @@ class UsersFilteredByOrganizationField(serializers.Field): return queryset.filter(organization=request.user.organization, public_primary_key__in=data).distinct() -class WritableSerializerMethodField(serializers.SerializerMethodField): - """ - Please, NEVER use this field. - It was a mistake to create this one due to necessity to dig deep in drf to fix bugs there. - This field is a workaround to allow to write into SerializerMethodField. - """ - - def __init__(self, method_name=None, **kwargs): - self.method_name = method_name - self.setter_method_name = kwargs.pop("setter_method_name", None) - self.deserializer_field = kwargs.pop("deserializer_field") - - kwargs["source"] = "*" - super(serializers.SerializerMethodField, self).__init__(**kwargs) - - def bind(self, field_name, parent): - retval = super().bind(field_name, parent) - if not self.setter_method_name: - self.setter_method_name = f"set_{field_name}" - - return retval - - def to_internal_value(self, data): - value = self.deserializer_field.to_internal_value(data) - method = getattr(self.parent, self.setter_method_name) - method(value) - return {self.method_name: value} - - class CustomTimeField(fields.TimeField): def to_representation(self, value): result = super().to_representation(value) diff --git a/engine/common/api_helpers/mixins.py b/engine/common/api_helpers/mixins.py index 271a9555..9889e642 100644 --- a/engine/common/api_helpers/mixins.py +++ b/engine/common/api_helpers/mixins.py @@ -283,11 +283,16 @@ BEHAVIOUR_TEMPLATE_NAMES = [RESOLVE_CONDITION, ACKNOWLEDGE_CONDITION, GROUPING_I ALL_TEMPLATE_NAMES = APPEARANCE_TEMPLATE_NAMES + BEHAVIOUR_TEMPLATE_NAMES +class PreviewTemplateException(Exception): + pass + + class PreviewTemplateMixin: @action(methods=["post"], detail=True) def preview_template(self, request, pk): template_body = request.data.get("template_body", None) template_name = request.data.get("template_name", None) + payload = request.data.get("payload", None) if template_body is None or template_name is None: response = {"preview": None} @@ -295,18 +300,21 @@ class PreviewTemplateMixin: notification_channel, attr_name = self.parse_name_and_notification_channel(template_name) if attr_name is None: - raise BadRequest(detail={"template_name": "Attr name is required"}) + raise BadRequest(detail={"template_name": "Template name is missing"}) if attr_name not in ALL_TEMPLATE_NAMES: - raise BadRequest(detail={"template_name": "Unknown attr name"}) + raise BadRequest(detail={"template_name": "Unknown template name"}) if attr_name in APPEARANCE_TEMPLATE_NAMES: if notification_channel is None: raise BadRequest(detail={"notification_channel": "notification_channel is required"}) if notification_channel not in NOTIFICATION_CHANNEL_OPTIONS: raise BadRequest(detail={"notification_channel": "Unknown notification_channel"}) - alert_to_template = self.get_alert_to_template() - if alert_to_template is None: - raise BadRequest(detail="Alert to preview does not exist") + try: + alert_to_template = self.get_alert_to_template(payload=payload) + if alert_to_template is None: + raise BadRequest(detail="Alert to preview does not exist") + except PreviewTemplateException as e: + raise BadRequest(detail=str(e)) if attr_name in APPEARANCE_TEMPLATE_NAMES: @@ -337,7 +345,7 @@ class PreviewTemplateMixin: response = {"preview": templated_attr} return Response(response, status=status.HTTP_200_OK) - def get_alert_to_template(self): + def get_alert_to_template(self, payload=None): raise NotImplementedError @staticmethod diff --git a/engine/common/exceptions/exceptions.py b/engine/common/exceptions/exceptions.py index 9adf0b47..15f70520 100644 --- a/engine/common/exceptions/exceptions.py +++ b/engine/common/exceptions/exceptions.py @@ -1,6 +1,6 @@ class OperationCouldNotBePerformedError(Exception): """ - Indicates that operation could not be performed due to to application logic. + Indicates that operation could not be performed due to application logic. E.g. you can't ack resolved AlertGroup """ diff --git a/engine/common/insight_log/__init__.py b/engine/common/insight_log/__init__.py index 9bf46cf3..f71d6423 100644 --- a/engine/common/insight_log/__init__.py +++ b/engine/common/insight_log/__init__.py @@ -1,3 +1,3 @@ -from .chatops_insight_logs import ChatOpsEvent, ChatOpsType, write_chatops_insight_log # noqa +from .chatops_insight_logs import ChatOpsEvent, ChatOpsTypePlug, write_chatops_insight_log # noqa from .maintenance_insight_log import MaintenanceEvent, write_maintenance_insight_log # noqa from .resource_insight_logs import EntityEvent, write_resource_insight_log # noqa diff --git a/engine/common/insight_log/chatops_insight_logs.py b/engine/common/insight_log/chatops_insight_logs.py index 6bf6055e..64808beb 100644 --- a/engine/common/insight_log/chatops_insight_logs.py +++ b/engine/common/insight_log/chatops_insight_logs.py @@ -9,8 +9,8 @@ logger = logging.getLogger(__name__) class ChatOpsEvent(enum.Enum): - WORKSPACE_CONNECTED = "started" - WORKSPACE_DISCONNECTED = "finished" + WORKSPACE_CONNECTED = "workspace_connected" + WORKSPACE_DISCONNECTED = "workspace_disconnected" CHANNEL_CONNECTED = "channel_connected" CHANNEL_DISCONNECTED = "channel_disconnected" USER_LINKED = "user_linked" @@ -18,17 +18,13 @@ class ChatOpsEvent(enum.Enum): DEFAULT_CHANNEL_CHANGED = "default_channel_changed" -class ChatOpsType(enum.Enum): - # Keep in sync with messaging backends' id. - # In perfect world backend_ids should be used intead of this enums - # It can be achieved when we move refactor slack and telegram to use the messaging_backend system. - SLACK = "SLACK" - MSTEAMS = "MSTEAMS" - TELEGRAM = "TELEGRAM" - MOBILE_APP = "MOBILE_APP" +class ChatOpsTypePlug(enum.Enum): + # ChatOpsTypePlug provides backend_id string for chatops integration not supporting messaging_backends. + SLACK = "slack" + TELEGRAM = "telegram" -def write_chatops_insight_log(author, event_name: ChatOpsEvent, chatops_type: ChatOpsType, **kwargs): +def write_chatops_insight_log(author, event_name: ChatOpsEvent, chatops_type: str, **kwargs): try: organization = author.organization @@ -37,7 +33,7 @@ def write_chatops_insight_log(author, event_name: ChatOpsEvent, chatops_type: Ch user_id = author.public_primary_key username = json.dumps(author.username) - log_line = f"tenant_id={tenant_id} author_id={user_id} author={username} action_type=chat_ops action_name={event_name.value} chat_ops_type={chatops_type.value}" # noqa + log_line = f"tenant_id={tenant_id} author_id={user_id} author={username} action_type=chat_ops action_name={event_name.value} chat_ops_type={chatops_type.lower()}" # noqa for k, v in kwargs.items(): log_line += f" {k}={json.dumps(v)}" diff --git a/engine/common/insight_log/insight_logs_enabled_check.py b/engine/common/insight_log/insight_logs_enabled_check.py index 0bf41933..67041bd9 100644 --- a/engine/common/insight_log/insight_logs_enabled_check.py +++ b/engine/common/insight_log/insight_logs_enabled_check.py @@ -8,8 +8,8 @@ logger = logging.getLogger(__name__) def is_insight_logs_enabled(organization): """ is_insight_logs_enabled checks if inside logs enabled for given organization. - Now it checks if oncall is deployed on same cluster that its grafana instance to be able to forward logs. - Or if it's Open Source :) + Now it checks if oncall is deployed on same cluster that its grafana instance to be able to forward logs + to Loki through logs-forwarder. """ logger.info( "is_insight_logs_enabled: " @@ -17,4 +17,4 @@ def is_insight_logs_enabled(organization): f"ONCALL_BACKEND_REGION={settings.ONCALL_BACKEND_REGION} " f"cluster_slug={organization.cluster_slug}" ) - return settings.IS_OPEN_SOURCE or settings.ONCALL_BACKEND_REGION == organization.cluster_slug + return not settings.IS_OPEN_SOURCE and settings.ONCALL_BACKEND_REGION == organization.cluster_slug diff --git a/engine/common/insight_log/maintenance_insight_log.py b/engine/common/insight_log/maintenance_insight_log.py index f1260351..d0426ebe 100644 --- a/engine/common/insight_log/maintenance_insight_log.py +++ b/engine/common/insight_log/maintenance_insight_log.py @@ -21,7 +21,7 @@ def write_maintenance_insight_log(instance, user, event: MaintenanceEvent): team = instance.get_team() entity_name = json.dumps(instance.insight_logs_verbal) entity_id = instance.public_primary_key - maintenance_mode = instance.get_maintenance_mode_display() + maintenance_mode = instance.get_maintenance_mode_display().lower() if is_insight_logs_enabled(organization): log_line = f"tenant_id={tenant_id} action_type=maintenance action_name={event.value} maintenance_mode={maintenance_mode} resource_id={entity_id} resource_name={entity_name}" # noqa @@ -32,7 +32,7 @@ def write_maintenance_insight_log(instance, user, event: MaintenanceEvent): if user: username = json.dumps(user.username) user_id = user.public_primary_key - log_line += f" user_id={user_id} username={username} " + log_line += f" author_id={user_id} author={username}" insight_logger.info(log_line) except Exception as e: logger.warning(f"insight_log.failed_to_write_maintenance_insight_log exception={e}") diff --git a/engine/common/insight_log/resource_insight_logs.py b/engine/common/insight_log/resource_insight_logs.py index 1b3a0ce9..7f5361fa 100644 --- a/engine/common/insight_log/resource_insight_logs.py +++ b/engine/common/insight_log/resource_insight_logs.py @@ -71,7 +71,7 @@ def write_resource_insight_log(instance: InsightLoggable, author, event: EntityE entity_id = instance.id entity_name = json.dumps(instance.insight_logs_verbal) metadata = instance.insight_logs_metadata - log_line = f"tenant_id={tenant_id} author_id={author_id} author={author} action_type=resource action={event.value} resource_type={entity_type} resource_id={entity_id} resource_name={entity_name}" # noqa + log_line = f"tenant_id={tenant_id} author_id={author_id} author={author} action_type=resource action_name={event.value} resource_type={entity_type} resource_id={entity_id} resource_name={entity_name}" # noqa for k, v in metadata.items(): log_line += f" {k}={json.dumps(v)}" if prev_state and new_state: @@ -82,7 +82,7 @@ def write_resource_insight_log(instance: InsightLoggable, author, event: EntityE log_line += f' new_state="{new_state}"' insight_logger.info(log_line) except Exception as e: - logger.warning(f"insight_log.failed_to_write_entity_insight_log exception={e}") + logger.warning(f"insight_log.failed_to_write_entity_insight_log exception={e} instance_id={instance.id}") def state_diff_finder(prev_state: dict, new_state: dict): diff --git a/engine/common/jinja_templater/filters.py b/engine/common/jinja_templater/filters.py index 1264aa68..88b4797d 100644 --- a/engine/common/jinja_templater/filters.py +++ b/engine/common/jinja_templater/filters.py @@ -37,3 +37,17 @@ def regex_match(pattern, value): return bool(re.match(value, pattern)) except (ValueError, AttributeError, TypeError): return None + + +def regex_search(pattern, value): + try: + return bool(re.search(value, pattern)) + except (ValueError, AttributeError, TypeError): + return None + + +def json_dumps(value): + try: + return json.dumps(value) + except (ValueError, AttributeError, TypeError): + return None diff --git a/engine/common/jinja_templater/jinja_template_env.py b/engine/common/jinja_templater/jinja_template_env.py index 32ceda6b..f4d2d65a 100644 --- a/engine/common/jinja_templater/jinja_template_env.py +++ b/engine/common/jinja_templater/jinja_template_env.py @@ -3,7 +3,15 @@ from jinja2 import BaseLoader from jinja2.exceptions import SecurityError from jinja2.sandbox import SandboxedEnvironment -from .filters import datetimeformat, iso8601_to_time, regex_match, regex_replace, to_pretty_json +from .filters import ( + datetimeformat, + iso8601_to_time, + json_dumps, + regex_match, + regex_replace, + regex_search, + to_pretty_json, +) def raise_security_exception(name): @@ -19,3 +27,5 @@ jinja_template_env.globals["time"] = timezone.now jinja_template_env.globals["range"] = lambda *args: raise_security_exception("range") jinja_template_env.filters["regex_replace"] = regex_replace jinja_template_env.filters["regex_match"] = regex_match +jinja_template_env.filters["regex_search"] = regex_search +jinja_template_env.filters["json_dumps"] = json_dumps diff --git a/engine/common/tests/test_apply_jinja_template.py b/engine/common/tests/test_apply_jinja_template.py index 632f5026..aab3f488 100644 --- a/engine/common/tests/test_apply_jinja_template.py +++ b/engine/common/tests/test_apply_jinja_template.py @@ -14,6 +14,14 @@ def test_apply_jinja_template(): assert payload == result +def test_apply_jinja_template_json_dumps(): + payload = {"name": "test"} + + result = apply_jinja_template("{{ payload | json_dumps }}", payload) + expected = json.dumps(payload) + assert result == expected + + def test_apply_jinja_template_regex_match(): payload = {"name": "test"} @@ -26,6 +34,19 @@ def test_apply_jinja_template_regex_match(): apply_jinja_template("{{ payload.name | regex_match('*') }}", payload) +def test_apply_jinja_template_regex_search(): + payload = {"name": "test"} + + assert apply_jinja_template("{{ payload.name | regex_search('.*') }}", payload) == "True" + assert apply_jinja_template("{{ payload.name | regex_search('tes') }}", payload) == "True" + assert apply_jinja_template("{{ payload.name | regex_search('est') }}", payload) == "True" + assert apply_jinja_template("{{ payload.name | regex_search('test1') }}", payload) == "False" + + # Check that exception is raised when regex is invalid + with pytest.raises(JinjaTemplateError): + apply_jinja_template("{{ payload.name | regex_search('*') }}", payload) + + def test_apply_jinja_template_bad_syntax_error(): with pytest.raises(JinjaTemplateError): apply_jinja_template("{{%", payload={}) diff --git a/helm/oncall/templates/engine/job-migrate.yaml b/helm/oncall/templates/engine/job-migrate.yaml index 2bb478fa..b92d2939 100644 --- a/helm/oncall/templates/engine/job-migrate.yaml +++ b/helm/oncall/templates/engine/job-migrate.yaml @@ -2,7 +2,13 @@ apiVersion: batch/v1 kind: Job metadata: + {{- if .Values.migrate.useHook }} + name: {{ printf "%s-migrate" (include "oncall.engine.fullname" .) }} + annotations: + "helm.sh/hook": post-install,post-upgrade + {{- else }} name: {{ printf "%s-migrate-%s" (include "oncall.engine.fullname" .) (now | date "2006-01-02-15-04-05") }} + {{- end }} labels: {{- include "oncall.engine.labels" . | nindent 4 }} spec: diff --git a/helm/oncall/values.yaml b/helm/oncall/values.yaml index 612e0c49..5bfb08bb 100644 --- a/helm/oncall/values.yaml +++ b/helm/oncall/values.yaml @@ -150,6 +150,8 @@ migrate: enabled: true # TTL can be unset by setting ttlSecondsAfterFinished: "" ttlSecondsAfterFinished: 20 + # use a helm hook to manage the migration job + useHook: false # Additional env variables to add to deployments env: {} diff --git a/tools/pagerduty-migrator/README.md b/tools/pagerduty-migrator/README.md index 6a1b0a19..f0f38222 100644 --- a/tools/pagerduty-migrator/README.md +++ b/tools/pagerduty-migrator/README.md @@ -79,30 +79,22 @@ docker run --rm \ -e PAGERDUTY_API_TOKEN="