public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,865 Commits 655 Branches 650 Tags
b94de101cd95b23f0266cd61e311f09ae8ad7592
Commit Graph
19865 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist d3b23b01d8 hide row actions for viewers 
closes #11112
 2018-03-06 12:32:50 +01:00
bergquist 5934521137 fixes invalid link to profile pic when gravatar is disabled 
closes #11097
 2018-03-06 11:46:50 +01:00
bergquist 0780d57548 changelog: adds note about closing #11016 2018-03-06 11:31:24 +01:00
Torkel Ödegaard 0de90accfb fix: restores white resize handle for panels, fixes #11103 2018-03-06 11:19:01 +01:00
bergquist cf6e5672ab changelog: adds note about closing #11063 2018-03-06 10:56:17 +01:00
Sven Klemm 6b656094fc Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-06 10:43:01 +01:00
Tony Dong 96504940a8 fix typo in heatmap rendering.ts (#11101) 2018-03-06 10:36:06 +01:00
Carl Bergquist c372716692 Merge pull request #11109 from bergquist/unsaved_changes_fix 
ignore iteration property when checking for unsaved changes
 2018-03-06 10:33:27 +01:00
Carl Bergquist 1fe8b33f65 Merge pull request #11000 from victorclaessen/master 
Added radiation units
 2018-03-06 09:38:12 +01:00
Daniel Lee 0e54c474aa Merge branch 'master' into docs-5.1 2018-03-06 09:28:13 +01:00
Daniel Lee 4d434d9845 docs: add v5.1 to versions 2018-03-06 09:27:40 +01:00
Daniel Lee 8a1bd2ee22 docs: fill for mysql/postgres 
ref #10138
 2018-03-06 09:24:36 +01:00
bergquist a7d62f44d3 ignore iteration property when checking for unsaved changes 
closes #11063
 2018-03-05 22:03:26 +01:00
Daniel Lee 1a16e588f7 changelog: notes for #11055 and #9487 2018-03-05 19:44:09 +01:00
Daniel Lee 9c8733ac85 Merge pull request #11093 from svenklemm/postgres-connection 
postgres: use net/url to generate postgres connection url
 2018-03-05 19:27:02 +01:00
Sven Klemm 4904a051cf use net/url to generate postgres connection url 2018-03-05 16:06:04 +01:00
Patrick O'Carroll 42cd462cbf made drop-menu into link 2018-03-05 14:09:04 +01:00
Alexander Zobnin 5037f93a78 heatmap: sort series before converting to heatmap. 
This allows to use histogram series from arbitrary datasource and display it properly.
 2018-03-05 14:01:55 +03:00
Sven Klemm 83200c289a use metricColumn in query builder 2018-03-04 23:32:23 +01:00
Sven Klemm 6766028d7a Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-04 21:40:20 +01:00
Daniel Lee 7ce63169a0 Merge pull request #10138 from svenklemm/macroengine-interpolate 
postgres+mysql: add optional fill parameter to $__timeGroup macro to fill in missing values in series
 2018-03-04 21:38:30 +01:00
Sven Klemm bf4a30d30f set rawSQL when rendering query builder query 2018-03-04 19:46:11 +01:00
Sven Klemm 26e09b598c fix group by column 2018-03-04 19:35:43 +01:00
Sven Klemm e8c6341fed clean up aggregation functions 2018-03-04 10:18:11 +01:00
Sven Klemm 7104e6f9f8 fix variable interpolation 2018-03-03 22:11:51 +01:00
Sven Klemm fd518846b1 rename field to column 2018-03-03 20:57:00 +01:00
Julien Pivotto 69c93e6401 Fix Prometheus 2.0 stats (#11048) 
Fixes #11016

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-03-03 13:40:28 +01:00
Torkel Ödegaard 328fc45bcc docs: removed beta notice in whats new article 2018-03-03 12:49:40 +01:00
Sven Klemm 4e826ff8f7 remove spaces around arguments of macros 2018-03-02 19:24:15 +01:00
Sven Klemm f1ba9137c0 remove spaces around arguments before calling macro expansion 2018-03-02 19:20:30 +01:00
Sven Klemm 0f931f9e5e Merge remote-tracking branch 'upstream/master' into macroengine-interpolate 2018-03-01 18:01:54 +01:00
Sven Klemm 1a051ce320 Merge remote-tracking branch 'upstream/master' into postgres-query-builder 2018-03-01 14:40:43 +01:00
Daniel Lee 655d2fb405 docs: update current version to 5.0 2018-03-01 10:11:52 +01:00
Daniel Lee cc2f478792 Merge branch 'docs_v5.0' 2018-03-01 09:36:48 +01:00
Daniel Lee f46f43dc32 docs: update install pages for v5.0.0 2018-03-01 09:20:52 +01:00
Alexander Zobnin fa8403750b Merge remote-tracking branch 'upstream/master' into prometheus-heatmap 2018-03-01 11:09:04 +03:00
Daniel Lee 59a13f1847 update version to 5.0.1-pre1 2018-03-01 08:30:44 +01:00
Daniel Lee 2e2f47177d changelog update for 5.0.0 stable 2018-03-01 08:14:27 +01:00
Ryan Gifford 49266d5150 Add metrics that triggered alert to description 2018-02-28 15:26:11 -07:00
Torkel Ödegaard af6e28366b build: updated version v5.0.0 2018-02-28 18:42:58 +01:00
Marcus Efraimsson 3d4e99d8be Merge pull request #11040 from grafana/permission-checks 
Add permission check for dashboard diff api route
 2018-02-28 18:23:39 +01:00
Alexander Zobnin d6087eb5f4 heatmap: hide unused Y axis controls for tsbuckets mode 2018-02-28 16:30:00 +03:00
Alexander Zobnin 76c684cc01 heatmap: format numeric tick labels in tsbuckets mode 2018-02-28 16:19:58 +03:00
Alexander Zobnin dfe8b0a0d2 heatmap: add rendering tests for tsbuckets mode 2018-02-28 15:58:28 +03:00
Laurent Godet 59704ee939 Fix Github OAuth not working with private Organizations (#11028) 
* Fix Github OAuth not working with private organizations

* Update documentation
 2018-02-28 13:08:15 +01:00
Torkel Ödegaard e67b1ebf33 Merge branch 'master' of github.com:grafana/grafana 2018-02-28 13:06:16 +01:00
Marcus Efraimsson 576deb37e8 login: hide sign up if configured so. Fixes #11041 2018-02-28 13:01:35 +01:00
Torkel Ödegaard 0c6b34e216 Merge branch 'tag-variables' of https://github.com/DanCech/grafana into DanCech-tag-variables 2018-02-28 12:39:53 +01:00
Marcus Efraimsson c298c7f3c9 Merge pull request #11034 from grafana/10701_permissions 
Only allow override permissions that is higher
 2018-02-28 09:15:46 +01:00
Marcus Efraimsson f44e476580 permissions: fix validation of permissions before update 
Did a bad pointer comparison so extended the tests for duplicate permissions.
 2018-02-28 08:48:28 +01:00