Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #677 from stenwt/sturpin-2015-10-08-ovs-monitor | Sten Turpin | 2015-10-08 | 2 | -24/+26 |
|\ | | | | | moved vswitch from master to node | ||||
| * | moved vswitch from master to node | Sten Turpin | 2015-10-08 | 2 | -24/+26 |
| | | |||||
* | | Merge pull request #676 from stenwt/sturpin-2015-10-08-ovs-monitor | Sten Turpin | 2015-10-08 | 1 | -1/+1 |
|\| | | | | | fixed not equals syntax | ||||
| * | fixed not equals syntax | Sten Turpin | 2015-10-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #675 from stenwt/sturpin-2015-10-08-ovs-monitor | Sten Turpin | 2015-10-08 | 1 | -0/+22 |
|\| | | | | | added items + triggers for ovs tests | ||||
| * | added items + triggers for ovs tests | Sten Turpin | 2015-10-08 | 1 | -0/+22 |
| | | |||||
* | | Merge pull request #674 from kwoodson/zabagent | Kenny Woodson | 2015-10-08 | 3 | -0/+34 |
|\ \ | |/ |/| | Adding zabbix agent template to config management | ||||
| * | Adding zabbix agent template | Kenny Woodson | 2015-10-08 | 3 | -0/+34 |
| | | |||||
* | | fixed spacing | Sten Turpin | 2015-10-08 | 1 | -5/+5 |
| | | |||||
* | | added running pods | Sten Turpin | 2015-10-08 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #672 from kwoodson/zbxmediafix | Kenny Woodson | 2015-10-08 | 1 | -0/+3 |
|\ \ | | | | | | | Fixed a bug where we are updating where we should be creating. | ||||
| * | | Fixed user media bug where we would update media when we really wanted to ↵ | Kenny Woodson | 2015-10-08 | 1 | -0/+3 |
| | | | | | | | | | | | | create. | ||||
* | | | removed static xvda checks | Matt Woodson | 2015-10-08 | 1 | -32/+0 |
| |/ |/| | |||||
* | | Merge pull request #633 from robotmaxtron/mwhittin-cluster-user-count | Thomas Wiest | 2015-10-08 | 1 | -0/+12 |
|\ \ | | | | | | | Zabbix check and trigger for user count | ||||
| * | | Changed trigger to only info alert if users is at 0 | Max Whittingham | 2015-10-05 | 1 | -1/+1 |
| | | | |||||
| * | | Zabbix check and trigger for user count | Max Whittingham | 2015-09-30 | 1 | -0/+12 |
| | | | |||||
* | | | Fixed a bug where applicationids were not being filtered properly | Kenny Woodson | 2015-10-07 | 1 | -3/+3 |
| |/ |/| | |||||
* | | Zabbix server template added | Kenny Woodson | 2015-10-07 | 3 | -0/+441 |
| | | |||||
* | | Merge pull request #660 from sdodson/updated-registry-facts | Brenton Leanhardt | 2015-10-07 | 1 | -4/+4 |
|\ \ | | | | | | | Updated registry fact with latest deployment_type mappings | ||||
| * | | Updated registry fact with latest deployment_type mappings | Scott Dodson | 2015-10-06 | 1 | -4/+4 |
| | | | |||||
* | | | Merge pull request #657 from liggitt/scheduler | Brenton Leanhardt | 2015-10-06 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Add kind/apiVersion to scheduler.json template | ||||
| * | | Add kind/apiVersion to scheduler.json template | Jordan Liggitt | 2015-10-05 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #653 from arsogukpinar/master | Brenton Leanhardt | 2015-10-06 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Fix for name conflict | ||||
| * | | Fix for name conflict | Ali Sogukpinar | 2015-10-05 | 1 | -2/+2 |
| | | | | | | | | | Template name is conflicting with the template name from 'eap6-basic-sti.json' . | ||||
* | | | Revert "GCE support" | Thomas Wiest | 2015-10-05 | 3 | -3/+3 |
|/ / | |||||
* | | Merge pull request #641 from menren/gce-support | Thomas Wiest | 2015-10-05 | 3 | -3/+3 |
|\ \ | | | | | | | GCE support | ||||
| * | | openshift master public api url defaults to None, it will get its default ↵ | Chengcheng Mu | 2015-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | value in openshift_facts commented infra-node code until it's solved | ||||
| * | | Removed some application specific code like insecure registries, heat template | Chengcheng Mu | 2015-10-01 | 2 | -15/+0 |
| | | | |||||
| * | | GCE-support (more information in PR, README_GCE.md) | Chengcheng Mu | 2015-10-01 | 4 | -4/+19 |
| | | | |||||
* | | | added Template Ops Tools | Thomas Wiest | 2015-10-02 | 4 | -5/+38 |
| | | | |||||
* | | | openshift_facts.py: Correct error case for uninstalled systems | Samuel Munilla | 2015-10-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | This adds a default value to the version to cover the case where the user doesn't have /usr/bin/openshift on the system, correcting the bug found in PR #646. | ||||
* | | | openshift_facts.py: Ansible fact for openshift version | Samuel Munilla | 2015-10-01 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | This added some logic to add a new the version of openshift rpm-based installations. This fact is intentionally not cached to account for users potenially updating versions outside of ansible playbooks. | ||||
* | | | added 'missingok' to logrotate and disabled fluentd in online | Stefanie Forrester | 2015-10-01 | 1 | -2/+1 |
| | | | |||||
* | | | Adding trggers for cpu idle | Kenny Woodson | 2015-10-01 | 1 | -0/+15 |
|/ / | |||||
* | | Adding % to units | Kenny Woodson | 2015-09-30 | 1 | -0/+8 |
| | | |||||
* | | Updating these to the correct type | Kenny Woodson | 2015-09-30 | 1 | -8/+8 |
| | | |||||
* | | Merge pull request #582 from sdodson/upgrades | Brenton Leanhardt | 2015-09-30 | 8 | -8/+14 |
|\ \ | | | | | | | Upgrade playbook | ||||
| * | | Upgrades | Scott Dodson | 2015-09-23 | 8 | -8/+14 |
| | | | |||||
* | | | added pylint as a package to ansible-tower | Matt Woodson | 2015-09-29 | 1 | -2/+1 |
| | | | |||||
* | | | Added some debug when zbxapi has an issue | Kenny Woodson | 2015-09-28 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #625 from kwoodson/triggerproto | Kenny Woodson | 2015-09-28 | 4 | -1/+216 |
|\ \ \ | | | | | | | | | Adding trigger prototype support | ||||
| * | | | Trigger prototype support | Kenny Woodson | 2015-09-28 | 4 | -1/+216 |
| | |/ | |/| | |||||
* / | | Only continue to merge facts if both old and new values are type dict. | Andrew Butcher | 2015-09-28 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #616 from kwoodson/tmp3 | Kenny Woodson | 2015-09-25 | 1 | -9/+44 |
|\ \ | | | | | | | Required updates to zabbix user media | ||||
| * | | Updates to zbx_user_media | Kenny Woodson | 2015-09-25 | 1 | -9/+44 |
| | | | |||||
* | | | Merge pull request #612 from kwoodson/zbx_action | Kenny Woodson | 2015-09-25 | 1 | -0/+538 |
|\ \ \ | | | | | | | | | First attempt at a ansible zabbix action class | ||||
| * | | | Initial stab at zabbix actions | Kenny Woodson | 2015-09-25 | 1 | -0/+538 |
| |/ / | |||||
* / / | added support for dynaic keys and items. added dynamic filesystems to zabbix | Matt Woodson | 2015-09-25 | 2 | -0/+46 |
|/ / | |||||
* | | Added descriptions and parameters required for associating prototypes to ↵ | Kenny Woodson | 2015-09-22 | 2 | -4/+11 |
| | | | | | | | | discovery rules. | ||||
* | | Fixed a bug and removed the need for template and discoveryrule | Kenny Woodson | 2015-09-22 | 2 | -9/+5 |
| | |