Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Fixed a few bugs and added support for prototypes and discoveryrules. | Kenny Woodson | 2015-09-22 | 2 | -16/+76 |
| | |||||
* | 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. | ||||
* | | 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 | 2 | -0/+30 |
|\ | | | | | Set up service accounts for router and registry | ||||
| * | Create service accounts and set up scc rules | Stefanie Forrester | 2015-09-10 | 2 | -0/+30 |
| | | |||||
* | | 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 |
| | | | |||||
* | | | 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 #548 from sdodson/jenkins-rename | Wesley Hearn | 2015-09-08 | 4 | -11/+21 |
|\ \ | |/ |/| | Jenkins image was renamed | ||||
| * | Jenkins image was renamed | Scott Dodson | 2015-09-01 | 4 | -11/+21 |
| | | |||||
* | | Avoid a recursive loop | Scott Dodson | 2015-09-04 | 3 | -3/+3 |
| | | |||||
* | | Merge pull request #558 from sdodson/version-pinning | Brenton Leanhardt | 2015-09-04 | 7 | -6/+9 |
|\ \ | | | | | | | Add openshift_version to set RPM versions | ||||
| * | | Add openshift_version to set RPM versions | Scott Dodson | 2015-09-03 | 7 | -6/+9 |
| | | | | | | | | | | | | Mostly necessary for debugging / testing upgrade paths | ||||
* | | | Merge pull request #562 from mwoodson/triggers | Matt Woodson | 2015-09-04 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | added mem.util.available | ||||
| * | | | added mem.util.available | Matt Woodson | 2015-09-04 | 1 | -0/+5 |
| | | | | |||||
* | | | | Merge pull request #555 from umairmufti/issue-554 | Wesley Hearn | 2015-09-04 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Fix to ensure use_openshift_sdn is a boolean value. | ||||
| * | | | | Fix to ensure use_openshift_sdn is a boolean value. | Umair Mufti | 2015-09-03 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Adding url to triggers | Marek Mahut | 2015-09-04 | 3 | -0/+13 |
| | | | | | |||||
* | | | | | Added trigger url | Kenny Woodson | 2015-09-03 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #556 from mwoodson/triggers | Matt Woodson | 2015-09-03 | 1 | -0/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | heartbeat sop url | ||||
| * | | | | added url to the heartbeat check | Matt Woodson | 2015-09-03 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Merge pull request #557 from kwoodson/triggerurl | Matt Woodson | 2015-09-03 | 1 | -2/+16 |
|\ \ \ \ | |/ / / |/| | | | Added support for trigger urls | ||||
| * | | | Adding url support for triggers | Kenny Woodson | 2015-09-03 | 1 | -2/+16 |
| |/ / | |||||
* / / | added new node fact for schedulability | Stefanie Forrester | 2015-09-02 | 3 | -8/+23 |
|/ / | |||||
* | | Merge pull request #544 from sdodson/serviceNetworkCIDR | Brenton Leanhardt | 2015-09-02 | 4 | -1/+13 |
|\ \ | | | | | | | Add serviceNetworkCIDR and SDN MTU config | ||||
| * | | Add openshift_node_sdn_mtu configuration | Scott Dodson | 2015-09-02 | 3 | -1/+11 |
| | | | | | | | | | | | | | | | Sync's with Origin 1.0.6 and OSE 3.0.2 node-config.yaml networkConfig changes Fixes #534 | ||||
| * | | Add serviceNetworkCIDR to network config | Scott Dodson | 2015-09-02 | 1 | -0/+2 |
| |/ | | | | | | | Required by OSE 3.0.2 and Origin 1.0.6 | ||||
* | | Merge pull request #505 from dak1n1/waitfor_etcd | Stefanie Forrester | 2015-09-02 | 1 | -2/+7 |
|\ \ | | | | | | | wait for ports instead of waiting for an arbitrary period of time | ||||
| * | | wait for ports instead of waiting for an arbitrary period of time | Stefanie Forrester | 2015-09-02 | 1 | -2/+7 |
| |/ | |||||
* / | relaxed the docker metadata triggers to be more in line with what ↵ | Thomas Wiest | 2015-09-02 | 1 | -2/+2 |
|/ | | | | docker-storage-setup allocates for metadata. | ||||
* | Fix for zbx applications | Kenny Woodson | 2015-09-01 | 4 | -65/+93 |
| | |||||
* | added monitoring triggers | Matt Woodson | 2015-08-31 | 1 | -0/+8 |
| | |||||
* | added triggers for disk space | Matt Woodson | 2015-08-31 | 1 | -0/+17 |
| | |||||
* | Adding create app | Kenny Woodson | 2015-08-31 | 2 | -0/+20 |
| |