IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
37,730 Commits 5,416 Branches 554 Tags
7b4cea8151e27c1ccaca1d1577958f5daf0e03f1
Commit Graph

8839 Commits

Author SHA1 Message Date
ying-jeanne
7b4cea8151 Chore: StoreSplit tag service (#55453) 
* move tag service outside

* fix dashboard

* fix test

* lint

* fix linter

* remove spew
 2022-09-21 08:04:01 -04:00
Will Browne
b25ea75bac Plugins: Add secure JSON fields to plugin setting DTO (#55313) 
* add secure JSON fields to plugin setting DTO

* add nil pointer fix

* adding secureJsonFields to the plugin meta.

Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>
 2022-09-21 12:20:11 +02:00
Emil Tullstedt
c10a69c007 Cleanup: Add traces to cleanup jobs (#55465) 2022-09-21 12:01:21 +02:00
Torkel Ödegaard
8440baab91 NavBarMenu: Section as links and design tweak (#55538) 
* scaffold new component + remove storing of expanded state

* some padding fixes

* simplify!

* move browse back to being a child of dashboards

* behaviour working

* improve child matcher to look recursively

* increase NavBarMenu zIndex to ensure it overlays explore drawer

* some renaming

* fix unit test

* make dashboards a top level item again and make chevrons their own buttons

* remove active background state

* Finished tweaks

* remove theme change

* Remove exit animation

* align button centrally + fix empty message alignment

* only show the empty message if there are no children

* ensure overflowing menu items truncate correctly

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
 2022-09-21 11:57:30 +02:00
George Robinson
bad4f7fec5 Alerting: Change screenshots to use components (#55156) 
* Alerting: Change screenshots to use components

This commit changes screenshots to use a number of components instead of a set of functional wrappers.

It moves the uploading of screenshots from the screenshot package to the image package so we can re-use the same code for both uploading screenshots and server-side images; SingleFlight from the screenshot package to the image package so we can use it for both taking and uploading the screenshot, where as before it was used just for taking the screenshot; and it also removes the use of a cache because we know that screenshots can be taken at most once per tick of the scheduler.
 2022-09-21 10:25:07 +01:00
George Robinson
7d20766ae9 Alerting: Fix mathexp.NoData cannot be reduced (#55347) 
This commit fixes a bug where queries from datasources such as InfluxDB that returned no data would not create a DatasourceNoData alert, but instead an error "can only reduce type series, got type noData".
 2022-09-21 10:01:51 +01:00
Erik Sundell
28ebdf1641 move describe log groups to resource api (#55485) 2022-09-21 10:55:54 +02:00
Artur Wierzbicki
c3ca5405ce Search: Add search index configuration options (#55525) 
* Search: externalize config

* Search: update config descriptions

* Search: fix value

* Search: fix

* update

* Search: revert config values

* Search: rename copy/paste

* Search: fix tests
 2022-09-20 19:09:55 -04:00
Artur Wierzbicki
9db2720016 Search: improve logging in case of failed dashboard loading phase (#55523) 2022-09-20 23:50:29 +02:00
Yuriy Tseretyan
57a0b6db2c Alerting: Refactor WeCom notifier to use encoding/json to parse settings instead of simplejson (#55423) 2022-09-20 14:37:24 -04:00
Ieva
6d5bdf12e8 resolve merge conflicts (#55503) 2022-09-20 13:31:08 -04:00
Serge Zaitsev
305d494902 Chore: Switch over to team.Service instead of sqlstore (#55497) 
* switch to using team service

* trying to fix tests

* more tests to fix

* add missing teamtest package
 2022-09-20 18:58:04 +02:00
Marcus Efraimsson
862a6a2fa6 Logging: Introduce API for contextual logging (#55198) 
Introduces a FromContext method on the log.Logger interface that 
allows contextual key/value pairs to be attached, e.g. per request, 
so that any logger using this API will automatically get the per request 
context attached. The proposal makes the traceID available for 
contextual logger , if available, and would allow logs originating from 
a certain HTTP request to be correlated with traceID.
In addition, when tracing not enabled, skip adding
traceID=00000000000000000000000000000000
to logs.
 2022-09-20 18:32:06 +02:00
Jo
006944a360 Auth: Add development manual override (#55496) 
* Auth: Add development manual override

* rename to disable_sync_lock
 2022-09-20 11:48:40 -04:00
Alexander Emelin
0e6a8cc6ac Live: Migrate to centrifuge-js v3 (new API and client protocol) (#51977) 2022-09-20 11:39:46 -04:00
Alexander Weaver
3a580dc3cd Alerting: Extract default message embed into named constant (#55424) 
* Resolve conflicts

* Combine multiple const definitions
 2022-09-20 10:20:06 -05:00
Artur Wierzbicki
03af63d52e SearchV2: add tracing to background jobs (#55250) 
* searchv2: add tracing to background jobs

* searchv2: lint

* searchv2: lint

* searchv2: fix context passing

* searchv2: add init org index span

* searchv2: add traceid to logs

* searchv2: add db count to logs
 2022-09-20 16:49:44 +02:00
Emil Tullstedt
4711454b81 Org: Fix service initialization (#55460) 2022-09-20 08:28:47 -04:00
idafurjes
43a1d1484d Add some org methods to org service interface (#55449) 
* Add some org methods to org service interface

* Fix fake method name
 2022-09-20 12:57:51 +02:00
idafurjes
eff4daacaf Bug: Rollback change in search (#55443) 2022-09-20 12:18:39 +02:00
Dimitris Sotirakis
cb93ed04a7 Add storybook bucket for main builds (#55448) 2022-09-20 13:15:06 +03:00
Serge Zaitsev
2ee3fd3994 Chore: Create structure for team service (#55444) 2022-09-20 10:14:00 +00:00
Giordano Ricci
d815e2cb56 Correlations: Return 200 instead of 404 for empt correlation lists (#55242) 
* return 200 instead of 404 for empty correlations list

* handle empty list response & improve consistency
 2022-09-20 11:13:33 +01:00
Josh Hunt
d014a3a09b Echo: Add support for Google Analytics 4 (#55446) 
* user essentials mob! 🔱

lastFile:public/app/core/services/echo/backends/analytics/GA4Backend.ts

* user essentials mob! 🔱

* user essentials mob! 🔱

lastFile:public/app/core/services/echo/backends/analytics/GA4Backend.ts

* user essentials mob! 🔱

lastFile:public/app/core/services/echo/backends/analytics/GA4Backend.ts

* user essentials mob! 🔱

lastFile:public/app/app.ts

* user essentials mob! 🔱

Co-authored-by: eledobleefe <laura.fernandez@grafana.com>
Co-authored-by: Leodegario Pasakdal <leodegario.pasakdal@grafana.com>
 2022-09-20 03:13:14 -07:00
Jo
13146cc812 Auth: reduce allocs (#55410) 2022-09-20 12:03:08 +02:00
Serge Zaitsev
8f1e2ed658 Chore: Split temporary user (invite) service (#55397) 
* Chore: Split temporary users

* change references to tempuser service

* fix api tests

* restore tests
 2022-09-20 11:29:17 +02:00
idafurjes
7ce7c9b64c Chore: Move SearchOrgs to org service (#55416) 
* Chore: Move SearchOrgs to org service

* Fix lint

* Fix lint 2
 2022-09-20 09:55:40 +02:00
Alexander Weaver
4df41972f1 Alerting: Refactor one notifier to use encoding/json to parse settings instead of simplejson (#55271) 
* Create struct for Slack's receiver settings

* Remove one layer of indirection when building slack notifier

* Delete un-used struct

* Validate against settings struct instead of simplejson object

* Genericize settings marshalling

* Remove repetition between fields on notifier and fields on settings struct

* Rename unmarshal settings wrapper

* Handle comma separated strings at marshalling time rather than validation time

* Address misc review feedback
 2022-09-19 17:30:16 -05:00
Serge Zaitsev
7108b4331d Fix: return proper values in dashboard thumbs service (#55421) 2022-09-20 00:29:55 +02:00
Guilherme Caulada
ee899e8c3a PublicDashboards: Sanitize metadata from public dashboard queries (#55269) 
* Add function to remove metadata from queries

* Add test for RemoveMetadataFromQueryData function

* Remove only custom data and executed query string

* Add sanity check to SanitizeMetadataFromQueryData
 2022-09-19 12:44:29 -03:00
Dimitris Sotirakis
b26e443173 Fix fetch-images command (#55365) 2022-09-19 17:17:56 +03:00
Dimitris Sotirakis
f058e1eae3 Add storybook bucket for main builds (#55379) 2022-09-19 17:17:25 +03:00
Will Browne
cd7a464f7e Plugins: Ensure plugin uninstall success for "pre-installed" community plugins (#55322) 
* track pre-installed external plugins in store

* fix tests
 2022-09-19 12:14:30 +02:00
Serge Zaitsev
96b032e103 Chore: Split dashboard thumbnail service (#55344) 
* Chore: split dashboard thumbnail service

* fix typo

* move tests

* make linter happy
 2022-09-19 11:29:22 +02:00
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 Leijonmarck
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
Jo
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
Jo
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 Leijonmarck
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