Commit Graph

42295 Commits

Author SHA1 Message Date
Yuri Tseretyan fb4796e1e2 SSE: DSNode to update result with names to make each value identifiable by labels (only Graphite and TestData) (#73642)
* SSE: DSNode to update result with names to make each value identifiable by labels (only Graphite and TestData) (#71246)

* introduce a function checkIfSeriesNeedToBeFixed to scan all value fields in the response and provide a function that updates Series so they can be uniquely identifiable. Only Graphite and TestData are checked.

* update `DSNode.Execute` to run this function and provide it to WideToMany
* update WideToMany to run the fix function if it is not nil
2023-08-22 15:02:02 -04:00
Horst Gutmann 9a6be573ec [v9.5.x] CI: Different secret for verification and do not ignore build failures (#73617)
CI: Different secret for verification and do not ignore build failures (#73613)

(cherry picked from commit 8fc3be6b5a)
2023-08-22 16:32:52 +03:00
grafana-delivery-bot[bot] c452a2bf00 [v9.5.x] Docs: Fix URL encoding @ Keycloak logout example (#73549)
Docs: Fix URL encoding @ Keycloak logout example (#71970)

(cherry picked from commit 5e50580d06)

Co-authored-by: Bruno Melo <bsilva.melo@gmail.com>
2023-08-21 10:00:42 +01:00
grafana-delivery-bot[bot] eb18822140 [v9.5.x] Update make docs procedure (#73545)
Update `make docs` procedure (#73540)

Co-authored-by: grafanabot <bot@grafana.com>
(cherry picked from commit 88d3f27b6b)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-08-21 09:18:20 +01:00
grafana-delivery-bot[bot] 15d0b852da [v9.5.x] CI: Improve error handling in gcloud copy operations (#73537)
CI: Improve error handling in gcloud copy operations (#73474)

(cherry picked from commit 220ea869be)

Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>
2023-08-21 09:27:31 +03:00
grafana-delivery-bot[bot] dbcd05b9b3 [v9.5.x] Sync-mirror GHA updates (#73509)
Sync-mirror GHA updates (#73504)

fixing sync-mirror run-name and altering concurrency to use branch name

(cherry picked from commit 4047cdb213)

Co-authored-by: Ricky Whitaker <ricky.whitaker@grafana.com>
2023-08-18 12:43:56 -05:00
Kevin Minehart d61e4f49c8 [v9.5.x] Changelog: Updated changelog for 9.5.8 (#73422)
Changelog: Updated changelog for 9.5.8 (#73421)

Co-authored-by: grafanabot <bot@grafana.com>
(cherry picked from commit 069afedcf5)

Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
2023-08-17 15:17:25 -03:00
grafana-delivery-bot[bot] da3daa76b9 [v9.5.x] Docs: Update dashboards api create/update (#73418)
Docs: Update dashboards api create/update (#73345)

(cherry picked from commit bb3a2d31d7)

Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com>
2023-08-17 12:36:02 -05:00
Horst Gutmann 47b1e21580 [v9.5.x] CI: Move npm token to Vault (#73409)
CI: Move npm token to Vault (#73407)

(cherry picked from commit c86a73c794)
2023-08-17 18:10:39 +03:00
grafana-delivery-bot[bot] f23fb5ef43 [v9.5.x] Update make docs procedure (#73387)
Update `make docs` procedure (#73359)

Co-authored-by: grafanabot <bot@grafana.com>
(cherry picked from commit 355917e755)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-08-17 15:48:43 +01:00
Dimitris Sotirakis 8fdb609c86 [v9.5.x] CI: Update grabpl to v3.0.41 (#73373) (#73377)
CI: Update `grabpl` to `v3.0.41` (#73373)

Update grabpl

(cherry picked from commit 3463dc8e48)

# Conflicts:
#	.drone.yml
2023-08-17 13:11:15 +03:00
grafana-delivery-bot[bot] 0c612ae868 [v9.5.x] Grafana versioning: Remove pre suffix from Grafana version (#73365)
Grafana versioning: Remove `pre` suffix from Grafana version (#73357)

* Remove pre suffix from version

* Fix tests

(cherry picked from commit 0aba319ea0)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
2023-08-17 11:29:27 +03:00
grafana-delivery-bot[bot] e7e175b0a8 [v9.5.x] DataSourceProxy: Fix url validation error handling (#73320)
* 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 8ec4c1bdc8)

* fix test

---------

Co-authored-by: Ricardo Christmann <80476005+ricci2511@users.noreply.github.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
2023-08-16 18:16:56 +03:00
Santiago 759dd42abf [v9.5.x] Alerting: Support concurrent queries for saving alert instances (#70921)
* Alerting: Support concurrent queries for saving alert instances (#70525)

This commit adds support for concurrent queries when saving alert
instances to the database. This is an experimental feature in
response to some customers experiencing delays between rule evaluation
and sending alerts to Alertmanager, resulting in flapping. It is
disabled by default.

(cherry picked from commit 7edbe72483)

* Trigger PR automation

---------

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-08-16 08:17:52 +01:00
grafana-delivery-bot[bot] c1ef527b0b [v9.5.x] Docs: correct SAML docs (#73284)
Docs: correct SAML docs (#73281)

Correct SAML docs

(cherry picked from commit 2848be9035)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
2023-08-15 16:59:51 +02:00
Santiago f645bff316 [v9.5.x] Alerting: Add debug logs for EndsAt timestamp (#70918)
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-08-14 19:21:01 +01:00
grafana-delivery-bot[bot] aa80c1ceda [v9.5.x] GenericOAuth: Set sub as auth id (#73223)
GenericOAuth: Set sub as auth id (#65902)

* GenericOAuth: Set sud as auth id

* GenericOAuth: Extract function to reduce complexity

(cherry picked from commit 7cd6018253)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
2023-08-14 12:13:44 +03:00
grafana-delivery-bot[bot] b33d4c3289 [v9.5.x] Permissions: Fix incorrect navId in permissions page (#73083)
Permissions: Fix incorrect `navId` in permissions page (#70906)

fix navId in permissions page

(cherry picked from commit ebd6aa5034)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
2023-08-09 11:34:46 +03:00
grafana-delivery-bot[bot] 2b95fdc7e7 [v9.5.x] docs: add default value workaround (#73002)
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 54f0de313f)

Co-authored-by: arunkg2787 <131352769+arunkg2787@users.noreply.github.com>
2023-08-08 00:27:19 +03:00
Christopher Moyer 82e675e20a [Docs v9.5.x] Manual backport - Docs/k8s install update (#72567) (#72832)
* 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 b1fd399c10)

* Ensure changes are correct for this branch

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>
2023-08-04 13:07:01 -05:00
grafana-delivery-bot[bot] f6139ceab4 [v9.5.x] Update bind-net-capabilities.md (#72918)
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 0d6e911fff)

Co-authored-by: David Allen <david.allen@grafana.com>
2023-08-04 06:42:31 -07:00
Christopher Moyer b1916959ba [Docs v9.5.x] Manual backport - Update _index.md (#72222) (#72817)
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 b8118520e4)

Co-authored-by: Iain Finlayson <ruffiain@gmail.com>
2023-08-03 08:50:48 -05:00
grafana-delivery-bot[bot] 6c0cf98659 [v9.5.x] Update start-restart-grafana.md (#72815)
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 4d7d2d6519)

Co-authored-by: David Allen <david.allen@grafana.com>
2023-08-03 07:54:30 -05:00
Christopher Moyer 3cdd6c540e [Docs 9.5x] Manual backport - Clarify necessary rediss scheme for TLS with redis caching (#72122) (#72648)
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

(cherry picked from commit e03303997a)

Co-authored-by: chrisharbro <102977229+chrisharbro@users.noreply.github.com>
2023-07-31 15:13:44 -05:00
Christopher Moyer 358f917633 [Docs v9.5] Manual backport - Update _index.md (#72068) (#72197)
* Update _index.md (#72068)

* Update _index.md

Edits to the "Set up image rendering" doc.

1. First section, "Set up Image Rendering," last paragraph:
"You can also render a PNG by clicking hovering..." -- I removed "clicking" from that sentence.

2. "Alerting and Render Limits" section, link for "concurrent_render_limit" takes you to the page but not the section. This seems to be the case for all section links on this "Configure Grafana" page. I'm not sure how to fix it but switched from a relative link to a full path to see if that would help.

3. "Install Grafana Image Renderer Plugin," the link goes to the plugin overview page instead of the installation page. I tried adding the full path to see if that would go to the installation tab.

4. "Configuration" section, the same as the second edit I made, the first link, "Grafana configuration file," goes to the page but not the section link. I switched the relative path to a full path to see if it would work.

5. "Security" section, the very last sentence has the same Grafana configuration page link that goes to the correct page but not the correct section, "Grafana configuration" for the renderer token section. Same as previous ones, I switched out the relative path for the full path.

6. "Start browser with additional arguments," the second link in the first paragraph that goes to Puppeteer list of Chromium flags went to a 404 page. I couldn't figure out where they had moved it so I found a different site with a list of default flags and used that link instead.

* corrects links

* updates links

* fixes anchor link

---------

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

* Apply suggestions from code review

---------

Co-authored-by: Eva <ebuchala@gmail.com>
2023-07-31 12:07:25 -07:00
grafana-delivery-bot[bot] 464590f622 [v9.5.x] Update the sign in docs to contain more precise information. (#72621)
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 d279d926a4)

Co-authored-by: Paweł Krawczyk <71645192+Pawel-Kr@users.noreply.github.com>
2023-07-31 11:08:03 -05:00
Ieva c81056922d [v9.5.x] Docs: remove references to groups_attribute_path for Okta and GitLab docs (#72592)
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 b96d6e2c8d)
2023-07-31 13:12:21 +02:00
Guilherme Caulada 817613f52e [v9.5.x] CI: Update secret refs to vault ones; update downstream repo origin (#72548)
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 6669d0a704)

Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
2023-07-28 16:00:26 -03:00
Kevin Minehart bd5728df22 [v9.5.x] CI: Make RGM the main pipeline for prerelease (#72531)
* 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 971f5f14be)

* make drone

---------

Co-authored-by: Guilherme Caulada <guilherme.caulada@grafana.com>
2023-07-28 19:29:18 +03:00
grafana-delivery-bot[bot] de3b289831 [v9.5.x] Update index.md (#72470)
* Update index.md (#72241)

Issue #6845 - Adding more context around how labels are extracted and indexed

(cherry picked from commit 5707f512be)

* fixed minor punctuation and title issues

* fixed capitalization

---------

Co-authored-by: arunkg2787 <131352769+arunkg2787@users.noreply.github.com>
Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com>
2023-07-27 13:16:05 -05:00
Kevin Minehart 558956f3d8 [v9.5.x] CI: use base64 key in windows installer build step (#72453)
CI: use base64 key in windows installer build step (#72413)

use base64 key

(cherry picked from commit b019ef9a89)
2023-07-27 16:52:28 +03:00
Dimitris Sotirakis d38393f32d [v9.5.x] CI: Fix deb/rpm bug for linux package publishing (#72423)
CI: Fix `deb/rpm` bug for linux package publishing (#72336)

Fix deb/rpm

(cherry picked from commit c3ebd388e3)
(cherry picked from commit 4c9bdef98dcfb24d8d24dac8117c9d3feb921a06)

# Conflicts:
#	.drone.yml
(cherry picked from commit e3ec53b418)

# Conflicts:
#	.drone.yml
2023-07-27 09:56:49 +03:00
Kevin Minehart 1ad544b293 [v9.5.x] CI: use the base64 key in the windows installer steps (#72381)
CI: use the base64 key in the windows installer steps (#72372)

use the base64 key in the windows installer steps

(cherry picked from commit 0c2b2219bb)
2023-07-26 12:04:11 -03:00
grafana-delivery-bot[bot] 751d35c396 [v9.5.x] Prometheus: Add present_over_time syntax highlighting (#72367)
Prometheus: Add present_over_time syntax highlighting (#72283)

add prometheus present_over_time syntax highlighting

to color present_over_time keyword for prometheus

(cherry picked from commit d96067985b)

Co-authored-by: stratomonitor <arnaud_lemaignen@yahoo.com>
2023-07-26 08:41:46 -05:00
Ieva b8ac666ea5 [v9.5.x] Docs: update GitLab OAuth2 documentation (#72344)
* backport

(cherry picked from commit 5a9944298d)

* linting
2023-07-26 13:10:08 +02:00
Dimitris Sotirakis 5df1da3a16 [v9.5.x] Changelog: Updated changelog for 9.5.7 (#72328)
Changelog: Updated changelog for 9.5.7 (#72321)

Co-authored-by: grafanabot <bot@grafana.com>
(cherry picked from commit da31b8083a)

# Conflicts:
#	CHANGELOG.md

Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
2023-07-26 11:57:59 +03:00
grafana-delivery-bot[bot] 68b4bb4a2b Release: Bump version to 9.5.8 (#72322)
"Release: Updated versions in package to 9.5.8"

Co-authored-by: grafana-delivery-bot[bot] <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
2023-07-26 08:47:49 +00:00
Guilherme Caulada be375d3946 [v9.5.x] CI: Fix verify-prerelease-assets pipeline (#72231)
CI: Fix verify-prerelease-assets pipeline (#72226)

* Fix verify-prerelease-assets pipeline

* Comment out unused assets

(cherry picked from commit 142cbc2ec6)
2023-07-25 00:57:44 +03:00
Christopher Moyer abe1c6825c [Docs 9.5x] Manual Backport 71400 to v9.5.x (#72138)
Update _index.md (#71400)

* Update _index.md

Added missing hyperlink for high availability and a small typo

* updates link

---------

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

Co-authored-by: Usman Ahmad <usman.ahmad@grafana.com>
2023-07-24 10:43:30 -04:00
grafana-delivery-bot[bot] d5ba847d92 [v9.5.x] Alerting: Improve performance of matching captures (#71998)
* Alerting: Improve performance of matching captures (#71828)

This commit updates eval.go to improve the performance of matching
captures in the general case. In some cases we have reduced the
runtime of the function from 10s of minutes to a couple 100ms.
In the case where no capture matches the exact labels, we revert to
the current subset/superset match, but with a reduced search space
due to grouping captures.

(cherry picked from commit 8dd3eb856d)

* Add label fingerprints from grafana-plugin-sdk-go

* Remove unsafe.StringData as we use Go 1.19

* Fix lint

---------

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-07-24 15:44:17 +02:00
Kevin Minehart a7302e7cc4 [v9.5.x] CI: Run only Grafana builds on RGM for grafana/grafana (#72160)
* CI: Try setting the vault secret for 'grafana_api_key' (#71981)

* Try setting the vault secret

* Maybe?

* forgot .drone.yml

* CI: Use GCP keys in vault and not drone secrets (#72023)

* CI: Run only Grafana builds on RGM for grafana/grafana (#72144)

* Run only OSS builds on RGM for grafana/grafana

* Update script name

* Ignore windows step failure for RGM

---------

Co-authored-by: Guilherme Caulada <guilherme.caulada@grafana.com>
v0.0.0-testrgm4
2023-07-21 18:27:50 -03:00
grafana-delivery-bot[bot] 36f1080ba6 [v9.5.x] docs: fix broken link (#72155)
docs: fix broken link (#72114)

(cherry picked from commit 0589060041)

Co-authored-by: David Harris <david.harris@grafana.com>
2023-07-21 16:56:11 -04:00
grafana-delivery-bot[bot] 4b0cec9803 [v9.5.x] Docs: adds mimir and oncall (#72048)
Docs: adds mimir and oncall (#72042)

adds mimir and oncall

(cherry picked from commit 46c49aa7ff)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2023-07-20 12:10:08 -05:00
lwandz13 e9df423b20 Docs: add alias to data sources index file 9.5 (#72025)
added features alias
2023-07-20 09:46:55 -05:00
grafana-delivery-bot[bot] 852ef5a946 [v9.5.x] AuthNZ documentation revamp (#71968)
AuthNZ documentation revamp (#62581)

* init for base branch

* Add authnz code ownership

* Fix docs ownsership path

* docs revamp: Plan IAM strategy (#62582)

* Add planning page

* Add teams definition

* Expand on planning and benefits

* Add reasons to organize users

* Add description of User Teams

* Add Grafana organizations info

* Add a section between Teams and Orgs

* Add a section for external systems

* planning your role strategy

* Add service account documentation

* Add Auth Setup to index sidebar

* Address PR comments

* Add planning for API keys

* Add team and org sync

* Docs: role and permission section for planning docs (#64702)

* docs revamp: Service accounts (#63710)

* docs revamp: Add new documentation to sidebar index (#66104)

* docs revamp: synchronisation planning (#66409)

* Docs: api keys (#64803)

* Remove personal access tokens section

* Move auth integration planning page

* Remove auth folder

* Restore codeowners file

* reword and update info on user management and grouping

* Rename iam strategy page

* extend the section on teams and organizations

* Rename planning your IAM section

* Move to administration section

* Add definition for role sync

* Relocate planning

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
(cherry picked from commit 63346674e6)

Co-authored-by: linoman <2051016+linoman@users.noreply.github.com>
2023-07-19 16:18:53 -05:00
Guilherme Caulada 2ccd7acb9b [v9.5.x] CI: Allow RGM to create msi for multiple editions (#71893)
CI: Allow RGM to create msi for multiple editions (#71883)

* Allow RGM to create msi for multiple editions

* Remove suffix from build-windows-installer step

* Invert exit code on verify_release_pipeline

(cherry picked from commit 4c80bcf35f)
2023-07-19 13:35:19 -03:00
grafana-delivery-bot[bot] ba60a8bb1d [v9.5.x] Alerting: Add tests for matching captures (#71938)
Alerting: Add tests for matching captures (#71928)

This commit adds tests for matching captures, which we do not have
at present.

(cherry picked from commit f1af0502db)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-07-19 15:11:01 +03:00
grafana-delivery-bot[bot] 905a79b17c [v9.5.x] Alerting: Sort NumberCaptureValues in EvaluationString (#71930)
Alerting: Sort NumberCaptureValues in EvaluationString (#71927)

This commit changes extractEvalString to sort NumberCaptureValues
in ascending order of Var before building the output string. This
means that users will see EvaluationString in a consistent order,
but also make it possible to assert its output in tests.

(cherry picked from commit 89dcaaf049)

Co-authored-by: George Robinson <george.robinson@grafana.com>
2023-07-19 14:29:52 +03:00
Dimitris Sotirakis 841cd57d4e [v9.5.x] Bug: Compare semver digits for frontend packages config (#71907)
Bug: Compare `semver` digits for frontend packages config (#71829)

* Compare semver digits

* Fix lint

(cherry picked from commit 5f8ace33fb)

# Conflicts:
#	pkg/build/frontend/config_test.go
2023-07-19 10:24:33 +03:00
grafana-delivery-bot[bot] 9dc78e3db1 [v9.5.x] docs: add docker commands for enabling alpha layers (#71898)
docs: add docker commands for enabling alpha layers (#71897)

added docker commands for enabling alpha layers

(cherry picked from commit ef0de1af32)

Co-authored-by: Isabel <76437239+imatwawana@users.noreply.github.com>
2023-07-18 18:15:09 -04:00