summaryrefslogtreecommitdiffstats
path: root/roles
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #677 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-082-24/+26
|\
| * moved vswitch from master to nodeSten Turpin2015-10-082-24/+26
* | Merge pull request #676 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-081-1/+1
|\|
| * fixed not equals syntaxSten Turpin2015-10-081-1/+1
* | Merge pull request #675 from stenwt/sturpin-2015-10-08-ovs-monitorSten Turpin2015-10-081-0/+22
|\|
| * added items + triggers for ovs testsSten Turpin2015-10-081-0/+22
* | Merge pull request #674 from kwoodson/zabagentKenny Woodson2015-10-083-0/+34
|\ \ | |/ |/|
| * Adding zabbix agent templateKenny Woodson2015-10-083-0/+34
* | fixed spacingSten Turpin2015-10-081-5/+5
* | added running podsSten Turpin2015-10-081-0/+6
* | Merge pull request #672 from kwoodson/zbxmediafixKenny Woodson2015-10-081-0/+3
|\ \
| * | Fixed user media bug where we would update media when we really wanted to cre...Kenny Woodson2015-10-081-0/+3
* | | removed static xvda checksMatt Woodson2015-10-081-32/+0
| |/ |/|
* | Merge pull request #633 from robotmaxtron/mwhittin-cluster-user-countThomas Wiest2015-10-081-0/+12
|\ \
| * | Changed trigger to only info alert if users is at 0Max Whittingham2015-10-051-1/+1
| * | Zabbix check and trigger for user countMax Whittingham2015-09-301-0/+12
* | | Fixed a bug where applicationids were not being filtered properlyKenny Woodson2015-10-071-3/+3
| |/ |/|
* | Zabbix server template addedKenny Woodson2015-10-073-0/+441
* | Merge pull request #660 from sdodson/updated-registry-factsBrenton Leanhardt2015-10-071-4/+4
|\ \
| * | Updated registry fact with latest deployment_type mappingsScott Dodson2015-10-061-4/+4
* | | Merge pull request #657 from liggitt/schedulerBrenton Leanhardt2015-10-061-0/+2
|\ \ \ | |/ / |/| |
| * | Add kind/apiVersion to scheduler.json templateJordan Liggitt2015-10-051-0/+2
* | | Merge pull request #653 from arsogukpinar/masterBrenton Leanhardt2015-10-061-2/+2
|\ \ \ | |/ / |/| |
| * | Fix for name conflictAli Sogukpinar2015-10-051-2/+2
* | | Revert "GCE support"Thomas Wiest2015-10-053-3/+3
|/ /
* | Merge pull request #641 from menren/gce-supportThomas Wiest2015-10-053-3/+3
|\ \
| * | openshift master public api url defaults to None, it will get its default val...Chengcheng Mu2015-10-021-1/+1
| * | Removed some application specific code like insecure registries, heat templateChengcheng Mu2015-10-012-15/+0
| * | GCE-support (more information in PR, README_GCE.md)Chengcheng Mu2015-10-014-4/+19
* | | added Template Ops ToolsThomas Wiest2015-10-024-5/+38
* | | openshift_facts.py: Correct error case for uninstalled systemsSamuel Munilla2015-10-021-0/+2
* | | openshift_facts.py: Ansible fact for openshift versionSamuel Munilla2015-10-011-0/+14
* | | added 'missingok' to logrotate and disabled fluentd in onlineStefanie Forrester2015-10-011-2/+1
* | | Adding trggers for cpu idleKenny Woodson2015-10-011-0/+15
|/ /
* | Adding % to unitsKenny Woodson2015-09-301-0/+8
* | Updating these to the correct typeKenny Woodson2015-09-301-8/+8
* | Merge pull request #582 from sdodson/upgradesBrenton Leanhardt2015-09-308-8/+14
|\ \
| * | UpgradesScott Dodson2015-09-238-8/+14
* | | added pylint as a package to ansible-towerMatt Woodson2015-09-291-2/+1
* | | Added some debug when zbxapi has an issueKenny Woodson2015-09-281-0/+4
* | | Merge pull request #625 from kwoodson/triggerprotoKenny Woodson2015-09-284-1/+216
|\ \ \
| * | | Trigger prototype supportKenny Woodson2015-09-284-1/+216
| | |/ | |/|
* / | Only continue to merge facts if both old and new values are type dict.Andrew Butcher2015-09-281-1/+1
|/ /
* | 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
| |/ /
* / / added support for dynaic keys and items. added dynamic filesystems to zabbixMatt Woodson2015-09-252-0/+46
|/ /
* | Added descriptions and parameters required for associating prototypes to disc...Kenny Woodson2015-09-222-4/+11
* | Fixed a bug and removed the need for template and discoveryruleKenny Woodson2015-09-222-9/+5