Remove post_config from the Kibana role

Since at least Stein, there is no visible effect from these tasks.
The Kibana dashboard seems to be working exactly the same,
greeting user on the first use with "please configure my index".
I tested on both Ubuntu and CentOS.
In new E*K stack (Ussuri+, CentOS8+) it even causes play errors.

Co-authored-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Change-Id: Iafc6986cce9cbaa0ea9e219ca85d7d01a61308cf
Closes-Bug: #1799689
(cherry picked from commit fbc47e60e1)
This commit is contained in:
xiaojueguan 2020-05-08 14:27:21 +08:00 committed by Radosław Piliszek
parent 0e20b997e6
commit aea9b4d233
4 changed files with 5 additions and 101 deletions

View File

@ -35,16 +35,6 @@ kibana_elasticsearch_shard_timeout: 0
kibana_elasticsearch_ssl_verify: false
####################
# Default index
####################
kibana_default_index_pattern: "{{ kibana_log_prefix }}-*"
kibana_default_index:
title: "{{ kibana_default_index_pattern }}"
timeFieldName: "@timestamp"
kibana_default_index_options:
index.mapper.dynamic: true
####################
# Docker
####################

View File

@ -3,5 +3,3 @@
- name: Flush handlers
meta: flush_handlers
- include_tasks: post_config.yml

View File

@ -1,89 +0,0 @@
---
- name: Wait for kibana port
wait_for:
host: "{{ kolla_internal_fqdn }}"
port: "{{ kibana_server_port }}"
run_once: true
- name: Register the kibana index in elasticsearch
become: true
kolla_toolbox:
module_name: uri
module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana"
method: PUT
body: "{{ kibana_default_index_options | to_json }}"
body_format: json
status_code: 200, 201, 400
register: result
failed_when:
# If the index already exists, Elasticsearch will respond with a 400 error.
- result.status == 400
# Format: {"json": {"error": {"type": "index_already_exists_exception"}}}
- result.get('json', {}).get('error', {}).get('type') != 'index_already_exists_exception'
run_once: true
- name: Wait for kibana to register in elasticsearch
become: true
kolla_toolbox:
module_name: uri
module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana"
status_code: 200
register: result
until: result.status == 200
retries: 20
delay: 2
run_once: true
- name: Change kibana config to set index as defaultIndex
vars:
kibana_default_index_body:
defaultIndex: "{{ kibana_default_index_pattern }}"
become: true
kolla_toolbox:
module_name: uri
module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana/config/*"
method: PUT
body: "{{ kibana_default_index_body | to_json }}"
body_format: json
status_code: 200, 201
run_once: true
- name: Get kibana default indexes
become: true
kolla_toolbox:
module_name: uri
module_args:
headers:
Content-Type: application/json
url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana"
method: GET
register: kibana_default_indexes
run_once: true
when: kibana_default_index is defined
- name: Set kibana default indexes fact
set_fact:
kibana_default_indexes: "{{ kibana_default_indexes.json | default([]) }}"
when:
- kibana_default_indexes is defined
run_once: true
connection: local
- name: Add index pattern to kibana
become: true
kolla_toolbox:
module_name: uri
module_args:
url: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ elasticsearch_port }}/.kibana/index-pattern/{{ kibana_default_index_pattern }}" # noqa 204
method: PUT
body: "{{ kibana_default_index | to_json }}"
body_format: json
status_code: 201
run_once: true
when:
- kibana_default_index is defined
- kibana_default_indexes is defined
- kibana_default_indexes['.kibana']['mappings']['config']['properties']['defaultIndex'] is not defined

View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes Kibana deployment with the new E*K stack (6+).
`LP#1799689 <https://launchpad.net/bugs/1799689>`__