diff --git a/CHANGELOG.md b/CHANGELOG.md index 8532b8bd..f30eb442 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Optimize alert and alert group public api endpoints and add filter by id ([1274](https://github.com/grafana/oncall/pull/1274) +- Enable mobile app backend by default on OSS ## v1.1.21 (2023-02-02) diff --git a/engine/apps/api/tests/test_features.py b/engine/apps/api/tests/test_features.py index 6fe5c444..6052cd69 100644 --- a/engine/apps/api/tests/test_features.py +++ b/engine/apps/api/tests/test_features.py @@ -7,6 +7,7 @@ from apps.api.views.features import ( FEATURE_GRAFANA_CLOUD_CONNECTION, FEATURE_GRAFANA_CLOUD_NOTIFICATIONS, FEATURE_LIVE_SETTINGS, + FEATURE_MOBILE_APP, FEATURE_SLACK, FEATURE_TELEGRAM, FEATURE_WEB_SCHEDULES, @@ -40,6 +41,7 @@ def test_select_features_all_enabled( settings.OSS_INSTALLATION = True settings.FEATURE_SLACK_INTEGRATION_ENABLED = True settings.FEATURE_TELEGRAM_INTEGRATION_ENABLED = True + settings.FEATURE_MOBILE_APP_INTEGRATION_ENABLED = True settings.FEATURE_LIVE_SETTINGS_ENABLED = True settings.FEATURE_GRAFANA_CLOUD_CONNECTION = True settings.FEATURE_GRAFANA_CLOUD_NOTIFICATIONS = True @@ -52,6 +54,7 @@ def test_select_features_all_enabled( assert response.json() == [ FEATURE_SLACK, FEATURE_TELEGRAM, + FEATURE_MOBILE_APP, FEATURE_GRAFANA_CLOUD_CONNECTION, FEATURE_LIVE_SETTINGS, FEATURE_GRAFANA_CLOUD_NOTIFICATIONS, @@ -69,6 +72,7 @@ def test_select_features_all_disabled( settings.OSS_INSTALLATION = False settings.FEATURE_SLACK_INTEGRATION_ENABLED = False settings.FEATURE_TELEGRAM_INTEGRATION_ENABLED = False + settings.FEATURE_MOBILE_APP_INTEGRATION_ENABLED = False settings.FEATURE_LIVE_SETTINGS_ENABLED = False settings.FEATURE_GRAFANA_CLOUD_CONNECTION = False settings.FEATURE_GRAFANA_CLOUD_NOTIFICATIONS = FEATURE_GRAFANA_CLOUD_NOTIFICATIONS diff --git a/engine/apps/api/views/features.py b/engine/apps/api/views/features.py index b705c23c..ca4cc488 100644 --- a/engine/apps/api/views/features.py +++ b/engine/apps/api/views/features.py @@ -9,7 +9,7 @@ from apps.base.utils import live_settings FEATURE_SLACK = "slack" FEATURE_TELEGRAM = "telegram" FEATURE_LIVE_SETTINGS = "live_settings" -MOBILE_APP_PUSH_NOTIFICATIONS = "mobile_app" +FEATURE_MOBILE_APP = "mobile_app" FEATURE_GRAFANA_CLOUD_NOTIFICATIONS = "grafana_cloud_notifications" FEATURE_GRAFANA_CLOUD_CONNECTION = "grafana_cloud_connection" FEATURE_WEB_SCHEDULES = "web_schedules" @@ -37,7 +37,7 @@ class FeaturesAPIView(APIView): enabled_features.append(FEATURE_TELEGRAM) if settings.FEATURE_MOBILE_APP_INTEGRATION_ENABLED: - enabled_features.append(MOBILE_APP_PUSH_NOTIFICATIONS) + enabled_features.append(FEATURE_MOBILE_APP) if settings.OSS_INSTALLATION: # Features below should be enabled only in OSS diff --git a/engine/settings/base.py b/engine/settings/base.py index be04ad98..3e7bf3a3 100644 --- a/engine/settings/base.py +++ b/engine/settings/base.py @@ -57,7 +57,7 @@ FEATURE_LIVE_SETTINGS_ENABLED = getenv_boolean("FEATURE_LIVE_SETTINGS_ENABLED", FEATURE_TELEGRAM_INTEGRATION_ENABLED = getenv_boolean("FEATURE_TELEGRAM_INTEGRATION_ENABLED", default=True) FEATURE_EMAIL_INTEGRATION_ENABLED = getenv_boolean("FEATURE_EMAIL_INTEGRATION_ENABLED", default=True) FEATURE_SLACK_INTEGRATION_ENABLED = getenv_boolean("FEATURE_SLACK_INTEGRATION_ENABLED", default=True) -FEATURE_MOBILE_APP_INTEGRATION_ENABLED = getenv_boolean("FEATURE_MOBILE_APP_INTEGRATION_ENABLED", default=False) +FEATURE_MOBILE_APP_INTEGRATION_ENABLED = getenv_boolean("FEATURE_MOBILE_APP_INTEGRATION_ENABLED", default=True) FEATURE_WEB_SCHEDULES_ENABLED = getenv_boolean("FEATURE_WEB_SCHEDULES_ENABLED", default=False) FEATURE_MULTIREGION_ENABLED = getenv_boolean("FEATURE_MULTIREGION_ENABLED", default=False) GRAFANA_CLOUD_ONCALL_HEARTBEAT_ENABLED = getenv_boolean("GRAFANA_CLOUD_ONCALL_HEARTBEAT_ENABLED", default=True)