IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-02 05:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,968 Commits 5,113 Branches 538 Tags 1.9 GiB
9045be0c12
Commit Graph

1668 Commits

Author SHA1 Message Date
Trent White
c186d8b2be button text position to center text vertically 2016-02-11 12:27:32 -05:00
Trent White
cd40362d47 sidenav tweaks, creating a content channel for the main content on non-dashboard pages 2016-02-11 12:02:12 -05:00
Mitsuhiro Tanda
81ad469533 (cloudwatch) custom metrics namespace support 2016-02-12 00:30:33 +09:00
utkarshcmu
bb77070aab Merge branch 'master' of https://github.com/grafana/grafana into ds-conf-box 2016-02-11 07:03:04 -08:00
utkarshcmu
c051ff3eac Removed unused commented code 2016-02-11 07:01:45 -08:00
Torkel Ödegaard
ac5f7ecdea fix(img): fixed img link on signup 2016-02-11 15:49:55 +01:00
Torkel Ödegaard
4e33e80957 fix(): clicking on items in graphites add function menu did not work, now works again, broken in recent panel refactorings 2016-02-11 15:25:34 +01:00
Torkel Ödegaard
bf1b60564e fix(png rendering): fixed broken png rendering due to recent panel change 2016-02-11 14:34:15 +01:00
Torkel Ödegaard
39bb9ce118 Merge branch 'master' of github.com:grafana/grafana 2016-02-11 13:42:33 +01:00
Torkel Ödegaard
2d8180fc9c fix(panels): restored panel name to edit mode 2016-02-11 13:42:18 +01:00
utkarshcmu
fac51d92c5 Added DS deletion confirmation modal 2016-02-11 00:06:04 -08:00
Trent White
581fb8ebfd dropdown.less added 2016-02-10 18:14:52 -05:00
Trent White
0fa0b3b256 style changes to forms, icons updates and new buttons 2016-02-10 18:14:26 -05:00
utkarshcmu
4c35c83b84 Minor html fix 2016-02-10 11:13:17 -08:00
Torkel Ödegaard
ae39ec8585 feat(plugins): changed so that plugins can load css async via util function exposed from app/plugins/sdk 2016-02-10 13:09:39 +01:00
Torkel Ödegaard
dfe0e258cd feat(text and css): html partials and css can be loaded via systemjs 2016-02-10 11:54:17 +01:00
Torkel Ödegaard
eda23252e1 Merge branch 'master' of github.com:grafana/grafana 2016-02-10 11:03:26 +01:00
Torkel Ödegaard
257b824d4f feat(plugins): better logging and handling of loading plugins, try to create plugins dir if it does not exist, fixes #3974 2016-02-10 11:03:12 +01:00
bergquist
b469904c7f fix(login): hide divider if no oath 
closes #3980
 2016-02-10 10:41:43 +01:00
Torkel Ödegaard
509b37eb91 dependency(): upgraded angularjs to 1.5.1 2016-02-10 10:15:11 +01:00
Torkel Ödegaard
1ce34ed907 Merge pull request #3968 from daniellee/issue3831 
Fixes when panel repeat is removed by clearing the templating variables
 2016-02-10 09:41:06 +01:00
Torkel Ödegaard
f9e7b14f2c cleanup(): removed old file 2016-02-10 08:32:16 +01:00
Torkel Ödegaard
dad394523f fix(build): fixed minor issue in systemjs builder, and added SystemJs cache buster 2016-02-10 06:50:17 +01:00
Mitsuhiro Tanda
5c7689388d fix template url for annotation editor 2016-02-10 11:42:59 +09:00
Torkel Ödegaard
fe2e6b8a80 feat(apps): began work on support for apps that contain data sources 2016-02-09 18:37:08 +01:00
Torkel Ödegaard
8784be9a14 feat(plugins): made it possible to have relative plugin template urls 2016-02-09 18:17:32 +01:00
Daniel Lee
72415be2db fix(dashboard): fixes when panel repeat with templating removed 
The original panel should clear all the templating variables and
    look like it did before repeat was selected. Fixes #3831. Also
cleans up after a row repeat is removed
 2016-02-09 14:59:24 +01:00
Torkel Ödegaard
9653f43466 fix(): unit tests 2016-02-09 14:41:43 +01:00
Torkel Ödegaard
1acbd5b7d8 :merge branch 'app-pages' 
Conflicts:
	examples/nginx-app/module.js
	examples/nginx-app/partials/stream.html
	examples/nginx-app/plugin.json
 2016-02-09 14:22:08 +01:00
