Merge branch 'master' into patch-1

.github/workflows/test.yml

@@ -15,6 +15,7 @@ defaults:
     shell: bash
 jobs:
   e2e-test:
+    if: github.repository_owner == 'getsentry'
     runs-on: ubuntu-20.04
     name: "Sentry self-hosted end-to-end tests"
     steps:
@@ -41,6 +42,7 @@ jobs:
           project_name: self-hosted
 
   unit-test:
+    if: github.repository_owner == 'getsentry'
     runs-on: ubuntu-20.04
     name: "unit tests"
     steps:
@@ -51,6 +53,7 @@ jobs:
         run: ./unit-test.sh
 
   integration-test:
+    if: github.repository_owner == 'getsentry'
     runs-on: ubuntu-20.04
     name: "integration test"
     strategy:

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 24.1.0
+
+### Various fixes & improvements
+
+- Enable crons (#2712) by @hubertdeng123
+- Parameterize backup restore script (#2412) by @hubertdeng123
+- Run tests only on getsentry repository (#2681) by @aminvakil
+- Tweak the template now that we can see it (#2670) by @chadwhitacre
+- Nginx client request body is buffered to a temporary file (#2630) by @zKoz210
+
 ## 23.12.1
 
 ### Various fixes & improvements

docker-compose.yml

@@ -369,6 +369,9 @@ services:
   ingest-profiles:
     <<: *sentry_defaults
     command: run consumer --no-strict-offset-reset ingest-profiles --consumer-group ingest-profiles
+  ingest-monitors:
+    <<: *sentry_defaults
+    command: run consumer --no-strict-offset-reset ingest-monitors --consumer-group ingest-monitors
   post-process-forwarder-errors:
     <<: *sentry_defaults
     command: run consumer post-process-forwarder-errors --consumer-group post-process-forwarder --synchronize-commit-log-topic=snuba-commit-log --synchronize-commit-group=snuba-consumers

install/create-kafka-topics.sh

@@ -3,7 +3,7 @@ echo "${_group}Creating additional Kafka topics ..."
 # NOTE: This step relies on `kafka` being available from the previous `snuba-api bootstrap` step
 # XXX(BYK): We cannot use auto.create.topics as Confluence and Apache hates it now (and makes it very hard to enable)
 EXISTING_KAFKA_TOPICS=$($dcr -T kafka kafka-topics --list --bootstrap-server kafka:9092 2>/dev/null)
-NEEDED_KAFKA_TOPICS="ingest-attachments ingest-transactions ingest-events ingest-replay-recordings profiles ingest-occurrences ingest-metrics ingest-performance-metrics"
+NEEDED_KAFKA_TOPICS="ingest-attachments ingest-transactions ingest-events ingest-replay-recordings profiles ingest-occurrences ingest-metrics ingest-performance-metrics ingest-monitors"
 for topic in $NEEDED_KAFKA_TOPICS; do
   if ! echo "$EXISTING_KAFKA_TOPICS" | grep -qE "(^| )$topic( |$)"; then
     $dcr kafka kafka-topics --create --topic $topic --bootstrap-server kafka:9092

scripts/_lib.sh

@@ -60,13 +60,15 @@ function reset() {
 }
 
 function backup() {
+  type=${1:-"global"}
   touch $(pwd)/sentry/backup.json
   chmod 666 $(pwd)/sentry/backup.json
-  $dc run -v $(pwd)/sentry:/sentry-data/backup --rm -T -e SENTRY_LOG_LEVEL=CRITICAL web export global /sentry-data/backup/backup.json
+  $dc run -v $(pwd)/sentry:/sentry-data/backup --rm -T -e SENTRY_LOG_LEVEL=CRITICAL web export $type /sentry-data/backup/backup.json
 }
 
 function restore() {
-  $dc run --rm -T web import global /etc/sentry/backup.json
+  type=${1:-"global"}
+  $dc run --rm -T web import $type /etc/sentry/backup.json
 }
 
 # Needed variables to source error-handling script

scripts/backup.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
-cmd=backup
+cmd="backup $1"
 source scripts/_lib.sh
 $cmd

scripts/restore.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
-cmd=restore
+cmd="restore $1"
 source scripts/_lib.sh
 $cmd

sentry/sentry.conf.example.py

@@ -278,6 +278,7 @@ def get_internal_network():
             "organizations:session-replay",
             "organizations:issue-platform",
             "organizations:profiling",
+            "organizations:monitors",
             "organizations:dashboards-mep",
             "organizations:mep-rollout-flag",
             "organizations:dashboards-rh-widget",