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
All the Elastic APM code from our docker/compose files, envs, logging, Satellite, docs, etc., is cleaned. #2720
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you remove
telescope/docker/production.yml
Line 211 in 667b0d8
# TODO: Kibana + APM, see https://github.com/Seneca-CDOT/telescope/blob/372a6076540351cd54d85478521bcfbe8edefc87/src/api/production.yml |
Line 67 in e9d694a
- [Logz: ELK stack on Docker](https://logz.io/blog/elk-stack-on-docker/) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're failing Prettier:
Checking formatting...
[warn] docker/production.yml
[warn] Code style issues found in the above file(s). Forgot to run Prettier?
Please set up your environment properly so it auto-formats your code in your editor and when you commit.
@aserputov we got a conflict!!! :) Let me know if you need help. |
No to this: Please squash and rebase, see https://github.com/Seneca-CDOT/telescope/blob/master/docs/git-workflow.md#squashing-commits |
b247429
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You lost your changes with this rebase. Please bring back your previous branch changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You only need 1 of the 3 commits:
$ git checkout -B issue-2498 fcf1e5758e057326ec220b3fd9c364971cba9089
$ git push origin issue-2498 -f
Why did do we use this commit "fcf1e5758e057326ec220b3fd9c364971cba9089" ? |
The other 2 are not really part of this fix. |
…, Satellite, docs, etc., is cleaned..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Excellent
Were there not more files here before? Can you confirm this was all? @aserputov |
@AmasiaNalbandian, yes, you are right. There were more files before, but to clean |
@AmasiaNalbandian can you please review this one ? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: maybe we can change the title to 'Cleaning All the Elastic APM...'
Fixes : #2498
Type of Change
Description
Checklist