Torkel Ödegaard
f0ecbd3878 feat(apps): removed some on hover stuff from sidemenu to make it ready to merge to master 2016-02-09 14:20:41 +01:00
Torkel Ödegaard
9dcfe6dc39 feat(apps): more work on app pages and sidemenu subnav 2016-02-09 14:06:23 +01:00
Torkel Ödegaard
397e4e4766 fix(img): img link on login 2016-02-09 12:20:09 +01:00
Torkel Ödegaard
5b9ed82d29 feat(plugins): working on plugin examples 2016-02-09 12:20:09 +01:00
Torkel Ödegaard
0def04ad34 feat(apps): more progress on app pages 2016-02-09 12:10:59 +01:00
Torkel Ödegaard
18eb9d6076 feat(apps): began work on app pages 2016-02-09 11:17:49 +01:00
bergquist
e7ff018487 feat(table): uses lodash to escape html 2016-02-09 11:16:07 +01:00
bergquist
ddb1d0c684 fix(table): escape / chars as well 2016-02-09 11:14:08 +01:00
bergquist
7d89cf228c fix(table): remove html for htmlencoding option 2016-02-09 11:14:08 +01:00
bergquist
5775c0a341 feat(table): remove option to disable html encoding 2016-02-09 11:14:08 +01:00
bergquist
d750908e36 feat(table): escape html by default 
closes #3673
 2016-02-09 11:14:08 +01:00
bergquist
b1a648608b test(table): rewrite invalid tests 2016-02-09 11:14:08 +01:00
Torkel Ödegaard
82d5d1b003 feat(plugins): working on plugin examples 2016-02-09 09:53:56 +01:00
Mitsuhiro Tanda
2cce057df1 (prometheus) add query result template query 2016-02-09 01:37:43 +09:00
Torkel Ödegaard
dea2234b14 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 16:57:41 +01:00
Torkel Ödegaard
99a053bbdd feat(): removed unused routes and minor fixes 2016-02-08 16:57:29 +01:00
Carl Bergquist
a3b6efdbfa Merge pull request #2883 from mtanda/prometheus_annotation_support 
Prometheus annotation support
 2016-02-08 14:51:59 +01:00
Torkel Ödegaard
3a1dff6636 fix(): karma now works again, broken in last commit 2016-02-08 14:39:57 +01:00
Torkel Ödegaard
cf92011fb9 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 14:35:45 +01:00
Torkel Ödegaard
0106033293 refactor(): removed stuff 2016-02-08 14:35:34 +01:00
Carl Bergquist
4a43cc1df6 Merge pull request #3958 from bergquist/ux_login 
Login: UX improvements
 2016-02-08 13:05:05 +01:00
bergquist
0f52b4397f feat(login): minor ux improvements 
make buttons bigger and introduce the login divider.

closes #3698
 2016-02-08 11:18:41 +01:00
Torkel Ödegaard
9c0da733e8 Merge branch 'master' of github.com:grafana/grafana 2016-02-08 10:31:36 +01:00
Torkel Ödegaard
de90ad8967 feat(influxdb): escape influxdb tag values, fixes #3950 2016-02-08 10:31:26 +01:00
bergquist
73bed3880f feat(graph): sets fixed height for right side legend 
closes #1277
 2016-02-08 09:49:53 +01:00
bergquist
edebdb166e fix(graph): add missing ctrl in variable 2016-02-08 09:24:30 +01:00
Torkel Ödegaard
7f83be3d0d ux(): mini fix! 2016-02-08 09:06:28 +01:00
Torkel Ödegaard
50920b1423 ux(forms): minor upgrade to new form design 2016-02-07 20:05:49 +01:00
Torkel Ödegaard
42b1c8c80d Merge branch 'master' into style-changes-mattttt 2016-02-07 19:47:14 +01:00
Torkel Ödegaard
a5d1e9ee43 fix(singlestat): fix for singlestat background and sparklines, fixes #3955 2016-02-07 18:37:07 +01:00
Torkel Ödegaard
ff4dbea19d ux(navbar): worked on responsive breakpoints for navbar 2016-02-07 12:28:06 +01:00
Matthew Toback
1bd58bc1c0 Added new file and removed change to .bra.toml 2016-02-06 17:38:36 -05:00
Matthew Toback
21b0945d08 Beginnings of form restyling, nowhere near merge yet 2016-02-06 17:37:33 -05:00
Torkel Ödegaard
89ef019b7c fix(): back to dashboard link fix 2016-02-06 10:32:07 +01:00
Torkel Ödegaard
801129530e feat(plugins): base clases are now in app/plugins/sdk 2016-02-05 18:08:21 +01:00
bergquist
020277c045 style(panel): fix intendention issue 2016-02-05 15:10:55 +01:00
bergquist
f8b3c0a64c feat(influxdb): add default interval setting 
closes #1552
 2016-02-05 15:10:33 +01:00
