Merge pull request #4928 from grafana/dev

v1.9.15

.github/CODEOWNERS

@@ -1,6 +1,9 @@
 * @grafana/grafana-oncall-backend
 /grafana-plugin @grafana/grafana-oncall-frontend
 /grafana-plugin/pkg @grafana/grafana-oncall-backend
+/grafana-plugin/go.mod @grafana/grafana-oncall-backend
+/grafana-plugin/go.sum @grafana/grafana-oncall-backend
+/grafana-plugin/Magefile.go @grafana/grafana-oncall-backend
 /docs @grafana/docs-gops @grafana/grafana-oncall
 
 # `make docs` procedure is owned by @jdbaldry of @grafana/docs-squad.

Tiltfile

@@ -73,13 +73,6 @@ def load_oncall_helm():
 
 # --- GRAFANA START ----
 
-# Generate and load the grafana deploy yaml
-configmap_create(
-    "grafana-oncall-app-provisioning",
-    namespace="default",
-    from_file="dev/grafana/provisioning/plugins/grafana-oncall-app-provisioning.yaml",
-)
-
 if not running_under_parent_tiltfile:
     # Load the custom Grafana extensions
     v1alpha1.extension_repo(
@@ -98,6 +91,13 @@ def load_grafana():
     grafana_version = os.getenv("GRAFANA_VERSION", "latest")
 
     if 'plugin' in profiles:
+        # Generate and load the grafana deploy yaml
+        configmap_create(
+            "grafana-oncall-app-provisioning",
+            namespace="default",
+            from_file="dev/grafana/provisioning/plugins/grafana-oncall-app-provisioning.yaml",
+        )
+
         k8s_resource(
             objects=["grafana-oncall-app-provisioning:configmap"],
             new_name="grafana-oncall-app-provisioning-configmap",

engine/apps/grafana_plugin/helpers/gcom.py

@@ -60,18 +60,20 @@ def check_gcom_permission(token_string: str, context) -> GcomToken:
                 )
 
             # Get org from db or create a new one
-            organization, _ = Organization.objects.get_or_create(
+            organization, _ = Organization.objects.update_or_create(
                 stack_id=instance_info["id"],
-                stack_slug=instance_info["slug"],
-                grafana_url=instance_info["url"],
                 org_id=instance_info["orgId"],
-                org_slug=instance_info["orgSlug"],
-                org_title=instance_info["orgName"],
-                region_slug=instance_info["regionSlug"],
-                cluster_slug=instance_info["clusterSlug"],
-                gcom_token=token_string,
-                api_token=grafana_token,
-                defaults={"gcom_token_org_last_time_synced": timezone.now()},
+                defaults={
+                    "gcom_token_org_last_time_synced": timezone.now(),
+                    "stack_slug": instance_info["slug"],
+                    "grafana_url": instance_info["url"],
+                    "org_slug": instance_info["orgSlug"],
+                    "org_title": instance_info["orgName"],
+                    "region_slug": instance_info["regionSlug"],
+                    "cluster_slug": instance_info["clusterSlug"],
+                    "gcom_token": token_string,
+                    "api_token": grafana_token,
+                },
             )
     else:
         organization.stack_slug = instance_info["slug"]

engine/apps/grafana_plugin/tests/test_gcom.py

@@ -3,6 +3,7 @@
 import pytest
 
 from apps.grafana_plugin.helpers.gcom import check_gcom_permission
+from apps.user_management.models import Organization
 
 
 @pytest.mark.parametrize(
@@ -59,3 +60,49 @@ def test_check_gcom_permission_updates_fields(make_organization, api_token, api_
     assert org.api_token == api_token if api_token_updated else broken_token
     assert org.gcom_token == gcom_token
     assert org.gcom_token_org_last_time_synced != last_time_gcom_synced
+
+
+@pytest.mark.django_db
+def test_check_gcom_permission_uniqueness_update_fields(make_organization):
+    gcom_token = "gcom:test_token"
+    fixed_token = "fixed_token"
+    instance_info = {
+        "id": 324534,
+        "slug": "testinstance",
+        "url": "http://example.com",
+        "orgId": 5671,
+        "orgSlug": "testorg",
+        "orgName": "Test Org",
+        "regionSlug": "us",
+        "clusterSlug": "us-test",
+    }
+    context = {
+        "stack_id": str(instance_info["id"]),
+        "org_id": str(instance_info["orgId"]),
+        "grafana_token": fixed_token,
+    }
+
+    org = make_organization(stack_id=instance_info["id"], org_id=instance_info["orgId"], api_token="broken_token")
+
+    # organization does not exist in the first check but it is created before the second check
+    with patch(
+        "apps.grafana_plugin.helpers.gcom.Organization.objects.filter", return_value=Organization.objects.none()
+    ):
+        with patch(
+            "apps.grafana_plugin.helpers.GcomAPIClient.get_instance_info",
+            return_value=instance_info,
+        ) as mock_instance_info:
+            check_gcom_permission(gcom_token, context)
+            mock_instance_info.assert_called()
+
+    org.refresh_from_db()
+    assert org.stack_id == instance_info["id"]
+    assert org.stack_slug == instance_info["slug"]
+    assert org.grafana_url == instance_info["url"]
+    assert org.org_id == instance_info["orgId"]
+    assert org.org_slug == instance_info["orgSlug"]
+    assert org.org_title == instance_info["orgName"]
+    assert org.region_slug == instance_info["regionSlug"]
+    assert org.cluster_slug == instance_info["clusterSlug"]
+    assert org.api_token == fixed_token
+    assert org.gcom_token == gcom_token

engine/apps/slack/scenarios/distribute_alerts.py

@@ -73,7 +73,7 @@ def process_signal(self, alert: Alert) -> None:
                     else alert.group.channel.organization.general_log_channel_id
                 )
                 self._send_first_alert(alert, channel_id)
-            except SlackAPIError:
+            except (SlackAPIError, TimeoutError):
                 AlertGroup.objects.filter(pk=alert.group.pk).update(slack_message_sent=False)
                 raise
 

engine/apps/slack/tests/test_scenario_steps/test_distribute_alerts.py

@@ -39,6 +39,38 @@ def test_restricted_action_error(
     assert not alert.delivered
 
 
+@pytest.mark.django_db
+def test_timeout_error(
+    make_slack_team_identity,
+    make_organization,
+    make_alert_receive_channel,
+    make_alert_group,
+    make_alert,
+):
+    SlackAlertShootingStep = ScenarioStep.get_step("distribute_alerts", "AlertShootingStep")
+    slack_team_identity = make_slack_team_identity()
+    organization = make_organization(
+        slack_team_identity=slack_team_identity, general_log_channel_id="DEFAULT_CHANNEL_ID"
+    )
+    alert_receive_channel = make_alert_receive_channel(organization)
+    alert_group = make_alert_group(alert_receive_channel)
+    alert = make_alert(alert_group, raw_request_data="{}")
+
+    step = SlackAlertShootingStep(slack_team_identity)
+
+    with pytest.raises(TimeoutError):
+        with patch.object(step._slack_client, "api_call") as mock_slack_api_call:
+            mock_slack_api_call.side_effect = TimeoutError
+            step.process_signal(alert)
+
+    alert_group.refresh_from_db()
+    alert.refresh_from_db()
+    assert alert_group.slack_message is None
+    assert alert_group.slack_message_sent is False
+    assert SlackMessage.objects.count() == 0
+    assert not alert.delivered
+
+
 @patch.object(AlertShootingStep, "_post_alert_group_to_slack")
 @pytest.mark.django_db
 def test_alert_shooting_no_channel_filter(

grafana-plugin/.bra.toml

@@ -0,0 +1,22 @@
+# default configuration created by the `mage watch` command.
+# this file can be edited and should be checked into source control.
+# see https://github.com/unknwon/bra/blob/master/templates/default.bra.toml for more configuration options.
+[run]
+init_cmds = [
+  ["mage", "-v", "build:debug"],
+  ["mage", "-v" , "reloadPlugin"]
+]
+watch_all = true
+follow_symlinks = false
+ignore = [".git", "node_modules", "dist"]
+ignore_files = ["mage_output_file.go"]
+watch_dirs = [
+  "pkg",
+  # "src",
+]
+watch_exts = [".go", ".json"]
+build_delay = 2000
+cmds = [
+  ["mage", "-v", "build:debug"],
+  ["mage", "-v" , "reloadPlugin"]
+]

grafana-plugin/package.json

@@ -11,6 +11,7 @@
     "build:dev": "NODE_ENV=development webpack -c ./webpack.config.ts --env development",
     "labels:link": "yarn --cwd ../../gops-labels/frontend link && yarn link \"@grafana/labels\" && yarn --cwd ../../gops-labels/frontend watch",
     "labels:unlink": "yarn --cwd ../../gops-labels/frontend unlink",
+    "mage:watch": "go mod download && mage -v buildAll",
     "test-utc": "TZ=UTC jest --verbose --testNamePattern '^((?!@london-tz).)*$'",
     "test-london-tz": "TZ=Europe/London jest --verbose --testNamePattern '@london-tz'",
     "test": "PLUGIN_ID=grafana-oncall-app yarn test-utc && yarn test-london-tz",