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

feature: timezone support for graylog #7799

Merged
merged 6 commits into from Dec 4, 2017

Conversation

Projects
None yet
4 participants
@crcro
Contributor

crcro commented Nov 26, 2017

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

feature request from community site

before:
screen shot 2017-11-26 at 4 40 06 pm

after:
screen shot 2017-11-26 at 4 39 45 pm

@crcro crcro changed the title from added timezone support for graylog to feature: timezone support for graylog Nov 26, 2017

@murrant

This comment has been minimized.

Show comment
Hide comment
@murrant

murrant Nov 27, 2017

Member

Not sure I like the way this is fixed. I think they should just be displayed in the timezone of the browser accessing them. Which means the translation should probably be done in javascript with moment.js

Member

murrant commented Nov 27, 2017

Not sure I like the way this is fixed. I think they should just be displayed in the timezone of the browser accessing them. Which means the translation should probably be done in javascript with moment.js

@murrant

This comment has been minimized.

Show comment
Hide comment
@crcro

This comment has been minimized.

Show comment
Hide comment
@crcro

crcro Nov 27, 2017

Contributor

but in that case won't it be forced to user? maybe there are some that still would like to get the exact data as graylog stores them

Contributor

crcro commented Nov 27, 2017

but in that case won't it be forced to user? maybe there are some that still would like to get the exact data as graylog stores them

@murrant

This comment has been minimized.

Show comment
Hide comment
@murrant

murrant Nov 28, 2017

Member

If you don't want to force it on the user, you should add a timezone setting to the user settings. With browser timezone as the default.

That is a much larger scope. Up to you.

Member

murrant commented Nov 28, 2017

If you don't want to force it on the user, you should add a timezone setting to the user settings. With browser timezone as the default.

That is a much larger scope. Up to you.

@crcro

This comment has been minimized.

Show comment
Hide comment
@crcro

crcro Nov 28, 2017

Contributor

@murrant: so I made it like:

if no timezone is set in config, print default user timezone using moment.js.
if timezone is set then display using php date functions.

is this better?

Contributor

crcro commented Nov 28, 2017

@murrant: so I made it like:

if no timezone is set in config, print default user timezone using moment.js.
if timezone is set then display using php date functions.

is this better?

@laf

This comment has been minimized.

Show comment
Hide comment
@laf

laf Nov 29, 2017

Member

Any reason why you've removed my name from the copyright?

Member

laf commented Nov 29, 2017

Any reason why you've removed my name from the copyright?

crcro added some commits Nov 29, 2017

@crcro

This comment has been minimized.

Show comment
Hide comment
@crcro

crcro Nov 29, 2017

Contributor

By mistake, copy/paste the entire copyright section, restored it. Sorry

Contributor

crcro commented Nov 29, 2017

By mistake, copy/paste the entire copyright section, restored it. Sorry

@murrant

This comment has been minimized.

Show comment
Hide comment
@murrant

murrant Dec 1, 2017

Member

Yeah, seems a like a good compromise for now. Thanks.

Member

murrant commented Dec 1, 2017

Yeah, seems a like a good compromise for now. Thanks.

@laf

Thanks for this. One little change from me.

I've also posted in the original issue for testers. If we don't hear from someone in a few days then I'm happy to merge in.

Show outdated Hide outdated html/includes/table/graylog.inc.php
@scrutinizer-notifier

This comment has been minimized.

Show comment
Hide comment
@scrutinizer-notifier

scrutinizer-notifier Dec 4, 2017

The inspection completed: No new issues

scrutinizer-notifier commented Dec 4, 2017

The inspection completed: No new issues

@laf

laf approved these changes Dec 4, 2017

@laf laf merged commit 0cb3470 into librenms:master Dec 4, 2017

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@crcro crcro deleted the crcro:feature-graylog-timezone branch Dec 4, 2017

@lock

This comment has been minimized.

Show comment
Hide comment
@lock

lock bot May 16, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

lock bot commented May 16, 2018

This thread has been automatically locked since there has not been any recent activity after it was closed.

@lock lock bot locked as resolved and limited conversation to collaborators May 16, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.