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

Prometheus: Fix copy paste behaving as cut and paste #28622

Merged
merged 1 commit into from
Oct 30, 2020

Conversation

aocenas
Copy link
Member

@aocenas aocenas commented Oct 28, 2020

Fixes: #28571

To reproduce it should just need to have 2 queries in explore and copy one part from one to another and then running the query (does not have to return data). The source query should be changed and the copied part should be deleted.

This is not a totally direct fix the issue seems to be that if this line runs at some point after the contents are pasted it will erase the copied part (from the source of the copy paste which is even stranger). cc @kaydelaney did you encounter something like this with Slate? Seems to be like their bug.

This fix mainly changes the behaviour of requesting metrics on time range change (which also happens on running query in case of relative range) so the offending line isn't even run after the initial mount.

This also fixes an issue with hints which we seem to have disabled after adding this hint Dynamic label lookup is disabled for datasources with more than ${lookupMetricsThreshold} metrics..

@aocenas aocenas requested review from a team, jackw, dprokop and zoltanbedi and removed request for a team October 28, 2020 22:14
if (languageProvider !== prevProps.datasource.languageProvider) {
// We reset this only on DS change so we do not flesh loading state on every rangeChange which happens on every
// query run if using relative range.
this.setState({
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the main fix that we are clearing this state only here not every time we refreshMetrics

@@ -298,17 +300,7 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
]
: metricsByPrefix;

// Hint for big disabled lookups
Copy link
Member Author

Choose a reason for hiding this comment

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

This fixes the hint as here it could end up null and rewriting any existing hints in state.

checkMetricsInCascader(await screen.findByRole('button'), changedMetrics);
});

