reports: hide program messages from reports by default

can be changed back by report_include_class2 = 2

Changes

@@ -17,6 +17,8 @@ next:
             - honor acknowledgement and downtime status shape color calculation
             - fix shape color for host problems in group/dashboard panels
             - fix saving column width for grid panels
+          - Reports:
+            - hide program messages from reports by default, can be changed back by report_include_class2 = 2
 
 2.12-3   Tue Dec 20 20:43:54 CET 2016
           - fix js error on status page

docs/documentation/configuration.asciidoc

@@ -230,6 +230,10 @@ ex.:
 Include messages with class = 2 (program messages) in reports.
 Setting this to 0 allows the MySQL backend to use indexes efficiently
 
+    - 0 = off
+    - 1 = auto (default)
+    - 2 = on
+
 ex.:
 
   report_include_class2 = 1

lib/Thruk/Utils/Avail.pm

@@ -559,8 +559,13 @@ sub calculate_availability {
             push @typefilter, { -or => [ @logservicefilter ] };
         }
     }
-    if ($c->config->{'report_include_class2'} == 1) {
-        push @typefilter, { class => 2 }; # programm messages
+    if($c->config->{'report_include_class2'} != 0) { # 0 means force - off
+        if($c->config->{'report_include_class2'} == 2 # 2 means force on
+           || ($c->config->{'report_include_class2'} == 1 # 1 means default auto
+               && ($full_log_entries || $assumestatesduringnotrunning eq 'no'))
+        ) {
+            push @typefilter, { class => 2 }; # programm messages
+        }
     }
     if($rpttimeperiod) {
         push @typefilter, { '-or' => [

thruk.conf

@@ -566,6 +566,9 @@ cron_post_edit_cmd = /usr/bin/crontab /tmp/thruk_cron.tmp && rm -f /tmp/thruk_cr
 
 # Include messages with class = 2 (program messages) in reports.
 # Setting this to 0 allows the MySQL backend to use indexes efficiently
+# 0 = off
+# 1 = auto (default)
+# 2 = on
 # report_include_class2 = 1
 
 # Should thruk update the logcache databases before running reports?