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 Jul 17, 2015
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())

This comment has been minimized.

@kroepke

kroepke Jul 17, 2015
Member

Don't these make sense in debug output?

This comment has been minimized.

@joschi

joschi Jul 17, 2015
Author Contributor

Yeah, I'll add them back.

@kroepke
Copy link
Member

@kroepke 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
1 of 2 checks passed
1 of 2 checks passed
ci Jenkins build graylog2-server-integration-pr 63 has failed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@joschi joschi deleted the web-issue-1533 branch Jul 17, 2015
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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants