Commit Graph

12766 Commits

Author SHA1 Message Date
Johannes Schill
0bc6f4e2bd fix: Original dashboard link from snapshot should be an a-tag, not a button (#10269) (#10283) 2017-12-19 14:58:12 +01:00
Johannes Schill
bc7462cd04 Merge branch 'master' into 10190_fix_select_icon_and_firefox 2017-12-19 14:55:18 +01:00
Daniel Lee
31fc19c6d7 dashboard: fixes #10262 2017-12-19 14:55:03 +01:00
Patrick O'Carroll
0d283214a0 added new to new dahsboard and folder 2017-12-19 14:52:34 +01:00
Johannes Schill
23cceaecc4 test: Update test with new component signature 2017-12-19 14:45:44 +01:00
Carl Bergquist
326ba11c42
Merge pull request #10280 from bergquist/windows_build
WIP: delete unused icon files
2017-12-19 14:35:22 +01:00
Carl Bergquist
d671f5b404 Merge branch 'devkid-patch-1'
* devkid-patch-1:
  pushover: update default message
  Add default message for Pushover notifications
2017-12-19 14:31:57 +01:00
Carl Bergquist
e2be6a38c4 pushover: update default message 2017-12-19 14:31:26 +01:00
Carl Bergquist
f36aa2e953 Merge branch 'patch-1' of https://github.com/devkid/grafana into devkid-patch-1
* 'patch-1' of https://github.com/devkid/grafana:
  Add default message for Pushover notifications
2017-12-19 14:30:09 +01:00
Johannes Schill
f6163a59af Merge branch 'master' into 10190_fix_select_icon_and_firefox 2017-12-19 14:11:37 +01:00
Carl Bergquist
8055dcae44 delete unused icon files 2017-12-19 14:02:06 +01:00
Carl Bergquist
887af65ca9
Merge pull request #10264 from SteelPhase/patch-2
fix: Extra forward slash added when org redirect middleware is called (#10263)
2017-12-19 13:58:33 +01:00
Johannes Schill
add5df07bf Merge branch 'master' into 10190_fix_select_icon_and_firefox 2017-12-19 13:52:45 +01:00
Johannes Schill
fee3e7c02a Merge branch 'master' into 10277_logout_route_full_page_reload 2017-12-19 13:50:36 +01:00
Johannes Schill
a55b42d11f fix: The /logout route should always full page reload (#10277) 2017-12-19 13:39:11 +01:00
Torkel Ödegaard
75bb511019 tech: added prettier to precommit 2017-12-19 13:27:05 +01:00
Johannes Schill
3e28ce94eb ux: Add icon to selected option in PageHeader navigation on small screens, update select boxes for Firefox so the arrow to the right is aligned with the other select boxes (#10190) 2017-12-19 13:19:44 +01:00
Carl Bergquist
0d9378d18e
Merge pull request #10274 from bergquist/alerting_without_rows
Alerting without dashboard rows
2017-12-19 13:19:33 +01:00
Johannes Schill
e1a527a87a ux: Fix color picker positioning when scrolled down to the bottom of a page (#10258) (#10271) 2017-12-19 12:58:55 +01:00
Carl Bergquist
644c2f7fb0 test: remove unused code 2017-12-19 11:23:21 +01:00
Carl Bergquist
66cf224e31 alerting: make alert extractor backwards compatible
closes #10270
2017-12-19 11:20:05 +01:00
Carl Bergquist
1816e89730 alerting: move test json into files 2017-12-19 10:22:26 +01:00
SteelPhase
a320a83138 Use strings.TrimPrefix to make sure relative url doesn't start with forward slash
Closes grafana/grafana#10263
2017-12-19 03:01:33 -05:00
Torkel Ödegaard
dd2192cccc
Update README.md 2017-12-18 16:54:09 +01:00
Torkel Ödegaard
0a28def71f
Update CHANGELOG.md 2017-12-18 16:52:31 +01:00
Johannes Schill
e569c8ea10 fix: Navigation on small screens when Grafana is installed in a sub directory (#10252) (#10261)
* ux: Add missing icon for login with grafana-com, fixes #10238

* fix: This fix potentially solves installations in sub directories, #10252
2017-12-18 16:22:58 +01:00
Torkel Ödegaard
22643eb109 cloudwatch: fixed optimized build issue, fixes #10174 2017-12-18 14:36:34 +01:00
Mitsuhiro Tanda
3cb841f3db fix text panel rows limit (#10246) 2017-12-18 14:29:48 +01:00
Mitsuhiro Tanda
6bb7f77346 use ace editor in panel edit (#10245) 2017-12-18 14:29:23 +01:00
Daniel Lee
78fb5be2cf docs: mysql example with macro 2017-12-18 14:24:04 +01:00
Daniel Lee
40af84a83f docs: mysql macros update 2017-12-18 14:12:04 +01:00
Torkel Ödegaard
40482d9ada Merge branch 'master' of github.com:grafana/grafana 2017-12-18 13:38:54 +01:00
Torkel Ödegaard
51ec64f872 fix: reduced team name column length, fixes #10244 2017-12-18 13:38:29 +01:00
shankdever
7256884555 ux: Add missing icon for login with grafana-com, fixes #10238 (#10249) 2017-12-18 13:33:28 +01:00
Carl Bergquist
47fb017a5f
Merge pull request #10240 from sernst/master
Kinesis Metric Capitalization
2017-12-16 13:16:01 +01:00
Scott Ernst
fcf1ff10d2 Kinesis Metric Capitalization
Fixes the capitalization of the AWS/Kinesis ShardId metric, which
was incorrectly specified as "ShardID" instead of "ShardId" as
specified in the AWS documentation:

http://docs.aws.amazon.com/streams/latest/dev/monitoring-with-cloudwatch.html
2017-12-15 12:44:13 -06:00
Daniel Lee
77cc546315 dashfolder: nginject fix 2017-12-15 16:36:31 +01:00
Daniel Lee
7dac64354f teams: missing nginject attribute 2017-12-15 16:26:00 +01:00
Torkel Ödegaard
71658d1e76 grid: disable resize and drag on non editable dashboards, closes #10235 2017-12-15 16:23:26 +01:00
Torkel Ödegaard
4112abd699 logging: removed logging from panel loader 2017-12-15 15:43:32 +01:00
Torkel Ödegaard
36fe8f5873 menu: fixed create default url 2017-12-15 15:17:05 +01:00
Torkel Ödegaard
23e0ca5543 Merge branch 'master' of github.com:grafana/grafana 2017-12-15 14:55:50 +01:00
Torkel Ödegaard
d1e0e36996 fix: dont show settings for viewers 2017-12-15 14:51:20 +01:00
bergquist
ea4ef47982
prometheus: change default resolution to 1/1
this should make the value of the step value more
consistant for most users

ref #9705
2017-12-15 14:24:31 +01:00
Torkel Ödegaard
a8a5f8181b fix: viewers can edit now works correctly 2017-12-15 14:19:49 +01:00
Torkel Ödegaard
ed48d27d85 fix: fixed minor ux and firefox issues, fixes #10228 2017-12-15 13:34:50 +01:00
Torkel Ödegaard
63d4499a2b ux: minor fixes 2017-12-15 13:14:00 +01:00
Torkel Ödegaard
2797e8e2d0 profile: use name or fallback for profile page 2017-12-15 13:06:11 +01:00
Torkel Ödegaard
fdf4bad1b7 fix: sidemenu profile main text is now username instead of name 2017-12-15 13:03:07 +01:00
Torkel Ödegaard
7bec195599 build: update master version to 5.0.0-pre1 2017-12-15 12:09:11 +01:00