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

All the Elastic APM code from our docker/compose files, envs, logging, Satellite, docs, etc., is cleaned. #2720

Merged
merged 1 commit into from Jan 27, 2022

Conversation

aserputov
Copy link
Contributor

@aserputov aserputov commented Jan 24, 2022

Fixes : #2498

Type of Change

  • Bugfix: Change which fixes an issue
  • New Feature: Change which adds functionality
  • Documentation Update: Change which improves documentation
  • UI: Change which improves UI

Description

Checklist

  • Quality: This PR builds and passes our npm test and works locally
  • Tests: This PR includes thorough tests or an explanation of why it does not
  • Screenshots: This PR includes screenshots or GIFs of the changes made or an explanation of why it does not (if applicable)
  • Documentation: This PR includes updated/added documentation to user exposed functionality or configuration variables are added/changed or an explanation of why it does not(if applicable)

@gitpod-io
Copy link

gitpod-io bot commented Jan 24, 2022

Copy link
Contributor

@humphd humphd left a comment

Choose a reason for hiding this comment

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

Can you remove

# TODO: Kibana + APM, see https://github.com/Seneca-CDOT/telescope/blob/372a6076540351cd54d85478521bcfbe8edefc87/src/api/production.yml
,
- [Logz: ELK stack on Docker](https://logz.io/blog/elk-stack-on-docker/)
as well?

Copy link
Contributor

@humphd humphd left a 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.

humphd
humphd previously approved these changes Jan 24, 2022
@AmasiaNalbandian
Copy link
Contributor

@aserputov we got a conflict!!! :) Let me know if you need help.

@humphd
Copy link
Contributor

humphd commented Jan 24, 2022

Copy link
Contributor

@humphd humphd left a 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.

Copy link
Contributor

@humphd humphd left a 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

@aserputov
Copy link
Contributor Author

Why did do we use this commit "fcf1e5758e057326ec220b3fd9c364971cba9089" ?

@humphd
Copy link
Contributor

humphd commented Jan 24, 2022

The other 2 are not really part of this fix.

Copy link
Contributor

@humphd humphd left a comment

Choose a reason for hiding this comment

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

Excellent

@AmasiaNalbandian
Copy link
Contributor

Were there not more files here before? Can you confirm this was all? @aserputov

@aserputov
Copy link
Contributor Author

@AmasiaNalbandian, yes, you are right. There were more files before, but to clean pnpm-lock.yaml I will need to create a pull request to Satellite.

@aserputov
Copy link
Contributor Author

@AmasiaNalbandian can you please review this one ?

Copy link
Contributor

@TueeNguyen TueeNguyen left a 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...'

@humphd humphd merged commit e663d8c into Seneca-CDOT:master Jan 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove all Elastic APM code from Telescope
4 participants