public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,884 Commits 655 Branches 650 Tags
29fcc463336f7f0e00e94de6fe1cc6350c4eb0da
Commit Graph
38884 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Sundell ec68c65660 flatten target obj 2018-12-20 11:00:16 +01:00
Pavel c041bf2488 Merge pull request #4 from grafana/master 
Update master
 2018-12-20 11:57:39 +02:00
Torkel Ödegaard f089c7ee5e Grafana ui library poc 2018-12-20 09:25:04 +01:00
Marcus Efraimsson b45f72a140 elasticsearch: support bucket script pipeline aggregations 2018-12-20 01:24:36 +01:00
Kofi Jedamzik 281312ffcd Add units for blood sugar concentration 💉 2018-12-19 22:23:25 +01:00
Erik Sundell 095407c8cf on deselect when reducer is set to none 2018-12-19 21:08:38 +01:00
ryan 9c086be591 Merge remote-tracking branch 'grafana/master' 
* grafana/master: (41 commits)
  Fixes undefined issue with angular panels and editorTabs
  changelog: adds note about closing #14562
  Update field name
  Add documentation
  Rename the setting and add description
  export init notifier func
  Increase recent and starred limit in search and home dashboard, closes #13950
  changelog: adds note about closing #14486
  Panel help view fixes
  Add min/max height when resizing and replace debounce with throttle
  changelog: adds note about closing #14546
  Adding tests for auth proxy CIDR support
  changelog: adds note about closing #14109
  fix signed in user for orgId=0 result should return active org id
  Another take on resizing the panel, now using react-draggable
  Raise datasources number to 5000
  copy props to state to make it visible in the view
  refactor to not crash when no links
  updating snaps
  renaming component
  ...
 2018-12-19 11:35:44 -08:00
Erik Sundell 945b0aeb86 add alignment component 2018-12-19 17:12:50 +01:00
Torkel Ödegaard 2325c5dbed Merge pull request #14603 from grafana/minor-angular-editmode-fix 
Fixes undefined issue with angular panels and editorTabs
 2018-12-19 17:09:23 +01:00
Torkel Ödegaard 5b83f6d49d Fixes undefined issue with angular panels and editorTabs 2018-12-19 17:00:26 +01:00
bergquist 7637ea55e4 changelog: adds note about closing #14562 2018-12-19 16:11:35 +01:00
Erik Sundell 603ef1c37d refactor aggregation picker 2018-12-19 16:08:18 +01:00
Carl Bergquist c201fc170f Merge pull request #14563 from tdabasinskas/broken_oauth_provider 
Support OAuth providers that are not RFC6749 compliant
 2018-12-19 16:05:53 +01:00
Erik Sundell 9b1b4c09f5 use render props pattern 2018-12-19 15:54:45 +01:00
Tomas Dabasinskas eb517a3791 Update field name 2018-12-19 15:36:45 +02:00
Torkel Ödegaard 71837fe137 Merge pull request #12681 from simPod/fix-variable-array-display 
Fix array display from url
 2018-12-19 14:34:21 +01:00
Tomas Dabasinskas e8823f71b0 Add documentation 2018-12-19 15:29:49 +02:00
Erik Sundell 07dc9d06d7 use template variable prop 2018-12-19 14:29:00 +01:00
Erik Sundell a955caa9ac cleanup 2018-12-19 14:19:27 +01:00
Tomas Dabasinskas 3aa24b3afa Rename the setting and add description 2018-12-19 14:59:33 +02:00
Carl Bergquist 52ccb49167 Merge pull request #14593 from bergquist/export_create_notifier_func 
export init notifier func
 2018-12-19 13:51:40 +01:00
bergquist 69489993c3 export init notifier func 
makes it possible to validate that an notifier can be
initialzed from the provisioning package
 2018-12-19 13:38:49 +01:00
Torkel Ödegaard d0f8d034df Quick refactoring of time picker styles, needs a much bigger redesign 2018-12-19 13:13:46 +01:00
Peter Holmberg f3ba3b4df0 render editor toolbar buttons 2018-12-19 13:09:53 +01:00
Johannes Schill f95359fb34 Notify user on query error 2018-12-19 12:58:10 +01:00
Torkel Ödegaard 1260301099 Merge pull request #14589 from grafana/search-increase-recent-starred-limit 
Increase recent and starred limit in search and home dashboard
 2018-12-19 12:09:54 +01:00
