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 #15023: Adapt system techniques to HTTPS reporting #1451

Merged
merged 2 commits into from
Jul 15, 2019
Merged

Fixes #15023: Adapt system techniques to HTTPS reporting #1451

merged 2 commits into from
Jul 15, 2019

Conversation

amousset
Copy link
Member

@amousset amousset commented Jun 6, 2019

@amousset
Copy link
Member Author

amousset commented Jun 6, 2019

Do not merge, the system variable does not exist for now.

@amousset
Copy link
Member Author

amousset commented Jun 6, 2019

Commit modified

1 similar comment
@amousset
Copy link
Member Author

amousset commented Jun 6, 2019

Commit modified

@amousset amousset force-pushed the arch_15023/adapt_system_techniques_to_https_reporting branch from d32b533 to 14cbedd Compare June 6, 2019 11:43
@amousset
Copy link
Member Author

amousset commented Jun 6, 2019

Commit modified

@amousset amousset force-pushed the arch_15023/adapt_system_techniques_to_https_reporting branch from 14cbedd to b53769c Compare June 6, 2019 11:45
@amousset
Copy link
Member Author

amousset commented Jun 6, 2019

Commit modified

@amousset
Copy link
Member Author

amousset commented Jun 6, 2019

PR rebased

@amousset amousset force-pushed the arch_15023/adapt_system_techniques_to_https_reporting branch 2 times, most recently from 7406f63 to 7377294 Compare June 6, 2019 15:53
@amousset
Copy link
Member Author

amousset commented Jun 6, 2019

Commit modified

1 similar comment
@amousset
Copy link
Member Author

Commit modified

@amousset
Copy link
Member Author

Commit modified

1 similar comment
@amousset
Copy link
Member Author

Commit modified

ncharles
ncharles reviewed Jun 21, 2019
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.

I have some questions - but this is great !

techniques/system/common/1.0/metadata.xml
@@ -79,6 +79,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<FILE name="properties.cf">
<INCLUDED>true</INCLUDED>
</FILE>
<FILE name="reporting-http.cf">
Copy link
Member

Choose a reason for hiding this comment

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

could it be reporting-https.cf ?

techniques/system/common/1.0/reporting-http.cf
"reports" slist => sublist("reports", "head", 50);

methods:
"send" usebundle => send_rudder_report("${reports}");
Copy link
Member

Choose a reason for hiding this comment

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

you may want to use @{reports} (not sure if it's relevant, but could be helpful)

techniques/system/common/1.0/restart-services.cf
@@ -79,7 +79,7 @@ bundle agent restart_services

# Ensure at least one syslog is running
# We cannot detect which one is used for Rudder
!aix.!solaris::
rudder_reporting_syslog.!aix.!solaris::
Copy link
Member

Choose a reason for hiding this comment

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

isn't it dealt with in the calling bundle ?

Copy link
Member Author

Choose a reason for hiding this comment

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

We could rename the bundle to restart_syslog and only call it when syslog is used for reporting indeed, good idea.

techniques/system/common/1.0/promises.st
@@ -157,7 +157,7 @@ bundle common va
"common_input_list" slist => { "common/1.0/common.cf", "common/1.0/cf-serverd.cf", "common/1.0/rudder-groups.cf", "common/1.0/hooks.cf", "common/1.0/cron-setup.cf", "common/1.0/site.cf", "common/1.0/update.cf", "common/1.0/monitoring.cf", "common/1.0/restart-services.cf", "common/1.0/internal-security.cf", "common/1.0/environment-variables.cf", "common/1.0/properties.cf" };
"inventory_input_list" slist => { "inventory/1.0/fusionAgent.cf" };
"distribute_policy_input_list" slist => { "distributePolicy/1.0/common.cf", "distributePolicy/1.0/rsyslogConf.cf", "distributePolicy/1.0/propagatePromises.cf", "distributePolicy/1.0/apache-acl.cf" };
"server_roles_input_list" slist => { "server-roles/1.0/common.cf", "server-roles/1.0/component-check.cf", "server-roles/1.0/alive-check.cf", "server-roles/1.0/service-check.cf", "server-roles/1.0/integrity-check.cf", "server-roles/1.0/network-check.cf", "server-roles/1.0/password-check.cf", "server-roles/1.0/postgres-check.cf", "server-roles/1.0/logrotate-check.cf", "server-roles/1.0/technique-reload.cf", "server-roles/1.0/compress-webapp-log.cf", "server-roles/1.0/compress-ldap-backups.cf", "server-roles/1.0/servers-by-role.cf" };
"server_roles_input_list" slist => { "server-roles/1.0/common.cf", "server-roles/1.0/relayd.cf", "server-roles/1.0/component-check.cf", "server-roles/1.0/alive-check.cf", "server-roles/1.0/service-check.cf", "server-roles/1.0/integrity-check.cf", "server-roles/1.0/network-check.cf", "server-roles/1.0/password-check.cf", "server-roles/1.0/postgres-check.cf", "server-roles/1.0/logrotate-check.cf", "server-roles/1.0/technique-reload.cf", "server-roles/1.0/compress-webapp-log.cf", "server-roles/1.0/compress-ldap-backups.cf", "server-roles/1.0/servers-by-role.cf" };
Copy link
Member

Choose a reason for hiding this comment

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

why is server-roles/1.0/relayd.cf included now ?

Copy link
Member Author

Choose a reason for hiding this comment

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

because it was missing from a previous PR

techniques/system/server-roles/1.0/password-check.cf
"pgpass[5]" string => "${p.psql_password[2]}";
"pgpass[3]" string => "${rudder_postgresql.db_user}";
"pgpass[4]" string => "${rudder_postgresql.db_name}";
"pgpass[5]" string => "${rudder_postgresql.db_pass}";
Copy link
Member

Choose a reason for hiding this comment

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

<3

@amousset amousset force-pushed the arch_15023/adapt_system_techniques_to_https_reporting branch from 7e9123d to 6e12e52 Compare June 24, 2019 08:51
@amousset
Copy link
Member Author

Commit modified

@amousset
Copy link
Member Author

PR updated with a new commit

1 similar comment
@amousset
Copy link
Member Author

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-techniques/pull/1451
-- Your faithful QA
Kant merge: "Morality is not the doctrine of how we may make ourselves happy, but how we may make ourselves worthy of happiness."
(https://ci.normation.com/jenkins/job/merge-accepted-pr/12280/console)

@amousset
Copy link
Member Author

OK, squash merging this PR

@amousset amousset force-pushed the arch_15023/adapt_system_techniques_to_https_reporting branch from 389e0c4 to ef8e915 Compare July 15, 2019 08:34
@amousset amousset merged commit ef8e915 into Normation:master Jul 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncharles ncharles ncharles left review comments

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