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

Sync with Grafana upstream 10.2.0 #78

Closed
wants to merge 6,863 commits into from
Closed

Sync with Grafana upstream 10.2.0 #78

wants to merge 6,863 commits into from

Conversation

mnottheone
Copy link
Collaborator

What is this feature?

[Add a brief description of what the feature or update does.]

Why do we need this feature?

[Add a description of the problem the feature is trying to solve.]

Who is this feature for?

[Add information on what kind of user the feature is for.]

Which issue(s) does this PR fix?:

Fixes #

Special notes for your reviewer:

ivanahuckova and others added 30 commits October 9, 2023 17:14
…a#76196)

Loki: Change run query button name based on number of queries
* Use production gcom api for nightly builds

* Use production package repositories

* Remove unused confusing env variable

* Comment out previous gcom nightly pipeline

* Remove unused grafana-com-nightly pipeline

* Remove unused import from cron.star
* remove legacy ac checks

* fix RBAC disabled tests

* add permissions for tests to work

* fix unifiedalertstatesworker test
…ana#76128)

* Extract code to manage service accounts

* Add test with client credentials grants

* Fix test with the changed interface

* Wire

* Fix HandleTokenRequest

* Add tests to extsvcaccounts

* Rename Retrieve function

* Document the interface
Breaklines don't render for history text
* DashboardScene: AdHoc filters

* Update

* minor update

* update
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…arks (grafana#76231)

Benchmarks: Replace mock guardian with the actual one
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* remove hasAccess and hasAcessInMetadata in favour of hasPermission and hasPermissionInMetadata

* test fixes

* more test fixes
* IDForwarding: change audience to be prefixed by org and remove JTI

* IDForwarding: Construct new signer each time we want to sign a token.

* SigningKeys: Simplify storage layer and move logic to service

* SigningKeys: Add private key to local cache
)

* DashboardScene: Support auto migration for angular panels

* minor tweak

* Update scenes

* Review fix

* Update
…a#75904)

* Don't show error when editor is empty

* Added multi-line support for error markers

* Fixed bug where new lines weren't being counted as characters

* Take startLine and endLine into account in column calculations

* Fix
…76226)

* Sandbox: initial dummy datasource plugin for e2e

* WIP: tests

* Add metrics to plugin.json so it shows up in explore

* Fix false positives in frontend-sandbox-datasource.spec.ts

* Change typed name to be static

* Add code to delete the datasource after tests are complete

* Add fail on status code

* Update tests for more config

* Replace visit with existing page

* Delete cleanup code
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Create a state for dockedMegaMenu and the function to manage it

* Add the dockedMenu icon and handle the status when clicking it

* Add Megamenu to section nav area when it is docked

* get logic working

* fix mobile

* refactor state + persist in localStorage

* adjust icon and don't use position absolute

* restore old rudderstack tracking

* use Flex instead

* adjust feature toggle to be experimental

* extract out localStorage handling into utils

* don't need separate file

* use store.set/get instead

---------

Co-authored-by: eledobleefe <[email protected]>
* Chore: remove LegacyForms from Ldap Page

* remove references to gf-form

* fix form control submit function
* Add deprecations to LegacyForms

* Fix whitespace

* Update FormField.tsx

* Update Input.tsx

* Update IndicatorsContainer.tsx

* Update NoOptionsMessage.tsx

* Update Select.tsx

* Update Switch.tsx

* Update SecretFormField.tsx

* Update index.ts

* Update Select.tsx

* Add deprecated Links

* Update deprecation comments

* Update deprecation message
* Simplify error message

* Add timeout

* Unsubscribe when unmount

---------

Co-authored-by: Nathan Marrs <[email protected]>
* Add fixed role UID

Co-authored-by: Karl Persson <[email protected]>

* Use base64 url encoding

---------

Co-authored-by: Karl Persson <[email protected]>
* Reduce to debug for session need rotation error

* try to extract log level from error and fallback to warning
Clarity-89 and others added 28 commits October 16, 2023 15:25
* Add Aggregate by to what's new

