Adding timeshift units #61
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gauravshah
reviewed
Jun 25, 2019
| @@ -38,6 +38,8 @@ export class MetaQueriesQueryCtrl extends QueryCtrl { | |||
|
|
|||
| defaultPeriods = 7; | |||
|
|
|||
| defaultUnit = "days"; | |||
There was a problem hiding this comment.
default helps not breaking existing ones
src/query_ctrl.ts
Outdated
| @@ -52,6 +54,9 @@ export class MetaQueriesQueryCtrl extends QueryCtrl { | |||
| if (!this.target.periods) { | |||
| this.clearPeriods(); | |||
| } | |||
| if (!this.target.units) { | |||
| this.target.units = this.defaultUnit; | |||
src/query_ctrl.ts
Outdated
| @@ -52,6 +54,9 @@ export class MetaQueriesQueryCtrl extends QueryCtrl { | |||
| if (!this.target.periods) { | |||
| this.clearPeriods(); | |||
| } | |||
| if (!this.target.units) { | |||
There was a problem hiding this comment.
calling this timeshiftUnit might be better. I do understand existing code doesn't do it for periods but would love to scope it to type unless its generic. keeping in mind about stddev etc
|
@rasinhas thanks for the PR |
|
fixes #22 |
Gauravshah
reviewed
Jun 25, 2019
| @@ -248,7 +249,7 @@ function (angular, _, dateMath, moment) { | |||
| data.forEach(function (datum) { | |||
| if(datum.target===metric){ | |||
| datum.datapoints.forEach(function (datapoint) { | |||
| datapoint[1] = dateToMoment(new Date(datapoint[1]),false).subtract(periodsToShift,'days').toDate().getTime(); | |||
| datapoint[1] = dateToMoment(new Date(datapoint[1]),false).subtract(periodsToShift,unit).toDate().getTime(); | |||
There was a problem hiding this comment.
I missed looking at this, can you fix variables and raise another PR ?
Gauravshah
reviewed
Jun 25, 2019
| @@ -221,9 +221,10 @@ function (angular, _, dateMath, moment) { | |||
| var periodsToShift = target.periods; | |||
| var query = target.query; | |||
| var metric = target.metric; | |||
| var unit = target.unit; | |||
Gauravshah
reviewed
Jun 25, 2019
| @@ -38,6 +38,8 @@ export class MetaQueriesQueryCtrl extends QueryCtrl { | |||
|
|
|||
| defaultPeriods = 7; | |||
|
|
|||
| defaultUnit = "days"; | |||
This was referenced Jun 25, 2019
Merged
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added a dropdown element to enable changing the period unit on timeshift.
Unit options are: seconds, minutes, hours, days, weeks and months.