IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-13 06:34:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
29,071 Commits 1,265 Branches 722 Tags
7e6db1ee7eb9c33db52f8a0c3a1ac337114844bd
Commit Graph
6103 Commits
Author SHA1 Message Date
Joan López de la Franca Beltran 5c07df9f4b Chore: Replace Command dispatches by explicit calls (#32131) 
* Clean up GetProvisionedDashboardDataByIdQuery

* Clean up SaveProvisionedDashboardCommand

* Clean up & fix AddTeamMemberCommand usages

* Clean up & fix UpdateUserPermissionsCommand usages

* Lint imports
 2021-03-19 09:14:14 +01:00
gotjosh cc74b1fe46 Alerting: Add database table for persisting alerting configuration (#32042) 
* Alerting: Add database table for persisting alerting configuration

* Fix the linter

* Address review comments

* Don't split templates and configuration

It is already bundled together as part of a of the API so might as well
marshall it directly.
 2021-03-18 18:12:28 +00:00
Joan López de la Franca Beltran b2e82a4f37 Login: Replace command dispatch by explicit call (#32088) 
* Fix LoginService.UpsertUser user creation

* Fix API AdminCreateUser user creation

* Add missing underscore import

* Fix API CompleteInvite user creation

* Fix API SignUpStep2 user creation
 2021-03-18 17:16:56 +01:00
Ganesh Vernekar 0b788b5ce8 AlertingNG: Notification channel for emails (#31768) 
* Email notification channel in ngalert

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Use existing templating system

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Update template and add unit tests

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-03-18 14:55:11 +00:00
Ottavio M. Hartmanachatterjee-grafanaDiana Payton
 		7a9a52c317 Alerting: Enable Alert rule severity tag to override VictorOps Severity setting (#29392) 
* add severity to victorops

* Update docs, add test

* Fix spelling and lint

* fix resolving not working

* Update docs/sources/alerting/notifications.md

* Update docs/sources/alerting/notifications.md

* Update docs/sources/alerting/notifications.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/alerting/notifications.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* remove table, update supported alert notifiers

* add docs

* 7.4->7.5

* fix

* Update docs/sources/alerting/notifications.md

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2021-03-18 09:50:07 -04:00
Arve Knudsen 5a0780801b SQLStore: Close session in withDbSession (#31775) 
* SQLStore: Close session in withDbSession

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* SQLStore.WithDbSession: Never use session from context

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-18 14:27:59 +01:00
Arve Knudsen a2eda798e7 PluginManager: Make remaining plugin state non-global (#32094) 
* PluginDashboards: Use plugin manager interface

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* PluginManager: Make panels non-global

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* PluginManager: Make apps non-global

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* PluginManager: Make static routes non-global

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* PluginManager: Make pluginTypes non-global

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-18 13:53:01 +01:00
Kyle Brandt 026bf1f9ca SSE/InfluxDB: Change InfluxQL to work with server side expressions (#31691) 
* SSE/InfluxDB: Change InfluxQL to work with server side expressions
updates the request to handle EpochMS as the time range (which is what expressions sends)
and the response to use millisecond timestamps instead of seconds.
fixes #31604
similar to https://github.com/grafana/grafana/pull/31455
 2021-03-18 08:02:37 -04:00
Hugo Häggmark f508a16a43 LibraryPanels: Improves the Get All experience (#32028) 
* LibraryPanels: Improves Get All Api

* Refactor: using useReducer instead of useState

* Refactor: adds Pagination to UI

* Tests: adds reducer tests

* Refactor: using Observable instead to avoid flickering

* Refactor: moves exclusion to backend instead

* Chore: changing back the perPage default value
 2021-03-18 11:19:41 +01:00
Dimitris Sotirakis 2d72b4e69e Prometheus: Convert Prometheus query response to dataframes (#31948) 
* Convert Prometheus query response to dataframes

* Add parseResponse tests

* Fixed lint imports

* Force use UTC as timezone in timeVector

* Updated test to check timezone
 2021-03-18 08:40:26 +02:00
Owen Diehl 7a4ab13a79 API Response implements http.ResponseWriter (#32046) 
* rename response.Header -> response.SetHeader to free up method name for http.ResponseWriter ifc

* normalresponse implements http.ResponseWriter
 2021-03-17 13:12:28 -04:00
Owen Diehl 36614b03f7 Data Source Proxy: Migrate proxy to its own service and make more extensible (#31927) 
* datasource proxy extensions

* revert normalresponse extensions

* data proxy service impl

* lint

* api datasource proxy method

* moves datasource proxy tests into correct new pkg
 2021-03-17 13:10:40 -04:00
Ganesh Vernekar 974ccf8091 AlertingNG: Fix the alerting stage for legacy alerts (#32025) 
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
 2021-03-17 16:38:33 +00:00
Arve Knudsen 87c3a2b790 PluginManager: Make Plugins, Renderer and DataSources non-global (#31866) 
* PluginManager: Make Plugins and DataSources non-global

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix integration tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Replace outdated command

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* DashboardService: Ensure it gets constructed with necessary parameters

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix build

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* DashboardService: Ensure it gets constructed with necessary parameters

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Remove dead code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix test

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix test

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Remove FocusConvey

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix test

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Remove dead code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Undo interface changes

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Backend: Move tsdbifaces.RequestHandler to plugins.DataRequestHandler

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Rename to DataSourceCount

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Consolidate dashboard interfaces into one

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix test

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix dashboard integration tests

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-17 16:06:10 +01:00
Marcus EfraimssonandArve Knudsen c0edf88f9f Data proxy: Fix encoded characters in URL path should be proxied encoded (#30597) 
Fix encoded characters in URL path should be proxied as encoded in the data proxy.

Fixes #26870 
Fixes #31438

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-17 12:17:41 +01:00
Sofia Papagiannaki 68b05b8aaa AlertingNG: Unified alerting API mock (#32040) 
* AlertingNG: Alertmanager mock API

* AlertingNG: Remove permissions API routes

* Add example POST payloads

* Prometheus and testing mock API
 2021-03-17 12:47:03 +02:00
Giordano Ricci 0c2045109e Chore: Collect elasticsearch version usage stats (#31787) 
* Chore: Collect elasticsearch version usage stats

* Fix lint error

* use GetDataSources from sqlstore

* Apply review suggestions

* Return error if datasource type is not specified

* Update pkg/services/sqlstore/datasource.go

* fix undefined var
 2021-03-17 09:14:53 +00:00
Will Browne 8e1c2d6472 move backend docs to their relevant folder (#32041) 2021-03-17 09:41:16 +01:00
Joan López de la Franca BeltranAlex KhomenkoHugo HäggmarkUrsula Kallio
 		610999cfa2 Auth: Allow soft token revocation (#31601) 
* Add revoked_at field to user auth token to allow soft revokes

* Allow soft token revocations

* Update token revocations and tests

* Return error info on revokedTokenErr

* Override session cookie only when no revokedErr nor API request

* Display modal on revoked token error

* Feedback: Refactor TokenRevokedModal to FC

* Add GetUserRevokedTokens into UserTokenService

* Backendsrv: adds tests and refactors soft token path

* Apply feedback

* Write redirect cookie on token revoked error

* Update TokenRevokedModal style

* Return meaningful error info

* Some UI changes

* Update backend_srv tests

* Minor style fix on backend_srv tests

* Replace deprecated method usage to publish events

* Fix backend_srv tests

* Apply suggestions from code review

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>

* Minor style fix after PR suggestion commit

* Apply suggestions from code review

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>

* Prettier fixes

Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
 2021-03-16 17:44:02 +01:00
Marcus Efraimsson a97637a133 Snapshots: Fix usage of sign in link from the snapshot page (#31986) 
Fix redirect to login page from snapshot page when not authenticated.

Fixes #28547
 2021-03-16 16:46:34 +01:00
Ganesh VernekarandJosue Abreu ecbc98ba5d AlertingNG: Add alert provider and basic structure with dispatcher, silences and delivery stages (#31833) 
* AlertingNG: Add alert provider

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Add unit tests

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Alertmanager WIP

* Merge alertmanager into notifier

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Fixes for PR 31833 (#31990)

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Use alertmanager from upgrad-uuid temporarily to unblock

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

* Fix lint

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>

Co-authored-by: Josue Abreu <josue@grafana.com>
 2021-03-16 10:44:52 +01:00
Arve Knudsen 65c1cb62a7 Chore: Move tsdbifaces.RequestHandler to plugins.DataRequestHandler (#31897) 
* Backend: Move tsdbifaces.RequestHandler to plugins.DataRequestHandler

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-12 18:26:07 +01:00
Will Browne 9454a4e125 add more context to unknown delta log (#31943) 2021-03-12 15:38:23 +01:00
Ryan McKinleyandErik Sundell 9dd1d5f553 Cloudwatch: use shared library for aws auth (#29550) 
* use sdk for handling auth

* fix broken test

* lint fixes

Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
 2021-03-12 14:30:21 +01:00
Arve Knudsen 1716de88b5 DashboardService: Consolidate constructors (#31886) 
* DashboardService: Consolidate constructors

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-12 11:51:02 +01:00
Sofia Papagiannaki fe628c6282 AlertingNG: base API implementation (#31824) 
* AlertingNG: base API implementation

* Pass the interface instead of the base impl

* Ruler mock draft (WIP)

* Update alerting-api dependency

* Improve mock implementation
 2021-03-11 21:28:00 +02:00
Sofia Papagiannaki 53bccf1b77 Replace eval.Condition with models.Condition (#31909) 2021-03-11 18:56:58 +02:00
Zoltán Bedi 3b6168eb4a Tempo: Add test for backend data source (#31835) 2021-03-11 08:18:24 +01:00
Will Browne c40d96d0ab Plugins: Remove pre-existing plugin installs when installing with grafana-cli (#31515) 
* remove old install before install if exists

* fix log format
 2021-03-10 19:13:08 +01:00
Arve Knudsen 47f13abf7a Backend: Migrate to using non-global configuration (#31856) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-10 12:41:29 +01:00
Lê Đặng Hoài Nam 7764739a8e Alerting: Generate random id when testing notification channel (#31844) 2021-03-10 11:24:31 +01:00
Arve Knudsen 04e9f6c24f UsageStatsService: Don't use global state (#31849) 
* UsageStatsService: Don't use global state

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-10 10:14:00 +01:00
Erik Sundellandachatterjee-grafana d512c5a1b4 Cloudwatch: ListMetrics API page limit (#31788) 
* add list metrics api page limit

* Update docs/sources/datasources/cloudwatch.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
 2021-03-10 07:41:22 +01:00
Erik SundellandArve Knudsen 2d660ee502 CloudWatch: Restrict auth provider and assume role usage according to Grafana configuration (#31805) 
* restrict usage of providers and assume role according to grafana config

* update docs

* Update docs/sources/datasources/cloudwatch.md

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/tsdb/cloudwatch/cloudwatch.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/tsdb/cloudwatch/session_test.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* pr feedback

* fix failing test

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-09 21:20:59 +01:00
Erik Sundell 13dd9dff50 CloudWatch: Add support for EC2 IAM role (#31804) 
* add support for iam role auth

* add stubbable func

* fix broken test

* goimports

* pr feedback
 2021-03-09 20:50:16 +01:00
Sofia Papagiannaki 4ce0a49eac AlertingNG: Split into several packages (#31719) 
* AlertingNG: Split into several packages

* Move AlertQuery to models
 2021-03-08 22:19:21 +02:00
Carl BergquistandDiana Payton 3b36636318 Annotations: Make the annotation clean up batch size configurable (#31487) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2021-03-08 14:16:07 +01:00
Arve Knudsen fc9381744a UsageStatsService: Make initialization more robust (#31761) 
* UsageStatsService: Make initialization more robust

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-08 10:33:20 +01:00
Arve KnudsenErik SundellWill BrowneTorkel ÖdegaardWill BrowneZoltán Bedi
 		b79e61656a Introduce TSDB service (#31520) 
* Introduce TSDB service

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
Co-authored-by: Will Browne <will.browne@grafana.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2021-03-08 07:02:49 +01:00
Carl Bergquist c899bf3592 log skipped, performed and duration for migrations (#31722) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2021-03-07 21:26:29 +01:00
Zoltán Bedi 29c998f9eb Tempo: Convert tempo to backend data source2 
This reverts commit c15d1f498a.
 2021-03-05 14:28:17 +01:00
Zoltán Bedi c15d1f498a Revert "Tempo: convert to backend data source (#31618)" (#31702) 
This reverts commit 862f09376f.
 2021-03-04 21:20:26 +01:00
Zoltán Bedi 53d4acdad2 Tempo: set authentication header properly (#31699) 2021-03-04 20:39:01 +01:00
Zoltán BediandArve Knudsen 862f09376f Tempo: convert to backend data source (#31618) 
* Tempo: Support opentelemetry response

* Tempo: convert Tempo to backend data source

* Update data source test

* Fix lint issues

* Apply suggestions from code review

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Return error when trace not found

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-03-04 18:23:02 +01:00
Joan López de la Franca Beltran 01b4048026 Usage Stats: Report usage for all signed plugins (#31545) 
* Report usage for all the signed plugins

* Remove no longer used code

* Fix tests by manipulating the global state

* Minor test fix
 2021-03-04 15:43:43 +01:00
Alexander Emelin 8016b3c5ca Live: Use pure WebSocket transport (#31630) 2021-03-04 09:06:42 +03:00
Sofia Papagiannaki bd2390c49f AlertingNG: code refactoring (#30787) 
* AlertingNG: refactoring

* Fix tests
 2021-03-03 17:52:19 +02:00
Ilya Stoliar f5d1fa48ca CloudWatch: Added AWS Timestream Metrics and Dimensions (#31624) 2021-03-03 11:25:45 +02:00
Erik Sundell 580332255d add new metrics and dimensions (#31595) 2021-03-03 10:18:34 +01:00
Kyle Brandt a488ab8393 SSE: Add "Classic Condition" on backend (#31511) 
This is a translation of services/alerting/conditions. Main Changes:

- Work with types in SSE (series/number) which are data frames (no more null.Float).
- The query part from alerting/conditions is handled by SSE logic
- Convey / simplejson removed.
- Time range no longer part of "query" in the condition
 2021-03-02 13:51:33 -05:00