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.

Sign up for GitHub

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

remove watchtower #1604

Merged
merged 4 commits into from
Jan 13, 2025
Merged

remove watchtower #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d4d7cb
remove watchtower
goastler Jan 8, 2025
83015c2
remove watchtower vector config
goastler Jan 8, 2025
3d3b096
remove watchtower env vars
goastler Jan 8, 2025
6216c6f
Merge branch 'staging' into remove-watchtower
goastler Jan 13, 2025
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
6 changes: 0 additions & 6 deletions dev/scripts/env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ PROSOPO_PROVIDER_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton e
PROSOPO_PROXY_COUNT=
PROSOPO_SERVER_URL=http://localhost:9228
PROSOPO_SITE_KEY=5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw
WATCHTOWER_LABEL_ENABLE=true
WATCHTOWER_LOG_FORMAT=JSON
WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL=
WATCHTOWER_NOTIFICATIONS=
WATCHTOWER_POLL_INTERVAL=30
WATCHTOWER_REMOVE_VOLUMES=true
PROSOPO_ADMIN_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
PROSOPO_ADMIN_JSON=
PROSOPO_ADMIN_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant
6 changes: 0 additions & 6 deletions dev/scripts/env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,3 @@ PROSOPO_PROVIDER_MNEMONIC=
PROSOPO_PROXY_COUNT=
PROSOPO_SITE_KEY=
PROSOPO_SERVER_URL=
WATCHTOWER_LABEL_ENABLE=true
WATCHTOWER_LOG_FORMAT=JSON
WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL=
WATCHTOWER_NOTIFICATIONS=
WATCHTOWER_POLL_INTERVAL=30
WATCHTOWER_REMOVE_VOLUMES=true
6 changes: 0 additions & 6 deletions dev/scripts/env.staging
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ PROSOPO_PROVIDER_MNEMONIC=
PROSOPO_PROXY_COUNT=
PROSOPO_SITE_KEY=
PROSOPO_SERVER_URL=
WATCHTOWER_LABEL_ENABLE=true
WATCHTOWER_LOG_FORMAT=JSON
WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL=
WATCHTOWER_NOTIFICATIONS=
WATCHTOWER_POLL_INTERVAL=30
WATCHTOWER_REMOVE_VOLUMES=true
PROSOPO_ADMIN_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
PROSOPO_ADMIN_JSON=
PROSOPO_ADMIN_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant
6 changes: 0 additions & 6 deletions dev/scripts/env.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ PROSOPO_PROVIDER_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton e
PROSOPO_PROXY_COUNT=
PROSOPO_SERVER_URL=http://localhost:9228
PROSOPO_SITE_KEY=5HGjWAeFDfFCWPsjFQdVV2Msvz2XtMktvgocEZcCj68kUMaw
WATCHTOWER_LABEL_ENABLE=true
WATCHTOWER_LOG_FORMAT=JSON
WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL=
WATCHTOWER_NOTIFICATIONS=
WATCHTOWER_POLL_INTERVAL=30
WATCHTOWER_REMOVE_VOLUMES=true
PROSOPO_ADMIN_ADDRESS=5EjTA28bKSbFPPyMbUjNtArxyqjwq38r1BapVmLZShaqEedV
PROSOPO_ADMIN_JSON=
PROSOPO_ADMIN_MNEMONIC=puppy cream effort carbon despair leg pyramid cotton endorse immense drill peasant
20 changes: 0 additions & 20 deletions docker/docker-compose.provider.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,26 +146,6 @@ services:
retries: 3
start_period: 30s
timeout: 10s
watchtower:
container_name: watchtower
profiles:
- production
- staging
image: containrrr/watchtower
command: ["--log-format", "JSON", "--remove-volumes", "--cleanup", "--warn-on-head-failure", "never", "--interval", "30", "--include-restarting"]
labels:
- "vector.watchtower=true" # enable logging as a watchtower
- "vector.docker=true" # log docker events
restart: unless-stopped # unless the container has been stopped, it will be restarted, even on reboot
env_file:
- ../.env.${NODE_ENV}
volumes:
- /var/run/docker.sock:/var/run/docker.sock
logging:
driver: 'json-file'
options:
max-size: '100m'
max-file: '1'
vector:
container_name: vector
profiles:
Expand Down
34 changes: 0 additions & 34 deletions docker/images/vector/vector.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,37 +141,3 @@ compression = "gzip"
encoding.codec = "json"
encoding.timestamp_format = "rfc3339"
healthcheck.enabled = false
batch.timeout_secs = 10 # time to wait before sending a batch
batch.max_bytes = 10485760 # 10mb, max number of bytes per batch
batch.max_events = 100000 # max number of events per batch

[sources.watchtower]
type = "docker_logs"
include_labels = ["vector.watchtower=true"]

[transforms.watchtower_format]
type = "remap"
inputs = ["watchtower"]
source = '''
.=parse_json!(string!(.message))
.host="$OO_HOST"
del(.time)
del(.notify)
'''

# send to openobserve
[sinks.openobserve_watchtower]
type = "http"
inputs = ["watchtower_format"]
uri = "https://api.openobserve.ai/api/$OO_ORG/${NODE_ENV}_provider_watchtower/_json"
method = "post"
auth.strategy = "basic"
auth.user = "$OO_USERNAME"
auth.password = "$OO_PASSWORD"
compression = "gzip"
encoding.codec = "json"
encoding.timestamp_format = "rfc3339"
healthcheck.enabled = false
batch.timeout_secs = 10 # time to wait before sending a batch
batch.max_bytes = 10485760 # 10mb, max number of bytes per batch
batch.max_events = 100000 # max number of events per batch
Loading