IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,667 Commits 5,454 Branches 554 Tags 1.9 GiB
00c2153edd
Commit Graph

11667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard
00c2153edd Merge branch 'develop' of github.com:grafana/grafana into develop 2017-10-17 09:21:45 +02:00
Torkel Ödegaard
cd10be0f52 newgrid: row progress 2017-10-16 16:09:23 +02:00
Daniel Lee
5f6ab1e370 styleguide: fix link in index 2017-10-16 14:11:52 +02:00
Daniel Lee
b866383ec0 api: fix for dashboard version history 2017-10-16 14:09:52 +02:00
Torkel Ödegaard
a979767439 grid: minor progress on new row concept 2017-10-16 10:58:08 +02:00
Torkel Ödegaard
2ff4b86781 ux: add panel progress 2017-10-16 10:39:50 +02:00
Torkel Ödegaard
772ab7812f ux: worked on add panel function 2017-10-16 09:55:55 +02:00
Torkel Ödegaard
48b6692491 ux: minor button changes 2017-10-15 12:25:31 +02:00
Torkel Ödegaard
9b7d346d3f ux: color tweaks 2017-10-14 21:51:36 +02:00
Torkel Ödegaard
a3bd761b0c ux: testing out new icons 2017-10-14 21:17:16 +02:00
Torkel Ödegaard
7e16254b1a Merge branch 'develop' of github.com:grafana/grafana into develop 2017-10-14 08:21:55 +02:00
Torkel Ödegaard
825cac38b4 ux: minor fixes 2017-10-13 17:01:38 +02:00
Torkel Ödegaard
0c31d23086 grid: fixed grid width issues 2017-10-13 15:11:05 +02:00
Torkel Ödegaard
70005d3e37 grid: repeat refactoring and unit tests 2017-10-13 14:50:16 +02:00
Torkel Ödegaard
e5a6cb6241 newgrid: added constants, changed grid to 24 cols, added tests for panel repeats 2017-10-13 13:51:05 +02:00
Torkel Ödegaard
9fb4f61975 Merge branch 'master' into develop 2017-10-13 10:49:55 +02:00
Torkel Ödegaard
7bfd8e2a56 docs: doc updates 2017-10-13 10:31:34 +02:00
Carl Bergquist
8e4a7060ca Merge pull request #9515 from imweijh/patch-1 
Update rpm.md
 2017-10-13 08:54:19 +02:00
weijh
d0ace0bc13 Update rpm.md 
for error "The GPG keys listed for the "grafana" repository are already installed but they are not correct for this package."
 2017-10-13 12:00:22 +08:00
Torkel Ödegaard
8bb9d92a73 grid: minor progress on panel repeats 2017-10-12 21:37:27 +02:00
Torkel Ödegaard
215d59865e changed name back to use underscore instead of camelcase, need to think more about this 2017-10-12 20:02:07 +02:00
Torkel Ödegaard
83e496606e fixed dashboard sorting 2017-10-12 19:55:52 +02:00
Torkel Ödegaard
770a21b368 newgrid: worked panel duplicate 2017-10-12 19:01:02 +02:00
Torkel Ödegaard
48c8e4d627 fix: various fixes for new grid 2017-10-12 17:38:49 +02:00
Torkel Ödegaard
88ceb19d96 Merge branch 'master' into develop 2017-10-12 16:32:44 +02:00
Torkel Ödegaard
2992fb4b0e fix: can now remove annotation tags without popover closing 2017-10-12 16:24:32 +02:00
Alexander Zobnin
3b14bee559 tech: add backward compatibility for <spectrum-picker> directive (#9510) 2017-10-12 15:31:59 +02:00
Torkel Ödegaard
e7b718ed7a fix: fixed links on new 404 page, fixes #9493 2017-10-12 15:31:41 +02:00
bergquist
b5727949fd logging: dont use cli logger in http_server 2017-10-12 15:29:01 +02:00
bergquist
88f55b01d8 oauth: raise error if session state is missing 
ref #9476
 2017-10-12 15:25:27 +02:00
bergquist
0848ba2e9c oauth: provide more logging for failed oauth requests 2017-10-12 15:25:27 +02:00
bergquist
23c610015f prepare for 4.6.0-beta1 release 2017-10-12 15:25:27 +02:00
Torkel Ödegaard
2564dda2d0 docs: updated whats new article 2017-10-12 14:53:29 +02:00
Patrick O'Carroll
1334a9e138 docs: initial draft release v46 2017-10-12 13:55:27 +02:00
Daniel Lee
4bdc3a5829 graph: fix y-axis decimalTick check. Fixes #9405 2017-10-12 12:45:20 +02:00
Torkel Ödegaard
a7068d835a Merge branch 'master' of github.com:grafana/grafana 2017-10-12 12:40:43 +02:00
Torkel Ödegaard
c879cc7615 minor docs update 2017-10-12 12:40:37 +02:00
Torkel Ödegaard
a90052dac3 docs: annotation docs update 2017-10-12 12:19:25 +02:00
bergquist
7548734510 changelog: adds note about closing #7104 2017-10-12 12:13:00 +02:00
bergquist
a45bd400f1 changelog: adds note about closing #9373 2017-10-12 12:11:51 +02:00
Carl Bergquist
b63725033e Merge pull request #9450 from utkarshcmu/kafka_alert 
Kafka alerting
 2017-10-12 12:11:13 +02:00
Carl Bergquist
ee5f69beb4 metrics: disable gzip for /metrics endpoint (#9468) 
Prometheus client lib support gzip by itself. Which caused the
response to be double gzipped sometimes. We should use the Grafana
middle ware instead.

closes #9464
 2017-10-12 12:02:36 +02:00
Daniel Lee
4c5bf76829 dashgrid: fix or skip tests for repeat rows 2017-10-12 12:01:13 +02:00
Patrick O'Carroll
5895f9dc89 Annotation docs (#9506) 
* added images to annotation docs

* added gifs and png to annotations, minor code formatting fix in alertlist
 2017-10-12 11:37:42 +02:00
Torkel Ödegaard
98f00f7e1f Update CHANGELOG.md 2017-10-12 11:35:47 +02:00
Daniel Lee
55d510a319 Update PLUGIN_DEV.md 2017-10-12 11:32:33 +02:00
Daniel Lee
b38016e97f Update PLUGIN_DEV.md 2017-10-12 11:31:04 +02:00
Torkel Ödegaard
64d75db514 Update README.md 2017-10-12 11:30:01 +02:00
Carl Bergquist
9d53653647 Merge pull request #9378 from mattbostock/verify_tls 
Bugfix: Always verify TLS unless explicitly told otherwise
 2017-10-12 11:11:02 +02:00
Daniel Lee
5272dd6605 dashboardgrid: disable dynamic_dashboard_srv for now 
The row concept is probably going to change a lot so disabling
the repeating panels and repeating rows code and tests for now.
 2017-10-12 11:04:38 +02:00