Work in progress

techniques/system/common/1.0/cron-setup.st

@@ -98,7 +98,9 @@ bundle agent check_cron_daemon
   methods:
 
     pass2.restart_crond::
+      "disable_reporting"        usebundle => disable_reporting;
       "restart_cron" usebundle => service_restart("${service_name}");
+      "enable_reporting"    usebundle => enable_reporting;
 
     # Fake success result, since we don't actually call service_restart unless it's needed
     pass2.!(android|windows|aix).!restart_crond::

techniques/system/common/1.0/restart-services.st

@@ -38,8 +38,8 @@ bundle agent restart_services
 
   methods:
 
+    "disable_reporting" usebundle => disable_reporting;
     # (sys)log service
-
     (!SuSE.!aix.!solaris).(syslogd_repaired|remove_rudder_syslog_configuration_syslog_repaired)::
       "restart_syslog" usebundle => service_restart("syslog");
 
@@ -54,7 +54,9 @@ bundle agent restart_services
 
     (aix|solaris).(syslog_ng_repaired|rsyslog_repaired|syslogd_repaired|remove_rudder_syslog_configuration_result_repaired)::
       "restart_syslog" usebundle => command_execution("${restart_cmd}");
-
+
+    any::
+      "enable_reporting" usebundle => enable_reporting;
     solaris|aix::
       # Final report about (sys)log setting enforcement / restart
       "any"  usebundle => rudder_common_report("Common", "log_repaired", "&TRACKINGKEY&", "Log system for reports", "None", "Logging system has been restarted"),
@@ -74,12 +76,14 @@ bundle agent restart_services
     # Ensure at least one syslog is running
     # We cannot detect which one is used for Rudder
     !windows.!aix.!solaris::
-      "run_syslog"   usebundle => service_ensure_running("syslog"),
-                    ifvarclass => "SuSE|syslogd_conffile_present";
-      "run_syslogng" usebundle => service_ensure_running("syslog-ng"),
-                    ifvarclass => "!SuSE.syslogng_conffile_present";
-      "run_rsyslog" usebundle  => service_ensure_running("rsyslog"),
-                    ifvarclass => "!SuSE.rsyslogd_conffile_present";
+      "inner_again"     usebundle => disable_reporting;
+      "run_syslog"      usebundle => service_ensure_running("syslog"),
+                        ifvarclass => "SuSE|syslogd_conffile_present";
+      "run_syslogng"    usebundle => service_ensure_running("syslog-ng"),
+                        ifvarclass => "!SuSE.syslogng_conffile_present";
+      "run_rsyslog"     usebundle  => service_ensure_running("rsyslog"),
+                        ifvarclass => "!SuSE.rsyslogd_conffile_present";
+      "end_inner_again" usebundle => enable_reporting;
     # We have a problem only if all 3 have an error (otherwise at least one is running)
     service_ensure_running_syslog_error.service_ensure_running_syslog_ng_error.service_ensure_running_rsyslog_error::
       "any"  usebundle => rudder_common_report("Common", "result_error", "&TRACKINGKEY&", "Log system for reports", "None", "Could not start the logging system");

techniques/system/distributePolicy/1.0/apache-acl.st

@@ -54,7 +54,10 @@ bundle agent apache_acl
 
   methods:
     rudder_apache_acl_repaired::
+      "disable_reporting" usebundle => disable_reporting; 
+      "context" usebundle => _method_reporting_context("Configure apache ACL", "None"); 
       "any" usebundle => service_reload("${apache_service}");
+      "enable_reporting" usebundle => enable_reporting; 
 
     rudder_apache_acl_ok.!rudder_apache_acl_repaired.!rudder_apache_acl_error::
       "any" usebundle => rudder_common_report("DistributePolicy", "result_success", "&TRACKINGKEY&", "Configure apache ACL", "None", "Apache ACLs are correct");

techniques/system/inventory/1.0/fusionAgent.st

@@ -248,7 +248,9 @@ bundle agent fusionAgent
   methods:
 
     xen.!xen_dom0::
-      "any" usebundle => package_present("${xen_tools_package}", "", "", "");
+      "disable_reporting"     usebundle => disable_reporting;
+      "any"       usebundle => package_present("${xen_tools_package}", "", "", "");
+      "enable_reporting" usebundle => enable_reporting;
 
     pass3.run_inventory::
       "any" usebundle => rudder_common_report("Inventory", "log_debug", "&TRACKINGKEY&", "inventory", "None", "Running inventory");

