Commit Graph

42947 Commits

Author SHA1 Message Date
grafana-delivery-bot[bot]
d63243cba6 [v10.0.x] Docs: changes link text and adds link to the download page (#70509)
Docs: changes link text and adds link to the download page (#70477)

achanges link text and add link to the download page

(cherry picked from commit 5426d519c6)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-06-22 06:58:44 -05:00
grafana-delivery-bot[bot]
d7b7e47f6c [v10.0.x] Tracing: supply Grafana build version (#70489)
Tracing: supply Grafana build version (#69733)

* tracing: supply Grafana build version

Not etcd client version.

* go mod tidy

(cherry picked from commit c45ff94806)

Co-authored-by: Bryan Boreham <bjboreham@gmail.com>
2023-06-22 12:12:48 +03:00
grafana-delivery-bot[bot]
c87b7233b8 [v10.0.x] XYChart: Ensure color scale is field-local and synced with data updates (#70481)
XYChart: Ensure color scale is field-local and synced with data updates (#70480)

(cherry picked from commit 3007e3b209)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2023-06-22 00:33:38 +03:00
grafana-delivery-bot[bot]
f5404286be [v10.0.x] Docs: removes references to YUM (#70475)
Docs: removes references to YUM (#70471)

removes references to YUM

(cherry picked from commit ebdba3b359)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-06-21 14:22:05 -05:00
Matthew Jacobson
c364c8dc0b [v10.0.x] Alerting: Fix unique violation when updating rule group with title chains/cycles (#70467)
* Alerting: Fix TestIntegration_GetAlertRulesForScheduling to make sure rules are created in different org (#69088)

make sure rules are created in different org

(cherry picked from commit b57ef1f2c7)

* Alerting: Fix flaky TestIntegrationUpdateAlertRules (#69106)

Prevents duplicate alert rule ids and 0 value for BaseInterval and IntervalSeconds

(cherry picked from commit 97ae6ae6ef)

* Alerting: Fix unique violation when updating rule group with title chains/cycles (#67868)

* Alerting: Fix unique violation when updating rule group with title chains/cycles

The uniqueness constraint for titles within an org+folder is enforced on every update within a transaction instead of on commit (deferred constraint). This means that there could be a set of updates that will throw a unique constraint violation in an intermediate step even though the final state is valid. For example, a chain of updates RuleA -> RuleB -> RuleC could fail if not executed in the correct order, or a swap of titles RuleA <-> RuleB cannot be executed in any order without violating the constraint.

The exact solution to this is complex and requires determining directed paths and cycles in the update graph, adding in temporary updates to break cycles, and then executing the updates in reverse topological order (see first commit in PR if curious).

This is not implemented here.

Instead, we choose a simpler solution that works in all cases but might perform more updates than necessary. This simpler solution makes a determination of whether an intermediate collision could occur and if so, adds a temporary title on all updated rules to break any cycles and remove the need for specific ordering.

In addition, we make sure diffs are executed in the following order: DELETES, UPDATES, INSERTS.

(cherry picked from commit 0c688190f7)

* Linting

---------

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
2023-06-21 14:38:38 -04:00
grafana-delivery-bot[bot]
ddd6b2803c [v10.0.x] Docs: fixes minor errors (#70466)
Docs: fixes minor errors (#70458)

* Docs: fixes minor errors

* adds links

* remove trailing slash

---------

Co-authored-by: Chris Moyer <chris.moyer@grafana.com>
(cherry picked from commit d8ffc6be5e)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-06-21 12:04:49 -05:00
Dimitris Sotirakis
007f95f1fa [v10.0.x] GitHub Apps: Replace grafanabot token with grafana-delivery-bot GitHub App (#70453)
* GitHub Apps: Replace `grafanabot` token with `grafana-delivery-bot` GitHub App (#70242)

* Update bump-version.yml

* Fix secret

* [REVERTME] Remove check

* Test without grafana-delivery-bot prefix

* Check if token exists

* Cleanup bump-version

* Update gh actions to use app key

(cherry picked from commit 15a85686c2)

# Conflicts:
#	.github/workflows/backport.yml
#	.github/workflows/bump-version.yml
#	.github/workflows/milestone.yml

* Bug: Fix `yaml` identation for github action yamls (#70445)

* Fix yaml identation

* Fix the rest of the yamls

(cherry picked from commit 31b9f9d235)
2023-06-21 16:26:26 +03:00
grafana-delivery-bot[bot]
dbd7fe1cc7 [v10.0.x] Alerting: Add debug logs when saving instances is finished (#70449)
Alerting: Add debug logs when saving instances is finished (#70447)

(cherry picked from commit 8a13ee3cd4)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-06-21 14:17:52 +01:00
grafana-delivery-bot[bot]
e301139f10 [v10.0.x] Docs: rearrange content order (#70450)
Docs: rearrange content order (#70425)

* Docs: rearrange content order

* more rearranging

* fixes relrefs

* fixes links

(cherry picked from commit cd8e5dc140)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-06-21 14:35:07 +02:00
Grot (@grafanabot)
f7b4f70151 [v10.0.x] Alerting: Add file and rule_group query params in request for filtering the res… (#70417)
(cherry picked from commit e6243f72fd)

Co-authored-by: Sonia Aguilar <33540275+soniaAguilarPeiron@users.noreply.github.com>
2023-06-21 14:16:35 +02:00
George Robinson
0cc97f63b1 Alerting: Update grafana/alerting to 5169fce (#70406)
* Alerting: Update grafana/alerting to 5169fce

* Run go mod tidy

---------

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
2023-06-21 11:00:17 +02:00
Piotr Jamróz
ceaf7dcdef [v10.0.x] Explore: Remove storing derived "loading" property (#70394)
Explore: Remove storing derived "loading" property (#70324)

* Remove storing derived state (loading property) and use a selector instead

* Remove redundant tests

There's no way to change the interval while live streaming

* Remove check for isLive when deriving waiting for data

It was introduced in #18804

* Remove unused props

(cherry picked from commit a94ba7784a)
2023-06-21 10:02:49 +02:00
Grot (@grafanabot)
435a6284d5 [v10.0.x] Docs: fix broken upgrade link to alerting (#70416)
Docs: fix broken upgrade link to alerting (#70415)

(cherry picked from commit 45fe250f3e)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-06-21 09:10:09 +02:00
Grot (@grafanabot)
706d2d4ca9 [v10.0.x] Docs: fixes various links (#70400)
Docs: fixes various links (#70384)

* Docs: fixes various links

* bit more moving

* corrects link

* fixes links

* fixes links from move

* fix links

* fix links

* fixes links

* fixes links

* fix typo

* fixes typo

* fix notif policy link

* fix link

(cherry picked from commit 701c6b6f07)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-06-20 22:02:37 +02:00
Grot (@grafanabot)
4bd873f2f7 [v10.0.x] docs: Fix bad markup in time series docs (#70390)
Fix bad markup in time series docs (#70352)

(cherry picked from commit d8a74ab1b7)

Co-authored-by: John Spurlock <john.spurlock@gmail.com>
2023-06-20 13:53:28 -04:00
Gilles De Mey
c6cfae6b97 [v10.0.x] Docs: bit of restructuring (#70380)
* Docs: bit of restructuring (#70364)

* Docs: bit of restructuring

* corrects link

* fixes link

* updates

* fixes links

* fixes links

* fixes links

* fixes links

* fixes links

(cherry picked from commit d529636bc3)

* fixes link

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-06-20 14:55:47 +02:00
Grot (@grafanabot)
73feec5910 [v10.0.x] DSPicker: Respect datasource & mixed props (#70382)
DSPicker: Respect datasource & mixed props (#70377)

(cherry picked from commit d5d3db9a6e)

Co-authored-by: Giordano Ricci <me@giordanoricci.com>
2023-06-20 14:54:12 +02:00
Gilles De Mey
499e3af846 [v10.0.x] Alerting: Allow selecting the same custom group when swapping folders (#70369)
Alerting: Allow selecting the same custom group when swapping folders (#70337)

(cherry picked from commit 87884f4d41)
2023-06-20 11:52:48 +02:00
Grot (@grafanabot)
3afcc5215e [v10.0.x] Docs: Add callout for variables behavior with classic conditions (#70368)
Docs: Add callout for variables behavior with classic conditions (#67253)

* Add doc on classic condition behaviour with labels

* Update docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

---------

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
(cherry picked from commit 69402f859b)

Co-authored-by: Alfredo <109958902+alfredo-d@users.noreply.github.com>
2023-06-20 11:48:48 +02:00
Grot (@grafanabot)
a8c52947ae [v10.0.x] Alerting: Add debug logs for EndsAt timestamp (#70366)
Alerting: Add debug logs for EndsAt timestamp (#70336)

This commit adds debug logs for previous_ends_at and next_ends_at
to state.go to help us debug issues where alerts are resolved in
Alertmanager due to expiration. This change is in response to a
support escalation where this information was needed but unavailable.

(cherry picked from commit 815e98ed95)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-06-20 12:25:42 +03:00
Grot (@grafanabot)
d9b189e5b6 [v10.0.x] Docs: List packages together, and fix or add menuTitles. (#70343)
Docs: List packages together, and fix or add menuTitles. (#70338)

List packages together, and fix or add menuTitles.

(cherry picked from commit a50afe67d3)

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
2023-06-19 11:34:20 -04:00
Grot (@grafanabot)
6c846786ae [v10.0.x] Use "or" to convey that OS options are unique (#70335)
Use "or" to convey that OS options are unique (#70332)
(cherry picked from commit b2074a68d4)

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
2023-06-19 17:28:39 +02:00
Grot (@grafanabot)
092b7506e1 [v10.0.x] Tempo: Use pipe in TraceQL by default for multi-value variables (#70321)
Tempo: Use pipe in TraceQL by default for multi-value variables (#70051)

* Use pipe in traceQL by default for multi value variables

* Use constant

(cherry picked from commit 06a4b6da62)

Co-authored-by: Joey <90795735+joey-grafana@users.noreply.github.com>
2023-06-19 13:50:02 +01:00
Grot (@grafanabot)
77b024bbc3 [v10.0.x] Command palette: Include help links (#70322)
Command palette: Include help links (#70234)

enrich help node with frontend links

(cherry picked from commit db44ba305e)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-06-19 12:48:50 +00:00
Jean-Philippe Quéméner
080c56b128 [v10.0.x] Alerting: Rewrite range to instant queries if possible (#70289) 2023-06-19 09:12:45 +02:00
Grot (@grafanabot)
cba55752b9 [v10.0.x] GrafanaUI: Export Toggletip (#70298) 2023-06-18 23:15:30 +09:00
Grot (@grafanabot)
7d013dc236 [v10.0.x] fix: allow {} type in VariableWithOptions.current (#70238)
Variables: allow `{}` type in `VariableWithOptions.current ` (#64358)

(cherry picked from commit 6f880b713a)

Co-authored-by: Simon Podlipsky <simon@podlipsky.net>
2023-06-17 11:26:38 +03:00
Grot (@grafanabot)
baf8e6389d [v10.0.x] [DOC] Add traces panel procedures (#70283)
[DOC] Add traces panel procedures (#70204)

* Add traces panel procedures

* Apply suggestions from code review

Co-authored-by: Heds Simons <hedss@users.noreply.github.com>

* Prettier and image fixes

* Apply suggestions from code review

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

* Fix images

* Apply suggestions from code review

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>

---------

Co-authored-by: Heds Simons <hedss@users.noreply.github.com>
Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
(cherry picked from commit ece3629804)

Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>
2023-06-16 16:41:31 -04:00
Grot (@grafanabot)
0759ac1a52 [v10.0.x] Update make-docs procedure (#70273)
Update make-docs procedure (#70265)

## 4.1.0 (2023-06-16)

### Added

- Mounts of `layouts` and `config` directories for the `website` project.
  Ensures that local changes to mounts or shortcodes are reflected in the development server.

### Fixed

- Version inference for versioned docs pages.
  Pages in versioned projects now have the `versioned: true` front matter set to ensure that "version" in $.Page.Scratch is set on builds.

## 4.0.0 (2023-06-06)

### Removed

- `doc-validator/%` target.
  The behavior of the target was not as described.
  Instead, to limit `doc-validator` to only specific files, refer to https://grafana.com/docs/writers-toolkit/writing-guide/tooling-and-workflows/validate-technical-documentation/#run-on-specific-files.

## 3.0.0 (2023-05-18)

### Fixed

- Compatibility with the updated Make targets in the `website` repository.
  `docs` now runs this script itself, `server-docs` builds the site with the `docs` Hugo environment.

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit a4a16b62c7)

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2023-06-16 19:06:25 +01:00
Jack Baldry
264fdb9e8b [v10.0.x] Use docs/reference for flexible linking for content reused in Grafana Cloud (#70267)
Use docs/reference for flexible linking for content reused in Grafana Cloud (#70253)

* Use docs/reference for flexible linking for content reused in Grafana Cloud

Documented in https://github.com/grafana/website/pull/13878



* Use docs-base image that has docs/reference shortcode



---------


(cherry picked from commit 3d15d54a71)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
2023-06-16 18:35:09 +01:00
Grot (@grafanabot)
af98396285 [v10.0.x] XYChart/Trend: Fix min/max and units/decimals X field overrides (#70261)
XYChart/Trend: Fix min/max and units/decimals x-field overrides (#70214)

(cherry picked from commit 66b0e6b77f)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2023-06-16 19:20:18 +03:00
Grot (@grafanabot)
edd4faf064 [v10.0.x] DS Picker: first item is not active when filtering (#70256)
DS Picker: first item is always active when filtering (#70071)

(cherry picked from commit 6be0ca396f)

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
2023-06-16 18:39:24 +03:00
Grot (@grafanabot)
f145c251d1 [v10.0.x] Explore: Improve logs volume panel empty state (#70255)
Co-authored-by: Giordano Ricci <me@giordanoricci.com>
2023-06-16 16:11:17 +01:00
Grot (@grafanabot)
3a977f9ea9 [v10.0.x] package.json: Fix what's new URL in package.json (#70236)
`package.json`: Fix `what's new` URL in `package.json` (#70233)

Fix what's new url

(cherry picked from commit 7ec91990ff)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-06-16 15:06:34 +03:00
Grot (@grafanabot)
15ae80757b [v10.0.x] Docs: recreates setup for oss alerting (#70231)
Docs: recreates setup for oss alerting (#70156)

* recreates setup for oss alerting

* fixes relrefs

* fix relrefs

* fix relref

* adds other setup topics

* adds other setup topics 2

* adds other setup topics 3

* adds cloud setup

* adds cloud setup from legacy

* fixes links

* removing link

* gilles feedback

(cherry picked from commit 5fc6bf5c69)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
2023-06-16 13:18:34 +03:00
Grot (@grafanabot)
2209deb0bf [v10.0.x] Alerting: Fix newlines in text/plain template (#70228)
Alerting: Fix newlines in text/plain template (#70207)

Alerting: Fix newlines in text/plain template at last
(cherry picked from commit a773b722b1)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-06-16 12:54:30 +03:00
Grot (@grafanabot)
91ef2045bc Plugins: Wrap original check health error (#70227)
Plugins: Wrap original check health error (#69944)

Fixes #69765

(cherry picked from commit 62ee1fa05a)

Co-authored-by: Kousik Mitra <kousikmitra12@gmail.com>
2023-06-16 11:47:07 +02:00
Grot (@grafanabot)
a47fa6f30d [v10.0.x] Auth: Show invite button if disable login form is set to false (#70155)
Auth: Show invite button if disable login form is set to false (#69946)

* show invite button if disable login form is set to false

* fix test

* Update public/app/features/users/UsersActionBar.tsx

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>

---------

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
(cherry picked from commit 21f8dd9599)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2023-06-16 09:31:56 +00:00
Grot (@grafanabot)
30363dbc34 [v10.0.x] XYChart: Fix variable interpolation in datalinks/toggletip (#70210)
XYChart: Fix variable interpolation in datalinks/toggletip (#70195)

(cherry picked from commit 7d4f7e5ffc)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2023-06-16 04:18:01 +03:00
Grot (@grafanabot)
225f6f8298 [v10.0.x] PublicDashboards: Add support for recorded queries used in Mixed ds (#70160) 2023-06-15 17:27:18 +00:00
Grot (@grafanabot)
18303f09b3 [v10.0.x] XYChart: Fix formatting of axis ticks (units, decimals) (#70193)
XYChart: Fix formatting of axis ticks (units, decimals) (#70190)

(cherry picked from commit 94881597d8)

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
2023-06-15 16:46:42 +00:00
Grot (@grafanabot)
e9a8bc8b2e [v10.0.x] DS Picker: Support width and hide label (#70180)
DS Picker: Support `width` and `hideTextValue` (#70074)

(cherry picked from commit 5b97670f11)

Co-authored-by: Ivan Ortega Alba <ivanortegaalba@gmail.com>
2023-06-15 15:50:27 +00:00
Ivan Ortega Alba
734e8c4f9c [v10.0.x] Datasources: Extend optional reporting (#70161)
Datasources: Extend  optional reporting (#69061)

* feat: add default properties to the `reportInteraction()`

* chore: add more tracking events to the ds-config page

* refactor: adding the `path` to the `meta` instaed

(cherry picked from commit 6a995d526a)

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>
2023-06-15 15:16:54 +00:00
Grot (@grafanabot)
01b07571b2 [v10.0.x] Fix unwanted newlines in plain text email (#70168)
Fix unwanted newlines in plain text email (#70141)

(cherry picked from commit a3845c9e2e)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-06-15 17:12:53 +03:00
Grot (@grafanabot)
9e6811995d [v10.0.x] PanelTypeCard: Improve contrast for disabled cards (#70151)
PanelTypeCard: Improve contrast for disabled cards (#69907)

(cherry picked from commit 5c152e5a24)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
2023-06-15 12:11:45 +00:00
Grot (@grafanabot)
4f90970027 [v10.0.x] DynamicConfigValueEditor: Pass ID to dynamic component and label (#70150)
DynamicConfigValueEditor: Pass ID to dynamic component and label (#69910)

Closes #66337

(cherry picked from commit a65c3c1ebc)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
2023-06-15 12:11:13 +00:00
Grot (@grafanabot)
0a3c39b8d4 [v10.0.x] TextPanel: Fix <summary> styling missing the disclosure triangle (#70138)
TextPanel: Fix <summary> styling missing the disclosure triangle (#70133)

TextPanel: Fix <summary> styling
(cherry picked from commit 57d7288fe4)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
2023-06-15 10:29:23 +00:00
Dimitris Sotirakis
115766e717 [v10.0.x] CI: Update grabpl to v3.0.39 (#70136)
CI: Update `grabpl` to `v3.0.39` (#70126)

Update grabpl to v3.0.39

(cherry picked from commit b1e219e72c)

# Conflicts:
#	.drone.yml
2023-06-15 12:09:17 +02:00
Grot (@grafanabot)
411a7a9cf7 [v10.0.x] Alerting: Add matchers metrics to Alertmanager (#70125)
Alerting: Add matchers metrics to Alertmanager (#69855)

(cherry picked from commit f085e99d3c)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-06-15 09:37:54 +01:00
Grot (@grafanabot)
a319efb964 [v10.0.x] Run make in emails folder (#70114)
Run make in emails folder (#70113)

(cherry picked from commit 1154720df2)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-06-15 08:14:53 +00:00