253 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
root	612089c69f	Merge remote-tracking branch 'origin/master' into 3.0	2018-06-01 02:07:06 -07:00
root	c8a86b92ee	Added Elasticsearch feature	2018-06-01 02:05:57 -07:00
root	6f4625a0bb	Merge remote-tracking branch 'origin/master' into 3.0	2018-05-31 20:36:16 -07:00
root	b93945f128	Fixed system.users.num item key	2018-05-31 20:35:53 -07:00
root	8d61d23972	Merge remote-tracking branch 'origin/master' into 3.0	2018-05-31 20:10:20 -07:00
root	a01674e016	Fixed '[' character escaping	2018-05-31 20:06:05 -07:00
root	cf963c7a03	Merge remote-tracking branch 'origin/master' into 3.0	2018-05-31 18:44:48 -07:00
root	112890eadd	Updated all Dockerfiles to make consistency	2018-05-31 18:44:12 -07:00
root	b7439bd28d	Updated all Dockerfiles to make consistency	2018-05-31 02:20:14 -07:00
root	53ff586760	Updated all Dockerfiles to make consistency	2018-05-31 00:50:32 -07:00
root	257c77eb7b	Merge remote-tracking branch 'origin/master' into 3.0	2018-05-29 22:36:54 -07:00
root	9aa8e0362b	Fixed Apache image on Alpine. Also using PHP7	2018-05-29 22:36:35 -07:00
root	72ed2881f5	Merge remote-tracking branch 'origin/master' into 3.0	2018-05-29 22:08:22 -07:00
root	0e102226fe	Fixed Apache image on Alpine. Also using PHP7	2018-05-29 22:07:59 -07:00
root	ba274f7451	Merge remote-tracking branch 'origin/master' into 3.0	2018-05-29 20:49:57 -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	57a6a5de32	Merge remote-tracking branch 'origin/master' into 3.0	2018-05-29 07:15:05 -07:00
root	795218279e	Fixed missing ldap on Zabbix agent (ubuntu) image	2018-05-29 07:14:30 -07:00
root	9cd74330d4	Zabbix Appliance multistage images	2018-05-29 05:28:28 -07:00
root	04b3fe2060	Zabbix Appliance multistage images	2018-05-29 05:23:20 -07:00
root	5defcccf52	Using multistage dockerfile for Zabbix agent (alpine) image	2018-05-28 20:48:13 -07:00
root	c8cbf57114	Using multistage dockerfile for Zabbix agent (alpine) image	2018-05-28 13:19:36 -07:00
Alexey Pustovalov	beaeeb0638	Merge pull request #313 from zabbix/master ... Fixed CentOS images building	2018-05-28 15:35:47 +09:00
root	5fae1b3437	Fixed CentOS images building	2018-05-26 06:50:04 -07:00
root	e7afdd9bf8	Fixed CentOS images building	2018-05-26 06:48:52 -07:00
root	32e02d831f	Fixed CentOS images building	2018-05-26 03:58:52 -07:00
Alexey Pustovalov	465f2957e5	Merge pull request #309 from zabbix/master ... Fixed php-fpm7 on Alpine images	2018-05-24 15:32:12 +08:00
root	046251b853	Fixed php-fpm7 on Alpine images	2018-05-24 00:31:46 -07:00
Alexey Pustovalov	36e16d463c	Merge pull request #305 from zabbix/master ... Fixed php-fpm7 on Alpine images	2018-05-11 23:54:58 +03:00
root	ddd519ce0b	Fixed php-fpm7 on Alpine images	2018-05-11 13:33:38 -07:00
Alexey Pustovalov	b2c3ed6705	Merge pull request #301 from zabbix/master ... Fixed php-fpm7 on Alpine images	2018-05-11 23:22:13 +03:00
root	278be78a91	Fixed php-fpm7 on Alpine images	2018-05-11 13:00:31 -07:00
root	5cec9cca9b	Zabbix 3.0.17	2018-05-10 17:02:20 -07:00
root	e080cc3e0d	Merge master	2018-05-10 17:01:14 -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	b47a70e3ad	Merge pull request #295 from zabbix/master ... Updated README for RHEL	2018-05-09 15:59:31 +03:00
root	ed806983ea	Updated README for RHEL	2018-05-09 15:58:04 +03:00
Alexey Pustovalov	807913b15c	Merge pull request #292 from zabbix/master ... Fixed run command example for RHEL	2018-05-09 15:48:50 +03:00
root	f5710a91aa	Fixed run command example for RHEL	2018-05-09 15:46:49 +03:00
Alexey Pustovalov	a6cec31912	Merge pull request #286 from zabbix/master ... Added Zabbix Appliance for RHEL 7	2018-05-09 00:26:40 +03:00
root	875950468a	Added Zabbix Appliance for RHEL 7	2018-05-09 00:25:00 +03:00
root	f8675ee603	Zabbix v3.0.16	2018-04-06 07:55:54 -07:00
Alexey Pustovalov	c0ecf3e38d	Merge pull request #272 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-31 00:09:38 +03:00
Alexey Pustovalov	a7a45ad4ee	Merge pull request #267 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-31 00:05:52 +03:00
Alexey Pustovalov	fc0cce07ef	Merge pull request #264 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-30 17:48:31 +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