IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 08:18:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
12,600 Commits 1,121 Branches 715 Tags
887af65ca92d9321bf99db31cb732a1717a2c482
Commit Graph
12600 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Torkel Ödegaard 75bb511019 tech: added prettier to precommit 2017-12-19 13:27:05 +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
Torkel Ödegaard c395237710 Merge branch Grafana v5 'develop' branch 2017-12-15 12:06:09 +01:00
Torkel Ödegaard 8905c8e5fb Merge branch 'team_member_count' of https://github.com/bergquist/grafana into develop 2017-12-15 11:53:47 +01:00
Torkel Ödegaard 75bfe313d7 Merge remote-tracking branch 'origin/develop-filter-table' into develop 2017-12-15 11:44:51 +01:00
Daniel Lee 2b814738c1 dashfolder: change to migration text 
First index for the dashboard_acl table had the word
unique in the migration description even though the
index is not unique
 2017-12-15 11:35:14 +01:00
Torkel Ödegaard ff0c2b496f ux:s sidemenu icon rules 2017-12-15 11:18:22 +01:00
bergquist 256f7176a2 teams: add team count when searching for team 
closes #10207
 2017-12-15 11:08:06 +01:00
Torkel Ödegaard 68ab11d7bf Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-15 11:01:30 +01:00
Patrick O'Carroll c78f1834bd changed background color for infobox and new blues in light theme, light theme now uses blue-dark in panel query (#10211) 2017-12-15 11:01:18 +01:00
Torkel Ödegaard 313d20292e ux: fixed navbar issue when sidemenu closes 2017-12-15 10:28:45 +01:00
Torkel Ödegaard 9a711a4fc3 ux: minor position change for layout selector, fixes #10217 2017-12-15 09:58:39 +01:00
Torkel Ödegaard 3300af909a Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-15 09:50:18 +01:00
Torkel Ödegaard ba3dbac50d fix: view json from share modal now works, #10217 2017-12-15 09:49:57 +01:00
Torkel Ödegaard 69305c20a0 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-15 09:29:41 +01:00
Torkel Ödegaard 25d8f21b64 ux: used new add data sources icon 2017-12-15 09:19:29 +01:00
Marcus Efraimsson a84e03ddc4 dashfolders: styling of selected filters 
#10081
 2017-12-15 09:14:10 +01:00