898 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
root	4355caab21	Added Elasticsearch feature	2018-06-01 02:02:20 -07:00
root	e5b94d728b	Merge remote-tracking branch 'origin/master' into trunk	2018-05-31 20:37:14 -07:00
root	b93945f128	Fixed system.users.num item key	2018-05-31 20:35:53 -07:00
root	0a8d38b8ac	Merge remote-tracking branch 'origin/master' into trunk	2018-05-31 20:09:12 -07:00
root	8b5cf58ce8	Updated all Dockerfiles to make consistency	2018-05-31 20:08:56 -07:00
root	a01674e016	Fixed '[' character escaping	2018-05-31 20:06:05 -07:00
root	f06c11f91a	Updated all Dockerfiles to make consistency	2018-05-31 19:02:46 -07:00
root	112890eadd	Updated all Dockerfiles to make consistency	2018-05-31 18:44:12 -07:00
root	53ff586760	Updated all Dockerfiles to make consistency	2018-05-31 00:50:32 -07:00
root	73859060cc	Fixed Apache image on Alpine. Also using PHP7	2018-05-30 00:57:30 -07:00
root	124242cf92	Fixed Apache image on Alpine. Also using PHP7	2018-05-29 22:44:48 -07:00
root	9aa8e0362b	Fixed Apache image on Alpine. Also using PHP7	2018-05-29 22:36:35 -07:00
root	0e102226fe	Fixed Apache image on Alpine. Also using PHP7	2018-05-29 22:07:59 -07:00
root	ce16b08f92	Fixed Apache image on Alpine. Also using PHP7	2018-05-29 20:49:05 -07:00
root	85a78b6743	Fixed Apache image on Alpine. Also using PHP7	2018-05-29 20:48:47 -07:00
root	795218279e	Fixed missing ldap on Zabbix agent (ubuntu) image	2018-05-29 07:14:30 -07:00
root	04b3fe2060	Zabbix Appliance multistage images	2018-05-29 05:23:20 -07:00
root	a3fb960b3e	Using multistage dockerfile for centos-based images + Zabbix agent images	2018-05-28 23:58:42 -07:00
root	c8cbf57114	Using multistage dockerfile for Zabbix agent (alpine) image	2018-05-28 13:19:36 -07:00
root	5fae1b3437	Fixed CentOS images building	2018-05-26 06:50:04 -07:00
root	32e02d831f	Fixed CentOS images building	2018-05-26 03:58:52 -07:00
Alexey Pustovalov	143d565927	Merge pull request #312 from zabbix/master ... Fixed php-fpm7 on Alpine images	2018-05-24 15:32:54 +08:00
root	046251b853	Fixed php-fpm7 on Alpine images	2018-05-24 00:31:46 -07:00
Alexey Pustovalov	bc48e4fe40	Merge pull request #307 from zabbix/master ... Fixed php-fpm7 on Alpine images	2018-05-11 23:55:29 +03:00
root	ddd519ce0b	Fixed php-fpm7 on Alpine images	2018-05-11 13:33:38 -07:00
Alexey Pustovalov	e9867a0d11	Merge pull request #303 from zabbix/master ... Fixed php-fpm7 on Alpine images	2018-05-11 23:22:47 +03:00
root	278be78a91	Fixed php-fpm7 on Alpine images	2018-05-11 13:00:31 -07:00
root	56e2b2eeff	Zabbix trunk for snmptraps image	2018-05-10 17:03:31 -07:00
root	9cbee91a1c	Merge master	2018-05-10 16:38:07 -07:00
root	c3e713a323	Updated Zabbix compose files to support Zabbix snmptraps based on different images (Alpine, CentOS)	2018-05-10 13:47:09 -07:00
root	b04d073fd6	Updated Zabbix snmptraps image description	2018-05-10 13:38:17 -07:00
root	26b9a39092	Some images bumped to Alpine 3.7 version. Added Alpine and CentOS snmptraps image	2018-05-10 13:30:42 -07:00
Alexey Pustovalov	51dfb8125c	Merge pull request #297 from zabbix/master ... Updated README for RHEL	2018-05-09 15:59:59 +03:00
root	ed806983ea	Updated README for RHEL	2018-05-09 15:58:04 +03:00
Alexey Pustovalov	b2c3b0270a	Merge pull request #291 from zabbix/master ... Fixed run command example for RHEL	2018-05-09 15:48:33 +03:00
root	f5710a91aa	Fixed run command example for RHEL	2018-05-09 15:46:49 +03:00
Alexey Pustovalov	dceefc8fcf	Merge pull request #288 from zabbix/master ... Added Zabbix Appliance for RHEL 7	2018-05-09 00:27:24 +03:00
root	875950468a	Added Zabbix Appliance for RHEL 7	2018-05-09 00:25:00 +03:00
root	15ffcfc51e	Fixed font config for trunk web-interface	2018-04-12 01:28:04 +03:00
Alexey Pustovalov	73c67df695	Merge pull request #274 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-31 00:10:14 +03:00
Alexey Pustovalov	c4937b52fd	Merge pull request #270 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-31 00:06:48 +03:00
root	849138440e	Fixed small issues. Preparation for Appliance	2018-03-30 06:19:06 -07:00
root	f4aa02c0b9	Fixed small issues. Preparation for Appliance	2018-03-30 06:15:14 -07:00
root	7bedb58dce	Fixed small issues. Preparation for Appliance	2018-03-30 05:37:54 -07:00
root	305b77fe7f	Fixed small issues. Preparation for Appliance	2018-03-30 05:36:16 -07:00
root	7c7635c388	Fixed small issues. Preparation for Appliance	2018-03-30 02:58:25 -07:00
root	2f8752ac1c	Fixed small issues. Preparation for Appliance	2018-03-30 01:36:04 -07:00
root	fb6866403c	Fixed small issues. Preparation for Appliance	2018-03-29 07:21:02 -07:00
Alexey Pustovalov	f6e90789a9	Merge pull request #260 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-29 16:54:52 +03:00
root	6e7a247564	Fixed small issues. Preparation for Appliance	2018-03-29 06:28:10 -07:00