gistfile1.txt

commit 974c69b74f54cd7e3cc37904d61b81fa48cf7d5d
Author: Nick Anderson <nick@cmdln.org>
Date:   Wed Feb 11 19:28:39 2015

    Add: Purging of old scheduled reports for Mission Portal
    
    Scheduled reports need to be cleaned up after some time so that they do
    not fill up the disk on CFEngine Enterprise Mission Portal hubs.
    
    Also removed cfe_internal_setup_knowledge_files_tmp_dir as it was a
    duplicate of cfe_internal_setup_knowledge_files_doc_root_tmp.
    
    Ref: https://dev.cfengine.com/issues/6819

diff --git a/cfe_internal/CFE_cfengine.cf b/cfe_internal/CFE_cfengine.cf
index 0e14f1d..b0ad1e8 100644
--- a/cfe_internal/CFE_cfengine.cf
+++ b/cfe_internal/CFE_cfengine.cf
@@ -31,6 +31,13 @@ bundle agent cfe_internal_management
 
     am_policy_hub.enterprise::
 
+      "hub" -> { "Mission Portal", "CFEngine Enterprise" }
+        usebundle => cfe_internal_purge_scheduled_reports_older_than_days( $(def.purge_scheduled_reports_older_than_days) ),
+        handle    => "cfe_internal_management_purge_scheduled_reports_older_than_days",
+        comment   => "So that we do not fill up the disk we need to purge scheduled
+                      reports after some time.";
+
+
       "hub" usebundle => cfe_internal_webserver("on"),
       handle => "cfe_internal_management_web_server",
       comment => "Manage Apache Web server (on/off)";

commit ae65fd51c8eb1304c9a43a6612d85bad2eb06293
Author: Eystein Måløy Stenberg <eystein.maloy.stenberg@cfengine.com>
Date:   Wed Feb 11 00:02:37 2015

    turn off cleanup of several cf-execd and cf-monitord by default, may kill CFEngine processes inside containers. Redmine #6906.

diff --git a/cfe_internal/CFE_cfengine.cf b/cfe_internal/CFE_cfengine.cf
index 0e14f1d..531557b 100644
--- a/cfe_internal/CFE_cfengine.cf
+++ b/cfe_internal/CFE_cfengine.cf
@@ -70,9 +70,12 @@ bundle agent cfe_internal_management
 
     any::
 
-      "any" usebundle => cfe_internal_limit_robot_agents,
-      handle => "cfe_internal_management_limit_cfe_agents",
-      comment => "Manage CFE processes";
+#   NB! On a container host this may kill CFEngine processes inside containers.
+#       See https://dev.cfengine.com/issues/6906
+#
+#      "any" usebundle => cfe_internal_limit_robot_agents,
+#      handle => "cfe_internal_management_limit_cfe_agents",
+#      comment => "Manage CFE processes";
 
       "any" usebundle => cfe_internal_log_rotation,
       handle => "cfe_internal_management_log_rotation",

commit 65b96a5a28e478a2e68f4d4bbdd899a811563ca1
Author: maciejmrowiec <maciej.mrowiec@cfengine.com>
Date:   Fri Jan 23 14:27:50 2015

    Enterprsie reports are accumulated on the client till they are collected by cf-hub.
    
    In case if not collecting the reports for extended period of time, they may consume too much space,
    this policy will purge accumulated "diff" reports if the exceed 50MB in total size. As the result,
    report history will become inconcistent with next successful report collection and cf-hub
    will go for rebase query (fetching full state next time). This cleanup apply only to diff reports
    which include class, variable, promise execution, software installed, software patch, lastseen reports.
    
    Redmine: #1150

diff --git a/cfe_internal/CFE_cfengine.cf b/cfe_internal/CFE_cfengine.cf
index 2205c0f..0e14f1d 100644
--- a/cfe_internal/CFE_cfengine.cf
+++ b/cfe_internal/CFE_cfengine.cf
@@ -77,6 +77,12 @@ bundle agent cfe_internal_management
       "any" usebundle => cfe_internal_log_rotation,
       handle => "cfe_internal_management_log_rotation",
       comment => "Rotate CFEngine logs so we dont fill the disk";
+
+    enable_cfe_internal_cleanup_agent_reports::
+      "any" usebundle => cfe_internal_cleanup_agent_reports,
+      handle => "cfe_internal_management_cleanup_agent_reports",
+      comment => "Remove accumulated reports if they grow too large in size";
+
 }
 
 ##################################################################