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

Remove elastic user password prompt from deploy.sh #107

Merged
merged 3 commits into from
Dec 18, 2023

Conversation

mitchelbaker-cisa
Copy link
Collaborator

@mitchelbaker-cisa mitchelbaker-cisa commented Dec 14, 2023

🗣 Description

  • Remove the prompt asking the user if they have an elastic user password
  • Move credentials that are displayed at the end of the script into a function, link troubleshooting.md docs

Resolves #81

💭 Motivation and context

The ./deploy.sh install script prompted the user if they have an old elastic user password from a previous LME installation. This feature allows the user to use the same password if required to do a reinstallation of LME. However, the reasoning for this step is redundant since the user can change their elastic password at any time without using the install script.

When logging into Kibana for the first time neither the new or old passwords would authenticate properly. This PR removes the feature in order to resolve this issue.

🧪 Testing

Run ./deploy.sh uninstall, then ./deploy.sh install from the Linux server.

✅ Pre-approval checklist

  • This PR has an informative and human-readable title.
  • Changes are limited to a single goal - eschew scope creep!
  • All future TODOs are captured in issues, which are referenced
    in code comments.
  • All relevant type-of-change labels have been added.
  • I have read the CONTRIBUTING document.
  • These code changes follow cisagov code standards.
  • All relevant repo and/or project documentation has been updated
    to reflect the changes in this PR.
  • All new and existing tests pass.

✅ Pre-merge checklist

  • Rebase local branch to latest updates from release-1.3.0
  • Update troubleshooting.md documentation to demonstrate how elasticsearch API can be used to change password with a curl request

@mitchelbaker-cisa mitchelbaker-cisa added the bug This issue or pull request addresses broken functionality label Dec 14, 2023
@mitchelbaker-cisa mitchelbaker-cisa self-assigned this Dec 14, 2023
Copy link
Collaborator

@aarz-snl aarz-snl left a comment

Choose a reason for hiding this comment

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

Here's my PR for adding curl command for resetting password:

#110

@aarz-snl aarz-snl self-requested a review December 15, 2023 20:34
@aarz-snl
Copy link
Collaborator

Did you mean to remove the logic for installing / not installing docker?

@mitchelbaker-cisa
Copy link
Collaborator Author

Here's my PR for adding curl command for resetting password:

#110

Thanks, testing it out now.

No docker install should be unaffected. I think in the diffs it looks like the prompt was removed, but the line is readded.

@aarz-snl
Copy link
Collaborator

Here's my PR for adding curl command for resetting password:
#110

Thanks, testing it out now.

No docker install should be unaffected. I think in the diffs it looks like the prompt was removed, but the line is readded.

You're right... its still there... oof. I really dont like githubs diff view. Kinda confusing

