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.

Sign up for GitHub

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

Jump to bottom

Fixes #19537: Add Kali Linux to the list of recognized OS #3720

Merged
merged 1 commit into from Jul 21, 2021
Merged

Fixes #19537: Add Kali Linux to the list of recognized OS #3720

merged 1 commit into from Jul 21, 2021

Conversation

ElaadF
Copy link
Member

@ElaadF ElaadF commented Jul 19, 2021 •
edited

https://issues.rudder.io/issues/19537

  • Kali icon
  • ${node.inventory[os][name]} = Kali
  • Name in tooltip info = Kali
  • OS enum in api-doc

@ElaadF ElaadF added Trigger test WIP Use that label for a Work In Progress PR that must not be merged yet labels Jul 19, 2021
@ElaadF ElaadF force-pushed the bug_19537/add_kali_linux_to_the_list_of_recognized_os branch from 9c61dd3 to e4bf8a2 Compare July 19, 2021 10:58
@ElaadF
Copy link
Member Author

ElaadF commented Jul 19, 2021

Commit modified

fanf
fanf reviewed Jul 19, 2021
View reviewed changes
Copy link
Member

@fanf fanf left a comment

Choose a reason for hiding this comment

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

you need to add:

  • an entry for kali in rudder-node.css (around line 270) for kali logo in node details,
  • the logo at the corresponding place,
  • an entry in os.yml for api doc

Appart from that, seems OK. Did you checked with an other added distro (like scientific) PR if everything is there ?

@fanf
Copy link
Member

fanf commented Jul 19, 2021

I looked for amazon linux, and you seems to have all the case covered.

@ElaadF ElaadF force-pushed the bug_19537/add_kali_linux_to_the_list_of_recognized_os branch from e4bf8a2 to a1207fb Compare July 19, 2021 15:47
@ElaadF
Copy link
Member Author

ElaadF commented Jul 19, 2021

Commit modified

@ElaadF ElaadF removed the WIP Use that label for a Work In Progress PR that must not be merged yet label Jul 20, 2021
@ElaadF ElaadF requested review from ncharles and fanf July 20, 2021 13:13
@ElaadF ElaadF force-pushed the bug_19537/add_kali_linux_to_the_list_of_recognized_os branch from a1207fb to bfe7ad6 Compare July 21, 2021 07:18
@ElaadF
Copy link
Member Author

ElaadF commented Jul 21, 2021

Commit modified

@Normation-Quality-Assistant
Copy link
Contributor

This PR is not mergeable to upper versions.
Since it is "Ready for merge" you must merge it by yourself using the following command:
rudder-dev merge https://github.com/Normation/rudder/pull/3720
-- Your faithful QA
Kant merge: "It is beyond a doubt that all our knowledge begins with experience."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/41679/console)

@Normation-Quality-Assistant
Copy link
Contributor

OK, merging this PR

@Normation-Quality-Assistant Normation-Quality-Assistant merged commit c802ad2 into Normation:branches/rudder/6.2 Jul 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VinceMacBuche VinceMacBuche VinceMacBuche approved these changes

@ncharles ncharles Awaiting requested review from ncharles

@fanf fanf Awaiting requested review from fanf

Assignees
No one assigned
Labels
Trigger test
Projects
None yet
Milestone
No milestone
4 participants
@ElaadF @fanf @Normation-Quality-Assistant @VinceMacBuche