Skip to content
This repository was archived by the owner on May 6, 2024. It is now read-only.

fix: add Elasticsearch variable overrides - #6646

Merged
pomegranited merged 2 commits into
openedx-unsupported:masterfrom
open-craft:agrendalath/bb-5242-add_ES_overrides_upstream
Jan 16, 2022
Merged

fix: add Elasticsearch variable overrides#6646
pomegranited merged 2 commits into
openedx-unsupported:masterfrom
open-craft:agrendalath/bb-5242-add_ES_overrides_upstream

Conversation

@Agrendalath

@Agrendalath Agrendalath commented Dec 30, 2021

Copy link
Copy Markdown
Contributor

Elasticsearch variables have been renamed for discovery and edx_notes_api services after the Koa release. This replaces the old names with the new ones.

Reviewers

Follow-up

  • Cherry-pick to open-release/lilac.master and open-release/maple.master once we merge this.

@openedx-webhooks openedx-webhooks added needs triage open-source-contribution PR author is not from Axim or 2U labels Dec 30, 2021
@openedx-webhooks

Copy link
Copy Markdown

Thanks for the pull request, @Agrendalath! I've created OSPR-6356 to keep track of it in JIRA, where we prioritize reviews. Please note that it may take us up to several weeks or months to complete a review and merge your PR.

Feel free to add as much of the following information to the ticket as you can:

  • supporting documentation
  • Open edX discussion forum threads
  • timeline information ("this must be merged by XX date", and why that is)
  • partner information ("this is a course on edx.org")
  • any other information that can help Product understand the context for the PR

All technical communication about the code itself will be done via the GitHub pull request interface. As a reminder, our process documentation is here.

Please let us know once your PR is ready for our review and all tests are green.

@kaustavb12 kaustavb12 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

  • I tested this: I have verified that the corresponding variables have been changed in the course-discovery and edx-notes-api repos for lilac
  • I read through the code
  • Includes documentation

Agrendalath and others added 2 commits January 6, 2022 17:38
… discovery

The variable name has been changed in:
edx/course-discovery@df5e75f

Co-authored-by: @0x29a <demid@opencraft.com>
…es_api

The variable name has been changed in:
edx/edx-notes-api@e24a267

Co-authored-by: @0x29a <demid@opencraft.com>
@Agrendalath
Agrendalath force-pushed the agrendalath/bb-5242-add_ES_overrides_upstream branch from aaa001b to eee778f Compare January 6, 2022 16:39
@Agrendalath

Agrendalath commented Jan 6, 2022

Copy link
Copy Markdown
Contributor Author

@nizarmah, would you be able to add this to the OSPR list?

It could be a good candidate for the CC review.

@natabene

natabene commented Jan 6, 2022

Copy link
Copy Markdown
Contributor

@Agrendalath Thank you for your contribution. @pomegranited Are you interested in reviewing this?

@pomegranited

Copy link
Copy Markdown
Contributor

@natabene Yep! I'll review this next sprint (starts Tues 11 Jan).

@nizarmah

nizarmah commented Jan 7, 2022

Copy link
Copy Markdown
Contributor

Yes @Agrendalath! I was going to ask @pomegranited as well, thank you so much @natabene!

@pomegranited pomegranited left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

  • I tested this by deploying an Ocim appserver using this branch, with Notes and Discovery services enabled. I checked that the configured ES hostnames made it through to the Notes and Discovery .yml files.
  • I read through the code, and checked the updated variable names against course_discovery.settings.production and notesserver.settings.common.
  • Includes documentation
  • Commit structure follows OEP-0051
  • I made sure any change in configuration variables is reflected in the corresponding client's configuration-secure repository. N/A

@nadeemshahzad

Copy link
Copy Markdown
Contributor

@Agrendalath Looks good to me.

@Agrendalath

Agrendalath commented Jan 13, 2022

Copy link
Copy Markdown
Contributor Author

Thanks for reviewing this, @pomegranited and @nadeemshahzad. Given that this is already approved, and won't likely need any changes, I've opened #6659 and #6660 to backport it to Lilac and Maple. Would you mind reviewing these too (and merging them, if possible)?

@natabene

Copy link
Copy Markdown
Contributor

So who can merge this?

@Agrendalath

Copy link
Copy Markdown
Contributor Author

@natabene, @pomegranited is going to merge this one on Monday.

@pomegranited
pomegranited merged commit 4a1790a into openedx-unsupported:master Jan 16, 2022
@openedx-webhooks

Copy link
Copy Markdown

@Agrendalath 🎉 Your pull request was merged! Please take a moment to answer a two question survey so we can improve your experience in the future.

@pomegranited
pomegranited deleted the agrendalath/bb-5242-add_ES_overrides_upstream branch January 16, 2022 23:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants