apache-frontend: Include more monitor reports

  Include report for apache status (see mod_status on apache documentation)
  Include report to traffic server to produce a summary on cache
  Update report for ats for run only once an hour

software/apache-frontend/buildout.hash.cfg

@@ -19,7 +19,7 @@ md5sum = f686f765e55d1dce2e55a400f0714b3e
 
 [template-apache-frontend]
 filename = instance-apache-frontend.cfg
-md5sum = 513a2ebaa8545a4f9c230427d2e913d2
+md5sum = a2cd4f7ab70ca35db42cfc0dbd290373
 
 [template-apache-replicate]
 filename = instance-apache-replicate.cfg.in

software/apache-frontend/instance-apache-frontend.cfg

@@ -48,6 +48,8 @@ parts =
 ## Monitor for apache
   monitor-base
   monitor-ats-cache-stats-wrapper
+  monitor-traffic-summary-last-stats-wrapper
+  monitor-apache-server-status-wrapper
   monitor-verify-re6st-connectivity
 
 extends = ${monitor-template:output}
@@ -604,16 +606,35 @@ password = $${slap-parameter:monitor-password}
 private-path-list += 
   $${directory:logrotate-backup}
 
+
+[monitor-traffic-summary-last-stats-wrapper]
+< = jinja2-template-base
+template = ${template-wrapper:output}
+rendered = $${monitor-directory:reports}/traffic-summary-last-stats_every_1_hour
+mode = 0700
+command = export TS_ROOT=$${buildout:directory} && echo "<pre>$(${trafficserver:location}/bin/traffic_logstats -f $${trafficserver-directory:log}/squid.blog)</pre>"
+extra-context =
+  key content monitor-traffic-summary-last-stats-wrapper:command
+
 # Produce ATS Cache stats
 [monitor-ats-cache-stats-wrapper]
 < = jinja2-template-base
 template = ${template-wrapper:output}
-rendered = $${monitor-directory:reports}/ats-cache-stats
+rendered = $${monitor-directory:reports}/ats-cache-stats_every_1_hour
 mode = 0700
 command = export TS_ROOT=$${buildout:directory} && echo "<pre>$(${trafficserver:location}/bin/traffic_shell $${monitor-ats-cache-stats-config:rendered})</pre>"
 extra-context =
   key content monitor-ats-cache-stats-wrapper:command
 
+[monitor-apache-server-status-wrapper]
+< = jinja2-template-base
+template = ${template-wrapper:output}
+rendered = $${monitor-directory:reports}/monitor-apache-server-status-wrapper
+mode = 0700
+command = ${curl:location}/bin/curl -s http://$${instance-parameter:ipv4-random}:$${instance-parameter:configuration.plain_http_port}/server-status -u $${monitor-htpasswd:username}:$${monitor-htpasswd:passwd} 2>&1 
+extra-context =
+  key content monitor-apache-server-status-wrapper:command
+
 [monitor-ats-cache-stats-config]
 < = jinja2-template-base
 template = ${template-empty:target}