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 |
|
Marcus Efraimsson
|
bd7837e8d7
|
dashfolders: styling of selected filters
#10081
|
2017-12-14 20:20:36 +01:00 |
|
Torkel Ödegaard
|
581257416e
|
Merge remote-tracking branch 'origin/develop-icons' into develop
|
2017-12-14 19:56:19 +01:00 |
|
Marcus Efraimsson
|
62e6fed5ce
|
dashfolders: fix moving plugin dashboard to folder
If moving a dashboard and the server responds with a plugin-dashboard
error we add the overwrite flag and moving the dashboard again.
Fixes #10183
|
2017-12-14 16:51:23 +01:00 |
|
bergquist
|
11fd401fad
|
changelog: adds note about closing #9170
|
2017-12-14 15:59:49 +01:00 |
|
Marcus Efraimsson
|
b1bb012343
|
dashfolders: fix folder selection dropdown in dashboard settings
Use folder id from meta instead of dashboard object
|
2017-12-14 15:58:24 +01:00 |
|
Carl Bergquist
|
f5d26bfcc9
|
Merge pull request #10050 from davkal/davkal/multi-query-table
Add support to render values of multiple queries in the same table
|
2017-12-14 15:57:07 +01:00 |
|
Patrick O'Carroll
|
780d3e2c8f
|
fix for merge conflict
|
2017-12-14 15:50:47 +01:00 |
|
Carl Bergquist
|
45eda16a87
|
Merge pull request #10203 from queeno/dashboard_provisioner_id_validation
Avoid ID validation before provisioning dashboards
|
2017-12-14 15:43:07 +01:00 |
|
Trent White
|
764992df2a
|
add links for large cta
|
2017-12-14 09:31:59 -05:00 |
|
Patrick O'Carroll
|
0f62b3e04d
|
resolve merge conflict
|
2017-12-14 15:15:54 +01:00 |
|