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
15,268 Commits 5,454 Branches 554 Tags 1.9 GiB
1bb5a57036
Commit Graph

15268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Kaltschmidt
02427ef88d Explore: calculate query interval based on available width 
- classic dashboard panels inject a dynamic query interval as part of
  the query options. Explore did not have that.
- this PR adds the interval calculation to Explore
- interval based on Explore container's width
- ensure min interval if set in datasource
 2018-07-17 15:13:44 +02:00
David Kaltschmidt
c6e9ffb168 Use url params for explore state 
- putting state in the path components led to 400 on reload
- use `/explore?state=JSON` instead
 2018-07-17 12:56:05 +02:00
David Kaltschmidt
f67b27e009 Dont parse empty explore state from url 
- only parse url state if there is any
- prevents parse exception in the console on empty explore state
 2018-07-17 12:24:04 +02:00
Torkel Ödegaard
e318489bd4
Fix default browser th font-weight 2018-07-17 11:56:33 +02:00
Daniel Lee
8ff055b1d5
Merge pull request #12624 from calebtote/patch-1 
Adding eval_data to alerts query results
 2018-07-17 10:23:08 +02:00
Caleb Tote
10aaf7b506
Adding eval_data to alerts query results 2018-07-16 12:38:42 -04:00
Torkel Ödegaard
c189262bac ldap: Make it possible to define Grafana admins via ldap setup, closes #2469 2018-07-16 16:56:42 +02:00
Daniel Lee
a1f0dffe01 nginx: update to docker block 
Adds commented out settings in nginx conf
for testing basic auth and auth proxy
 2018-07-16 15:09:42 +02:00
Torkel Ödegaard
f0508aa526 Merge branch 'master' of github.com:grafana/grafana 2018-07-16 13:52:34 +02:00
David Kaltschmidt
1f74b298c4 Remove string casting for template variables in prometheus 2018-07-16 13:02:36 +02:00
Daniel Lee
0b210a6f5d ldap: docker block readme update 2018-07-16 12:47:22 +02:00
David Kaltschmidt
1efe34e6cf Make prometheus value formatting more robust 
- prometheus datasources passes its own interpolator function to the
  template server
- that function relies on incoming values being strings
- some template variables may be non-strings, e.g., `__interval_ms`,
  which throws an error

This PR makes this more robust.
 2018-07-16 12:40:55 +02:00