Torkel Ödegaard
853cd16336 fix(search); fixes to dashboard search (using keyboard), and fix for singlestat in snapshot view 2016-02-05 13:48:10 +01:00
Torkel Ödegaard
0fab210ad2 feat(apps): changed edit apps view to use plugin-component for apps config view 2016-02-05 12:13:59 +01:00
Torkel Ödegaard
9fc0a83b83 Merge branch 'master' of github.com:grafana/grafana 2016-02-05 11:08:44 +01:00
Torkel Ödegaard
aa8bd044c5 fix(): various fixes to snapshots 2016-02-05 11:05:47 +01:00
Carl Bergquist
59cb429d2d Merge pull request #3949 from bergquist/table_panel_thresholds 
tablepanel: using two thresholds
 2016-02-05 10:38:31 +01:00
Torkel Ödegaard
273fbaac68 refactor(): minor changes 2016-02-05 10:37:14 +01:00
bergquist
8ff997594f fix(tablepanel): change to using two thresholds 
fixes #3878
 2016-02-05 10:30:46 +01:00
Torkel Ödegaard
f188900379 Merge branch 'master' of github.com:grafana/grafana 2016-02-05 08:50:31 +01:00
Torkel Ödegaard
f80d5f8c03 refactor(): minor refactor 2016-02-05 08:50:15 +01:00
Torkel Ödegaard
fcc960e9a2 Merge pull request #3792 from utkarshcmu/snapshot-view 
UI Review: Snapshot view
 2016-02-05 08:49:23 +01:00
Torkel Ödegaard
db27bbb162 Merge pull request #3918 from utkarshcmu/metadata 
Added metadata fields under Settings tab
 2016-02-05 08:47:57 +01:00
Torkel Ödegaard
1bce8f6669 Merge pull request #3736 from mtanda/cloudwatch_custom_metrics_alpha 
(cloudwatch) custom metrics support
 2016-02-05 08:44:50 +01:00
utkarshcmu
59a384b453 Merge branch 'master' of https://github.com/grafana/grafana into metadata 2016-02-04 13:34:32 -08:00
utkarshcmu
b5a5b7b912 Removed totalStats from PR 2016-02-04 13:34:23 -08:00
Torkel Ödegaard
a167eb4fa1 fix(row repeat): fix for row repeat where repeated row was added to the bottom and not next to the source row, fixes #2942 2016-02-04 22:33:53 +01:00
Torkel Ödegaard
660ce3a61d fix(row editor): row editor fix and cleanup of unused code 2016-02-04 22:19:46 +01:00
Torkel Ödegaard
edf5868c38 fix(panel timeshift): fixed so that panel time range works when dashboard time range does not end in now, like and , fixes #3941 2016-02-04 21:52:05 +01:00
Torkel Ödegaard
5588e7597c feat(inspector): minor fix for inspector making the error not clear when having dashboard refresh, fixes #3938 2016-02-04 15:31:54 +01:00
Torkel Ödegaard
68a5fb66ff ux(panel menu): changed remove icon to trash icon, closes #3939 2016-02-04 15:28:24 +01:00
Torkel Ödegaard
33dc9fdd76 fix(inspector): fixed broken panel error inspect 2016-02-04 15:23:40 +01:00
Torkel Ödegaard
316e1aac67 fix(build): minor fix 2016-02-04 15:12:44 +01:00
Torkel Ödegaard
2ed3cd7f1a Merge branch 'master' of github.com:grafana/grafana 2016-02-04 15:04:20 +01:00
Torkel Ödegaard
14cc771cbe feat(plugins): made panels loaded via plugin-componet directive 2016-02-04 15:04:07 +01:00
Torkel Ödegaard
2a8b96b680 feat(plugins): last refactoring of how panels are implemented, now the same way as plugin editors 2016-02-04 14:36:19 +01:00
Torkel Ödegaard
6f923ecd17 Merge pull request #3901 from bobrik/opentsdb-tag-name-suggestions 
Show relevant tag name suggestions for OpenTSDB, closes #3610
 2016-02-04 14:30:33 +01:00
Torkel Ödegaard
501f21b16c fix(dashlist): fix for entering dashboard list edit mode 2016-02-04 13:58:43 +01:00
Ivan Babrou
f4ad673b6d Show relevant tag name suggestions for OpenTSDB, closes #3610 2016-02-04 10:57:19 +00:00
Torkel Ödegaard
37ff432f9d fix(influxdb): fix for influxdb when using format as table and having group by time, fixes #2928 2016-02-04 09:48:17 +01:00
Mitsuhiro Tanda
20283a46f9 fix annotation editor error 2016-02-04 14:14:19 +09:00
Mitsuhiro Tanda
634699c8e2 fix prometheus datasource plugin 2016-02-04 14:10:27 +09:00
Mitsuhiro Tanda
7d97f381cf fix tslint error 2016-02-04 14:09:59 +09:00
Mitsuhiro Tanda
7a1326ff14 follow new plugin format 2016-02-04 14:06:01 +09:00
Mitsuhiro Tanda
ee84d4371b fix prometheus annotation, reflect API change 2016-02-04 14:05:51 +09:00
Mitsuhiro Tanda
f8b05e0f42 add prometheus annotation query 2016-02-04 14:05:44 +09:00