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 upstream #1

Open
wants to merge 10,000 commits into
base: main
Choose a base branch
from
Open

Sync upstream #1

wants to merge 10,000 commits into from

Conversation

maidmaid
Copy link
Member

@maidmaid maidmaid commented Mar 8, 2022

No description provided.

gillesdemey and others added 30 commits September 10, 2024 19:31
* Add errorsource

* Minor lint fixes
Back-end:
* update alerting module
* update GetSecretKeysForContactPointType to extract secret fields from nested options
* Update RemoveSecretsForContactPoint to support complex settings
* update PostableGrafanaReceiverToEmbeddedContactPoint to support nested secrets
* update Integration to support nested settings in models.Integration
* make sigv4 fields optional

Front-end:
* add UI support for encrypted subform fields
* allow emptying nested secure fields
* Omit non touched secure fields in POST payload when saving a contact point
* Use SecretInput from grafana-ui instead of the new EncryptedInput
* use produce from immer
* rename mapClone
* rename sliceClone
* Don't use produce from immer as we need to delete the fileds afterwards

---------

Co-authored-by: Gilles De Mey <[email protected]>
Co-authored-by: Sonia Aguilar <[email protected]>
Co-authored-by: Matt Jacobson <[email protected]>
* UserCreatePage: Make compatible with react router 6

* ServiceAccountPage.test: Make compatible with react router 6

* Update TeamPages
* fix some any's/type assertions

* fix some more any/type assertions
New Crowdin translations by GitHub Action

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
* UI improvements WIP

* change links appearance and layout for plugin details right panel

* Changed external links back

* Update public/app/features/plugins/admin/components/PluginDetailsRightPanel.tsx

Co-authored-by: David Harris <[email protected]>

* Update public/locales/en-US/grafana.json

Co-authored-by: David Harris <[email protected]>

* fix report abuse to report concern

---------

Co-authored-by: David Harris <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Plugins: Fix plugins count in update all plugins button

* Plugins: Fix new updates filter

* Plugins: Update tests
As per grafana/support-escalations#11312 (comment), this PR updates the admonition to reflect that some features such as branding are not available for all plans.
…93206)

* Chore: Enable auto-triager to set labels

* pass the correct token to add labels
* word wrap long metric names

* trunctate long labels

* use css for filters
torkelo and others added 30 commits September 24, 2024 13:51
…des (#93651)

* FieldOverrides: Clear displayName caching after applying field overrides

* Remove old comment
…93605)

* Check if playlist is playing before updating

* add tests
* remove bodyScrolling toggle and make it default

* fix e2e tests
* add state to grpc plugin

* tidy

* fix lint

* fix issues

* return true

* use defer

* update err message
* Add option to skip rbac check for specified verbs
* DashboardScene: Do not add hide flags to URL

* Update
…ss Explore (#93519)

Correlations: Limit access to correlations page to users who can access Explore
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Pass one

* Fix linter and add new betterer problem (sorry)

* fix swagger

* Add type to tests and update single correlations sql

* Fix provisioning test and other function that needs a type

* Add errors around query/external typing and add tests

* increment number of correlations tested as we added one for testing v1 type placement

* try merging back the swagger that is in main

* try again?

* Style form a little

* Update public/app/features/logs/components/logParser.ts

Co-authored-by: Matias Chomicki <[email protected]>

* fix bad commit, simplify logic

* Demonstrating type difficulties

* Fix distributed union changes

* Additional type changes

* Update types in form

* Fix swagger

* Add comment around the assertion and explicit typing

---------

Co-authored-by: Matias Chomicki <[email protected]>
Co-authored-by: Andrej Ocenas <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* TimePicker: Support strings in ISO formats

* changed fix and added test
#93658)

Remove buildstamp from build hash, version and commit should be enough
…ify (#93045)

* Options pane, data pane queries tab and transformations tab working

* Update

* Discard works

* Panel inspect working

* Table viw works

* Repeat options

* Began fixing tests

* More tests fixed

* Progress on tests

* no errors

* init full width when enabling repeat

* Began moving VizPanelManager tests to where the code was moved

* Unlink libray panel code and unit test

* Fixes and unit tests for change tracking and resetting original state and dirty flag when saving

* migrating and improving unit tests

* Done with VizPanelManager tests refactoring

* Update

* Update

* remove console.log

* Removed unnesssary behavior and fixed test

* Update

* Fix unrelated test

* conditional options fix

* remove

* Fixing issue with editing repeated panels and scoping variable to first value

* Minor fix

* Fix discard query runner changes

* Review comment changes

* fix discard issue with new panels

* Add loading state to panel edit

* Fix test

* Update

* fix test

* fix lint

* lint

* Fix

* Fix overrides editing  mutating fieldConfig

---------

Co-authored-by: alexandra vargas <[email protected]>
…93678)

fix query interval string interpolation in query cache
…92759)

* WIP: working as expected, has to be tested

* Rename query param, small changes

* Remove unused code

* Address feedback

* Cleanup

* Use the feature toggle to control the behaviour

* Use the toggle on the FE too

* Prevent the extra redirect/reload

 Co-authored-by: Josh Hunt <[email protected]>

* Return to login if user is not authenticated

* Add tracking issue

* Align BE redirect constructor to locationSvc
Use appropriate deps and bumpy TS to match root
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Use URI for querying resources in RG

- Ensure resource group names are correctly slash separated

* Update test
* Improve errorsource

* Fix imports
Setup serve_from_sub_path scenario with nginx
… faro.api (#90509)

Check if Grafana Javascript agent is enabled before using faro.api
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.