Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #7997 to 6.x: Add tag "multiline" to "log.flags" if event consists of multiple lines. #8207

Merged
merged 1 commit into from
Sep 11, 2018

Conversation

kvch
Copy link
Contributor

@kvch kvch commented Sep 3, 2018

Cherry-pick of PR #7997 to 6.x branch. Original message:

Add "multiline" tag to "log.status" if the event contains multiple lines. This way users can filter for multiline messages using "multiline" in [log.status].

Example event

{
  "@timestamp": "2018-08-17T11:35:21.813Z",
  "@metadata": {
    "beat": "filebeat",
    "type": "doc",
    "version": "7.0.0-alpha1"
  },
  "source": "/home/n/test.log",
  "offset": 0,
  "log": {
    "status": ["multiline"],
  },
  "message": "[test line\ntest line]",
  "prospector": {
    "type": "log"
  },
  "input": {
    "type": "log"
  },
  "beat": {
    "hostname": "sleipnir",
    "version": "7.0.0-alpha1",
    "name": "sleipnir"
  },
  "host": {
    "name": "sleipnir"
  }
}

Depends on #7991
Closes #957

@kvch
Copy link
Contributor Author

kvch commented Sep 4, 2018

jenkins test this

@ruflin
Copy link
Contributor

ruflin commented Sep 5, 2018

I assume this will need a rebase as soon as the geoip fix is merged / backported into 6.x

@jsoriano FYI

@jsoriano
Copy link
Member

jsoriano commented Sep 5, 2018

#8204 with the fix for the geoip issue merged

@kvch kvch force-pushed the backport_7997_6.x branch from 9792f90 to 5adea77 Compare September 5, 2018 14:36
Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, will need a update

…s. (elastic#7997)

Add "multiline" tag to "log.status" if the event contains multiple lines. This way users can filter for multiline messages using "multiline" in [log.status].

Example event

{
  "@timestamp": "2018-08-17T11:35:21.813Z",
  "@metadata": {
    "beat": "filebeat",
    "type": "doc",
    "version": "7.0.0-alpha1"
  },
  "source": "/home/n/test.log",
  "offset": 0,
  "log": {
    "status": [
        "multiline"
     ],
  },
  "message": "[test line\ntest line]",
  "prospector": {
    "type": "log"
  },
  "input": {
    "type": "log"
  },
  "beat": {
    "hostname": "sleipnir",
    "version": "7.0.0-alpha1",
    "name": "sleipnir"
  },
  "host": {
    "name": "sleipnir"
  }
}

Closes elastic#957

(cherry picked from commit 6da83e8)
@kvch kvch force-pushed the backport_7997_6.x branch from 5adea77 to cb73c73 Compare September 11, 2018 15:27
@kvch
Copy link
Contributor Author

kvch commented Sep 11, 2018

jenkins test this

@kvch
Copy link
Contributor Author

kvch commented Sep 11, 2018

Failing test is unrelated.

@kvch kvch merged commit 4d3ccd6 into elastic:6.x Sep 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants