x/browbeat
Code Issues Proposed changes

Elasticsearch 5 Templates

Browse Source 
Elasticsearch5 changed some of the template structure. We also need to
update the number of fields avaialble.

Change-Id: I7de9fe8e41cb8663467249b1bcad603a214d1624
This commit is contained in:
Joe Talerico 2018-03-12 10:36:50 -04:00
parent 1d275959cb
commit 748fb2be61
7 changed files with 350 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/install/group_vars/all.yml
View File

@ -427,6 +427,7 @@ rsyslog_forwarding: true
es_ip: es_ip:
es_local_port: 9200 es_local_port: 9200
es_listen_external: true es_listen_external: true
elastic5: false
### kibana options ### ### kibana options ###
# change this to affect nginx-wrapped htpasswd authentication # change this to affect nginx-wrapped htpasswd authentication
kibana_user: admin kibana_user: admin

13
ansible/install/roles/es-template/tasks/main.yml
View File

@ -9,3 +9,16 @@
with_fileglob: with_fileglob:
- "{{ browbeat_path }}/elastic/templates/browbeat*" - "{{ browbeat_path }}/elastic/templates/browbeat*"
ignore_errors: true ignore_errors: true
when: elastic5 == false
- name: Upload templates
uri:
url: http://{{ es_ip }}:{{ es_local_port }}/_template/{{ item | basename | regex_replace('\.json','') }}*
method: PUT
body: "{{ lookup('file', item) }}"
body_format: json
with_fileglob:
- "{{ browbeat_path }}/elastic/v5templates/browbeat*"
ignore_errors: true
when: elastic5 == true

6
elastic/v5templates/README.rst Normal file
View File

@ -0,0 +1,6 @@
ElasticSearch / Kibana Template
----------------------------------
to use v5 templates, set 'elastic5: true' in ansible/install/group_vars/all
Template to instruct elasticsearch & Kibana to not processes some of our fields. For example, our UUIDs would turn into multiple strings due the default tokenizer's use of '-', '.', '/', etc. as token separators.

36
elastic/v5templates/browbeat-logstash-.json Normal file
View File

@ -0,0 +1,36 @@
{
"template": "browbeat-logstash-*",
"mappings": {
"result": {
"properties": {
"action": {
"index": "not_analyzed",
"type": "string"
},
"browbeat_cloud_name": {
"index": "not_analyzed",
"type": "string"
},
"message": {
"properties": {
"openstack-general-system-performance": {
"index": "not_analyzed",
"type": "string"
}
}
},
"level": {
"type": "string"
},
"hostname": {
"index": "not_analyzed",
"type": "string"
},
"timestamp": {
"type": "date",
"format": "strict_date_optional_time||epoch_millis"
}
}
}
}
}

76
elastic/v5templates/browbeat-perfkit-.json Normal file
View File

@ -0,0 +1,76 @@
{
"template": "browbeat-perfkit-*",
"settings": {
"index.mapping.total_fields.limit": 5000,
"number_of_shards": 1,
"number_of_replicas": 0
},
"mappings": {
"result": {
"properties": {
"browbeat_rerun": {
"type": "long"
},
"browbeat_scenario": {
"properties": {
"benchmarks": {
"index": "not_analyzed",
"type": "string"
}
}
},
"browbeat_uuid": {
"index": "not_analyzed",
"type": "string"
},
"cloud_name": {
"index": "not_analyzed",
"type": "string"
},
"grafana_url": {
"properties": {
"openstack-general-system-performance": {
"index": "not_analyzed",
"type": "string"
}
}
},
"perfkit_setup": {
"properties": {
"cloud": {
"index": "not_analyzed",
"type": "string"
},
"image": {
"index": "not_analyzed",
"type": "string"
},
"machine_instance": {
"index": "not_analyzed",
"type": "string"
},
"machine_type": {
"index": "not_analyzed",
"type": "string"
},
"perfkitbenchmarker_version": {
"index": "not_analyzed",
"type": "string"
},
"vm_count": {
"type": "string"
},
"zone": {
"index": "not_analyzed",
"type": "string"
}
}
},
"timestamp": {
"type": "date",
"format": "strict_date_optional_time||epoch_millis"
}
}
}
}
}

