diff --git a/zabbix-ansible/hosts b/zabbix-ansible/hosts index 0de4e8b..be191be 100644 --- a/zabbix-ansible/hosts +++ b/zabbix-ansible/hosts @@ -1,8 +1,8 @@ [server] -192.168.96.161 +192.168.96.144 [database] -192.168.96.161 +192.168.96.144 [zabbix-server:children] server @@ -14,4 +14,4 @@ dbPassword=123456 dbName=zabbix [agent] -192.168.96.161 Hostname=zabbix-agent \ No newline at end of file +192.168.96.144 Hostname=zabbix-agent diff --git a/zabbix-ansible/roles.yml b/zabbix-ansible/roles.yml index 806000d..6fa62c7 100644 --- a/zabbix-ansible/roles.yml +++ b/zabbix-ansible/roles.yml @@ -2,5 +2,4 @@ - hosts: server remote_user: root roles: - - mariadb - - zabbix-server + - zabbix-agentd diff --git a/zabbix-ansible/zabbix-agentd/tasks/main.yml b/zabbix-ansible/zabbix-agentd/tasks/main.yml index 17169b8..36bcf76 100644 --- a/zabbix-ansible/zabbix-agentd/tasks/main.yml +++ b/zabbix-ansible/zabbix-agentd/tasks/main.yml @@ -2,20 +2,20 @@ # tasks file for zabbix-agentd - name: copy repo - copy: src=zabbix-release-{{ zabbixServerLevel }}-1.el7.noarch.rpm dest=/etc/yum.repos.d + copy: src=zabbix-release-{{ zabbixServerLevel }}-1.el7.noarch.rpm dest=./ - name: install {{ ansible_ens33['ipv4']['address'] }} zabbix-agent yum repostory yum: name="zabbix-release-{{ zabbixServerLevel }}-1.el7.noarch.rpm" state=present disable_gpg_check=yes -- name: install {{ ansible_eth0['ipv4']['address'] }} zabbix-agent package +- name: install {{ ansible_ens33['ipv4']['address'] }} zabbix-agent package yum: name=zabbix-agent,zabbix-sender,net-tools,bc state=present - name: copy zabbix-agent {{ zabbixServerLevel }} config file - template: src=zabbix_agent.conf.j2 dest=/etc/zabbix/zabbix_agentd.conf backup=yes + template: src=zabbix_agentd.conf.j2 dest=/etc/zabbix/zabbix_agentd.conf backup=yes notify: restart service - name: copy child config file - copy: src=zabbix-agentd dest=/etc/zabbix + copy: src=zabbix_agentd.d dest=/etc/zabbix - name: start zabbix-agent - service: name=zabbix-agent state=started \ No newline at end of file + service: name=zabbix-agent state=started diff --git a/zabbix-ansible/zabbix-agentd/templates/zabbix-agentd.conf.j2 b/zabbix-ansible/zabbix-agentd/templates/zabbix-agentd.conf.j2 deleted file mode 100644 index d22544c..0000000 --- a/zabbix-ansible/zabbix-agentd/templates/zabbix-agentd.conf.j2 +++ /dev/null @@ -1,9 +0,0 @@ -{% if mode %} -Server={{ ServerIP }} #指明服务器是谁 -{% else %} -ServerActive={{ ServerIP }} #主动监控时的服务器 -Hostname={{ Hostname }} #自己能被server端识别的名称 -{% endif %} -ListenPort=10050 #自己监听的端口 -ListenIP=0.0.0.0 #自己监听的地址,0.0.0.0表示本机所有地址 -StartAgents=3 #优化时使用的 \ No newline at end of file diff --git a/zabbix-ansible/zabbix-agentd/templates/zabbix_agentd.conf.j2 b/zabbix-ansible/zabbix-agentd/templates/zabbix_agentd.conf.j2 new file mode 100644 index 0000000..d437918 --- /dev/null +++ b/zabbix-ansible/zabbix-agentd/templates/zabbix_agentd.conf.j2 @@ -0,0 +1,14 @@ +{% if mode %} +Server={{ ServerIP }} +{% else %} +ServerActive={{ ServerIP }} +Hostname={{ Hostname }} +{% endif %} +ListenPort=10050 +ListenIP=0.0.0.0 +StartAgents=3 +PidFile=/var/run/zabbix/zabbix_agentd.pid +LogFile=/var/log/zabbix/zabbix_agentd.log +LogFileSize=0 +Include=/etc/zabbix/zabbix_agentd.d/*.conf + diff --git a/zabbix-ansible/zabbix-agentd/vars/main.yml b/zabbix-ansible/zabbix-agentd/vars/main.yml index be3ea45..8f8abdb 100644 --- a/zabbix-ansible/zabbix-agentd/vars/main.yml +++ b/zabbix-ansible/zabbix-agentd/vars/main.yml @@ -2,6 +2,6 @@ # vars file for zabbix-agentd zabbixServerLevel: 5.0 -ServerIP: 192.168.96.161 +ServerIP: 192.168.96.144 # True 为被动模式,False为主动,主动模式需配置 hosts 文件中的主机名 -mode: True \ No newline at end of file +mode: True diff --git a/zabbix-ansible/zabbix-server/vars/main.yml b/zabbix-ansible/zabbix-server/vars/main.yml index 4c07d49..3c4a77e 100644 --- a/zabbix-ansible/zabbix-server/vars/main.yml +++ b/zabbix-ansible/zabbix-server/vars/main.yml @@ -1,4 +1,4 @@ --- # vars file for zabbix-server zabbixServerLevel: 5.0 -database: 192.168.96.161 \ No newline at end of file +database: 192.168.96.144