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 #18346: Make the group option to include the Rudder server or not in the group more clear #3272

Merged
merged 1 commit into from Oct 20, 2020
Merged

Fixes #18346: Make the group option to include the Rudder server or not in the group more clear #3272

merged 1 commit into from Oct 20, 2020

Conversation

fanf
Copy link
Member

@fanf fanf commented Oct 19, 2020

ncharles
ncharles requested changes Oct 19, 2020
View reviewed changes
Copy link
Member

@ncharles ncharles left a comment

Choose a reason for hiding this comment

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

It is not only root server

webapp/sources/rudder/rudder-web/src/main/webapp/templates-hidden/server/server_details.html Outdated
@@ -18,7 +18,7 @@
<span class="ion ion-checkmark-round check-icon"></span>
</label>
<label for="typeQuery" class="form-control">
Include Rudder server components
Include Rudder root server
Copy link
Member

Choose a reason for hiding this comment

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

It is not only root, but all node with a server component: so nodes having rudder-reports, rudder-db, rudder-webapp or rudder-server-root
But not the relays

Telling root is not correct - maybe something in the line
"Include Rudder server components (web interface, database)"

Copy link
Member Author

Choose a reason for hiding this comment

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

nobody knows what "server components" are (I didn't think it's documented anywhere). I really think it should say "root".

Include Rudder root server components (nodes with Rudder application or database)

Copy link
Member Author

Choose a reason for hiding this comment

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

"application" is maybe too broad, though

Copy link
Member Author

Choose a reason for hiding this comment

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

Include Rudder root server components (nodes with Rudder web application or database)

Copy link
Member Author

Choose a reason for hiding this comment

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

image

@fanf
Copy link
Member Author

fanf commented Oct 19, 2020

PR updated with a new commit

@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/3272
-- Your faithful QA
Kant merge: "All our knowledge begins with the senses, proceeds then to the understanding, and ends with reason. There is nothing higher than reason."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/31147/console)

@fanf
Copy link
Member Author

fanf commented Oct 20, 2020

OK, squash merging this PR

@fanf fanf force-pushed the bug_18346/make_the_group_option_to_include_the_rudder_server_or_not_in_the_group_more_clear branch from bbf447d to f600fef Compare October 20, 2020 08:20
@fanf fanf merged commit f600fef into Normation:branches/rudder/6.1 Oct 20, 2020
@fanf fanf deleted the bug_18346/make_the_group_option_to_include_the_rudder_server_or_not_in_the_group_more_clear branch March 15, 2024 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncharles ncharles ncharles approved these changes

Assignees
No one assigned
Labels
qa: Can't merge Trigger test
Projects
None yet
Milestone
No milestone
3 participants
@fanf @Normation-Quality-Assistant @ncharles