Merge branch 'dev' into 167-slack-notification-not-displaying

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## v1.0.15 (2022-08-03)
+- Bug fixes
+
 ## v1.0.13 (2022-07-27)
 - Optimize alert group list view
 - Fix a bug related to Twilio setup

engine/apps/alerts/tasks/notify_user.py

@@ -386,9 +386,7 @@ def perform_notification(log_record_pk):
                 "status": f"{alert_group.status}",
                 "aps": {
                     "alert": f"Critical page: {message}",
-                    # This is disabled until we gain the Critical Alerts Api permission from apple
-                    # "interruption-level": "critical",
-                    "interruption-level": "time-sensitive",
+                    "interruption-level": "critical",
                     "sound": "ambulance.aiff",
                 },
             },

engine/apps/api/views/live_setting.py

@@ -10,7 +10,6 @@ from apps.api.permissions import IsAdmin
 from apps.api.serializers.live_setting import LiveSettingSerializer
 from apps.auth_token.auth import PluginAuthentication
 from apps.base.models import LiveSetting
-from apps.oss_installation.models import CloudConnector
 from apps.oss_installation.tasks import sync_users_with_cloud
 from apps.slack.tasks import unpopulate_slack_user_identities
 from apps.telegram.client import TelegramClient
@@ -73,6 +72,8 @@ class LiveSettingViewSet(PublicPrimaryKeyMixin, viewsets.ModelViewSet):
                 unpopulate_slack_user_identities.delay(organization_pk=organization.pk, force=True)
 
         if instance.name == "GRAFANA_CLOUD_ONCALL_TOKEN":
+            from apps.oss_installation.models import CloudConnector
+
             CloudConnector.remove_sync()
 
             sync_users = self.request.query_params.get("sync_users", "true") == "true"

helm/oncall/Chart.yaml

@@ -8,13 +8,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.2
+version: 1.0.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v1.0.3"
+appVersion: "v1.0.13"
 dependencies:
   - name: cert-manager
     version: v1.8.0