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

WIP Feature/out of range#707 #725

Merged
merged 23 commits into from
Jan 6, 2017
Merged

WIP Feature/out of range#707 #725

merged 23 commits into from
Jan 6, 2017

Conversation

121watts
Copy link
Contributor

@121watts 121watts commented Jan 4, 2017

  • CHANGELOG.md updated
  • Rebased/mergable
  • Tests pass
  • Sign CLA (if not already signed)

Connect #707
Connect #711

The problem

Nothing in the GUI or backend for 'out of range' functionality in Chronograf.

The Solution

Add it!

Note

Should probably hold off merging this until the backend work is done for this.

Picture's worth some words:

@@ -143,9 +143,9 @@ type TriggerValues struct {
Period string `json:"period,omitempty"` // Period length of time before deadman is alerted
Shift string `json:"shift,omitempty"` // Shift is the amount of time to look into the past for the alert to compare to the present
Operator string `json:"operator,omitempty"` // Operator for alert comparison
RangeOperator string `json:"range_operator,omitempty"` // RangeOperator is an optional operator for range comparisons
RangeOperator string `json:"rangeOperator,omitempty"` // RangeOperator is an optional operator for range comparisons
Copy link
Contributor

Choose a reason for hiding this comment

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

Please run go fmt ./...

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh also, would you update the documentation in server/swagger.json with the new names?

Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch about the go_fmt. Is the swagger.json hand-edited? I don't recall how to view and work with it.

@@ -23,6 +26,7 @@
}
},
"devDependencies": {
"@kadira/storybook": "^2.21.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

Would you update the LICENSE_OF_DEPENDENCIES.md?

Copy link
Contributor

Choose a reason for hiding this comment

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

Is this auto-generated?

Copy link
Contributor

Choose a reason for hiding this comment

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

Thankfully, it looks like I remembered to check in my script to do it: etc/licenses.sh ... although it looks like the Go licenses are not generated correctly from that script. Anyway, the javascript licenses use this:

nlf -c |awk -F, '{printf "%s %s \[%s\]\(%s\)\n", $1, $2, $5, $4}'

"name": "kapa",
"url": "http://chronograf.influxcloud.net:9092",
"username": "hunter",
"password": "TMnN5JyM35H9m6Hc",
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this a real password? Probably shouldn't be checked in.

Copy link
Contributor

Choose a reason for hiding this comment

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

Haha, wow... My bad. That was absolutely my password.
I'll get that changed right away. I'm not sure how to change it though?
I guess I wasn't expecting that to be kept plaintext in memory on the frontend? Is there any reason for that?

Period string `json:"period,omitempty"` // Period length of time before deadman is alerted
Shift string `json:"shift,omitempty"` // Shift is the amount of time to look into the past for the alert to compare to the present
Operator string `json:"operator,omitempty"` // Operator for alert comparison
RangeOperator string `json:"rangeOperator,omitempty"` // RangeOperator is an optional operator for range comparisons
Copy link
Contributor

Choose a reason for hiding this comment

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

RangeOperator is no longer needed (merge issue)

@121watts 121watts merged commit 1f09402 into master Jan 6, 2017
@121watts 121watts deleted the feature/out-of-range#707 branch January 6, 2017 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants