Merge pull request #1196 from ktsaou/master

fping improvements

diff --git a/conf.d/apps_groups.conf b/conf.d/apps_groups.conf
index 57357a87322f130ed25482952b4ea5e45dd90a67..23131e35344a8d876ad367c9b01e053fad4107b0 100644 (file)
--- a/conf.d/apps_groups.conf
+++ b/conf.d/apps_groups.conf
@@ -202,7 +202,7 @@ ksmd: ksmd
 # -----------------------------------------------------------------------------
 # media players, servers, clients
 
-media: mplayer vlc xine mediatomb omxplayer* kodi* xbmc* mediacenter eventlircd mpd minidlnad mt-daapd avahi*
+media: mplayer vlc xine mediatomb omxplayer* kodi* xbmc* mediacenter eventlircd mpd minidlnad mt-daapd avahi* Plex*
 
 # -----------------------------------------------------------------------------
 # X

diff --git a/python.d/nginx_log.chart.py b/python.d/nginx_log.chart.py
index 95fb123d2ffe03487d5ecb78880a115864ea17e6..16a9d95713416d5a0a4175434d6e795116857409 100644 (file)
--- a/python.d/nginx_log.chart.py
+++ b/python.d/nginx_log.chart.py
@@ -54,7 +54,10 @@ class Service(LogService):
         regex = self.regex
         for line in raw:
             code = regex.search(line)
-            beginning = code.group(1)[0]
+            try:
+                beginning = code.group(1)[0]
+            except AttributeError:
+                continue
 
             if beginning == '2':
                 data["2xx"] += 1

diff --git a/python.d/python_modules/msg.py b/python.d/python_modules/msg.py
index 203751afdb051d39ab98c5f5b883c3dc772d017f..e10819c28432b3fe53e739e438f233817fc606a5 100644 (file)
--- a/python.d/python_modules/msg.py
+++ b/python.d/python_modules/msg.py
@@ -34,7 +34,7 @@ def log_msg(msg_type, *args):
         NEXT_CHECK = now - (now % LOG_INTERVAL) + LOG_INTERVAL
         if LOG_COUNTER < 0:
             timestamp = strftime('%Y-%m-%d %X')
-            msg = "%s: Prevented %s log messages from displaying" % (timestamp, str(0 - LOG_COUNTER))
+            msg = "%s: python.d.plugin: Prevented %s log messages from displaying" % (timestamp, str(0 - LOG_COUNTER))
             WRITE(msg + "\n")
             FLUSH()