it('refreshes metrics when time range changes but dont show loading state', async () => {
Copy link
Member Author

Choose a reason for hiding this comment

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

Testing slate itself is tricky so this is just indirect test and just checks if we get to loading state after timeRange change

@aocenas aocenas added this to the 7.3.1 milestone Oct 29, 2020
Copy link
Member

@zoltanbedi zoltanbedi 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 added add to changelog old backport v7.3.x Mark PR to be automatically backported to v7.3.x labels Oct 30, 2020
@aocenas aocenas merged commit 43a0167 into master Oct 30, 2020
@aocenas aocenas deleted the aocenas/fix-copy-paste branch October 30, 2020 09:03
grafanabot pushed a commit that referenced this pull request Oct 30, 2020
dprokop pushed a commit that referenced this pull request Oct 30, 2020
(cherry picked from commit 43a0167)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
@chancez
Copy link

chancez commented Nov 2, 2020

I'm still seeing this in 7.3.1

@zoltanbedi
Copy link
Member

@chancez this is not released yet. Will be in 7.3.2.

@aocenas
Copy link
Member Author

aocenas commented Nov 3, 2020

@dprokop should we change the milestone here? As there is already this PR #28691 would that confuse the release scripts somwhow?

@chancez
Copy link

chancez commented Nov 3, 2020

@aocenas @zoltanbedi I saw it in the 7.3.1 release notes, so that should get fixed.

@zoltanbedi zoltanbedi added this to the 7.3.2 milestone Nov 10, 2020
@zoltanbedi
Copy link
Member

@aocenas @zoltanbedi I saw it in the 7.3.1 release notes, so that should get fixed.

Thanks @chancez, I've removed it from the changelog.

lunaticusgreen added a commit to percona/grafana that referenced this pull request Feb 18, 2021
* Fix: Dynamically add ShowWhen fields to the form watch (#28135)

* Snapshots: Store dashboard data encrypted in the database (#28129)

* end 2 end

* fix import

* refactor

* introduce securedata

* check err

* use testify instead of convey

* cleanup test

* cleanup test

* blob time

* rename funcs

* JSON syntax update (#28193)

JSON syntax update

* Users: Expire old user invites (#27361)

* expire with existng cleanup service

* expire with new temp user service

* make Drone happy :)

* add expiry status

* remove other approach

* cleanup

* add test for idempotency

* add migration from datetime to unix ts

* update cmd names

* change lifetime config to duration

* remove unnecessart formatting

* add comment

* update docs

* remove max bound and introduce min error

* simplify sql

* remove comment

* allow any outstanding to exist for at least 24 hours

* revert created ts change

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* add extra state check to cleanup step

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Automation: New label command to close issue that has no new info & activity  (#28201)

* Automation: New label command

Adds a label command "no new info" 

That closes issue with standard message. 

We could also add an automated scheduled task that does this automatically: 
https://github.com/microsoft/vscode/blob/master/.github/workflows/needs-more-info-closer.yml

* Update .github/commands.json

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* Update .github/commands.json

Co-authored-by: Marcus Olsson <marcus.olsson@hey.com>

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Marcus Olsson <marcus.olsson@hey.com>

* Database: Adds new indices to alert_notification_state and alert_rule_tag tables (#28166)

Add non-unique indices to alert_notification_state and alert_rule_tag tables for 
column alert_id.

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

Fixes #22890

* Cloudwatch: Fix regression with profile datasource field (#28138)

* Fallback to the old field only if new field is undefined

* Added DOT(.) at end of line (#28161)

Hi - I have observed Dot(.) is missing in many places of paragraphs in document. So raising this PR.

Added Dot(.) to below line
This page shows how to use regex to filter/modify values in the variable dropdown.

Thanks,
Ashish

* Added Dot(.) at the end of line (#28150)

Hi - Added Dot(.) at the end of line.

Thanks,
Ashish

* Added link to Plugins (#28149)

* Added link to Plugins

HI - Added link to Plugins for quick redirection

Thanks,
Ashish

* Update configuration.md

* Removal of repeated words (#28194)

Removal of repeated words

* Docs: Fix typo in cloud monitoring docs (#28213)

* Use latest @grafana/eslint-config (#28225)

* Use latest @grafana/eslint-config

* Updated lockfile

* Added Hyperlink to Alert Notification (#28197)

Hi, I have added hyperlink to alert notification for quick redirection.

Thanks,
Ashish

* Theme: Deprecate selectThemeVariant util function (#28223)

* @grafana/eslint-config bump (#28230)

* Use latest @grafana/eslint-config

* Version bump

* Added hyperlink to Prometheus (#28196)

Hi - I have added hyperlink to Prometheus. Pls review and merge.

Thanks,
Ashish

* Tracing: Add Tempo data source (#28204)

* Add tempo datasource, mostly copy of jaeger datasource code

* Add label to input field

* Add logo

* Remove access option from configuration

* Add white space to field label

* Add documentation

* Fix link in docs

* Update public/app/plugins/datasource/tempo/ConfigEditor.tsx

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Update public/app/plugins/datasource/tempo/QueryField.tsx

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Add data source to the docs menu

* Add simple implementation for testDatasource

* Wording updates to the docs.

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Added Dot(.) at the end of line. (#28198)

Hi - Added Dot(.) to end the paragraph.

Thanks

* Build: handles verify-repos failures correctly (#28227)

* Build: handles verify-repos failures correctly

* shellcheck

* Added Dot at the end of line (#28233)

Hi - Added Dot at the end of line to make it consistent.

Thanks,
Ashish

* Azure: Fixes merging of requests with different Azure sources (#28221)

* Azure: Fixes merging of requests with different Azure sources

* Refactor: Changes return type

* change grafana to Grafana (#28244)

Hi - Made minor change grafana to Grafana in More examples section.

Thanks,
Ashish

* Docs: Change grafana to Grafana (#28243)

Hi - There is minor change grafana to Grafana in scripted-dashboards page.

Thanks,
Ashish

* NamedColors: Named colors refactors (#28235)

* NamedColors: Refactoring, performance improvements, and simplifications

* More simplifification

* Updated to use new function

* Updates

* Updates

* Updated BarGauge to use fallback color intead of magic string

* Updates

* Fixed unused import

* Loki: LogQL v2 support (#27884)

* Add new logql v2 functions

* Fix autocompletion if missing ending }

* Refactor operators regex, add pipe operator and tests

* Add parsers

* Update tests

* Add parsers to suggestions, add test

* Add operators to syntax

* Create pipe operator autocomplete + highlighting + add tests

* Add to documentation that pipe operations are available in in Loki 2.0+

* Update snapshot test

* Update operators list, add regex quotes and move cursor

* Fix spelling

* Update documentation

* Update

* Docs: Change grafana to Grafana (#28242)

Hi - Made minor change grafana to Grafana.

Thanks,
Ashish

* Chore: Add Dockerfile for Windows CI build environment (#28241)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Migration: TestData Query Editor (#27997)

* Use new editor

* Add basic fields

* Add labels

* Add ids

* Add ManualEntryEditor

* Use tooltip prop

* Switch to inline labels

* Fix inline label tooltip position

* Allow resetting max-width

* Replace form inputs

* Add random walk editor

* separate editors

* Add logs and endpoints fields

* Add PredictablePulseEditor

* Add CSVWaveEditor

* Add grow prop

* Add default query

* Fix types

* Fix manual editor

* Fix type issues

* Handle scenario change

* Sort scenarios by label

* Add ManualEditor test

* Fix label height

* test manual editor

* Update test

* Setup QueryEditor tests

* Fix selected value

* Connect CSVWaveEditor

* Convert stream data to numbers

* Fix random walk editor

* Cleanup

* Convert scenarios to ts

* Remove extra icon styles

* Minor tweaks

* Update e2e tests

* Remove useEffect

* Add missing aria-labels

* Use new button components

* Dashboard: Allow shortlink generation (#27409)

* intial frontend resolution/redirection logic

* backend scaffolding

* enough of the frontend to actually test end to end

* bugfixes

* add tests

* cleanup

* explore too hard for now

* fix build

* Docs: add docs

* FE test

* redirect directly from backend

* validate incoming uids

* add last_seen_at

* format documentation

* more documentation feedback

* very shaky migration of get route to middleware

* persist unix timestamps

* add id, orgId to table

* fixes for orgId scoping

* whoops forgot the middleware

* only redirect to absolute URLs under the AppUrl domain

* move lookup route to /goto/:uid, stop manually setting 404 response code

* renaming things according to PR feedback

* tricky deletion

* sneaky readd

* fix test

* more BE renaming

* FE updates -- no more @ts-ignore hacking :) and accounting for subpath

* Simplify code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Short URLs: Drop usage of bus

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* ShortURLService: Make injectable

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Rename file

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Add handling of url parsing and creating of full shortURL to backend

* Update test, remove unused imports

* Update pkg/api/short_urls.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Add correct import

* Pass context to short url service

* Remove not needed error log

* Rename dto and field to denote URL rather than path

* Update api docs based on feedback/suggestion

* Rename files to singular

* Revert to send relative path to backend

* Fixes after review

* Return dto when creating short URL that includes the full url

Use full url to provide shorten URL to the user

* Fix after review

* Fix relative url path when creating new short url

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Ivana <ivana.huckova@gmail.com>
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Variables: prevent adhoc filters from crashing when they are not loaded properly (#28226)

* fixing so we will present a better error message when loading ad hoc filter variables.

* added tests to verify url parsing.

* added a test to make sure it works the oppisite way.

* Docker: OpenShift compatability (#27813)

* openshift wip

* Docker: switches from grafana group to root group

* Docker: make group fully configurable

* Docker: create custom grafana group if needed

* Docker: removes duplicated group permission

* Docker: more unneccesary changes

* Dashboard: Do not allow users without edit permission to a folder to see new dashboard page (#28249)

* Build: added steps to generate packages api documentation. (#27930)

* added steps to generate docs.

* re-generated the drone.yml file.

* removed metrics reporting from pr pipeline.

* fixed spelling issues.

* fixed so package generation should work.

* some small refactorings.

* fixed spelling error.

* adding echo to verify that we execute the correct script.

* removed echo statement.

* changed scripts a bit.

* added ci flag to script.

* adding exit 1

* increased the limit.

* added missing space.

* fixed shellcheck error.

* fixing lint errors.

* renamed build step.

* changed logic.

* increased limit.

* changed to echo instead of echo -e

* fixed shellcheck errors.

* trying to debug script,

* trying to simplify the find statement.

* fixed issue with text formatting on linux.

* imported build step.

* Update scripts/ci-reference-docs-lint.sh

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* removed cleanup of packages.

* increased limit.

* will build frontend docs on master but not lint it.

* will always run the linting step.

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Cloud monitoring: out-of-the-box dashboards (#27864)

* Cloud monitoring: out-of-the-box dashboards

* Remove redundant information related to dev account

* Update docs/sources/features/datasources/cloudmonitoring.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Rename JSON files

* Fix docs

* Fixe docs

* Parameterise dashboards by CM datasource

* Fix metric kind in CloudSQL dashboard

* Set alias to instance name for GCE dashboard panels

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Added hyperlink to Data Source Proxy (#28246)

Hi - Added hyperlink to Data Source Proxy. Pls review and approve.

Thanks,
Ashish

* fix: prevent graph-panel legend overflowing container (#28254)

* Docs: remove checked-in generated package api docs. (#27880)

* Gauge: Improve text sizing and support non threshold color modes (#28256)

* Gauge: Improve text sizing and support non threshold color modes

* Updated tests

* Dashboard: Fixed issue accessing horizontal table scrollbar when placed at bottom of dashboard (#28250)

* Docs: generate packages docs before syncing to website (#27879)

* updated to latest version of api-documenter.

* saved lockfile after upgrade.

* adding yarn to docker environment.

* adding packages to trigger paths.

* added steps to workflow for generating docs.

* reverted back to api-documenter 0.9.3

* Variables: Fixes so constants set from url get completed state (#28257)

* Variables: Fixes so constant set from url get completed state

* Tests: fixes broken test

* Explore:  Allow shortlink generation (#28222)

* Add short link functionality to Explore and Rich history

* Update documentation

* Implement short url for explore

* Implement short link in Rich history

* Update docs

* Add error alert

* Transformations: improve the reduce transformer (#27875)

* Chore: clean up Enterprise feature toggles (#28264)

* Chore: use new Input component in Share Modal (#28269)

* Chore: Add dashboard-alt icon

* Chore: use new Input component in Share Modal

* Update packages/grafana-ui/src/types/icon.ts

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* Update public/app/features/dashboard/components/ShareModal/ShareLink.tsx

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* Update packages/grafana-ui/src/types/icon.ts

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* Transformations: add Concatenate fields transformer (#28237)

* Drone: Fix enterprise config (#28270)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Added Hyperlink to annotations (#28261)

Hi -  Added Hyperlink to annotations for quick redirection.

Thanks,
Ashish

* Explore: Add link to logs from trace span (#28229)

* Add trace to logs link

* Do a bit of refactor and allow for custom time range in split

* Add margin and noopener to the link

* Fix tests

* Fix tests

* Prometheus: Data source settings page help wording. (#28274)

* Add a space between: "handled." and "Server".

This text is .. a little ambiguous, is it:
  "handled.Server()..."

or:
  "handled. Server should...."

Punctuation it matters.
  https://i.pinimg.com/originals/ad/db/a1/addba11374256fd0b1d679a595f57d9b.jpg

* Fix the sentence to be readable.

* BackendSrv: Reloads page instead of redirect on Unauthorized Error (#28276)

* feat(grafana/ui): export FieldArray (#28251)

* Docs: Add What's New 7.3 (#28268)

* add base

* Update docs/sources/whatsnew/whats-new-in-v7-3.md

* Update What's new in 7.3 with CM OOTB dashboards

* Docs: enterprise whats new placeholders

* Add short url info

* Update shorten url after pull

* Update docs/sources/whatsnew/whats-new-in-v7-3.md

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Sofia Papagiannaki <sofia@grafana.com>
Co-authored-by: Leonard Gram <leo@xlson.com>
Co-authored-by: Ivana <ivana.huckova@gmail.com>

* Drone: Use DRONE_COMMIT_REF to get release tag (#28283)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: Update what's new and release notes URL in package.json

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Release 7.3.0-beta1

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Fixes

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Fixes

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* BackendSrv: Fixes queue countdown when unsubscribe is before response (#28323) (#28328)

(cherry picked from commit 9305117902a3698fcefc5d3063f58867717e34ce)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>

* Instrumentation: Adds environment_info metric (#28355) (#28388)

Signed-off-by: bergquist <carl.bergquist@gmail.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 89ebb97fcaa22488f5d56911e6703360899b56ae)

Co-authored-by: Carl Bergquist <carl@grafana.com>

* CloudWatch: Fix custom metrics (#28391) (#28401)

* CloudWatch: Fix querying for custom metrics

Co-authored by Mitch McKenzie <mitch.mckenzie@outlook.com>

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit af17f9fd9b38e364c31fc98c65acd1ee4f1d6365)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* ColorSchemes: Adds more color schemes and text colors that depend on the background (#28305) (#28414)

* Adding more color modes and text colors that depend on the background color

* Updates

* Updated

* Another big value fix

* Fixing unit tests

* Updated

* Updated test

* Update

* Updated

* Updated

* Updated

* Updated

* Added new demo dashboard

* Updated

* updated

* Updated

* Updateed

* added beta notice

* Fixed e2e test

(cherry picked from commit 566cd2c6af8dc95b00b79d30e124b9517739f446)

* FieldColor: Remove inverted color scheme (#28408) (#28418)

(cherry picked from commit 84992adf2a9a437bbfec0018ed7052c42bb73e5a)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* App Plugins: Add backend support (#28272) (#28423)

* Add backend support for app plugins

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 68efedfa88cd8b907aff2d101e88c7577014cb17)

Co-authored-by: Joan López de la Franca Beltran <joanjan14@gmail.com>

* plugins: Don't exit on duplicate plugin (#28390) (#28430)

* plugins: Don't exit on duplicate plugin

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Add missing files

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix test

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 4084b53f917c0b2a3c0710401a3b96bdc5baf6b0)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Plugins: do not remount app plugin on nav change (#28105) (#28426)

* do not remount app plugin on nav change

* test for not mounting app plugin twice

(cherry picked from commit 97526fc492c0b3137d30fcf521139f1a2734ec7b)

Co-authored-by: Domas <domas.lapinskas@grafana.com>

* TestData: multiple arrow requests should return multiple frames (#28417) (#28441)

(cherry picked from commit f32d47a53515ad7ce5b30fc37c3d7e2e63e49f29)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>

* Live: support real time measurements (alpha) (#28022) (#28451)

* improve reduce transformer

* add measurment classes

* sync with new grafana measure format

* use address for live

* use plural in URL

* set the field name

* fix build

* find changes

* POST http to channel

* Yarn: Update lock file (#28014)

* Loki: Run instant query only in Explore (#27974)

* Run instant query only in Explore

* Replace forEach with for loop

* don't cast

* Docs: Fixed row display in table (#28031)

* Plugins: Let descendant plugins inherit their root's signature (#27970)

* plugins: Let descendant plugins inherit their root's signature

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Registry: Fix service shutdown mode trigger location (#28025)

* Add Alex Khomenko as member (#28032)

* show history

* fix confirm

* fix confirm

* add tests

* fix lint

* add more errors

* set values

* remove unrelated changes

* unrelated changes

* Update pkg/models/live.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/models/live.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/services/live/live.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/services/live/pluginHandler.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/services/live/pluginHandler.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/services/live/pluginHandler.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* use measurments for testdata endpoints

* add live to testdata

* add live to testdata

* Update pkg/services/live/channel.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Apply suggestions from code review

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* update comment formats

* uprevert testdata

* Apply suggestions from code review

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>

* Apply suggestions from code review

* CloudWatch: Add EC2CapacityReservations Namespace (#28309)

* API: Fix short URLs (#28300)

* API: Fix short URLs

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Chore: Add cloud-middleware as code owners (#28310)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* SQLStore: Run tests as integration tests (#28265)

* sqlstore: Run tests as integration tests

* Truncate database instead of re-creating it on each test

* Fix test description

See https://github.com/grafana/grafana/pull/12129

* Fix lint issues

* Fix postgres dialect after review suggestion

* Rename and document functions after review suggestion

* Add periods

* Fix auto-increment value for mysql dialect

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Drone: Fix grafana-mixin linting (#28308)

* Drone: Fix Starlark script

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* grafana-mixin: Move build logic to scripts

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Use mixin scripts

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* CI build image: Install jsonnetfmt and mixtool

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Makefile: Print commands

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* should only ignore the file in the grafana mixin root folder (#28306)

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* fix: for graph size not taking up full height or width

* Graph NG: fix toggling queries and extract Graph component from graph3 panel (#28290)

* Fix issue when data and config is not in sync

* Extract GraphNG component from graph panel and add some tests coverage

* Update packages/grafana-ui/src/components/uPlot/hooks.test.ts

* Update packages/grafana-ui/src/components/uPlot/hooks.test.ts

* Update packages/grafana-ui/src/components/uPlot/hooks.test.ts

* Fix grid color and annotations refresh

* Drone: Use ${DRONE_TAG} in release pipelines, since it should work (#28299)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Explore: respect min_refresh_interval (#27988)

* Explore: respect min_refresh_interval

Fixes #27494

* fixup! Explore: respect min_refresh_interval

* fixup! Explore: respect min_refresh_interval

* UI: export defaultIntervals from refresh picker

* fixup! Explore: respect min_refresh_interval

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Loki: Base maxDataPoints limits on query type (#28298)

* Base maxLines and maxDataPoints based on query type

* Allow overriding the limit to higher value

* Bump tree-kill from 1.2.1 to 1.2.2 (#27405)

Bumps [tree-kill](https://github.com/pkrumins/node-tree-kill) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/pkrumins/node-tree-kill/releases)
- [Commits](https://github.com/pkrumins/node-tree-kill/compare/v1.2.1...v1.2.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump handlebars from 4.4.3 to 4.7.6 (#27416)

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.4.3 to 4.7.6.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.4.3...v4.7.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Build(deps): Bump http-proxy from 1.18.0 to 1.18.1 (#27507)

Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/http-party/node-http-proxy/compare/1.18.0...1.18.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Automation: Add backport github action (#28318)

* BackendSrv: Fixes queue countdown when unsubscribe is before response (#28323)

* GraphNG: Use AxisSide enum (#28320)

* IssueTriage: Needs more info automation and messages (#28137)

* IssueTriage: Needs more info automation and messages

* Updated

* Updated

* Updated wording

* SAML: IdP-initiated SSO docs (#28280)

* SAML: IdP-initiated SSO docs

* Update docs/sources/enterprise/saml.md

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Apply suggestions from code review

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Loki: Run instant query only when doing metric query (#28325)

* Run instant query only when doing metric query

* Update public/app/plugins/datasource/loki/datasource.ts

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* Automation: Tweaks to more info message (#28332)

* AlertingNG: remove warn/crit from eval prototype (#28334)

and misc cleanup

* area/grafana/toolkit: update e2e docker image (#28335)

* add xvfb to image

* comment out toolkit inclusion

* add latest tag

* update packages for cypress

* cleanup script

* Update auth-proxy.md (#28339)

Fix a minor grammar mistake: 'handling' to 'handle'.

* Git: Create .gitattributes for windows line endings (#28340)

With this set, Windows users will have text files converted from Windows style line endings (\r\n) to Unix style line endings (\n) when they’re added to the repository.
https://www.edwardthomson.com/blog/git_for_windows_line_endings.html

* Docs: Add docs for valuepicker (#28327)

* Templating: Replace all '$tag' in tag values query (#28343)

* Docs: Add missing records from grafana-ui 7.2.1 CHANGELOG (#28302)

* Dashboard links: Places drop down list so it's always visible (#28330)

* calculating whether to place the list on the right or left edge of the parent

* change naming and add import of createRef

* Automation: Update backport github action trigger (#28352)

It seems like GitHub has solved the problem of running github actions on PRs from forks with access to secrets.

https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/#improvements-for-public-repository-forks

If I change the event that triggers it to pull_request_target the action is run in the context of the base instead of the merged PR branch

* ColorSchemes: Adds more color schemes and text colors that depend on the background (#28305)

* Adding more color modes and text colors that depend on the background color

* Updates

* Updated

* Another big value fix

* Fixing unit tests

* Updated

* Updated test

* Update

* Updated

* Updated

* Updated

* Updated

* Added new demo dashboard

* Updated

* updated

* Updated

* Updateed

* added beta notice

* Fixed e2e test

* Fix typos

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* revert pseduo code

* apply feedback

* remove HTTP for now

* fix backend test

* change to datasource

* clear input for streams

* fix docs?

* consistent measure vs measurements

* better jsdocs

* fix a few jsdoc errors

* fix comment style

* Remove commented out code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Clean up code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Clean up code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Clean up code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Clean up code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Clean up code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Clean up code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Clean up code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/models/live.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix build

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* set the stringField

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Co-authored-by: ozhuang <ozhuang.95@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Amos Law <ahlaw.dev@gmail.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
Co-authored-by: The Rock Guy <fabian.bracco@gvcgroup.com.au>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
Co-authored-by: Carl Bergquist <carl@grafana.com>
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Elliot Pryde <elliot.pryde@elliotpryde.com>
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
Co-authored-by: Kyle Brandt <kyle@grafana.com>
Co-authored-by: Brian Gann <briangann@users.noreply.github.com>
Co-authored-by: J-F-Far <joel.f.farthing@gmail.com>
Co-authored-by: acoder77 <73009264+acoder77@users.noreply.github.com>
Co-authored-by: Peter Holmberg <peterholmberg@users.noreply.github.com>
Co-authored-by: Krzysztof Dąbrowski <krzysdabro@live.com>
Co-authored-by: maknik <mooniczkam@gmail.com>
(cherry picked from commit 2aafa3987960952cd558fc727978646f59faacc9)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>

* Explore: Support wide data frames (#28393) (#28454)

* Change how isTimeSeries work

* Simplify the decorators and update tests

(cherry picked from commit 8f4be08b00f3f3b095b9cc795097766273b29b00)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>

* Loki: Visually distinguish error logs for LogQL2 (#28359) (#28460)

* Loki: Add errored logs and update UI

* Update messaging

* Add icon and tooltip for errored logs

* Update name of variable for more semantic meaning

* Add tests

* Update test

* Refactor, remove unnecessary state

* Update packages/grafana-data/src/types/logs.ts

* Update packages/grafana-ui/src/components/Logs/LogDetails.tsx

Co-authored-by: Giordano Ricci <gio.ricci@grafana.com>

Co-authored-by: Giordano Ricci <gio.ricci@grafana.com>
(cherry picked from commit 3f39b4b601a67a8de48b2abc96c381cee8095e5a)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* AzureMonitor: Fix capitalization of NetApp 'volumes' namespace (#28369) (#28459)

'Microsoft.NetApp/netAppAccounts/capacityPools/Volumes'  -> 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes'

(cherry picked from commit d2a792ea3b316650e07d3c124892a51582796516)

Co-authored-by: Sean Luce <lucesean@gmail.com>

* SAML: IdP-initiated SSO docs (#28280) (#28462)

* SAML: IdP-initiated SSO docs

* Update docs/sources/enterprise/saml.md

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Apply suggestions from code review

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
(cherry picked from commit 2087ff6003f24989f0d153eeb3ef03d6a1f224e8)

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>

* Add monitoring mixing for Grafana (#28285)

Co-authored-by: Tom Wilkie <tom.wilkie@gmail.com>
(cherry picked from commit 6002df580ff22f0f5f6df84c074f39bda67cb7b4)

* Jaeger: timeline collapser to show icons (#28284)

* Fix: timeline collapser to show icons

* Use IconButton

* Export named component instead of default

(cherry picked from commit e93bd23353ff43195bfe0e480e9bcd57b116f95e)

* CloudWatch: Add EC2CapacityReservations Namespace (#28309)

(cherry picked from commit c9cc82ea5583bbc100f7e3a62ec33b487bcc765b)

* API: Fix short URLs (#28300)

* API: Fix short URLs

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit a2c7c5b912695361c6f5d852df1ed69ec118b233)

* SQLStore: Run tests as integration tests (#28265)

* sqlstore: Run tests as integration tests

* Truncate database instead of re-creating it on each test

* Fix test description

See https://github.com/grafana/grafana/pull/12129

* Fix lint issues

* Fix postgres dialect after review suggestion

* Rename and document functions after review suggestion

* Add periods

* Fix auto-increment value for mysql dialect

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
(cherry picked from commit 4937f0daabb42304f1ee544da02bcf35d1336fe1)

* Drone: Fix grafana-mixin linting (#28308)

* Drone: Fix Starlark script

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* grafana-mixin: Move build logic to scripts

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Use mixin scripts

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* CI build image: Install jsonnetfmt and mixtool

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Makefile: Print commands

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 847dc0bec7bfada0485c9f4c59f769914c7600f8)

* fix: for graph size not taking up full height or width

(cherry picked from commit 448114f649356aabda6f685d00cb54e5414ecb71)

* Drone: Use ${DRONE_TAG} in release pipelines, since it should work (#28299)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 392c5bdf7357ebf5b485d51d63d6f08136782cf9)

* Explore: respect min_refresh_interval (#27988)

* Explore: respect min_refresh_interval

Fixes #27494

* fixup! Explore: respect min_refresh_interval

* fixup! Explore: respect min_refresh_interval

* UI: export defaultIntervals from refresh picker

* fixup! Explore: respect min_refresh_interval

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
(cherry picked from commit 1760fdd55ddd9c83b6523ad5bb0da11474b16218)

* Loki: Base maxDataPoints limits on query type (#28298)

* Base maxLines and maxDataPoints based on query type

* Allow overriding the limit to higher value

(cherry picked from commit 8db5d750d0cc8d2f5a09fef3d86a1f2355a5de60)

* Loki: Run instant query only when doing metric query (#28325)

* Run instant query only when doing metric query

* Update public/app/plugins/datasource/loki/datasource.ts

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
(cherry picked from commit 8e9181e7d1e9920c25558ad847cabdc1c84c15d7)

* Dashboard links: Places drop down list so it's always visible (#28330)

* calculating whether to place the list on the right or left edge of the parent

* change naming and add import of createRef

(cherry picked from commit cdab6028e19d451eb4a15644d99c9f8124099cc4)

* Add unique ids to query editor fields (#28376)

* Add unique ids to query editor fields

* Update public/app/plugins/datasource/testdata/components/RandomWalkEditor.tsx

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
(cherry picked from commit 1cce13b5018fa718d5486189d45001adc72fab2c)

* CloudWatch: Adding support for additional Amazon CloudFront metrics (#28378)

Follow up to #28069 where some metrics was missed.

Ref #28069

(cherry picked from commit 0e17a15fbd2cabe65087207b347d5a21f95206bd)

* Instrumentation: Add counters and histograms for database queries (#28236)

Signed-off-by: bergquist <carl.bergquist@gmail.com>

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 74d1d3c6a82872ed05e9122d3d47d684797c4f20)

* Explore: Fix date formatting in url for trace logs link (#28381)

* Fix url formatting

* Reverse the overhang buffers

* Fix range when opening split

(cherry picked from commit ad657dcdc3e50a36fc2c1b46a06572354640dcc1)

* remove status label from histogram (#28387)

Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit b036112444d896ccc8fc636da5d1e98a7177c274)

* Instrumentation: Add histogram for request duration (#28364)

Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit edbaa9d681a8619e35e348730da40fe6c39a4c5a)

* Docs: Adds basic frontend data request concepts (#28253)

* Docs: Adds frontend data request docs

* Update contribute/architecture/frontend-data-requests.md

Co-authored-by: Marcus Olsson <marcus.olsson@hey.com>

* Update contribute/architecture/frontend-data-requests.md

Co-authored-by: Marcus Olsson <marcus.olsson@hey.com>

* Update contribute/architecture/frontend-data-requests.md

Co-authored-by: Marcus Olsson <marcus.olsson@hey.com>

* Update contribute/architecture/frontend-data-requests.md

Co-authored-by: Marcus Olsson <marcus.olsson@hey.com>

* Docs: changes after PR comments

* Docs: changes after PR comments

* Docs: changes after PR comments

* Update contribute/architecture/frontend-data-requests.md

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

Co-authored-by: Marcus Olsson <marcus.olsson@hey.com>
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: achatterjee-grafana <34888589+ashishagarwal06@users.noreply.github.com>
(cherry picked from commit b497063f646058a108c864e1d898a470af62efea)

* Grafana/ui: pass html attributes to segment (#28316)

* feat(grafana-ui): introduce rest props to segment components

* docs(grafana-ui): add segment stories for html attributes

(cherry picked from commit 04c06f228626f5a9ca2f722e5a3a2a9e34801d7c)

* Prometheus: fix parsing of infinite sample values (#28287) (#28288)

* Prometheus: fix parsing of infinite sample values (#28287)

* Prometheus: Use common function to parse both sample values and histogram "le" label

(cherry picked from commit f3c09e8bcc4c5269580c425eca0d05c379645e72)

* Database; Remove database metric feature flag and update changelog (#28438)

* adds note about broken feature flag

* remove code to enable feature flag

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
(cherry picked from commit 62f5641aa9c8509a4ad3b01471b84b036f231f91)

* CloudWatch/Athena - valid metrics and dimensions. (#28436)

* CloudWatch/Athena - valid metrics and dimensions.
In accordance with https://docs.aws.amazon.com/athena/latest/ug/query-metrics-viewing.html.

* Athena: add ProcessedBytes dimension instead of DataScannedInBytes

(cherry picked from commit a71eadf3794ba89e7777974f380b1758961a19bf)

* Release v7.3.0-beta2

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Circle: Remove release pipeline (#28474) (#28477)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 77cbb4f0f9bb24c6099e25589ba8ef5bd90f8673)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Explore: parse time range fix (#28467) (#28470)

* Explore: parse time range fix

* Remove commented out code

* Fix cases for string epoch and ISO strings

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
(cherry picked from commit ce1f7908c867531745363c1a9a6f70cec485c199)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Drone: Add version branch pipeline (#28490) (#28492)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 07897c7e1e90957a7a016323ddc740081ebc9135)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Don't build Windows installer for version branches (#28494) (#28495)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 090c683fea22cd00bde8e1b99378b36ce0b3ed17)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Auth: Should redirect to login when anonymous enabled and URL with different org than anonymous specified  (#28158) (#28503)

If anonymous access is enabled for an org and there are multiple
orgs. When requesting a page that requires user to be logged in
and orgId query string is set in the request url to an org not
equal the anonymous org, if the user is not logged in should
be redirected to the login page.

Fixes #26120

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
(cherry picked from commit 3be82ecd4e31c19c4514fadc23150c0b242f0c5e)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Cloud Monitoring: Fix help section for aliases (#28499) (#28509)

(cherry picked from commit 8327dd500f0549db37455360021f7a12b8aeab12)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

* Plugins: Track plugin signing errors and expose them to the frontend (#28219) (#28505)

* first pass

* return list

* types and cleanup

* add to plugin page and add styles

* update comment

* update comment

* fix component path

* simplify error component

* simplify error struct

* fix tests

* don't export and fix string()

* update naming

* remove frontend

* introduce phantom loader

* track single error

* remove error from base

* remove unused struct

* remove unnecessary filter

* add errors endpoint

* Update set log to use id field

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* skip adding BE plugins

* remove errs from plugin + ds list

* remove unnecessary fields

* add signature state to panels

* remove unused code

* apply PR feedback

* update comment

* merge dto with model

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 1bee9f416890d608ab47f31b8c7dc652887f8fbf)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>

* Elasticsearch: Fix handling of errors when testing data source (#28498) (#28504)

#24999 changed the error response payload, but the test data source
was not adapted to this change and broke the feature of displaying
any errors to the user in the UI. This change should resolve this
problem.

Ref #24999
Ref #28481

(cherry picked from commit c8b7ccc66caf68559e7603f6472ea23bc7e65eaf)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Drone: Upgrade build-pipeline tool (#28520) (#28530)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit c3917e652519f926a7da12be5dccf8d96a9eaff1)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Drone: Upgrade build pipeline tool (#28533) (#28536)

* Drone: Upgrade grabpl

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 1571579c1d861b65c784859541118753abf03967)

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Auth: Fix SigV4 request verification step for Amazon Elasticsearch Service (#28481) (#28539)

* remove forward header and add extra steps for encoding

* add comment

* re-use forwarded header

* fix service param

* Make SDK the default auth option in UI

* use SDK code instead

* propagate err

* refactor flow

* fix prom service namespace

(cherry picked from commit 4d2b20f7270d392ad007e9615c5d9256ea60f8f3)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>

* AzureMonitor: Support decimal (as float64) type in analytics/logs (#28480) (#28540)

loss of precision but will make the response work instead of erroring
follows work already done in the ADX plugin
fixes #28278

(cherry picked from commit 96e6524a7d68f3b341d66d940eff78723b9858ef)

Co-authored-by: Kyle Brandt <kyle@grafana.com>

* Docs: SigV4 What's New and AWS Elasticsearch documentation (#28506) (#28543)

* add what's new entry and elastic docs

* update docs

* remove caps

* fix image path

* fix md link

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

* fix link case

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

* fix md link

* docs fixes

* update config ref

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* API: add login username in SendLoginLogCommand (#28544) (#28545)

* API: add login username in Login actions

* LoginUser -> LoginUsername

* fix test

(cherry picked from commit 65b5086a59d7cc94caceae24067c74c66e0fbcbb)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Grafana/ui: auto focus threshold editor input (#28360) (#28538)

* feat(grafana-ui): autofocus threshold editor input

* refactor(grafana-ui): remove commented out css

* feat(grafana-ui): use ref for autofocus new thresholds editor input

* refactor(grafana-ui): conditionally set input ref for latest threshold

* refactor(grafana-ui): put back createRef for input ref

(cherry picked from commit a8a36867859d05343a844834374d0683cfb81bdf)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>

* Short URL: Update last seen at when visiting a short URL (#28565) (#28573)

Ref #28248

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
(cherry picked from commit 60d40fa99b4bfb01941c2e63336640fae7551e2f)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Plugin signing: UI information (#28469) (#28563)

* first pass

* return list

* types and cleanup

* add to plugin page and add styles

* update comment

* update comment

* fix component path

* simplify error component

* simplify error struct

* fix tests

* don't export and fix string()

* update naming

* remove frontend

* introduce phantom loader

* track single error

* remove error from base

* remove unused struct

* remove unnecessary filter

* add errors endpoint

* Update set log to use id field

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* skip adding BE plugins

* remove errs from plugin + ds list

* remove unnecessary fields

* add signature state to panels

* Fetch plugins errors

* grafana/ui component tweaks

* DS Picker - add unsigned badge

* VizPicker - add unsigned badge

* PluginSignatureBadge tweaks

* Plugins list - add signatures info box

* New datasource page - add signatures info box

* Plugin page - add signatures info box

* Fix test

* Do not show Core label in viz picker

* Update public/app/features/plugins/PluginsErrorsInfo.tsx

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* Update public/app/features/plugins/PluginListPage.test.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Update public/app/features/plugins/PluginListPage.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Update public/app/features/datasources/NewDataSourcePage.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Review comments 1

* Review comments 2

* Update public/app/features/plugins/PluginsErrorsInfo.tsx

* Update public/app/features/plugins/PluginPage.tsx

* Prettier fix

* remove stale backend code

* Docs issues fix

Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
(cherry picked from commit 4468d41417f8528464aa5bc39b18867a756da78e)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* Alerting: Log alert warnings for obsolete notifiers when extracting alerts and remove spammy error (#28162) (#28582)

* Lower level of notification translation messages

* API: Log alert warnings when saving dashboard

* Remove spammy error

* Rename function parameter

* Apply suggestions from code review

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Apply suggestions from code review

* Fix test

* Change alertValidator return type

* Small fix

* Rename symbol

* Revert "Rename symbol"

This reverts commit 40b619b21a336a8f635daf7ef4241e44a03f0977.

* Revert "Small fix"

This reverts commit 2df8319d1d0e8b9e4a3d18b36711e3ff53e6fa81.

* Revert "Change alertValidator return type"

This reverts commit ad933863e32057cf02caabaa5799e3c14033770d.

* Revert "Fix test"

This reverts commit f728ece2db9d45e7a78d31992082700b3fb4931d.

* Revert "Apply suggestions from code review"

This reverts commit f35c5f52af06a60cc39c8adf1508dce5a9a67052.

* Revert "Apply suggestions from code review"

This reverts commit 7f95800c5f0f1a7b552b7124f5dbeba349cce1d8.

* Revert "Rename function parameter"

This reverts commit 95d3e75b00c110e3e355ba069dbcd89939c2bee2.

* Revert "API: Log alert warnings when saving dashboard"

This reverts commit 1ac5c3f281263a2cad5d4136589ce1ece706752b.

* Conditionally log translation failures

* Fix issue causing test to fail

* Fix test

* Log instead of propagating translations failures due to database errors

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* StatPanel: Fixes BizChart error max: yyy should not be less than min zzz (#28587) (#28588)

(cherry picked from commit 0d803613d6d0e8915c9a8cb75951f647bd4c9a3c)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>

* AddDatasource: Improve plugin categories (#28584) (#28589)

* add IoT category to datasources

* add more enterprise plugins

* add more enterprise plugins

(cherry picked from commit 33ef71d81e880f40e61213e8f7fd5b4b35fc801c)

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>

* Live: updated the reference to use lazy loaded Monaco in code editor. (#28597) (#28599)

(cherry picked from commit c258ee86eb236e6fd328d9a427cac87d1b41b2e3)

Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>

* Release v7.3.0

* Plugin signing: Fix copy on signed plugin notice (#28633) (#28637)

* Fix copy on signed plugin notice

* Update public/app/features/plugins/PluginPage.tsx

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update public/app/features/plugins/PluginPage.tsx

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit a2b3e637058f987c6e881dcfe07cb0ca79de254d)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* Table: Fix image cell mode so that it works with value mappings (#28644) (#28651)

(cherry picked from commit 1e51d33d859627a532d8107ddeff7abadf8c1e4f)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* StatPanel: Fixed value being under graph and reduced likley hood for white and dark value text mixing (#28641) (#28655)

* StatPanel: Fixed value being under graph and reduced likley hood for white and dark value text mixing

* Updated snapshot

* Updated storybook config

(cherry picked from commit b46ac2891db257eaa2e1612c2f809b70c38bf485)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* Plugins: Fix descendent frontend plugin signature validation (#28638) (#28662)

* move plugin root check to earlier in validation process

* remove comment

* only check root if necessary

(cherry picked from commit b9d71f5cddd88a150c3655e5f578e30001617feb)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>

* Cloudwatch: Fix duplicate metric data (#28642) (#28668)

* Cloudwatch: Fix duplicate metric data

* Refactor reduce function to for of

(cherry picked from commit 6dbf1f830a1ba4d297360ebf186ddcaed8394220)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* PanelMenu: Fixes panel submenu not being accessible for panels close to the right edge of the screen (#28666) (#28676)

* Dropdowns: Trying to fix dropdown menus

* Dropdowns: Trying to fix dropdown menus

* removed now unnessary wrapper ref

* Upodates

* Remove export

(cherry picked from commit 5a83fc574aaf73a8143f921c84dff6a8b59e0549)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* TextPanel: Fixes problems where text panel would show old content (#28643) (#28687)

(cherry picked from commit 16a1d2f744f8a47a74cac1369902ca5f73d57a43)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* Loki: Fix error when some queries return zero results (#28645) (#28689)

* Fix logSeriesToLogsModel when some data frames have empty fields

* Update test

* Update public/app/core/logs_model.ts

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
(cherry picked from commit 05644e70423fafde5c3518ee99cd9f294a6466fe)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* Release 7.3.1

* Prometheus: Fix copy paste behaving as cut and paste (#28622) (#28691)

(cherry picked from commit 43a0167b01e57b95f0633bc206cc31c2fbb6092a)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>

* Templating: Speeds up certain variable queries for Postgres, MySql and MSSql (#28686) (#28726)

(cherry picked from commit 04565d497e1e2ce347aa94e8e7f5ba0f00624e9d)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>

* TableFilters: Fixes filtering with field overrides (#28690) (#28727)

* TableFilters: Fixes filtering with field overrides

* Refactor: changes after PR comments

(cherry picked from commit ba12a6a42afbcad3b03af705384e41b2f0a8c026)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>

* Fix typo in unsigned plugin warning (#28709) (#28722)

Typo fix!

(cherry picked from commit 5b1dbe0b0c4094a4e9fae5fd49d87c00522dbd58)

Co-authored-by: Éamon Ryan <eamonryan@users.noreply.github.com>

* Dashboard: fix view panel mode for Safari / iOS (#28702) (#28755)

* fix(dashboard): flex-basis so child height percentages are respected

* fix(dashboard): reset scrollTop when entering view panel mode

(cherry picked from commit 87ba1b67b7b282db26ae7a15cdc611df8589b867)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>

* Plugin page: Fix dom validation warning (#28737) (#28741)

(cherry picked from commit e93cb066044eb75485d75b9427a89f015e4dfaf3)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* Cloudwatch: Fix issue with field calculation transform not working properly with Cloudwatch data (#28761) (#28775)

* Cloudwatch: Fix issue with reducer transform not working properly with Cloudwatch data

* Updated go sdk and updated code

* CloudWatch: Improve test

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit fa567de9b8a3615fbd079f2940bee70938c8f03a)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* Templating: Custom variable edit UI, change text input into textarea  (#28312) (#28322) (#28704)

(cherry picked from commit 0f97925c1ae518c0516607acf12a7e77f561a817)

Co-authored-by: Darryl <5493333+darrylsepeda@users.noreply.github.com>

* grafana/toolkit: Extract CHANGELOG when building plugin (#28773) (#28774)

(cherry picked from commit 651ab5677c975dba4f00f69e593b18f6e7677acd)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* Variables: Fixes URL values for dependent variables (#28798) (#28800)

(cherry picked from commit 50b3409474a0f680c60ac0ea2e1a4c38fb0ef91e)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>

* Gauge: Improve font size auto sizing (#28797) (#28828)

* Gauge: Improved font size calculations

* Added some comments

* update

* Moving to variable

(cherry picked from commit 2b7a5702734eae53d800763252c5088711a92446)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* increase blob column size for encrypted dashboard data (#28831) (#28832)

(cherry picked from commit 65554269edbeaa08cff46b7c52fc51e96d6eae4d)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>

* Units: added support to handle negative fractional numbers. (#28849) (#28851)

(cherry picked from commit abe96f4f898d72f868e3d04d6f21426330cfb188)

Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>

* Prometheus: fix missing labels from value (#28842) (#28855)

(cherry picked from commit 9155f46315e1a61e5ec62f912cd21e8b808c9284)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Tempo: fix test data source (#28836) (#28856)

(cherry picked from commit 62138e8ad482f30e159ea5984516d1c593237d2b)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

* Disable selecting enterprise plugins with no license (#28758) (#28859)

* Add unlicensed property to plugins

* Disable selecting unlicensed plugin

* Add customizable plugin market place url

* License: workaround enabled only in enterprise

* linter

* Move licensing info to front end

* Update pkg/services/licensing/oss.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/services/licensing/oss.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/setting/setting.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/setting/setting.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/api/frontendsettings.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update sample.ini

* Update docs

* Update packages/grafana-runtime/src/config.ts

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* Update public/app/features/datasources/state/buildCategories.ts

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* Update pkg/api/frontendsettings.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/setting/setting.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix spelling

Co-authored-by: Leonard Gram <leo@xlson.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
(cherry picked from commit 9b90ff29611c6a49471b89a6ea43d4f6920ee825)

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Dashboards / Folders: delete related data (permissions, stars, tags, versions, annotations) when deleting a dashboard or a folder (#28826) (#28890)

* Dashboard: delete related data when deleting a dashboard or a folder

* fix migrations order

* apply PR feedback

(cherry picked from commit f0421ed08ea9bde31bd11c44ef15ded87f30474f)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Elasticsearch: Exclude pipeline aggregations from order by options (#28620) (#28873)

(cherry picked from commit 135b83e17f8def56529815a34dfda2117e1655f0)

Co-authored-by: Chris Cowan <chris@chriscowan.us>

* API: replace SendLoginLogCommand with LoginHook (#28777) (#28891)

* API: replace SendLoginLogCommand with LoginHook

* LoginInfo: Query -> LoginUsername

(cherry picked from commit 2c246276fdc8fcbc6b10ba49c84d7d2957cbe3f8)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Chore: Fix spelling issue (#28904) (#28925)

(cherry picked from commit 5b00b500a73289caa656a1fa3f2049cdb4596d4c)

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

* Plugins signing: Fix docs urls (#28930) (#28934)

(cherry picked from commit 2ddda8f452b27acb6b813ad9d2f9419544482e89)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* Short URL: Cleanup unvisited/stale short URLs (#28867) (#28944)

* cleanup stale short urls

* refactor test case names

* service injection

* fix query

* add docs

* remove comma

(cherry picked from commit a7ea8de47e21463cbb2180302217594183051359)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>

* UsageStats: start tracking usage stats for tempo (#28948) (#28951)

Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit afb06ec21a8ca123605590f505f872baeb9252d2)

Co-authored-by: Carl Bergquist <carl@grafana.com>

* Panel inspect: Interpolate variables in panel inspect title (#28779) (#28801)

* Interpolate variables in panel inspect title

* Update public/app/features/dashboard/components/Inspector/InspectContent.tsx

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* fix typo

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
(cherry picked from commit 4036a44a809d84bdb895506c3fa8bf58bdf5446c)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>

* Tracing: log traceID in request logger (#28952) (#28959)

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* CloudWatch Logs: Change what we use to measure progress (#28912) (#28964)

(cherry picked from commit 76f4c11430a6b41a68d8a0bb3a5fedd8ef223518)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>

* Plugins: allow override when allowing unsigned plugins (#28901) (#28927)

* Plugins: allow override when allowing unsigned plugins

* Update pkg/plugins/plugins.go

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Plugins: removed java-style setter

* Plugins: cleanup

* Update pkg/plugins/plugins.go

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
(cherry picked from commit 8fb06da34e677d535d343f048a6e33f8233ebb5b)

Co-authored-by: Leonard Gram <leo@xlson.com>

* Alerting: Append appSubUrl to back button on channel form (#28282) (#28983)

Co-authored-by: Mikhail Snetkov <ufoproger@gmail.com>

* [v7.3.x] Drone: Fix docs building (#28987)

* Drone: Fix docs building (#28986)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
(cherry picked from commit 9582e0afd94c90c6e014333ba9cb7896fa0468e1)

* Updated

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>

* Explore: Remove redundant decodeURI and fix urls (#28697) (#28963)

* Remove redundant path URIdecoding

* Remove redundant comments

(cherry picked from commit f71f03bf9458d912c4f5de713f3d80936514f382)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* Variables: make sure that we support both old and new syntax for custom variables. (#28896) (#28985)

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>

* Gauge: making sure threshold panel json is correct before render (#28898) (#28984)

* making sure we work with a proper data structure.

* added test to verify functionality.

* removed unused variables.

Co-authored-by: Leonard Gram <leo@xlson.com>

* Tracing: Add setting for sampling server (#29011) (#29015)

Signed-off-by: bergquist <carl.bergquist@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
(cherry picked from commit e3c7d663245b7f54fd3d6bad89c9bd62832a6978)

Co-authored-by: Carl Bergquist <carl@grafana.com>

* StatPanels: Fixes auto min max when latest value is zero (#28982) (#29007)

(cherry picked from commit 10f226c4c2e4da25a96c885a1dc936d60fe0ef19)

Co-authored-by: Torkel Ödegaard <torkel@grafana.org>

* Fix conflict (#29020)

* Release v7.3.2 (#29024)

* [v7.3.x] Chore: Bump build pipeline version (#29025)

* Thresholds: Fixes color assigned to nul…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog old backport v7.3.x Mark PR to be automatically backported to v7.3.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Explore: Queries dissapear when interacting with multiple query windows
4 participants