public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,939 Commits 655 Branches 650 Tags
fccf08107bdf6e8a2fb4d3363a9f2ef240c1bfd7
Commit Graph

13386 Commits

Author SHA1 Message Date
Ieva 5fcb301765 [v11.1.x] RBAC: Always store action sets (#92856) 
RBAC: Always store action sets (#92833)

always store action sets, even if FT is disabled

(cherry picked from commit 46e81e98cf)
 2024-09-03 15:08:31 +01:00
grafana-delivery-bot[bot] 9fe605265d [v11.1.x] CI: Run prettier in bump-version workflow (#92530) 
CI: Run prettier in bump-version workflow (#92195)

Run prettier

(cherry picked from commit 931d64b8fc)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
 2024-08-27 22:40:45 +03:00
grafana-delivery-bot[bot] da500a56b3 [v11.1.x] RBAC: Fix an issue with server admins not being able to manage users in orgs that they don't belong to (#92273) 
* RBAC: Fix an issue with server admins not being able to manage users in orgs that they don't belong to (#92024)

* look at global perms if user is not a part of the target org

* use constant

* update tests

(cherry picked from commit 41ac5b5ae7)

* fix tests

---------

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2024-08-22 11:24:08 +01:00
grafana-delivery-bot[bot] d5a6f8eed0 [v11.1.x] OpenTSDB: Fix data frame construction (#91757) 
OpenTSDB: Fix data frame construction (#90991)

* Update type and frame construction

* Update tests

* Keep dataField name as value

(cherry picked from commit 06509712ec)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
 2024-08-09 20:18:11 +03:00
Yuri Tseretyan 738cc49ec5 [v11.1.x] Alerting: Fix persisting result fingerprint that is used by recovery threshold (#91290) 
Alerting: Fix persisting result fingerprint that is used by recovery threshold (#91224)

(cherry picked from commit 537f1fb857)

# Conflicts:
#	pkg/services/ngalert/state/persister_sync.go
 2024-07-31 11:16:37 -04:00
Ryan McKinley bb5d2c83ef Snapshots: Fix panic when snapshot_remove_expired is true (#91232) 2024-07-31 16:21:58 +03:00
grafana-delivery-bot[bot] 93d25da8c1 [v11.1.x] CI: fix release pr target (#91002) 
CI: fix release pr target (#90999)

* use inputs.target as checkout ref, and `main` for all reused actions.

(cherry picked from commit 2fe506d502)

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
 2024-07-26 00:33:52 +03:00
Kevin Minehart c17f395374 RBAC: Allow plugins to use scoped actions (#90945) 
Co-authored-by: gamab <gabriel.mabille@grafana.com>
 2024-07-25 17:22:31 +03:00
Andreas Christou 417edf5c43 [v11.1.x] Prometheus: Reintroduce Azure audience override feature flag (#90560) 
Prometheus: Reintroduce Azure audience override feature flag (#90339)

* Re-add feature flag with deprecation note

* Hide the field in frontend if ff disabled

* Block scope overriding if ff is disabled in backend

- Update promlib to forward logger to extendOptions
- Add warning
- Update tests

* Default toggle to true for now

* Update description

* Update prom tests

* Fix lint

(cherry picked from commit 2616366a0a)

# Conflicts:
#	packages/grafana-data/src/types/featureToggles.gen.ts
#	pkg/services/featuremgmt/registry.go
#	pkg/services/featuremgmt/toggles_gen.csv
#	pkg/services/featuremgmt/toggles_gen.go
#	pkg/services/featuremgmt/toggles_gen.json
#	pkg/tsdb/prometheus/prometheus.go
 2024-07-23 11:31:31 +01:00
grafana-delivery-bot[bot] e0dbd8f3f2 [v11.1.x] CloudWatch: Fix raw queries with dimensions set (#90387) 
CloudWatch: Fix raw queries with dimensions set (#90348)

(cherry picked from commit 9a8be1785a)

Co-authored-by: Isabella Siu <Isabella.siu@grafana.com>
 2024-07-12 17:33:49 -04:00
grafana-delivery-bot[bot] eab471a17c [v11.1.x] RBAC: List only the folders that the user has access to (#89016) 
RBAC: List only the folders that the user has access to (#88599)

only check folder permissions when listing folders

(cherry picked from commit 095ca66d9f)

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
 2024-07-12 14:54:31 +03:00
Ieva c5ea48aec9 [v11.1.x] Admin: Fixes an issue where user accounts could not be enabled (#90361) 
Fix: unable to enable user
Co-authored-by: gonvee <gonvee@users.noreply.github.com>
 2024-07-12 12:12:21 +02:00
grafana-delivery-bot[bot] b8c48273db [v11.1.x] InfluxDB: Fix returning InfluxDB error messages (#90087) 
InfluxDB: Fix returning InfluxDB error messages (#89973)

* Revert "Chore: Return influxdb query error early before parsing the result (#88549)"

This reverts commit a87c155c06.

* Handle error in buffered parser

* handle error message in streaming parser

(cherry picked from commit 4fcd348366)

Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
 2024-07-09 19:50:04 +02:00
grafana-delivery-bot[bot] 460dfdd63d [v11.1.x] Tempo: Fix grpc streaming support over pdc-agent (#90055) 
Tempo: Fix grpc streaming support over pdc-agent (#89883)

* Tempo: Fix grpc streaming support over pdc-agent

* Fix a spelling error and formatting

* Ignore lint issue for reasons listed in source code comment

---------

Co-authored-by: Joey Tawadrous <joey.tawadrous@grafana.com>
(cherry picked from commit d5b21f77aa)

Co-authored-by: Taylor Dean <taylor@makeshift.dev>
 2024-07-04 15:48:00 +01:00
Kevin Minehart 80b3b5d292 [11.1.x] backport CI / release changes (#89641) 
* CI: Make pkg/build its own module, remove unused Grafana modules in go.mo… (#89243)

* Make pkg/build its own module, remove unused Grafana modules in go.mod/go.sum

* fix go.work format

* log errors on file close errors

* CI: Add release-pr workflow (#89005)

* Add release-pr workflow

* update CODEOWNERS

* CI: Trigger release pr workflow when a release is completed (#89062)

* CI: Add bump-version action to the release PR workflow (#89491)

* Automation: Verify release artifacts on grafana.com (#89197)

* baldm0mma/verify_release/ create verify_release_for_download function

* baldm0mma/verify_release/ add name, image, env

* baldm0mma/verify_release/ add initial commands

* baldm0mma/verify_release/ add deps?

* baldm0mma/verify_release/ update location

* baldm0mma/verify_release/ add anno to lib-star

* bald0mma/verify_release/ update func name to verify_grafanacom_step

* baldm0mma/verify_release/ add verify shell script

* baldm0mma/verify_release/ add script content, first attempt

* baldm0mma/verify_release/ add node image to verify_grafanacom_step

* baldm0mma/verify_release/ add gcom secret note

* baldm0mma/verify_release/ add sudo to apt-get

* baldm0mma/verify_release/ add anno

* baldm0mma/verify_release/ add anno to secrets

* baldm0mma/verify_release/ update commands to reflect node env image

* baldm0mma/verify_release/ update annos

* baldm0mma/verify_release/ update tag variable

* baldm0mma/verify release/ add whitespace

* baldm0mma/verify_releases/ update with no bash loops

* baldm0mma/verify_release/ update exit logic

* baldm0mma/verify_release/ remove annos

* baldm0mma/verify_releasse/ resign and build yml

* baldm0mma/verify_release/ remove annos

* baldm0mma/verify_release/ update signature

* baldm0mma/verify_release/ download curl

* baldm0mma/verify_release/ remove temp key folder removal

* baldm0mma/verify_release/ account for artifact download time

* baldm0mma/verify_release/ add anno

* baldm0mma/verify_release/ update location

* baldm0mma/verify_release/ update script

* baldm0mma/verify_release/ make drone

* baldm0mma/verify_release/ update script for oss or ent

* baldm0mma/verify_release/ add promotion option

* baldm0mma/verify_release/ make drone

* Update scripts/drone/events/release.star

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* Update scripts/drone/steps/lib.star

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* Update scripts/drone/steps/lib.star

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* baldm0mma/verify_release/ update drone

* Update scripts/drone/events/release.star

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* baldm0mma/verify_release/ update drone

* Update scripts/drone/steps/lib.star

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* baldm0mma/update drone

* baldm0mma/verify_release/ update path

* baldm0mma/verify_release/ make drone

* baldm0mma/update drone

* Apply suggestions from code review

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

* baldm0mma/verify_release/ update for loop to account for failure

* baldm0mma/verify_release/ make drone

* baldm0mma/verify_release/ make format-drone

* baldm0mma/verify_release/ rem unused var

---------

Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>

---------

Co-authored-by: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>
 2024-06-24 15:07:01 -05:00
grafana-delivery-bot[bot] fe6cc7bcb5 [v11.1.x] Notifications: Do not log email address in error message (#89502) 
Notifications: Do not log email address in error message (#89314)

Do not log email address in error message

(cherry picked from commit c2c30c25ed)

Co-authored-by: William Wernert <william.wernert@grafana.com>
 2024-06-20 20:12:48 +03:00
grafana-delivery-bot[bot] 92ba78cd95 [v11.1.x] Alerting: Fix rule storage to filter by group names using case-sensitive comparison (#89007) 
Alerting: Fix rule storage to filter by group names using case-sensitive comparison (#88992)

* add test for the bug
* remove unused struct
* update db store to post process filters by group using go-lang's case-sensitive string comparison

--------

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
(cherry picked from commit d4b0ac5973)

Co-authored-by: Yuri Tseretyan <yuriy.tseretyan@grafana.com>
 2024-06-11 12:04:39 -04:00
Isabella Siu 114a136378 CloudWatch: Fix labels for raw metric search queries (#88943) 2024-06-07 17:37:19 -04:00
Diego Augusto Molina 7ca3ec7518 Infra: fix data race in usagestats service (#88881) 
fix data race
 2024-06-07 17:52:21 -03:00
Todd Treece 22989acf95 K8s: Improve response writer error handling (#88926) 
---------

Co-authored-by: Diego Augusto Molina <diegoaugustomolina@gmail.com>
 2024-06-07 16:10:02 -04:00
Marcus Efraimsson 4a97ff45fe API Server: Enhanced profiling with godeltaprof (#88939) 2024-06-07 19:39:45 +02:00
William Wernert 63e9969c1b Alerting: Recording rule mapping logic for data frames to Prometheus metrics (#88550) 
* Add stub Prometheus writer with mapping logic

* Add tests
 2024-06-07 20:00:22 +03:00
lean.dev 330da7916d Chore: Add unit test for cloudmigration package (#88868) 2024-06-07 13:46:19 -03:00
Alexander Weaver 58fdb24b0b Alerting: Recording rules appear as type=recording in Prometheus API + better abstraction for type (#88805) 
* Wire status through to prom API

* Regenerate swagger
 2024-06-07 11:24:06 -05:00
Sonia Aguilar b761153812 Alerting: Fix permissions for silences list view (#88908) 2024-06-07 19:19:28 +03:00
Yuri Tseretyan 32ea1801aa Alerting: Support AWS SNS integration in Grafana (#88867) 2024-06-07 11:49:49 -04:00
Alexander Weaver f1dc63565e Alerting: Fix go-swagger extraction and several embedded types from Alertmanager in Swagger docs (#88879) 
Drop redundant swagger model comments
 2024-06-07 10:47:47 -05:00
Marcus Efraimsson 40931b6da6 Tracing: Enable traces to profiles (#88896) 2024-06-07 16:58:24 +02:00
Piotr Jamróz c9271edfa1 Feature Toggles: Validate if a GA toggle is enabled or not explicitly (#88277) 2024-06-07 16:21:54 +02:00
Eric Leijonmarck 39bd13f877 User: add second migration for lowercasing login/email of users (#88915) 2024-06-07 15:07:14 +02:00
Karl Persson f3efd95bb4 Auth: Add org to role mappings support to Google integration (#88891) 
* Auth: Implement org role mapping for google oauth provider

* Update docs

* Remove unused function

Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>
 2024-06-07 14:07:35 +02:00
Jack Westbrook 036c878843 Plugins: Improve frontend loader cache (#87488) 
* do it

* set empty child version to parent version

* feat(plugins): use pluginId for loader cache keys

* feat(plugins): apply caching to all js and css files systemjs loads

* remove old code and add comment

* test(plugins): update systemjs hooks tests in line with better caching

* test(plugins): wip - comment out failing backend loader tests

* fix tests and improve comment

* Update public/app/features/plugins/loader/cache.test.ts

Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>

---------

Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>
 2024-06-07 10:03:41 +02:00
Dave Henderson c931a44503 storage: Avoid panic when no previous versions in history (#88880) 
Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
 2024-06-06 21:33:08 -04:00
Yuri Tseretyan 003e3efce9 Alerting: Update mute timings provisioning API to support optimistic locking (#88731) 
* add version to time-interval models
* set time interval fingerprint as version
* update to check provided version
* delete to check if version is provided in query parameter 'version'
* update integration tests
* update specs
 2024-06-06 18:06:37 -04:00
Alexander Weaver a2e21d61f8 Alerting: Remove dead evalRunning guard in rule routine (#88312) 
Remove dead guard
 2024-06-06 16:15:01 -05:00
Isabella Siu cd15e9732d Cloudwatch: Use the metric map from grafana-aws-sdk (#88733) 2024-06-06 21:25:54 +03:00
William Wernert d359591dac Alerting: Support recording rule struct in provisioning API (#87849) 
* Support record struct in provisioning API

* Update api spec

* Use record field

* Restrict API endpoints following toggle

* Fix swagger spec

* Add recording rule validation to store validator
 2024-06-06 21:05:02 +03:00
ismail simsek 808cf75ff8 InfluxDB: Use json-iterator package for json operations (#88562) 
* return error early

* enable gzip between grafana and influxdb

* use json-iterator package for json operations

* revert gzip changes

* update test

* go mod tidy
go work sync
 2024-06-06 20:14:53 +03:00
Dave Henderson e21d357d67 chore: Updating linter, fixing some new warnings (#88863) 2024-06-06 13:01:27 -04:00
Andreas Christou c9778c3332 AzureMonitor: Prometheus exemplars support (#87742) 
* Update types

* Mark datasource as supporting traces

* Add logic to transform exemplar query to traces query

* Render appropriate editor

* Run trace query for exemplars

* Refactor out common functions

- Add function to retrieve first/default subscription

* Add route for trace exemplars

* Update logic to appropriately query exemplars

* Update traces query builder

* Update instance test

* Remove unneeded import

* Set traces pseudo data source

* Replace deprecated function calls

* Add helper for setting default traces query

* Don't show resource field for exemplars query

* When resetting operation ID for exemplars set query to default

- Update tests

* Update query header to appropriately set the service value

* Fix response frame creation and update tests

* Correctly select resource

* Convert subscriptionsApiVersion to const

* Add feature toggle
 2024-06-06 17:53:17 +01:00
Diego Augusto Molina ae84c5fef9 Unified Storage: Fix Entity Server unconditionally starting (#88857) 
fix Entity Server unconditionally starting
 2024-06-06 12:17:46 -03:00
Will Browne 7d8722b561 API server: Add shutdown func to interface (#88827) 
add shutdown func to interface
 2024-06-06 15:18:54 +01:00
Timur Olzhabayev 8690e97c92 Chore: disable proxy trailing slash keep by default (#88842) 
disable proxy trailing slash keep by default
 2024-06-06 16:28:11 +03:00
Timur Olzhabayev 1909ad6fa8 Chore: Removing editor.html from angular patterns (#88845) 
Removing editor.html from angular patterns
 2024-06-06 16:12:51 +03:00
Dave Henderson ca1379bad3 chore: A few updates for the pkg/build/wire fork (#88813) 
* chore: A few updates for the pkg/build/wire fork

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>

* chore: run go work sync

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>

---------

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
 2024-06-06 16:09:27 +03:00
Karl Persson d3b06f09ae Users: remove unused store function (#88784) 2024-06-06 11:43:51 +02:00
Misi 4f2a9a47f3 Auth: Add org to role mappings support to Okta integration (#88770) 
* Add org mapping support to Okta

* Update docs and configs

* Prettier docs

* Apply suggestions from code review

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>

* Improve tests

---------

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
 2024-06-06 10:35:06 +02:00
Marcus Efraimsson 2403665998 Chore: Remove legacydata package (#88790) 
* Chore: Remove legacydata package

* remove unused dependency

* sdk v0.234.0
 2024-06-05 22:31:06 +02:00
ismail simsek 08276bd8e7 InfluxDB: Revert calculation of maxPointsEnforced value (#88809) 
revert calculation of maxPointsEnforced
 2024-06-05 21:43:04 +02:00
ismail simsek a87c155c06 Chore: Return influxdb query error early before parsing the result (#88549) 
return error early
 2024-06-05 21:36:13 +02:00