Merge pull request #22 from rpsedlak/integration

Version 1.0.1 complete

ReleaseNotes.md

@@ -0,0 +1,17 @@
+# Release notes
+
+## Release 1.0.1 - 12/21/2015
+* #20 - Changed collection delay for docker version
+* #18 - Implemented WARNING trigger for paused containers
+* #17 - Implemented AVERAGE trigger for OMMKilled containers
+* #16 - Corrected install.sh problem for overridden directories
+* #15 - Implemented value file caching on zabbix-agent host to keep docker from becoming over loaded.
+* #12 - Changed "Docker Storage Driver Deferred Removal Enabled" from text to unsigned int (Boolean value).
+
+## Release 1.0.0 - 12/19/2015
+* Feature complete
+* Supports docker 'inspect'
+* Supports docker 'stats' commands
+* Supports docker 'info'
+* Supports Zabbix LLD
+

ZabbixDockerTemplate.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>2.0</version>
-    <date>2015-12-18T04:08:42Z</date>
+    <date>2015-12-21T20:59:49Z</date>
     <groups>
         <group>
             <name>Templates</name>
@@ -733,12 +733,12 @@
                     <snmp_community/>
                     <multiplier>0</multiplier>
                     <snmp_oid/>
-                    <key>docker.info[Deferred Removal Enabled]</key>
+                    <key>docker.info.boolean[Deferred Removal Enabled]</key>
                     <delay>3600</delay>
                     <history>90</history>
                     <trends>365</trends>
                     <status>0</status>
-                    <value_type>4</value_type>
+                    <value_type>3</value_type>
                     <allowed_hosts/>
                     <units/>
                     <delta>0</delta>
@@ -1338,7 +1338,7 @@ last(&quot;docker.containers.running&quot;)</params>
                     <privatekey/>
                     <port/>
                     <filter>:</filter>
-                    <lifetime>2</lifetime>
+                    <lifetime>7</lifetime>
                     <description/>
                     <item_prototypes>
                         <item_prototype>
@@ -5531,6 +5531,24 @@ last(&quot;docker.containers.running&quot;)</params>
                             <description/>
                             <type>0</type>
                         </trigger_prototype>
+                        <trigger_prototype>
+                            <expression>{Template App Docker:docker.container.inspect.boolean[{#ZD_ID},State.OOMKilled].last(0)}=1</expression>
+                            <name>Docker Container {#ZD_NAME} ({#ZD_ID}) Out of memory (killed)</name>
+                            <url/>
+                            <status>0</status>
+                            <priority>3</priority>
+                            <description/>
+                            <type>0</type>
+                        </trigger_prototype>
+                        <trigger_prototype>
+                            <expression>{Template App Docker:docker.container.inspect.boolean[{#ZD_ID},State.Paused].last(0)}=1</expression>
+                            <name>Docker Container {#ZD_NAME} ({#ZD_ID}) Paused</name>
+                            <url/>
+                            <status>0</status>
+                            <priority>2</priority>
+                            <description/>
+                            <type>0</type>
+                        </trigger_prototype>
                     </trigger_prototypes>
                     <graph_prototypes>
                         <graph_prototype>

install.sh

@@ -4,7 +4,7 @@
 
 CONFIG_PATH=/etc/zabbix/zabbix_agentd.d/
 
-if [ "$#" -eq 1]; 
+if [ "$#" -eq 1 ]; 
 	then CONFIG_PATH=$1
 fi
 

userparameter_zabbixdocker.conf

@@ -17,6 +17,8 @@ UserParameter=docker.discovery, /usr/local/bin/zabbix-docker-discover.py
 
 UserParameter=docker.info[*], docker info | grep "$1" | cut -f2 -d: | cut -c2-
 
+UserParameter=docker.info.boolean[*], docker info | grep "$1" | cut -f2 -d: | cut -c2- | grep -i true | wc -l
+
 UserParameter=docker.info.convert[*], docker info | grep "$1" | cut -f2 -d: | cut -c2- | /usr/local/bin/zabbix-docker-convert.py
 
 UserParameter=docker.container.inspect[*], /usr/local/bin/zabbix-docker-inspect.py $1 $2

zabbix-docker-inspect.py

@@ -14,23 +14,35 @@
 #################################################################
 
 import sys
+import subprocess
+import os
+import time
+import json
 
 #################################################################
 # sys.argv[1] - the instanceID of the docker container
 # sys.argv[2] - the JSON value of the key to collect
 #################################################################
 
-import sys
-import subprocess
-import json
 
-# sys.argv[1] - container ID
-# sys.argv[2] - key value
+def local_run_command(cmd,file):
+	cmd = cmd + " | tee > " + file 
+	if os.path.isfile(file) == False:
+		os.system(cmd)
+	else:
+		(mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(file)
+		ticks=int(time.time())
+		delta=ticks-mtime
+		if (delta > 60):
+			os.system(cmd)
+
+	strings = open(file,"r").read()
+	return strings
 
 cmd="docker inspect " + sys.argv[1]
-string = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read()
+strings = local_run_command(cmd,"/tmp/zabbix-docker-inspect-"+sys.argv[1]+".out")
 
-parsed_json = json.loads(string)
+parsed_json = json.loads(strings)
 
 key_path = sys.argv[2].split('.')
 
@@ -40,4 +52,3 @@
 	ptr=ptr[key_path[i]]
 
 print ptr
-

zabbix-docker-stats.py

@@ -15,6 +15,8 @@
 
 import sys
 import subprocess
+import os
+import time
 
 def B(b):
 	return int(float(b))
@@ -84,11 +86,26 @@ def onet(data):
 	'onet':onet
 }
 
+def local_run_command(cmd,file):
+	cmd = cmd + " | tee > " + file 
+	if os.path.isfile(file) == False:
+		os.system(cmd)
+	else:
+		(mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(file)
+		ticks=int(time.time())
+		delta=ticks-mtime
+		if (delta > 60):
+			os.system(cmd)
+
+	strings = open(file,"r").readlines()
+	return strings
+
+
 container=sys.argv[1]
 key=sys.argv[2]
 
 cmd="docker stats --no-stream=true " + container
-strings = subprocess.Popen(cmd,shell=True,stdout=subprocess.PIPE).stdout.readlines()
+strings = local_run_command(cmd,"/tmp/zabbix-docker-stats-"+container+".out")
 
 print options[key](strings[1])