Commit Graph
43812 Commits
Author SHA1 Message Date
Matthew JacobsonandGilles De Mey e3787de470 Alerting: Fix Alertmanager change detection for receivers with secure settings (#71307)
* Alerting: Make ApplyAlertmanagerConfiguration only decrypt/encrypt new/changed secure settings

Previously, ApplyAlertmanagerConfiguration would decrypt and re-encrypt all secure settings. However, this caused re-encrypted secure settings to be included in the raw configuration when applied to the embedded alertmanager, resulting in changes to the hash. Consequently, even if no actual modifications were made, saving any alertmanager configuration triggered an apply/restart and created a new historical entry in the database.

To address the issue, this modifies ApplyAlertmanagerConfiguration, which is called by POST `api/alertmanager/grafana/config/api/v1/alerts`, to decrypt and re-encrypt only new and updated secure settings. Unchanged secure settings are loaded directly from the database without alteration.

We determine whether secure settings have changed based on the following (already in-use) assumption: Only new or updated secure settings are provided via the POST `api/alertmanager/grafana/config/api/v1/alerts` request, while existing unchanged settings are omitted.

* Ensure saving a grafana-managed contact point will only send new/changed secure settings

Previously, when saving a grafana-managed contact point, empty string values were transmitted for all unset secure settings. This led to potential backend issues, as it assumed that only newly added or updated secure settings would be provided.

To address this, we now exclude empty ('', null, undefined) secure settings, unless there was a pre-existing entry in secureFields for that specific setting. In essence, this means we only transmit an empty secure setting if a previously configured value was cleared.

* Fix linting

* refactor omitEmptyUnlessExisting

* fixup

---------

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
2023-07-11 08:23:07 +02:00
Ryan McKinley 09cc63329f XYChart: Improve base options setup (#67878) 2023-07-10 17:54:01 -07:00
Ihor YerominandJoao Silva 4206a4d16a Dashboard: Slider overlapping with right input field (#71282)
* fix(slider): input field left margin

* fix(slider): use theme spacing variable

Co-authored-by: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>

---------

Co-authored-by: Joao Silva <100691367+JoaoSilvaGrafana@users.noreply.github.com>
2023-07-10 21:36:37 +02:00
Emil Tullstedt 5c19272065 Slug: Use urlencoding to support non-ASCII characters (#70691) 2023-07-10 21:05:39 +02:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> d358bce562 Update dependency @opentelemetry/semantic-conventions to v1.15.0 (#71271)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-10 17:46:20 +01:00
Josh Hunt 899de865fc Update Public Dashboards documentation (#71276)
The documentation for how to support public dashboards is slightly incorrect.
2023-07-10 15:53:46 +00:00
Juan Cabanas 8a6c6c3285 PanelInspect: Download CSV without extra blank rows (#71248) 2023-07-10 12:16:47 -03:00
Torkel Ödegaard 9f2baaf5c3 PanelInspect: Clean table display settings from field config (#71226)
* Does not work, hmm..

* now it works

* fixing and refactoring

* remove unused import
2023-07-10 16:27:03 +02:00
Haris Rozajac 4b3050e02e Explore: Test deleting comments in query history (#70934)
* Working test
2023-07-10 08:09:42 -06:00
276c63a656 Auth: update generic OAuth documentation (#70330)
* update generic OAuth docs

* some more fixes and corrections

* update examples and sync sections

* fix a link

* linting

* formatting and adding more links to OAuth integrations

* add a section with config walkthrough

* fix link

* move examples to the end of the doc

* extend role mapping

* small improvements

* add a before you begin section, clean up steps, remove some text

* remove unnecessary section

* merge main 2

* OAuth -> OAuth2

* remove Centrify example because it's likely outdated

* add shared intro content

* indentation

* add refresh token to tasks, clean up more sections

* linting

* linting

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Update docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* indentation and small descriptions under headings

* add a table for config options

* clean up more sections

* rewrite email address section

* rewriting login and display name sections, plus adding line breaks

* clean up more sections

* update role mapping section

* indentation again

* update section names

* incorporates final edits

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* pr feedback

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* PR feedback: rewording

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
2023-07-10 16:00:05 +03:00
Piotr Jamróz c191a20591 Explore: Fix Query History flakey test (#71190)
* Baseline benchmark

* Baseline benchmark

* Re-trigger the build

* Use test id

* Re-trigger the build

* Re-trigger the build

* Use test id to speed up the test

* Split query history sync tests
2023-07-10 14:35:54 +02:00
Ieva a65cb4d808 RBAC: remove simple RBAC disabled checks (#71137)
* remove simple RBAC disabled checks

* fixing tests

* remove old AC tests
2023-07-10 15:14:21 +03:00
Gábor FarkasandMatias Chomicki 8f2f6d63eb logs: scanning: add tracking (#71031)
* logs: scanning: add tracking

* only report start-click when it is really doing it

Co-authored-by: Matias Chomicki <matyax@gmail.com>

---------

Co-authored-by: Matias Chomicki <matyax@gmail.com>
2023-07-10 13:50:18 +02:00
Gilles De Mey 1945f2b64e Alerting: Use new "Label" components for alert instance labels (#70997) 2023-07-10 13:03:35 +02:00
Jack Baldry 01f6b8e90c Use docs/reference style links for all Alerting links (#71124)
* Replace all alerting links with docs/reference style links

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Fix broken docs/reference style link

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Update all alerting links to go to Grafana Cloud resources when the page is published in Grafana Cloud

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Prettier

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Replace another link

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

---------

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2023-07-10 11:51:29 +01:00
Douglas Adams 3a245e4945 Auth: Fix US gov azure ad oauth URL parsing (#71254)
Updates regex for tenant ID parsing to support .us domains in addition
to .com domains for Azure AD.

Fixes #71252
2023-07-10 12:37:00 +02:00
Torkel Ödegaard 17b2240d52 GrafanaUI: Update FilterPill active state and ToolbarButton active state (#70396) 2023-07-10 11:41:33 +02:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 1c994bfec8 Update dependency @kusto/monaco-kusto to v7.6.2 (#71269)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-10 10:33:35 +01:00
Jo 932c24986d Auth: Resolve isGrafanaAdmin for debug logging (#71145)
resolve isGrafanaAdmin for debug logging
2023-07-10 11:14:51 +02:00
Jo 49e42d1a8d AccessControl: Add resource permission deletion helper (#71222)
* add method for deleting managed resource permissions

* test method
2023-07-10 11:13:05 +02:00
Jo a7aca983a5 AccessControl: Fix nuid permission deletion when deleting dashboards and folders (#71225)
* fix nuid permission deletion when deleting dashboards and folders

* fix lint
2023-07-10 11:12:04 +02:00
Joseph Perez d9e0ab2964 Docs: fix incorrect alias for sign-a-plugin.md (#71255) 2023-07-10 10:30:58 +02:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 082c2c6a59 Update dependency @grafana/scenes to v0.18.0 (#71268)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-10 09:28:07 +01:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 1fff3b262e Update dependency stylelint to v15.10.1 [SECURITY] (#71256)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-10 09:12:14 +01:00
Sven Grossmann b05cc2d651 Transformations: Fix extractFields throwing Error if one value is undefined or null (#71070)
* fix extract fields with null values

* rename test

* check for null values

* revert changes

* improve position
2023-07-10 09:49:56 +02:00
MisiandGabriel MABILLE 607670a9fa Auth: Use SHA-1 for generating an ID for External Service Role (#71079)
* Use sha1 (160 bit hash)

* Update pkg/services/accesscontrol/database/externalservices.go

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* Satisfy linter, clean up

---------

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
2023-07-10 09:47:33 +02:00
renovate[bot]andrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com> ae5d9e9ae4 Update React Aria (#71086)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-10 06:36:34 +00:00
2b7af7798c StateTimeline: Add disconnect value option (#70610)
Co-authored-by: nmarrs <nathanielmarrs@gmail.com>
Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2023-07-07 13:24:22 -07:00
matt abramsandlwandz13 69d8e3d8dc Docs: Fix broken links to play (#71112)
* fix broken links to play

* Update docs/sources/dashboards/variables/_index.md

Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>

---------

Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
2023-07-07 10:00:05 -10:00
Sofia Papagiannaki 22147c6230 NestedFolders: Do not perform guardian checks for subfolders (#69769)
Nested folders: Do not perform guardian checks for subfolders

Permissions are inherited so if the parent has access then
the subfolder has access too
2023-07-07 21:26:01 +03:00
Ihor Yeromin d92d3ede79 XYChart: Point size editor should reflect correct default (5) (#71126)
fix(xychart): reconcile point size editors
2023-07-07 18:43:49 +02:00
fabrizio-grafana 2075dc4f2b Dashboard: Add test dashboard for Flame Graph (#70685) 2023-07-07 18:15:47 +02:00
Orgad Shaneh 45ff62af78 Chore: Update crewjam/saml (#71122)
* Chore: Update crewjam/saml to match replaced version for vulnerability scanners

* go mod tidy
2023-07-07 17:59:22 +02:00
Timur Olzhabayev 38a3cc71ee Chore: Make grafana-delivery-bot non-external (#71116)
Make grafana-delivery-bot non-external
2023-07-07 16:22:24 +01:00
Armand Grillet 3ec0558204 Clarify external AM limitation (#71179) 2023-07-07 17:13:11 +02:00
Laura Fernández 616126674d GLDS: Fix className metrics (#71214) 2023-07-07 17:00:57 +02:00
Galen Kistler 7dc071f46b Prometheus: Version detect bug (#71198)
* remove redundant request copy in backend, add more versions to semver lists
2023-07-07 09:39:20 -05:00
b1e76a7036 Dashboards: Keep save drawer open for unhandled errors (#70434)
* user essentials mob! 🔱

* user essentials mob! 🔱

lastFile:public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx

* user essentials mob! 🔱

lastFile:public/app/features/dashboard/components/SaveDashboard/SaveDashboardDrawer.tsx

* user essentials mob! 🔱

lastFile:public/app/features/dashboard/components/SaveDashboard/useDashboardSave.tsx

* rename isHandledError fn

* fix prettier

---------

Co-authored-by: Joao Silva <joao.silva@grafana.com>
Co-authored-by: Laura Benz <laura.benz@grafana.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-07-07 13:46:53 +00:00
Mitch Seaman ac78146091 Docs: update the word "integration" in Okta config (#71181) 2023-07-07 08:44:27 -05:00
Kevin Minehart d5a4c81fa1 CI: Add GPG keys to rgm, don't clone RGM just use the docker image (#71143)
* Add GPG keys to rgm, dont' clone RGM just use the docker image

* remove the cd command

* forgot to make drone :(

* idk

* reference script more specifically

* i guess we'll just cd /src

* Only show not found artifacts
2023-07-07 16:42:40 +03:00
Matias Chomicki 92c94710cd Loki/Elasticsearch config: Add DataSourceDescription component (#71206)
* Loki config: add data source description component

* Elastic config: add data source description component
2023-07-07 14:22:52 +01:00
Emil Tullstedt 56f52dc97e Annotations: Fix database lock while updating annotations (#71199) 2023-07-07 15:21:49 +02:00
Leanna ShippyandIsabel 217265baee Docs: Updates Grafana alerting link text on Panel Editor Overview page (#71146)
* Updates Grafana alerting link text on panel editor overview page

* fixed wording of link text

---------

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-07-07 08:12:19 -04:00
Laura Fernández b34f3a6142 GLDS: Get metrics of className usage in props (#71072) 2023-07-07 13:39:52 +02:00
David Harris a9368aab7a docs: remove kentik from angular plugins (#71191)
As of v1.7.0 this plugin no longer uses Angular
2023-07-07 12:28:57 +01:00
Gilles De Mey 089305e399 Alerting: improve provisioning indicator for notification policies (#71160) 2023-07-07 14:00:53 +03:00
Ben Donnelly 524f111ab3 Explore: Allow the use of plugin panels (#66982)
* Explore: Allow the use of plugin panels

Allow plugins to define a visualisation to use in explore that comes from a plugin.

* Explore: Allow the use of plugin panels

Rename ExplorePanel to CustomContainer

* Explore: Allow the use of plugin panels

Changed CustomContainer to take all frames for plugin id.
Add field preferredVisualisationPluginId to frame metadata.
Updated decorators to check for plugin and fallback to preferredVisualisationType if plugin cannot be found.

* Explore: Allow the use of plugin panels

Handle case where there are no custom frames

* Explore: Allow the use of plugin panels

Add test cases
2023-07-07 11:28:44 +02:00
Guillaume Jacquet b947222bf5 Platform: Add support for Postgresql pgpass file (#61517)
lib/pq has built-in support to use pgpass file for authentication when
no password has been provided. However this requires that the connection
does not contain the password parameter at all.

Removing password parameter when postgresql password is empty in
SQL store.
2023-07-07 11:17:35 +02:00
Sofia Papagiannaki e82d437e0e Drone: Enable running go benchmarks on demand (#70359)
* Add benchmark

* Run pkg/api benchmarks in CI

* Conditionally run benchmarks for provided go packages

* Bypass fork check for promotes
2023-07-07 11:55:01 +03:00
Gilles De Mey 536146de5f Docs: Adding the right syntax highlighting in a few places (#71141)
Adding the right syntax highlighting in a few places
2023-07-07 09:15:39 +02:00