From 71af1ba07ee8c07032e82b25e44a237895966a78 Mon Sep 17 00:00:00 2001
From: newrain <newrain_wang@126.com>
Date: Thu, 17 Jun 2021 22:04:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4bug=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                           |   2 +-
 zabbix_agentd.d/db.conf             |  12 +--
 zabbix_agentd.d/script/dbMonitor.sh |   4 +-
 zabbix_agentd.d/script/osMonitor.sh |   2 +-
 zbx_export_templates.xml            | 138 ++++++++++++++++++++++++++--
 5 files changed, 141 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 51a05de..f101290 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ zabbix 监控脚本
 #### 安装教程
 
 1.  自行百度zabbix安装方法，此脚本适用于>3.0zabbix版本
-
+2.  此脚本实验版本 5.0.12
 #### 使用说明
 
 1.  zabbix agent 监控脚本
diff --git a/zabbix_agentd.d/db.conf b/zabbix_agentd.d/db.conf
index 499acf5..079c10d 100644
--- a/zabbix_agentd.d/db.conf
+++ b/zabbix_agentd.d/db.conf
@@ -1,6 +1,6 @@
-UserParameter=dbcheck.heartbeat[*],sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh $1 heartbeat
-UserParameter=dbcheck.crud[*],sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh $1 crud $2
-UserParameter=dbcheck.twins[*],sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh $1 twins
-UserParameter=dbcheck.slowlog[*],sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh $1 slowlog
-UserParameter=dbcheck.config[*],sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh $1 config $2
-UserParameter=dbcheck.ruser[*],sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh $1 ruser
\ No newline at end of file
+UserParameter=dbcheck.heartbeat,sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh heartbeat
+UserParameter=dbcheck.crud[*],sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh crud $1
+UserParameter=dbcheck.twins,sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh twins
+UserParameter=dbcheck.slowlog,sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh slowlog
+UserParameter=dbcheck.config[*],sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh config $1 
+UserParameter=dbcheck.ruser,sh /etc/zabbix/zabbix_agentd.d/script/dbMonitor.sh ruser
\ No newline at end of file
diff --git a/zabbix_agentd.d/script/dbMonitor.sh b/zabbix_agentd.d/script/dbMonitor.sh
index 8ebadb9..f62ab17 100644
--- a/zabbix_agentd.d/script/dbMonitor.sh
+++ b/zabbix_agentd.d/script/dbMonitor.sh
@@ -3,7 +3,7 @@
 # os check
 # build 2021-06-16
 
-replPasswd=$1 # zabbix传参
+replPasswd=123456 # zabbix传参
 replUser=root
 cmdPath=/usr/bin/mysql
 slowLog=/var/log/mysql/slow.log
@@ -12,7 +12,7 @@ slowTmp=/tmp/.slowLog
 
 #1、数据库存活
 function Heartbeat() {
-	$cmdPath -u$replUser -p$replPasswd -e 'select user' &>/dev/null
+	$cmdPath -u$replUser -p$replPasswd -e 'select user()' &>/dev/null
 	echo $?
 }
 
diff --git a/zabbix_agentd.d/script/osMonitor.sh b/zabbix_agentd.d/script/osMonitor.sh
index 63807a5..99d43f4 100644
--- a/zabbix_agentd.d/script/osMonitor.sh
+++ b/zabbix_agentd.d/script/osMonitor.sh
@@ -103,7 +103,7 @@ function services() {
         echo $s
         ;;
     service)
-        s=$(systemctl list-unit-files|grep enabled)
+        s=$(systemctl list-unit-files|grep enabled | wc -l)
         echo $s
         ;;
     esac
diff --git a/zbx_export_templates.xml b/zbx_export_templates.xml
index 2e3ba6e..af3c921 100644
--- a/zbx_export_templates.xml
+++ b/zbx_export_templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>5.0</version>
-    <date>2021-06-17T16:44:53Z</date>
+    <date>2021-06-17T19:15:47Z</date>
     <groups>
         <group>
             <name>Zabbix servers</name>
@@ -25,6 +25,136 @@
                 </application>
             </applications>
             <items>
+                <item>
+                    <name>database mysql config memory</name>
+                    <key>dbcheck.config[&quot;innodb_buffer_pool_size&quot;]</key>
+                    <units>M</units>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                    <preprocessing>
+                        <step>
+                            <type>MULTIPLIER</type>
+                            <params>1048576</params>
+                        </step>
+                    </preprocessing>
+                </item>
+                <item>
+                    <name>database mysql config conns</name>
+                    <key>dbcheck.config[&quot;max_connections&quot;]</key>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql crud commit</name>
+                    <key>dbcheck.crud[commit]</key>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql crud delete</name>
+                    <key>dbcheck.crud[delete]</key>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql crud insert</name>
+                    <key>dbcheck.crud[insert]</key>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql crud qps</name>
+                    <key>dbcheck.crud[qps]</key>
+                    <value_type>FLOAT</value_type>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql crud rollback</name>
+                    <key>dbcheck.crud[rollback]</key>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql crud select</name>
+                    <key>dbcheck.crud[select]</key>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql crud tps</name>
+                    <key>dbcheck.crud[tps]</key>
+                    <value_type>FLOAT</value_type>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql crud update</name>
+                    <key>dbcheck.crud[update]</key>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql heartbeat</name>
+                    <key>dbcheck.heartbeat</key>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql ruser</name>
+                    <key>dbcheck.ruser</key>
+                    <trends>0</trends>
+                    <value_type>TEXT</value_type>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
+                <item>
+                    <name>database mysql slowlog</name>
+                    <key>dbcheck.slowlog</key>
+                    <trends>0</trends>
+                    <value_type>LOG</value_type>
+                    <applications>
+                        <application>
+                            <name>database monitor</name>
+                        </application>
+                    </applications>
+                </item>
                 <item>
                     <name>system port connect 22</name>
                     <key>systemcheck.connect[22]</key>
@@ -94,12 +224,6 @@
                             <name>system monitor</name>
                         </application>
                     </applications>
-                    <preprocessing>
-                        <step>
-                            <type>MULTIPLIER</type>
-                            <params>100</params>
-                        </step>
-                    </preprocessing>
                 </item>
                 <item>
                     <name>system file md5 check</name>