Torkel Ödegaard
09c3569caa
Update README.md 2018-07-16 12:36:35 +02:00
Torkel Ödegaard
c6bcf13d78
Devenv testdata dashboards (#12615) 
* devenv: working on dev env setup & dashboards

* devenv: refactored testdata app to a built in datasource instead, and moved dashboards to a devenv provisioned dashboards
 2018-07-16 03:12:13 -07:00
David
a13b4f2b3f
Merge pull request #12596 from grafana/davkal/explore-datasource-selector 
Explore Datasource selector
 2018-07-16 11:13:29 +02:00
Torkel Ödegaard
2dd60f78d9 devenv: working on dev env setup & dashboards 2018-07-16 10:53:41 +02:00
David Kaltschmidt
eb2abe800b Reverted $q to Promise migration in datasource_srv 2018-07-13 22:28:14 +02:00
Mark Meyer
0f6e5e2953 Allow settting of default org id to auto-assign to (#12401) 
Author:    Mark Meyer <mark@ofosos.org>
 2018-07-13 12:14:40 -07:00
Tobias Skarhed
7ae844518c Remove unused SASS variables (#12603) 
* Comment out unused vars

* Remove unused sass vars
 2018-07-13 12:10:09 -07:00
Torkel Ödegaard
964620c38c
fix: panel embedd scrolbar fix, fixes #12589 (#12595) 2018-07-13 05:07:04 -07:00
David Kaltschmidt
390090da05 Set datasource in deep links to Explore 2018-07-13 09:45:56 +02:00
David Kaltschmidt
d06b26de26 Explore Datasource selector 
Adds a datasource selector to the Explore UI. Only datasource plugins
that have `explore: true` in their `plugin.json` can be selected.

- adds datasource selector (based on react-select) to explore UI
- adds getExploreSources to datasource service
- new `explore` flag in datasource plugins model
- Prometheus plugin enabled explore
 2018-07-13 09:09:36 +02:00
Shane
756c08e713 changed you to your (#12590) 2018-07-12 23:56:37 -07:00
David
64c77febef
Merge pull request #12586 from dehrax/12075-iframe-scroll 
Prevent scroll on focus for iframe
 2018-07-12 16:10:06 +02:00
Tobias Skarhed
7361d352bf Add comments 2018-07-12 15:38:41 +02:00
David
030d06331f
Merge pull request #12585 from grafana/davkal/fix-plugin-css-loader-2 
Fix freezing browser when loading plugin
 2018-07-12 14:51:45 +02:00
David Kaltschmidt
81e62e1051 Fix freezing browser when loading plugin 
- broken since 4d2dd2209
- `*` was previously working as a path matcher, but freezes browser when
  used with new cache-busting plugin loader
- changed matcher to be `/*`
 2018-07-12 13:16:41 +02:00
Mitsuhiro Tanda
9b50c9038b skip backend request if extended statistics is invalid. (#12495) 
* check extended statistics pattern

* check extended statistics pattern

* Revert "check extended statistics pattern"

This reverts commit 52c7b1a972636d5f5729e64ae5e00e6fae329257.

* add test

* fix test
 2018-07-11 11:23:38 -07:00
Torkel Ödegaard
c03764ff8a
Refactor team pages to react & design change (#12574) 
* Rewriting team pages in react

* teams to react progress

* teams: getting team by id returns same DTO as search, needed for AvatarUrl

* teams: progress on new team pages

* fix: team test

* listing team members and removing team members now works

* teams: team member page now works

* ux: fixed adding team member issue

* refactoring TeamPicker to conform to react coding styles better

* teams: very close to being done with team page rewrite

* minor style tweak

* ux: polish to team pages

* feature: team pages in react & everything working

* fix: removed flickering when changing tabs by always rendering PageHeader
 2018-07-11 11:23:07 -07:00
Mitsuhiro Tanda
18a8290c65 (prometheus) prevent error to use $__interval_ms in query (#12533) 
* prevent error to use $__interval_ms in query

* add test

* prevent error to use $__interval_ms in query
 2018-07-11 11:13:47 -07:00
Torkel Ödegaard
b4e0ace7a2
fix: folder picker did not notify parent that the initial folder had been changed, fixes #12543 (#12554) 2018-07-11 10:58:06 -07:00
Łukasz Gryglicki
24f395f986 Add support for skipping variable value in URL, fixes #12174 (#12541) 
* New rebase

Signed-off-by: Lukasz Gryglicki <lukaszgryglicki@o2.pl>

* Lint

Signed-off-by: Lukasz Gryglicki <lukaszgryglicki@o2.pl>
 2018-07-11 10:06:36 -07:00
Torkel Ödegaard
2c22a7b4ba
Don't build-all for PRs 2018-07-11 13:31:34 +02:00
Rollulus Rouloul
2fbf2bba4e fix: requests/sec instead of requets (#12557) 2018-07-11 03:33:19 -07:00
Tobias Skarhed
cfa555b569 Add folder name to dashboard title (#12545) 
* Add folder name to dashboard title. No display on medium displays and below

* Compare folderId instead

* folderId bigger than 0
 2018-07-11 03:31:07 -07:00
David
4d2dd22095 Fix css loading in plugins (#12573) 
- allow css loader to be imported again (wasnt prefixed by plugin)
 2018-07-11 03:29:19 -07:00
Tobias Skarhed
4ee4ca99be Prevent scroll on focus for iframe 2018-07-10 12:54:45 +02:00
Dominic Smith
5578097210 Add new sequential color scales 
* Add new sequential color scales

* Simplify inversion logic
 2018-07-10 12:17:55 +03:00
David
9595f992b9
Merge pull request #12496 from dehrax/12224-prostgres-ds 
Karma to Jest: 3 data sources
 2018-07-10 11:13:44 +02:00
yogy rahmawan
8b32dc5847 move go vet out of scripts and fixing warning (#12552) 2018-07-09 23:25:32 -07:00
Tobias Skarhed
e51f208a49 Cleanup and remove some jest.fn() 2018-07-09 15:42:34 +02:00
Tobias Skarhed
6670acd082 Remove irrelevant tests and templateSrv stub 2018-07-09 12:52:56 +02:00
David
25bcdbcab1
Merge pull request #12284 from grafana/davkal/queryfield-refactor 
Query field refactorings to support external plugins
 2018-07-09 11:29:59 +02:00
Torkel Ödegaard
5a925461f1
Update CHANGELOG.md 2018-07-09 07:00:11 +02:00
Jesse Tane
677117fb03 fix diff and percent_diff (#12515) 
* make diff and percent_diff tests more realistic

* fix diff and percent_diff

* include @marefr's additional tests
 2018-07-08 21:58:34 -07:00
Mitsuhiro Tanda
77220456b6 improve error message 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda
4c59be4f5b generate unique id when variable is multi 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda
40ed235b3b support GetMetricData 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda
077cf9a343 dep ensure 2018-07-09 13:11:50 +09:00
Mitsuhiro Tanda
664944980a update aws-sdk-go 2018-07-09 13:11:49 +09:00