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

Show name and number in OS version #4851

Merged
merged 3 commits into from Nov 14, 2022

Conversation

chantal-kelm
Copy link
Member

@chantal-kelm chantal-kelm commented Nov 11, 2022

Description

We want to unify the names displayed in operating system versions, as for example in SUSE versions only the number is displayed and on Ubuntu the number plus the OS name is displayed.

Issues Resolved

#4850

Evidence

image

image

Steps to test:

*Go to the Agents tab
*Click on the 'Deploy new agent' button.
*Verify that each version shows the OS name plus the number.

Check List

  • All tests pass
    • yarn test:jest
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

@chantal-kelm chantal-kelm self-assigned this Nov 11, 2022
@chantal-kelm chantal-kelm requested a review from a team as a code owner November 11, 2022 17:11
@chantal-kelm chantal-kelm linked an issue Nov 11, 2022 that may be closed by this pull request
Copy link
Member

@asteriscos asteriscos left a comment

Choose a reason for hiding this comment

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

should this have a changelog entry?

Tostti
Tostti previously approved these changes Nov 11, 2022
Copy link
Member

@Tostti Tostti left a comment

Choose a reason for hiding this comment

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

LGTM

asteriscos
asteriscos previously approved these changes Nov 11, 2022
Copy link
Member

@asteriscos asteriscos left a comment

Choose a reason for hiding this comment

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

LGTM: ✔️

CHANGELOG.md Outdated Show resolved Hide resolved
@chantal-kelm chantal-kelm dismissed stale reviews from asteriscos and Tostti via 110dd6e November 11, 2022 18:03
@github-actions
Copy link
Contributor

Code coverage (Jest) % values
Statements 8.69% ( 3208 / 36931 )
Branches 4.43% ( 1269 / 28674 )
Functions 7.6% ( 696 / 9163 )
Lines 8.76% ( 3095 / 35351 )

@gdiazlo gdiazlo mentioned this pull request Nov 11, 2022
29 tasks
Copy link
Member

@asteriscos asteriscos left a comment

Choose a reason for hiding this comment

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

LGTM ✔️

@AlexRuiz7 AlexRuiz7 changed the title show name + number in OS version Show name and number in OS version Nov 14, 2022
Copy link
Member

@Tostti Tostti left a comment

Choose a reason for hiding this comment

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

LGTM

@chantal-kelm chantal-kelm merged commit 81a9712 into 4.4-7.10 Nov 14, 2022
@chantal-kelm chantal-kelm deleted the 4850-Names-shown-in-OS-versions branch November 14, 2022 11:33
@github-actions
Copy link
Contributor

The backport to 4.4-7.16 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-7.16 4.4-7.16
# Navigate to the new working tree
cd .worktrees/backport-4.4-7.16
# Create a new branch
git switch --create backport-4851-to-4.4-7.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 81a9712eb84a942cc49ba370350179aa3e60fb75
# Push it to GitHub
git push --set-upstream origin backport-4851-to-4.4-7.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-7.16

Then, create a pull request where the base branch is 4.4-7.16 and the compare/head branch is backport-4851-to-4.4-7.16.

@github-actions
Copy link
Contributor

The backport to 4.4-2.3-wzd failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-4.4-2.3-wzd 4.4-2.3-wzd
# Navigate to the new working tree
cd .worktrees/backport-4.4-2.3-wzd
# Create a new branch
git switch --create backport-4851-to-4.4-2.3-wzd
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 81a9712eb84a942cc49ba370350179aa3e60fb75
# Push it to GitHub
git push --set-upstream origin backport-4851-to-4.4-2.3-wzd
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-4.4-2.3-wzd

Then, create a pull request where the base branch is 4.4-2.3-wzd and the compare/head branch is backport-4851-to-4.4-2.3-wzd.

chantal-kelm added a commit that referenced this pull request Nov 14, 2022
* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)
chantal-kelm added a commit that referenced this pull request Nov 14, 2022
* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)
chantal-kelm added a commit that referenced this pull request Nov 14, 2022
* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)
chantal-kelm added a commit that referenced this pull request Nov 14, 2022
* Show name and number in OS version (#4851)

* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)

* Show name and number in OS version (#4851)

* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)

* Show name and number in OS version (#4851)

* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)
chantal-kelm added a commit that referenced this pull request Nov 15, 2022
* Show name and number in OS version (#4851)

* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)

* manual backport

* Delete worktree

Co-authored-by: Federico Rodriguez <federico.rodriguez@wazuh.com>
chantal-kelm added a commit that referenced this pull request Nov 17, 2022
…4878)

* Show name and number in OS version (#4851)

* show name + number in OS version

* CHANGELOG

* CHANGELOG

(cherry picked from commit 81a9712)

* local merge 4.4-7.16

* changes

* link debian
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.

Update Operating Systems' names
3 participants