diff --git a/zabbix/defaults.yaml b/zabbix/defaults.yaml index 4e553c88..7fdc84af 100644 --- a/zabbix/defaults.yaml +++ b/zabbix/defaults.yaml @@ -2,7 +2,7 @@ # vim: ft=yaml --- zabbix: - version_repo: 2.2 + version_repo: 5.0 user: zabbix group: zabbix home: /var/lib/zabbix @@ -24,7 +24,7 @@ zabbix: - /etc/zabbix/zabbix_agentd.d/ server: pkgs: - - zabbix-server-mysql + - zabbix-server-pgsql - zabbix-get service: zabbix-server config: /etc/zabbix/zabbix_server.conf @@ -36,18 +36,17 @@ zabbix: dbname: zabbix dbuser: zabbix dbpassword: zabbix - dbsocket: /var/run/mysqld/mysqld.sock + dbsocket: "" timeout: '4' alertscriptspath: /usr/lib/zabbix/alertscripts externalscripts: /usr/lib/zabbix/externalscripts fpinglocation: /usr/bin/fping fping6location: /usr/bin/fping6 - logslowqueries: '3000' frontend: pkgs: - zabbix-web-mysql config: /etc/zabbix/web/zabbix.conf.php - dbtype: MYSQL + dbtype: POSTGRESQL dbhost: localhost dbname: zabbix dbuser: zabbix diff --git a/zabbix/osfamilymap.yaml b/zabbix/osfamilymap.yaml index 039408ca..4f8260da 100644 --- a/zabbix/osfamilymap.yaml +++ b/zabbix/osfamilymap.yaml @@ -124,6 +124,47 @@ RedHat: pkgs: - MySQL-python +Suse: + version_repo: 5.0 + user: zabbix + group: zabbix + shell: /sbin/nologin + agent: + pkgs: + - zabbix-agent + service: zabbix-agent + config: /etc/zabbix/zabbix_agentd.conf + pidfile: /var/run/zabbix/zabbix_agentd.pid + logfile: /var/log/zabbix/zabbix_agentd.log + includes: + - /etc/zabbix/zabbix_agentd.d/*.conf + server: + pkgs: + - zabbix-server-pgsql + service: zabbix-server + config: /etc/zabbix/zabbix_server.conf + dbsocket: /var/lib/mysql/mysql.sock + pidfile: /var/run/zabbix/zabbix_server.pid + logfile: /var/log/zabbix/zabbix_server.log + snmptrapperfile: /var/log/snmptrap/snmptrap.log + fpinglocation: /usr/sbin/fping + fping6location: /usr/sbin/fping + frontend: + pkgs: + - zabbix-web-pgsql + config: /etc/zabbix/web/zabbix.conf.php + proxy: + pkgs: + - zabbix-proxy-sqlite3 + service: zabbix-proxy + config: /etc/zabbix/zabbix_proxy.conf + dbname: /var/lib/zabbix/zabbix_proxy.db + pidfile: /var/run/zabbix/zabbix_proxy.pid + logfile: /var/log/zabbix/zabbix_proxy.log + mysql: + pkgs: + - MySQL-python + FreeBSD: version_repo: 2.2 user: zabbix diff --git a/zabbix/osfingermap.yaml b/zabbix/osfingermap.yaml index 090e844b..15bba58e 100644 --- a/zabbix/osfingermap.yaml +++ b/zabbix/osfingermap.yaml @@ -34,6 +34,8 @@ Amazon Linux AMI-2018: {} # os: SUSE Leap-15: {} +SLES-15: {} +SLES-12: {} # os: FreeBSD FreeBSD-12: {} diff --git a/zabbix/repo.sls b/zabbix/repo.sls index 7c5eeef2..5050c99f 100644 --- a/zabbix/repo.sls +++ b/zabbix/repo.sls @@ -53,6 +53,16 @@ - gpgcheck: 1 - gpgkey: https://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-79EA5ED4 +{%- elif salt['grains.get']('os_family') == 'Suse' %} +zabbix_repo: + pkgrepo.managed: + - name: zabbix + - humanname: "Zabbix Official Repository" + - baseurl: https://repo.zabbix.com/zabbix/{{ zabbix.version_repo }}/sles/{{ grains['osmajorrelease'] }}/x86_64/ + - gpgcheck: 1 + - gpgkey: https://repo.zabbix.com/zabbix/{{ zabbix.version_repo }}/sles/{{ grains['osmajorrelease'] }}/x86_64/repodata/repomd.xml.key + - gpgautoimport: True + {%- else %} {{ id_prefix }}_repo: {} {%- endif %}