Alerting: Support Prometheus durations in Provisioning API (#58293)
Provisioning API should support Prometheus durations
(cherry picked from commit 57d6adbc7c)
Co-authored-by: Bart Peeters <birtpeeters@hotmail.com>
Chore: Extract server lock error so it can be used with errors.As (#58899)
chore: extract server lock Error so it can be used with error.As
(cherry picked from commit 7e9d94cfda)
Co-authored-by: Jo <joao.guerreiro@grafana.com>
* Trim leading and trailing whitespaces from email and username on signup
* Check whether the provided email address is the same as where the invitation sent
Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com>
* Plugins: CallResource: use canonical MIME headers when writing response
* Plugins: add tests for canonical mime headers and Set-Cookie filter
* Removed extra new line
(cherry picked from commit 33f02839f0)
Co-authored-by: Giuseppe Guerra <giuseppe.guerra@grafana.com>
* Grafana Enterprise Packaging: Set to conflict with `grafana`, not replace
When `grafana` and `grafana-enterprise` are in the same RPM repository, grafana-enterprise takes precedence over Grafana
This is not what we want. Users should be able to install either OSS or Enterprise
* Set it only one way. It's how it's currently tested
(cherry picked from commit 786c7faff2)
Co-authored-by: Julien Duchesne <julien.duchesne@grafana.com>
Grafana's HTTPServer ensures that the Content-Type header is always set
in the response to a CallResource call, but when the status code is
204 No Content this shouldn't be done; the body should be empty and no
Content-Type header should be set.
We ran into this in the Grafana ML plugin where we were sending an empty
response with status 204, but the frontend client saw that the content
type was JSON and tried to parse it, resulting in an error that made it
to the JS console.
(cherry picked from commit 480277f612)
Co-authored-by: Ben Sully <ben.sully@grafana.com>
Move mentions to a markdown-formatted pretext field
to prevent issues mixing blocks and legacy-attachment content.
(cherry picked from commit d581b368bd)
Co-authored-by: Will Jordan <wjordan@users.noreply.github.com>
* RBAC: Use query struct in tests
* RBAC: If access control enforcement is disabled don't filter out users
when fetching permissions
(cherry picked from commit 9adaf1565c)
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
* Add CreateTempDir func and use it in publish packages logic
* Fill err return in defer func
(cherry picked from commit e829b50149)
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
* Backport PR for: Prometheus: Flavor/version configuration (#57554), and /label match parameter support #56510
* Revert "Revert "Prometheus: Type and flavor configuration (#56496)" (#57552)"
This reverts commit 2432ce619a.
* Adds new fields and documentation for Prometheus datasource configuration: prometheus type, and version
(cherry picked from commit f93c3acc51)
* Revert "Revert "Prometheus: Provide label values match parameter API when supported prometheus instance is configured (#56510)" (#57551)" (#57553) (#57564)
This reverts commit e7671bf909.
(cherry picked from commit e59ddd6bc5)
Co-authored-by: Galen Kistler <109082771+gtk-grafana@users.noreply.github.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
`pkg/web` triggers a panic when a http handler chain does not return any
response to the client.
This has been put in place, because it usually means a middleware along
the way did not call the next one.
In this specific case however, the handlers meant to return 200, but did
not do so explicitely, instead relying on the default behavior of `net/http`
(cherry picked from commit beaaabd770)
Co-authored-by: sh0rez <me@shorez.de>
