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
bergquist 0cfdebf0a2 Merge remote-tracking branch 'fork/bus_multi_dispatch' into alerting_reminder 
* fork/bus_multi_dispatch:
  sql: adds tests for InTransaction
  bus: noop should still execute fn
  removes unused code
  bus: Dispatch now passes empty ctx if handler require it
  bus: dont start transaction when creating session
  bus: dont mix ctx/classic handlers
  bus: DispatchCtx can now invoke any handler
  refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203
  refactoring: transaction manager PR #12203
  fixes typo in code
  check if admin exists or create one in one transaction
  replace begin/end with wrapper function
  bus: support multiple dispatch in one transaction
 2018-06-15 13:17:24 +02:00
bergquist 4be6ef4ab3 changelog: adds note about closing #12286 2018-06-15 12:47:53 +02:00
bergquist 09e71e00a3 sql: adds tests for InTransaction 2018-06-15 12:46:20 +02:00
bergquist 03dae10e79 bus: noop should still execute fn 2018-06-15 12:46:20 +02:00
bergquist a3ee778ddb removes unused code 2018-06-15 12:46:20 +02:00
bergquist 9c1758b593 bus: Dispatch now passes empty ctx if handler require it 2018-06-15 12:46:20 +02:00
bergquist 9ca9a7c302 bus: dont start transaction when creating session 2018-06-15 12:46:20 +02:00
bergquist 629eab0b1e bus: dont mix ctx/classic handlers 2018-06-15 12:46:20 +02:00
bergquist e2275701d8 bus: DispatchCtx can now invoke any handler 2018-06-15 12:46:20 +02:00
Torkel Ödegaard 5af0b924ff refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203 2018-06-15 12:46:20 +02:00
Torkel Ödegaard 442e0e437b refactoring: transaction manager PR #12203 2018-06-15 12:46:20 +02:00
bergquist 6775a82c82 fixes typo in code 2018-06-15 12:46:20 +02:00
bergquist 1bd31aa313 check if admin exists or create one in one transaction 2018-06-15 12:46:20 +02:00
bergquist 263572813a replace begin/end with wrapper function 2018-06-15 12:46:20 +02:00
bergquist 8143610024 bus: support multiple dispatch in one transaction 
this makes it possible to run multiple DispatchCtx
in one transaction. The TransactionManager will
start/end the transaction and pass the dbsession
in the context.Context variable
 2018-06-15 12:46:20 +02:00
