grafana

Commit Graph

Author	SHA1	Message	Date
Horst Gutmann	77bb24bc9e	AuthJWT: Fix JWT query param leak (CVE-2023-1387) [9.3.x] (#843 ) * fix JWT query param leak Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com> * skip broken test --------- Co-authored-by: jguer <me@jguer.space> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com>	3 years ago
Grot (@grafanabot)	5a35850514	[v9.3.x] Alerting: Update migration to put alerts to the default folder if dashboard folder is missing (#66592 ) * Alerting: Update migration to put alerts to the default folder if dashboard folder is missing (#65577) * extract function * use context logger * put alert to general folder if folder is missing * move folderHelper init * add test * Update pkg/services/sqlstore/migrations/ualert/ualert.go Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> --------- Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com> (cherry picked from commit `7b2f44762e`) * rename ID to Id and dashboards.Dashboard to models.Dashboard --------- Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Dimitris Sotirakis	a807c04177	[v9.3.x] Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63891 ) (#66455 ) * CI: Split subcommand (#66005) * Update e2e package - Ensure health request is monitored for addDatasource flow - Add custom timeout to configurePanel flow (cherry picked from commit `155fcae4aa`) * Make health check optional (cherry picked from commit `91f66d61e1`) --------- Co-authored-by: Andreas Christou <andreas.christou@grafana.com>	3 years ago
Dimitris Sotirakis	b34f9779fd	[v9.3.x] CI: Split `/bin/build artifacts ` subcommand (#66005 ) (#66341 ) CI: Split `/bin/build artifacts ` subcommand (#66005) * Split go files * Modify publishartifacts.go * Split main * FIXME: Temp add GCSCopy to gcloud/storage * Fix lint * Exported flags * Update starlark - make drone * Further backend lint fixes * Add fallback_test.go * Fix go imports order * make drone * Remove GCSCopy from static assets * Remove GCSCopy from storybook * Fix lint * Remove GCSCopy * Remove success logline * drone yaml cleanup * Add artifacts-editions flag * Fix starlark * Add default sting slice in artifacts packages command (cherry picked from commit `24d348f804`) # Conflicts: # .drone.yml	3 years ago
Grot (@grafanabot)	1d0c19ff5c	[v9.3.x] Build: Add CloudMode to build versions (#65988 ) Build: Add CloudMode to build versions (#65651) * Add CloudMode to build versions * Use linux-amd64 variant without musl for cloud mode * Add cloud mode to version folder on package upload * Use musl variant for CloudMode * Only sign rpm packages if there's any to sign * Remove trailing whitespace (cherry picked from commit `8f282b8a6e`) Co-authored-by: Guilherme Caulada <guilherme.caulada@grafana.com>	3 years ago
Grot (@grafanabot)	87ca6d206d	[v9.3.x] Alerting: Fix integration test for creating silences (#65791 ) Alerting: Fix integration test for creating silences (#65722) * fix integration test for creating silences to create correct silence with endsAt in the future * Update api_alertmanager_test.go (cherry picked from commit `ed8628e39d`) Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Horst Gutmann	64f074ca8d	[v9.3.x] CI: Update golangci-lint to 1.51.2 for Go 1.20 compatibility (#65506 ) [v9.3.x] Update golangci-lint to 1.51.2 for Go 1.20 compatibility	3 years ago
Grot (@grafanabot)	678847d250	[v9.3.x] CI: Allow overwriting of existing GitHub release assets (#65458 ) CI: Allow overwriting of existing GitHub release assets (#65127) * CI: Allow overwriting of existing GitHub release assets This closes #63698 * Use c for *cli.Context in publishgithub.go (cherry picked from commit `4ab3bd6f7e`) Co-authored-by: Horst Gutmann <horst.gutmann@grafana.com>	3 years ago
Yuri Tseretyan	3a22eba17f	Chore: Update Grafana to use Alertmanager v0.25.1-0.20230308154952-78fedf89728b (#64784 )	3 years ago
Yuri Tseretyan	2b00a15709	Alerting: Update scheduler to receive rule updates only from database (#64662 ) Alerting: Update scheduler to get updates only from database (#64635) * stop using the scheduler's Update and Delete methods all communication must be via the database * update scheduler's registry to calculate diff before re-setting the cache * update fetcher to return the diff generated by registry * update processTick to update rule eval routine if the rule was updated and it is not going to be evaluated at this tick. * remove references to the scheduler from api package * remove unused methods in the scheduler (cherry picked from commit `85a954cd81`) # Conflicts: # pkg/services/ngalert/api/api_ruler.go # pkg/services/ngalert/ngalert.go # pkg/services/ngalert/ngalert_test.go # pkg/services/ngalert/schedule/schedule.go # pkg/services/ngalert/schedule/schedule_mock.go # pkg/services/ngalert/schedule/schedule_unit_test.go	3 years ago
Dan Cech	2047786936	Backport 59615 to v9.3.x (#62458 ) * Build: Streamline and sync dockerfiles (#58101) --------- Co-authored-by: gotjosh <josue.abreu@gmail.com> Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>	3 years ago
Grot (@grafanabot)	e057471d95	[v9.3.x] CI: Add `PrereleaseBucket` field in `versions.go` (#64523 ) CI: Add `PrereleaseBucket` field in `versions.go` (#64519) Add PrereleaseBucket in versions.go (cherry picked from commit `29b3f3fbf4`) Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>	3 years ago
Armand Grillet	4deceb0aa7	Revert "[v9.3.x] Alerting: Update Prometheus Alertmanager (#64447 )" (#64505 ) This reverts commit `42665ac87f`.	3 years ago
Armand Grillet	42665ac87f	[v9.3.x] Alerting: Update Prometheus Alertmanager (#64447 ) * Alerting: Update Prometheus Alertmanager * Move to TruncateInRunes * Use updated FromGlobs signature * Avoid indirection around InhibitRule based on 61810 * Work around new API for nflog * One more template FromGlobs api change * One more FromGlobs change in test files. Searched for them all... * Missing line from cherrypicked change * Run maintenance on correct state object --------- Co-authored-by: Alex Weaver <weaver.alex.d@gmail.com>	3 years ago
Grot (@grafanabot)	ac56c21aad	[v9.3.x] Plugins: Fix bug with copying grafanaData (#64453 ) Plugins: Fix bug with copying grafanaData (#64446) (cherry picked from commit `39a4634ae9`) Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>	3 years ago
Grot (@grafanabot)	4f4921ad01	[v9.3.x] build: fix corss build (#63262 ) build: fix corss build (#61121) * build: fix corss build * fix lint (cherry picked from commit `37baae3699`) Co-authored-by: Jimmie Han <hanjinming@outlook.com>	3 years ago
Grot (@grafanabot)	587bbf20d3	[v9.3.x] Docker Build: Use `tonistiigi/binfmt` image for cross compilation (#64116 ) Docker Build: Use `tonistiigi/binfmt` image for cross compilation (#64108) * Change docker image used for cross-compilation * Replace fmt.Println with log.Println * Add specific tag for docker image (cherry picked from commit `b42fd92fad`) Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>	3 years ago
Grot (@grafanabot)	d30dc44312	[v9.3.x] NPM: Stop using the folder path before the name path (#63860 ) NPM: Stop using the folder path before the name path (#63851) Stop using the folder path before the name path (cherry picked from commit `177aa254c5`) Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>	3 years ago
Grot (@grafanabot)	27e188c48c	[v9.3.x] MSSQL Datasource: Revert functions within macros change (#63597 ) MSSQL Datasource: Revert functions within macros change (#63592) * Revert functions within macros change * Add tests for function and macro for mssql * Remove macro support tests --------- Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com> (cherry picked from commit `356e2e1933`) Co-authored-by: Kyle Cunningham <codeincarnate@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	30a521aade	[v9.3.x] Alerting: Fix incorrect comment in eval.go (#63512 ) Alerting: Fix incorrect comment in eval.go (#63510) This commit fixes an incorrect comment in the Result struct in eval.go that I had written some time ago. The comment now documents the actual behaviour and content of this field. (cherry picked from commit `f93a9c794d`) Co-authored-by: George Robinson <george.robinson@grafana.com>	3 years ago
George Robinson	e663f6c35e	[v9.3.x] Alerting: Fix a bug taking screenshots with Dashboard UID (#63226 ) Alerting: Fix a bug taking screenshots with Dashboard UID (#63220) This commit fixes a bug where Grafana would fail to take a screenshot if the same Dashboard UID was present across two or more different orgs. (cherry picked from commit `1f984409a2`)	3 years ago
Grot (@grafanabot)	0720a4ad4b	[v9.3.x] Fix MSSQL queries failing because of bad interpolation (#63171 ) Fix MSSQL queries failing because of bad interpolation (#63167) fix failing mssql queries (cherry picked from commit `62b078e4e4`) Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	b43e6e64e1	[v9.3.x] Annotations: Fix EpochEnd being zero for Alert-generated annotations (#60988 ) Annotations: Fix EpochEnd being zero for Alert-generated annotations (#60931) * Revert linter suggestion * Re-add nolint * Work in terms of pointer rather than copy * Add tests covering validation * Add comment (cherry picked from commit `1381fb6dfc`) Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>	3 years ago
Grot (@grafanabot)	10f04e19f0	[v9.3.x] Alerting: Fix template validation in provisioning api (#62824 ) * Alerting: Fix template validation in provisioning api (#62530) * Alerting: Fix template validation in provisioning api Fix issue where provisioning API accepts a malformed template having extra text outside of definition block and template name matching definition name. (cherry picked from commit `f9ec16e74f`) --------- Co-authored-by: Matthew Jacobson <matthew.jacobson@grafana.com>	3 years ago
Dimitris Sotirakis	8faaacd80d	[v9.3.x] CI: Remove variants arg from `package` step (#62858 ) (#62998 ) CI: Remove variants arg from `package` step (#62858) * Remove variants arg from package step # Conflicts: # .drone.yml * Fix starlark lint * Default to releaseModeConfig.Variants * Check for empty variants arg (cherry picked from commit `e5c48ac945`) # Conflicts: # .drone.yml	3 years ago
Grot (@grafanabot)	9c4964279c	[v9.3.x] MSSQL: Add support for macro function calls (#62889 ) MSSQL: Add support for macro function calls (#62742) * MSSQL: Add support for macro function calls * Add tests (cherry picked from commit `9fc3b360a4`) Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>	3 years ago
Dimitris Sotirakis	03b1cf763d	CI: Backport CI/Release related code to `v9.3.x` (#62752 ) * Batch-move everything * go mod tidy * make drone * Remove genversions * Bump alpine image * Revert back pkg/build/docker/build.go * Make sure correct enterprise branch is checked out * Add enterprise2 version * Remove extensions * Bump build container * backport node 18 test fix (cherry picked from commit `4ff03fdbfb`) * Update scripts/drone * Add more commands * Fix starlark link * Copy .drone.star * Add drone target branch for custom events ---------	3 years ago
Grot (@grafanabot)	e7c8704090	[v9.3.x] Server: Switch from separate server & cli to a unified grafana binary (#62443 ) * Server: Switch from separate server & cli to a unified grafana binary (#58286) * avoid the need for a second bulky binary for grafana-cli * look for grafana-server in $PATH as well as same directory * implement unified "grafana" command * update dockerfiles, fix grafana-cli -v * update packaging to work with single binary - add wrapper scripts for grafana and grafana-server - update and sync package files - implement --sign flag of build package command - stop packaging scripts folder, they are not useful for end users - add support for --configOverrides in server command - remove unused nfpm.yaml config file * windows support (cherry picked from commit `de99ce139c`) * Build: don't remove grafana-server and grafana-cli binaries from deb and rpm packages (#59890) * don't remove grafana-server and grafana-cli binaries from /usr/share/grafana/bin in deb and rpm packages * don't add config overrides in /usr/sbin/grafana-server --------- Co-authored-by: Dan Cech <dcech@grafana.com>	3 years ago
Gilles De Mey	a31430a3dd	Alerting: hide "silence" button for external AM setups (#62133 ) (#62693 )	3 years ago
ismail simsek	ead3a002df	[v9.3.x] Expressions: Fixes the issue showing expressions editor (#62627 ) Expressions: Fixes the issue showing expressions editor (#62510) * Use suggested value for uid * update the snapshot * use __expr__ * replace all -100 with __expr__ * update snapshot * more changes * revert redundant change * Use expr.DatasourceUID where it's possible * generate files (cherry picked from commit `91221bc436`)	3 years ago
George Robinson	1c6fcb8ed4	Alerting: Validate that tags are 100 characters or less (#62335 ) (#62594 ) Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com> (cherry picked from commit `0dacb11a12`)	3 years ago
Grot (@grafanabot)	aaa2a821ae	[v9.3.x] Plugins: Fix circular reference in customOptions leading to MarshalJSON errors (#62564 ) Plugins: Fix circular reference in customOptions leading to MarshalJSON errors (#62328) * Plugins: test ds.JsonData.MarshalJSON() * CustomOptions: copy to avoid cyclic marshal (cherry picked from commit `c41f97029e`) Co-authored-by: Yasir Ekinci <ekinci.yasir@gmail.com>	3 years ago
Emil Tullstedt	267d53a56a	[v9.3.x] Login: Fix panic when UpsertUser is called without ReqContext (#62571 ) * Login: Fix panic when UpsertUser is called without ReqContext (#62539) (cherry picked from commit `b1151dd118`) * login->models	3 years ago
Grot (@grafanabot)	7ee08a5c50	[v9.3.x] Auth: Fix catch both both ErrInvalidAPIKey for context with APIKey (#62206 ) Auth: Fix catch both both ErrInvalidAPIKey for context with APIKey (#62193) * fix: capture both ErrInvalidAPIKey * rename of variable (cherry picked from commit `c5cb5be3cc`) Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>	3 years ago
Grot (@grafanabot)	4da046bde5	[v9.3.x] CloudWatch: Add missing AWS/DX metric (#62442 ) CloudWatch: Add missing AWS/DX metric (#62405) (cherry picked from commit `2ff715cb7a`) Co-authored-by: Jan Garaj <jan.garaj@gmail.com>	3 years ago
Grot (@grafanabot)	6991330eda	[v9.3.x] Encryption: Cache new DEKs (only) after a caution period (#62177 ) Encryption: Cache new DEKs (only) after a caution period (#60664) * Encryption: Cache new DEKs (only) after commit * Fix typo * Update secrets manager tests with new failing case * Update secrets manager tests with new clarifications (comments) * Correct broken method calls * Unify methods * Cache data keys only after a caution period * Caution period for data keys caching only for encrypt ops (cherry picked from commit `c4e067d49d`) Co-authored-by: Joan López de la Franca Beltran <5459617+joanlopez@users.noreply.github.com>	3 years ago
Grot (@grafanabot)	e7e110c140	[v9.3.x] Oauth: Remove extra decoding of redirect url (#60878 ) Oauth: Remove extra decoding of redirect url (#60875) Oauth: remove extra decoding of redirect cookie url (cherry picked from commit `5b4e1ee6fc`) Co-authored-by: Karl Persson <kalle.persson@grafana.com>	3 years ago
Grot (@grafanabot)	47f924d915	[v9.3.x] Datasources: Fix Proxy by UID Failing for UIDs with a Hyphen (#62011 ) Datasources: Fix Proxy by UID Failing for UIDs with a Hyphen (#61723) Fix Proxy by UID Failing for UIDs with a Hyphen Hyphens are allowed in short IDs but not picked up by the proxyPathRegexp. This caused the end of the uid to be proxied as part of the path to the backing datasource which would usually cause a 404. (cherry picked from commit `f85d072c17`) Co-authored-by: Chris Marchbanks <csmarchbanks@gmail.com>	3 years ago
Grot (@grafanabot)	4dc28cfec5	[v9.3.x] Elasticsearch: Fix failing requests when using SigV4 (#61933 ) Elasticsearch: Fix failing requests when using SigV4 (#61923) fix setting of `es` servicename (cherry picked from commit `c5610450b2`) Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>	3 years ago
Grot (@grafanabot)	f485d0a1df	[v9.3.x] Plugins: enable the plugin sdk to get the json data for all datasources (#61792 ) Plugins: enable the plugin sdk to get the json data for all datasources (#61729) (cherry picked from commit `3b718a3e8f`) Co-authored-by: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>	3 years ago
Grot (@grafanabot)	bed1e36dcc	[v9.3.x] Auth: Fix disable/remove duplicate user entries metrics for performance reasons (#61692 ) Auth: Fix disable/remove duplicate user entries metrics for performance reasons (#61675) * fix: remove metrics from duplicate user entries * fix: disable metrics collection for authinfo * fix: initifine goroutine loop that happened * removed: metrics (cherry picked from commit `bedd2304d1`) Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>	3 years ago
Yuri Tseretyan	ad705086cf	Alerting: Fix webhook to use correct key for decrypting token (#61717 )	3 years ago
Selene	fe6088e60e	[v9.3.x] Dashboards: Add org_id in dashboards query (#61599 ) Manual backport	3 years ago
Grot (@grafanabot)	b7e4a27e96	[v9.3.x] Auth: Fix correct error for updateapikey in context handler (#61565 ) Auth: Fix correct error for updateapikey in context handler (#61544) * fix: correct error for updateapikey * refactor: send the correct err forward * update: based on review (cherry picked from commit `07bbc0716c`) Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>	3 years ago
Alexander Weaver	46f377635e	Alerting: Set error annotation on EvaluationError regardless of underlying error type (#61508 ) * Alerting: Set error annotation on EvaluationError regardless of underlying error type (#61506) Set error annotation regardless of underlying error type (cherry picked from commit `b289b8ac6e`) * Also cherrypick the nilcheck that got added prior to 9.4	3 years ago
Grot (@grafanabot)	225534841f	[v9.3.x] Alerting: Fix evaluation timeout (#61307 ) Alerting: Fix evaluation timeout (#61303) (cherry picked from commit `b4e1e1871f`) Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Grot (@grafanabot)	0a5f051dd1	[v9.3.x] Instrumentation: measure time until plugin request (#61289 ) Instrumentation: measure time until plugin request (#61279) Signed-off-by: bergquist <carl.bergquist@gmail.com> (cherry picked from commit `672b1711b0`) Co-authored-by: Carl Bergquist <carl.bergquist@gmail.com>	3 years ago
Grot (@grafanabot)	007110c599	[v9.3.x] Traces: Fix timestamp for database query traces (#61162 ) Traces: Fix timestamp for database query traces (#61109) (cherry picked from commit `e7b17cde47`) Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Grot (@grafanabot)	e12c571abf	[v9.3.x] Alerting: Fix conversion of alert state from db state during manager warmup (#60976 ) Alerting: Fix conversion of alert state from db state during manager warmup (#60933) (cherry picked from commit `4d989860fb`) Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>	3 years ago
Stephanie Hingtgen	a4b7019ff0	[v9.3.x] Plugins: add option to proxy ds connections through a secure socks proxy (#59254 ) (#60643 ) Plugins: add option to proxy ds connections through a secure socks proxy (#59254) * Plugins: add feature to proxy data source connections (cherry picked from commit `6805c951e9`)	3 years ago

1 2 3 4 5 ...

9427 Commits (a9873db0f94dea418511ecc953bc3d304ab95e3f)