IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-09 12:48:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,166 Commits 1,232 Branches 722 Tags
fcac61203ec4a5e7036ca14801a0523beb4f46f2
Commit Graph
5844 Commits
Author SHA1 Message Date
Torkel Ödegaard 7428668835 Profile: Fixes profile preferences being accessible when anonymous access was enabled (#31516) 
* Profile: Fixes profile preferences page being available when anonymous access was enabled

* Minor change

* Renamed property
 2021-02-27 18:04:28 +01:00
Dimitris Sotirakis 554055e39d Convert annotations to dataframes (#31400) 
* Stop using transformation to tables

* Update datasource.ts to parse from dataframes

* Add test on transformToDataframe func

* Remove parseResponse and do the work inside parseToAnnotations method

* Name the dataframe after the RefID

* Small fix when mapping to annotation

* Add tests in annotation_query_test.go class

* Small fix in loop iteration

* Change for loop signature
 2021-02-25 18:29:17 +02:00
Agnès Toulet 663d44fe82 Login: handle custom token creation error messages (#31283) 
* Login: handle custom token creation errors

* Login: handle external error for OAuth responses
 2021-02-25 15:30:51 +01:00
M4t3o 0bb4cbdb68 Alerting notifier SensuGo: improvements in default message (#31428) 
* add related metrics as default message

* fix CI linter error
 2021-02-25 10:52:34 +01:00
Torkel Ödegaard 584886fa46 AppPlugins: Options to disable showing config page in nav (#31354) 
* AppPlugins: Options to disable showing config page in nav

* rename

* Added autoEnabled

* updated

* Things are working sort of

* Simplify
 2021-02-25 10:00:21 +01:00
Hugo Häggmark 1725bf773f Chore: Fixes small typos (#31461) 2021-02-25 08:59:26 +01:00
Kyle Brandt c9dbf5a0d0 Graphite/SSE: update graphite to work with server side expressions (#31455) 
Changes the time value of the response to be milliseconds, which I think is like the other data sources I have seen.

Also if it sees the timerange values as numbers, assumes they are unixMS (and come from expressions, or our new backend.TimeRange type). When this timerange is used, the request is sent to graphite with from and until as epoch timestamps
 2021-02-24 13:16:26 -05:00
Erik SundellUrsula KallioArve Knudsen
 		1b149523ed AWS: Add aws plugin configuration (#31312) 
* add new conf and make sure its passed to frontend

* change auth provider name

* goimports

* fixed after feedback

* more updates after feedback

* Update docs/sources/administration/configuration.md

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

* Update docs/sources/administration/configuration.md

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

* Update docs/sources/administration/configuration.md

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

* Update docs/sources/administration/configuration.md

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

* Update docs/sources/administration/configuration.md

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

* Update conf/sample.ini

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

* Update docs/sources/administration/configuration.md

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

* Update pkg/setting/setting.go

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

* updates after pr feedback

* Update conf/defaults.ini

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

* Update conf/defaults.ini

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

* Update conf/sample.ini

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

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-02-24 18:08:13 +01:00
Erik Sundellachatterjee-grafanaArve KnudsenUrsula Kallio
 		055590890c CloudWatch: Make it possible to specify custom api endpoint (#31402) 
* wip: add endpoint field

* add endpoint to config and make sure it's part of the cache key

* update docs

* improve endpoint paragraph

* Update docs/sources/datasources/cloudwatch.md

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

* Update public/app/plugins/datasource/cloudwatch/components/ConfigEditor.tsx

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

* goimports

* Update docs/sources/datasources/cloudwatch.md

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

* update snapshot

* Update docs/sources/datasources/cloudwatch.md

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

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
 2021-02-24 16:05:14 +01:00
Hugo Häggmark 466462de37 LibraryPanels: Adds permissions to getAllHandler (#31416) 
* LibraryPanels: Adds permissions to getAllHandler

* Chore: adds a test to verify the permissions

* Chore: tests refactor
 2021-02-24 14:06:22 +01:00
Carl Bergquist 5114fa39ce we should never log unhashed tokens (#31432) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2021-02-24 10:04:25 +01:00
ying-jeanneArve KnudsenMarcus Efraimsson
 		c57047a420 Postgres: allow providing TLS/SSL certificates as text in addition to file paths (#30353) 
* postgres SSL certification

* add back the UI to configure SSL Authentication files by file path

* add backend logic

* correct unittest

* mini changes

* Update public/app/plugins/datasource/postgres/config_ctrl.ts

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

* Update public/app/plugins/datasource/postgres/partials/config.html

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

* mutex

* check file exist before remove

* change permission

* change default configuremethod to file-path

* Update public/app/plugins/datasource/postgres/partials/config.html

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

* Update public/app/plugins/datasource/postgres/partials/config.html

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

* Update public/app/plugins/datasource/postgres/partials/config.html

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

* Update public/app/plugins/datasource/postgres/partials/config.html

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

* rename sslconfiguremethod to sslconfigurationmethod

* frontend update

* solve comments

* Postgres: Convert tests to stdlib

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

* Postgres: Be consistent about TLS/SSL terminology

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

* fix init inconsistancy

* Fix tests

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

* naming convention

* Fix tests

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

* Fix tests

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

* Undo change

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

* Fix TLS issue

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>

* change permissions

* Fix data source field names

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

* Clean up HTML

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

* Improve popover text

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

* Fix SSL input bug

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

* Undo unnecessary change

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

* Clean up backend code

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

* Fix build

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

* More consistent naming

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

* Clean up code

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

* Enforce certificate file permissions

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

* add settings

* Undo changes

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

* fix windows file path

* PostgresDataSource: Fix mutex usage

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

* Fix tests

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

* Update pkg/tsdb/postgres/postgres.go

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

* Apply suggestions from code review

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

* fix compilation

* fix unittest

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* mock function

* change kmutex package

* add kmutex into middleware

* lock connection file per datasource

* add unittest regarding concurrency

* version should be equal

* adding unittest

* fix the loop

* fix unitest

* fix postgres unittst

* remove comments

* move dataPath from arg to tlsManager struct field

* Use DecryptedValues method

Use cached decrypted values instead of
using secure json data decrypt which will
decrypt unchanged values over and over again.

* remove unneeded mutex in tests and cleanup tests

* fix the lint

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2021-02-23 22:10:55 +01:00
Ilya Stoliar 19c12b5451 CloudWatch: Added AWS Ground Station metrics and dimensions (#31362) 2021-02-23 20:36:18 +01:00
Gábor Farkas 1e7f2e93e6 InfluxDB: handle columns named "table" (#30985) 
* influxdb: flux: manually calculate table-group-key

* influxdb: flux: added explanation about the group-key
 2021-02-23 16:44:33 +01:00
Ivana Huckova dce67db6ba Prometheus: Use configured HTTP method for /series and /labels endpoints (#31401) 
* Run post-friendly request with set method first

* Improve messaging, retry only when post and specific status code

* Add comments

* Fix backend

* Update public/app/plugins/datasource/prometheus/datasource.ts
 2021-02-23 16:31:03 +01:00
Rafael de Elvira c05cf9fdbb Add new Cloudwatch AWS/DDoSProtection metrics and dimensions (#31297) 2021-02-23 13:50:40 +01:00
Rubycut 833446645a Add eu-south-1 cloudwatch region, closes #31197 (#31198) 2021-02-23 10:42:54 +01:00
Alex KhomenkoandTorkel Ödegaard 6db4b40d5b Data source list: Use Card component (#31326) 
* Replace DataSourcesListItem with Card

* Add tests

* Remove unused styles

* Make card heading semi bold

* Make heading semi-bold

* Show type name instead of type id

* Fix key warning

* Update Card

* Fix tests

* Make typeName optional

* remove styling that was just a test

* Make typeName non-optional and fix tests

* Update list key

Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
 2021-02-22 14:02:10 +02:00
Arve Knudsen 6e549bc95d Chore: Remove gotest.tools dependency (#31391) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-02-22 11:53:15 +01:00
Torkel Ödegaard 3e55c967ee Theming: Support for runtime theme switching and hooks for custom themes (#31301) 
* WIP Custom themes

* Load custom themes from URL and via event

* Dynamic page background

* Header color change

* Fixing tests and emotion warnings

* Fixed test

* moving cx to getStyles

* Review fixes

* minor change
 2021-02-20 09:02:06 +01:00
Leonard Gram fe74c51d68 SAML: single logout only enabled in enterprise (#31325) 2021-02-19 10:00:30 +01:00
Hugo Häggmark 0a4c3b8779 LibraryPanels: Syncs panel title with name (#31311) 2021-02-19 06:05:21 +01:00
Carl Bergquist 95c8766f86 Usagestats: Exclude folders from total dashboard count (#31320) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2021-02-18 15:32:47 +01:00
Levi Harrison e0a6854c36 Correct name of Discord notifier tests (#31277) 2021-02-17 17:24:07 +01:00
Alex KhomenkoandAgnès Toulet c21e45e428 Search: display sort metadata (#31167) 
* Search: display metadata

* Search: update SortPicker icon

* Search: display folder meta data

* Search: reset sort picker on layout change

* Search: align tags in Card component

* Search: replace hyphen with dash

* Search: preserve sort state on layout change

* Search: update tests

* Search: fix tests

* Update pkg/services/search/hits.go

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Update public/app/features/search/components/SearchItem.tsx

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Update public/app/features/search/components/SearchItem.tsx

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Update public/app/features/search/types.ts

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Search: fix type error

* Search: add General folder name and adjust icon margin

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
 2021-02-17 14:06:19 +02:00
Emil Tullstedt a87dd17501 UsageStats: Purpose named variables (#31264) 2021-02-17 10:19:27 +01:00
Marcus Efraimsson 8f20b13f1c Snapshots: Disallow anonymous user to create snapshots (#31263) 2021-02-17 09:51:50 +01:00
Carl Bergquist b5cbbc3db1 only update usagestats every 30min (#31131) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2021-02-17 09:10:36 +01:00
Hugo Häggmark 06e6bcf091 LibraryPanels: Disconnect before connect during dashboard save (#31235) 
* LibraryPanels: Disconnect before connect during dashboard save

* Tests: fixed test

* Chore: updates after PR comments

* Chore: changes from context.Background() to c.Context.Req.Context()

* Chore: fixes lint issue
 2021-02-16 13:00:56 +01:00
Arve Knudsen d27a72f859 IPv6: Support host address configured with enclosing square brackets (#31226) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-02-15 17:55:41 +01:00
Ricky Putra d56c5285e2 Postgres: Fix timeGroup macro converts long intervals to invalid numbers when TimescaleDB is enabled (#31179) 
Fixes #27253
 2021-02-15 17:15:57 +01:00
Dafydd e17198af83 WIP: Skip this call when we skip migrations (#31216) 2021-02-15 12:57:20 +01:00
dependabot[bot]dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>Marcus Efraimsson
 		4f918e37f4 Chore(deps): Bump xorm.io/xorm from 0.8.1 to 0.8.2 (#30773) 
* Chore(deps): Bump xorm.io/xorm from 0.8.1 to 0.8.2

Bumps xorm.io/xorm from 0.8.1 to 0.8.2.

Signed-off-by: dependabot[bot] <support@github.com>

* Fix limit for snapshots

* Fix limit for org and users

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2021-02-15 09:59:39 +01:00
Agnès Toulet 7f1f559929 Permissions: Fix team and role permissions on folders/dashboards not displayed for non Grafana Admin users (#31132) 
* Cfg: fix hidden users initialization

* add tests

* do not call isHiddenUser function for non-user permission

* do not call isHiddenUser function for non-user permission
 2021-02-12 16:08:18 +01:00
Ricky Putra e21f6a29b7 Alerting: Fix so that sending an alert with the Alertmanager notifier doesn't fail when one of multiple configured URL's are down (#31079) 
Fixes behaviour of Notify that returns error when one of the dispatch 
event return error, to maintain high availability, we should return error 
when all dispatched events return error instead.

Fixes #30509
 2021-02-11 15:13:53 +01:00
Torkel ÖdegaardandOscar Kilhed cb5928fdb7 PieChart: Progress on new core pie chart (#28020) 
Use visx for the Pie chart plugin.

Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>
 2021-02-11 14:32:33 +01:00
Arve Knudsen 7394c98d38 MuxWriter: Handle error for already closed file (#31119) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-02-11 10:34:51 +01:00
Domas 5c9a10d423 Logging: sourcemap transform asset urls from CDN in logged stacktraces (#31115) 2021-02-11 11:00:55 +02:00
Agnès TouletandEmil Tullstedt 3303e28b38 Search: add sort information in dashboard results (#30609) 
* Search: add SortMeta in dashboard results

* fix integration tests

* trim SortMeta

* fix searchstore tests

* Update pkg/services/sqlstore/dashboard.go

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2021-02-11 08:49:16 +01:00
Andrej OcenasGiordano RicciIvana Huckova
 		e0448513eb Influx: Make max series limit configurable and show the limiting message if applied (#31025) 
* Add configuration in ConfigEditor and default to 1000

* Show data in explore if any even if there is an error

* Update pkg/tsdb/influxdb/flux/executor.go

* Better handling of defaults

* Add test for runQuery to show data even with error

* Update public/app/store/configureStore.ts

Co-authored-by: Giordano Ricci <gio.ricci@grafana.com>

* Update public/app/plugins/datasource/influxdb/components/ConfigEditor.tsx

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>

* Update tooltip

* Update input

* Lint fixes

* Update snapshots

* Update decorator tests

Co-authored-by: Giordano Ricci <gio.ricci@grafana.com>
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
 2021-02-10 15:23:19 +01:00
Arve Knudsen b99127be82 PluginManager: Remove some global state (#31081) 
* PluginManager: Remove global state

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-02-10 13:31:47 +01:00
Carl Bergquist d1b9fddb4f Usage stats: Adds source/distributor setting (#31039) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2021-02-10 10:07:32 +01:00
Will Browne da3f963987 convert path to posix by default (#31045) 2021-02-09 16:21:45 +01:00
Nutmos 45b9ea7b4e Prometheus: Min step defaults to seconds when no unit is set to prevent errors when running alerts. (#30966) 
* update interval to fix no unit

* fix bug

* update with new method

* format go

* add test

* change test method to add test error nil

* add simplejson and model package

* change json format

* add parentheses

* add simplejson to function

* change mode to model

* move assert import package

* add one enter to avoid goimport error

* change to test case
 2021-02-09 10:23:38 +01:00
Carl Bergquist 49e394e167 instrumentation: make the first database histogram bucket smaller (#30995) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2021-02-08 19:51:48 +01:00
Peter HolmbergSofia PapagiannakiSofia Papagiannaki
 		aaf5710748 AlertingNG: Edit Alert Definition (#30676) 
* break out new and edit

* changed model to match new model in backend

* AlertingNG: API modifications (#30683)

* Fix API consistency

* Change eval alert definition to POST request

* Fix eval endpoint to accept custom now parameter

* Change JSON input property for create/update endpoints

* model adjustments

* set mixed datasource, fix put url

* update snapshots

* remove edit and add landing page

* remove snapshot tests ans snapshots

* wrap linkbutton in array

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Sofia Papagiannaki <sofia@grafana.com>
 2021-02-04 09:13:02 +01:00
Domas 21817055bd Logging: sourcemap support for frontend stacktraces (#30590) 2021-02-04 08:37:28 +02:00
Joan López de la Franca BeltranandLeonard Gram 6415d2802e Plugins: Requests validator (#30445) 
* Introduce PluginRequestValidator abstraction with a NoOp implementation

* Update PluginRequestValidator abstraction to use the dsURL instead

* Inject PluginRequestValidator into the HTTPServer and validate requests going through data source proxy

* Inject PluginRequestValidator into the BackendPluginManager and validate requests going through it

* Validate requests going through QueryMetrics & QueryMetricsV2

* Validate BackendPluginManager health requests

* Fix backend plugins manager tests

* Validate requests going through alerting service

* Fix tests

* fix tests

* goimports

Co-authored-by: Leonard Gram <leo@xlson.com>
 2021-02-03 20:47:45 +01:00
Ash CaireSofia PapagiannakiDiana PaytonArve Knudsen
 		4ed283e7bf Alerting: Customise OK notification priorities for Pushover notifier (#30169) 
* pushover: Customise OK notification priorities

* Apply suggestions from code review

* Fix build failure

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

* Update pkg/services/alerting/notifiers/pushover.go

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

* Update docs

* Apply suggestions from code review

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

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2021-02-03 10:57:18 +02:00
Torkel Ödegaard 64254eaa82 CDN: Fixes cdn path when Grafana is under sub path (#30822) 2021-02-02 12:34:59 +01:00