Alerting: Fix state manager to not keep datasource_uid and ref_id labels in state after Error #72216
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yuri-tceretian
added
type/bug
area/alerting
yuri-tceretian
requested review from
a team,
rwwiv,
JacobsonMT and
grobinson-grafana
and removed request for
a team
github-actions
bot
added
area/backend
pr/external
grobinson-grafana
previously approved these changes
Jul 24, 2023
|
Just before I approve this quick fix, what is needed to get #68142 finished? |
|
JacobsonMT
approved these changes
Jul 25, 2023
There was a problem hiding this comment.
LGTM 🚀
It's not clear to me how 68142 will inherently fix this though, unless you mean you will take this case into account when working there.
I would like to move the population of these labels to the |
3 tasks
gurinder39
added a commit
to coderabbitai/grafana
that referenced
this pull request
Oct 13, 2023
* docs: logs: removed incorrect text (#72247)
* docs: logs: update copy-link documentation (#71943)
* docs: logs: update copy-link documentation
* remove incorrect icon
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* better styling
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
---------
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* InfluxDB: Fix setting retention policy on visual query editor (#72248)
Prevent fetch loop
* Transformations: fix bug in seriesToRowsTransformer when a timeserie … (#72217)
* Transformations: fix bug in seriesToRowsTransformer when a timeserie is empty
* Explore: add URL schema docs (#71724)
Co-authored-by: Kristina <kristina.durivage@grafana.com>
Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
* Alerting: Update Swagger spec (#72177)
chore: update alerting swagger spec
Co-authored-by: rwwiv <rwwiv@users.noreply.github.com>
* Alerting: Fix typo when no rules exist (#72250)
* Auth: Lock organization roles for users who are managed through an external auth provider (#72204)
remove onlyExternalOrgRoleSync feature flag
* Login: Show oauth error messages inline (#72255)
Squashed commit of the following:
commit b82ed875b88d12348cd4043e2add493e8fb6edc6
Author: Roxana Turc <anamaria-roxana.turc@grafana.com>
Date: Tue Jul 25 10:42:31 2023 +0100
user essentials mob! :trident:
lastFile:public/app/core/components/Login/LoginPage.test.tsx
commit 923cbcf190d2def57b59f8b231f14322efdf9718
Author: joshhunt <josh@trtr.co>
Date: Tue Jul 25 10:17:51 2023 +0100
user essentials mob! :trident:
Co-authored-by: joshhunt <josh@trtr.co>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
Co-authored-by: L-M-K-B <48948963+L-M-K-B@users.noreply.github.com>
* Public Dashboard: Redesign modal (v2) (#71151)
* Update public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsBar.tsx
Co-authored-by: Juan Cabanas <juan.cabanas@grafana.com>
* revert modal styling and add specific styling to Sharing
* Update public/app/features/dashboard/components/ShareModal/SharePublicDashboard/ConfigPublicDashboard/SettingsBar.tsx
Co-authored-by: Juan Cabanas <juan.cabanas@grafana.com>
* functions > const
* put a gat between all items in email config, instead of margins for each item
* fix html semantic elements
* ad theme to class component ShareModal
* add labels
* fix failing tests; now Settings has a summary and has to be opened to be able to see the On/Off toggles
* fix dashboard-public-create test with settings dropdown
* Alerting: Improve alerts names visibility on narrow panels (#72104)
* NestedFolders: Add library panels counting and deletion to folder registry (#69149)
* Expose library element service's folder service
* Register library panels, add count implementation
* Expand folder counts test
* Update registry deletion method interface
* Allow getting library elements from any folder
* Add test for library panel deletion
* Add test for library panel counting
* Docs: Update logs documentation to include missing features (#72113)
* Docs: Update logs documentation to include missing features
* Logs sample
* Log level table compressed
* Update docs/sources/explore/logs-integration.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update docs/sources/explore/logs-integration.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update docs/sources/explore/logs-integration.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update docs/sources/explore/logs-integration.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update docs/sources/explore/logs-integration.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update docs/sources/explore/logs-integration.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update docs/sources/explore/logs-integration.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update docs/sources/explore/logs-integration.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update
---------
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Tempo: Use new configuration editor components (#71288)
* Use new config components in Tempo
* Update Grafana experimental version
* Clarify necessary rediss scheme for TLS with redis caching (#72122)
Update index.md
To enable TLS with Redis you must use the `rediss` scheme, not the `redis` scheme. This is documented here: https://www.iana.org/assignments/uri-schemes/prov/rediss
* Auth: add a feature toggle for locking user roles for users synced through GCom (#72202)
* add a new feature toggle for locking down role sync for users managed by GCom
* protect the frontend and the backend using the new feature toggle
* fix merge
* Guardian: Split dashboard and folder guardian implementation (#69722)
* Split dashboard and folder guardian implementations
* Replace guardian constructors
* Simplify tests
* Add tests
* Apply suggestion from code review
Differentiate errors for dashboard and folders
* Remove tests for general folder
* Add tests for general scope
* Tracing: Span filters UI enhancements (#72245)
* Update margin between inputs
* Updated spacing between toggle and text
* Add more spacing
* Loki: Run logs volume for query when switching from trace to logs (#72268)
Loki: Run logs volume for query that has no queryType (defaults to range)
* logs: context: various scrolling-fixes (#72271)
* logs: context: correctly append to the above&below arrays
* logs: context: on initial load always scroll to center
* logs: context: reset counts when context-query-ui changes
* Dashboards: Add Angular deprecation alert in data source query editor (#72211)
* reportInteraction when clicking on angular deprecation docs link
* Made messages consistent, removed duplicate component
* Revert unnecessary changes in PluginDetailsPage.test.tsx
* Moved angular deprecation notice to different folder
* Fix component names
* Dismissable alert
* Plugins: Add Angular deprecation alert in data source query editor
* Add tests
* Fix test name
* Add const deprecationText
* lint
* PR review feedback
* Prometheus: Turn browser resource cache on by default (#72105)
* turn prometheus browser cache flag on by default
* Prometheus: Add a keyboard shortcut to toggle all exemplars (#64479)
* Add a keyboard shortcut to toggle all exemplars
Sometimes it's hard to see the quantile line behind all the exemplars.
This commit adds a `d x` keyboard shortcut to toggle exemplar visibility
on all prometheus queries. Unlike with legends, the logic is simpler
and it does a pure toggle as opposed to "majority toggle" as with legends.
Since exemplars might not be loaded, this also requires refreshing the data.
For the same reason, toggling a single panel is not supported, as it will
make the panel data out of sync with the rest of the dashboard.
* Use "p x" to navigate to panel explore rather than just "x"
It's more consistent with other panel level shortcuts.
It also doesn't conflict with the global "x" to toggle exemplars that way.
* RBAC: hide the empty basic role from the org role picker (#72276)
hide the empty basic role from the org role picker
* RBAC: Explain why org role selection is disabled for externally synced users (#72274)
* Move builtin role selector to separate component
* Show message if basic roles picker disabled
* Show explanation in OSS
* Alerting: Prevent showing View YAML button on new rules (#72278)
* Alerting: Fix contact point testing with secure settings (#72235)
* Alerting: Fix contact point testing with secure settings
Fixes double encryption of secure settings during contact point testing and removes code duplication
that helped cause the drift between alertmanager and test endpoint. Also adds integration tests to cover
the regression.
Note: provisioningStore is created to remove cycle and the unnecessary dependency.
* AzureMonitor: Fix ResourcePicker hanging (#71886)
* AzureMonitor: Fix ResourcePicker hanging
Removed location fetching for every subscription.
Fixes #70523
* fix region for multi metricnames
* fix tests
* fix e2e
* remove regions/locations from variable editor
* remove region pieces from e2e
* Plugins: Angular deprecation: Open "View plugin details" in new tab (#72280)
* Docs: update labels for auth provider pages (#72294)
update labels for auth provider pages
* LogRow: ensure scrollIntoView is called only once with shortlinks (#72291)
* Auth: Gitlab Improve group fetching when using read_api (#72277)
* improve group fetching when using read api
* add constant for access level
* Auth: Add azure warning for conflicting settings (#72289)
* add conflicting option debug warning
* add warning for Grafana Admin sync in auth config
* Docs: Loki data sources updates (#72041)
* added new configure loki doc
* finished first draft of config doc
* changed file name
* started updates to query editor
* updated config and qury editor
* updated index doc config doc and query editor
* updated query editor
* updates to query editor doc
* more updates to query editor and index doc
* one small update
* updates to query editor doc and index
* Update docs/sources/datasources/loki/_index.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update docs/sources/datasources/loki/query-editor/index.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update docs/sources/datasources/loki/query-editor/index.md
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* Update docs/sources/datasources/loki/query-editor/index.md
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* Update docs/sources/datasources/loki/_index.md
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* made changes suggested in PR
---------
Co-authored-by: Matias Chomicki <matyax@gmail.com>
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* Heatmap: Add datalink support (#71016)
* Docs: update GitLab OAuth2 documentation (#71834)
* gitlab doc update and update the default scopes
* small fixes
* fix a reference
* update another reference
* PR feedback: fix numbering of bulletpoints, reorder config options
* linting
* PluginExtensions: Allow to specify unkown properties in override but they will be ignored (#72273)
* fixed bug.
* Update public/app/features/plugins/extensions/getPluginExtensions.ts
Co-authored-by: Ben Sully <ben.sully@grafana.com>
* Update public/app/features/plugins/extensions/getPluginExtensions.test.ts
Co-authored-by: Ben Sully <ben.sully@grafana.com>
* Update public/app/features/plugins/extensions/getPluginExtensions.ts
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
* Update public/app/features/plugins/extensions/getPluginExtensions.test.ts
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
---------
Co-authored-by: Ben Sully <ben.sully@grafana.com>
Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
* Docs: adds new alert rule creation flow (#72257)
* Docs: adds new alert rule creation flow
* updates configure alerting topic
* Adds grafana-managed process
* adds data source-managed and recording rule
* takes out anchor
* Alerting: Fix inconsistencies in alert rule form depending on alert type (#72287)
* Fix inconsistencies in alert rule form depending on alert type
* Fix default annotations when comming from dashboard panel
* Update texts following pr review comments
* Fix texts
---------
Co-authored-by: Virginia Cepeda <virginia.cepeda@grafana.com>
* Heatmap: Clean up datalink code (#72296)
* XYChart: Prevent crash on point hover (#70225)
* Docs: updates to alert rule docs (#72313)
* Docs: updates to alert rule docs
* removes steps
* edits to numbering
* description parameter edit
* fixing description frontmatter
* Doc's: Add google support for team sync (#72316)
Add google support for team sync
* Changelog: Updated changelog for 9.5.7 (#72321)
Co-authored-by: grafanabot <bot@grafana.com>
* Alerting: Fix refetching grafana rules on alert list panel (#72242)
* Changelog: Updated changelog for 10.0.3 (#72324)
Co-authored-by: grafanabot <bot@grafana.com>
* logs: log-details: handle dataplane-compliant dataframes (#71935)
* logs: log-details: handle dataplane-compliant dataframes
* lint fix, removed unused import
* Chore: update latest.json to 10.0.3 (#72330)
* refactor: add wrap for small screen widths (#71864)
* A11Y: SelectOptionGroup component fix lint rule about element interactions (#72213)
* A11Y: SelectOptionGroup component fix lint rule about element interactions
* Undone changes following feedback received
* Data Sources: Remove Admin/Data sources page in favour of Connections/Data sources (#72102)
* don't show Admin/Data sources page in navtree
* redirect from admin/datasources to connections/datasources
* update link of DS plugins to connections/datasources
* redirect edit page from datasources to connections
* redirect to new datasource page under connections
* redirect to datasouce dashboard page under connections
* fix navId on datasource dashboards page
* fix datasource dashboard page's nav
* Revert "update link of DS plugins to connections/datasources"
This reverts commit 0ebcb09b038b9db14f16bd0066c26869e57ff253.
* NestedFolders: Add invalid state to NestedFolderPicker (#72175)
* chore: add invalid state to NestedFolderPicker
* NestedFolderPicker: pass invalid state to trigger
* fix: remove redundant sharedInputStyle
* Chore: Remove topnav feature flag (#72337)
* Remove topnav feature flag
* Allow deprecated flags to be enabled by default
* change topnav feature flag to deprecated instead
* fix lint
* CI: Fix `deb/rpm` bug for linux package publishing (#72336)
Fix deb/rpm
(cherry picked from commit c3ebd388e3cc192590c3f4d381429f7d9e345765)
(cherry picked from commit 4c9bdef98dcfb24d8d24dac8117c9d3feb921a06)
# Conflicts:
# .drone.yml
* InfluxDB: Change feature toggle stage (#72348)
Change feature toggle stage
* Toggle transformationsRedesign for prod (#72207)
* Toggle transformationsRedesign for prod
* grafana-data: handle reordering of field.nanos (#72290)
* grafana-data: handle reordering of field.nanos
* do not add nanos:undefined
* Chore: Remove unnecessary go.mod replace (#72346)
* Dashboard: New Datasource picker link is keyboard accessible (#72134)
* WIP
* fixes for readability
* fix
* WIP
* Keep tab index working with portal
* Use callback and clean up
* Fix linting errors
* Ignore clickable element
---------
Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com>
* Prometheus: Add present_over_time syntax highlighting (#72283)
add prometheus present_over_time syntax highlighting
to color present_over_time keyword for prometheus
* Only trigger downstream builds on Grafana (#72356)
* Tempo: Use feature toggle to control TraceQL streaming (#72288)
Rename traceql streaming feature toggle. Remove the manual toggle from Options component and use the feature toggle
* Loki / Prometheus: Fix query builder select component in safari (#71966)
* partial fix
* remove unused import
* fix that doesnt remove error message
* CI: use the base64 key in the windows installer steps (#72372)
use the base64 key in the windows installer steps
* AzureMonitor: revert Variable Editor region changes (#72306)
* Revert "remove regions/locations from variable editor"
This reverts commit 41dc6a8bfb5dd90d56c108f7d76d20d79011d51a.
* Revert "remove region pieces from e2e"
This reverts commit 6b1f82f14a2f4f7338f5ad4b84a89c0e375e7348.
* e2e: open resource picker correctly
* Loki Query Splitting: Ignore empty queries like hidden queries (#72376)
Loki query splitting: ignore empty queries like hidden queries
* SSE: (Instrumentation/Chore) Add datasource_type label to grafana_sse (#72370)
SSE: (Instrumentation/Chore) Add datasource_type label to the grafana_sse_ds_queries_total metric
* Explore: ensure newly added query use the correct datasource (#72251)
* Alerting: Fix state manager to not keep datasource_uid and ref_id labels in state after Error (#72216)
* Alerting: Exclude expression refIDs from NoData state (#72219)
* A11y: Fixed keyboard accessibility in Tooltip Component (#72323)
* A11y: Fixed keyboard accessibility in Tooltip Component
* Made updates and fixed the keyboard accessibility
* Button: Fix global button styles! (#72391)
uncomment button focus styles!
* Tranformations: True OUTER JOIN in the join by field transformation used for tabular data (#72176)
write join for tabular data and add test
* Prometheus: Config overhaul part two, auth and DataSourceHttpSettings overhaul (#71250)
* build httpsettings overhaul with new auth component
* remove test code
* add connection and advanced http settings components
* use tooltip with link
* add correct styling and spacing
* save option select for sigV4
* fix styles in Azure auth to fit new auth component
* add types in overhaul folder that are not available yet in grafana
* update e2e tests for new connection component
* update e2e tests for new connection component
* update width of azure inputs
* fix non custom auth selects
* add feature toggle
* wrap azure style changes behind the feature flag
* fix feature toggle rebase fix error
* move advanced http setting and wrap everything in the config subsection component to fix font
* fix input width
* use cx for conditional classes
* use cx for conditional class
* DSPicker: Use new DS picker everywhere in Grafana (#70609)
* Alerting: Add ability to control scheduler tick interval via config (#71980)
* add ability to control scheduler interval via config
* add feature flag `configurableSchedulerTick`
* Explore: Turn ExplorePage.test into unit test (#72022)
* Extract logic from ExplorePage to a hook, add a test for the hook; remove ExplorePage test
* Remove extracted stuff from ExplorePage
* Clean up
* Fix minWidth logic
* Geomap: Add network layer (#70192)
* Geomap: Add network layer
* Support text labels for nodes
* Add solid styling for edges
* Remove symbol option for edge style menu
* Add support for edge text labels
* Fix linter issues
* Simplify multiple data frame handling
* Add TODO notes
* Add node and edge style categories for options
* Remove data frame hardcoding
* Hide legend, attempt to hide tooltip by default
* Mark network layer as beta
* refactor updateEdge
* Fix some linter issues
* Remove attempt at disabling tooltip for network layer
* For edge text add a stroke and increase z index
* Restrict field selection based on frame type
* refactor
* add basic bad data handling (prevent entire panel from breaking)
* generate non hard coded graph frames for style editor filtering
* code cleanup; remove hardcoded reference to "edges" frame
* fix select clearing for Data option
* fix styling
* fix lookup
---------
Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
Co-authored-by: Adela Almasan <adela.almasan@grafana.com>
* Prometheus: Add support for day_of_year (#72403)
add querybuilder/code editor support for day_of_year
* Prometheus: Update heatmap unit tests (#72404)
introduce tests for new potential heatmap response type, revert prior changes to tests
* Chore: Use Github App credentials for pr-commands.yml workflow (#72400)
* Use grafana-pr-automation credentials
* Action!
* Transforms: Add Format Time Transform (Alpha) (#72319)
* Stub transform editor
* Mostly working
* Get things working 💪
* Add tests
* Add alpha flag
* Timezone support
* Remove debug statement
* Fix tests
* Prettier fix
* Fix linter error
* One more linter fix
* [v10.1.x] Provisioning: Fix overwrite SecureJSONData on provisioning (#72455)
Provisioning: Fix overwrite SecureJSONData on provisioning (#72395)
* Overwrite SecureJSONData on provisioning
(cherry picked from commit a912c970e376322ec874cf7edae5d82afda4be29)
Co-authored-by: Hugo Kiyodi Oshiro <hugo.oshiro@grafana.com>
* [v10.1.x] Chore: Refactor error when retrieving the plugin manifest key (#72493)
Chore: Refactor error when retrieving the plugin manifest key (#72492)
(cherry picked from commit a331c892a08cef4ba64ebd6075bad11c26981187)
Co-authored-by: Andres Martinez Gotor <andres.martinez@grafana.com>
* [v10.1.x] Data sources: Dashboards page now loads correctly from direct url (#72495)
Data sources: Dashboards page now loads correctly from direct url (#72264)
* ensure DataSourceDashboardsPage initialises data source settings
* fix unit test
* apply suggestions from review
(cherry picked from commit 7406c4ff5141f410a4935cb4dbf86c587516ee59)
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
* [v10.1.x] CI: Make RGM the main pipeline for prerelease (#72533)
CI: Make RGM the main pipeline for prerelease (#72295)
* Make RGM the main pipeline for prerelease
* Use grafana/grafana-build:dev-bd41660
* Use grafana/grafana-build:dev-fda506a
* Fix destination url
* Update vault secrets
* Move bucket path to environment
* Use grafana/grafana-build:dev-2f36afa
* Revert to grafana/grafana-build:main
* Add repo to rgm_main trigger
(cherry picked from commit 971f5f14be87cf1d346e1235a5b90e106e553a57)
Co-authored-by: Guilherme Caulada <guilherme.caulada@grafana.com>
* [v10.1.x] CI: Update secret refs to vault ones; update downstream repo origin (#72550)
CI: Update secret refs to vault ones; update downstream repo origin (#72515)
Update secret refs to vault ones; update downstream repo origin
(cherry picked from commit 6669d0a704ecdd995dc970f51be390ac9d173e0a)
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
* [v10.1.x] Docs: fixed incorrect TLS entry for mysql data source (#72557)
Docs: fixed incorrect TLS entry for mysql data source (#72543)
fixed tls skip verify
(cherry picked from commit 5e4000b6e96d98dd9a2871a161c2fa0c663a4dc0)
Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
* [v10.1.x] docs: add advanced data source picker option in Explore (#72559)
docs: add advanced data source picker option in Explore (#72412)
* updated screenshots in explore index page
* add advanced data picker option to jaeger, tempo, and zipkin data source docs
* Revert changes to data source files
Reverting changes to data source files to maintain scope of this PR as just updating Explore. Changes to other areas where DS picker has been updated will be addressed on another PR when that scope has been decided.
* Fixed indentation and made advanced ds picker language more robust
(cherry picked from commit 0c072770ca6133226c9454a36c63747d59c1f97f)
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* [v10.1.x] docs: fix broken links (#72585)
docs: fix broken links (#72582)
* docs: fix broken link
To reflect changes on plugin-tools site
* fix more links
(cherry picked from commit d2509278506fbc959ef28b7563d66af89eb58fbc)
Co-authored-by: David Harris <david.harris@grafana.com>
* [v10.1.x] Docs: remove references to `groups_attribute_path` for Okta and GitLab docs (#72593)
Docs: remove references to `groups_attribute_path` for Okta and GitLab docs (#72588)
remove references to groups_attribute_path for Okta and GitLab
(cherry picked from commit b96d6e2c8db5e4202be53af314b36183dc06538c)
* [v10.1.x] Explore: Do not update URL when time range changes to absolute (#72600)
Explore: Do not update URL when time range changes to absolute (#72436)
Allow passing updateURL flag to absolute time range event
(cherry picked from commit 89618e0c0fba3ed4499da61c322229eb3f993e84)
* [v10.1.x] PublicDashboards: Do not return hidden queries (#72605)
PublicDashboards: Do not return hidden queries (#72554)
* PublicDashboards: Do not return hidden queries
* Update pkg/services/publicdashboards/service/query_test.go
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
---------
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
(cherry picked from commit bffd55efd400e99c9856d26238c2904af37574e3)
Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com>
* [v10.1.x] Update team_sync.md (#72616)
Update team_sync.md (#70423)
(cherry picked from commit a13130f503abe8ef1ce2e291428751748d829001)
Co-authored-by: Zvonimir Burić <zvonimir.buric@gmail.com>
* [v10.1.x] Update the sign in docs to contain more precise information. (#72623)
Update the sign in docs to contain more precise information. (#71698)
* Update sign-in-to-grafana.md
* updates link
---------
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
(cherry picked from commit d279d926a4536b4120276139af525c6c3c941849)
Co-authored-by: Paweł Krawczyk <71645192+Pawel-Kr@users.noreply.github.com>
* [v10.1.x] Logs: Fix ui getting stuck when removing fields (#72603)
Logs: Fix ui getting stuck when removing fields (#72597)
* Logs: Fix ui getting stuck when removing fields
* Update public/app/features/logs/components/LogDetailsRow.tsx
* Update
* Fix tests
(cherry picked from commit 117e33471937fea15ab4ab5d376104a8b1463607)
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* [v10.1.x] InfluxDB: Fix fetching retention policies after manually entering a non-existent retention policy (#72643)
InfluxDB: Fix fetching retention policies after manually entering a non-existent retention policy (#72564)
Don't fetch tag keys before fetching policies
(cherry picked from commit 31f4eddbb6b57e04d454b57c0c5e93684fa0154e)
* [v10.1.x] DS Picker: Ignore capitalization when sorting dropdown list (#72668)
DS Picker: Ignore capitalization when sorting by name (#72665)
(cherry picked from commit 148b6186b70fce90e9d3b830094bb97c70a2f40f)
Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
* [v10.1.x] Auth: Fix static test fake (#72627)
Auth: Fix static test fake (#72514)
fix static fake
(cherry picked from commit e04a6fb08e3b994ee63cd80503630b1937807d91)
* [v10.1.x] Docs: Prometheus yaml file needs to be fixed (#72696)
Docs: Prometheus yaml file needs to be fixed (#72654)
fixed yaml
(cherry picked from commit 65febbc8ece226dce9022bf204909ecfb95e2a5d)
Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
* [v10.1.x] Auth: Lock down Grafana admin role updates if the role is externally synced (#72691)
merge
* [v10.1.x] Explore: Fix parsing absolute range when URL changes (#72722)
Explore: Fix parsing absolute range when URL changes (#72578)
* Fix parsing absolute range when URL changes
* Update public/app/features/explore/hooks/useStateSync/index.test.tsx
Co-authored-by: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>
* Clean up docs
* Clean up
---------
Co-authored-by: Haris Rozajac <58232930+harisrozajac@users.noreply.github.com>
(cherry picked from commit 922dd94997339eb94b4bd74d3262d5c4267cdf3e)
Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
* [v10.1.x] docs: remove broken plugin from Angular guidance (#72707)
docs: remove broken plugin from Angular guidance (#72614)
aceiot-svg-panel fails to load in G10 and is therefore (currently) an unviable alternative
(cherry picked from commit 01100f83ba2ee27ebe35f3b74802c3c849007dda)
Co-authored-by: David Harris <david.harris@grafana.com>
* [v10.1.x] Nested folders: Clear selection state in tree view when indeterminate (#72728)
Nested folders: Clear selection state in tree view when indeterminate (#72595)
* clear selection state when indeterminate
* ensure search state is properly cleared when toggling the indeterminate checkbox
* select everything in view
(cherry picked from commit dbef9899ac8ec88c4c8b54146e26fa4418c25cbb)
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
* [v10.1.x] AzureMonitor: Add hardcoded namespaces to improve coverage (#72718)
AzureMonitor: Add hardcoded namespaces to improve coverage (#72629)
Add hardcoded resources
(cherry picked from commit 95f8cc09c7538fa25819c4b558c2f48af4fc5891)
Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
* [v10.1.x] Nested folders: Fix search query for empty self-contained permissions (#72733)
Nested folders: Fix search query for empty self-contained permissions (#72727)
* Add tests
* Fix query for nested folders with zero self-contained permissions
* Fix query behind permissionsFilterRemoveSubquery flag
* Apply suggestion from code review
(cherry picked from commit 8a24e891fe49e82a45af61179cbb5ab0ae2771be)
* [v10.1.x] Update all links that have destinations outside of /docs/grafana/latest/datasources/ to use shortcode (#72625)
Update all links that have destinations outside of /docs/grafana/latest/datasources/ to use `docs/reference` shortcode (#72051)
* Update all links that have destinations outside of /docs/grafana/latest/datasources/ to use docs/reference shortcode
* Fix typo
* Prettier
---------
(cherry picked from commit 2b14b2d56498d2ee1637ed28fb25fe3de67da4ed)
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* [v10.1.x] Update _index.md (#72701)
Update _index.md (#72222)
The existing link will take new users to the Data Source Management page which falls under that administration section and is perhaps more advanced that we want for a new user. The updated link takes new users to what I think was the intended "Data Sources" page.
(cherry picked from commit b8118520e42ff7d989eda5352076ee94cd198ed5)
Co-authored-by: Iain Finlayson <ruffiain@gmail.com>
* [v10.1.x] Auth: add a lock message for Grafana Admin role (#72762)
merge
* Docs: added labels section due to failed backport (#72693)
* added labels section
* removed references
* run prettier
---------
Co-authored-by: Eve Meelan <81647476+Eve832@users.noreply.github.com>
* [v10.1.x] UserSync: Avoid UpdateLastSeenAt with invalid user ids (#72784)
UserSync: Avoid UpdateLastSeenAt with invalid user ids (#72776)
* avoid user zero
* more errors
* more tests
* split
(cherry picked from commit 7431c0ddb15a146352eeb99eca67bca0dc61bec5)
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
* [v10.1.x] Tempo: Only get span_names when they are in the response (#72785)
Tempo: Only get span_names when they are in the response (#72663)
* Only get span names when they are in the response
* Find span_name field/labels
(cherry picked from commit b4c55765fe8ad5bf37a28384c5a7bc732bb9b1e9)
Co-authored-by: Joey <90795735+joey-grafana@users.noreply.github.com>
* [v10.1.x] Search v1: Remove unnecessary subqueries (#72710)
Search v1: Remove unnecessary subqueries (#72388)
* Add feature flag
* Introduce interface and dummy implementation
* Add tests for the new filter
* accessControlDashboardPermissionFilterNoFolderSubquery implementation
* join only if it's necessary
* force ordering for tests
* Temporarily enable new query for benchmarks
(cherry picked from commit 2c26a02b82238e0f89ca08844914cff22a84255a)
Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
* [v10.1.x] Alerting: added description to api resource (#72796)
Alerting: added description to api resource (#70597)
* added description to api resource
* prettier now
(cherry picked from commit b6c8ac6dd103c0d7c3dd4831c04793efb8a9abdd)
Co-authored-by: tonypowa <45235678+tonypowa@users.noreply.github.com>
* [v10.1.x] Usage stats: Tune collector execution startup and interval (#72790)
Usage stats: Tune collector execution startup and interval (#72688)
* Do not update statistics at service collector startup
* Configurable collector interval
* Introduce initial random delay
* Prevent reporting metrics until the stats have been collected
* Apply suggestion from code review
(cherry picked from commit afb59af79bd36b7ac911d8c9be83ec2642937283)
Co-authored-by: Sofia Papagiannaki <1632407+papagian@users.noreply.github.com>
* [v10.1.x] Fix setting oauthPassThru flag (#72799)
Fix setting oauthPassThru flag (#72472)
* Fix setting oauthPassThru flag
* Call onChange only if azure auth is enabled
* Move changes in onSettingsChange
(cherry picked from commit a44e0f2cfd089eabbe95bb7d19a4c3b5d0c5d7ed)
Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
* [v10.1.x] Update _index.md (#72802)
Update _index.md (#72317)
* Update _index.md
Adding popular open-source proxy options so users don't have to do further research if they don't want to
* ran Prettier
* Update docs/sources/setup-grafana/configure-security/_index.md
Co-authored-by: Ieva <vasiljeva.ieva@gmail.com>
---------
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Ieva <vasiljeva.ieva@gmail.com>
(cherry picked from commit 916f3008f919ec4d57b3b427239f78fb557f8016)
Co-authored-by: cmo-pomerium <91488121+cmo-pomerium@users.noreply.github.com>
* [v10.1.x] Proxy: Set the proxy information in Grafana for Graphite (#72813)
Proxy: Set the proxy information in Grafana for Graphite (#72777)
(cherry picked from commit 2c949a6a33a1f6aca956b1d1d95f4eb27b21267c)
Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
* [v10.1.x] Update start-restart-grafana.md (#72768)
Update start-restart-grafana.md (#72737)
* Update start-restart-grafana.md
Closes https://github.com/grafana/grafana/issues/72309
* Update docs/sources/setup-grafana/start-restart-grafana.md
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
---------
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
(cherry picked from commit 4d7d2d65198dc2c3444d76131d0d394a75deb5bd)
Co-authored-by: David Allen <david.allen@grafana.com>
* [v10.1.x] Auth: Add missing skipOrgRoleSync property to SocialBase for GenericOAuth (#72818)
Auth: Add missing skipOrgRoleSync property to SocialBase for GenericOAuth (#72752)
* add missing cfg for skiporgrolesync
* add google skiporgrolesync
* removed google skip
* update docs to reflect google
* remove docs update for google
(cherry picked from commit 27f57fe1120bf6f3e2dd54bcb1bc7c6801fc8829)
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
* [v10.1.x] SAML: Add onclick action to providercard if the provider is configured (#72836)
SAML: Add onclick action to providercard if the provider is configured (#72734)
* adds missign onclick for provider card
* simplified version
(cherry picked from commit 5d99fdeb46187dc91ac4433be6b28b71e3206617)
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
* [v10.1.x] Auth: lock down Grafana admin sync for SAML (#72839)
Auth: lock down Grafana admin sync for SAML (#72828)
lock down Grafana admin sync for SAML
(cherry picked from commit 3a2538c2ca52b65ca0ca966e65b7cbe5654c679e)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* [v10.1.x] Units: Fix display for kHz, MHz, GHz (#72852)
* [v10.1.x] Update index.md (#72851)
Update index.md (#71680)
* Update index.md
Updated the notes section per https://github.com/grafana/support-escalations/issues/6202
* Update docs/sources/setup-grafana/configure-grafana/configure-custom-branding/index.md
---------
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
(cherry picked from commit 515677c9380b96007ed15763201ee26e6e826b65)
Co-authored-by: deresolution20 <85902399+deresolution20@users.noreply.github.com>
* [v10.1.x] Update bind-net-capabilities.md (#72920)
Update bind-net-capabilities.md (#65181)
This doc fragment is included on multiple pages including this one: https://grafana.com/docs/grafana/latest/setup-grafana/installation/debian/
the only flaw is it's missing "sudo". Modern linux practice suggests using sudo for all administrative edits like this, and this change reinforces parallel structure in the target docs page. There may potentially be some other context this fragment is used in where sudo isn't appropriate, but this makes it easier to copy/paste the command and have it work on modern linuxes.
(cherry picked from commit 0d6e911fff4e10a0d220689c6a2132c9f7b0808d)
Co-authored-by: David Allen <david.allen@grafana.com>
* [v10.1.x] InfluxDB: Fix retention policy handling for InfluxDB 3.0 engine by bringing back the hardcoded default (#72923)
InfluxDB: Fix retention policy handling for InfluxDB 3.0 engine by bringing back the hardcoded default (#72467)
* Revert retention policy handling
* Remove comment
* Send retention policy with request when it's possible
(cherry picked from commit 3395ad03a74ad131a4079e1d81a3766d81e000cc)
* [v10.1.x] Auth: OAuth sets `skip_org_role_sync = true` for auth.google by default (#72924)
Auth: OAuth sets `skip_org_role_sync = true` for auth.google by default (#72819)
* sets skip_org_role_sync to true for google
* add google skiporgrolesync and sets to true always
* add field
* Update docs/sources/setup-grafana/configure-security/configure-authentication/google/index.md
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
* add AKS to words
* script back to mina
---------
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
(cherry picked from commit 95760cb021d51928dd0eddfaef294aad6166961d)
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
* [v10.1.x] Alerting: Fix cloud rules editing (#72928)
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
Fix cloud rules editing (#72927)
* [v10.1.x] Trend: Fix x field matching logic (#72961)
* [Docs 10.1.x] Manual backport - Docs/k8s install update (#72567) (#72953)
* Docs/k8s install update (#72567)
* added before you begin section
* just syncing up
* added namespace and yaml mainfest sections
* started the managed k8s section
* added external-ip section
* added minikube instructions
* added deployment rollout section
* added rolling update section
* added rollback stratgety section
* added the logging section
* fixed many typos
* Update docs/sources/setup-grafana/installation/kubernetes/index.md
* Update docs/sources/setup-grafana/installation/kubernetes/index.md
* Update docs/sources/setup-grafana/installation/kubernetes/index.md
* Update docs/sources/setup-grafana/installation/kubernetes/index.md
* Update docs/sources/setup-grafana/installation/kubernetes/index.md
* adjust codeblock spacing
* adjusts steps
* copy edit throughout
* Apply suggestions from code review
* more copy edit, updates links
* fixed minor typos
* Apply suggestions from code review
Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
* Apply suggestions from code review
* Apply suggestions from code review
* explained the dry-run example
* Move .codespellignore out of Drone so that technical writers can modify it
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* Fix spelling errors
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
* Add .codespellignore CODEOWNER
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
---------
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit b1fd399c10b608c75b18a74d3d692248b173958b)
* Update Drone signature
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
---------
Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Usman Ahmad <usman.ahmad@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
* [v10.1.x] Admin: Add redirect notice for datasources to admin landing page (#72865)
Admin: Add redirect notice for datasources to admin landing page (#72736)
* update copy of ConnectionsRedirectNotice
The Connections page is not that new anymore
* extend NavLandingPage with optional header
* show ConnectionsRedirectNotice on Admin landing page
* make ConnectionsRedirectNotice dismissable
* make ConnectionsRedirectNotice informational
(cherry picked from commit 290fc3aadf4400f224bd028806ad2e3975a19531)
Co-authored-by: mikkancso <miklos.tolnai@grafana.com>
* [v10.1.x] sign-plugin-docs: information of usage of a new token has been added to the docs (#72988)
sign-plugin-docs: information of usage of a new token has been added to the docs (#72912)
* Documentation for signing a plugin has been updated
* changes after review
* small review change
(cherry picked from commit ba3cbbef7f8fc9975acb5fe0abaff13d25314250)
Co-authored-by: Yulia Shanyrova <yulia.shanyrova@grafana.com>
* [v10.1.x] Prometheus: Fix fetching label values when datasource has no labels match api support (#72985)
Prometheus: Fix fetching label values when datasource has no labels match api support (#72960)
* interpolate match string
* provide unit test
* add the third parameter back to fix the unit test
(cherry picked from commit 29906847e1d19f6d201559dca298f5de90d47422)
Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
* [v10.1.x] docs: add default value workaround (#73004)
docs: add default value workaround (#72545)
* Update _index.md
Fixes #https://github.com/grafana/support-escalations/issues/6376
Variables : Added Default values
* Update docs/sources/dashboards/variables/_index.md
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* Ran prettier to resolve build errors
---------
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Isabel Matwawana <isabel.matwawana@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 54f0de313fbdb49ff1154d135c51e394f45fa734)
Co-authored-by: arunkg2787 <131352769+arunkg2787@users.noreply.github.com>
* [v10.1.x] Chore: Bump github.com/grafana/grafana-plugin-sdk-go to v0.172.0 (#73028)
Chore: Bump github.com/grafana/grafana-plugin-sdk-go to v0.172.0
* [v10.1.x] Alerting: Fix "see graph button" for cloud rules (#73029)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
Co-authored-by: Giordano Ricci <me@giordanoricci.com>
Fix "see graph button" for cloud rules (#72980)
* [v10.1.x] Docs: Update screenshots for generating an access token for signing a plugin (#73035)
Docs: Update screenshots for generating an access token for signing a plugin (#73031)
updated screenshots path and name
(cherry picked from commit 3c4d2edb61d86ab343eb5345840b725e1cb11257)
Co-authored-by: Yulia Shanyrova <yulia.shanyrova@grafana.com>
* [v10.1.x] Logs: Fix displaying the wrong field as body (#73037)
Logs: Fix displaying the wrong field as body (#73025)
* fix displaying the wrong field as body
* fix test
* fix `getFirstFieldOfType` with non-present type
(cherry picked from commit 533fae4c603293149b41e2a4d411e3f90388c44f)
Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
* [v10.1.x] InfluxDB: Fix handling flux response with no time and value column (#73047)
InfluxDB: Fix handling flux response with no time and value column (#72833)
* Upgrade the influxdb-client-go version
* Handle flux response with no time and value column
(cherry picked from commit 1ac9e7eaabe5f6cd9e0d3fa0f51648bf9f229933)
Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
* [v10.1.x] Alerting: Optimize external Loki queries (#73050)
Alerting: Optimize external Loki queries (#73014)
(cherry picked from commit 2c6cf6674157f1051f655277b96b03af1e4a0cbd)
Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
* [v10.1.x] Add a warning in the documentation (#73073)
Add a warning in the documentation (#72975)
A partner complained in the name of a customer. They have 6k datasources and it took them some time to figure out why they only had 5k coming back.
This commit add a warning for this edge case, content is pretty clear.
(cherry picked from commit 5eef8291e2d8b58724fa52e4412da2b1a7d0b4e3)
Co-authored-by: Clément Duveau <clement@duveau.eu>
* [v10.1.x] EditDatasource: Fix navtree when `dataSourcePageHeader` is on (#73024)
EditDatasource: Fix navtree when `dataSourcePageHeader` is on (#72827)
use useDataSourceSettingsNav from connections in DataSourceTabPage
(cherry picked from commit 1646b901af8908585218f29255a037c5d775189d)
Co-authored-by: mikkancso <miklos.tolnai@grafana.com>
* [v10.1.x] Auth: prevent auto_login redirect if user is already authenticated (#73081)
Auth: prevent auto_login redirect if user is already authenticated (#72477)
* Auth: prevent auto_login redirect if user is already authenticated
Before attempting an auto-login for OAuth, verifies if current context has already been
authenticated.
Fixes: #72476
Co-authored-by: Karl Persson <kalle.persson92@gmail.com>
(cherry picked from commit d9c232b331c4bed015ded5d4fdbcebb50600402b)
Co-authored-by: Maksym Revutskyi <maksym.revutskyi@gmail.com>
* [v10.1.x] Logs: Disable query splitting due to conflicts with transformations (#73097)
Logs: Disable query splitting due to conflicts with transformations (#73086)
* disable query splitting for now
* change stage of `lokiQuerySplitting`
(cherry picked from commit 1343c74362f6e476820968a78aa24754dab304ed)
Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
* [v10.1.x] Update _index.md (#73119)
Update _index.md (#72562)
Fixes # https://github.com/grafana/support-escalations/issues/6887
Configure HA: Added ha_peer_Timeout global config in the unified alerting
(cherry picked from commit cda78c6fe811b1c2be83b1ea660a3464b8a476b2)
Co-authored-by: arunkg2787 <131352769+arunkg2787@users.noreply.github.com>
* [v10.1.x] Docs: Fix broken links to create-plugin docs (#73130)
Docs: Fix broken links to create-plugin docs (#72965)
* Fix broken links to create-plugin docs
* Typo fix
* Fix additional broken link
* Fix additional links
(cherry picked from commit eb6e19c7af8b98975fdfacee52bd892766fe07b8)
Co-authored-by: Joseph Perez <45749060+josmperez@users.noreply.github.com>
* [v10.1.x] Alerting: Optimize rule details page data fetching (#73139)
* [v10.1.x] Alerting: Add "no-rules" to redirect to rule viewer (#73141)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* [v10.1.x] Auth: Add authed device tagging (#73156)
* Auth: Rename Sessions to Devices in counting (#72432)
* rename session to device
* rename session to device
* Auth: Add authed device tagging (#72442)
* add authed device tagging
* fix config
* implement feedback
* implement feedback
* add reverse untag behavior
* remove duplicate stat
* Update pkg/services/anonymous/anonimpl/impl.go
(cherry picked from commit 3353b1a8aa821aa4bd328c4a02c67ad48bbbcc39)
* [v10.1.x] Docs: Update to include keycloak link in oauth docs (#73172)
Docs: Update to include keycloak link in oauth docs (#72698)
Update to include keycloak link in oauth docs
(cherry picked from commit 3c289d8a0840f381b602b3b7c5bea7370f9c1096)
Co-authored-by: Jess Sartin <jdoherty513@gmail.com>
* [v10.1.x] Update [analytics] section to include the ability to set to false (#73175)
Update [analytics] section to include the ability to set to false (#71473)
* Update [analytics] section to include the ability to set to false
In the follow section:
https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#analytics
Added a line for 'enabled' under the [analytics] section to include the ability to set to false as this is now a togglable feature.
* Update docs/sources/setup-grafana/configure-grafana/_index.md
* Update docs/sources/setup-grafana/configure-grafana/_index.md
---------
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit ff1fdac67519bcf45e049f2879b085b7be5a39de)
Co-authored-by: Milton Prado <89411595+Ptoricanmilt@users.noreply.github.com>
* [v10.1.x] Alerting: Always invalidate the AM config after mutation (#73189)
Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
* [v10.1.x] docs: remove strava from angular plugin list (#73195)
docs: remove strava from angular plugin list (#73192)
(cherry picked from commit a70d2d39f65144f3010e107416c6f5be263cb7aa)
Co-authored-by: David Harris <david.harris@grafana.com>
* [v10.1.x] AzureMonitor: Allow `serviceTags` and `tags` to be empty for trace results (#73197)
AzureMonitor: Allow `serviceTags` and `tags` to be empty for trace results (#73145)
Allow serviceTags and tags to be empty
(cherry picked from commit 95546551bcb0990eda2847b7148406b1eeb11a15)
Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
* [v10.1.x] docs: remove Moogsoft from angular list, update version for helm (#73206)
docs: remove Moogsoft from angular list, update version for helm (#73204)
(cherry picked from commit 63ffd9511021e1ee9957bc3a19cb7f5d49d49001)
Co-authored-by: David Harris <david.harris@grafana.com>
* [v10.1.x] Update index.md (#73200)
Update index.md (#73183)
* Update index.md
* Update docs/sources/setup-grafana/configure-security/configure-authentication/okta/index.md
---------
Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
(cherry picked from commit a9d2bbc814bf9f8e3d9a69660fce8f18c7d259b8)
Co-authored-by: Kevin Burke <kevin.burke@segment.com>
* [v10.1.x] Slug: Combine various slugify fixes for special character handling (#73173)
Slug: Combine various slugify fixes for special character handling (#73164)
* combine various slugify fixes for special character handling
* a couple more test cases
* update more tests
* goimports
(cherry picked from commit dd97038b003260f800296bbc9a14c54f93e11de3)
Co-authored-by: Dan Cech <dcech@grafana.com>
* [v10.1.x] Alerting: Remove dump wrapper for yaml config (#73215)
Alerting: Remove dump wrapper for yaml config (#73169)
Remove dump wrapper for yaml config
(cherry picked from commit 6c007641e0804ff349d38c1bff50111dd7d3fd2a)
Co-authored-by: Virginia Cepeda <virginia.cepeda@grafana.com>
* [v10.1.x] Drawer: Fix scrolling drawer content on Safari (#73229)
Drawer: Fix scrolling drawer content on Safari (#73080)
Add min-height to allow scroll drawer content on Safari
(cherry picked from commit 140624603f6ef689a9af2fd026841175eff55cf0)
Co-authored-by: Alex Simonok <sashasimonok@gmail.com>
* [v10.1.x] CodeEditor: Correctly fires onChange handler (#73261)
CodeEditor: Correctly fires onChange handler (#73030)
move onChange outside onEditorDidMount condition
(cherry picked from commit 57d8997b86df7a6388dcab01394b971048399fe3)
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
* [v10.1.x] Logs: Fix scrolling with `exploreScrollableLogsContainer` feature (#73276)
Logs: Fix scrolling with `exploreScrollableLogsContainer` feature (#73272)
fix scrolling with `exploreScrollableLogsContainer`
(cherry picked from commit 98b38782312ff46772bc5835b527c128bc3fb467)
Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
* [v10.1.x] Dashboard: Fix repeated row panel placement with larger number of rows (#73279)
Dashboard: Fix repeated row panel placement with larger number of rows (#72011)
Closes #69833
(cherry picked from commit cd6ed02256ecf547ea96d6399e24f15f3cd56477)
Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
* [v10.1.x] docs: What’s New & Upgrade Guide 10.1 (#73282)
docs: What’s New & Upgrade Guide 10.1 (#70636)
* added what's new 10.1
* created new upgrade guide
* updated index file to 10.1
* updated whats new index file
* Dataviz: add disconnect values whats new content
* Docs: Add Configure refresh token handling separately for OAuth providers to what's new 10.1 (#71648)
* Add what s new section for configuring refresh token handling
---------
Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* Whats new: Add step editor and copy link (#71964)
* Add step editor and copu link to the whats new
* Update docs/sources/whatsnew/whats-new-in-v10-1.md
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* Update docs/sources/whatsnew/whats-new-in-v10-1.md
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* Update docs/sources/whatsnew/whats-new-in-v10-1.md
Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
---------
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
* Add flamegraph section
* Added TraceQL response streaming section
* Updated tempo-streaming video link
* What's new: Add Loki, Elasticsearch, and Log changes (#72101)
* What's new: Add Loki, Elasticsearch, and Log changes
* Remove Lucene parser mention
* added contributor name to each entry
* Alerting: adds whats new entries and structure
* Elasticsearch: logs sample in explore
* Add span filtering is GA to whats new doc
* Transformations redesign and metrics explorer
* ran prettier
* What's new 10.1: Recategorize contents and add missing data (#72199)
What's new: recategorize content and add missing data
* Revert whats new refresh token handling (#72191)
Revert refresh token handling
* docs: What’s New & Upgrade Guide 10.1 AuthNZ (#72000)
* add what's new authnz
* Update docs/sources/upgrade-guide/upgrade-v10.1/index.md
---------
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* Alerting: screenshots and updates
* Alerting: delete couple of entries
* Docs: Add Visualizations and Widgets Split to what's new 10.1 (#72009)
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* Docs: Add CloudWatch Logs Monaco query editor to what's new in 10.1 (#72221)
* Docs: Add CloudWatch Logs Monaco query editor to what's new in 10.1
* Add guidance for Cloud users to enable the feature
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
---------
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* Alerting: adds notification policy entry
* Add Plugins/Angular deprecation sections to What's new 10.1
* Add Plugins/ds uid deprecation section to What's new 10.1
* Alerting: adds label color entry
* Adds whats new features for AWS Datasources
* Update what's new 10.1 angular deprecation section
* Docs: what's new for preventing manual role updates (#72279)
* what's new for disabling manual role updates
* add a reference to the feature toggle
* fix spelling
* Apply suggestions from code review
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* PR feedback
---------
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* wording fixes
* whatsnew-10.1.0: add logs-context info (#72240)
* whatsnew-10.1.0: add logs-context info
* explain what log context is
* improved description
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* better phrasing
---------
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* Subfolders: folder picker
* Influxdb backend mode
* Dataviz: heatmap datalink support
* DataViz: geomap new beta network layer
* Dataviz: update geomap network layer image
* Dataviz: update availability wording to public preview from experimental for geomap network layer
* Docs: Add Activate draft reports section to what's new in 10.1
* Docs: Add format time transformation to what's new
* Docs: Adjust format time transformation language
* Explore: Add what's new about panel plugins (#72338)
* Add what's new about panel plugins
* Update docs/sources/whatsnew/whats-new-in-v10-1.md
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
---------
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
* add tabular outer join to whats new
* Update traceql streaming section
* Added new tempo search section
* Update traceql streaming video name
* docs: what's new 10.1.0, easier to use elastic query editor (#72513)
* docs: elasticsearch: new mode selector
* improved text
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
---------
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* mitch edits
* Added product labels
* Made general copy edits
* Removed editing notes
* Fixed broken relref
* Fixed typo and added contributor name
* Added contributor name
* Made minor copy edits
* Update format time transformation docs
* A small edit to the role list
* Added missing information and committed copy edits
* Move Reports item to under Dashboards & visualizations
* Changed heading level of Activate draft reports
* Fixed wording of Choose which fields to display in log line entry
* Made edits to Logs improved performance entry
* Added availability for Transformations redesign
* Added availability for Join by fields
* Made final copy edits
* Removed Loki query splitting
---------
Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
Co-authored-by: André Pereira <adrapereira@gmail.com>
Co-authored-by: Matias Chomicki <matyax@gmail.com>
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
Co-authored-by: Gareth Dawson <gwdawson.work@gmail.com>
Co-authored-by: Joey Tawadrous <joey.tawadrous@grafana.com>
Co-authored-by: catherineymgui <catherine.gui@grafana.com>
Co-authored-by: Jo <joao.guerreiro@grafana.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
Co-authored-by: Alexa V <239999+axelavargas@users.noreply.github.com>
Co-authored-by: Kevin Yu <kevinwcyu@users.noreply.github.com>
Co-authored-by: Giuseppe Guerra <giuseppe@guerra.in>
Co-authored-by: Sarah Zinger <sarah.zinger@grafana.com>
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Zsofia <zsofia.komaromi@gmail.com>
Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
Co-authored-by: Robert Horvath <robert.horvath@grafana.com>
Co-authored-by: Kyle Cunningham <kyle@codeincarnate.com>
Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
Co-authored-by: bohandley <brendan.ohandley@gmail.com>
Co-authored-by: Mitchel Seaman <mitchel.seaman@gmail.com>
Co-authored-by: Isabel Matwawana <isabel.matwawana@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 3432d3b72120b0d1d5d165df68e1fd226ed0649d)
Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
* [v10.1.x] Docs: correct SAML docs (#73286)
Docs: correct SAML docs (#73281)
Correct SAML docs
(cherry picked from commit 2848be90355d77e446c783fd339a7f4d49ed1199)
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
* [v10.1.x] DataSourceProxy: Fix url validation error handling (#73322)
* DataSourceProxy: Fix url validation error handling (#73087)
* DataSourceProxy: Fix url validation error handling
* DataSourceProxy: Add unit test for proxyDatasourceRequest
* DataSourceProxy: Fix lint error
(cherry picked from commit 8ec4c1bdc87c43fe43e6bc56db924a9107edf137)
* fix test
* fix test
---------
Co-authored-by: Ricardo Christmann <80476005+ricci2511@users.noreply.github.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
* [v10.1.x] Loki: Fix validation of `step` values to also allow e.g. `ms` values (#73335)
Loki: Fix validation of `step` values to also allow e.g. `ms` values (#73270)
* use go duration validation
* add `isValidGrafanaDuration`
* use `isValidGrafanaDuration`
* improve jsdoc
(cherry picked from commit c006ea18fbcf719adc70032efd2a3ef5abb1cd7c)
Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
* [v10.1.x] Canvas: Fix data links (#73337)
* [v10.1.x] Docs: Fixed Grafana Fundamentals tutorial to match updated UI (#73342)
Docs: Fixed Grafana Fundamentals tutorial to match updated UI (#73168)
* Update index.md
The word `Configuration` was used to describe an action for getting started, when the actual UI has the word `Administration` and not Configuration. Updated the docs to reflect the actual environment created.
* Update index.md
Updated the tutorial to match the current UI options
* Made copy edits for styling and consistency with Cloud fundamentals tutorial
Made some copy edits to match our style guide and to make this tutorial a bit more consistent with the Cloud version. Also added the step for updating the legend back to the build dashboards section.
* Ran linter
* Edited text to match updated UI
Made edits to match UI behaviour as well as some further style edits.
* Made final copy edits
---------
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
Co-authored-by: Isabel Matwawana <isabel.matwawana@grafana.com>
(cherry picked from commit cc1ea31616a8be105eaa78777b4b0ffda4aa2348)
Co-authored-by: C M <40527412+glitchwizard@users.noreply.github.com>
* [v10.1.x] Grafana versioning: Remove `pre` suffix from Grafana version (#73367)
Grafana versioning: Remove `pre` suffix from Grafana version (#73357)
* Remove pre suffix from version
* Fix tests
(cherry picked from commit 0aba319ea04378b4e64335e365236155135185a0)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
* [v10.1.x] docs: update signature level guidance (#73371)
docs: update signature level guidance (#73368)
docs: update signature level guidances
(cherry picked from commit ccbd31fe1f0ba19298c59472161f3e20e2ff925f)
Co-authored-by: David Harris <david.harris@grafana.com>
* [v10.1.x] CI: Update grabpl to v3.0.41 (#73379)
CI: Update `grabpl` to `v3.0.41` (#73373)
Update grabpl
(cherry picked from commit 3463dc8e48a96fcfe808aa250dbb02a74bfe3ef0)
# Conflicts:
# .drone.yml
* [v10.1.x] ClientTokenRotation: Don't rotate session cookie for authproxy (#73381)
ClientTokenRotation: Don't rotate session cookie for authproxy (#72496)
* ClientTokenRotation: Don't rotate session cookie for authproxy
* Account for config option auth.proxy enable_login_token
* Limit amount of changes on devenv
* Fix tests by moving authenticatedBy up
* Uncomment nginx conf
(cherry picked from commit 4c7b97cdb0318b2c08299c407c4bf51a497dc33b)
Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
* [v10.1.x] Log row: split row-highlighting booleans in two (#73334)
Log row: split row-highlighting booleans in two (#73330)
(cherry picked from commit 0fe53fbd1dd8269ff51883ea9244b9b06a3f33d1)
Co-authored-by: Matias Chomicki <matyax@gmail.com>
* [v10.1.x] Rendering: Fix dashboard screenshot (#73361)
Rendering: Fix dashboard screenshot (#73190)
Rendering: fix dashboard screenshot
(cherry picked from commit 24978eff61310d6161887f84ec84cd472720db47)
Co-authored-by: Agnès To…
yuri-tceretian
added
backport v9.4.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this feature?
This PR fixes a bug in the state manager that is described in #71467. It updates the state manager to clean up the labels sneaked after the cacheID was calculated. I added safety to remove only if the result does not contain these labels.
This is a temporary change to remediate the problem and will be changed in #68142
Before
before-no-sound.mp4
After
after-no-sound.mp4
Why do we need this feature?
This happens only in the case when the result does not have any labels, usually when the rule uses the classic condition. The normal evaluation uses labels from the rule only. When an error happens, the error result does not have labels either, and therefore it is matched to the normal state instead of being a new state (in multi-dimensional alerts when each normal result contains labels). The state manager adds extra labels after the state identifier is calculated. Therefore, this makes the normal result match the state that contains the extra labels, and therefore the extra labels (datasource_uid and ref_id) never go away from the state.
Who is this feature for?
Those who use classic condition and execution of Error as an error.
Which issue(s) does this PR fix?:
Fixes #71467
Special notes for your reviewer:
Please check that: