public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
62,534 Commits 655 Branches 650 Tags
054e12b1aca94dea145f15475f80076c279ea20b
Commit Graph
17405 Commits
Author SHA1 Message Date
Dimitris Sotirakis 93e78e2146 CI: Move fetch-images sub-command from build-pipeline repo (#55298) 
* Move fetch images from build-pipeline

* Modify drone

* Replace zerolog with builtin log

* Fix lint
 2022-09-19 11:19:31 +03:00
Sofia Papagiannaki 754eea20b3 Chore: SQL store split for annotations (#55089) 
* Chore: SQL store split for annotations

* Apply suggestion from code review
 2022-09-19 10:54:37 +03:00
Jean-Philippe Quéméner 4dc0d49025 Alerting: make sure that rules in rule group are nil if not provided (#55301) 2022-09-16 18:54:00 +02:00
Yuriy Tseretyan 6539ae512c use filepath.Dir to get the parent (#55266) 2022-09-16 10:29:39 -04:00
Dave Henderson 801b61c963 Tracing: Add new [tracing.opentelemetry] custom_attributes config setting (#54110) 
* tracing: Add new [tracing.opentelemetry] custom_attributes config setting

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

* Fix typos in config

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

* Return error when custom_attributes contains malformed entries

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

Signed-off-by: Dave Henderson <dave.henderson@grafana.com>
 2022-09-16 09:54:25 -04:00
Piotr Jamróz 9b4cdfe652 Correlations: Hide Correlations Page behind a feature toggle (#55224) 
* Hide Correlations Page behind a toggle

* Remove redundant defaults

* Ensure top nav is rendered when correlations are disabled

This is for the case when:

[feature_toggles]
topnav = true
 2022-09-16 15:14:27 +02:00
Dimitris Sotirakis 95512c19e0 CI: Refactor versions.go (#55238) 
* Refactor versions.go

* s/ReleaseModeConfig/BuildConfig
 2022-09-16 06:26:33 -04:00
ying-jeanne e4741ce8d6 remove datasource from sqlstore (#55288) 2022-09-16 06:20:26 -04:00
Eric LeijonmarckandMarcus Efraimsson 9cdd1cde7f fix: order of database (#55232) 
* fix: order of database

* fix: sort of results

* Update pkg/api/dtos/models_test.go

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Update pkg/api/dtos/models_test.go

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* only one assert

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-09-16 05:24:24 -04:00
George Robinson 5561f935e6 Alerting: Fix send resolved notifications (#54793) 
This commit fixes a bug where we did not send resolved alerts to Alertmanager for resolved alert instances. This meant that resolved notifications did not have the annotations from the resolved state, and a result did not also have the resolved screenshot.
 2022-09-15 17:25:05 +01:00
Michael Musenbrock 099d3cdf72 Provisioning Contact points: Support disableResolveMessage via YAML too (#54122) 
Signed-off-by: Michael Musenbrock <michael.musenbrock@gmail.com>
 2022-09-15 12:19:34 -04:00
JoGabriel MABILLEAlex KhomenkoJosh Huntgamab
 		3e2e9f93b9 Auth: Allow admins to manually change oauth user role if oauth_skip_org_role_update_sync is enabled (#55182) 
* Auth: Allow admins to change oauth user info it it's not synced.

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* Update public/app/features/admin/UserAdminPage.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Add missing import

* Simplify init

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* SAML: Add option to skip org role sync (#55230)

* SAML: Add option to skip org role sync

* Modify frontend accordingly

* Remove update from config option name

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Remove update from config option name

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Fix typo

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
Co-authored-by: gamab <gabi.mabs@gmail.com>
Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
 2022-09-15 12:06:09 -04:00
JoGabriel MABILLEgamab
 		00e7324bf6 Auth: Restore legacy behavior and add deprecation notice for empty org role in oauth (#55118) 
* Auth: Add deprecation notice for empty org role

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>

* fix recasts

* fix azure tests missing logger

* Adding test to gitlab oauth

* Covering more cases

* Cover more options

* Add role attributestrict check fail

* Adding one more edge case test

* Using legacy for gitlab

* Yet another edge case YAEC

* Reverting github oauth to legacy

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Not using token

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Nit.

* Adding warning in docs

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* add warning to generic oauth

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Be more precise

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Adding warning to github oauth

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Adding warning to gitlab oauth

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Adding warning to okta oauth

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Add docs about mapping to AzureAD

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Clarify oauth_skip_org_role_update_sync

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Nit.

* Nit on Azure AD

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Reorder docs index

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

* Fix typo

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>
Co-authored-by: gamab <gabi.mabs@gmail.com>
 2022-09-15 17:35:59 +02:00
Adam Simpson 92857ef331 CloudMonitor: Remove cloudMonitoringExperimentalUI feature flag (#55054) 
* CloudMonitor: remove cloudMonitoringExperimentalUI

* fix: address typecheck errors

* fix: fix SLO import and width cleanup

* fix wrong metricType when switching datasources

* fix: remove legacy SLO and fix queryType check
 2022-09-15 14:12:26 +00:00
Eric LeijonmarckandMarcus Efraimsson 1d298b3e53 fix: min metric to hourly metric (#55228) 
* fix: min metric to hourly metric

* Update pkg/services/login/model.go

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-09-15 14:17:34 +02:00
Marcus Efraimsson cc583c5d87 Chore: Change default log level for errutil.CoreStatus (#55199) 2022-09-15 14:08:59 +02:00
Piotr Jamróz 7352c181c2 Migrate user_id to BIGINT (#55084) 2022-09-15 13:29:46 +02:00
Karl Persson b827df626d RBAC: Initiate store in service (#55081) 
* RBAC: Dont inject store with wire

* RBAC: Use Store interface

* RBAC: Move store interface and initiate it from service
 2022-09-15 11:34:15 +02:00
Dimitris Sotirakis 4e73766067 CI: Move store-storybook to OSS (#55212) 
* Move store-storybook to OSS

* grabpl -> build for store-storybook command

* Replace zerolog with builtin log

* Remove flags from store-storybook

* Fix lint
 2022-09-15 11:06:43 +03:00
owensmallwood e37420f0a8 PublicDashboards: Log api layer errors and which datasources fail/succeed (#55056) 
Adds pubdash api error logging and logs array of datasource names with success status when running pubdash queries.
 2022-09-14 13:19:21 -06:00
Yuriy Tseretyan 8a62020211 Alerting: New API endpoint GET /api/v1/ngalert (#55134) 
* declare new endpoint /api/v1/ngalert
* add authorization for new path
* add request handler for the new path
 2022-09-14 14:03:10 -04:00
Will BrowneandMarcus Efraimsson 29327cbba2 Plugins: Use error plane for api/ds/query (#54750) 
* plugin client returns error base

* fix api test

* add plugin client test

* add fallback err

* fix linting

* wip

* replace bad query

* template is an error

* failing test of templated error

* add one test passing

* fix failing test

* move test

* rename ErrBadQuery to ErrQueryValidationFailure

* tidy diff

* Change to one error per specific error kind

* last err + fix test

* fix imports

* more tests

* keep req vars together

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2022-09-14 18:19:57 +02:00
owensmallwood deb86e3250 PublicDashboards: Dont support exemplars (#54933) 
Don't support exemplars in public dashboards
 2022-09-14 09:49:10 -06:00
sam boyer ced53a8dc2 plugins: Introduce generated, static core plugin registry (#54118) 
* Refactor towards template/codegen framework

* Add templates for plugin gen

* Add Go codegen for plugins; overhaul framework, too

* Add new codegen output; assorted framework fixes

* Regenerate after merge

* Remove accidental commit file, update templates

* Export the pfs.Tree loader from plugin types

* Print details from cuetsy errors

* Generate loaders for all plugins and list in registry

* Use pfs_gen.go over lineage_gen.go

* Un-un-ignore main file

* Introduce simple List static registry for plugins

* Last tweaks to codegen

* remove unused tvars

* Ensure loop-local instances for both vars

* Generate pfs parsing in-place in registry

* Stop generating pfs_gen.go

* Move Tree into pfs, rename subdir

* Change package name to match dir

* Ignore gocyclo on HTTPServer.getNavTree
 2022-09-14 10:15:09 -04:00
Will Browne 0571d98bba [WIP] Plugins: Introduce Plugins specific config (#54854) 2022-09-14 14:35:35 +01:00
Yuriy Tseretyan 896eeb65a9 Alerting: Fix alerting evaluation to use proper permissions (#55127) 
* access control to log user name if it does not have permissions
* update ngalert Evaluator to accept user instead of creating a pseudo one
* update alerting eval (rule\query testing) API to provide the real user to the Evaluator
* update scheduler to create a pseudo user with proper permissions
 2022-09-14 09:30:58 -04:00
Karl Persson d896db6d30 RBAC: Batch permission creation (#55075) 2022-09-14 15:14:09 +02:00
Gábor Farkas 6dcc8534f7 elastic: simplify unit test (#55168) 2022-09-14 08:59:35 -04:00
Karl Persson d1b9849946 RBAC: Fix background users to include permissions (#55147) 
* RBAC: add function to construct background users

* PluginDashboards: Set rbac permissions for user

* Dashboards: use background user constructor
 2022-09-14 11:26:05 +02:00
Karl Persson 870929b463 RBAC: Add cache for oss rbac permissions (#55098) 
* RBAC: Add cache for oss permissions

* RBAC: include service account actions

* RBAC: revert changes to fetch service account permissions

* Update comment for setting

* RBAC: Disable permission chache for tests
 2022-09-14 09:13:10 +02:00
Kevin Minehart ed5d617cb9 CI: move grabpl verify-drone (#55057) 
* move grabpl verify-drone
 2022-09-14 08:59:18 +03:00
Alexander Weaver 9f45e2e706 Alerting: Fix legacy migration crash when rule name is too long (#55053) 
* Extract standardized UID field length to constant

* Extract default length to constant

* Truncate rule names that are too long

* Add tests for name normalization

* Fix whitespace lint error

* Another linter fix

* Empty commit to kick build
 2022-09-13 13:53:09 -05:00
Guilherme Caulada b06eaf66b6 Public Dashboards: Replace simplejson with TimeSettings on dashboard struct (#55047) 
* Replace simplejson for TimeSettings on PublicDashboard struct

* Implement xorm conversion interface to TimeSettings

* Fix minor test assertion issue
 2022-09-13 13:33:41 -03:00
Andreas Gerstmayr 2c622b912a Prometheus: Fix integer overflow in rate interval calculation (#52051) 
Affecting only 32-bit architectures.
 2022-09-13 12:51:26 +02:00
Dimitris Sotirakis ac0f5c5556 CI: Add export-version command (#55072) 
* Add export-version command

* Fix lint

* 1-line cleanup
 2022-09-13 13:26:24 +03:00
Torkel Ödegaard da001b01f1 TopNav: Section navigation UX (#55012) 
* Design tweaks

* Updated

* Fixing unit tests

* Review fixes

* Text primary on active sections, and change home icon to text

* spacing fix

* More fix

* Fixes

* Updates
 2022-09-13 12:24:23 +02:00
Artur WierzbickiandRyan McKinley e19f36649f Storage: Content root storage (#54929) 
Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
 2022-09-12 18:34:46 -04:00
Kevin Minehart d3af3e0431 CI: Move grabpl publish-metrics (#55042) 
* move grabpl publish-metrics

* grabpl -> ./bin/build

* fix lint error
 2022-09-12 13:28:08 -05:00
Adam Simpson 879ee82b83 AzureMonitor: Fix custom namespaces (#54937) 2022-09-12 12:10:51 +02:00
Domas b5c67fe0dd Frontend logging: handle logging endpoints without expensive middleware (#54960) 2022-09-12 13:04:43 +03:00
Emil Tullstedt b287047052 Chore: Upgrade Go to 1.19.1 (#54902) 
* WIP

* Set public_suffix to a pre Ruby 2.6 version

* we don't need to install python

* Stretch->Buster

* Bump versions in lib.star

* Manually update linter

Sort of messy, but the .mod-file need to contain all dependencies that
use 1.16+ features, otherwise they're assumed to be compiled with
-lang=go1.16 and cannot access generics et al.

Bingo doesn't seem to understand that, but it's possible to manually
update things to get Bingo happy.

* undo reformatting

* Various lint improvements

* More from the linter

* goimports -w ./pkg/

* Disable gocritic

* Add/modify linter exceptions

* lint + flatten nested list

Go 1.19 doesn't support nested lists, and there wasn't an obvious workaround.
https://go.dev/doc/comment#lists
 2022-09-12 12:03:49 +02:00
Carl Bergquist 72ae4a5aa3 toggles: add feature toggle to increase in mem caching (#55014) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2022-09-12 03:50:54 -04:00
Sofia Papagiannaki b157fcdd87 Chore: fix formating for swagger definitions (#54993) 2022-09-12 10:40:35 +03:00
Jean-Philippe Quéméner bc4d929c67 Alerting: remove interpolation of annotations from alert rule file provisioning (#54975) 2022-09-09 18:47:54 +02:00
Misi c5be9605a2 Chore: Use TimeNow instead of time.Now in user sql store to make it testable (#54983) 2022-09-09 18:43:14 +02:00
Joe Blubaugh 22c937340e Revert "Alerting: Write and Delete multiple alert instances. (#54072)" (#54885) 
This reverts commit 5e4fd94413.
 2022-09-09 17:44:06 +02:00
Giordano Ricci f0ec5961a4 fix: restore data source edit page access (#54973) 2022-09-09 09:50:56 -04:00
Nicholas Wiersma faf8eb3afb JWT: Allow conventional bearer token in Authorization header (#54821) 
* fix: allow JWT to accept standard bearer token

* fix: linter issues

* fix: linter gosec false positive

* fix: refactor logic into JWT handler

* fix: move bearer trimming earlier
 2022-09-09 11:05:58 +02:00
Jean-Philippe Quéméner d88f1c8e35 Alerting: validate am config changes before persisting (#54908) 2022-09-09 10:05:52 +02:00
Gabriel MABILLEKalle PerssonmarefrAlexander ZobninWill BrowneJguer
 		101349fe49 RBAC: Add permissions to install and configure plugins (#51829) 
* RBAC: Allow app plugins restriction

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

* Moving declaration to HttpServer

Co-Authored-By: marefr <marcus.efraimsson@gmail.com>

* Picking changes from the other branch

Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>

* Rename plugins.settings to plugins

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>

* Account for PluginAdminExternalManageEnabled

Co-authored-by: Will Browne <will.browne@grafana.com>

* Set metadata on instantiation

Co-authored-by: Jguer <joao.guerreiro@grafana.com>

Co-authored-by: Kalle Persson <kalle.persson@grafana.com>
Co-authored-by: marefr <marcus.efraimsson@gmail.com>
Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Jguer <joao.guerreiro@grafana.com>
 2022-09-09 09:44:50 +02:00