Torkel Ödegaard 9e92609313 Merge pull request #14113 from cinaglia/fix-csv-decimal-places 
Retain decimal precision when exporting CSV
 2018-12-19 11:56:27 +01:00
Torkel Ödegaard 16ad0f65ea Increase recent and starred limit in search and home dashboard, closes #13950 2018-12-19 11:40:38 +01:00
Torkel Ödegaard cbeefcd376 Merge pull request #14574 from grafana/14543_org_redirect 
fix signed in user for orgId=0 result should return active org id
 2018-12-19 11:31:06 +01:00
Torkel Ödegaard 36154e59b0 Merge pull request #14571 from oiooj/pr-ds-limit 
Raise datasources number to 5000
 2018-12-19 11:26:16 +01:00
Torkel Ödegaard 6154f89d96 Merge pull request #14587 from grafana/panel-help-fixes 
Panel help view fixes
 2018-12-19 11:25:12 +01:00
Torkel Ödegaard d21b5899c1 Merge branch 'master' of github.com:grafana/grafana 2018-12-19 11:24:25 +01:00
Torkel Ödegaard 6542bfb83e Merge branch 'fix-misspell-issues' of https://github.com/mjtrangoni/grafana into mjtrangoni-fix-misspell-issues 2018-12-19 11:21:34 +01:00
Torkel Ödegaard 87cc3902b7 Merge pull request #14558 from hahnjo/flops 
Add units for Floating Point Operations per Second
 2018-12-19 11:11:14 +01:00
Torkel Ödegaard 8375c23de9 Merge pull request #14569 from grafana/14537/time-range-and-relative-time 
Show current values for relative time and time shift
 2018-12-19 11:05:42 +01:00
Johannes Schill 9607b27935 changelog: adds note about closing #14486 2018-12-19 11:04:40 +01:00
Torkel Ödegaard 60ea99078e Panel help view fixes 2018-12-19 11:03:54 +01:00
Peter Holmberg 2046309de5 rewrite angular view 2018-12-19 10:42:57 +01:00
Torkel Ödegaard 9fec202668 Merge pull request #14565 from grafana/panel-help-view 
Panel help view
 2018-12-19 10:25:02 +01:00
Carl Bergquist fdb48b7bbc Merge pull request #14531 from grafana/golang_1.11.4 
Upgrade go version to 1.11.4
 2018-12-19 10:09:56 +01:00
Torkel Ödegaard 5f2937431f Merge pull request #14572 from grafana/develop-draggable-panel 
Another take on resizing the panel, now using react-draggable
 2018-12-19 10:07:45 +01:00
Erik Sundell 9e558b70d7 Merge branch '14293-metric-display-names' into reactify-stackdriver 
# Conflicts:
#	public/app/plugins/datasource/stackdriver/partials/query.aggregation.html
#	public/app/plugins/datasource/stackdriver/partials/query.editor.html
#	public/app/plugins/datasource/stackdriver/partials/query.filter.html
#	public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
#	public/app/plugins/datasource/stackdriver/query_ctrl.ts
#	public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
#	public/sass/_grafana.scss
 2018-12-19 09:21:35 +01:00
Johannes Schill 9cd0067187 Add min/max height when resizing and replace debounce with throttle 2018-12-19 09:08:56 +01:00
bergquist a6d90151da changelog: adds note about closing #14546 2018-12-19 08:58:14 +01:00
Carl Bergquist 251e80aa5e Merge pull request #14547 from jacobrichard/master 
Adding CIDR capability to auth_proxy whitelist
 2018-12-19 08:55:03 +01:00
Jacob Richard 34d3086ec8 Adding tests for auth proxy CIDR support 2018-12-18 21:16:29 -06:00
Marcus Efraimsson 12f3c8f9d6 fix only add column if not exists for mysql 2018-12-18 23:02:08 +01:00
bergquist ea84ec6229 changelog: adds note about closing #14109 2018-12-18 22:49:38 +01:00
Carl Bergquist 854487acab Merge pull request #14441 from cinaglia/delete-external-snapshot 
Add support for deleting external snapshots from Snapshots List
 2018-12-18 22:43:12 +01:00
Marcus Efraimsson a451c20129 fix handling of indices with multiple columns (mysql) 2018-12-18 22:28:27 +01:00