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.

Sign up for GitHub

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

Jump to bottom

TimeSeries: Preserve RegExp series overrides when migrating from old graph panel #36134

Merged
merged 1 commit into from Jun 25, 2021
Merged

TimeSeries: Preserve RegExp series overrides when migrating from old graph panel #36134

merged 1 commit into from Jun 25, 2021

Conversation

ashharrison90
Copy link
Contributor

…ld graph

What this PR does / why we need it:

  • checks if the series override is a regex and uses a regex matcher instead if so
  • adds a unit test to preserve this behaviour going forward

Which issue(s) this PR fixes:

Fixes #36085

Special notes for your reviewer:

  • if there's a better/more robust way to check if the string is a regex, happy to make that change 👍

@ashharrison90 ashharrison90 added type/bug add to changelog area/panel/timeseries The main time series Graph panel old backport v8.0.x Mark PR for automatic backport to v8.0.x labels Jun 24, 2021
@ashharrison90 ashharrison90 added this to the 8.0.4 milestone Jun 24, 2021
@ashharrison90 ashharrison90 requested review from a team, torkelo and hugohaggmark and removed request for a team June 24, 2021 14:50
dprokop
dprokop approved these changes Jun 25, 2021
View reviewed changes
Copy link
Member

@dprokop dprokop left a comment

Choose a reason for hiding this comment

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

LGTM

@dprokop dprokop changed the title TimeSeries: Preserve RegExp series overrides when transforming from o… TimeSeries: Preserve RegExp series overrides when migrating from old graph panel Jun 25, 2021
@dprokop dprokop added this to In Review (max. internal 8, external 3) in Frontend Platform Backlog via automation Jun 25, 2021
@ashharrison90 ashharrison90 merged commit b8b90ec into main Jun 25, 2021
Frontend Platform Backlog automation moved this from In Review (max. internal 8, external 3) to Done Jun 25, 2021
@ashharrison90 ashharrison90 deleted the ash-36085 branch June 25, 2021 08:50
grafanabot pushed a commit that referenced this pull request Jun 25, 2021
@ashharrison90 @grafanabot
TimeSeries: Preserve RegExp series overrides when transforming from o…
191cdad 
…ld graph (#36134)

(cherry picked from commit b8b90ec)
@grafanabot grafanabot mentioned this pull request Jun 25, 2021
Merged
ashharrison90 added a commit that referenced this pull request Jun 25, 2021
@grafanabot @ashharrison90
TimeSeries: Preserve RegExp series overrides when transforming from o…
b5b8d22 
…ld graph (#36134) (#36158)

(cherry picked from commit b8b90ec)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
bryanuribe pushed a commit to open-o11y/grafana that referenced this pull request Aug 6, 2021
@ashharrison90 @bryanuribe
TimeSeries: Preserve RegExp series overrides when transforming from o…
4d4ead4 
…ld graph (grafana#36134)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dprokop dprokop dprokop approved these changes

@torkelo torkelo Awaiting requested review from torkelo

@hugohaggmark hugohaggmark Awaiting requested review from hugohaggmark

Assignees
No one assigned
Labels
add to changelog area/frontend area/panel/timeseries The main time series Graph panel old backport v8.0.x Mark PR for automatic backport to v8.0.x type/bug
Projects
None yet
Milestone
8.0.4
Development

Successfully merging this pull request may close these issues.

Converting Graph (old) to Time series does not handle series overrides using regex
3 participants
@ashharrison90 @dprokop @grafanabot