212 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
root	707842be3b	Zabbix 3.2 for snmptraps image	2018-05-10 19:18:47 -07:00
root	0653f8390b	Merge from master	2018-05-10 19:11:24 -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	abc8504962	Merge pull request #296 from zabbix/master ... Updated README for RHEL	2018-05-09 15:59:46 +03:00
root	ed806983ea	Updated README for RHEL	2018-05-09 15:58:04 +03:00
Alexey Pustovalov	009a5e88f8	Merge pull request #293 from zabbix/master ... Fixed run command example for RHEL	2018-05-09 15:49:09 +03:00
root	f5710a91aa	Fixed run command example for RHEL	2018-05-09 15:46:49 +03:00
Alexey Pustovalov	f8d3a48920	Merge pull request #287 from zabbix/master ... Added Zabbix Appliance for RHEL 7	2018-05-09 00:26:59 +03:00
root	875950468a	Added Zabbix Appliance for RHEL 7	2018-05-09 00:25:00 +03:00
Alexey Pustovalov	7d929ebcf3	Merge pull request #273 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-31 00:09:55 +03:00
Alexey Pustovalov	3f36bae72e	Merge pull request #269 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-31 00:06:24 +03:00
Alexey Pustovalov	c4134d7687	Merge pull request #265 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-30 17:48:49 +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	7c7635c388	Fixed small issues. Preparation for Appliance	2018-03-30 02:58:25 -07:00
root	37df41f2f0	Fixed small issues. Preparation for Appliance	2018-03-30 02:04:04 -07:00
Alexey Pustovalov	beae98e524	Merge pull request #263 from zabbix/master ... Master	2018-03-30 16:50:45 +03: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	ad42d1a355	Merge pull request #258 from zabbix/master ... Fixed small issues. Preparation for Appliance	2018-03-29 16:54:08 +03:00
root	6e7a247564	Fixed small issues. Preparation for Appliance	2018-03-29 06:28:10 -07:00
root	41e45d405d	Merge remote-tracking branch 'origin/master' into 3.2	2018-02-23 13:49:05 -08:00
root	de98c6bbd8	Escpaing special characters	2018-02-23 13:43:00 -08:00
root	30ed00f5b0	Removed unused files	2018-02-23 01:46:37 -08:00
root	6a9d8dfbc7	Merge remote-tracking branch 'origin/master' into 3.2	2018-02-22 14:37:41 -08:00
root	6bde28aac3	Fix Apache on Ubuntu startup command	2018-02-22 14:37:03 -08:00
root	0685e09a30	Merge remote-tracking branch 'origin/master' into 3.2	2018-02-22 13:30:34 -08:00
root	20271e6592	Fixed issue with supervisord daemon on Nginx Ubuntu images	2018-02-22 13:29:41 -08:00
root	8f487259bb	Merge remote-tracking branch 'origin/master' into 3.2	2018-02-22 12:54:36 -08:00
root	e274af43ee	Fixed issue with missing https in apt	2018-02-22 12:53:52 -08:00
root	ac8647d1f3	Merge remote-tracking branch 'origin/master' into 3.2	2018-02-22 12:38:59 -08:00
root	2955fefc19	Fixed issue with missing iksemel package. It exists in EPEL only	2018-02-22 12:38:03 -08:00
Alexey Pustovalov	a2879cb448	Merge pull request #239 from zabbix/master ... Removed supervisord from single application images	2018-02-22 22:10:58 +02:00
root	6a382c3f34	Removed supervisord from single application images	2018-02-22 12:07:15 -08:00
Alexey Pustovalov	d0e79cbb24	Merge pull request #236 from zabbix/master ... Fixed issue in ubuntu image	2018-02-22 13:03:50 +02:00
root	cfcad63159	Fixed issue in ubuntu image	2018-02-22 03:02:43 -08:00
Alexey Pustovalov	82aaab3474	Merge pull request #230 from zabbix/master ... Fixed issue with config params undef	2018-02-21 03:02:06 +02:00
root	c79f2e0271	Fixed issue with config params undef	2018-02-20 08:23:18 -08:00
root	ff6a8681ed	Added v3 compose files	2018-02-20 06:42:18 -08:00
Alexey Pustovalov	7c50fc7899	Merge pull request #226 from zabbix/master ... Added v3 compose files	2018-02-21 01:01:11 +02:00
root	67ed377c68	Added v3 compose files	2018-02-20 06:22:27 -08:00
Alexey Pustovalov	8d407ae506	Merge pull request #222 from zabbix/master ... Fixed issue with web-nginx-mysql image	2018-02-19 13:06:47 +02:00
Alexey Pustovalov	acfc97ad92	Merge pull request #220 from zabbix/master ... Master	2018-02-19 12:16:16 +02:00
Alexey Pustovalov	3f23ee47fb	Merge pull request #213 from zabbix/master ... Master	2018-02-19 12:04:29 +02:00
root	5ccac3cdf4	Fixed issue with web-nginx-mysql image	2018-02-17 17:10:43 -08:00
root	1be4813733	Revert "Merge branch '3.4' into master" ... This reverts commit e3dd845396, reversing changes made to 461f869a4a.	2018-02-17 16:12:34 -08:00
Alexey Pustovalov	e3dd845396	Merge branch '3.4' into master	2018-02-19 12:05:02 +02:00
root	461f869a4a	Revert "Merge branch 'trunk' into master" ... This reverts commit b643fe4890, reversing changes made to 59f4e534f2.	2018-02-17 16:07:56 -08:00