* 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>
* Display legend for fixed colors and field; Hide tooltip on base layer;
(cherry picked from commit 118b87ee8f)
# Conflicts:
# public/app/plugins/panel/geomap/GeomapPanel.tsx
# public/app/plugins/panel/geomap/editor/layerEditor.tsx
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>
* update snapshots server url
* update all old references to snapshot.raintank.io
(cherry picked from commit 1e89fc157d)
Co-authored-by: Dan Cech <dcech@grafana.com>
* Make e2e test depend on binary builds
* Search for binary in the correct folders
* Remove package file var
* Add ARCH var
(cherry picked from commit 7bb5a5b318)
* Library Elements API GET by name returns array
Making a GET request to the Library Elements HTTP API `api/library-elements/name/:name` will return an **array** of Library Element objects, but the documentation says it will return a Library Element object.
Example cURL POST request:
`curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer XXXXXXXXXXX" -d @request.json "https://my.grafana.net/api/library-elements/"`
request.json
```json
{
"model": {},
"kind": 1,
"name": "testing description3",
"uid": "basic3",
"id": 12345,
"version": 2
}
```
Example cURL GET request:
`curl -X GET -H "Content-Type: application/json" -H "Authorization: Bearer XXXXXXXX" -d @request "https://my/api/library-elements/name/testing description3"`
Example response:
```json
{
"result": [
{
. . .
}
]
}
```
* Library Elements API fix bracket spacing
(cherry picked from commit 925333bfa4)
Co-authored-by: JM <justintmai@gmail.com>