* Update index.md

* Update index.md

* Update index.md

* Update index.md

* Add demo image

* Apply suggestions from code review

Co-authored-by: Isabel <[email protected]>

---------

Co-authored-by: Joey Tawadrous <[email protected]>
Co-authored-by: Isabel <[email protected]>
* Sandbox: Add e2e tests to test global variables access

* Trigger drone again

* Add be.visible validation to global object elements
* Whats new for multiple spansets

* Added date

* Updated link format

* Updated version syntax

---------

Co-authored-by: Isabel <[email protected]>
* docs: fix minor inaccuracies

- give content on the type of data that needs persistence
- Use more precise terminology
  - persistent storage != Docker volumes
  - filesystem changes remains in a stopped container
      and only discard when container removed
  - 'directory' is more accurate than 'folder'
- fix typo: `grafana_data` should be `grafana-storage`

* docs: fix grammar and use 'directory' consistently

* docs: replace 'sqlite3' with 'SQLite version 3'
* Added correlations content

* Added dates

* Fixed linting errors
…6576)

* update with sdk

* do sql

* fix core plugins

* fix proxy settings

* bump SDK version

* tidy

* enable pdc for test

* add codeowners

* bump dep

* go mod tidy

* bump SDK
* Added alerting insights entry

* Added placeholder date field

* Added date
* TeamPicker: Add optional initial value support

* Rename value to teamId
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Docs: Update new Browse Dashboards

* Apply suggestions from code review

Co-authored-by: Isabel <[email protected]>

* add date

---------

Co-authored-by: Isabel <[email protected]>
Remove 0.0.0-test tag event
…lite (grafana#76659)

Reduce flakiness of e2e tests caused by write contention in sqlite

Write contention in sqlite on startup intermittently causes failed tests because
 of failed service runs. This can have various root causes, one example is
 dashboard provisioning:

Dashboard provisioning's frequent commits can cause other read transaction
 snapshots to invalidate and throw SQLITE_BUSY/SQLITE_BUSY_SNAPSHOT. If those
 failing transactions have a long length but not long enough to ensure all of
 the dashboards have finished provisioning it will run out of retries and fail
 entirely.

 This change helps indirectly reduce these write contentions by limiting the
 connection pool for e2e tests.

 As a bonus, having our e2e tests run using `max_open_conn = 2` means it acts
 as a guard against regressions that would affect certain internal instances
 that run with these settings.
…6236)

* Plugins: Chore: Renamed instrumentation middleware to metrics middleware

* Removed repeated logger attributes in middleware and contextual logger

* renamed loggerParams to logParams

* PR review suggestion

* Add pluginsInstrumentationStatusSource feature toggle

* Plugin error source prometheus metrics

* Add error_source to logs

* re-generate feature toggles

* fix compilation issues

* remove unwanted changes

* Removed logger middleware changes, implement error source using context

* Renamed pluginmeta to pluginrequestmeta, changed some method names

* Fix comment

* pluginrequestmeta.go -> plugin_request_meta.go

* Replaced plugin request meta with status source

* Add tests for pluginrequestmeta status source

* Fix potential nil pointer dereference in instrmentation middleware

* Add metrics middleware tests

* Sort imports in clienttest.go

* Add StatusSourceFromContext test

* Add error_source label to plugin_request_duration_seconds

* Re-generate feature flags

* lint

* Use StatusSourcePlugin by default

* re-generate feature flags
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* refactor: remove hasActiveChild

* refactor: remove unused properties from MegeMenuItemText

* refactor: remove MegaMenuItemIcon

* refactor after code review
* Social: Fix error decoding id_token log

* Update pkg/login/social/generic_oauth.go
Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Chore: Fix formatter test (grafana#76689)

(cherry picked from commit 0ddc3d4)

Co-authored-by: Andres Martinez Gotor <[email protected]>
@mnottheone
Copy link
Collaborator Author

Closing as updated main by syncing it with upstream grafana/grafana. This merge is not needed now.

@mnottheone mnottheone closed this Jan 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.