public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 913b8576f8 docs: minor docs fix 2018-07-18 13:20:28 +02:00
David Kaltschmidt 3ab5ab3674 Fix label suggestions in Explore query field 
- In 0425b477 the labels suggestions were refactored and a typo broke
  the look up for available lables of a metric
 2018-07-18 13:20:18 +02:00
Torkel Ödegaard 3fa2ec0762 Merge branch 'ldap-grafana-admin' 2018-07-18 13:02:49 +02:00
Torkel Ödegaard c63f142578 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 13:02:27 +02:00
Torkel Ödegaard 660dc09fa9 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 12:46:42 +02:00
Daniel Lee 3cb95fb40a pluginloader: expose flot gauge plugin 2018-07-18 12:05:45 +02:00
Daniel Lee f5cc7618c5 alert: add missing test after refactor 2018-07-17 22:17:43 +02:00
Jakob van Santen 92d417f6b4 Handle query string in storage public_url (#9351) (#12555) 2018-07-17 11:10:12 -07:00
David 21e5d61de6 Merge pull request #12631 from grafana/davkal/explore-url-encoding 
Use url params for explore state
 2018-07-17 16:49:13 +02:00
David 5c6adbbada Merge pull request #12630 from grafana/davkal/explore-empty-error 
Dont parse empty explore state from url
 2018-07-17 16:48:23 +02:00
Augustin 05e060dee0 HTTP API documentation +fix when updating a playlist (#12612) 
* get id from path param when updating a playlist

* add playlist http api documentation

* remove required condition for the id in update cmd
 2018-07-17 07:45:38 -07:00
David b526150578 Merge pull request #12634 from grafana/davkal/explore-step 
Explore: calculate query interval based on available width
 2018-07-17 16:36:51 +02:00
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 4e089229fb minor fix for legacy panels 2018-07-16 14:56:40 +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
Sven Klemm 0e608a08c2 fix test for query generation 2018-07-15 22:58:25 +02:00
Sven Klemm 7f348f3836 dont run queries if target has no table set 2018-07-15 22:27:33 +02:00
Sven Klemm 43686616a0 add query to find metric table 2018-07-15 22:26:32 +02:00
Sven Klemm b49d10104e add popover for metric column 2018-07-15 19:13:19 +02:00
Sven Klemm b28bf1a4f9 rename PostgresQueryBuilder to PostgresMetaQuery 2018-07-15 17:12:03 +02:00
Sven Klemm 070b556fd3 dont expand variables in rawSql 2018-07-15 17:02:26 +02:00
Sven Klemm 2fcb09b23d filter datatype for groupby suggestions 2018-07-15 16:23:47 +02:00
Sven Klemm 6e824e81bf fix rate special function when using group by 2018-07-15 15:14:12 +02:00
Sven Klemm c3c20ef2e2 remove unused import 2018-07-15 12:52:00 +02:00
Sven Klemm f85c9c012e refactor adding sqlPart 2018-07-15 12:26:22 +02:00
Sven Klemm f48060a1bb remove render code from sql_part 2018-07-15 09:53:22 +02:00
Sven Klemm d9648f1fe7 fix bug in query generation with metricColumn 2018-07-15 09:43:38 +02:00
Sven Klemm fa66645b0f refactor PostgresQuery 2018-07-15 09:36:49 +02:00
Sven Klemm 844beb660d refactor PostgresQueryCtrl 2018-07-14 21:00:06 +02:00
Sven Klemm d7ed706e12 refactor PostgresQueryCtrl and PostgresQuery 2018-07-14 20:28:34 +02:00
Sven Klemm 2dc9d4e960 refactor addGroupBy and removeGroupByPart 2018-07-14 16:46:53 +02:00
Sven Klemm 569a8567f9 use let for variable declaration 2018-07-14 11:32:00 +02:00
Sven Klemm d0c2b19c51 Add templateSrv to PostgresQuery tests 2018-07-14 11:05:35 +02:00
Sven Klemm b745fab190 add tests for query generation 2018-07-13 22:29:10 +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