summaryrefslogtreecommitdiffstats
path: root/.flake8
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-02 16:08:15 -0800
committerGitHub <noreply@github.com>2018-01-02 16:08:15 -0800
commitb1be9cd5d7573dc9d18ca27915bb383f8591117b (patch)
treefa76d72a4ecf648056dfedc6c68cb5f315341409 /.flake8
parent8119a5c87a1560c2f607c06f30383133cc7137e5 (diff)
parent8cb27ae800df71ee816852df56cd2c861a0f0a0a (diff)
downloadopenshift-b1be9cd5d7573dc9d18ca27915bb383f8591117b.tar.gz
openshift-b1be9cd5d7573dc9d18ca27915bb383f8591117b.tar.bz2
openshift-b1be9cd5d7573dc9d18ca27915bb383f8591117b.tar.xz
openshift-b1be9cd5d7573dc9d18ca27915bb383f8591117b.zip
Merge pull request #5894 from ewolinetz/logging_defaults_from_existing
Automatic merge from submit-queue. Update logging to use existing cluster deployment for defaults This will allow us to use logging facts to set defaults of specific configurations such as ES index replicas and shard count. The update to logging facts yields us output like: ```json "elasticsearch": { "clusterrolebindings": {}, "configmaps": { "logging-elasticsearch": { "elasticsearch.yml": { "cloud": { "kubernetes": { "namespace": "${NAMESPACE}", "pod_label": "${POD_LABEL}", "pod_port": 9300 } }, "cluster": { "name": "${CLUSTER_NAME}" }, "discovery": { "type": "kubernetes", "zen.minimum_master_nodes": "${NODE_QUORUM}", "zen.ping.multicast.enabled": false }, "gateway": { "expected_nodes": "${RECOVER_EXPECTED_NODES}", "recover_after_nodes": "${NODE_QUORUM}", "recover_after_time": "${RECOVER_AFTER_TIME}" }, "index": { "number_of_replicas": 0, "number_of_shards": 1, "translog": { "flush_threshold_period": "5m", "flush_threshold_size": "256mb" }, "unassigned.node_left.delayed_timeout": "2m" }, "io.fabric8.elasticsearch.authentication.users": [ "system.logging.kibana", "system.logging.fluentd", "system.logging.curator", "system.admin" ], ``` TODO: - [x] Update logging facts to pull out settings from config maps - [x] Move `openshift_sanitize_inventory/library/conditional_set_fact.py` up to repo level - [x] Generate diffs against currently deployed configs and correctly patch in custom changes from customers - [x] Use `conditional_set_fact` to easily set defaults for logging based on logging facts, or falling back to role defaults when not specified in the inventory - [x] Update all components to follow patching configmaps
Diffstat (limited to '.flake8')
0 files changed, 0 insertions, 0 deletions