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

Fix dynamic keyword time-ranges for dashboard widgets created from content packs #1308

Merged
merged 3 commits into from Jul 17, 2015

Conversation

joschi
Copy link
Contributor

@joschi joschi commented Jul 17, 2015

Keyword time-ranges are static by default but should be dynamic for dashboard widgets created from content packs.

This PR additionally makes KeywordRange dynamically evaluate the keyword by default and removes the static behaviour completely to prevent accidental usage.

Fixes graylog-labs/graylog2-web-interface#1533

Jochen Schalanda added 2 commits July 17, 2015 11:27
Keyword time-ranges are static by default but should be dynamic for dashboard widgets
created from content packs.

Refs #956
Fixes graylog-labs/graylog2-web-interface#1533
The static behaviour has been removed completely to prevent accidental usage.

Refs #956
@joschi joschi added this to the 1.1.5 milestone Jul 17, 2015
@kroepke kroepke self-assigned this Jul 17, 2015
@@ -99,8 +84,6 @@ public DateTime getTo() {
public String toString() {
return MoreObjects.toStringHelper(this)
.add("keyword", getKeyword())
.add("from", getFrom())
.add("to", getTo())
Copy link
Member

Choose a reason for hiding this comment

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

Don't these make sense in debug output?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I'll add them back.

@kroepke
Copy link
Member

kroepke commented Jul 17, 2015

Apart from the minor question above, lgtm.
Feel free to merge :)

joschi added a commit that referenced this pull request Jul 17, 2015
Fix dynamic keyword time-ranges for dashboard widgets created from content packs
@joschi joschi merged commit d8ea2e6 into 1.1 Jul 17, 2015
@joschi joschi deleted the web-issue-1533 branch July 17, 2015 12:11
joschi added a commit that referenced this pull request Jul 17, 2015
Fix dynamic keyword time-ranges for dashboard widgets created from content packs
(cherry picked from commit d8ea2e6)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants