public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,856 Commits 655 Branches 650 Tags
d95eabfeec00a2386a64db9461e119ff0c8ac4f6
Commit Graph
13856 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Adilet Maratov 50daf7463d Solves problem with Github authentication restriction by organization membership when the organization's access policy is set to "Access restricted". "Access restricted" policy should not stop user to authenticate. 
How it is solved:
* Take organizations_url field data from user basic data response
* Make another request to get all organization the user is a member of (public membership)
* Authenticate user if appropriate organization found in that list
 2017-12-07 16:13:49 +06:00
Alexander Zobnin 9bff005faf Merge remote-tracking branch 'upstream/develop' into graph-legend-v5 2017-12-07 12:45:08 +03:00
Alexander Zobnin 58d40eb6a0 graph: fix legend height calculation 2017-12-07 12:39:10 +03:00
Sven Klemm b44c599410 postgres: pass timerange for template variable queries (#10069) 
* pass timerange for template queries when refresh is set to timerange
change

* document on time range change refresh mode for template queries
 2017-12-07 10:05:04 +01:00
Alexander Zobnin 3cdf0dce56 graph: move auto decimals calc to ticks.ts and use it for legend values format. 2017-12-07 10:49:00 +03:00
Ben Whaley fe88658bdd Resolves grafana/grafana:#9309 2017-12-07 03:43:32 +00:00
Marcus Efraimsson 58fb35c5cb dashboard: fix linting and formating - #10100 2017-12-06 23:51:39 +01:00
Marcus Efraimsson cb0dac11a3 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-06 20:35:16 +01:00
Marcus Efraimsson f87b9aaa8a dashboard: keyboard nav in dashboard search - closes #10100 
Pressing enter/return for a folder toggles it.
Pressing enter/return for a dashboard navigates to it.
 2017-12-06 20:34:41 +01:00
Alexander Zobnin 2cf1c29eae graph: refactor (don't render twice) 2017-12-06 21:30:14 +03:00
Sven Klemm c80eadcdf4 handle native postgres datetime types in annotation queries (#9986) 2017-12-06 18:12:24 +01:00
Sven Klemm 373389c920 treat any text column in timeseries query as metric name unless column (#9985) 
named metric is present
 2017-12-06 18:04:33 +01:00
Johannes Schill e8807f4bce Fixing tabs for Grafana 5 - #10082 (#10103) 
* ux: Make new tabs responsive #10082

* ux: Add possibility to manipulate url in angular router outside of angular - and use it in the responsive navigation #10082
 2017-12-06 17:36:44 +01:00
Patrick O'Carroll 8adaf99bff other panels now hidden, fixes 10088 (#10102) 2017-12-06 16:55:12 +01:00
Patrick O'Carroll ea3447fbfd fixed 404 for grafana5 + now responsive (#10101) 
* fixed 404 for grafana5 + now resonsive

* code formatting fixes
 2017-12-06 16:54:24 +01:00
Marcus Efraimsson fe177f198b dashboard: fix search results tests #10083 2017-12-06 14:32:22 +01:00
Marcus Efraimsson 0029d96579 dashboard: Show CTA for empty lists/folders #10083 2017-12-06 14:27:29 +01:00
Marcus Efraimsson dd3c9da009 dashboard: Dashboard folder page wip #10083 2017-12-06 14:11:25 +01:00
bergquist 48d9d0d356 prom: enable min interval per panel 
This commit makes it possible to set min interval per panel.
Overrides the value configured on the datasource.

ref #9705
 2017-12-06 13:51:19 +01:00
David Kaltschmidt 011b2cd1b2 Fix merge issue on multi-query table transforms 
* after a match has been found the merger should keep looking for more
 2017-12-06 13:12:16 +01:00
Alexander Zobnin 6b4b7969fe graph: fix karma tests 2017-12-06 14:55:57 +03:00
Alexander Zobnin 0c3e04ca60 graph: render legend before graph 2017-12-06 14:14:00 +03:00
Patrick O'Carroll 3aa1cb012a added tooltip, fixes #10092 (#10097) 
* added tooltip, fixes #10092

* fixed code formatting
 2017-12-06 12:13:17 +01:00
Alexander Zobnin ae80a589c1 graph: refactor 2017-12-06 12:22:35 +03:00
Alexander Zobnin 36b3309961 graph: convert legend.js to typescript 2017-12-06 11:29:13 +03:00
linux chips 5114b1f792 fixing a few fromattings 2017-12-06 10:32:20 +03:00
linux chips 1c1675afe3 adding mssql docs 2017-12-05 23:41:32 +03:00
bergquist bbc8aa0525 docs: link from cfg page to provisioning 2017-12-05 18:44:31 +01:00
Trent White 5894b8f4e0 reduce app icon by 3px on home dashboard - wasn't lining up properly with starred/recently viewed dasboard list properly 2017-12-05 12:30:49 -05:00
Torkel Ödegaard 46c8b36244 ux: minor style tweaks to cards and sidemenu icons for white theme 2017-12-05 15:50:15 +01:00
Torkel Ödegaard 2414074c94 Merge branch 'develop-light-theme' into develop 2017-12-05 15:16:42 +01:00
Torkel Ödegaard 8085182121 ux: tweaked light theme and made page container more fluid 2017-12-05 15:16:06 +01:00
Marcus Efraimsson 8e8c3d2eeb Merge branch 'develop' into develop_searchresults 2017-12-05 14:25:20 +01:00
Daniel Lee 781349d360 dashboard: dashboard search results component. closes #10080 2017-12-05 14:20:44 +01:00
Torkel Ödegaard 16fbefbbc5 Merge branch 'develop' into develop-light-theme 2017-12-05 13:31:05 +01:00
Torkel Ödegaard 35f97c9a2f docs: added utm_source for link from ds list page to docs page 2017-12-05 13:28:20 +01:00
linux chips 8883201635 updating the query editor's syntax highlighting mode to sqlserver 2017-12-05 14:49:48 +03:00
Patrick O'Carroll df5fd3cd1d fixed grey colors in light-theme, added new variables, played a bit with blue 2017-12-05 12:48:16 +01:00
Torkel Ödegaard 282d830ff4 v5: removed permissions from dashboard cog dropdown, closes #10068 2017-12-05 12:28:47 +01:00
Torkel Ödegaard 90bcec8178 nav: updated nav item id for manage dashboards 2017-12-05 12:25:59 +01:00
Torkel Ödegaard 90da964a14 refactoring PR #10068 2017-12-05 12:19:01 +01:00
Torkel Ödegaard cc2349f6aa Merge branch 'feat-10064' of https://github.com/alexanderzobnin/grafana into develop 2017-12-05 12:03:33 +01:00
Torkel Ödegaard 31bb2f8006 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-05 12:03:28 +01:00
Alexander Zobnin afc036492c dashboard: migrations for repeat rows (#10070) 2017-12-05 11:46:58 +01:00
David Kaltschmidt eb31833d52 Backwards-compat for multi-query table transform 
* treat single-query table panels like they were before
* adjusted test cases
 2017-12-05 11:25:10 +01:00
Alexander Zobnin deebaabfc8 graph: make legend scrollable 2017-12-05 13:07:33 +03:00
Torkel Ödegaard 6fae999f62 Merge branch 'develop' of github.com:grafana/grafana into develop 2017-12-05 10:23:03 +01:00
bergquist 35232a77e6 removes unused properties 
the dsType property caused some confusion about what datasource is
beeing used. I just removed it since it not beeing used.

closes #10072
 2017-12-05 08:26:43 +01:00
David Kaltschmidt 1dd90c8105 Making the multi-query table transform the default table transform 2017-12-04 17:55:00 +01:00
Torkel Ödegaard 9be6f9734d ux: updated padding 2017-12-04 16:29:46 +01:00