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
Torkel Ödegaard aa766e3e18 Merge branch 'external-plugins' of github.com:grafana/grafana into external-plugins 2015-12-02 18:31:05 +01:00
Torkel Ödegaard ee0e4d2b69 Merge branch 'master' into external-plugins 
Conflicts:
	public/app/plugins/panels/table/editor.ts
	public/views/index.html
 2015-12-02 18:30:48 +01:00
Torkel Ödegaard 8eb3e48bc7 fix(build): fixed build issues with concat not including require_config 2015-12-02 18:22:47 +01:00
utkarshcmu 384292b647 Removed metadata from dropdown, included in settings 2015-12-02 04:15:50 -08:00
Michael Kröll 1bb1ddcd29 Fixed spelling error 2015-12-02 11:14:28 +01:00
Torkel Ödegaard 24324939e1 Merge branch 'fix_refresh_variable_from_url' of https://github.com/toni-moreno/grafana into toni-moreno-fix_refresh_variable_from_url 2015-12-01 15:28:48 +01:00
Torkel Ödegaard 2436cda7ac fix(graph panel): minor spelling change 2015-12-01 15:28:34 +01:00
Torkel Ödegaard 75b83af08f refactoring(ui): minor ui improvement to graph axis tab 2015-12-01 14:04:44 +01:00
Torkel Ödegaard 82d8e3c2b6 feat(graph panel): refactoring of hide zero option, #3336 2015-12-01 13:34:42 +01:00
Torkel Ödegaard c351f46e47 Merge branch 'hide-zero' of https://github.com/utkarshcmu/grafana into utkarshcmu-hide-zero 2015-12-01 13:08:37 +01:00
Torkel Ödegaard fb9e8d2166 feat(table panel): fixed issue with column selection for new table panel 2015-12-01 10:16:11 +01:00
Torkel Ödegaard 3668cb6dd4 fix(readme): minor readme update 2015-12-01 09:23:30 +01:00
Torkel Ödegaard 93f3e30cac fix(log): removed logging accidentlally checked in 2015-12-01 09:19:22 +01:00
Torkel Ödegaard 52af346ec8 Merge pull request #3375 from hartfordfive/issue-3374 
Add flag option to display app version (Issue 3374)
 2015-12-01 09:18:37 +01:00
Torkel Ödegaard 8e0bba4f99 fix(templating): minor fix to default property name, fixes #3378 2015-12-01 09:01:44 +01:00
Torkel Ödegaard 4cc61d10ff fix(docs): fixed typo in installing docs fixes #3379 2015-12-01 08:59:30 +01:00
Al Lefebvre 8deb6d9246 Updated README 2015-11-30 13:09:29 -05:00
Al Lefebvre 20eb6df9e8 Removed comment line 2015-11-30 12:24:14 -05:00
Al Lefebvre a921eeb5e2 Merge branch 'master' of github.com:hartfordfive/grafana into issue-3374 2015-11-30 12:20:47 -05:00
Al Lefebvre f3f34e1835 Merge pull request #1 from grafana/master 
Updating forked copy from official Grafana master
 2015-11-30 12:20:32 -05:00
Al Lefebvre 4a29d459da Added flag to display version number and exit 2015-11-30 12:10:47 -05:00
Torkel Ödegaard 0f867a3484 Merge pull request #3230 from utkarshcmu/time-units 
Added currency units, time units, tests
 2015-11-30 17:29:51 +01:00
Torkel Ödegaard 6eeddaa564 Merge pull request #3369 from matschaffer/cw/alias-fix 
Use of `<dimension name>` seems to confuse angular so changing to DIMENSION_NAME
 2015-11-30 17:28:41 +01:00
Torkel Ödegaard d80458ef81 Merge branch 'refresh' of https://github.com/utkarshcmu/grafana into utkarshcmu-refresh 2015-11-30 17:23:50 +01:00
Torkel Ödegaard ad15df7222 Merge branch 'influxdb_editor_v3' 2015-11-30 16:29:20 +01:00
Torkel Ödegaard 98f7febed1 feat(influxdb): added all functions 2015-11-30 16:28:56 +01:00
Torkel Ödegaard 4f04eaec3a feat(influxdb): moved query builder tests 2015-11-30 15:27:38 +01:00
Torkel Ödegaard 5a2b9b1f44 feat(influxdb): worked on schema upgrade for new influx query editor 2015-11-30 15:09:18 +01:00
Torkel Ödegaard 721b37a08e feat(influxdb): new editor now supports field and tag lookup again 2015-11-30 10:14:42 +01:00
Torkel Ödegaard b3d494d4c8 feat(influxdb): minor fixes to new editor 2015-11-30 08:40:11 +01:00
Mat Schaffer 85ec70e92b Use of <dimension name> seems to confuse angular so changing to DIMENSION_NAME 2015-11-30 15:55:07 +09:00
Torkel Ödegaard e2f0ff9e88 Merge pull request #3367 from utkarshcmu/orgs 
Fixed #3357
 2015-11-30 07:40:07 +01:00
utkarshcmu 0dbd7d0e17 Fixed #3357 2015-11-29 03:28:07 -08:00
utkarshcmu 8cdaa044e1 Removed repeating test 2015-11-29 03:14:26 -08:00
utkarshcmu 712a420217 Fixed refresh setting for absolute time 2015-11-29 03:12:48 -08:00
addshore b38dc70c71 Add graphtie sortByName natural param 
Introduced in graphite 0.9.15

Fixes #3360
 2015-11-28 00:16:42 +01:00
Torkel Ödegaard 72d9fcdcb4 feat(influxdb): progress with new influxdb editor 2015-11-27 16:35:40 +01:00
Torkel Ödegaard 5a6981e7af Merge pull request #3354 from raintank/externalPlugin 
Merge changes to external-plugins branch
 2015-11-27 10:21:35 +01:00
woodsaj 79d29db18b really fix unit tests. 2015-11-27 17:17:27 +08:00
woodsaj 4f6a52503d fix plugin unit test 2015-11-27 17:04:43 +08:00
woodsaj 1b5c40dd1f add role access limitions for menu items. 
This allows external-plugin menu items to conditionally
be added to the UI depending on the logged in users
current role.
 2015-11-27 16:27:14 +08:00
woodsaj 700b77c450 implement role access checks on external-plugin routes. 2015-11-27 16:26:30 +08:00
woodsaj 8449017592 Add plugin type field to externalPlugin model 2015-11-27 15:21:57 +08:00
shoonoise 5cf3425b93 Disable sign out button in case of auth proxy enabled 2015-11-26 17:56:45 +03:00
Torkel Ödegaard aa13a80d83 fix(influxdb): fixed issue with metric segment component that caused double events 2015-11-26 09:28:59 +01:00
Torkel Ödegaard 9e2ef543ed Merge pull request #3343 from mtanda/cloudwatch_fix_credential_check 
(cloudwatch) fix EC2RoleProvider parameter
 2015-11-26 08:20:50 +01:00
Mitsuhiro Tanda 2aabb387b1 fix EC2RoleProvider parameter 2015-11-26 16:01:33 +09:00
Mitsuhiro Tanda f972863f49 add credential setting to handleDescribeInstances 2015-11-26 13:21:38 +09:00
Torkel Ödegaard f00320c8b9 feat(influxdb): query editor is starting to work, can now add group by parts 2015-11-25 14:27:22 +01:00
utkarshcmu 1f57cf08a7 Added an option to hide zero values 2015-11-25 04:38:54 -08:00