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

GrafanaDS: Add support for annotation time regions #65462

Merged
merged 99 commits into from
Apr 21, 2023
Merged

GrafanaDS: Add support for annotation time regions #65462

merged 99 commits into from
Apr 21, 2023

Conversation

leeoniya
Copy link
Contributor

@leeoniya leeoniya commented Mar 28, 2023 •
edited by adela-almasan

time-regions1

Setting up time regions:

time-regions.mov

Fixes: #35486

Testing steps:

  1. Create a Dashboard
  2. Add a Timeseries panel
  3. Go to Dashboard Settings -> Annotations -> New Query
  4. Add a new annotation with Data source: -- Grafana --
  5. Query section - choose Query type: Time regions
  6. Set a region (from/to/time/timezone)
  7. Apply/Save Dashboard
  8. Go back to the panel, refresh, time regions annotations should be visible and correctly represented

@leeoniya leeoniya added this to the 10.0.0 milestone Mar 28, 2023
@leeoniya leeoniya added area/panel/timeseries The main time series Graph panel and removed area/frontend labels Mar 28, 2023
@github-advanced-security
Copy link

You have successfully added a new CodeQL configuration .github/workflows/pr-codeql-analysis-javascript.yml:analyze. As part of the setup process, we have scanned this repository and found 27 existing alerts. Please check the repository Security tab to see all alerts.

nmarrs
nmarrs reviewed Apr 21, 2023
View reviewed changes
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.

A number of nits 😬 testing locally things are working great, the issue described in #66625 is definitely noticeable though so we will for sure want to address that for G10 release
Screenshot 2023-04-20 at 10 37 03 PM

public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx Show resolved Hide resolved
public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx Outdated Show resolved Hide resolved
public/app/plugins/datasource/grafana/components/TimePickerInput.tsx Outdated Show resolved Hide resolved
public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx Outdated Show resolved Hide resolved
public/app/plugins/datasource/grafana/components/TimeRegionEditor.tsx Outdated Show resolved Hide resolved
public/app/plugins/datasource/grafana/datasource.ts Show resolved Hide resolved
public/app/plugins/datasource/grafana/timeRegions.test.ts Outdated Show resolved Hide resolved
public/app/plugins/datasource/grafana/timeRegions.test.ts Show resolved Hide resolved
public/app/plugins/datasource/grafana/timeRegions.test.ts Show resolved Hide resolved
public/app/plugins/datasource/grafana/timeRegions.ts Outdated Show resolved Hide resolved
ryantxu
ryantxu approved these changes Apr 21, 2023
View reviewed changes
Copy link
Member

@ryantxu ryantxu left a comment

Choose a reason for hiding this comment

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

🌮

@adela-almasan adela-almasan enabled auto-merge (squash) April 21, 2023 20:20
@adela-almasan adela-almasan merged commit faad4b9 into main Apr 21, 2023
14 checks passed
@adela-almasan adela-almasan deleted the built-in-regions branch April 21, 2023 20:25
@BuckarooBanzay
Copy link

nice work ❤️

@adela-almasan adela-almasan restored the built-in-regions branch April 24, 2023 21:03
@adela-almasan adela-almasan mentioned this pull request Apr 24, 2023
Closed
@leeoniya leeoniya mentioned this pull request May 5, 2023
Closed
@zerok zerok modified the milestones: 10.0.0, 10.0.0-preview May 31, 2023
@yweiy10
Copy link

yweiy10 commented Jun 20, 2023

Hello team,
This is a really great feature! Is there any plans to backport it into the previous versions, like 9.5?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nmarrs nmarrs nmarrs left review comments

@adela-almasan adela-almasan adela-almasan left review comments

@ryantxu ryantxu ryantxu approved these changes

@grafanabot grafanabot Awaiting requested review from grafanabot grafanabot is a code owner

@tskarhed tskarhed Awaiting requested review from tskarhed tskarhed is a code owner automatically assigned from grafana/grafana-frontend-platform

@ashharrison90 ashharrison90 Awaiting requested review from ashharrison90 ashharrison90 is a code owner automatically assigned from grafana/grafana-frontend-platform

@axelavargas axelavargas Awaiting requested review from axelavargas axelavargas was automatically assigned from grafana/dashboards-squad

@polibb polibb Awaiting requested review from polibb polibb was automatically assigned from grafana/dashboards-squad

Assignees

@leeoniya leeoniya

@ryantxu ryantxu

@adela-almasan adela-almasan

Labels
add to changelog add to what's new area/datasource area/frontend area/panel/timeseries The main time series Graph panel no-backport Skip backport of PR
Projects
None yet
Milestone
10.0.0-preview
Development

Successfully merging this pull request may close these issues.

Time series panel: Add support for time regions
8 participants
@leeoniya @BuckarooBanzay @yweiy10 @ryantxu @nmarrs @adela-almasan @zerok @grafanabot