IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
18,966 Commits 5,454 Branches 554 Tags 1.9 GiB
87cb3d4caa
Commit Graph

18966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Holmberg
6aacd0734b typings and renamings 2018-12-21 11:57:21 +01:00
Peter Holmberg
25a46c60f1 Merge branch 'master' into 14388/alert-tab-ux-update 2018-12-21 11:25:09 +01:00
Peter Holmberg
bbd77d8f0b adding extra props 2018-12-21 11:24:31 +01:00
Torkel Ödegaard
6e66b2b906 breaking up grafana into multiple packages poc 2018-12-20 16:56:46 +01:00
Erik Sundell
e2ed163779 add project and help component 2018-12-20 16:55:02 +01:00
Erik Sundell
06f771afd3 add alias by component 2018-12-20 15:59:21 +01:00
Erik Sundell
861f911cda add alignment periods component 2018-12-20 13:36:10 +01:00
Erik Sundell
7a31076f09 cleanup aggregation picker 2018-12-20 13:27:47 +01:00
Erik Sundell
1452bc2e8a move alignment population code to parent component. make alignment a stateless component instead. 2018-12-20 11:26:05 +01:00
Erik Sundell
ec68c65660 flatten target obj 2018-12-20 11:00:16 +01:00
Torkel Ödegaard
f089c7ee5e Grafana ui library poc 2018-12-20 09:25:04 +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
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
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