summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Jenkins image was renamedScott Dodson2015-09-014-11/+21
* Merge pull request #546 from kwoodson/appfixMatt Woodson2015-09-014-65/+93
|\
| * Fix for zbx applicationsKenny Woodson2015-09-014-65/+93
|/
* Merge pull request #543 from mwoodson/triggersMatt Woodson2015-08-311-0/+25
|\
| * added monitoring triggersMatt Woodson2015-08-311-0/+8
| * added triggers for disk spaceMatt Woodson2015-08-311-0/+17
|/
* Merge pull request #541 from kwoodson/master_templKenny Woodson2015-08-312-0/+20
|\
| * Adding create appKenny Woodson2015-08-312-0/+20
* | Merge pull request #530 from sdodson/fix-hosts-fileBrenton Leanhardt2015-08-311-2/+4
|\ \ | |/ |/|
| * Make masters schedulable in byo exampleScott Dodson2015-08-311-2/+4
* | Merge pull request #539 from twiest/prKenny Woodson2015-08-3112-129/+133
|\ \ | |/ |/|
| * added docker zabbix template, removed unused / old templates so they don't co...Thomas Wiest2015-08-3112-129/+133
|/
* Merge pull request #533 from mwoodson/masterMatt Woodson2015-08-281-17/+2
|\
| * added filesys.fullMatt Woodson2015-08-281-17/+2
|/
* Merge pull request #512 from sdodson/nextWesley Hearn2015-08-2834-136/+208
|\
| * Atomic Enterprise related changes.Avesh Agarwal2015-08-2634-136/+208
* | Merge pull request #525 from cgwalters/tutorial-reset-no-imagesBrenton Leanhardt2015-08-281-0/+7
|\ \
| * | adhoc/tutorial_reset: Also delete etcd and dataColin Walters2015-08-271-0/+4
| * | adhoc/tutorial_reset: Don't error out if there are no Docker imagesColin Walters2015-08-271-0/+3
* | | Merge pull request #527 from spinolacastro/metrics_fixWesley Hearn2015-08-281-2/+1
|\ \ \ | |/ / |/| |
| * | Fix testsDiego Castro (dscastro)2015-08-281-1/+0
| * | Make cluster_metrics disabled by defaultDiego Castro (dscastro)2015-08-281-1/+1
* | | Merge pull request #524 from kwoodson/zbxfixKenny Woodson2015-08-2711-22/+22
|\ \ \
| * | | Fixed env var defaults.Kenny Woodson2015-08-2711-22/+22
* | | | Merge pull request #523 from mwoodson/hbMatt Woodson2015-08-271-1/+1
|\ \ \ \
| * | | | update heartbeat checkMatt Woodson2015-08-271-1/+1
|/ / / /
* | | | Merge pull request #518 from tdawson/201508logrotateTroy Dawson2015-08-2712-0/+166
|\ \ \ \ | |/ / / |/| | |
| * | | Add a role that allows logrotate config editing.Troy Dawson2015-08-2712-0/+166
* | | | Merge pull request #520 from kwoodson/zbxupdatesKenny Woodson2015-08-2740-527/+836
|\ \ \ \
| * | | | Updates for zbx ans moduleKenny Woodson2015-08-2740-527/+836
* | | | | Merge pull request #519 from spinolacastro/fix_broken_testsWesley Hearn2015-08-271-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix name was too longDiego Castro2015-08-271-2/+2
| | |/ / | |/| |
| * | | Merge remote-tracking branch 'openshift/master'Diego Castro2015-08-2744-230/+935
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #517 from openshift/revert-513-zbxupdatesWesley Hearn2015-08-2738-682/+334
|\ \ \ \
| * | | | Revert "Zabbix API updates"Kenny Woodson2015-08-2738-682/+334
|/ / / /
* | | | Merge pull request #513 from kwoodson/zbxupdatesWesley Hearn2015-08-2738-334/+682
|\ \ \ \
| * | | | Updates for zbx ans moduleKenny Woodson2015-08-2738-334/+682
| | |/ / | |/| |
* | | | Merge pull request #459 from spinolacastro/fluentdWesley Hearn2015-08-272-0/+4
|\ \ \ \
| * | | | Remove extra space.Diego Castro (dscastro)2015-08-261-1/+1
| * | | | Revert Fluentd FactsDiego Castro2015-08-141-1/+2
| * | | | Configure FluentdDiego Castro2015-08-123-2/+5
* | | | | Merge pull request #516 from detiber/docker_registry_fixWesley Hearn2015-08-271-11/+13
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Bugfix for extra --add-registry in docker configJason DeTiberus2015-08-261-11/+13
|/ / / /
* | | | Merge pull request #509 from lhuard1A/configure_docker_registriesWesley Hearn2015-08-262-0/+45
|\ \ \ \
| * | | | Add options to configure docker registriesLénaïc Huard2015-08-262-0/+45
* | | | | Merge pull request #483 from lhuard1A/issue_471Wesley Hearn2015-08-265-79/+43
|\ \ \ \ \
| * | | | | Properly pass the "external network" option to the HEAT templateLénaïc Huard2015-08-175-79/+43
* | | | | | Merge pull request #498 from sdodson/bz1248376Wesley Hearn2015-08-2620-140/+540
|\ \ \ \ \ \
| * | | | | | Add jenkins image stream and quickstartScott Dodson2015-08-265-20/+357
| * | | | | | Update latest openshift examplesScott Dodson2015-08-2015-120/+183
| | |_|_|/ / | |/| | | |