Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to 24.12.1 #56

Merged
merged 13 commits into from
Jan 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .env
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
COMPOSE_PROJECT_NAME=sentry-self-hosted
# Set COMPOSE_PROFILES to "feature-complete" to enable all features
# To enable errors monitoring only, set COMPOSE_PROFILES=errors-only
# See https://develop.sentry.dev/self-hosted/experimental/errors-only/
COMPOSE_PROFILES=feature-complete
SENTRY_EVENT_RETENTION_DAYS=90
# You can either use a port number or an IP:PORT combo for SENTRY_BIND
# See https://docs.docker.com/compose/compose-file/#ports for more
SENTRY_BIND=9000
# Set SENTRY_MAIL_HOST to a valid FQDN (host/domain name) to be able to send emails!
# SENTRY_MAIL_HOST=example.com
SENTRY_IMAGE=getsentry/sentry:24.11.2
SNUBA_IMAGE=getsentry/snuba:24.11.2
RELAY_IMAGE=getsentry/relay:24.11.2
SYMBOLICATOR_IMAGE=getsentry/symbolicator:24.11.2
VROOM_IMAGE=getsentry/vroom:24.11.2
SENTRY_IMAGE=getsentry/sentry:24.12.1
SNUBA_IMAGE=getsentry/snuba:24.12.1
RELAY_IMAGE=getsentry/relay:24.12.1
SYMBOLICATOR_IMAGE=getsentry/symbolicator:24.12.1
VROOM_IMAGE=getsentry/vroom:24.12.1
HEALTHCHECK_INTERVAL=30s
HEALTHCHECK_TIMEOUT=1m30s
HEALTHCHECK_RETRIES=10
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
severity: 'CRITICAL,HIGH'

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
with:
sarif_file: '${{ matrix.image-name }}-trivy-results.sarif'

Expand All @@ -53,6 +53,6 @@ jobs:
severity-cutoff: critical

- name: Upload vulnerability report
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169
with:
sarif_file: '${{ steps.scan.outputs.sarif }}'
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## 24.12.1

### Various fixes & improvements

- chore: clearer message for errors-only mode (#3487) by @aldy505
- chore(relay): provide opt-in max_memory_percent config as workaround for failing healthcheck (#3486) by @aldy505
- fix(nginx): _assets should rewrite to _static/sentry/dist (#3483) by @BYK

## 24.12.0

- No documented changes.

## 24.11.2

### Various fixes & improvements
Expand Down
8 changes: 8 additions & 0 deletions _integration-test/test_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,14 @@ def test_initial_redirect():
assert initial_auth_redirect.url == f"{SENTRY_TEST_HOST}/auth/login/sentry/"


def test_asset_internal_rewrite():
"""Tests whether we correctly map `/_assets/*` to `/_static/dist/sentry` as
we don't have a CDN setup in self-hosted."""
response = httpx.get(f"{SENTRY_TEST_HOST}/_assets/entrypoints/app.js")
assert response.status_code == 200
assert response.headers["Content-Type"] == "text/javascript"


def test_login(client_login):
client, login_response = client_login
parser = BeautifulSoup(login_response.text, "html.parser")
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.relay
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SENTRY_VERSION=24.11.2
ARG SENTRY_VERSION=24.12.1
ARG RELAY_IMAGE=getsentry/relay:${SENTRY_VERSION}
ARG APPLICATION=relay-hh=24.11.2-4-3-1-7-1
ARG APPLICATION=relay-hh=24.11.2
FROM ${RELAY_IMAGE}
4 changes: 2 additions & 2 deletions docker/Dockerfile.sentry
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG SENTRY_VERSION=24.11.2
ARG SENTRY_VERSION=24.12.1
ARG SENTRY_IMAGE=getsentry/sentry:${SENTRY_VERSION}
ARG APPLICATION=sentry-hh=24.11.2-4-3-1-7-1
ARG APPLICATION=sentry-hh=24.11.2
FROM ${SENTRY_IMAGE}

COPY docker/requirements-extra.txt /tmp/
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.snuba
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SENTRY_VERSION=24.11.2
ARG SENTRY_VERSION=24.12.1
ARG SNUBA_IMAGE=getsentry/snuba:${SENTRY_VERSION}
ARG APPLICATION=snuba-hh=24.11.2-4-3-1-7-1
ARG APPLICATION=snuba-hh=24.11.2
FROM ${SNUBA_IMAGE}
4 changes: 2 additions & 2 deletions docker/Dockerfile.symbolicator
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SENTRY_VERSION=24.11.2
ARG SENTRY_VERSION=24.12.1
ARG SYMBOLICATOR_IMAGE=getsentry/symbolicator:${SENTRY_VERSION}
ARG APPLICATION=symbolicator-hh=24.11.2-4-3-1-7-1
ARG APPLICATION=symbolicator-hh=24.11.2
FROM ${SYMBOLICATOR_IMAGE}
4 changes: 2 additions & 2 deletions docker/Dockerfile.vroom
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SENTRY_VERSION=24.11.2
ARG SENTRY_VERSION=24.12.1
ARG VROOM_IMAGE=getsentry/vroom:${SENTRY_VERSION}
ARG APPLICATION=vroom-hh=24.11.2-4-3-1-7-1
ARG APPLICATION=vroom-hh=24.11.2
FROM ${VROOM_IMAGE}
4 changes: 4 additions & 0 deletions nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ http {
location / {
proxy_pass http://sentry;
}
location /_assets/ {
proxy_pass http://sentry/_static/dist/sentry/;
proxy_hide_header Content-Disposition;
}
location /_static/ {
proxy_pass http://sentry;
proxy_hide_header Content-Disposition;
Expand Down
7 changes: 7 additions & 0 deletions relay/config.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@ processing:
- {name: "message.max.bytes", value: 50000000} # 50MB
redis: redis://redis:6379
geoip_path: "/geoip/GeoLite2-City.mmdb"

# In some cases, relay might fail to find out the actual machine memory
# therefore it makes the healthcheck fail and events can't be submitted.
# As a workaround, uncomment the following line:
#
# health:
# max_memory_percent: 1.0
16 changes: 12 additions & 4 deletions sentry/sentry.conf.example.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,18 @@ def get_internal_network():
env("SENTRY_EVENT_RETENTION_DAYS", "90")
)

# Self-hosted Sentry infamously has a lot of Docker containers required to make
# all the features work. Oftentimes, users don't use the full feature set that
# requires all the containers. This is a way to enable only the error monitoring
# feature which also reduces the amount of containers required to run Sentry.
#
# To make Sentry work with all features, set `COMPOSE_PROFILES` to `feature-complete`
# in your `.env` file. To enable only the error monitoring feature, set
# `COMPOSE_PROFILES` to `errors-only`.
#
# See https://develop.sentry.dev/self-hosted/experimental/errors-only/
SENTRY_SELF_HOSTED_ERRORS_ONLY = env("COMPOSE_PROFILES") != "feature-complete"

#########
# Redis #
#########
Expand Down Expand Up @@ -373,10 +385,6 @@ def get_internal_network():
# if you're using it directly like a CDN instead of using the loader script.
JS_SDK_LOADER_DEFAULT_SDK_URL = "https://browser.sentry-cdn.com/%s/bundle%s.min.js"


# If you would like to use self-hosted Sentry with only errors enabled, please set this
SENTRY_SELF_HOSTED_ERRORS_ONLY = env("COMPOSE_PROFILES") != "feature-complete"

#####################
# Insights Settings #
#####################
Expand Down
Loading