IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,578 Commits 5,462 Branches 554 Tags 1.9 GiB
fac0333f47
Commit Graph

14578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Patel
bdb736a9ee http_server: All files in public/build have now a huge max-age (#11536) 2018-05-08 13:54:00 +02:00
Marcus Efraimsson
219118ef4a
Merge pull request #11867 from grafana/11862_migration 
decrease length of auth_id column in user_auth table
 2018-05-08 13:10:22 +02:00
Torkel Ödegaard
869d8e6f0e fix: ldap unit test 2018-05-08 12:50:39 +02:00
David
06aca5e8b5
Merge branch 'master' into prometheus_align_queries 2018-05-08 12:22:55 +02:00
bergquist
65352dccc0 only error log when err is not nil 2018-05-08 11:59:27 +02:00
bergquist
b649358734 rename alerting engine to service 2018-05-08 11:56:30 +02:00
Tomasz Torcz
e1b9d361ed case-insensitive LDAP group comparison (#9926) 
* ldap: case-insensitive LDAP group comparison

According to RFC2251 4.1.5, LDAP strings are case-insensitive. Disregard case when comparing group mappings.

* ldap: add test for case-insensitive group mapping
 2018-05-08 11:47:23 +02:00
Marcus Efraimsson
3d9ea3f1fa
changelog: add notes about closing #11813 
[skip ci]
 2018-05-08 11:36:05 +02:00
Torkel Ödegaard
4aae3c6c05 Merge branch 'master' of github.com:grafana/grafana 2018-05-08 11:33:13 +02:00
Torkel Ödegaard
cec783ca2c docs: updated changelog 2018-05-08 11:30:52 +02:00
Alexander Zobnin
00454b32f5 fix XSS vulnerabilities in dashboard links (#11813) 
fix XSS vulnerabilities in dashboard links
 2018-05-08 11:28:16 +02:00
Torkel Ödegaard
1c886940ff Merge branch 'jereksel-feature/save_json' 2018-05-08 11:25:20 +02:00
Torkel Ödegaard
eb3aa7b193 PR: ux changes to #11528 2018-05-08 11:24:20 +02:00
Torkel Ödegaard
6a5ce09b08 Merge branch 'feature/save_json' of https://github.com/jereksel/grafana into jereksel-feature/save_json 2018-05-08 10:54:26 +02:00
bergquist
7e9a10a5fb renames alerting engine to match other services 2018-05-08 10:53:42 +02:00
Dan Cech
93a8d8a25b allow analytics.js to be cached, enable anonymizeIP setting (#11656) 2018-05-08 10:48:27 +02:00
Torkel Ödegaard
a2b864dd6b
Update CHANGELOG.md 2018-05-08 10:23:28 +02:00
Torkel Ödegaard
f84534adea Revert "Add baron scrollbar to a node managed by gafana (#11850)" 
This reverts commit 34133671b9.
 2018-05-08 09:45:08 +02:00
Torkel Ödegaard
4b61c7cd55 Merge branch 'influx-db-select-query-variable' 2018-05-08 09:29:53 +02:00
Marcus Efraimsson
8ed79d614b
decrease length of auth_id column in user_auth table 
certain mysql versions don't support having indices with a greater varchar length
than 190.
 2018-05-08 09:26:28 +02:00
Carl Bergquist
8d13276844
Merge pull request #11852 from grafana/davkal/super-simple-docker 
Support for local Docker builds
 2018-05-08 09:17:01 +02:00
Torkel Ödegaard
b894a5ff16 Merge branch 'am/fix-query-variable-influxdb' of https://github.com/forzafootball/grafana into influx-db-select-query-variable 2018-05-08 09:01:58 +02:00
Patrick O'Carroll
8f0c8005af fixed svg background (#11848) 2018-05-08 06:40:34 +02:00
Ryan McKinley
34133671b9 Add baron scrollbar to a node managed by gafana (#11850) 
* Add baron scroller to grafana panel, not plugin panel

* remove comment about root <div> element, since it will not be true
 2018-05-08 06:39:12 +02:00
David
ed067e8d35 Fix CSS asset loading for yarn start (HMR) (#11855) 
* enable url() processing in CSS to ensure assets load in HMR mode
* only needed when running `yarn start` which needs this for the hot
reloader
 2018-05-07 17:02:55 +02:00
Torkel Ödegaard
4c6e4e2aa6 fix: fixed gometalinter issues with Discord PR 2018-05-07 17:01:31 +02:00
Carl Bergquist
23738ad4ac
Merge pull request #11801 from grafana/provision-service-refactor 
Server shutdown flow rewrite & provision service refactor
 2018-05-07 16:32:26 +02:00
David
1236b7b918
Merge pull request #11770 from grafana/davkal/explore-panel-link 
Explore: Add entry to panel menu to jump to Explore
 2018-05-07 16:31:19 +02:00
Torkel Ödegaard
b170bde74f
Update CHANGELOG.md 2018-05-07 15:44:34 +02:00
Torkel Ödegaard
c46a3c8646 Merge branch 'jereksel-feature/discord' 2018-05-07 15:41:10 +02:00
Torkel Ödegaard
e5e8b9800c merge: fixed conflicts in discord PR 2018-05-07 15:40:43 +02:00
Marcus Efraimsson
23c88a3b3f
docs: update installation instructions targeting v5.1.1 stable 2018-05-07 14:57:18 +02:00
Dan Cech
29c9d3f74c fix root_url in docs & comments (#11819) 
* fix root_url in docs & comments

* include ports in docker-compose config
 2018-05-07 14:18:21 +02:00
Marcus Efraimsson
b804f6d999
changelog: 5.1.1 update 
add notes about closing #11743 and add release data for 5.1.1
[skip ci]
 2018-05-07 14:09:04 +02:00
Torkel Ödegaard
249c1e8d3d fix: loading of css url (images/fonts) 2018-05-07 14:02:38 +02:00
David Kaltschmidt
c3cc60b080 Support for local Docker builds 
* add a git-ignored `local/` folder for Makefile/Dockerfile
* import `local/Makefile` to root Makefile
* add `.dockerignore`
 2018-05-07 12:32:18 +02:00
Torkel Ödegaard
afec9ec5be
Update ROADMAP.md 2018-05-07 11:16:59 +02:00
Dan Cech
543c7fe587 support additional fields in authproxy (#11661) 2018-05-07 10:39:16 +02:00
Dan Cech
b4ad044044 better handling for special chars in db config (#11662) 2018-05-07 10:33:33 +02:00
Florian Plattner
5d54bc00e1 Fix/improved csv output (#11740) 
* fix: initial cleanup and implementation

* feat: finish special character escaping

* feat: updates fileExport to generate RFC-4180 compliant CSV

* chore: replace html decoder with the lodash version and final cleanup

* fix: restore character html decoding
 2018-05-07 10:22:54 +02:00
Torkel Ödegaard
871b85f199
Update ROADMAP.md 2018-05-07 10:16:39 +02:00
Torkel Ödegaard
ec7703bad7
Update ROADMAP.md 2018-05-07 10:14:04 +02:00
Torkel Ödegaard
217d43e512
Update ROADMAP.md 2018-05-07 10:13:39 +02:00
Carl Bergquist
06623506d3
Merge pull request #11805 from simPod/missing-lock 
Add missing items to Gopkg.lock
 2018-05-07 10:08:05 +02:00
Torkel Ödegaard
fb7db147ed Merge remote-tracking branch 'origin/11809-permission-dropdown' 2018-05-07 09:49:38 +02:00
Šimon Podlipský
1fbac909cb Remove preceding / from public JS path (#11804) 2018-05-07 08:11:48 +02:00
Ryan McKinley
2ee59ccad8 Add panel scrolling docs (#11826) 2018-05-07 08:03:30 +02:00
Marcus Efraimsson
e078e2733f
Merge pull request #11803 from svenklemm/whatsnew51-table 
Fix variable interpolation examples in whats new in 5.1 docs
 2018-05-06 08:45:02 +02:00
Sven Klemm
ed4dc241cc escape pipe symbol same way as in templating docs 2018-05-05 10:47:44 +02:00
Marcus Efraimsson
8523b1e410
changelog: add notes about closing #11616 
[skip ci]
 2018-05-04 15:03:30 +02:00