web_log fixes

diff --git a/conf.d/health.d/web_log.conf b/conf.d/health.d/web_log.conf
index 82e7d987e2439db55efa00527011e7ae760a16ee..4300fe7557f2b741676dbebe5e7793d63d0ddac4 100644 (file)
--- a/conf.d/health.d/web_log.conf
+++ b/conf.d/health.d/web_log.conf
@@ -3,6 +3,7 @@
 
 template: last_collected_secs
       on: web_log.response_codes
+families: *
     calc: $now - $last_collected_t
    units: seconds ago
    every: 10s
@@ -17,6 +18,7 @@ template: last_collected_secs
 
 template: 1m_2xx
       on: web_log.response_codes
+families: *
   lookup: sum -1m unaligned of 2xx
     calc: ($this == 0)?(1):($this)
    units: requests
@@ -25,6 +27,7 @@ template: 1m_2xx
 
 template: 1m_redirects
       on: web_log.response_codes
+families: *
   lookup: sum -1m unaligned of 3xx
     calc: $this * 100 / ( $1m_2xx + $this )
    units: %
@@ -38,6 +41,7 @@ template: 1m_redirects
 
 template: 1m_bad_requests
       on: web_log.response_codes
+families: *
   lookup: sum -1m unaligned of 4xx
     calc: $this * 100 / ( $1m_2xx + $this )
    units: %
@@ -51,6 +55,7 @@ template: 1m_bad_requests
 
 template: 1m_internal_errors
       on: web_log.response_codes
+families: *
   lookup: sum -1m unaligned of 5xx
     calc: $this * 100 / ( $1m_2xx + $this )
    units: %
@@ -67,6 +72,7 @@ template: 1m_internal_errors
 
 template: 10m_response_time
       on: web_log.response_time
+families: *
   lookup: average -10m unaligned of avg
    units: ms
    every: 30s
@@ -75,7 +81,8 @@ template: 10m_response_time
 
 template: web_slow
       on: web_log.response_time
-  lookup: sum -1m unaligned of avg
+families: *
+  lookup: average -1m unaligned of avg
    units: ms
    every: 10s
    green: 500
@@ -91,6 +98,7 @@ template: web_slow
 
 template: 5m_2xx_last
       on: web_log.response_codes
+families: *
   lookup: average -5m at -5m unaligned of 2xx
    units: requests
    every: 30s
@@ -98,6 +106,7 @@ template: 5m_2xx_last
 
 template: 5m_2xx_now
       on: web_log.response_codes
+families: *
   lookup: average -5m unaligned of 2xx
    units: requests
    every: 30s
@@ -105,6 +114,7 @@ template: 5m_2xx_now
 
 template: 5m_requests_ratio
       on: web_log.response_codes
+families: *
     calc: ($5m_2xx_last > 0)?($5m_2xx_now * 100 / $5m_2xx_last):(100)
    units: %
    every: 30s

diff --git a/python.d/web_log.chart.py b/python.d/web_log.chart.py
index 315369c26e6818eeddc9d355b068b5f5ed680d9b..6cb594f6ae02c62f7b72bbb9e9e4e54abafa80b2 100644 (file)
--- a/python.d/web_log.chart.py
+++ b/python.d/web_log.chart.py
@@ -209,9 +209,9 @@ class Service(LogService):
         job_name = find_job_name(self.override_name, self.name)
         self.detailed_chart = 'CHART %s.detailed_response_codes ""' \
                               ' "Response Codes" requests/s responses' \
-                              ' web_log.detailed_resp stacked 1 %s\n' % (job_name, self.update_every)
+                              ' web_log.detailed_response_codes stacked 1 %s\n' % (job_name, self.update_every)
         self.http_method_chart = 'CHART %s.http_method' \
-                                 ' "" "HTTP Methods" requests/s requests' \
+                                 ' "" "Requests Per HTTP Method" requests/s requests' \
                                  ' web_log.http_method stacked 2 %s\n' % (job_name, self.update_every)
 
         if regex_name == 'access_apache_ext':