77
elastic/v5templates/browbeat-rally-.json Normal file
View File

@ -0,0 +1,77 @@
{
"template": "browbeat-rally-*",
"settings": {
"index.mapping.total_fields.limit": 5000,
"number_of_shards": 1,
"number_of_replicas": 0
},
"mappings": {
"result": {
"properties": {
"action": {
"index": "not_analyzed",
"type": "string"
},
"browbeat_uuid": {
"index": "not_analyzed",
"type": "string"
},
"cloud_name": {
"index": "not_analyzed",
"type": "string"
},
"grafana_url": {
"properties": {
"openstack-general-system-performance": {
"index": "not_analyzed",
"type": "string"
}
}
},
"result": {
"type": "string"
},
"scenario": {
"index": "not_analyzed",
"type": "string"
},
"timestamp": {
"type": "date",
"format": "strict_date_optional_time||epoch_millis"
}
}
},
"error": {
"properties": {
"action": {
"index": "not_analyzed",
"type": "string"
},
"action_name": {
"index": "not_analyzed",
"type": "string"
},
"browbeat_uuid": {
"index": "not_analyzed",
"type": "string"
},
"cloud_name": {
"index": "not_analyzed",
"type": "string"
},
"error_msg": {
"index": "not_analyzed",
"type": "string"
},
"error_type": {
"index": "not_analyzed",
"type": "string"
},
"timestamp": {
"type": "date",
"format": "strict_date_optional_time||epoch_millis"
}
}
}
}
}

141
elastic/v5templates/browbeat-shaker-.json Normal file
View File

@ -0,0 +1,141 @@
{
"aliases": { },
"settings": {
"index.mapping.total_fields.limit": 5000,
"number_of_shards": 1,
"number_of_replicas": 0
},
"template": "browbeat-shaker-*",
"mappings": {
"result": {
"properties": {
"browbeat_scenario": {
"index": "not_analyzed",
"type": "string"
},
"browbeat_uuid": {
"index": "not_analyzed",
"type": "string"
},
"cloud_name": {
"index": "not_analyzed",
"type": "string"
},
"grafana_url": {
"properties": {
"openstack-general-system-performance": {
"index": "not_analyzed",
"type": "string"
}
}
},
"result": {
"properties": {
"metric": {
"index": "not_analyzed",
"type": "string"
},
"result_type": {
"index": "not_analyzed",
"type": "string"
},
"value": {
"type": "double"
}
}
},
"run": {
"type": "long"
},
"record": {
"properties": {
"agent": {
"index": "not_analyzed",
"type": "string"
},
"node": {
"index": "not_analyzed",
"type": "string"
},
"scenario": {
"index": "not_analyzed",
"type": "string"
},
"test": {
"index": "not_analyzed",
"type": "string"
}
}
},
"shaker_test_info": {
"properties": {
"deployment": {
"properties": {
"template": {
"index": "not_analyzed",
"type": "string"
}
}
},
"description": {
"index": "not_analyzed",
"type": "string"
},
"title": {
"index": "not_analyzed",
"type": "string"
},
"execution": {
"properties": {
"progression": {
"index": "not_analyzed",
"type": "string"
},
"tests": {
"properties": {
"class": {
"index": "not_analyzed",
"type": "string"
},
"method": {
"index": "not_analyzed",
"type": "string"
},
"time": {
"index": "not_analyzed",
"type": "long"
},
"title": {
"index": "not_analyzed",
"type": "string"
}
}
}
}
},
"file_name": {
"index": "not_analyzed",
"type": "string"
},
"title": {
"index": "not_analyzed",
"type": "string"
}
}
},
"shaker_uuid": {
"index": "not_analyzed",
"type": "string"
},
"template": {
"index": "not_analyzed",
"type": "string"
},
"timestamp": {
"type": "date",
"format": "dateOptionalTime"
}
}
}
}
}