Skip to content

Commit

Permalink
Revert "Rename onpremise to self-hosted"
Browse files Browse the repository at this point in the history
This reverts commit 9ad05d8.
  • Loading branch information
chadwhitacre committed Nov 24, 2021
1 parent 9ad05d8 commit 5495fe2
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COMPOSE_PROJECT_NAME=sentry_self_hosted
COMPOSE_PROJECT_NAME=sentry_onpremise
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
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ body:
id: problem
attributes:
label: Problem Statement
description: What problem could `self-hosted` solve that it doesn't?
description: What problem could `onpremise` solve that it doesn't?
placeholder: |-
I want to make whirled peas, but `self-hosted` doesn't blend.
I want to make whirled peas, but `onpremise` doesn't blend.
validations:
required: true
- type: textarea
Expand All @@ -16,7 +16,7 @@ body:
label: Solution Brainstorm
description: We know you have bright ideas to share ... share away, friend.
placeholder: |-
Add a blender to `self-hosted`.
Add a blender to `onpremise`.
validations:
required: false
- type: markdown
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ sudo SENTRY_IMAGE=us.gcr.io/sentryio/sentry:83b1380 ./install.sh

Where you replace `83b1380` with the sha you want to use.

[build-status-image]: https://github.com/getsentry/self-hosted/workflows/test/badge.svg
[build-status-image]: https://github.com/getsentry/onpremise/workflows/test/badge.svg
[build-status-url]: https://git.io/JUYkh
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ x-healthcheck-defaults: &healthcheck_defaults
# Related issues:
# https://github.com/moby/moby/issues/39102
# https://github.com/moby/moby/issues/39388
# https://github.com/getsentry/self-hosted/issues/1000
# https://github.com/getsentry/onpremise/issues/1000
interval: 30s
timeout: 5s
retries: 5
Expand Down Expand Up @@ -252,15 +252,15 @@ services:
command: subscriptions --auto-offset-reset=latest --consumer-group=snuba-transactions-subscriptions-consumers --topic=events --result-topic=transactions-subscription-results --dataset=transactions --commit-log-topic=snuba-commit-log --commit-log-group=transactions_group --delay-seconds=60 --schedule-ttl=60
snuba-cleanup:
<<: *snuba_defaults
image: snuba-cleanup-self-hosted-local
image: snuba-cleanup-onpremise-local
build:
context: ./cron
args:
BASE_IMAGE: "$SNUBA_IMAGE"
command: '"*/5 * * * * gosu snuba snuba cleanup --storage errors --dry-run False"'
snuba-transactions-cleanup:
<<: *snuba_defaults
image: snuba-cleanup-self-hosted-local
image: snuba-cleanup-onpremise-local
build:
context: ./cron
args:
Expand All @@ -278,7 +278,7 @@ services:
command: run -c /etc/symbolicator/config.yml
symbolicator-cleanup:
<<: *restart_policy
image: symbolicator-cleanup-self-hosted-local
image: symbolicator-cleanup-onpremise-local
build:
context: ./cron
args:
Expand Down Expand Up @@ -317,7 +317,7 @@ services:
command: run query-subscription-consumer --commit-batch-size 1 --topic transactions-subscription-results
sentry-cleanup:
<<: *sentry_defaults
image: sentry-cleanup-self-hosted-local
image: sentry-cleanup-onpremise-local
build:
context: ./cron
args:
Expand Down
4 changes: 2 additions & 2 deletions install/_test_setup.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
set -euo pipefail
source "$(dirname $0)/_lib.sh"

rm -rf /tmp/sentry-self-hosted-test-sandbox.*
_SANDBOX="$(mktemp -d /tmp/sentry-self-hosted-test-sandbox.XXX)"
rm -rf /tmp/sentry-onpremise-test-sandbox.*
_SANDBOX="$(mktemp -d /tmp/sentry-onpremise-test-sandbox.XXX)"

report_success() {
echo "$(basename $0) - Success 👍"
Expand Down
4 changes: 2 additions & 2 deletions install/replace-tsdb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace_tsdb() {
! grep -xq 'SENTRY_TSDB = "sentry.tsdb.redissnuba.RedisSnubaTSDB"' "$SENTRY_CONFIG_PY"
); then
# Do NOT indent the following string as it would be reflected in the end result,
# breaking the final config file. See getsentry/self-hosted#624.
# breaking the final config file. See getsentry/onpremise#624.
tsdb_settings="\
SENTRY_TSDB = \"sentry.tsdb.redissnuba.RedisSnubaTSDB\"
Expand Down Expand Up @@ -37,7 +37,7 @@ SENTRY_TSDB_OPTIONS = {\"switchover_timestamp\": $(date +%s) + (90 * 24 * 3600)}
echo ""
echo "$tsdb_settings"
echo ""
echo "For more information please refer to https://github.com/getsentry/self-hosted/pull/430"
echo "For more information please refer to https://github.com/getsentry/onpremise/pull/430"
fi
}

Expand Down
3 changes: 3 additions & 0 deletions install/turn-things-off.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ if [[ -n "$MINIMIZE_DOWNTIME" ]]; then
$dc rm -fsv $($dc config --services | grep -v -E '^(nginx|relay)$')
else
# Clean up old stuff and ensure nothing is working while we install/update
# This is for older versions of on-premise:
$dc -p onpremise down -t $STOP_TIMEOUT --rmi local --remove-orphans
# This is for newer versions
$dc down -t $STOP_TIMEOUT --rmi local --remove-orphans
fi

Expand Down
13 changes: 6 additions & 7 deletions install/update-docker-images.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
echo "${_group}Fetching and updating Docker images ..."

# We tag locally built images with a '-self-hosted-local' suffix.
# docker-compose pull tries to pull these too and shows a 404 error on the
# console which is confusing and unnecessary. To overcome this, we add the
# stderr>stdout redirection below and pass it through grep, ignoring all lines
# having this '-self-hosted-local' suffix.

$dc pull -q --ignore-pull-failures 2>&1 | grep -v -- -self-hosted-local || true
# We tag locally built images with an '-onpremise-local' suffix. docker-compose
# pull tries to pull these too and shows a 404 error on the console which is
# confusing and unnecessary. To overcome this, we add the stderr>stdout
# redirection below and pass it through grep, ignoring all lines having this
# '-onpremise-local' suffix.
$dc pull -q --ignore-pull-failures 2>&1 | grep -v -- -onpremise-local || true

# We may not have the set image on the repo (local images) so allow fails
docker pull ${SENTRY_IMAGE} || true;
Expand Down
2 changes: 1 addition & 1 deletion reset.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

# The purpose of this script is to make it easy to reset a local self-hosted
# The purpose of this script is to make it easy to reset a local onpremise
# install to a clean state, optionally targeting a particular version.

set -euo pipefail
Expand Down

0 comments on commit 5495fe2

Please sign in to comment.