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

Add .env for specifying aws logging specifics #164

Merged
merged 2 commits into from
Dec 13, 2023
Merged

Add .env for specifying aws logging specifics #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0ac362
Add .env for specifying aws logging specifics
jayjb Dec 12, 2023
011e2e4
Update README.md
jayjb Dec 13, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ Thanks, @mamisano for catching a silly issue using the above 🙏

We are going to track some new features/additions here so that it is quick and easy to see what has been recently added.

- we have moved the "What's new?" to Github Discussions. Go check it out over ()[]
- we have moved the "What's new?" to Github Discussions. Check it out [here](https://github.com/thinkst/canarytokens-docker/discussions).

- we now have the capability of sending error logs to a webhook of your choice, hopefully alerting you
or your team to the failures as opposed to these errors only living in a log file.
Expand Down
16 changes: 8 additions & 8 deletions docker-compose-aws-logging-letsencrypt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ services:
logging:
driver: awslogs
options:
awslogs-region: eu-west-1
awslogs-group: canarytokens-dev
awslogs-region: ${CANARYTOKENS_LOGGING_REGION:-eu-west-1}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My first thought was that we may want to use the standard CANARY_ prefix, but as this is not being included in the settings objects I suspect it's better as it is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmmm its a good thought to raise. I hadn't considered it. I'll leave for now.

awslogs-group: ${CANARYTOKENS_LOGGING_GROUP:-canarytokens}
awslogs-stream: redis
frontend:
extends:
Expand All @@ -18,8 +18,8 @@ services:
logging:
driver: awslogs
options:
awslogs-region: eu-west-1
awslogs-group: canarytokens-dev
awslogs-region: ${CANARYTOKENS_LOGGING_REGION:-eu-west-1}
awslogs-group: ${CANARYTOKENS_LOGGING_GROUP:-canarytokens}
awslogs-stream: frontend
switchboard:
extends:
Expand All @@ -29,8 +29,8 @@ services:
logging:
driver: awslogs
options:
awslogs-region: eu-west-1
awslogs-group: canarytokens-dev
awslogs-region: ${CANARYTOKENS_LOGGING_REGION:-eu-west-1}
awslogs-group: ${CANARYTOKENS_LOGGING_GROUP:-canarytokens}
awslogs-stream: switchboard
nginx:
extends:
Expand All @@ -41,8 +41,8 @@ services:
logging:
driver: awslogs
options:
awslogs-region: eu-west-1
awslogs-group: canarytokens-dev
awslogs-region: ${CANARYTOKENS_LOGGING_REGION:-eu-west-1}
awslogs-group: ${CANARYTOKENS_LOGGING_GROUP:-canarytokens}
awslogs-stream: nginx
volumes:
log-volume:
16 changes: 8 additions & 8 deletions docker-compose-aws-logging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ services:
logging:
driver: awslogs
options:
awslogs-region: eu-west-1
awslogs-group: canarytokens-dev
awslogs-region: ${CANARYTOKENS_LOGGING_REGION:-eu-west-1}
awslogs-group: ${CANARYTOKENS_LOGGING_GROUP:-canarytokens}
awslogs-stream: redis
frontend:
extends:
Expand All @@ -18,8 +18,8 @@ services:
logging:
driver: awslogs
options:
awslogs-region: eu-west-1
awslogs-group: canarytokens-dev
awslogs-region: ${CANARYTOKENS_LOGGING_REGION:-eu-west-1}
awslogs-group: ${CANARYTOKENS_LOGGING_GROUP:-canarytokens}
awslogs-stream: frontend
switchboard:
extends:
Expand All @@ -29,8 +29,8 @@ services:
logging:
driver: awslogs
options:
awslogs-region: eu-west-1
awslogs-group: canarytokens-dev
awslogs-region: ${CANARYTOKENS_LOGGING_REGION:-eu-west-1}
awslogs-group: ${CANARYTOKENS_LOGGING_GROUP:-canarytokens}
awslogs-stream: switchboard
nginx:
extends:
Expand All @@ -39,8 +39,8 @@ services:
logging:
driver: awslogs
options:
awslogs-region: eu-west-1
awslogs-group: canarytokens-dev
awslogs-region: ${CANARYTOKENS_LOGGING_REGION:-eu-west-1}
awslogs-group: ${CANARYTOKENS_LOGGING_GROUP:-canarytokens}
awslogs-stream: nginx
volumes:
log-volume: