IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-10 05:08:16 -05:00
Code Issues Packages Projects Releases Wiki Activity
18,710 Commits 1,225 Branches 722 Tags
e694604be5db3cccf45755345b2bcd6808b9f485
Commit Graph
18710 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Kaltschmidt e694604be5 Loki: fix timestamp field 
- timestamp was renamed to `ts` in grafana/loki#152
- renamed here in result transformer and tests
 2018-12-22 17:19:58 +01:00
David b2401e37fa Merge pull request #14414 from grafana/davkal/explore-logging-search 
Explore: Split logging query into selector and search
 2018-12-22 17:00:57 +01:00
Torkel Ödegaard f8e2e11734 Merge pull request #14631 from grafana/firefox-height-bugfix 
Fixed panel height & scroll issue with flexbox in firefox,
 2018-12-22 09:54:58 +01:00
Torkel Ödegaard 9aa2764753 Fixed panel height & scroll issue with flexbox in firefox, fixes #14620 2018-12-22 08:58:08 +01:00
Marcus Efraimsson 8b4083a602 changelog: add notes about closing #14519 2018-12-21 13:01:25 +01:00
Marcus Efraimsson 45e92a116d Merge pull request #14605 from kjedamzik/add-blood-glucose-level-units 
Add units for blood sugar concentration 💉
 2018-12-21 12:54:43 +01:00
Kofi Jedamzik 281312ffcd Add units for blood sugar concentration 💉 2018-12-19 22:23:25 +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
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
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
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
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
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
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
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 e82b3632f6 fix signed in user for orgId=0 result should return active org id 2018-12-18 20:02:27 +01:00
Johannes Schill a007730f5d Another take on resizing the panel, now using react-draggable 2018-12-18 17:22:30 +01:00
Baokun Lee f51222027d Raise datasources number to 5000 2018-12-18 23:59:14 +08:00
Peter Holmberg 8f92e23e98 copy props to state to make it visible in the view 2018-12-18 16:39:59 +01:00
Peter Holmberg 659b5a3c15 refactor to not crash when no links 2018-12-18 15:30:34 +01:00
Peter Holmberg bf7ba9a4d1 updating snaps 2018-12-18 14:54:50 +01:00
Peter Holmberg 95656e1e95 renaming component 2018-12-18 14:49:59 +01:00
Peter Holmberg a44a07593f panel help working 2018-12-18 14:40:54 +01:00
Victor Cinaglia 48fe92a945 snapshots: Close response body after error check 2018-12-18 08:32:49 -05:00
Tomas Dabasinskas 08c12313fe Update sample and default configs 2018-12-18 13:51:17 +02:00
Tomas Dabasinskas 54b73025dc Add OAuth provider flag to indicate if it's broken 2018-12-18 13:50:37 +02:00