paulbsd/paulbsd-salt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated zabbix state

Browse Source
This commit is contained in:
Paul 2021-08-16 09:59:37 +02:00
parent a74185cc6a
commit 19cf4d8523
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
states/zabbix/agent/config.sls
View File

@ -3,8 +3,8 @@
zabbix_config_dir: zabbix_config_dir:
file.directory: file.directory:
- name: /etc/zabbix - name: /etc/zabbix
- user: root - user: {{ zabbix.agent.user }}
- group: root - group: {{ zabbix.agent.user }}
- mode: 755 - mode: 755
- watch_in: - watch_in:
- service: zabbix_agent_service - service: zabbix_agent_service
@ -12,8 +12,8 @@ zabbix_config_dir:
zabbix_log_dir: zabbix_log_dir:
file.directory: file.directory:
- name: /var/log/zabbix - name: /var/log/zabbix
- user: zabbix - user: {{ zabbix.agent.user }}
- group: zabbix - group: {{ zabbix.agent.user }}
- mode: 755 - mode: 755
- watch_in: - watch_in:
- service: zabbix_agent_service - service: zabbix_agent_service
@ -21,8 +21,8 @@ zabbix_log_dir:
zabbix_agent_config_dir: zabbix_agent_config_dir:
file.directory: file.directory:
- name: /etc/zabbix/zabbix_agentd.conf.d - name: /etc/zabbix/zabbix_agentd.conf.d
- user: root - user: {{ zabbix.agent.user }}
- group: root - group: {{ zabbix.agent.user }}
- mode: 755 - mode: 755
- watch_in: - watch_in:
- service: zabbix_agent_service - service: zabbix_agent_service
@ -30,6 +30,8 @@ zabbix_agent_config_dir:
zabbix_agent_config: zabbix_agent_config:
file.managed: file.managed:
- name: /etc/zabbix/zabbix_agentd.conf - name: /etc/zabbix/zabbix_agentd.conf
- user: {{ zabbix.agent.user }}
- group: {{ zabbix.agent.user }}
- source: salt://zabbix/templates/zabbix_agentd.conf.j2 - source: salt://zabbix/templates/zabbix_agentd.conf.j2
- template: jinja - template: jinja
- watch_in: - watch_in:
@ -39,6 +41,8 @@ zabbix_agent_config:
zabbix_agent_tlspsk_file: zabbix_agent_tlspsk_file:
file.managed: file.managed:
- name: {{ zabbix.agent.config.TLSPSKFile }} - name: {{ zabbix.agent.config.TLSPSKFile }}
- user: {{ zabbix.agent.user }}
- group: {{ zabbix.agent.user }}
- contents: {{ zabbix.agent.psk }} - contents: {{ zabbix.agent.psk }}
- create: true - create: true
- watch_in: - watch_in:
@ -49,8 +53,8 @@ zabbix_userparameters:
file.managed: file.managed:
- name: /etc/zabbix/zabbix_agentd.conf.d/user_parameters.conf - name: /etc/zabbix/zabbix_agentd.conf.d/user_parameters.conf
- source: salt://zabbix/templates/user_parameters.j2 - source: salt://zabbix/templates/user_parameters.j2
- user: root - user: {{ zabbix.agent.user }}
- group: root - group: {{ zabbix.agent.user }}
- mode: 0755 - mode: 0755
- template: jinja - template: jinja
- watch_in: - watch_in:

6
states/zabbix/agent/scripts.sls
View File

@ -3,13 +3,15 @@
zabbix_script_dir: zabbix_script_dir:
file.directory: file.directory:
- name: /etc/zabbix/scripts - name: /etc/zabbix/scripts
- user: {{ zabbix.agent.user }}
- group: {{ zabbix.agent.group }}
{%- for key, value in zabbix.agent.scripts.items() %} {%- for key, value in zabbix.agent.scripts.items() %}
zabbix_script_{{ key }}: zabbix_script_{{ key }}:
file.managed: file.managed:
- name: /etc/zabbix/scripts/{{ value.name }} - name: /etc/zabbix/scripts/{{ value.name }}
- source: salt://zabbix/scripts/{{ value.name }} - source: salt://zabbix/scripts/{{ value.name }}
- user: zabbix - user: {{ zabbix.agent.user }}
- group: zabbix - group: {{ zabbix.agent.group }}
- mode: 0755 - mode: 0755
{%- endfor %} {%- endfor %}

4
states/zabbix/defaults.yaml
View File

@ -2,6 +2,8 @@
zabbix: zabbix:
server: server:
enabled: false enabled: false
user: zabbix
group: zabbix
pkgs: pkgs:
- zabbix-frontend-php - zabbix-frontend-php
- zabbix-server-pgsql - zabbix-server-pgsql
@ -15,6 +17,8 @@ zabbix:
PidFile: /run/zabbix/zabbix_server.pid PidFile: /run/zabbix/zabbix_server.pid
agent: agent:
enabled: true enabled: true
user: zabbix
group: zabbix
pkgs: pkgs:
- python3-pyzabbix - python3-pyzabbix
- zabbix-agent - zabbix-agent

2
states/zabbix/server/config.sls
View File

@ -4,4 +4,6 @@ zabbix_server_config:
file.managed: file.managed:
- name: /etc/zabbix/zabbix_server.conf - name: /etc/zabbix/zabbix_server.conf
- source: salt://zabbix/templates/zabbix_server.conf.j2 - source: salt://zabbix/templates/zabbix_server.conf.j2
- user: {{ zabbix.server.user }}
- group: {{ zabbix.server.group }}
- template: jinja - template: jinja