techniques/system/server-roles/1.0/alive-check.st

@@ -50,10 +50,12 @@ bundle agent generic_alive_check(app)
   methods:
 
     root_server::
-
+      "disable_reporting" usebundle => disable_reporting; 
+      "context" usebundle => _method_reporting_context("Check ${app} status", "None"); 
       "any" usebundle => service_restart("rudder-jetty"),
         ifvarclass => "site_alivecheck_restart_jetty_${sitename}",
         classes => set_persist_classes("site_alivecheck_jetty_restarted_${sitename}", "site_down_once_${sitename}" ,"0");
+      "enable_reporting" usebundle => enable_reporting; 
 
     pass3.root_server::
 

techniques/system/server-roles/1.0/password-check.st

@@ -151,9 +151,10 @@ bundle agent root_password_check_ldap
   methods:
 
     pass2.rudder_ldap_password_integrity_changed::
-
+      "disable_reporting" usebundle => disable_reporting; 
+      "context" usebundle => _method_reporting_context("Check LDAP in rudder-webabb.properties", "None");
       "restart_slapd" usebundle => service_restart("rudder-slapd");
-
+      "enable_reporting" usebundle => enable_reporting;  
     pass3.root_server.rudder_web_password_integrity_ok.!rudder_web_password_integrity_changed.!rudder_web_password_integrity_failed::
       "any" usebundle => rudder_common_report("server-roles", "result_success", "&TRACKINGKEY&", "Check LDAP in rudder-webapp.properties", "None", "Web interface configuration files are correct (checked LDAP password)");
 
@@ -259,8 +260,10 @@ bundle agent root_password_restart_jetty
   methods:
 
     pass2.rudder_web_password_integrity_changed::
-
+      "disable_reporting" usebundle => disable_reporting; 
+      "context" usebundle => _method_reporting_context("Check rudder-webapp.properties", "None");
       "restart_jetty" usebundle => service_restart("rudder-jetty");
+      "enable_reporting" usebundle => enable_reporting;  
 
     pass3.service_restart_rudder_jetty_repaired::
       "any" usebundle => rudder_common_report("server-roles", "log_info", "&TRACKINGKEY&", "Check rudder-webapp.properties", "None", "Jetty has been restarted");

techniques/system/server-roles/1.0/postgres-check.st

@@ -44,7 +44,10 @@ bundle agent root_postgres_check
   methods:
 
     pass2.SuSE.psql_conf_updated::
+      "disable_reporting" usebundle => disable_reporting;
+      "context" usebundle => _method_reporting_context("Check PostgreSQL configuration", "None");
       "restart_postgresql" usebundle => service_restart("postgresql");
+      "enable_reporting" usebundle => enable_reporting;
 
     # Report about the configuration file editing
     pass3.SuSE.psql_conf_ok.!psql_conf_updated.!psql_conf_update_error::

techniques/system/server-roles/1.0/service-check.st

@@ -23,8 +23,10 @@ bundle agent generic_process_check_process(binary, initscript, name) {
       "c_initscript" string => canonify("${initscript}");
 
   methods:
-
+      "disable_reporting" usebundle => disable_reporting;
+      "context" => _method_reporting_context("Check ${name} process", "None");
       "start_process" usebundle => service_ensure_running_path("${initscript}", "${binary}");
+      "enable_reporting" usebundle => enable_reporting;
 
       "any"           usebundle => rudder_common_reports_generic("server-roles", "service_ensure_running_${c_initscript}", "&TRACKINGKEY&", "Check ${name} process", "None", "Check ${name} process running");
 
@@ -38,7 +40,10 @@ bundle agent generic_process_check_bootstart(binary, initscript, name) {
 
   methods:
 
+      "disable_reporting" usebundle => disable_reporting;
+      "context" => _method_reporting_context("Check ${name} boot script", "None");
       "bootstart_service" usebundle => service_ensure_started_at_boot("${initscript}");
+      "enable_reporting" usebundle => enable_reporting;
       "any" usebundle => rudder_common_reports_generic("server-roles", "service_ensure_started_at_boot_${c_initscript}", "&TRACKINGKEY&", "Check ${name} boot script", "None", "Check ${name} boot starting parameters");
 
 }