diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-05-22 14:11:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-22 14:11:31 -0500 |
| commit | 2a575a6240ff624e45628d9848194d1fecb28ff4 (patch) | |
| tree | e491451531ebeb76d5fcf1916abcdca0fc56951a /roles/openshift_logging_kibana | |
| parent | 7426996929fe298f4da0b238e38d91fb929b5112 (diff) | |
| parent | 2740dff958cb3c619ca508d83edb3b351f83c31d (diff) | |
| download | openshift-2a575a6240ff624e45628d9848194d1fecb28ff4.tar.gz openshift-2a575a6240ff624e45628d9848194d1fecb28ff4.tar.bz2 openshift-2a575a6240ff624e45628d9848194d1fecb28ff4.tar.xz openshift-2a575a6240ff624e45628d9848194d1fecb28ff4.zip | |
Merge pull request #25 from stevekuznetsov/skuznets/scale-first
Add Kibana readiness probe, stop using `oc scale` for cluster start
Diffstat (limited to 'roles/openshift_logging_kibana')
| -rw-r--r-- | roles/openshift_logging_kibana/tasks/main.yaml | 10 | ||||
| -rw-r--r-- | roles/openshift_logging_kibana/templates/kibana.j2 | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml index 3bc903181..4444413e1 100644 --- a/roles/openshift_logging_kibana/tasks/main.yaml +++ b/roles/openshift_logging_kibana/tasks/main.yaml @@ -210,7 +210,7 @@ kibana_memory_limit: "{{ openshift_logging_kibana_memory_limit }}" kibana_proxy_cpu_limit: "{{ openshift_logging_kibana_proxy_cpu_limit }}" kibana_proxy_memory_limit: "{{ openshift_logging_kibana_proxy_memory_limit }}" - replicas: "{{ openshift_logging_kibana_replicas | default (0) }}" + replicas: "{{ openshift_logging_kibana_replicas | default (1) }}" kibana_node_selector: "{{ openshift_logging_kibana_nodeselector | default({}) }}" - name: Set Kibana DC @@ -223,14 +223,6 @@ - "{{ tempdir }}/templates/kibana-dc.yaml" delete_after: true -# Scale up Kibana -- is this really necessary? -- name: Start Kibana - oc_scale: - kind: dc - name: "{{ kibana_name }}" - namespace: "{{ openshift_logging_namespace }}" - replicas: "{{ openshift_logging_kibana_replicas | default (1) }}" - # update master configs? - name: Delete temp directory diff --git a/roles/openshift_logging_kibana/templates/kibana.j2 b/roles/openshift_logging_kibana/templates/kibana.j2 index ea506b12b..f8043812b 100644 --- a/roles/openshift_logging_kibana/templates/kibana.j2 +++ b/roles/openshift_logging_kibana/templates/kibana.j2 @@ -7,7 +7,7 @@ metadata: component: "{{ component }}" logging-infra: "{{ logging_component }}" spec: - replicas: {{ replicas | default(0) }} + replicas: {{ replicas | default(1) }} selector: provider: openshift component: "{{ component }}" @@ -63,6 +63,13 @@ spec: - name: kibana mountPath: /etc/kibana/keys readOnly: true + readinessProbe: + exec: + command: + - "/usr/share/kibana/probe/readiness.sh" + initialDelaySeconds: 5 + timeoutSeconds: 4 + periodSeconds: 5 - name: "kibana-proxy" image: {{ proxy_image }} |