| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #626 from kwoodson/quick | Matt Woodson | 2015-09-28 | 1 | -0/+4 |
| |\ | | | | | Error handling added | ||||
| | * | 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 |
| | | | |||||
| * | | Merge pull request #624 from abutcher/merge-facts | Brenton Leanhardt | 2015-09-28 | 1 | -1/+1 |
| |\ \ | | | | | | | Avoid attribute error in merge facts | ||||
| | * | | 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 #613 from jaryn/patch-1 | Brenton Leanhardt | 2015-09-28 | 1 | -1/+6 |
| |\ \ | |/ |/| | Fix bullets in libvirt readme | ||||
| | * | Fix bullets in libvirt readme | Jaroslav Henner | 2015-09-25 | 1 | -1/+6 |
| | | | |||||
| * | | 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 |
| | |/ / | |||||
| * | | | Merge pull request #615 from openshift/dynamic_filesystem | Matt Woodson | 2015-09-25 | 2 | -0/+46 |
| |\ \ \ | |_|/ |/| | | added support for dynamic keys and items | ||||
| | * | | added support for dynaic keys and items. added dynamic filesystems to zabbix | Matt Woodson | 2015-09-25 | 2 | -0/+46 |
| |/ / | |||||
| * | | Merge pull request #590 from dak1n1/s3 | Stefanie Forrester | 2015-09-24 | 2 | -0/+70 |
| |\ \ | |/ |/| | Added S3 docker-registry config script | ||||
| | * | added dynamic inventory support for single-master clusters | Stefanie Forrester | 2015-09-24 | 2 | -11/+6 |
| | | | |||||
| | * | Added S3 docker-registry config script | Stefanie Forrester | 2015-09-23 | 2 | -0/+75 |
| |/ | |||||
| * | Merge pull request #605 from kwoodson/tmp2 | Matt Woodson | 2015-09-22 | 2 | -4/+11 |
| |\ | | | | | Adding support for prototypes and discoveryrules | ||||
| | * | Added descriptions and parameters required for associating prototypes to ↵ | Kenny Woodson | 2015-09-22 | 2 | -4/+11 |
| |/ | | | | discovery rules. | ||||
| * | Merge pull request #603 from kwoodson/tmp1 | Matt Woodson | 2015-09-22 | 2 | -9/+5 |
| |\ | | | | | Adding support for prototypes and discoveryrules | ||||
| | * | Fixed a bug and removed the need for template and discoveryrule | Kenny Woodson | 2015-09-22 | 2 | -9/+5 |
| | | | |||||
| * | | Merge pull request #602 from kwoodson/tmp1 | Matt Woodson | 2015-09-22 | 2 | -16/+76 |
| |\| | | | | | Adding support for prototypes and discoveryrules | ||||
| | * | Fixed a few bugs and added support for prototypes and discoveryrules. | Kenny Woodson | 2015-09-22 | 2 | -16/+76 |
| |/ | |||||
| * | Merge pull request #598 from mwoodson/cleanup | Matt Woodson | 2015-09-21 | 1 | -4/+3 |
| |\ | | | | | made docker cleanup exclude certain regitries | ||||
| | * | changed the docker cleanup to exclude certain registries | Matt Woodson | 2015-09-21 | 1 | -4/+3 |
| |/ | |||||
| * | Merge pull request #597 from mwoodson/cleanup | Matt Woodson | 2015-09-21 | 1 | -3/+4 |
| |\ | | | | | removed dangerous docker cleanup option | ||||
| | * | commented out dangerous playbook option for cleanup | Matt Woodson | 2015-09-21 | 1 | -3/+4 |
| |/ | |||||
| * | Merge pull request #595 from sdodson/v106-changes | Brenton Leanhardt | 2015-09-18 | 1 | -5/+1 |
| |\ | | | | | Update origin paths for v1.0.6 | ||||
| | * | Update origin paths for v1.0.6 | Scott Dodson | 2015-09-18 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | Origin now uses /etc/origin and /var/lib/origin as of v1.0.6. The RPMs will create a symlinks from /etc/origin to /etc/openshift and /var/lib/origin to /var/lib/openshift if the openshift directories exist. However on clean installs /etc/openshift won't exist. | ||||
| * | | Merge pull request #594 from mwoodson/docker_loopback | Matt Woodson | 2015-09-18 | 2 | -2/+78 |
| |\ \ | | | | | | | added docker_storage_cleanup playbook | ||||
| | * | | added playbook for docker storage cleanup | Matt Woodson | 2015-09-18 | 2 | -2/+78 |
| | | | | |||||
| * | | | Merge pull request #593 from mwoodson/docker_loopback | Matt Woodson | 2015-09-18 | 1 | -2/+5 |
| |\| | | | | | | | | cleaned up some errors in loopback playbook | ||||
| | * | | cleaned up some errors in loopback playbook | Matt Woodson | 2015-09-18 | 1 | -2/+5 |
| | | | | |||||
| * | | | Merge pull request #592 from mwoodson/docker_loopback | Matt Woodson | 2015-09-18 | 2 | -0/+143 |
| |\| | | | | | | | | added loopback fixer playbook | ||||
| | * | | added the docker loopback fixer script | Matt Woodson | 2015-09-18 | 2 | -0/+143 |
| |/ / | |||||
| * | | Merge pull request #588 from twiest/pr | Thomas Wiest | 2015-09-17 | 3 | -0/+46 |
| |\ \ | |/ |/| | Added zabbix item openshift.master.process.exist and trigger to watch it. | ||||
| | * | Added zabbix item openshift.master.process.exist and trigger to watch it. | Thomas Wiest | 2015-09-17 | 3 | -0/+46 |
| |/ | |||||
| * | Merge pull request #569 from dak1n1/service_accounts | Stefanie Forrester | 2015-09-11 | 3 | -0/+39 |
| |\ | | | | | Set up service accounts for router and registry | ||||
| | * | Create service accounts and set up scc rules | Stefanie Forrester | 2015-09-10 | 3 | -0/+39 |
| | | | |||||
| * | | Merge pull request #577 from kwoodson/tmp | Matt Woodson | 2015-09-11 | 2 | -4/+4 |
| |\ \ | |/ |/| | Fixing a few zbx api issues to make idempotency work. | ||||
| | * | Fixes for zbx api | Kenny Woodson | 2015-09-11 | 2 | -4/+4 |
| |/ | |||||
| * | Merge pull request #570 from sdodson/openshift_data_dir | Brenton Leanhardt | 2015-09-10 | 4 | -4/+11 |
| |\ | | | | | Move openshift_data_dir to openshift.common.data_dir fact based on deployment_type | ||||
| | * | Move openshift_data_dir to a fact based on deployment_type | Scott Dodson | 2015-09-10 | 4 | -4/+11 |
| | | | | | | | | | | | | | Previously this was being set to /var/lib/origin regardless of deployment_type which isn't correct given that existing 'enterprise' and 'online' deployments would have been deployed with /var/lib/openshift | ||||
| * | | Merge pull request #574 from openshift/mem_items | Matt Woodson | 2015-09-10 | 4 | -57/+81 |
| |\ \ | | | | | | | added more support for zabbix | ||||
| | * | | updated triggers and items to have better descriptions and multipliers | Matt Woodson | 2015-09-10 | 4 | -57/+81 |
| | | | | |||||
| * | | | Merge pull request #573 from kwoodson/triggerfix | Kenny Woodson | 2015-09-10 | 2 | -5/+8 |
| |\ \ \ | |/ / |/| | | Adding support for triggers to have descriptions. | ||||
| | * | | Adding capability to have descriptions on triggers | Kenny Woodson | 2015-09-10 | 2 | -5/+8 |
| |/ / | |||||
| * | | Merge pull request #566 from kwoodson/item_fix | Matt Woodson | 2015-09-10 | 3 | -2/+40 |
| |\ \ | |/ |/| | Adding desc, units, and multiplier functionality to zabbix items. | ||||
| | * | Adding desc, multiplier, and units to zabbix item | Kenny Woodson | 2015-09-08 | 3 | -2/+40 |
| | | | |||||
| * | | Merge pull request #564 from jtslear/minor-error | Wesley Hearn | 2015-09-09 | 1 | -1/+1 |
| |\ \ | | | | | | | Fix a minor bug involving AWS ENV Keys | ||||
 |
index : csa/devops/ansible-patches/openshift.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |