public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,380 Commits 655 Branches 650 Tags
77dccd54ca0c5f8ceed9fc53392f94759ffdcf29
Commit Graph

35380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grot (@grafanabot) 77dccd54ca Azure OAuth: silent fail on getting groups (#49909) (#50022) 
(cherry picked from commit 3049534c40)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2022-06-02 09:23:44 +02:00
Grot (@grafanabot) f591c64661 etcd: Fix vuln CVE-2018-1098 (#49976) (#49977) 
* Update etcd

* Update go.sum

* Replace etcd with etcd/v3

(cherry picked from commit 0d7a3209e7)

Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
 2022-06-02 09:03:55 +02:00
Alexander Weaver 8efd4350b4 Alerting: Remove double quotes from matchers (#50038) (#50046) 
* 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)

Co-authored-by: gotjosh <josue.abreu@gmail.com>
 2022-06-01 16:52:07 -05:00
Grot (@grafanabot) 1c335d1da7 Tracing: Fix trace links in traces panel (#50028) (#50039) 
(cherry picked from commit bb94681d5a)

Co-authored-by: Connor Lindsey <cblindsey3@gmail.com>
 2022-06-01 19:50:12 +02:00
Grot (@grafanabot) 08b84c11cb CloudWatch: Add multi-value template variable support for log group names in logs query builder (#49737) (#50037) 
* Add multi-value template variable support for log group names

* add test for multi-value template variable for log group names

* add test

(cherry picked from commit dca0453c2e)

Co-authored-by: Kevin Yu <kevinwcyu@users.noreply.github.com>
 2022-06-01 19:41:51 +02:00
Christopher Moyer a96aac39f3 Docs: intro docs refactor (#49545) (#50033) 
* intro docs refactor

* adds content to the index file; incorporates feedback

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Fix alerting opt out relref

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>

* Convert front matter to YAML and add current aliases

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
Co-authored-by: Chris Moyer <chris.moyer@grafana.com>

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit 1e3e9f3c68)
 2022-06-01 12:35:07 -05:00
Grot (@grafanabot) 835928cd01 license: Make coremodels all Apache v2 (#49731) (#50032) 
(cherry picked from commit e5fab2dec8)

Co-authored-by: sam boyer <sdboyer@grafana.com>
 2022-06-01 13:17:29 -04:00
Grot (@grafanabot) ffa5873529 DashList: Remove star z-index (#50029) 
Closes #49796

(cherry picked from commit 6ceb40e20e)

Co-authored-by: Alexander Kubyshkin <i.am.glint@gmail.com>
 2022-06-01 18:47:59 +02:00
Grot (@grafanabot) 56818c16fd SearchV2: Fix scroll issue in folder folder view page (#50010) (#50017) 
(cherry picked from commit 07bfa13770)

Co-authored-by: Maria Alexandra <239999+axelavargas@users.noreply.github.com>
 2022-06-01 17:13:12 +02:00
Grot (@grafanabot) 6e93f497b2 Alerting: Fix external alertmanager duplication (#49980) (#50008) 
* Fix external alertmanager duplication

* Add tests

(cherry picked from commit 9da41140aa)

Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
 2022-06-01 16:36:38 +02:00
Grot (@grafanabot) 382eaaa773 Secrets: Fix unified secrets backwards compatibility (#49719) (#50009) 
* Fix unified secrets backwards compatibility

* Add compatibility fix to AddDataSource function

* Allow updating password on fail to decrypt secrets

* If unified secret is corrupt try migrating

(cherry picked from commit 470be98588)

Co-authored-by: Guilherme Caulada <guilherme.caulada@grafana.com>
 2022-06-01 11:10:02 -03:00
Grot (@grafanabot) 3b5511db2b Loki: Run query when pressing Enter on line-filters (#49913) (#50004) 
* changed `onBlur` and `onKeyDown` handling

- `onCommitChange` is only called if `onBlur` or `onKeyDown` are not set

* added `runQueryOnEnter` flag to OperationParamDef

* only run query if `runQueryOnEnter` is configured

* changed `evt.type` check to `keydown`

(cherry picked from commit b355adac6f)

Co-authored-by: svennergr <Svennergr@gmail.com>
 2022-06-01 16:08:09 +02:00
Grot (@grafanabot) 338f6797b2 RBAC: Include alert.rules action when setting folder permissions (#49946) (#50006) 
(cherry picked from commit bdff63d4a8)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
 2022-06-01 15:41:07 +02:00
Grot (@grafanabot) 39f461ea78 Metrics: Remove support for using summaries instead of histogram for HTTP instrumentation (#49985) (#50003) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit 9562fb389f)

Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>
 2022-06-01 14:49:37 +02:00
Kevin Yu b2e73b866f Azure Monitor: Include datasource ref when interpolating variables (#49543) (#49957) 2022-06-01 05:30:16 -07:00
Grot (@grafanabot) c011b15d1c Table: Reorder panel options (#49983) (#49998) 
* Table: Reorder panel options

* Fix e2e selector

(cherry picked from commit f566958555)

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2022-06-01 13:33:14 +02:00
Grot (@grafanabot) f7e8809763 [v9.0.x] Alerting: Re-render panel's tabs on variables change (#49995) 
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
 2022-06-01 13:24:22 +02:00
Grot (@grafanabot) d344b69fbb Plugins: Remove deprecated /api/tsdb/query metrics endpoint (#49916) (#49996) 
* remove /api/tsdb/query

* revert changes to alert rules

* regenerate spec based on 9.0.x

(cherry picked from commit abfc711c53)

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2022-06-01 13:22:53 +02:00
Grot (@grafanabot) e58aac1b77 Prometheus: Fix aligning of labels of exemplars after backend migration (#49924) (#49982) 
* Fix normalization of labels

* Move sorting so it actually has an effect

* fix lint error

Co-authored-by: Todd Treece <todd.treece@grafana.com>
(cherry picked from commit d2fefec306)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
 2022-06-01 12:48:31 +02:00
Grot (@grafanabot) a4431a7cbf Settings: Sunset non-duration based login lifetime config (#49944) (#49990) 
(cherry picked from commit 39096208ed)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2022-06-01 12:46:25 +02:00
Grot (@grafanabot) 4371c45dff Usage stats: Divide collection into multiple functions to isolate failures (#49928) (#49989) 
(cherry picked from commit d3ffb9e245)

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2022-06-01 12:43:02 +02:00
Will Browne 3061d57220 regenerate swagger spec (#49942) 2022-06-01 13:37:49 +03:00
Grot (@grafanabot) f5ede594f4 Alerting: do not overwrite existing alert rule condition (#49920) (#49984) 
(cherry picked from commit 82e9f4e7e7)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2022-06-01 12:07:29 +02:00
Grot (@grafanabot) c14d7aa4a3 UI: Remove deprecated getFormStyles function (#49945) (#49981) 
(cherry picked from commit 05e501c641)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-06-01 11:13:12 +02:00
Grot (@grafanabot) a51f51f7a8 grafana/ui: Move panel-container styles to component (#49566) (#49915) 
* Chore: transfer styling to Explore.tsx and convert to Emotion

* feat: create a component and export it

* Chore: replace by new component

* Chore: replace by new component

* Feat: create a story

* Chore: clean up

* Chore: clean up

(cherry picked from commit 94375592c8)

Co-authored-by: Laura <48948963+L-M-K-B@users.noreply.github.com>
 2022-06-01 09:29:13 +03:00
Grot (@grafanabot) 5c19011dc1 Alerting: Add GetImages to ImageStore (#49717) (#49791) 
GetImages does a `TOKEN IN` query for each token in the argument.

(cherry picked from commit 47a3ddd968)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-06-01 05:10:03 +02:00
Grot (@grafanabot) 849a0932e8 Alerting: Add templated subject config to email notifier (#49742) (#49846) 
* Add subject templating to email notifier

* Fix linting

(cherry picked from commit d92625125b)

Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>
 2022-06-01 04:14:56 +02:00
Ezequiel Victorero cc536ea6e9 ReleaseNotes: Updated changelog and release notes for 9.0.0-beta2 (#49960) (#49963) 
(cherry picked from commit 1e4ebf876b)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
 2022-05-31 16:46:53 -03:00
Grot (@grafanabot) 2508cb4751 "Release: Updated versions in package to 9.0.0-beta.2" (#49959) 2022-05-31 15:49:24 -03:00
Grot (@grafanabot) d71e30a692 [v9.0.x] Docs: integration tests for using sqllite (#49784) 
* Docs: integration tests for using sqllite (#49455)

* Update developer-guide.md

* prettier formatting

(cherry picked from commit f5d25c91f6)

* Update contribute/developer-guide.md

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

* Update contribute/developer-guide.md

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

Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
 2022-05-31 23:52:59 +07:00
Grot (@grafanabot) 8a4eed5fb6 Datasource: Remove deprecated max_idle_connections_per_host setting (#49948) (#49951) 
(cherry picked from commit b03657b0e0)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-05-31 18:38:54 +02:00
Grot (@grafanabot) 088125ae28 Plugins: Support headers field for check health (#49930) (#49949) 
(cherry picked from commit a7813275a5)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-05-31 18:22:35 +02:00
Grot (@grafanabot) 445909a759 InlineLabel: Remove deprecated props (#49929) (#49943) 
(cherry picked from commit 1595cc96e6)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-05-31 16:48:31 +01:00
Grot (@grafanabot) e3127d4070 Datasource: Fix allowed cookies to be forwarded as header to backend datasources (#49541) (#49935) 
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
(cherry picked from commit 1196b4a609)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-05-31 17:17:55 +02:00
Christopher Moyer b8ec4346aa Docs/fixes relrefs (#49754) (#49933) 
* fixes http-api link

* removes old saml docs

* fixes broken links to enterprise docs landing page

(cherry picked from commit 0f40d2a79d)
 2022-05-31 10:14:35 -05:00
Jack Baldry 7de6880ba4 Backport 49786 and 49207 to v9.0.x (#49932) 
* Docs: Identify which Grafana editions are relevant to each Enterprise doc (#49207)

* Add section to Ent docs index re: Cloud features
* Add and update notes identifying Enterprise and Cloud features
* Address feedback

(cherry picked from commit 3ecee06630)

* Use ref links for external content (#49786)

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

Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
 2022-05-31 10:02:35 -05:00
Grot (@grafanabot) 9cb10d735f ColorPicker: Remove deprecated onColorChange prop (#49923) (#49927) 
(cherry picked from commit 8d59ba2be9)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-05-31 16:46:21 +02:00
Christopher Moyer 4b5adfb1ba Docs: combines all SAML topics into one topic (#49443) (#49755) 
* Docs: combines all SAML topics into one topic (#49443)

* combines all SAML topics

* resolves merge conflicts

* makes prettier

(cherry picked from commit 8c84d62e3d)

* Fix broken relrefs

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
 2022-05-31 09:27:07 -05:00
Grot (@grafanabot) adac77dd1f ClipboardButton: Simplify callbacks (#49847) (#49852) 
(cherry picked from commit 70980fbb44)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-05-31 14:43:49 +01:00
Grot (@grafanabot) a482c055a0 Prometheus: Predefined scopes for Azure authentication (#49861) (#49881) 
(cherry picked from commit 0101c19374)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>
 2022-05-31 09:16:20 -04:00
Grot (@grafanabot) 6d107a7f41 Alerting: Add Go error message to warning log for screenshots. (#49870) (#49917) 
Makes debugging problems with alert screenshotting easier.

(cherry picked from commit 56f40bd413)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
 2022-05-31 15:07:57 +02:00
Grot (@grafanabot) c73b1787ec [v9.0.x] Alerting: Add fgac support to alert list panel (#49912) 
Co-authored-by: gillesdemey <gilles.de.mey@gmail.com>
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
 2022-05-31 14:41:35 +02:00
Grot (@grafanabot) a8dbc1eaa0 UI/Card: Remove deprecated props (#49885) (#49900) 
(cherry picked from commit d590012a18)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-05-31 13:38:22 +01:00
Grot (@grafanabot) a87062e4e6 AuthProxy: Remove deprecated ldap_sync_ttl setting (#49902) (#49908) 
* Remove deprecated ldap_sync_ttl

(cherry picked from commit 389eec089e)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
 2022-05-31 14:19:59 +02:00
Grot (@grafanabot) 199b1467aa [v9.0.x] Prometheus: Cleanup annotation editor (#49884) 
* Prometheus: Cleanup annotation editor (#49615)

* Remove unused code

* Remove test

* Remove Builder mode and simplify the code

* Fix step mapping

* Fix import

* change placeholder

(cherry picked from commit 72367cf1ad)

* Change import

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
 2022-05-31 13:54:28 +02:00
Grot (@grafanabot) cf7ed5ed22 add feature highlighting in the expanded menu (#49892) (#49901) 
(cherry picked from commit 0089779945)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-05-31 13:23:27 +02:00
Grot (@grafanabot) 1d83694679 RBAC: drop permissions with folder:create action added by migration (#49878) (#49891) 
(cherry picked from commit f4f25d911b)

Co-authored-by: Karl Persson <kalle.persson@grafana.com>
 2022-05-31 12:58:06 +02:00
Grot (@grafanabot) 8c91d4e6e2 Alerting: fix layout with long words / numbers (#49882) (#49889) 
(cherry picked from commit e04f84fd1b)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2022-05-31 12:54:17 +02:00
Grot (@grafanabot) 326c48347e UI/Button: Remove deprecated "link" variant (#49843) (#49877) 
(cherry picked from commit 0012d2d81f)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-05-31 11:44:52 +02:00
Grot (@grafanabot) 606323212e Dependencies: Update etcd module (#49873) (#49880) 
* Update etcd

* Update go.sum

* Replace etcd due to broken module

(cherry picked from commit 3587a5559b)

Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
 2022-05-31 11:28:33 +02:00