IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,569 Commits 1,119 Branches 715 Tags
6c0752473a8edae505d95fa4bc075603ae74a603
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 6c0752473a Sqlstore refactor (#11908) 
* refactor: tracing service refactoring

* refactor: sqlstore to instance service

* refactor: sqlstore & registory priority

* refactor: sqlstore refactor wip

* sqlstore: progress on getting tests to work again

* sqlstore: progress on refactoring and getting tests working

* sqlstore: connection string fix

* fix: not sure why this test is not working and required changing expires

* fix: updated grafana-cli
 2018-05-18 11:10:10 +02:00
Torkel Ödegaard 27e1c67453 refactor: tracing service refactoring (#11907) 2018-05-10 16:51:55 +02:00
Torkel Ödegaard 869d8e6f0e fix: ldap unit test 2018-05-08 12:50:39 +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
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
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
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
Torkel Ödegaard 4c6e4e2aa6 fix: fixed gometalinter issues with Discord PR 2018-05-07 17:01:31 +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
Torkel Ödegaard 249c1e8d3d fix: loading of css url (images/fonts) 2018-05-07 14:02:38 +02:00
Torkel Ödegaard afec9ec5be Update ROADMAP.md 2018-05-07 11:16:59 +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
Torkel Ödegaard fb7db147ed Merge remote-tracking branch 'origin/11809-permission-dropdown' 2018-05-07 09:49:38 +02:00
Torkel Ödegaard c40a50829d fix: removed manully added http server from inject graph as it is now a self registered service 2018-05-02 21:30:15 +02:00
Torkel Ödegaard b5e70d4607 fix: removed unused channel 2018-05-02 19:56:15 +02:00
Torkel Ödegaard e3ea6c683c fix: comment spell fix 2018-05-02 19:56:15 +02:00
Torkel Ödegaard 23655315b8 fix: fixed race condition between http.Server ListenAndServe & Shutdown, now service crash during startup correctly closes http server every time 2018-05-02 19:56:15 +02:00
Torkel Ödegaard d04ad835e2 refactoring: lots of refactoring around server shutdown flows, making sure process is terminated when background service has crashed 2018-05-02 19:56:15 +02:00
Torkel Ödegaard 053c2039bb refactor: provisioning service refactoring 2018-05-02 19:56:15 +02:00
Torkel Ödegaard 14bb7832af Metrics package now follows new service interface & registration (#11787) 
* refactoring: metrics package now follows new service interface & registration

* fix: minor fix, make sure metrics service is imported, by grafana-server
 2018-05-02 19:54:07 +02:00
Torkel Ödegaard 2b93cbbf04 --amend 2018-05-01 14:18:10 +02:00
Torkel Ödegaard 13e015fe3f fix: improved handling of http server shutdown 2018-05-01 14:14:11 +02:00
Torkel Ödegaard fa7d7ed5df Initial Baby Step to refactoring settings from global vars to instance (#11777) 
* wip: start on refactoring settings

* settings: progress on settings refactor

* refactor: progress on settings refactoring

* fix: fixed failing test

* settings: moved smtp settings from global to instance
 2018-04-30 16:21:04 +02:00
Torkel Ödegaard b3531362ca fix: minor fix to plugin service shut down flow 2018-04-27 21:22:29 +02:00
Torkel Ödegaard a8eed9d344 Refactoring PluginManager to be a self registering service (#11755) 
* refator: refactored PluginManager to be a self registering service, a lot more work needed to fully make plugin manager use instance variables and not so many globals
 2018-04-27 15:11:55 +02:00
Torkel Ödegaard 44b0f15a61 fix: removed log calls used while troubleshooting 2018-04-27 14:28:42 +02:00
Torkel Ödegaard df71fe33fd refactor: refactoring notification service to use new service registry hooks 2018-04-27 14:15:17 +02:00
Torkel Ödegaard e81330abf0 fix: sign in link should have target self to trigger full page reload, fixes #11626 2018-04-17 21:01:52 +02:00
Torkel Ödegaard 1594ceeb6f fix: Label font weight should be semi bold, fixes #11629 2018-04-17 19:40:44 +02:00
Torkel Ödegaard 85121e55c9 fix: Row state is now ignored when looking for dashboard changes (#11608) 
* fix: Row state is now ignored when looking for dashboawrd changes, had to fix bug in expand logic to make fix work. Also moved the ChangeTracker to it's own file and moved tests to jest, fixes #11208

* removed commented out log calls
 2018-04-17 09:41:07 +02:00
Torkel Ödegaard 9ec89c1848 disable codecov comments 2018-04-17 09:20:43 +02:00
Torkel Ödegaard d60c7b2013 docs: updated debian distro in install docs to stretch, closes #11527 2018-04-09 08:18:58 +02:00
Torkel Ödegaard 310d740667 Update ROADMAP.md 2018-03-07 12:53:00 +01:00
Torkel Ödegaard 0de90accfb fix: restores white resize handle for panels, fixes #11103 2018-03-06 11:19:01 +01:00
Torkel Ödegaard 328fc45bcc docs: removed beta notice in whats new article 2018-03-03 12:49:40 +01:00
Torkel Ödegaard af6e28366b build: updated version 2018-02-28 18:42:58 +01:00
Torkel Ödegaard e67b1ebf33 Merge branch 'master' of github.com:grafana/grafana 2018-02-28 13:06:16 +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
Torkel Ödegaard dff2c14aed fix: changed react-grid-layout to use grafana fork to a commit before https://github.com/STRML/react-grid-layout/commit/15503084fb7b0af826427c8c0706901e5745a39f, this fixes all the panel movement bugs, fixes #10831 2018-02-27 11:34:29 +01:00
Torkel Ödegaard 2451282563 Update ROADMAP.md 2018-02-22 15:24:38 +01:00
Torkel Ödegaard 5b8a49ee44 Update ROADMAP.md 2018-02-22 15:14:37 +01:00
Torkel Ödegaard aa3872a0e2 fix: elasticsearch terms size now allows custom values again, fixes #10124 2018-02-21 15:41:55 +01:00
Torkel Ödegaard 98a4731454 fix: scrollbar position now to max right pos, fixes #10982 2018-02-21 11:01:48 +01:00
Torkel Ödegaard 2f6e77af1e Merge branch 'master' into docs_v5.0 2018-02-21 10:47:14 +01:00
Torkel Ödegaard 3964d6b797 fix: added new known data source plugins, and minor migration fix for v1 dashboards 2018-02-20 16:08:43 +01:00
Torkel Ödegaard dceac3aa71 fix: fixes to signup flow, fixes #9816 2018-02-20 13:39:16 +01:00
Torkel Ödegaard 69ccbffaed fix: fixed github oauth login with allowed orgs filter, fixes #10964, reverts #10851 2018-02-20 11:30:18 +01:00
Torkel Ödegaard 21d48df095 fix: plugin dashboard did not get plugin id after import 2018-02-20 11:30:18 +01:00
Torkel Ödegaard 7d0c3ae6a7 fix: alert history list now shows on graphs with manually added annotation events, fixes #10968 2018-02-20 09:33:28 +01:00
Torkel Ödegaard c5461fe2e2 docs: updated for changelog and docs with beta4 2018-02-19 15:41:59 +01:00
Torkel Ödegaard 1de889169c build: updated build version to v5.0-beta4 2018-02-19 14:24:01 +01:00
Torkel Ödegaard ae20366b01 graph: added 0.5 point radius option 2018-02-19 11:37:42 +01:00
Torkel Ödegaard 2e9433c495 fix: fixed redirect after save, fixes #10946 2018-02-16 16:29:14 +01:00
Torkel Ödegaard 497132c441 fix: esc key now closes panel edit/view mode as usual, fixes #10945 2018-02-16 16:09:54 +01:00
Torkel Ödegaard 76cfa0bee3 Update CHANGELOG.md 2018-02-16 14:48:50 +01:00
Torkel Ödegaard 577a00e3cf docs: updated to beta3 2018-02-16 14:43:36 +01:00
Torkel Ödegaard 8af2c9f1f8 test: added integration test for #10941 2018-02-16 14:17:41 +01:00
Torkel Ödegaard 5323971c21 refactoring: alert rule query refactoring (#10941) 2018-02-16 13:56:04 +01:00
Torkel Ödegaard 5e33a52b69 updated version to v5-beta3 2018-02-16 13:26:04 +01:00
Torkel Ödegaard ac6800a88a Merge branch 'master' of github.com:grafana/grafana 2018-02-16 10:34:15 +01:00
Torkel Ödegaard 39fdfb7922 Merge branch 'master' of github.com:grafana/grafana 2018-02-16 09:14:44 +01:00
Torkel Ödegaard 6b930df4d4 updated download links 2018-02-15 14:48:11 +01:00
Torkel Ödegaard 4fb7ba454e docs: Updated changelog 2018-02-15 13:41:48 +01:00
Torkel Ödegaard ed546c9720 updated package.json version 2018-02-15 13:30:40 +01:00
Torkel Ödegaard 168ac314fc fix: more phantomjs fixes 2018-02-15 13:20:50 +01:00
Torkel Ödegaard 57103ec98a fix: refactoring #10922 2018-02-15 12:42:17 +01:00
Torkel Ödegaard 4b4e38531b Merge branch 'fix-10526' of https://github.com/alexanderzobnin/grafana 2018-02-15 11:46:33 +01:00
Torkel Ödegaard fcaa8227a6 Dashboard acl query fixes (#10909) 
* initial fixes for dashboard permission acl list query, fixes #10864

* permissions: refactoring of acl api and query
 2018-02-14 15:04:26 +01:00
Torkel Ödegaard 73eaba076e wip: dashboard acl ux2, #10747 2018-02-14 15:03:22 +01:00
Torkel Ödegaard ec6f0f94b8 permissions: refactoring of acl api and query 2018-02-14 14:31:20 +01:00
Torkel Ödegaard db89ac4134 initial fixes for dashboard permission acl list query, fixes #10864 2018-02-14 11:50:58 +01:00
Torkel Ödegaard 8dd4d505ee Merge branch 'dashboard-search-permissions-filter' 2018-02-14 10:48:55 +01:00
Torkel Ödegaard ead1c300d7 API Integration Tests via jest (#10899) 
* tests: experiment with api tests

* api tests are getting nice

* api: api testing ready for feedback
 2018-02-14 10:26:20 +01:00
Torkel Ödegaard bb681cd498 Merge branch '10819_empty_dashboard_list' 2018-02-14 09:38:19 +01:00
Torkel Ödegaard b0fae0129c ux: refactoring #10884 2018-02-14 09:37:39 +01:00
Torkel Ödegaard 162439a8d6 fix: removed logging 2018-02-13 17:03:20 +01:00
Torkel Ödegaard e3c3f3ce4c fix: sql search permissions filter fix 2018-02-13 16:49:00 +01:00
Torkel Ödegaard 6bbd87dd9c ux: minor tweak to grid resize handle color 2018-02-10 20:11:11 +01:00
Torkel Ödegaard 4d5a24a6c4 permissions: might have a solution for search 2018-02-09 17:24:34 +01:00
Torkel Ödegaard c01b80522e fix: clear items list before fetching permissions list 2018-02-09 16:13:20 +01:00
Torkel Ödegaard e949eb3f58 Merge branch 'master' into dashboard-search-permissions-filter 2018-02-09 15:16:34 +01:00
Torkel Ödegaard e672604835 docs: minor docs update 2018-02-09 12:53:07 +01:00
Torkel Ödegaard 41a6e7c2c8 docs: updated docs landing page 2018-02-09 12:39:17 +01:00
Torkel Ödegaard 8e8f3c4332 dashboard and folder search with permissions 2018-02-08 17:11:01 +01:00
Torkel Ödegaard b84fd3a7ae fix: initial fix for #10822 2018-02-07 17:54:21 +01:00
Torkel Ödegaard 39238c192d fix: folder redirect after creation 2018-02-07 15:33:08 +01:00
Torkel Ödegaard 541b0a0ca1 fix: fixed bug with redirect after new dashboard saved, related to buggy angularjs location path/url and base href, fixes #10817 2018-02-07 14:10:23 +01:00
Torkel Ödegaard 17cbd9d6b4 fix: removed old shortcut that does not exist, fixes #10802 2018-02-07 10:43:42 +01:00
Torkel Ödegaard 76c2a6e5ee build: fixed recovery test 2018-02-06 13:16:21 +01:00
Torkel Ödegaard f54ba20783 fix: css fix, found a better way to fix #10772 2018-02-06 13:01:23 +01:00
Torkel Ödegaard f1f8c23206 fix: minor build fix 2018-02-06 12:43:11 +01:00