Skip to content

Commit

Permalink
Merge branch 'master' into 14331-regular-job
Browse files Browse the repository at this point in the history
  • Loading branch information
webjunkie authored Aug 13, 2024
2 parents d274bea + 9306142 commit 0e8d28a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ export function SessionRecordingPreview({
className="overflow-hidden text-ellipsis text-xs text-muted shrink-0"
time={recording.start_time}
placement="right"
showPopover={false}
/>
</div>

Expand Down
1 change: 1 addition & 0 deletions posthog/utils_cors.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"Baggage",
"x-highlight-request",
"x-datadome-clientid",
"x-posthog-token",
)


Expand Down
6 changes: 2 additions & 4 deletions vector/replay-capture/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ COPY vector.yaml .
# evaluate with yq, basically to expand anchors (which vector doesn't support)
RUN yq -i e 'explode(.)' vector.yaml

# fork of vector from this branch: https://github.com/frankh/vector/tree/main
# includes 2 fixed: 1 to make Kafka temporary errors return 500 not 400
# and 1 to allow us to set response body on the http source
FROM frankh/vector:0.41.0-patched
# nightly vector to include this fix https://github.com/vectordotdev/vector/commit/dc0b4087095b4968cca0201e233919de8cff9918
FROM timberio/vector@sha256:f30cba5e4efcf554aea09a3f970fc75a140750ded0095840a47a8b9c9571100c

COPY --from=config-builder /config/vector.yaml /etc/vector/vector.yaml
3 changes: 0 additions & 3 deletions vector/replay-capture/vector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ sources:
query_parameters:
- _
host_key: ip
response_body_key: '%response'
decoding:
codec: vrl
vrl:
Expand Down Expand Up @@ -63,8 +62,6 @@ sources:
assert!(is_string(.message[0].properties."$$session_id"), "$$session_id is required")
assert!(is_string(%token), "token is required")
%response = {"status": 1}
transforms:
quota_check:
type: route
Expand Down

0 comments on commit 0e8d28a

Please sign in to comment.