IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-16 18:34:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
15,205 Commits 5,454 Branches 554 Tags 1.9 GiB
4d722b2177
Commit Graph

15205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David
4d722b2177
Merge pull request #12675 from grafana/davkal/logging-datasource 
Datasource for Grafana logging platform
 2018-07-23 18:11:11 +02:00
srid12
6b071054a3 changing callback fn into arrow functions for correct usage of this (#12673) 2018-07-23 07:23:26 -07:00
Marcus Efraimsson
a17a9218da
Merge pull request #12692 from dehrax/12224-graph-ctrl 
Karma to Jest: graph_ctrl
 2018-07-23 15:53:41 +02:00
Tobias Skarhed
47bec0fd91 Fix requested changes 2018-07-23 15:42:47 +02:00
David
76bc02b3fa
Update CHANGELOG.md 
Added #12597
 2018-07-23 14:58:11 +02:00
David
b09a7c5dd6
Merge pull request #12597 from dehrax/7664-query-var 
Interval and range in query template variable
 2018-07-23 14:48:49 +02:00
Tobias Skarhed
6b6a23ff6a Add support for interval in query variable 
Add range to scopedVars

Add basic tests and extract function for range vars

Add support for range query variable in createQuery

Template vars squash
 2018-07-23 14:33:21 +02:00
Tobias Skarhed
529883b61d Change to arrow functions 2018-07-23 13:39:32 +02:00
Tobias Skarhed
ed8568f0df Add graph_ctrl jest 2018-07-23 13:38:16 +02:00
Marcus Efraimsson
0fa98a812b
changelog: add notes about closing #12691 
[skip ci]
 2018-07-23 13:13:18 +02:00
Marcus Efraimsson
c26b9a49ad
Merge pull request #12691 from mwegrzynek/add-pln-format 
Add Polish złoty to currency formatters
 2018-07-23 13:10:12 +02:00
Michał Węgrzynek
ee2eda615e
Update kbn.ts 2018-07-23 12:07:54 +02:00
Marcus Efraimsson
d7401a9f8a
Merge pull request #12690 from mtanda/cw_get_metricdata_input_validation 
Id validation of CloudWatch GetMetricData
 2018-07-23 11:48:01 +02:00
Tobias Skarhed
ae935bf08b Add jest test file 2018-07-23 11:31:04 +02:00
Marcus Efraimsson
dde484be60
Merge pull request #11469 from grafana/jquery-flot-events-to-ts 
migrated jquery.flot.events to ts
 2018-07-23 11:20:50 +02:00
Marcus Efraimsson
608303f4ce
Merge branch 'master' into jquery-flot-events-to-ts 2018-07-23 10:59:25 +02:00
Mitsuhiro Tanda
fb4546b811 Id validation of CloudWatch GetMetricData 2018-07-23 17:58:54 +09:00
Daniel Lee
34a8864601 changelog: adds note for #11487 2018-07-22 21:52:26 +02:00
Daniel Lee
5129ea8f87
Merge pull request #11624 from mtanda/cw_get_metric_data 
CloudWatch GetMetricData support
 2018-07-22 21:34:07 +02:00
David Kaltschmidt
3297ae462d Datasource for Grafana logging platform 
- new builtin datasource plugin "Logging" (likely going to be renamed)
- plugin implements no panel ctrls yet, only ships datasource
- new models for logging data as first class citizen (aside from table
  and time_series model)
- Logs as new view for Explore
- JSON view for development

Testable only against existing logish deployment.
Then test with queries like `{job="..."} regexp`.
 2018-07-20 17:07:17 +02:00
David
bfd05ba6ec
Merge pull request #12617 from grafana/davkal/prometheus-value-formatting 
Make prometheus value formatting more robust
 2018-07-18 17:11:16 +02:00
Torkel Ödegaard
e413f026b9
fix: postgres/mysql engine cache was not being used, fixes #12636 (#12642) 2018-07-18 07:21:32 -07:00
Torkel Ödegaard
ce64a3ccbc added: replaces added to grafana 2018-07-18 15:40:30 +02:00
Torkel Ödegaard
a4587cdeee fix: datasource search was not working properly 2018-07-18 14:28:38 +02:00
Torkel Ödegaard
29291f88b1 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 13:20:56 +02:00
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
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