diff --git a/.go-version b/.go-version new file mode 100644 index 0000000..2e0e38c --- /dev/null +++ b/.go-version @@ -0,0 +1 @@ +1.9 diff --git a/README.md b/README.md index 9cabca5..939de0b 100644 --- a/README.md +++ b/README.md @@ -150,12 +150,15 @@ This will fetch and create all images required for the build process. The hole p # Releases and Downloads -## 4.1.0 (WiP) [Download](https://github.com/christiangalsterer/httpbeat/releases/tag/4.1.0) +## 4.1.0 (2017-11-01) [Download](https://github.com/christiangalsterer/httpbeat/releases/tag/4.1.0) [![Github Releases (by Release)](https://img.shields.io/github/downloads/christiangalsterer/httpbeat/4.1.0/total.svg)](https://github.com/christiangalsterer/httpbeat/releases/tag/4.1.0) Feature and Bugfix release containing the following changes: -* Update to beats v5.6.2 -* Set correct version in package names and package metadata +* Update to beats v5.6.3 +* [Support returning HTTP status phrase](https://github.com/christiangalsterer/httpbeat/issues/27) +* Fix: Set correct version in package names and package metadata +* Fix: [HTTP Status code in event doesn't match documentation](https://github.com/christiangalsterer/httpbeat/issues/26) +* Fix: [Making the template work for kibana - Use `object` instead of `nested`](https://github.com/christiangalsterer/httpbeat/issues/25) ## 4.0.0 (2017-02-19) [Download](https://github.com/christiangalsterer/httpbeat/releases/tag/4.0.0) [![Github Releases (by Release)](https://img.shields.io/github/downloads/christiangalsterer/httpbeat/4.0.0/total.svg)](https://github.com/christiangalsterer/httpbeat/releases/tag/4.0.0) diff --git a/_meta/fields.yml b/_meta/fields.yml index 3e1ea5d..1cc9efa 100644 --- a/_meta/fields.yml +++ b/_meta/fields.yml @@ -12,11 +12,12 @@ - name: method type: keyword + example: get description: > HTTP method used by Httpbeat to call the URL endpoint. - name: headers - type: nested + type: object description: > HTTP headers send to the URL endpoint. @@ -30,11 +31,18 @@ fields: - name: code type: keyword + example: 404 description: > HTTP status code returned by the URL endpoint. + - name: phrase + type: keyword + example: Not found + description: > + HTTP status phrase (without the HTTP status code) returned by the URL endpoint. + - name: headers - type: nested + type: object description: > HTTP response headers send by the URL endpoint. @@ -44,6 +52,6 @@ HTTP response body returned by the URL endpoint. - name: jsonBody - type: nested + type: object description: > HTTP response body returned by the URL endpoint in JSON format. diff --git a/_meta/kibana/5.x/index-pattern/httpbeat.json b/_meta/kibana/5.x/index-pattern/httpbeat.json index 03ece4a..0a1fb7d 100644 --- a/_meta/kibana/5.x/index-pattern/httpbeat.json +++ b/_meta/kibana/5.x/index-pattern/httpbeat.json @@ -1,5 +1,5 @@ { - "fields": "[{\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.hostname\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.version\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"@timestamp\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"date\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"tags\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"fields\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.provider\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.instance_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.machine_type\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.availability_zone\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.project_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.region\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.url\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.method\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.headers\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.body\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.code\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.headers\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.body\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.jsonBody\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_id\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"_type\", \"searchable\": true, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_index\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_score\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"number\", \"scripted\": false}]", + "fields": "[{\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.hostname\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.version\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"@timestamp\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"date\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"tags\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"fields\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.provider\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.instance_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.machine_type\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.availability_zone\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.project_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.region\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.url\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.method\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.headers\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.body\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.code\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.phrase\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.headers\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.body\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.jsonBody\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_id\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"_type\", \"searchable\": true, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_index\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_score\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"number\", \"scripted\": false}]", "fieldFormatMap": "{\"@timestamp\": {\"id\": \"date\"}}", "timeFieldName": "@timestamp", "title": "httpbeat-*" diff --git a/_meta/kibana/default/index-pattern/httpbeat.json b/_meta/kibana/default/index-pattern/httpbeat.json index 52b80bc..3466721 100644 --- a/_meta/kibana/default/index-pattern/httpbeat.json +++ b/_meta/kibana/default/index-pattern/httpbeat.json @@ -1,9 +1,9 @@ { - "version": "5.6.1", + "version": "5.6.2", "objects": [ { "attributes": { - "fields": "[{\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.hostname\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.version\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"@timestamp\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"date\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"tags\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"fields\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.provider\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.instance_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.machine_type\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.availability_zone\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.project_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.region\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.url\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.method\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.headers\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.body\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.code\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.headers\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.body\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.jsonBody\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_id\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"_type\", \"searchable\": true, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_index\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_score\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"number\", \"scripted\": false}]", + "fields": "[{\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.name\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.hostname\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"beat.version\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"@timestamp\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"date\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"tags\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"fields\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.provider\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.instance_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.machine_type\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.availability_zone\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.project_id\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"meta.cloud.region\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.url\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.method\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.headers\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"request.body\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.code\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.phrase\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.headers\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.body\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"response.jsonBody\", \"searchable\": true, \"indexed\": true, \"doc_values\": true, \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_id\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": true, \"name\": \"_type\", \"searchable\": true, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_index\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"string\", \"scripted\": false}, {\"count\": 0, \"analyzed\": false, \"aggregatable\": false, \"name\": \"_score\", \"searchable\": false, \"indexed\": false, \"doc_values\": false, \"type\": \"number\", \"scripted\": false}]", "fieldFormatMap": "{\"@timestamp\": {\"id\": \"date\"}}", "timeFieldName": "@timestamp", "title": "httpbeat-*" diff --git a/beater/httpevent.go b/beater/httpevent.go index f372dac..19e9496 100644 --- a/beater/httpevent.go +++ b/beater/httpevent.go @@ -21,10 +21,11 @@ type Request struct { } type Response struct { - StatusCode int `json:"statusCode"` - Headers map[string]string `json:"headers,omitempty"` - Body string `json:"body,omitempty"` - JsonBody map[string]interface{} `json:"jsonBody,omitempty"` + StatusCode int `json:"code"` + StatusPhrase string `json:"phrase"` + Headers map[string]string `json:"headers,omitempty"` + Body string `json:"body,omitempty"` + JsonBody map[string]interface{} `json:"jsonBody,omitempty"` } func (h *HttpEvent) ToMapStr() common.MapStr { diff --git a/beater/poller.go b/beater/poller.go index 96ac25e..7428ecb 100644 --- a/beater/poller.go +++ b/beater/poller.go @@ -163,8 +163,9 @@ func (p *Poller) runOneTime() error { var jsonBody map[string]interface{} responseEvent := Response{ - StatusCode: resp.StatusCode, - Headers: p.GetResponseHeader(resp), + StatusCode: resp.StatusCode, + StatusPhrase: resp.Status[4:len(resp.Status)], + Headers: p.GetResponseHeader(resp), } if outputFormat == "string" { diff --git a/docs/fields.asciidoc b/docs/fields.asciidoc index a0ec412..c604e55 100644 --- a/docs/fields.asciidoc +++ b/docs/fields.asciidoc @@ -141,13 +141,15 @@ URL endpoint called by Httpbeat. type: keyword +example: get + HTTP method used by Httpbeat to call the URL endpoint. [float] === request.headers -type: nested +type: object HTTP headers send to the URL endpoint. @@ -166,13 +168,25 @@ HTTP request body passed to the URL endpoint. type: keyword +example: 404 + HTTP status code returned by the URL endpoint. +[float] +=== response.phrase + +type: keyword + +example: Not found + +HTTP status phrase (without the HTTP status code) returned by the URL endpoint. + + [float] === response.headers -type: nested +type: object HTTP response headers send by the URL endpoint. @@ -188,7 +202,7 @@ HTTP response body returned by the URL endpoint. [float] === response.jsonBody -type: nested +type: object HTTP response body returned by the URL endpoint in JSON format. diff --git a/glide.lock b/glide.lock index d21e58b..a52c1d8 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: ebf7447bd48e113d3d7bef2d8d8ab7e52ce030cecf1155cedaecedd5d907feb5 -updated: 2017-10-01T10:32:13.154851725+02:00 +hash: 9fb1cdf9715828125c6d837c6ab90a643aa3fdaf94eb2ae08d3690d127aa3853 +updated: 2017-10-28T13:36:41.440352783+02:00 imports: - name: github.com/davecgh/go-spew version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d @@ -14,7 +14,7 @@ imports: - name: github.com/eapache/queue version: ded5959c0d4e360646dc9e9908cff48666781367 - name: github.com/elastic/beats - version: 3e0b7a36227e7dc359b1f999676100c3c42d3898 + version: c34337071a05d7ae4f7397725319e0573c4a3e65 subpackages: - libbeat/beat - libbeat/cfgfile diff --git a/glide.yaml b/glide.yaml index bf2a006..8ffca75 100644 --- a/glide.yaml +++ b/glide.yaml @@ -6,7 +6,7 @@ owners: homepage: https://github.com/christiangalsterer import: - package: github.com/elastic/beats - version: v5.6.2 + version: v5.6.3 subpackages: - libbeat/beat - libbeat/cfgfile diff --git a/httpbeat.template-es2x.json b/httpbeat.template-es2x.json index 15c8aba..5a8883c 100644 --- a/httpbeat.template-es2x.json +++ b/httpbeat.template-es2x.json @@ -7,7 +7,7 @@ } }, "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ @@ -92,7 +92,7 @@ }, "headers": { "properties": {}, - "type": "nested" + "type": "replace" }, "method": { "ignore_above": 1024, @@ -120,11 +120,16 @@ }, "headers": { "properties": {}, - "type": "nested" + "type": "replace" }, "jsonBody": { "properties": {}, - "type": "nested" + "type": "replace" + }, + "phrase": { + "ignore_above": 1024, + "index": "not_analyzed", + "type": "string" } } }, @@ -141,4 +146,4 @@ "index.refresh_interval": "5s" }, "template": "httpbeat-*" -} \ No newline at end of file +} diff --git a/httpbeat.template-es6x.json b/httpbeat.template-es6x.json index 3ceaf9c..58e47b2 100644 --- a/httpbeat.template-es6x.json +++ b/httpbeat.template-es6x.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ @@ -76,7 +76,7 @@ }, "headers": { "properties": {}, - "type": "nested" + "type": "replace" }, "method": { "ignore_above": 1024, @@ -100,11 +100,15 @@ }, "headers": { "properties": {}, - "type": "nested" + "type": "replace" }, "jsonBody": { "properties": {}, - "type": "nested" + "type": "replace" + }, + "phrase": { + "ignore_above": 1024, + "type": "keyword" } } }, @@ -121,4 +125,4 @@ "index.refresh_interval": "5s" }, "template": "httpbeat-*" -} \ No newline at end of file +} diff --git a/httpbeat.template.json b/httpbeat.template.json index 3ceaf9c..58e47b2 100644 --- a/httpbeat.template.json +++ b/httpbeat.template.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ @@ -76,7 +76,7 @@ }, "headers": { "properties": {}, - "type": "nested" + "type": "replace" }, "method": { "ignore_above": 1024, @@ -100,11 +100,15 @@ }, "headers": { "properties": {}, - "type": "nested" + "type": "replace" }, "jsonBody": { "properties": {}, - "type": "nested" + "type": "replace" + }, + "phrase": { + "ignore_above": 1024, + "type": "keyword" } } }, @@ -121,4 +125,4 @@ "index.refresh_interval": "5s" }, "template": "httpbeat-*" -} \ No newline at end of file +} diff --git a/vendor/github.com/elastic/beats/CHANGELOG.asciidoc b/vendor/github.com/elastic/beats/CHANGELOG.asciidoc index 29604b7..2f55e9c 100644 --- a/vendor/github.com/elastic/beats/CHANGELOG.asciidoc +++ b/vendor/github.com/elastic/beats/CHANGELOG.asciidoc @@ -8,7 +8,7 @@ // Template, add newest changes here === Beats version HEAD -https://github.com/elastic/beats/compare/v5.6.1...master[Check the HEAD diff] +https://github.com/elastic/beats/compare/v5.6.2...5.6[Check the HEAD diff] ==== Breaking changes @@ -82,6 +82,12 @@ https://github.com/elastic/beats/compare/v5.6.1...master[Check the HEAD diff] //////////////////////////////////////////////////////////// +[[release-notes-5.6.2]] +=== Beats version 5.6.2 +https://github.com/elastic/beats/compare/v5.6.1...v5.6.2[View commits] + +No changes in this release. + [[release-notes-5.6.1]] === Beats version 5.6.1 https://github.com/elastic/beats/compare/v5.6.0...v5.6.1[View commits] diff --git a/vendor/github.com/elastic/beats/dev-tools/jenkins_ci b/vendor/github.com/elastic/beats/dev-tools/jenkins_ci deleted file mode 100755 index fb5afaa..0000000 --- a/vendor/github.com/elastic/beats/dev-tools/jenkins_ci +++ /dev/null @@ -1,145 +0,0 @@ -#!/usr/bin/env bash -set -e - -# Script directory: -SDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -SNAME="$(basename "$0")" - -source "${SDIR}/common.bash" - -usage() { -cat << EOF - Usage: $SNAME [-d] [-h] [-v] [-r] [-w=WORKSPACE] (-g|-b|-c) - - Description: Executes a build using the project's Go version. - - Options: - -w=WORKSPACE Required. Specifies the path to the Jenkins workspace. - If not set then the WORKSPACE environment variable is - used. The workspace will be treated as the GOPATH. - -b | --build Perform a build which includes make targets: check, - testsuite, coverage-report, and docs. - -c | --cleanup Clean up after the build by removing the checkout of - elastic/docs and stopping any running containers - started by the build. This cannot be specified with - --build. - -g | --go-version Optional. Write the project's Go version to stdout - and then exits. Can be used to setup Go with - eval "\$(gimme \$(./jenkins_ci -g))". - -i | --install-gimme Optional. Installs gimme to HOME/bin. - -r | --race Optional. Enable the Go race detector for tests that - are run. - -d | --debug Optional. Runs the script with 'set -x' to log a trace - of all commands and their arguments being executed. - -v | --verbose Optional. Enable verbose logging from this script to stderr. - -h | --help Optional. Print this usage information. - - Examples: - Print project Go version: ./$SNAME --go-version - Build with race detector: ./$SNAME -b -r - Stop test environment: ./$SNAME -c - - Jenkins Setup: - - 1) Jenkins should be setup to checkout elastic/beats into - \$WORKSPACE/src/github.com/elastic/ - 2) The single build script should be added that executes - \$WORKSPACE/src/github.com/elastic/beats/dev-tools/$SNAME -d -v -b --race - 3) A post build action should be added that executes - \$WORKSPACE/src/github.com/elastic/beats/dev-tools/$SNAME -d -v -c -EOF -} - -# Parse command line arguments. -parse_args() { - for i in "$@" - do - case $i in - -b|--build) - BUILD=true - shift - ;; - -c|--cleanup) - CLEANUP=true - shift - ;; - -d|--debug) - set -x - shift - ;; - -g|--go-version) - get_go_version - echo "${GO_VERSION}" - exit 0 - ;; - -h|--help) - usage - exit 1 - ;; - -i|--install-gimme) - install_gimme - exit 0 - ;; - -r|--race) - export RACE_DETECTOR=1 - shift - ;; - -v|--verbose) - VERBOSE=true - shift - ;; - -w=*|--workspace=*) - WORKSPACE="${i#*=}" - shift - ;; - *) - echo "Invalid argument: $i" - usage - exit 1 - ;; - esac - done - - if [ -z "$WORKSPACE" ]; then - err "WORKSPACE env var must be set or --workspace must be specified" - exit 1 - fi -} - -build() { - make check - make testsuite - make coverage-report - make docs -} - -cleanup() { - # Remove the checkout of elastic/docs if it exists. - rm -rf "${SDIR}/../build/docs" - - make stop-environments -} - -main() { - cd "${SDIR}/.." - parse_args $* - get_go_version - setup_go_root ${GO_VERSION} - setup_go_path ${WORKSPACE} - - if [ "$BUILD" == "true" ] && [ "$CLEANUP" == "true" ]; then - err "--build and --cleanup cannot be used together" - exit 1 - elif [ "$BUILD" == "true" ]; then - chmod -R go-w "${GOPATH}/src/github.com/elastic/beats" - build - elif [ "$CLEANUP" == "true" ]; then - cleanup - else - err "Use either --build or --cleanup" - exit 1 - fi -} - -umask 022 -main $* diff --git a/vendor/github.com/elastic/beats/dev-tools/jenkins_ci.ps1 b/vendor/github.com/elastic/beats/dev-tools/jenkins_ci.ps1 new file mode 100755 index 0000000..a7f9f5d --- /dev/null +++ b/vendor/github.com/elastic/beats/dev-tools/jenkins_ci.ps1 @@ -0,0 +1,61 @@ +function Exec +{ + param( + [Parameter(Position=0,Mandatory=1)][scriptblock]$cmd, + [Parameter(Position=1,Mandatory=0)][string]$errorMessage = ($msgs.error_bad_command -f $cmd) + ) + + & $cmd + if ($LastExitCode -ne 0) { + Write-Error $errorMessage + exit $LastExitCode + } +} + +# Setup Go. +$env:GOPATH = $env:WORKSPACE +$env:PATH = "$env:GOPATH\bin;C:\tools\mingw64\bin;$env:PATH" +if (Test-Path -PathType leaf .go-version) { + & gvm --format=powershell $(Get-Content .go-version) | Invoke-Expression +} else { + & gvm --format=powershell 1.7.5 | Invoke-Expression +} + +if (Test-Path "$env:beat") { + cd "$env:beat" +} else { + echo "$env:beat does not exist" + New-Item -ItemType directory -Path build | Out-Null + New-Item -Name build\TEST-empty.xml -ItemType File | Out-Null + exit +} + +if (Test-Path "build") { Remove-Item -Recurse -Force build } +New-Item -ItemType directory -Path build\coverage | Out-Null +New-Item -ItemType directory -Path build\system-tests | Out-Null +New-Item -ItemType directory -Path build\system-tests\run | Out-Null + +exec { go get -u github.com/jstemmer/go-junit-report } + +echo "Building $env:beat" +exec { go build } "Build FAILURE" + +if ($env:beat -eq "metricbeat") { + cp .\_meta\fields.common.yml .\_meta\fields.generated.yml + python .\scripts\fields_collector.py | out-file -append -encoding UTF8 -filepath .\_meta\fields.generated.yml +} elseif ($env:beat -eq "libbeat") { + cp .\_meta\fields.common.yml .\_meta\fields.generated.yml + cat processors\*\_meta\fields.yml | Out-File -append -encoding UTF8 -filepath .\_meta\fields.generated.yml + cp .\_meta\fields.generated.yml .\fields.yml +} + +echo "Unit testing $env:beat" +go test -v $(go list ./... | select-string -Pattern "vendor" -NotMatch) 2>&1 | Out-File -encoding UTF8 build/TEST-go-unit.out +exec { Get-Content build/TEST-go-unit.out | go-junit-report.exe -set-exit-code | Out-File -encoding UTF8 build/TEST-go-unit.xml } "Unit test FAILURE" + +echo "System testing $env:beat" +# TODO (elastic/beats#5050): Use a vendored copy of this. +exec { go get github.com/docker/libcompose } +exec { go test -race -c -cover -covermode=atomic -coverpkg ./... } +exec { cd tests/system } +exec { nosetests --with-timer --with-xunit --xunit-file=../../build/TEST-system.xml } "System test FAILURE" \ No newline at end of file diff --git a/vendor/github.com/elastic/beats/dev-tools/jenkins_ci.sh b/vendor/github.com/elastic/beats/dev-tools/jenkins_ci.sh new file mode 100755 index 0000000..087d8ae --- /dev/null +++ b/vendor/github.com/elastic/beats/dev-tools/jenkins_ci.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +set -euox pipefail + +: "${HOME:?Need to set HOME to a non-empty value.}" +: "${WORKSPACE:?Need to set WORKSPACE to a non-empty value.}" +: "${beat:?Need to set beat to a non-empty value.}" + +if [ ! -d "$beat" ]; then + echo "$beat does not exist" + mkdir -p build + touch build/TEST-empty.xml + exit +fi + +# Setup Go. +export GOPATH=${WORKSPACE} +export PATH=${GOPATH}/bin:${PATH} +if [ -f ".go-version" ]; then + eval "$(gvm $(cat .go-version))" +else + eval "$(gvm 1.7.5)" +fi + +# Workaround for Python virtualenv path being too long. +TEMP_PYTHON_ENV=$(mktemp -d) +export PYTHON_ENV="${TEMP_PYTHON_ENV}/python-env" + +cleanup() { + echo "Running cleanup..." + rm -rf $TEMP_PYTHON_ENV + make stop-environment fix-permissions + echo "Killing all running containers..." + docker ps -q | xargs -r docker kill || true + echo "Cleaning stopped docker containers and dangling images/networks/volumes..." + docker system prune -f || true + echo "Cleanup complete." +} +trap cleanup EXIT + +rm -rf ${GOPATH}/pkg +cd ${beat} +RACE_DETECTOR=1 make clean check testsuite \ No newline at end of file diff --git a/vendor/github.com/elastic/beats/dev-tools/jenkins_intake.sh b/vendor/github.com/elastic/beats/dev-tools/jenkins_intake.sh new file mode 100755 index 0000000..9e23ea6 --- /dev/null +++ b/vendor/github.com/elastic/beats/dev-tools/jenkins_intake.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash +set -euox pipefail + +: "${HOME:?Need to set HOME to a non-empty value.}" +: "${WORKSPACE:?Need to set WORKSPACE to a non-empty value.}" + +# Setup Go. +export GOPATH=${WORKSPACE} +export PATH=${GOPATH}/bin:${PATH} +if [ -f ".go-version" ]; then + eval "$(gvm $(cat .go-version))" +else + eval "$(gvm 1.7.5)" +fi + +# Workaround for Python virtualenv path being too long. +TEMP_PYTHON_ENV=$(mktemp -d) +export PYTHON_ENV="${TEMP_PYTHON_ENV}/python-env" + +cleanup() { + echo "Running cleanup..." + rm -rf $TEMP_PYTHON_ENV + echo "Cleanup complete." +} +trap cleanup EXIT + +make check \ No newline at end of file diff --git a/vendor/github.com/elastic/beats/dev-tools/packer/version.yml b/vendor/github.com/elastic/beats/dev-tools/packer/version.yml index 3bea03b..4c6c0b6 100644 --- a/vendor/github.com/elastic/beats/dev-tools/packer/version.yml +++ b/vendor/github.com/elastic/beats/dev-tools/packer/version.yml @@ -1 +1 @@ -version: "5.6.2" +version: "5.6.3" diff --git a/vendor/github.com/elastic/beats/filebeat/filebeat.template-es2x.json b/vendor/github.com/elastic/beats/filebeat/filebeat.template-es2x.json index 4fe8bce..6206553 100644 --- a/vendor/github.com/elastic/beats/filebeat/filebeat.template-es2x.json +++ b/vendor/github.com/elastic/beats/filebeat/filebeat.template-es2x.json @@ -7,7 +7,7 @@ } }, "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/filebeat/filebeat.template-es6x.json b/vendor/github.com/elastic/beats/filebeat/filebeat.template-es6x.json index 86e9497..e021192 100644 --- a/vendor/github.com/elastic/beats/filebeat/filebeat.template-es6x.json +++ b/vendor/github.com/elastic/beats/filebeat/filebeat.template-es6x.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/filebeat/filebeat.template.json b/vendor/github.com/elastic/beats/filebeat/filebeat.template.json index 86e9497..e021192 100644 --- a/vendor/github.com/elastic/beats/filebeat/filebeat.template.json +++ b/vendor/github.com/elastic/beats/filebeat/filebeat.template.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/heartbeat/heartbeat.template-es2x.json b/vendor/github.com/elastic/beats/heartbeat/heartbeat.template-es2x.json index 4e3d74f..359dbd6 100644 --- a/vendor/github.com/elastic/beats/heartbeat/heartbeat.template-es2x.json +++ b/vendor/github.com/elastic/beats/heartbeat/heartbeat.template-es2x.json @@ -7,7 +7,7 @@ } }, "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/heartbeat/heartbeat.template-es6x.json b/vendor/github.com/elastic/beats/heartbeat/heartbeat.template-es6x.json index a6fbd8d..0827df1 100644 --- a/vendor/github.com/elastic/beats/heartbeat/heartbeat.template-es6x.json +++ b/vendor/github.com/elastic/beats/heartbeat/heartbeat.template-es6x.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/heartbeat/heartbeat.template.json b/vendor/github.com/elastic/beats/heartbeat/heartbeat.template.json index a6fbd8d..0827df1 100644 --- a/vendor/github.com/elastic/beats/heartbeat/heartbeat.template.json +++ b/vendor/github.com/elastic/beats/heartbeat/heartbeat.template.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/libbeat/beat/version.go b/vendor/github.com/elastic/beats/libbeat/beat/version.go index 6b747bb..3f53bbf 100644 --- a/vendor/github.com/elastic/beats/libbeat/beat/version.go +++ b/vendor/github.com/elastic/beats/libbeat/beat/version.go @@ -1,3 +1,3 @@ package beat -const defaultBeatVersion = "5.6.2" +const defaultBeatVersion = "5.6.3" diff --git a/vendor/github.com/elastic/beats/libbeat/docs/communitybeats.asciidoc b/vendor/github.com/elastic/beats/libbeat/docs/communitybeats.asciidoc index 5aa7a7c..b60201c 100644 --- a/vendor/github.com/elastic/beats/libbeat/docs/communitybeats.asciidoc +++ b/vendor/github.com/elastic/beats/libbeat/docs/communitybeats.asciidoc @@ -15,6 +15,7 @@ https://github.com/goomzee/cassandrabeat[cassandrabeat]:: Uses Cassandra's nodet https://github.com/hartfordfive/cloudflarebeat[cloudflarebeat]:: Indexes log entries from the Cloudflare Enterprise Log Share API. https://github.com/jarl-tornroos/cloudfrontbeat[cloudfrontbeat]:: Reads log events from Amazon Web Services https://aws.amazon.com/cloudfront/[CloudFront]. https://github.com/aidan-/cloudtrailbeat[cloudtrailbeat]:: Reads events from Amazon Web Services' https://aws.amazon.com/cloudtrail/[CloudTrail]. +https://github.com/narmitech/cloudwatchmetricbeat[cloudwatchmetricbeat]:: A beat for Amazon Web Services' https://aws.amazon.com/cloudwatch/details/#other-aws-resource-monitoring[CloudWatch Metrics]. https://github.com/e-travel/cloudwatchlogsbeat[cloudwatchlogsbeat]:: Reads log events from Amazon Web Services' https://aws.amazon.com/cloudwatch/details/#log-monitoring[CloudWatch Logs]. https://github.com/raboof/connbeat[connbeat]:: Exposes metadata about TCP connections. https://github.com/Pravoru/consulbeat[consulbeat]:: Reads services health checks from consul and pushes them to Elastic. diff --git a/vendor/github.com/elastic/beats/libbeat/docs/processors-config.asciidoc b/vendor/github.com/elastic/beats/libbeat/docs/processors-config.asciidoc index b7a71bc..c238576 100644 --- a/vendor/github.com/elastic/beats/libbeat/docs/processors-config.asciidoc +++ b/vendor/github.com/elastic/beats/libbeat/docs/processors-config.asciidoc @@ -16,7 +16,7 @@ include::../../libbeat/docs/processors.asciidoc[] To define a processor, you specify the processor name, an optional condition, -and a set of parameters: +and a set of parameters: [source,yaml] ------ @@ -41,7 +41,7 @@ the event. * specifies an optional <>. If the condition is present, then the action is executed only if the condition is fulfilled. If no condition is passed, then the action is always executed. -* is the list of parameters to pass to the processor. +* is the list of parameters to pass to the processor. See <> for specific {beatname_uc} examples. @@ -51,7 +51,7 @@ See <> for specific {beatname_uc} examples. Each condition receives a field to compare. You can specify multiple fields under the same condition by using `AND` between the fields (for example, -`field1 AND field2`). +`field1 AND field2`). For each field, you can specify a simple field name or a nested map, for example `dns.question.name`. @@ -160,7 +160,7 @@ range: [[condition-or]] ==== OR -The `or` operator receives a list of conditions. +The `or` operator receives a list of conditions. [source,yaml] ------- @@ -173,7 +173,7 @@ or: ------- For example, to configure the condition -`http.response.code = 304 OR http.response.code = 404`: +`http.response.code = 304 OR http.response.code = 404`: [source,yaml] ------ @@ -188,7 +188,7 @@ or: [[condition-and]] ==== AND -The `and` operator receives a list of conditions. +The `and` operator receives a list of conditions. [source,yaml] ------- @@ -201,7 +201,7 @@ and: ------- For example, to configure the condition -`http.response.code = 200 AND status = OK`: +`http.response.code = 200 AND status = OK`: [source,yaml] ------ @@ -237,7 +237,7 @@ not: ------- -For example, to configure the condition `NOT status = OK`: +For example, to configure the condition `NOT status = OK`: [source,yaml] ------ @@ -351,9 +351,9 @@ replaces the strings with valid JSON objects. processors: - decode_json_fields: fields: ["field1", "field2", ...] - process_array: false + process_array: false max_depth: 1 - target: + target: "" overwrite_keys: false ----------------------------------------------------- @@ -366,7 +366,8 @@ arrays. The default is false. `target`:: (Optional) The field under which the decoded JSON will be written. By default the decoded JSON object replaces the string field from which it was read. To merge the decoded JSON fields into the root of the event, specify -`target` with an empty value (`target:`). +`target` with an empty string (`target: ""`). Note that the `null` value (`target:`) +is treated as if the field was not set at all. `overwrite_keys`:: (Optional) A boolean that specifies whether keys that already exist in the event are overwritten by keys from the decoded JSON object. The default value is false. @@ -376,7 +377,7 @@ default value is false. The `drop_event` processor drops the entire event if the associated condition is fulfilled. The condition is mandatory, because without one, all the events -are dropped. +are dropped. [source,yaml] ------ @@ -394,7 +395,7 @@ See <> for a list of supported conditions. The `drop_fields` processor specifies which fields to drop if a certain condition is fulfilled. The condition is optional. If it's missing, the specified fields are always dropped. The `@timestamp` and `type` fields cannot -be dropped, even if they show up in the `drop_fields` list. +be dropped, even if they show up in the `drop_fields` list. [source,yaml] ----------------------------------------------------- diff --git a/vendor/github.com/elastic/beats/libbeat/docs/release.asciidoc b/vendor/github.com/elastic/beats/libbeat/docs/release.asciidoc index 9561a8d..13f7fac 100644 --- a/vendor/github.com/elastic/beats/libbeat/docs/release.asciidoc +++ b/vendor/github.com/elastic/beats/libbeat/docs/release.asciidoc @@ -6,6 +6,8 @@ -- This section summarizes the changes in each release. +* <> +* <> * <> * <> * <> diff --git a/vendor/github.com/elastic/beats/libbeat/docs/version.asciidoc b/vendor/github.com/elastic/beats/libbeat/docs/version.asciidoc index fe17e63..9e76373 100644 --- a/vendor/github.com/elastic/beats/libbeat/docs/version.asciidoc +++ b/vendor/github.com/elastic/beats/libbeat/docs/version.asciidoc @@ -1,4 +1,4 @@ -:stack-version: 5.6.1 +:stack-version: 5.6.2 :doc-branch: 5.6 :go-version: 1.7.6 :release-state: released diff --git a/vendor/github.com/elastic/beats/libbeat/libbeat.template-es6x.json b/vendor/github.com/elastic/beats/libbeat/libbeat.template-es6x.json index 18fffa3..006ba0c 100644 --- a/vendor/github.com/elastic/beats/libbeat/libbeat.template-es6x.json +++ b/vendor/github.com/elastic/beats/libbeat/libbeat.template-es6x.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/metricbeat/metricbeat.template-es2x.json b/vendor/github.com/elastic/beats/metricbeat/metricbeat.template-es2x.json index d9781ee..0f60a43 100644 --- a/vendor/github.com/elastic/beats/metricbeat/metricbeat.template-es2x.json +++ b/vendor/github.com/elastic/beats/metricbeat/metricbeat.template-es2x.json @@ -7,7 +7,7 @@ } }, "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/metricbeat/metricbeat.template-es6x.json b/vendor/github.com/elastic/beats/metricbeat/metricbeat.template-es6x.json index 5879a41..b6c9b59 100644 --- a/vendor/github.com/elastic/beats/metricbeat/metricbeat.template-es6x.json +++ b/vendor/github.com/elastic/beats/metricbeat/metricbeat.template-es6x.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/metricbeat/metricbeat.template.json b/vendor/github.com/elastic/beats/metricbeat/metricbeat.template.json index 5879a41..b6c9b59 100644 --- a/vendor/github.com/elastic/beats/metricbeat/metricbeat.template.json +++ b/vendor/github.com/elastic/beats/metricbeat/metricbeat.template.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/packetbeat/packetbeat.template-es2x.json b/vendor/github.com/elastic/beats/packetbeat/packetbeat.template-es2x.json index 4c4a0c0..53bbf2f 100644 --- a/vendor/github.com/elastic/beats/packetbeat/packetbeat.template-es2x.json +++ b/vendor/github.com/elastic/beats/packetbeat/packetbeat.template-es2x.json @@ -7,7 +7,7 @@ } }, "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/packetbeat/packetbeat.template-es6x.json b/vendor/github.com/elastic/beats/packetbeat/packetbeat.template-es6x.json index 7d7e86a..9065391 100644 --- a/vendor/github.com/elastic/beats/packetbeat/packetbeat.template-es6x.json +++ b/vendor/github.com/elastic/beats/packetbeat/packetbeat.template-es6x.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/packetbeat/packetbeat.template.json b/vendor/github.com/elastic/beats/packetbeat/packetbeat.template.json index 7d7e86a..9065391 100644 --- a/vendor/github.com/elastic/beats/packetbeat/packetbeat.template.json +++ b/vendor/github.com/elastic/beats/packetbeat/packetbeat.template.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/testing/environments/args.yml b/vendor/github.com/elastic/beats/testing/environments/args.yml index 063f852..b3e8c84 100644 --- a/vendor/github.com/elastic/beats/testing/environments/args.yml +++ b/vendor/github.com/elastic/beats/testing/environments/args.yml @@ -6,4 +6,4 @@ services: build: args: DOWNLOAD_URL: https://snapshots.elastic.co/downloads - ELASTIC_VERSION: 5.6.1-SNAPSHOT + ELASTIC_VERSION: 5.6.2-SNAPSHOT diff --git a/vendor/github.com/elastic/beats/testing/environments/docker/elasticsearch/Dockerfile-snapshot b/vendor/github.com/elastic/beats/testing/environments/docker/elasticsearch/Dockerfile-snapshot index 4c0af96..0e73c27 100644 --- a/vendor/github.com/elastic/beats/testing/environments/docker/elasticsearch/Dockerfile-snapshot +++ b/vendor/github.com/elastic/beats/testing/environments/docker/elasticsearch/Dockerfile-snapshot @@ -19,8 +19,8 @@ WORKDIR /usr/share/elasticsearch # Download/extract defined ES version. busybox tar can't strip leading dir. RUN wget ${DOWNLOAD_URL}/elasticsearch/elasticsearch-${ELASTIC_VERSION}.tar.gz && \ - EXPECTED_SHA=$(wget -O - ${DOWNLOAD_URL}/elasticsearch/elasticsearch-${ELASTIC_VERSION}.tar.gz.sha1) && \ - test $EXPECTED_SHA == $(sha1sum elasticsearch-${ELASTIC_VERSION}.tar.gz | awk '{print $1}') && \ + EXPECTED_SHA=$(wget -O - ${DOWNLOAD_URL}/elasticsearch/elasticsearch-${ELASTIC_VERSION}.tar.gz.sha512) && \ + test $EXPECTED_SHA == $(sha512sum elasticsearch-${ELASTIC_VERSION}.tar.gz | awk '{print $1}') && \ tar zxf elasticsearch-${ELASTIC_VERSION}.tar.gz && \ chown -R elasticsearch:elasticsearch elasticsearch-${ELASTIC_VERSION} && \ mv elasticsearch-${ELASTIC_VERSION}/* . && \ diff --git a/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template-es2x.json b/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template-es2x.json index 8bf191b..455d790 100644 --- a/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template-es2x.json +++ b/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template-es2x.json @@ -7,7 +7,7 @@ } }, "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template-es6x.json b/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template-es6x.json index 9291dc5..d2aee9a 100644 --- a/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template-es6x.json +++ b/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template-es6x.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [ diff --git a/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template.json b/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template.json index 9291dc5..d2aee9a 100644 --- a/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template.json +++ b/vendor/github.com/elastic/beats/winlogbeat/winlogbeat.template.json @@ -2,7 +2,7 @@ "mappings": { "_default_": { "_meta": { - "version": "5.6.2" + "version": "5.6.3" }, "date_detection": false, "dynamic_templates": [