summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #616 from kwoodson/tmp3Kenny Woodson2015-09-251-9/+44
|\ \ \ \ \ \ \
| * | | | | | | Updates to zbx_user_mediaKenny Woodson2015-09-251-9/+44
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #612 from kwoodson/zbx_actionKenny Woodson2015-09-251-0/+538
|\ \ \ \ \ \ \
| * | | | | | | Initial stab at zabbix actionsKenny Woodson2015-09-251-0/+538
| |/ / / / / /
* | | | | | | Merge pull request #615 from openshift/dynamic_filesystemMatt Woodson2015-09-252-0/+46
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | added support for dynaic keys and items. added dynamic filesystems to zabbixMatt Woodson2015-09-252-0/+46
|/ / / / / /
* | | | | | Merge pull request #590 from dak1n1/s3Stefanie Forrester2015-09-242-0/+70
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | added dynamic inventory support for single-master clustersStefanie Forrester2015-09-242-11/+6
| * | | | | Added S3 docker-registry config scriptStefanie Forrester2015-09-232-0/+75
|/ / / / /
* | | | | Merge pull request #605 from kwoodson/tmp2Matt Woodson2015-09-222-4/+11
|\ \ \ \ \
| * | | | | Added descriptions and parameters required for associating prototypes to disc...Kenny Woodson2015-09-222-4/+11
|/ / / / /
* | | | | Merge pull request #603 from kwoodson/tmp1Matt Woodson2015-09-222-9/+5
|\ \ \ \ \
| * | | | | Fixed a bug and removed the need for template and discoveryruleKenny Woodson2015-09-222-9/+5
* | | | | | Merge pull request #602 from kwoodson/tmp1Matt Woodson2015-09-222-16/+76
|\| | | | | | |/ / / / |/| | | |
| * | | | Fixed a few bugs and added support for prototypes and discoveryrules.Kenny Woodson2015-09-222-16/+76
|/ / / /
* | | | Merge pull request #598 from mwoodson/cleanupMatt Woodson2015-09-211-4/+3
|\ \ \ \
| * | | | changed the docker cleanup to exclude certain registriesMatt Woodson2015-09-211-4/+3
|/ / / /
* | | | Merge pull request #597 from mwoodson/cleanupMatt Woodson2015-09-211-3/+4
|\ \ \ \
| * | | | commented out dangerous playbook option for cleanupMatt Woodson2015-09-211-3/+4
|/ / / /
* | | | Merge pull request #595 from sdodson/v106-changesBrenton Leanhardt2015-09-181-5/+1
|\ \ \ \
| * | | | Update origin paths for v1.0.6Scott Dodson2015-09-181-5/+1
| | |/ / | |/| |
* | | | Merge pull request #594 from mwoodson/docker_loopbackMatt Woodson2015-09-182-2/+78
|\ \ \ \
| * | | | added playbook for docker storage cleanupMatt Woodson2015-09-182-2/+78
* | | | | Merge pull request #593 from mwoodson/docker_loopbackMatt Woodson2015-09-181-2/+5
|\| | | |
| * | | | cleaned up some errors in loopback playbookMatt Woodson2015-09-181-2/+5
* | | | | Merge pull request #592 from mwoodson/docker_loopbackMatt Woodson2015-09-182-0/+143
|\| | | |
| * | | | added the docker loopback fixer scriptMatt Woodson2015-09-182-0/+143
|/ / / /
* | | | Merge pull request #588 from twiest/prThomas Wiest2015-09-173-0/+46
|\ \ \ \ | |/ / / |/| | |
| * | | Added zabbix item openshift.master.process.exist and trigger to watch it.Thomas Wiest2015-09-173-0/+46
|/ / /
* | | Merge pull request #569 from dak1n1/service_accountsStefanie Forrester2015-09-113-0/+39
|\ \ \
| * | | Create service accounts and set up scc rulesStefanie Forrester2015-09-103-0/+39
* | | | Merge pull request #577 from kwoodson/tmpMatt Woodson2015-09-112-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes for zbx apiKenny Woodson2015-09-112-4/+4
|/ / /
* | | Merge pull request #570 from sdodson/openshift_data_dirBrenton Leanhardt2015-09-104-4/+11
|\ \ \
| * | | Move openshift_data_dir to a fact based on deployment_typeScott Dodson2015-09-104-4/+11
* | | | Merge pull request #574 from openshift/mem_itemsMatt Woodson2015-09-104-57/+81
|\ \ \ \
| * | | | updated triggers and items to have better descriptions and multipliersMatt Woodson2015-09-104-57/+81
* | | | | Merge pull request #573 from kwoodson/triggerfixKenny Woodson2015-09-102-5/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adding capability to have descriptions on triggersKenny Woodson2015-09-102-5/+8
|/ / / /
* | | | Merge pull request #566 from kwoodson/item_fixMatt Woodson2015-09-103-2/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Adding desc, multiplier, and units to zabbix itemKenny Woodson2015-09-083-2/+40
* | | | Merge pull request #564 from jtslear/minor-errorWesley Hearn2015-09-091-1/+1
|\ \ \ \
| * | | | Fix a minor bug involving AWS ENV KeysJohn T Skarbek2015-09-051-1/+1
| | |/ / | |/| |
* | | | Merge pull request #567 from wshearn/update_master_sizeWesley Hearn2015-09-093-3/+3
|\ \ \ \
| * | | | Default masters to t2.medium instead of t2.smallWesley Hearn2015-09-093-3/+3
|/ / / /
* | | | Merge pull request #548 from sdodson/jenkins-renameWesley Hearn2015-09-084-11/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | Jenkins image was renamedScott Dodson2015-09-014-11/+21
* | | | Merge pull request #563 from sdodson/fix-recursive-loopBrenton Leanhardt2015-09-084-4/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Avoid a recursive loopScott Dodson2015-09-044-4/+4
|/ / /
* | | Merge pull request #558 from sdodson/version-pinningBrenton Leanhardt2015-09-048-6/+12
|\ \ \