bergquist 6cd83e182a Merge branch 'master' into alerting_reminder 
* master: (84 commits)
  docs: adds info about grafana-dev container
  changelog: add notes about closing #12282
  Added Litre/min and milliLitre/min in Flow (#12282)
  remove papaparse dependency
  list name is deleteDatasources, not delete_datasources
  remove internal influx ifql datasource
  Document the endpoint for deleting an org
  tests: rewrite into table tests
  influxdb: adds mode func to backend
  changelog: add notes about closing #11484
  changelog: add notes about closing #11233
  Remove import
  Fix PR feedback
  Removed papaparse from external plugin exports
  Karma to Jest: query_builder
  dsproxy: move http client variable back
  Karma to Jest: threshold_mapper
  Expose react and slate to external plugins
  Karma to Jest: threshold_manager
  Karma to Jest: query_def, index_pattern
  ...
 2018-06-15 12:45:35 +02:00
Carl Bergquist e33d18701d Merge pull request #12287 from bergquist/fix_12286 
Influxdb: add mode functions
 2018-06-15 12:43:47 +02:00
Marcus Efraimsson f0254c201a Merge pull request #12215 from ryantxu/use-ng-if-for-time 
use ng-if for the panel timeInfo
 2018-06-15 12:16:48 +02:00
Marcus Efraimsson a02306bc75 Merge pull request #12295 from bergquist/docker_master 
docs: adds info about grafana-dev container
 2018-06-15 11:32:24 +02:00
bergquist 10d840b1cc docs: adds info about grafana-dev container 2018-06-15 11:07:23 +02:00
Marcus Efraimsson 551957fc4d changelog: add notes about closing #12282 
[skip ci]
 2018-06-15 10:57:19 +02:00
flopp999 2d1f59a9cc Added Litre/min and milliLitre/min in Flow (#12282) 
units: Litre/min and milliLitre/min in Flow
 2018-06-15 10:54:38 +02:00
Marcus Efraimsson 5f78ad583f remove papaparse dependency 2018-06-15 10:49:57 +02:00
Marcus Efraimsson 22c7c741eb Merge pull request #12252 from grafana/davkal/ifql-query 
Internal Influx Flux plugin cleanup
 2018-06-15 10:43:34 +02:00
Marcus Efraimsson b62322b128 Merge pull request #12288 from mlclmj/master 
docs: HTTP Endpoint for Deleting an Organization
 2018-06-15 10:37:51 +02:00
Marcus Efraimsson 96287a9061 Merge pull request #12294 from vincent-fuchs/patch-1 
docs: delete_datasources -> deleteDatasources in provisioning
 2018-06-15 10:33:03 +02:00
Vincent Fuchs c8becf57fa list name is deleteDatasources, not delete_datasources 
fixes https://github.com/grafana/grafana/issues/12293
 2018-06-15 12:19:53 +05:30
David Kaltschmidt d5196ab322 remove internal influx ifql datasource 2018-06-14 20:42:33 +01:00
Malcolm Jones 2765afc830 Document the endpoint for deleting an org 2018-06-14 15:28:54 -04:00
bergquist c63533f004 tests: rewrite into table tests 2018-06-14 20:33:36 +02:00
bergquist bf4ee9bcc6 influxdb: adds mode func to backend 
closes #12286
 2018-06-14 20:33:22 +02:00
Marcus Efraimsson 56628996b7 Merge pull request #12280 from dehrax/12224-elastic-response 
karma to jest: 6 test files
 2018-06-14 17:24:36 +02:00
David Kaltschmidt a9e1e5f346 Fix queryfield wrapper css 2018-06-14 16:20:48 +01:00
David Kaltschmidt bbe6ab5096 Fix Queryfield metrics field missing 2018-06-14 16:20:33 +01:00
David Kaltschmidt b2f497b100 batch DOM reads from query field typeahead 2018-06-14 16:20:21 +01:00
David Kaltschmidt 73ddf2c3ed hint support for typeahead 2018-06-14 16:20:09 +01:00
David Kaltschmidt 2ebda4bf4d Make suggestions an object 2018-06-14 16:19:55 +01:00
David Kaltschmidt 4113f7db47 Trigger typeahead on Ctrl-Space 2018-06-14 16:19:43 +01:00
David Kaltschmidt 0425b47791 refactor Explore query field 2018-06-14 16:19:29 +01:00
Marcus Efraimsson 0107491195 changelog: add notes about closing #11484 
[skip ci]
 2018-06-14 15:59:31 +02:00
Marcus Efraimsson 81d34137a8 Merge pull request #11484 from manacker/master 
alerting: fix mobile notifications for microsoft teams notifier
 2018-06-14 15:56:18 +02:00
Marcus Efraimsson e6135ffd4f changelog: add notes about closing #11233 
[skip ci]
 2018-06-14 15:39:32 +02:00
Marcus Efraimsson 9dd38031e4 Merge pull request #11233 from flopp999/patch-2 
units: W/m2(energy), l/h(flow) and kPa(pressure)
 2018-06-14 15:36:38 +02:00
Tobias Skarhed dbbd6b9b66 Remove import 2018-06-14 15:27:11 +02:00
Marcus Efraimsson 1626a66bab Merge pull request #12275 from dehrax/12224-exporter 
karma to jest: exporter, playlist_edit_ctrl
 2018-06-14 15:10:06 +02:00
Marcus Efraimsson 25e1d723c6 Merge pull request #12276 from grafana/davkal/expose-react-slate 
Expose react and slate to external plugins
 2018-06-14 14:41:30 +02:00
Tobias Skarhed 23abf044ff Fix PR feedback 2018-06-14 14:37:48 +02:00
David Kaltschmidt 5ec7d60e5f Removed papaparse from external plugin exports 2018-06-14 13:22:16 +01:00
Tobias Skarhed ef0586acab Karma to Jest: query_builder 2018-06-14 14:20:42 +02:00
Marcus Efraimsson 284045748c Merge pull request #12243 from grafana/12236-ds-proxy-tokens 
dsproxy: allow multiple access tokens per datasource
 2018-06-14 14:03:08 +02:00