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

TimeSeries: Fix leading null-fill for missing intervals #67570

Merged
merged 2 commits into from Apr 29, 2023

Conversation

leeoniya
Copy link
Contributor

@leeoniya leeoniya added type/bug add to changelog backport v9.4.x Mark PR for automatic backport to v9.4.x backport v9.5.x Bot will automatically open backport PR labels Apr 29, 2023
@leeoniya leeoniya added this to the 10.0.0 milestone Apr 29, 2023
@leeoniya leeoniya requested a review from ryantxu April 29, 2023 00:40
@leeoniya leeoniya self-assigned this Apr 29, 2023
@leeoniya leeoniya requested a review from a team as a code owner April 29, 2023 00:40
@leeoniya leeoniya added the area/panel/timeseries The main time series Graph panel label Apr 29, 2023
Copy link
Contributor

@nmarrs nmarrs left a comment

Choose a reason for hiding this comment

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

nice!

Co-authored-by: Nathan Marrs  <nathanielmarrs@gmail.com>
@leeoniya leeoniya merged commit e5aeb7c into main Apr 29, 2023
14 checks passed
@leeoniya leeoniya deleted the leeoniya/better-interval-filling branch April 29, 2023 04:35
@grafanabot
Copy link
Contributor

The backport to v9.4.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-67570-to-v9.4.x origin/v9.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e5aeb7c32207733a257ae1ae70c6cba3278a337d
# Push it to GitHub
git push --set-upstream origin backport-67570-to-v9.4.x
git switch main
# Remove the local backport branch
git branch -D backport-67570-to-v9.4.x

Then, create a pull request where the base branch is v9.4.x and the compare/head branch is backport-67570-to-v9.4.x.

@grafanabot grafanabot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label Apr 29, 2023
@grafanabot
Copy link
Contributor

The backport to v9.5.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-67570-to-v9.5.x origin/v9.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e5aeb7c32207733a257ae1ae70c6cba3278a337d
# Push it to GitHub
git push --set-upstream origin backport-67570-to-v9.5.x
git switch main
# Remove the local backport branch
git branch -D backport-67570-to-v9.5.x

Then, create a pull request where the base branch is v9.5.x and the compare/head branch is backport-67570-to-v9.5.x.

leeoniya added a commit that referenced this pull request Apr 29, 2023
(cherry picked from commit e5aeb7c)

# Conflicts:
#	packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
leeoniya added a commit that referenced this pull request Apr 29, 2023
(cherry picked from commit e5aeb7c)

# Conflicts:
#	packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts
leeoniya added a commit that referenced this pull request Apr 29, 2023
)

* TimeSeries: Fix leading null-fill for missing intervals (#67570)

(cherry picked from commit e5aeb7c)

# Conflicts:
#	packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts

* fix jest
leeoniya added a commit that referenced this pull request Apr 29, 2023
)

* TimeSeries: Fix leading null-fill for missing intervals (#67570)

(cherry picked from commit e5aeb7c)

# Conflicts:
#	packages/grafana-ui/src/components/GraphNG/nullInsertThreshold.ts

* fix jest
@zerok zerok modified the milestones: 10.0.0, 10.0.0-preview May 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/frontend area/panel/timeseries The main time series Graph panel backport v9.4.x Mark PR for automatic backport to v9.4.x backport v9.5.x Bot will automatically open backport PR backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants