From ea813c9b5e691ed184546112ecf204a6018689d2 Mon Sep 17 00:00:00 2001
From: Joey Orlando <joey.orlando@grafana.com>
Date: Wed, 11 Sep 2024 12:34:53 -0400
Subject: [PATCH 1/3] fix some Tilt hiccups (#5013)

## Which issue(s) this PR closes

- Tilt would complain, on a completely fresh setup, if the
`./dev/helm-local.dev.yml` file didn't exist
- fix issue when building the `grpcio` wheel
---
 Tiltfile | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Tiltfile b/Tiltfile
index bd5cc8fe60..264424161c 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -66,9 +66,21 @@ docker_build_sub(
 
 
 def load_oncall_helm():
-    helm_oncall_values = ["./dev/helm-local.yml"]
-    helm_oncall_values += ["./.github/helm-ci.yml"] if is_ci else ["./dev/helm-local.dev.yml"]
-    yaml = helm("helm/oncall", name=HELM_PREFIX, values=helm_oncall_values, set=twilio_values, namespace="default")
+    helm_oncall_values_files = ["./dev/helm-local.yml"]
+    local_dev_helm_values_file = "./dev/helm-local.dev.yml"
+
+    if is_ci:
+        helm_oncall_values_files.append("./.github/helm-ci.yml")
+    elif os.path.exists(local_dev_helm_values_file):
+        helm_oncall_values_files.append(local_dev_helm_values_file)
+
+    yaml = helm(
+        "helm/oncall",
+        name=HELM_PREFIX,
+        values=helm_oncall_values_files,
+        set=twilio_values,
+        namespace="default",
+    )
     k8s_yaml(yaml)
 
 # --- GRAFANA START ----

From b2f392f835d2b396c08e8228d81bbb8f76b6c48f Mon Sep 17 00:00:00 2001
From: Denis Arslanbekov <denis@arslanbekov.com>
Date: Wed, 11 Sep 2024 18:22:25 +0100
Subject: [PATCH 2/3] Bump Redis deps (#4997)

Can we update this dependency? The current version of Redis has CVE.
---
 helm/oncall/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helm/oncall/Chart.yaml b/helm/oncall/Chart.yaml
index c3836dbbd8..8f8494ad62 100644
--- a/helm/oncall/Chart.yaml
+++ b/helm/oncall/Chart.yaml
@@ -22,7 +22,7 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     condition: rabbitmq.enabled
   - name: redis
-    version: 16.13.2
+    version: 20.0.5
     repository: https://charts.bitnami.com/bitnami
     condition: redis.enabled
   - name: grafana

From ead79b36af70f832518b3d299e2773524844d39a Mon Sep 17 00:00:00 2001
From: Michael Derynck <michael.derynck@grafana.com>
Date: Wed, 11 Sep 2024 12:24:03 -0600
Subject: [PATCH 3/3] Enable schedule for new sync process (#4992)

# What this PR does
Replaces old scheduled sync task with new one.

## Which issue(s) this PR closes

Related to [issue link here]

<!--
*Note*: If you want the issue to be auto-closed once the PR is merged,
change "Related to" to "Closes" in the line above.
If you have more than one GitHub issue that this PR closes, be sure to
preface
each issue link with a [closing
keyword](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue).
This ensures that the issue(s) are auto-closed once the PR has been
merged.
-->

## Checklist

- [ ] Unit, integration, and e2e (if applicable) tests updated
- [ ] Documentation added (or `pr:no public docs` PR label added if not
required)
- [ ] Added the relevant release notes label (see labels prefixed w/
`release:`). These labels dictate how your PR will
    show up in the autogenerated release notes.
---
 engine/settings/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/engine/settings/base.py b/engine/settings/base.py
index 22d9233396..6450b62249 100644
--- a/engine/settings/base.py
+++ b/engine/settings/base.py
@@ -571,7 +571,7 @@ class BrokerTypes:
         "args": (),
     },
     "start_sync_organizations": {
-        "task": "apps.grafana_plugin.tasks.sync.start_sync_organizations",
+        "task": "apps.grafana_plugin.tasks.sync_v2.start_sync_organizations_v2",
         "schedule": crontab(minute="*/30"),
         "args": (),
     },