public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,224 Commits 655 Branches 650 Tags
1c4dd6f2f7ca4a4eac3ea5a66fe0eee7ec0d23d6
Commit Graph
15224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcus Efraimsson 1c4dd6f2f7 Merge pull request #12702 from dehrax/12224-influx-query-ctrl 
Karma to Jest: influx query_ctrl
 2018-07-24 16:58:01 +02:00
Marcus Efraimsson 04c91601a4 Merge pull request #12699 from grafana/docs-reloading-configs 
docs: mentation that config changes requires restart.
 2018-07-24 16:47:18 +02:00
Marcus Efraimsson 5de8b6c2f0 changelog: add notes about closing #12489 
[skip ci]
 2018-07-24 16:45:36 +02:00
Marcus Efraimsson e921f3b673 Merge pull request #12698 from mtanda/cw_400_err 
CloudWatch backend return 400 if user input error
 2018-07-24 16:43:22 +02:00
Marcus Efraimsson a63fca03b8 changelog: add notes about closing #12551 
[skip ci]
 2018-07-24 15:57:07 +02:00
Marcus Efraimsson 1c691ac855 changelog: add notes about closing #12533 
[skip ci]
 2018-07-24 15:51:34 +02:00
Marcus Efraimsson 3dab4e1b52 changelog: add notes about closing #12589 
[skip ci]
 2018-07-24 15:27:13 +02:00
Marcus Efraimsson b81621b6f5 changelog: add notes about closing #12636 #9827 
[skip ci]
 2018-07-24 15:24:44 +02:00
Tobias Skarhed 48ae9ec77e Remove comments and Karm test 2018-07-24 14:35:37 +02:00
Tobias Skarhed 987a16086b Karma to Jest 2018-07-24 14:34:37 +02:00
Tobias Skarhed 81c32780b9 Pass more tests 2018-07-24 11:27:53 +02:00
Marcus Efraimsson 35efb7c225 changelog: add notes about closing #12644 
[skip ci]
 2018-07-24 11:26:09 +02:00
Marcus Efraimsson 05da21c6d7 Merge pull request #12678 from yogyrahmawan/escape_postgres_parameters 
postgres; escape ssl mode parameter
 2018-07-24 11:15:21 +02:00
Marcus Efraimsson 93e73919e8 fix code style 2018-07-24 11:03:46 +02:00
Leonard Gram 59c1705399 docs: mentation that config changes requires restart. 2018-07-24 10:34:11 +02:00
Mitsuhiro Tanda d9bf894383 return 400 if user input error 2018-07-24 17:06:55 +09:00
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
Tobias Skarhed bb0af52d34 Figuring out why it doesn't initialize 2018-07-23 14:54:58 +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 46e31621b0 Add jest file 2018-07-23 14:28:17 +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
yogyrahmawan 26aa575cb4 escaping ssl mode on postgres param 2018-07-22 08:04:57 +07: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