提交

zabbix-ansible/1_roles_database.yml

@@ -0,0 +1,5 @@
+---
+- hosts: database
+  remote_user: root
+  roles:
+  - mariadb

zabbix-ansible/2_role_server.yml

@@ -0,0 +1,5 @@
+---
+- hosts: server
+  remote_user: root
+  roles:
+  - zabbix-server

zabbix-ansible/3_role_agent.yml

@@ -0,0 +1,5 @@
+---
+- hosts: agent
+  remote_user: root
+  roles:
+  - zabbix-agentd

zabbix-ansible/hosts

@@ -1,22 +1,29 @@
 [server]
-192.168.96.168
+192.168.96.172
 
 [database]
-192.168.96.168
+192.168.96.172
 
 [zabbix-server:children]
 server
 database
 
 [zabbix-server:vars]
-dbHost=192.168.96.168
+dbHost=192.168.96.172
 dbUser=remote
 dbPassword=123456
 dbName=zabbix
+# 微信报警脚本配置
+corpid='wwa1dc8236066ba123'
+agentid=1000005
+secret_wechat='CRzsnYigkQy_9qoHErXG94am81AUuXabY0A8-N7L456'
+# 钉钉报警脚本配置
+secret_dingding='SECf3aa0ec68151d6a0599d8d9db4fa40afa5341c358d53af717eb924f0fa29e789'
 
 [agent]
-192.168.96.168 Hostname=zabbix-agent 
-192.168.96.169 Hostname=zabbix-agent
+192.168.96.172 Hostname=zabbix-agent 
+192.168.96.173 Hostname=zabbix-agent1
+192.168.96.174 Hostname=zabbix-agent2
 
 [agent:vars]
-serverHost=192.168.96.168
+serverHost=192.168.96.172

zabbix-ansible/zabbix-agentd/files/zabbix_agentd.d/script/dbMonitor.sh

@@ -61,7 +61,8 @@ function SlowLog() {
 	else
 		echo -n $newLines >$slowTmp
 	fi
-	if [ $(du -s $slowLog | awk '{print $1}') -ge 2000 ]; then
+	size=$(du -s $slowLog | awk '{print $1}')
+	if [ "$size" -ge 2000 ]; then
 		cat $slowLog >/var/log/mysql/slow${datetime}.log && echo -n >$slowLog && echo -n 0 >$slowTmp
 	fi
 }

zabbix-ansible/zabbix-server/templates/dingding.py

@@ -14,7 +14,7 @@ import time,hmac,base64,hashlib,urllib.parse
 headers = {'Content-Type': 'application/json;charset=utf-8'}
 # 需要修改，钉钉群助手中获取
 timestamp = str(round(time.time() * 1000))
-secret = {{ secret }}
+secret = {{ secret_dingding }}
 secret_enc = secret.encode('utf-8')
 string_to_sign = '{}\n{}'.format(timestamp, secret)
 string_to_sign_enc = string_to_sign.encode('utf-8')

zabbix-ansible/zabbix-server/templates/wechat3.py

@@ -18,7 +18,7 @@ CorpID = {{ corpid }}
 Agentid = {{ agentid }}
 
 # 认证信息，企业ID+认证信息可获取tokent，获取之后向此tokent发送内容
-Secret = {{ secret }}
+Secret = {{ secret_wechat }}
 
 localtime = time.strftime("[%H:%M:%S]", time.localtime())
 class Tencent(object):

zabbix-ansible/zabbix-server/vars/main.yml

@@ -1,13 +1,4 @@
 ---
 # vars file for zabbix-server
 zabbixServerLevel: 5.0
-database: "{{ dbHost }}"
-
-
-# 微信报警脚本配置
-corpid: 'wwa1dc8236066bab50'
-agentid: 1000005
-secret: 'CRzsnYigkQy_9qoHErXG94am81AUuXabY0A8-N7LW_4'
-
-# 钉钉报警脚本配置
-secret: 'SECf3aa0ec68151d6a0599d8d9db4fa40afa5341c358d53af717eb924f0fa29ee5f'
+database: "{{ dbHost }}"