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.

Sign up for GitHub

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

Jump to bottom

adding timezone support to logparser timestamps #2882

Merged
merged 1 commit into from
Jun 5, 2017
Merged

adding timezone support to logparser timestamps #2882

merged 1 commit into from
Jun 5, 2017

Conversation

sebito91
Copy link
Contributor

@sebito91 sebito91 commented Jun 3, 2017 •
edited
Loading

  • Signed CLA.
  • Associated README.md updated.
  • Has appropriate unit tests.

danielnelson
danielnelson suggested changes Jun 5, 2017
View reviewed changes
Copy link
Contributor

@danielnelson danielnelson left a comment

Choose a reason for hiding this comment

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

Looks great, just a few tweaks needed.

plugins/inputs/logparser/README.md Outdated
@@ -7,15 +7,17 @@ regex patterns.
### Configuration:

```toml
[[inputs.logparser]]
Copy link
Contributor

Choose a reason for hiding this comment

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

Keep this line

plugins/inputs/logparser/README.md Outdated
custom_pattern_files = []
## Custom patterns can also be defined here. Put one pattern per line.

## Custom patterns can also be defined here. Put one pattern per line.
Copy link
Contributor

Choose a reason for hiding this comment

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

Use 2 space indention in here

plugins/inputs/logparser/grok/grok.go Outdated
@@ -155,9 +167,16 @@ func (p *Parser) Compile() error {
p.Measurement = "logparser_grok"
}

p.loc, err = time.LoadLocation(p.Timezone)
if err != nil {
log.Printf("D! improper timezone supplied (%s), setting loc to UTC", p.Timezone)
Copy link
Contributor

Choose a reason for hiding this comment

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

Log this as W!

plugins/inputs/logparser/logparser.go Outdated
## 1. Local -- interpret based on machine localtime
## 2. "Canada/Eastern" -- Unix TZ values like those found in https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
## 3. UTC -- or blank/unspecified, will return timestamp in UTC
timezone = "Canada/Eastern"
Copy link
Contributor

Choose a reason for hiding this comment

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

2 space indention

@danielnelson danielnelson added this to the 1.4.0 milestone Jun 5, 2017
@sebito91
Copy link
Contributor Author

sebito91 commented Jun 5, 2017

Updated with requested changes. Apologies for the whitespace issues, new vimrc config :/

@danielnelson danielnelson merged commit 035905d into influxdata:master Jun 5, 2017
@sebito91 sebito91 deleted the timezone branch June 13, 2017 07:32
jeichorn pushed a commit to jeichorn/telegraf that referenced this pull request Jul 24, 2017
@sebito91 @jeichorn
Add timezone support to logparser timestamps (influxdata#2882)
84bc2a9
@sebito91 sebito91 mentioned this pull request Jul 27, 2017
Closed
maxunt pushed a commit that referenced this pull request Jun 26, 2018
@sebito91 @danielnelson
Add timezone support to logparser timestamps (#2882)
1b3c2cd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danielnelson danielnelson danielnelson requested changes

Assignees
No one assigned
Labels
area/tail
Projects
None yet
Milestone
1.4.0
Development

Successfully merging this pull request may close these issues.
2 participants
@sebito91 @danielnelson