* Fix XSS in runbook URL (#383)
* "Release: Updated versions in package to 8.3.8" (#385)
* Fix: Choose Lookup params per auth module v8.3.x (#401)
* Fix: Choose Lookup params per auth module
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: Prefer pointer to struct in lookup
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: user email for ldap
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: Use only login for lookup in LDAP
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: use user email for ldap
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
fix remaining test
fix nit picks
* update lock
* fix integration tests
* [v8.3.x] Merge 'release-8.3.9` branch (#404)
* Fix: Choose Lookup params per auth module
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: Prefer pointer to struct in lookup
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: user email for ldap
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: Use only login for lookup in LDAP
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
Fix: use user email for ldap
Co-authored-by: Karl Persson <kalle.persson@grafana.com>
fix remaining test
fix nit picks
(cherry picked from commit 09ca54d4665583b5648fea5726a19e0b58df4ec0)
* fix integration tests
(cherry picked from commit 16c3077bb39f41acacbef4b13c65c7c907c54de7)
* Release: Bump version to 8.3.9 (#403)
* Change bump-version.yml
* "Release: Updated versions in package to 8.3.9"
Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com>
* Update yarn.lock
Co-authored-by: jguer <joao.guerreiro@grafana.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
* "Release: Updated versions in package to 8.3.10" (#409)
* Update grabpl
* update grabpl
* CI: Update `grabpl` version - remove `--no-pull-enterprise` flag (#47013)
* Update grabpl version
* Sign drone
* Remove --no-pull-enterprise flag
* Sign drone
* Update grabpl
* update drone, cherry-pick some ci updates
* update PR pipeline
Co-authored-by: George Robinson <george.robinson@grafana.com>
Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
Co-authored-by: Jguer <joao.guerreiro@grafana.com>
Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
* Alerting: Remove double quotes from matchers (#50038)
* Alerting: Remove double quotes from matchers
With #38629 a new Alertmanager configuration object was introduced with `object_matchers`, it was meant to circumvent around the fact that Prometheus label names don't support a set of characters that Grafana needs to support for alerts, silences, matchers, etc. (with a common example being elasticsearch's `.`).
This new object does not include the label of sanitzation or validation that its Prometheus equivalent supports in `matchers` and therefore are semantically not equivalent.
This triggered the problem that when the migration is run, we use `matchers` as the object to populate in configuration for routing policies, but when the UI does its first save this object is transformed to `object_matchers`.
Matchers that were previously running just fine would immediately stop working as soon as the configuration is saved.
This problem surfaced with the introduction of #49952 where we stopped stripping double quotes from matchers (not just regex but _all_ of them).
* Add comment explaining rationale and future removal
Co-authored-by: Alex Weaver <weaver.alex.d@gmail.com>
(cherry picked from commit 1a50b0dbb7)
* Drop changelog
Co-authored-by: gotjosh <josue.abreu@gmail.com>
The problem here is that without the orgID we ignore the lookup of the existing notification channel just before updating and end up failing the update because there is no channel available.
(cherry picked from commit 8bf2e642aa)
Co-authored-by: gotjosh <josue.abreu@gmail.com>
It is conventionally common for the X-Forwarded-For header to contain a
comma-separated list of IP addresses, with each intermediate proxy
adding an additional item as a request passes through it. This change
makes the web framework handle this case appropriately, always selecting
the first item in the list.
(cherry picked from commit 6a2255abe7)
Co-authored-by: sam boyer <sdboyer@grafana.com>
This pull request adds metrics to the ngalert scheduler so we can see how long it takes to evaluate a tick.
(cherry picked from commit 5e2280ceee)
Co-authored-by: George Robinson <george.robinson@grafana.com>
* return an error if no user was found
* update condition
(cherry picked from commit ec87405543fe8032a0c2769d3ec97536b7a749ef)
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
* Use integers for time range filter
Previously it was passed as a string which is automatically converted by Elastic to a number only if the field type is "date". For other types (e.g. "long") such conversion doesn't work. In theory "date" could be passed as a formatted string but we don't use it this way and always pass it as a number so it is safe to always pass numbers, not strings.
* Fix time_series_query_test
* Retrigger build
(cherry picked from commit 9fb8339f87)
Co-authored-by: Piotr Jamróz <pm.jamroz@gmail.com>
* Name fields based on targets length
* Remove rounding in rate interval variable replacing
* Refactor and fix edge case when interval and time duration would be rate interval
* Add tests
* Remove , from test
* Revert "Name fields based on targets length"
This reverts commit 5dcb34a765.
(cherry picked from commit e704110f74)
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
* prometheus: add tests covering prometheus_response to grafana_dataframes
* fixed variable name
* added comment
* removed not-helping function call
(cherry picked from commit 4a88b8f66c)
Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
* Allow customizable googlechat message via optional setting
* Add optional message field in googlechat contact point configurator
* Fix strange error message on send if template fails to fully evaluate
* Elevate template evaluation failure logs to Warn level
* Extract default.title template embed from all channels to shared constant
(cherry picked from commit fd583a0e3b)
* prometheus: respect the http-method data source setting
* removed forgotten if-true section
* refactored json-check
(cherry picked from commit 1879a6855e)
Co-authored-by: Gábor Farkas <gabor.farkas@gmail.com>
* change registry.delete to return deleted struct
* use pointer to alertRuleInfo instead copying.
* do not access evaluation channel when routine is stopped
* remove stopCh and use context cancellation
* do not return ctx.Err when channel is cancelled because it cancels all other routines
* make alertRuleInfo fields and functions package private
(cherry picked from commit 1a762083d7)
Co-authored-by: Yuriy Tseretyan <tceretian@gmail.com>
* Alerting: log errors happening in the API on server side
* adapt tests to reflect changed payload
(cherry picked from commit b605340668)
Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
* defer updating empty UID to insert command
* change logging to use the command
(cherry picked from commit 35b0067650)
Co-authored-by: Yuriy Tseretyan <tceretian@gmail.com>
* Fix Annotation creation
- Remove validation of panelID, now annotations are created irrespective on whether they're attached to a panel or not.
- Alwasy attach the annotation to an AlertID
* Fix annotation creation
* fix tests
(cherry picked from commit 357e9ed1ea)
Co-authored-by: gotjosh <josue@grafana.com>
