-
Notifications
You must be signed in to change notification settings - Fork 324
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tweaks to deal with merges and get some more tests running.
- Restore the old elasticsearch v1 template for running with Elasticsearch v2. - Update some dependencies. - Restore some things that were accidentally removed in merging. - Update some of the newer tests from master to work on the updated gems.
- Loading branch information
Showing
14 changed files
with
248 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,204 @@ | ||
| [ | ||
| { | ||
| "id": "api-umbrella-log-v1-template", | ||
| "template": { | ||
| "template": "api-umbrella-logs-v1-*", | ||
| "settings": { | ||
| "index": { | ||
| "number_of_shards": 1, | ||
| "codec": "best_compression" | ||
| }, | ||
| "analysis": { | ||
| "analyzer": { | ||
| "keyword_lowercase": { | ||
| "type": "custom", | ||
| "tokenizer": "keyword", | ||
| "filter": ["lowercase"] | ||
| } | ||
| } | ||
| }, | ||
| "translog": { | ||
| "durability": "async", | ||
| "sync_interval": "10s" | ||
| } | ||
| }, | ||
| "mappings": { | ||
| "log": { | ||
| "_all": { | ||
| "enabled": false | ||
| }, | ||
| "date_detection": false, | ||
| "numeric_detection": false, | ||
| "dynamic_templates": [ | ||
| { | ||
| "string_template": { | ||
| "match": "*", | ||
| "match_mapping_type": "string", | ||
| "mapping": { | ||
| "type": "string", | ||
| "index": "analyzed", | ||
| "analyzer": "keyword_lowercase" | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "properties": { | ||
| "api_backend_id": { | ||
| "type": "string", | ||
| "index": "not_analyzed" | ||
| }, | ||
| "api_backend_url_match_id": { | ||
| "type": "string", | ||
| "index": "not_analyzed" | ||
| }, | ||
| "api_key": { | ||
| "type": "string", | ||
| "index": "not_analyzed" | ||
| }, | ||
| "gatekeeper_denied_code": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_accept": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_accept_encoding": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_at": { | ||
| "type": "date" | ||
| }, | ||
| "request_basic_auth_username": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_connection": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_content_type": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_hierarchy": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_host": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_ip": { | ||
| "type": "string", | ||
| "index": "not_analyzed" | ||
| }, | ||
| "request_ip_city": { | ||
| "type": "string", | ||
| "index": "not_analyzed" | ||
| }, | ||
| "request_ip_country": { | ||
| "type": "string", | ||
| "index": "not_analyzed" | ||
| }, | ||
| "request_ip_region": { | ||
| "type": "string", | ||
| "index": "not_analyzed" | ||
| }, | ||
| "request_method": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_origin": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_path": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_referer": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_scheme": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_size": { | ||
| "type": "integer" | ||
| }, | ||
| "request_url": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_url_query": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_user_agent": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_user_agent_family": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "request_user_agent_type": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "response_age": { | ||
| "type": "integer" | ||
| }, | ||
| "response_cache": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "response_content_encoding": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "response_content_length": { | ||
| "type": "integer" | ||
| }, | ||
| "response_content_type": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "response_server": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "response_size": { | ||
| "type": "integer" | ||
| }, | ||
| "response_status": { | ||
| "type": "short" | ||
| }, | ||
| "response_time": { | ||
| "type": "integer" | ||
| }, | ||
| "response_transfer_encoding": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "user_id": { | ||
| "type": "string", | ||
| "index": "not_analyzed" | ||
| }, | ||
| "user_email": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| }, | ||
| "user_registration_source": { | ||
| "type": "string", | ||
| "analyzer": "keyword_lowercase" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/api-umbrella/proxy/startup/init_elasticsearch_templates_data.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.