Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 2 | -2/+8 |
|\ \ | | | | | | | 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 | 2 | -2/+8 |
| |/ | |||||
* | | Merge pull request #550 from twiest/pr | Thomas Wiest | 2015-09-02 | 1 | -2/+2 |
|\ \ | |/ |/| | relaxed the docker metadata triggers to be more in line with what docker-storage-setup allocates for metadata. | ||||
| * | 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. | ||||
* | Merge pull request #546 from kwoodson/appfix | Matt Woodson | 2015-09-01 | 4 | -65/+93 |
|\ | | | | | Application fixes for zabbix | ||||
| * | Fix for zbx applications | Kenny Woodson | 2015-09-01 | 4 | -65/+93 |
|/ | |||||
* | Merge pull request #543 from mwoodson/triggers | Matt Woodson | 2015-08-31 | 1 | -0/+25 |
|\ | | | | | added triggers | ||||
| * | added monitoring triggers | Matt Woodson | 2015-08-31 | 1 | -0/+8 |
| | | |||||
| * | added triggers for disk space | Matt Woodson | 2015-08-31 | 1 | -0/+17 |
|/ | |||||
* | Merge pull request #541 from kwoodson/master_templ | Kenny Woodson | 2015-08-31 | 2 | -0/+20 |
|\ | | | | | app create in master template | ||||
| * | Adding create app | Kenny Woodson | 2015-08-31 | 2 | -0/+20 |
| | | |||||
* | | Merge pull request #530 from sdodson/fix-hosts-file | Brenton Leanhardt | 2015-08-31 | 1 | -2/+4 |
|\ \ | |/ |/| | Make all nodes schedulable by default in byo example inventory | ||||
| * | Make masters schedulable in byo example | Scott Dodson | 2015-08-31 | 1 | -2/+4 |
| | | | | | | | | ... but note why you wouldn't want them to be | ||||
* | | Merge pull request #539 from twiest/pr | Kenny Woodson | 2015-08-31 | 12 | -129/+133 |
|\ \ | |/ |/| | added docker zabbix template, removed unused / old templates so they don't confuse other people. | ||||
| * | added docker zabbix template, removed unused / old templates so they don't ↵ | Thomas Wiest | 2015-08-31 | 12 | -129/+133 |
|/ | | | | confuse other people. | ||||
* | Merge pull request #533 from mwoodson/master | Matt Woodson | 2015-08-28 | 1 | -17/+2 |
|\ | | | | | added disk monitoring | ||||
| * | added filesys.full | Matt Woodson | 2015-08-28 | 1 | -17/+2 |
|/ | |||||
* | Merge pull request #512 from sdodson/next | Wesley Hearn | 2015-08-28 | 34 | -136/+208 |
|\ | | | | | Merge in Atomic Enterprise work into master | ||||
| * | Atomic Enterprise related changes. | Avesh Agarwal | 2015-08-26 | 34 | -136/+208 |
| | | |||||
* | | Merge pull request #525 from cgwalters/tutorial-reset-no-images | Brenton Leanhardt | 2015-08-28 | 1 | -0/+7 |
|\ \ | | | | | | | adhoc/tutorial_reset: Cleanup the cleanup | ||||
| * | | adhoc/tutorial_reset: Also delete etcd and data | Colin Walters | 2015-08-27 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | I needed this because I forgot to override openshift_hostname, and it found the wrong hostname, which then leaked into etcd certs, which caused the master to fail to start. | ||||
| * | | adhoc/tutorial_reset: Don't error out if there are no Docker images | Colin Walters | 2015-08-27 | 1 | -0/+3 |
| | | | | | | | | | | | | I'd like this playbook to always work. | ||||
* | | | Merge pull request #527 from spinolacastro/metrics_fix | Wesley Hearn | 2015-08-28 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | Make cluster_metrics disabled by default | ||||
| * | | Fix tests | Diego Castro (dscastro) | 2015-08-28 | 1 | -1/+0 |
| | | | |||||
| * | | Make cluster_metrics disabled by default | Diego Castro (dscastro) | 2015-08-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #524 from kwoodson/zbxfix | Kenny Woodson | 2015-08-27 | 11 | -22/+22 |
|\ \ \ | | | | | | | | | Updating zabbix for env vars. | ||||
| * | | | Fixed env var defaults. | Kenny Woodson | 2015-08-27 | 11 | -22/+22 |
| | | | | |||||
* | | | | Merge pull request #523 from mwoodson/hb | Matt Woodson | 2015-08-27 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | update heartbeat check | ||||
| * | | | | update heartbeat check | Matt Woodson | 2015-08-27 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #518 from tdawson/201508logrotate | Troy Dawson | 2015-08-27 | 12 | -0/+166 |
|\ \ \ \ | |/ / / |/| | | | Update syslog logrotate to compress and rotate daily | ||||
| * | | | Add a role that allows logrotate config editing. | Troy Dawson | 2015-08-27 | 12 | -0/+166 |
| | | | | | | | | | | | | | | | | | | | | This role gets called for each type of machine, but if logrotate_scripts is not set, nothing happens. | ||||
* | | | | Merge pull request #520 from kwoodson/zbxupdates | Kenny Woodson | 2015-08-27 | 40 | -527/+836 |
|\ \ \ \ | | | | | | | | | | | Updating zabbix ansible module. | ||||
| * | | | | Updates for zbx ans module | Kenny Woodson | 2015-08-27 | 40 | -527/+836 |
| | | | | | |||||
* | | | | | Merge pull request #519 from spinolacastro/fix_broken_tests | Wesley Hearn | 2015-08-27 | 1 | -2/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix broken tests | ||||
| * | | | | Fix name was too long | Diego Castro | 2015-08-27 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
| * | | | Merge remote-tracking branch 'openshift/master' | Diego Castro | 2015-08-27 | 44 | -230/+935 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #517 from openshift/revert-513-zbxupdates | Wesley Hearn | 2015-08-27 | 38 | -682/+334 |
|\ \ \ \ | | | | | | | | | | | Revert "Zabbix API updates" | ||||
| * | | | | Revert "Zabbix API updates" | Kenny Woodson | 2015-08-27 | 38 | -682/+334 |
|/ / / / | |||||
* | | | | Merge pull request #513 from kwoodson/zbxupdates | Wesley Hearn | 2015-08-27 | 38 | -334/+682 |
|\ \ \ \ | | | | | | | | | | | Zabbix API updates | ||||
| * | | | | Updates for zbx ans module | Kenny Woodson | 2015-08-27 | 38 | -334/+682 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #459 from spinolacastro/fluentd | Wesley Hearn | 2015-08-27 | 2 | -0/+4 |
|\ \ \ \ | | | | | | | | | | | Configure Fluentd | ||||
| * | | | | Remove extra space. | Diego Castro (dscastro) | 2015-08-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Revert Fluentd Facts | Diego Castro | 2015-08-14 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Configure Fluentd | Diego Castro | 2015-08-12 | 3 | -2/+5 |
| | | | | | |||||
* | | | | | Merge pull request #516 from detiber/docker_registry_fix | Wesley Hearn | 2015-08-27 | 1 | -11/+13 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Bugfix for extra --add-registry in docker config | ||||
| * | | | | Bugfix for extra --add-registry in docker config | Jason DeTiberus | 2015-08-26 | 1 | -11/+13 |
|/ / / / | |||||
* | | | | Merge pull request #509 from lhuard1A/configure_docker_registries | Wesley Hearn | 2015-08-26 | 2 | -0/+45 |
|\ \ \ \ | | | | | | | | | | | Add options to configure docker registries |