public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,246 Commits 655 Branches 650 Tags
61ba4eeb8cb3bbfd3e722c729c681e37566dcfae
Commit Graph

5867 Commits

Author SHA1 Message Date
Daniel Lee 719ebdc24d dsproxy: allow multiple access tokens per datasource 
Changes the cache key for tokens to cache on datasource id +
route path + http method instead of just datasource id.
 2018-06-12 17:39:38 +02:00
Marcus Efraimsson 3fb4eb7322 Merge pull request #12175 from grafana/davkal/12168-fix-explore-setting 
Respect explore settings in config ini
 2018-06-07 12:08:42 +02:00
bergquist 4a8e9cf93f removes more unused code 2018-06-07 07:15:50 +02:00
bergquist 850aa21d45 removes unused code 2018-06-07 07:06:13 +02:00
bergquist f93d83befe adds missing return statement 2018-06-06 22:17:19 +02:00
Sławek Piotrowski 9db964bf35 Fix typo: eleasticsearch -> elasticsearch (#12184) 2018-06-06 13:09:16 -07:00
Alexander Zobnin 9460063ab5 show import menu in sidenav, dashboard search and manage dashboards page 
if user has editor permissions for at least one folder
 2018-06-06 13:55:00 +03:00
David Kaltschmidt 661503f828 Respect explore settings in config ini 
Previous explore restrictions only took permissions into consideration.

* add `exploreEnabled` to global settings
* only bind `x` if enabled
* only show explore in panel menu if enabled
 2018-06-06 10:50:47 +02:00
Alexander Zobnin 4063ae37a4 dashboard: import to folder 2018-06-05 19:23:09 +03:00
bergquist 171a38df99 alerting: fixes broken table rename 2018-06-05 14:29:48 +02:00
David 45a156577c Merge pull request #12143 from grafana/davkal/ifql-datasource 
InfluxDB IFQL datasource (beta)
 2018-06-05 14:23:21 +02:00
bergquist ab70ead5e4 alerting: renames journal table to alert_notification_journal 2018-06-05 13:10:38 +02:00
bergquist bcbae7aa62 alerting: move queries from evalcontext to notifier base 2018-06-05 12:07:02 +02:00
bergquist 7333d7b8d4 alerting: invert sendOnce to sendReminder 2018-06-05 10:44:17 +02:00
bergquist 0c6d8398a1 alerting: remove zero units from duration 2018-06-05 08:42:39 +02:00
bergquist 93124f38fa alerting: only check frequency when not send once 2018-06-04 22:19:27 +02:00
Marcus Efraimsson 962f996799 always show server admin link in sidenav if grafana admin 2018-06-04 19:28:01 +02:00
bergquist 0e647db485 Merge branch 'master' into alerting_reminder 
* master: (30 commits)
  changelog: add notes about closing #11882
  renamed variable in tests
  added comment, variableChange -> variableValueChange
  added a test
  added if to check if new variable has been added
  Gravatar fallback does not respect 'AppSubUrl'-setting (#12149)
  change admin password after first login
  changelog: adds note about closing #11958
  revert: reverted singlestat panel position change PR #12004
  Revert "provisioning: turn relative symlinked path into absolut paths"
  provisioning: turn relative symlinked path into absolut paths
  changelog: adds note about closing #11670
  elasticsearch: sort bucket keys to fix issue wth response parser tests
  docs: what's new in v5.2
  changelog: add notes about closing #11167
  docs: docker secrets support. (#12141)
  alerting: show alerts for user with Viewer role
  datasource: added option no-direct-access to ds-http-settings diretive, closes #12138
  provisioning: adds fallback if evalsymlink/abs fails
  tests: uses different paths depending on os
  ...
 2018-06-04 17:44:18 +02:00
bergquist 86e65f84f9 alerting: fixes invalid error handling 2018-06-04 17:30:57 +02:00
pari- 9680a3d44d Gravatar fallback does not respect 'AppSubUrl'-setting (#12149) 
Closes #12148
 2018-06-04 16:03:59 +02:00
David b5c53aae97 Merge pull request #12108 from grafana/davkal/12001-explore-permissions 
Restrict Explore UI to Editor and Admin roles
 2018-06-04 16:01:39 +02:00
Carl Bergquist 7214ee9024 Merge pull request #12007 from bergquist/provisioning_symlinked_folders 
Add support for symlinked folders in dashboard provisioning
 2018-06-04 16:00:32 +02:00
bergquist cd4026da6b Revert "provisioning: turn relative symlinked path into absolut paths" 
This reverts commit d089b5e05d.
 2018-06-04 15:38:37 +02:00
bergquist d089b5e05d provisioning: turn relative symlinked path into absolut paths 2018-06-04 15:20:26 +02:00
Marcus Efraimsson 38906acda9 elasticsearch: sort bucket keys to fix issue wth response parser tests 2018-06-04 15:15:47 +02:00
Carl Bergquist 49d9235433 Merge pull request #12122 from grafana/provisioning_ha 
Support provisioning in HA setup where modtime differs
 2018-06-04 15:12:46 +02:00
John Baublitz bdf433594a Implement code review changes 2018-06-04 13:19:14 +02:00
John Baublitz 5c5951bc42 Bug fix for repeated alerting even on OK state and add notification_journal cleanup when alert resolves 2018-06-04 13:19:14 +02:00
John Baublitz c0a9e5cf1d Fix tests 2018-06-04 13:19:14 +02:00
John Baublitz fca97535d1 Fix multiple bugs 2018-06-04 13:19:14 +02:00
John Baublitz 3cb0e27e1c Revert changes post code review and move them to notification page 2018-06-04 13:19:14 +02:00
John Baublitz e068be4c26 Feature for repeated alerting in grafana 2018-06-04 13:19:13 +02:00
David Kaltschmidt 08ee1da6b1 InfluxDB IFQL datasource 2018-06-04 12:24:47 +02:00
Alexander Zobnin 13c6f37ea5 alerting: show alerts for user with Viewer role 
changelog: add notes about closing #11167

remove changelog note

reformat alert_test.go
 2018-06-04 12:34:30 +03:00
bergquist f606654c50 provisioning: adds fallback if evalsymlink/abs fails 2018-06-04 09:04:33 +02:00
bergquist 3f5078339c tests: uses different paths depending on os 2018-06-04 08:27:03 +02:00
bergquist 75ee1e9208 renames intervalSeconds to updateIntervalSeconds 2018-06-04 08:13:20 +02:00
Marcus Efraimsson b6afe5f2e8 Merge pull request #11380 from WPH95/feature/add_es_alerting 
elasticsearch: alerting support
 2018-06-01 15:17:28 +02:00
Patrick O'Carroll 0c269d64d0 Alert panel filters (#11712) 
alert list panel: filter alerts by name, dashboard, folder, tags
 2018-06-01 14:36:40 +02:00
bergquist 333af6fd9b provisioning: makes the interval for polling for changes configurable 2018-05-31 21:07:34 +02:00
bergquist c817aecd66 provisioning: only update dashboard if hash of json changed 2018-05-31 21:05:52 +02:00
Marcus Efraimsson b8ff3b1e3f remove dead code 2018-05-31 19:05:32 +02:00
Marcus Efraimsson dcac63936b elasticsearch: minor refactor 
Handle all replacements if interval template variables in the client.
Fix issue with client and different versions.
Adds better tests of the client
 2018-05-31 19:02:20 +02:00
Marcus Efraimsson 28f0acd854 Merge branch 'master' into feature/add_es_alerting 2018-05-31 16:33:07 +02:00
bergquist 44f5b92fbc provisioning: only provision if json file is newer then db 2018-05-31 11:38:29 +02:00
David Kaltschmidt 0c45ee63a9 Guard /explore by editor role on the backend 2018-05-31 11:26:24 +02:00
bergquist 2bd4c14e5f make path absolute before following symlink 2018-05-31 09:53:15 +02:00
bergquist 47d3884377 provisioning: follow symlinked folders 
fixes #11958
 2018-05-31 09:38:09 +02:00
bergquist d5aeae3a90 test: fixes broken test on windows 2018-05-31 08:27:29 +02:00
Carl Bergquist 5c30643f6e Merge pull request #12101 from bergquist/devenv 
devenv: initial scripts for setting up devenv
 2018-05-30 21:49:17 +02:00