Merge pull request #5014 from grafana/dev

v1.9.25

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 ----

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": (),
     },

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