public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,834 Commits 655 Branches 650 Tags
7e1df2ac61ab9cd11527691f673d52f337263bf8
Commit Graph
35834 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Grot (@grafanabot)andCarl Bergquist 7e1df2ac61 Instrumentation: Collect database connection stats (#52797) (#52866) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
(cherry picked from commit 7825ad6aa3)

Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>
 2022-07-27 08:02:17 -04:00
Armand Grillet e78045a059 Docs: fix data source MSSQL link (#52854) 2022-07-27 10:26:19 +02:00
Grot (@grafanabot)andgjed be2d8320fc Docs: updated configuration description for auto_assign_org (#50180) (#52835) 
* Docs: updated configuration description for auto_assign_org

* Update docs/sources/setup-grafana/configure-grafana/_index.md

* Resolve prettier issues for CI

* Update docs/sources/setup-grafana/configure-grafana/_index.md

Remove trailing space

Co-authored-by: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com>
Co-authored-by: Garrett Guillotte <garrett.guillotte@grafana.com>
Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
(cherry picked from commit 6968478d94)

Co-authored-by: gjed <marco@pernigo.com>
 2022-07-26 10:25:17 -07:00
Grot (@grafanabot)andGilles De Mey 16d7897e1c UI/Card: Fix card items always having pointer cursor (#52809) (#52817) 
(cherry picked from commit aa8c9d86dd)

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
 2022-07-26 16:44:52 +02:00
Grot (@grafanabot) b5e3497ce5 ReleaseNotes: Updated changelog and release notes for 9.0.5 (#52813) (#52815) 
(cherry picked from commit c20d96aaec)
 2022-07-26 16:16:41 +02:00
Grot (@grafanabot) 12a81fe0bf "Release: Updated versions in package to 9.0.5" (#52812) 2022-07-26 15:04:47 +01:00
Grot (@grafanabot)andGeorge Robinson a03896d83d Docs: Update docs for images in notifications (#52721) (#52785) 
(cherry picked from commit 23fc5383d9)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-07-26 10:49:50 +01:00
Dimitris Sotirakis af89d404b2 Update grabpl (#52782) 2022-07-26 12:16:54 +03:00
Grot (@grafanabot)andEsteban Beltran 8d4180104b [v9.0.x] Grafana/toolkit: Fix incorrect image and font generation for plugin builds (#52783) 
Co-authored-by: Esteban Beltran <academo@users.noreply.github.com>
 2022-07-26 04:58:27 -04:00
Grot (@grafanabot)andRobin Tönniges 63fe3aaf7c Updated pushover in Supported notifiers (#52631) (#52748) 
Pushover supports images in notifications since v9.0.2

(cherry picked from commit 9c3f9887fc)

Co-authored-by: Robin Tönniges <development@toenniges.org>
 2022-07-25 10:38:11 -07:00
Grot (@grafanabot)andkay delaney fb3d767f61 Dashboard: Adjust styles for very long titles (#52452) (#52741) 
(cherry picked from commit 06012d51a9)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-07-25 18:36:58 +01:00
Grot (@grafanabot)andMed Amine Amara d92fa74450 docs(alerting): removed a repetition of a word (#52376) (#52736) 
removed a repetition of a word in doc

(cherry picked from commit 4d2f2b88b6)

Co-authored-by: Med Amine Amara <60155224+medamineamara@users.noreply.github.com>
 2022-07-25 16:21:22 +01:00
Grot (@grafanabot)andScott Lepper d12e3b6da1 fix dockerfile for oracle alpine image (#52667) (#52731) 
fix dockerfile for oracle alpine image

(cherry picked from commit dbc2171401)

Co-authored-by: Scott Lepper <scott.lepper@gmail.com>
 2022-07-25 10:33:44 -04:00
Grot (@grafanabot)andIvana Huckova af47d9342e Docs: Fix query history documentation (#52610) (#52724) 
* Query history: Fix docs

* Update query history docs

* Update docs/sources/explore/query-management.md

* Update docs/sources/explore/query-management.md

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

* Trigger drone

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
(cherry picked from commit 9d960e8723)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2022-07-25 15:14:54 +02:00
Will Browne 61be62e42b resolve conflicts (#52642) 2022-07-25 11:45:11 +02:00
Grot (@grafanabot) 6dcaa1e567 Plugins: Fixes navigation between different plugin pages (#52571) (#52680) 2022-07-23 08:01:11 -04:00
Grot (@grafanabot)andkay delaney 56f8a72bfe Variables: Optimize "timeRangeUpdated" path (#52047) (#52664) 
(cherry picked from commit 0c89743759)

Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
 2022-07-22 11:49:11 -04:00
Emil Tullstedt 4efa75ffdc [v9.0.x] Chore: Upgrade to Go version 1.17.12 (#52523) (#52531) 
(cherry picked from commit 78f26a079c)
 2022-07-22 14:22:22 +02:00
Grot (@grafanabot)andKonrad Lalik 1d59297f70 [v9.0.x] Alerting: Fix alert panel instance-based rules filtering (#52646) 
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
 2022-07-22 07:16:15 -04:00
Eric Leijonmarck 234f29f42b [v9.0.x] Auth: Add prometheus metrics for case insensitive ids (#52634) 
* merge backport

* remove sa background service
 2022-07-22 12:06:02 +01:00
Grot (@grafanabot)andKonrad Lalik 84b88a4dae [v9.0.x] Alerting: Add subpath to the folder edit and permission url (#52638) 
Co-authored-by: Konrad Lalik <konrad.lalik@grafana.com>
 2022-07-22 05:40:05 -04:00
Grot (@grafanabot)andGabriel MABILLE cc7c8d4cef Fix anonymous access (#52615) (#52636) 
(cherry picked from commit 8d938175f5)

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
 2022-07-22 11:09:05 +02:00
Grot (@grafanabot)andChristopher Moyer 632f015454 removes unnecessary words in into (#52622) (#52624) 
(cherry picked from commit 1974f166e0)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2022-07-21 14:00:26 -05:00
Grot (@grafanabot)andDarren Janeczek 57976b7119 Prometheus: Don't show errors from unsuccessful API checks like rules or exemplar checks (#52609) 
The query inspector was experiencing some error pop-ups due
to errors encountered on metrics datasources configured with multiple
tenants.

e.g., team-a|team-b

This fix suppresses those errors so as to not mislead the user.

(cherry picked from commit 565430f297)

Co-authored-by: Darren Janeczek <38694490+darrenjaneczek@users.noreply.github.com>
 2022-07-21 10:11:37 -04:00
Grot (@grafanabot)andbrendamuir 6eb283e29f Docs: minor corrections to prefix and naming (#52579) (#52597) 
(cherry picked from commit cf42365fdd)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>
 2022-07-21 12:50:07 +01:00
Grot (@grafanabot)andgotjosh 6eb552a595 Alerting: Allow the webhook notifier to support a custom Authorization header (#52515) (#52587) 
* Allow the webhook notifier to support a custom Authorization header

Instead of doing something clever of re-using the existing username/password fields of Basic Authentication - I opted for two diffent fields to match the upstream Alertmanager configuration (that in turn is based of the HTTP Basic authentication).

 It'll fail if you have values for both HTTP Basic Authentication and Authorization.

(cherry picked from commit b026f2bc5d)

Co-authored-by: gotjosh <josue.abreu@gmail.com>
 2022-07-21 12:07:40 +01:00
Grot (@grafanabot)andIeva 723eca610e display dashboard settings to users who are allowed to edit the dashboard (#52532) (#52535) 
(cherry picked from commit becd895244)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2022-07-21 12:04:30 +01:00
Grot (@grafanabot)andJean-Philippe Quéméner 02a7557de4 Alerting: Cleanup the alert_configuration table on write (#51497) (#52539) 
(cherry picked from commit 320262c3db)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
 2022-07-21 12:29:37 +02:00
Vardan TorosyanandIeva 89ea9f0e36 Access control: Allow organisation admins to add existing users to org (#51668) (#52553) 
* Access control: Allow organisation admins to add existing users to org (#51668)

* check users with user add permission to access the invite endpoint

* undo unneeded changes

* tests and cleanup

* linting

* linting

* betterer

* betterer again

* fix prettier issue

Co-authored-by: jguer <joao.guerreiro@grafana.com>
(cherry picked from commit 0c33b9f211)

* Fix org invites

* Fix tests

* Revert betterer

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2022-07-21 11:44:20 +02:00
Grot (@grafanabot)andSven Grossmann da2442863b Changelog: Removed falsely added bugfix (#52580) (#52581) 
(cherry picked from commit b1f355fddc)

Co-authored-by: Sven Grossmann <Svennergr@gmail.com>
 2022-07-21 04:26:19 -04:00
Eric Leijonmarck 1f44da3d83 Fix: add alias to subqueries for mysql database (#52576) 
(cherry picked from commit 8073502701b172f23a4dfa09a7195217cb4007aa)
 2022-07-21 09:03:10 +01:00
Alexander WeaverandJean-Philippe Quéméner 795e2d0a48 Alerting: use static channel configuration to determinate secure fields (#52527) (#52570) 
* Alerting: use static channel configuration to determinate secure fields

* move to channels package

* introduce channel_config package to fix cyclic import

* add missing changes

* compare type to type

(cherry picked from commit ba9c18d9c3)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
 2022-07-20 18:34:58 -04:00
Guilherme CauladaandMichael Mandrus d1f1041aba Datasource: Propagate datasource secret decryption errors to the frontend (#52068) (#52557) 
* update decrypt secrets function signature and add secrets error handling

* remove a couple instances of unnecessary logging since errors are properly handled now

* add unit test

* fix linting issues

(cherry picked from commit 9aa6ce2a50)

Co-authored-by: Michael Mandrus <41969079+mmandrus@users.noreply.github.com>
 2022-07-20 18:03:44 -03:00
Grot (@grafanabot)andChristopher Moyer e95c97c119 Docs: adjusts heading and rewords the intro to active voice (#52545) (#52551) 
* adjusts heading and makes intro active voice

* Update docs/sources/administration/service-accounts/_index.md

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>

Co-authored-by: Ursula Kallio <ursula.kallio@grafana.com>
(cherry picked from commit 7d90f2f1a3)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2022-07-20 12:42:36 -05:00
Grot (@grafanabot) 2feb6a5f73 ReleaseNotes: Updated changelog and release notes for 9.0.4 (#52548) (#52549) 
(cherry picked from commit 240bb8928d)
 2022-07-20 13:09:36 -04:00
Grot (@grafanabot) 409aa6b4f3 "Release: Updated versions in package to 9.0.4" (#52547) 2022-07-20 18:05:20 +01:00
Grot (@grafanabot)andSven Grossmann af4402dab9 Loki: Fix show context not working in some occasions (#52458) (#52518) 
* added missing `languageProvider.start` call

* moved `languageProvider.start`

(cherry picked from commit 6cab909132)

Co-authored-by: Sven Grossmann <Svennergr@gmail.com>
 2022-07-20 16:23:09 +02:00
Grot (@grafanabot)andIeva 931818b822 Access control: Fix org user removal for OSS users (#52473) (#52514) 
* allow setting team managed permissions for service accounts

* Revert "allow setting team managed permissions for service accounts"

This reverts commit 7598626397.

* fix org user removal for OSS

* remove comment

(cherry picked from commit ba76be174f)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2022-07-20 13:53:32 +01:00
Grot (@grafanabot)andGeorge Robinson 21d74574c8 [v9.0.x] Alerting: Fix Slack push notifications (#52476) 
This commit fixes push notifications for Slack which used to show "This content cannot be displayed". The text field is shown in both the message and the push notification.

(cherry picked from commit 094dfd0d4d)

Co-authored-by: George Robinson <george.robinson@grafana.com>
 2022-07-19 22:17:46 -04:00
Grot (@grafanabot) 963c55eeda Dashboard: Fix iteration property change triggering unsaved changes warning (#51272) (#52493) 2022-07-19 21:59:27 -04:00
Grot (@grafanabot)andUsman Ahmad 46e0c1fe99 Update upgrade-grafana.md (#52406) (#52482) 
fixed the broken link for the release notes

(cherry picked from commit a8ddea0d35)

Co-authored-by: Usman Ahmad <69509548+usmangt@users.noreply.github.com>
 2022-07-19 14:25:45 -05:00
Grot (@grafanabot)andIsabella Siu 49db9712ab CloudWatch: fix log explorer context (#52118) (#52478) 
(cherry picked from commit 146c90d59e)

Co-authored-by: Isabella Siu <Isabella.siu@grafana.com>
 2022-07-19 14:17:11 -04:00
Grot (@grafanabot)andAlexander Weaver 2b5f654fc4 Alerting: Preserve new-lines from custom email templates in rendered email (#52253) (#52470) 
* Add line break, regenerate, and fix

* Left-align custom text in addition to preserving newlines

(cherry picked from commit 39d7fdbbbc)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
 2022-07-19 11:24:11 -05:00
Ieva 24f9baef16 resolve conflicts (#52464) 2022-07-19 17:08:31 +01:00
Grot (@grafanabot)andAgnès Toulet 74d0e7227a Docs: Update query caching support (#50706) (#52462) 
* Docs: Update query caching support

* Update query-caching.md

(cherry picked from commit 2b7fe7251c)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
 2022-07-19 16:47:16 +02:00
Ieva 711fc26f7b merge (#52410) 2022-07-19 15:36:42 +01:00
Grot (@grafanabot)andDominik Prokop bcd25e86cb Legend: Right align calculation values (#52400) (#52454) 
(cherry picked from commit 49311e1cfb)

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
 2022-07-19 05:52:01 -07:00
Joey Tawadrous 377acb4cdd [v9.0.x] Traces: Remove serviceMap feature flag (#52433) 2022-07-19 10:25:12 +01:00
Grot (@grafanabot)andJoe Blubaugh b026345459 SQLStore: Support Upserting multiple rows. (#52228) (#52438) 
This will be used to reduce write load when the alerting system writes a
large number of events.

(cherry picked from commit a0f96ed4e1)

Co-authored-by: Joe Blubaugh <joe.blubaugh@grafana.com>
 2022-07-19 17:05:27 +08:00
Eric LeijonmarckandEmil Tullstedt e4c221afc4 [v9.0.x] CSRF: Fix additional headers option (#52347) 
* merged and backport to 9.0.x

* merged http_server

* fix for provider being interface

* fix for provider maybe

* wire inject

* wire inject

* wire inject

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2022-07-19 07:50:31 +01:00