aarz-snl
aarz-snl previously approved these changes Dec 15, 2023
@mitchelbaker-cisa mitchelbaker-cisa merged commit 851aec3 into release-1.3.0 Dec 18, 2023
3 checks passed
@mitchelbaker-cisa mitchelbaker-cisa deleted the mitchelbaker-81-remove-es-prompt branch December 18, 2023 19:09
mitchelbaker-cisa added a commit that referenced this pull request Dec 20, 2023
* added branch naming conventions to Contributing, fixed typo (#85)

Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>

* adding line change from clint's old pr

* Release 1.2.0 MERGE INTO MAIN  (#101) (#102)

* Added instructions to update from Release 1.1.0 to Release 1.2.0 to upgrading.md file

* Upgrade ELK stack to 8.11.1 (#86)

* Update ELK to 8.11.1

* Pull images before starting cluster

* Pull images before deploylme

* Upgrade versions in the live docker compose upon upgrade

* Pull new images before deploying new stack

* Globalize version variable

* Adding the following:
 - get_latest_version function
 - pulling version from this function
 - old password reading text update to reduce confusion
 - print statements in upgrade from 1.0 -> 1.2
 - sleep so it doesn't fail if docker does a slow removal

* Update the version in dashboard_update.sh

---------




* Changed ELK Stack from deploy.sh update to deploy.sh upgrade

---------

Co-authored-by: mitchelbaker-cisa <149098823+mitchelbaker-cisa@users.noreply.github.com>
Co-authored-by: Rishi Aggarwal <Rishi.Aggarwal@ecstech.com>
Co-authored-by: Clint Baxley <c.baxley-ctr@ecstech.com>
Co-authored-by: Clint Baxley <clint.baxley-ctr@ecstech.com>
Co-authored-by: mreeve.snl <mreeve@sandia.gov>
Co-authored-by: ddiabe <133152385+ddiabe@users.noreply.github.com>
Co-authored-by: rishagg01 <149525835+rishagg01@users.noreply.github.com>

* Add .gitattributes file to exclude the testing folder from releases. (#105)

* Updated dashboard Process Explorer file downloads panels

* Update workflow file to include linting and static security scans (#106)

* Update main.yml to add linting

* Update main.yml

* Update troubleshooting.md with instructions on how to change elastic password (#110)

* Delete Chapter 4 Files/dashboards/user_security.ndjson

* Delete Chapter 4 Files/dashboards/security_dashboard_security_log.ndjson

* Updated dashboards

* Remove elastic user password prompt from deploy.sh (#107)

* Remove elastic password prompt and condition in setpasswords()

* create displaycredentials() fnc, link troubleshooting.md documentation at end of script

* update deploy.sh to link to changing elastic username/password in troubleshooting.md

* updated upgrading.md for release 1.3.0 and fixed link in chapter3.md (#117)

Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>

* imported new dashboard

* Rearrange sysmon dashboard  (#115)

* updating sysmon dashboard

* adding line change from clint's old pr

* Add .gitattributes file to exclude the testing folder from releases. (#105)

* updating sysmon dashboard

---------

Co-authored-by: mreeve-snl <mreeve@sandia.gov>
Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>

* Healthcheckoverview dashboard update (#120)

* imported new dashboard

* updated healthcheck dashboard

* Delete Chapter 4 Files/dashboards/alerting_dashboard.ndjson (#121)

removed alerting dashboard from this PR healthcheck PR

---------

Co-authored-by: ddiabe <0743724407@HQ.DHS.GOV>
Co-authored-by: ddiabe <you@example.com>

* adding push so that I can track this branch

* pushing all changes as documented in the PR: 112

* Updated Healthcheck Overview Dashboard panels

---------

Co-authored-by: Linda Waterhouse <82845774+llwaterhouse@users.noreply.github.com>
Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>
Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>
Co-authored-by: mitchelbaker-cisa <149098823+mitchelbaker-cisa@users.noreply.github.com>
Co-authored-by: Rishi Aggarwal <Rishi.Aggarwal@ecstech.com>
Co-authored-by: Clint Baxley <c.baxley-ctr@ecstech.com>
Co-authored-by: Clint Baxley <clint.baxley-ctr@ecstech.com>
Co-authored-by: ddiabe <133152385+ddiabe@users.noreply.github.com>
Co-authored-by: rishagg01 <149525835+rishagg01@users.noreply.github.com>
Co-authored-by: Andrew Arz <149685528+aarz-snl@users.noreply.github.com>
Co-authored-by: ddiabe <0743724407@HQ.DHS.GOV>
Co-authored-by: Grant (SNL) <108766839+rgbrow1949@users.noreply.github.com>
Co-authored-by: Connor <107427279+causand22@users.noreply.github.com>
Co-authored-by: ddiabe <you@example.com>
cbaxley added a commit that referenced this pull request Dec 26, 2023
* added branch naming conventions to Contributing, fixed typo (#85)

Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>

* adding line change from clint's old pr

* Release 1.2.0 MERGE INTO MAIN  (#101) (#102)

* Added instructions to update from Release 1.1.0 to Release 1.2.0 to upgrading.md file

* Upgrade ELK stack to 8.11.1 (#86)

* Update ELK to 8.11.1

* Pull images before starting cluster

* Pull images before deploylme

* Upgrade versions in the live docker compose upon upgrade

* Pull new images before deploying new stack

* Globalize version variable

* Adding the following:
 - get_latest_version function
 - pulling version from this function
 - old password reading text update to reduce confusion
 - print statements in upgrade from 1.0 -> 1.2
 - sleep so it doesn't fail if docker does a slow removal

* Update the version in dashboard_update.sh

---------




* Changed ELK Stack from deploy.sh update to deploy.sh upgrade

---------

Co-authored-by: mitchelbaker-cisa <149098823+mitchelbaker-cisa@users.noreply.github.com>
Co-authored-by: Rishi Aggarwal <Rishi.Aggarwal@ecstech.com>
Co-authored-by: Clint Baxley <c.baxley-ctr@ecstech.com>
Co-authored-by: Clint Baxley <clint.baxley-ctr@ecstech.com>
Co-authored-by: mreeve.snl <mreeve@sandia.gov>
Co-authored-by: ddiabe <133152385+ddiabe@users.noreply.github.com>
Co-authored-by: rishagg01 <149525835+rishagg01@users.noreply.github.com>

* Add .gitattributes file to exclude the testing folder from releases. (#105)

* Updated dashboard Process Explorer file downloads panels

* Update workflow file to include linting and static security scans (#106)

* Update main.yml to add linting

* Update main.yml

* Update troubleshooting.md with instructions on how to change elastic password (#110)

* Delete Chapter 4 Files/dashboards/user_security.ndjson

* Delete Chapter 4 Files/dashboards/security_dashboard_security_log.ndjson

* Updated dashboards

* Remove elastic user password prompt from deploy.sh (#107)

* Remove elastic password prompt and condition in setpasswords()

* create displaycredentials() fnc, link troubleshooting.md documentation at end of script

* update deploy.sh to link to changing elastic username/password in troubleshooting.md

* updated upgrading.md for release 1.3.0 and fixed link in chapter3.md (#117)

Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>

* imported new dashboard

* Rearrange sysmon dashboard  (#115)

* updating sysmon dashboard

* adding line change from clint's old pr

* Add .gitattributes file to exclude the testing folder from releases. (#105)

* updating sysmon dashboard

---------

Co-authored-by: mreeve-snl <mreeve@sandia.gov>
Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>

* Healthcheckoverview dashboard update (#120)

* imported new dashboard

* updated healthcheck dashboard

* Delete Chapter 4 Files/dashboards/alerting_dashboard.ndjson (#121)

removed alerting dashboard from this PR healthcheck PR

---------

Co-authored-by: ddiabe <0743724407@HQ.DHS.GOV>
Co-authored-by: ddiabe <you@example.com>

* adding push so that I can track this branch

* pushing all changes as documented in the PR: 112

* Updated Healthcheck Overview Dashboard panels

---------

Co-authored-by: Linda Waterhouse <82845774+llwaterhouse@users.noreply.github.com>
Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>
Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>
Co-authored-by: mitchelbaker-cisa <149098823+mitchelbaker-cisa@users.noreply.github.com>
Co-authored-by: Rishi Aggarwal <Rishi.Aggarwal@ecstech.com>
Co-authored-by: Clint Baxley <c.baxley-ctr@ecstech.com>
Co-authored-by: Clint Baxley <clint.baxley-ctr@ecstech.com>
Co-authored-by: ddiabe <133152385+ddiabe@users.noreply.github.com>
Co-authored-by: rishagg01 <149525835+rishagg01@users.noreply.github.com>
Co-authored-by: Andrew Arz <149685528+aarz-snl@users.noreply.github.com>
Co-authored-by: ddiabe <0743724407@HQ.DHS.GOV>
Co-authored-by: Grant (SNL) <108766839+rgbrow1949@users.noreply.github.com>
Co-authored-by: Connor <107427279+causand22@users.noreply.github.com>
Co-authored-by: ddiabe <you@example.com>
cbaxley added a commit that referenced this pull request Jan 10, 2024
* added branch naming conventions to Contributing, fixed typo (#85)

Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>

* adding line change from clint's old pr

* Release 1.2.0 MERGE INTO MAIN  (#101) (#102)

* Added instructions to update from Release 1.1.0 to Release 1.2.0 to upgrading.md file

* Upgrade ELK stack to 8.11.1 (#86)

* Update ELK to 8.11.1

* Pull images before starting cluster

* Pull images before deploylme

* Upgrade versions in the live docker compose upon upgrade

* Pull new images before deploying new stack

* Globalize version variable

* Adding the following:
 - get_latest_version function
 - pulling version from this function
 - old password reading text update to reduce confusion
 - print statements in upgrade from 1.0 -> 1.2
 - sleep so it doesn't fail if docker does a slow removal

* Update the version in dashboard_update.sh

---------




* Changed ELK Stack from deploy.sh update to deploy.sh upgrade

---------

Co-authored-by: mitchelbaker-cisa <149098823+mitchelbaker-cisa@users.noreply.github.com>
Co-authored-by: Rishi Aggarwal <Rishi.Aggarwal@ecstech.com>
Co-authored-by: Clint Baxley <c.baxley-ctr@ecstech.com>
Co-authored-by: Clint Baxley <clint.baxley-ctr@ecstech.com>
Co-authored-by: mreeve.snl <mreeve@sandia.gov>
Co-authored-by: ddiabe <133152385+ddiabe@users.noreply.github.com>
Co-authored-by: rishagg01 <149525835+rishagg01@users.noreply.github.com>

* Add .gitattributes file to exclude the testing folder from releases. (#105)

* Updated dashboard Process Explorer file downloads panels

* Update workflow file to include linting and static security scans (#106)

* Update main.yml to add linting

* Update main.yml

* Update troubleshooting.md with instructions on how to change elastic password (#110)

* Delete Chapter 4 Files/dashboards/user_security.ndjson

* Delete Chapter 4 Files/dashboards/security_dashboard_security_log.ndjson

* Updated dashboards

* Remove elastic user password prompt from deploy.sh (#107)

* Remove elastic password prompt and condition in setpasswords()

* create displaycredentials() fnc, link troubleshooting.md documentation at end of script

* update deploy.sh to link to changing elastic username/password in troubleshooting.md

* updated upgrading.md for release 1.3.0 and fixed link in chapter3.md (#117)

Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>

* imported new dashboard

* Rearrange sysmon dashboard  (#115)

* updating sysmon dashboard

* adding line change from clint's old pr

* Add .gitattributes file to exclude the testing folder from releases. (#105)

* updating sysmon dashboard

---------

Co-authored-by: mreeve-snl <mreeve@sandia.gov>
Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>

* Healthcheckoverview dashboard update (#120)

* imported new dashboard

* updated healthcheck dashboard

* Delete Chapter 4 Files/dashboards/alerting_dashboard.ndjson (#121)

removed alerting dashboard from this PR healthcheck PR

---------

Co-authored-by: ddiabe <0743724407@HQ.DHS.GOV>
Co-authored-by: ddiabe <you@example.com>

* adding push so that I can track this branch

* pushing all changes as documented in the PR: 112

* Updated Healthcheck Overview Dashboard panels

---------

Co-authored-by: Linda Waterhouse <82845774+llwaterhouse@users.noreply.github.com>
Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>
Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>
Co-authored-by: mitchelbaker-cisa <149098823+mitchelbaker-cisa@users.noreply.github.com>
Co-authored-by: Rishi Aggarwal <Rishi.Aggarwal@ecstech.com>
Co-authored-by: Clint Baxley <c.baxley-ctr@ecstech.com>
Co-authored-by: Clint Baxley <clint.baxley-ctr@ecstech.com>
Co-authored-by: ddiabe <133152385+ddiabe@users.noreply.github.com>
Co-authored-by: rishagg01 <149525835+rishagg01@users.noreply.github.com>
Co-authored-by: Andrew Arz <149685528+aarz-snl@users.noreply.github.com>
Co-authored-by: ddiabe <0743724407@HQ.DHS.GOV>
Co-authored-by: Grant (SNL) <108766839+rgbrow1949@users.noreply.github.com>
Co-authored-by: Connor <107427279+causand22@users.noreply.github.com>
Co-authored-by: ddiabe <you@example.com>
mitchelbaker-cisa added a commit to mitchelbaker-cisa/LME that referenced this pull request Jan 31, 2024
* added branch naming conventions to Contributing, fixed typo (cisagov#85)

Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>

* adding line change from clint's old pr

* Release 1.2.0 MERGE INTO MAIN  (cisagov#101) (cisagov#102)

* Added instructions to update from Release 1.1.0 to Release 1.2.0 to upgrading.md file

* Upgrade ELK stack to 8.11.1 (cisagov#86)

* Update ELK to 8.11.1

* Pull images before starting cluster

* Pull images before deploylme

* Upgrade versions in the live docker compose upon upgrade

* Pull new images before deploying new stack

* Globalize version variable

* Adding the following:
 - get_latest_version function
 - pulling version from this function
 - old password reading text update to reduce confusion
 - print statements in upgrade from 1.0 -> 1.2
 - sleep so it doesn't fail if docker does a slow removal

* Update the version in dashboard_update.sh

---------




* Changed ELK Stack from deploy.sh update to deploy.sh upgrade

---------

Co-authored-by: mitchelbaker-cisa <149098823+mitchelbaker-cisa@users.noreply.github.com>
Co-authored-by: Rishi Aggarwal <Rishi.Aggarwal@ecstech.com>
Co-authored-by: Clint Baxley <c.baxley-ctr@ecstech.com>
Co-authored-by: Clint Baxley <clint.baxley-ctr@ecstech.com>
Co-authored-by: mreeve.snl <mreeve@sandia.gov>
Co-authored-by: ddiabe <133152385+ddiabe@users.noreply.github.com>
Co-authored-by: rishagg01 <149525835+rishagg01@users.noreply.github.com>

* Add .gitattributes file to exclude the testing folder from releases. (cisagov#105)

* Updated dashboard Process Explorer file downloads panels

* Update workflow file to include linting and static security scans (cisagov#106)

* Update main.yml to add linting

* Update main.yml

* Update troubleshooting.md with instructions on how to change elastic password (cisagov#110)

* Delete Chapter 4 Files/dashboards/user_security.ndjson

* Delete Chapter 4 Files/dashboards/security_dashboard_security_log.ndjson

* Updated dashboards

* Remove elastic user password prompt from deploy.sh (cisagov#107)

* Remove elastic password prompt and condition in setpasswords()

* create displaycredentials() fnc, link troubleshooting.md documentation at end of script

* update deploy.sh to link to changing elastic username/password in troubleshooting.md

* updated upgrading.md for release 1.3.0 and fixed link in chapter3.md (cisagov#117)

Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>

* imported new dashboard

* Rearrange sysmon dashboard  (cisagov#115)

* updating sysmon dashboard

* adding line change from clint's old pr

* Add .gitattributes file to exclude the testing folder from releases. (cisagov#105)

* updating sysmon dashboard

---------

Co-authored-by: mreeve-snl <mreeve@sandia.gov>
Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>

* Healthcheckoverview dashboard update (cisagov#120)

* imported new dashboard

* updated healthcheck dashboard

* Delete Chapter 4 Files/dashboards/alerting_dashboard.ndjson (cisagov#121)

removed alerting dashboard from this PR healthcheck PR

---------

Co-authored-by: ddiabe <0743724407@HQ.DHS.GOV>
Co-authored-by: ddiabe <you@example.com>

* adding push so that I can track this branch

* pushing all changes as documented in the PR: 112

* Updated Healthcheck Overview Dashboard panels

---------

Co-authored-by: Linda Waterhouse <82845774+llwaterhouse@users.noreply.github.com>
Co-authored-by: Linda Lovero-Waterhouse <l.lovero-waterhouse@ecstech.com>
Co-authored-by: mreeve-snl <mreeve@sandia.gov>
Co-authored-by: Alden Hilton <106177711+adhilto@users.noreply.github.com>
Co-authored-by: Rishi Aggarwal <Rishi.Aggarwal@ecstech.com>
Co-authored-by: Clint Baxley <c.baxley-ctr@ecstech.com>
Co-authored-by: Clint Baxley <clint.baxley-ctr@ecstech.com>
Co-authored-by: ddiabe <133152385+ddiabe@users.noreply.github.com>
Co-authored-by: rishagg01 <149525835+rishagg01@users.noreply.github.com>
Co-authored-by: Michael Reeves <147089975+mreeve-snl@users.noreply.github.com>
Co-authored-by: Andrew Arz <149685528+aarz-snl@users.noreply.github.com>
Co-authored-by: ddiabe <0743724407@HQ.DHS.GOV>
Co-authored-by: Grant (SNL) <108766839+rgbrow1949@users.noreply.github.com>
Co-authored-by: Connor <107427279+causand22@users.noreply.github.com>
Co-authored-by: ddiabe <you@example.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue or pull request addresses broken functionality
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants