Merge branch 'master' into detect-stale-flags

posthog/api/proxy_record.py

@@ -1,12 +1,15 @@
 import asyncio
 import hashlib
+import posthoganalytics
 from django.conf import settings
 from rest_framework import serializers, status
 from rest_framework.viewsets import ModelViewSet
 
 from posthog.api.routing import TeamAndOrgViewSetMixin
 from posthog.constants import GENERAL_PURPOSE_TASK_QUEUE
+from posthog.event_usage import groups
 from posthog.models import ProxyRecord
+from posthog.models.organization import Organization
 from posthog.permissions import OrganizationAdminWritePermissions
 from posthog.temporal.common.client import sync_connect
 from posthog.temporal.proxy_service import CreateManagedProxyInputs, DeleteManagedProxyInputs
@@ -76,6 +79,17 @@ def create(self, request, *args, **kwargs):
         )
 
         serializer = self.get_serializer(record)
+        organization = Organization.objects.get(id=record.organization_id)
+        posthoganalytics.capture(
+            request.user.distinct_id,
+            "managed reverse proxy created",
+            properties={
+                "proxy_record_id": record.id,
+                "domain": record.domain,
+                "target_cname": record.target_cname,
+            },
+            groups=groups(organization),
+        )
         return Response(serializer.data)
 
     def destroy(self, request, *args, pk=None, **kwargs):

posthog/warehouse/api/saved_query.py

@@ -53,7 +53,11 @@ class Meta:
 
     def get_columns(self, view: DataWarehouseSavedQuery) -> list[SerializedField]:
         team_id = self.context["team_id"]
-        context = HogQLContext(team_id=team_id, database=create_hogql_database(team_id=team_id))
+        database = self.context.get("database", None)
+        if not database:
+            database = create_hogql_database(team_id=team_id)
+
+        context = HogQLContext(team_id=team_id, database=database)
 
         fields = serialize_fields(view.hogql_definition().fields, context, view.name, table_type="external")
         return [
@@ -170,6 +174,11 @@ class DataWarehouseSavedQueryViewSet(TeamAndOrgViewSetMixin, viewsets.ModelViewS
     search_fields = ["name"]
     ordering = "-created_at"
 
+    def get_serializer_context(self) -> dict[str, Any]:
+        context = super().get_serializer_context()
+        context["database"] = create_hogql_database(team_id=self.team_id)
+        return context
+
     def safely_get_queryset(self, queryset):
         return queryset.prefetch_related("created_by").exclude(deleted=True).order_by(self.ordering)