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
15,627 Commits 1,119 Branches 715 Tags
7b06800295189343bb61e6ef56cebe70056cc23b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Torkel Ödegaard 7b06800295 refactor: changed nav store to use nav index and selector instead of initNav action 2018-09-02 10:36:36 -07:00
Torkel Ödegaard 2ac202b22f moving things around 2018-09-02 07:11:21 -07:00
Torkel Ödegaard de456f8b73 wip: solid progress on redux -> angular location bridge update 2018-08-31 13:16:20 -07:00
Torkel Ödegaard 6efe9da10f wip: moving things around 2018-08-31 09:49:32 -07:00
Torkel Ödegaard 2c85e44ab7 wip: moveing things around 2018-08-31 09:49:02 -07:00
Torkel Ödegaard 593cc5380f wip: redux refactor 2018-08-31 09:42:32 -07:00
Torkel Ödegaard d68007fde3 wip: redux 2018-08-31 14:38:23 +02:00
Torkel Ödegaard cf58eea1db redux: wip progress for using redux 2018-08-31 13:24:36 +02:00
Torkel Ödegaard ad9f38ae4d Merge branch 'master' into redux-poc2 2018-08-30 13:04:29 -07:00
Torkel Ödegaard e1beaaa0f7 tslint: tslint to const fixes part3 (#13036) 2018-08-26 21:52:57 +02:00
Torkel Ödegaard 35c00891e7 tslint: more const fixes (#13035) 2018-08-26 20:19:23 +02:00
Torkel Ödegaard 314b645857 tslint: changing vars -> const (#13034) 2018-08-26 18:43:07 +02:00
Torkel Ödegaard 9b978b7203 tslint: autofix of let -> const (#13033) 2018-08-26 17:14:40 +02:00
Torkel Ödegaard 5f81c879fa Merge branch 'code-migrations' 2018-08-21 13:53:46 +02:00
Torkel Ödegaard 92ed1f04af sql: added code migration type 2018-08-21 13:53:04 +02:00
Torkel Ödegaard a1ed3ae094 feat: add auto fit panels to shortcut modal, closes #12768 2018-08-14 12:26:08 +02:00
Torkel Ödegaard 4f704cec53 fix: ds_proxy test not initiating header 2018-08-14 09:18:23 +02:00
Torkel Ödegaard 0fa47c5ef4 Update CHANGELOG.md 2018-08-14 08:55:27 +02:00
Torkel Ödegaard 7e0482e78d Fix for Graphite function parameter quoting (#12907) 
* fix: graphite function parameters should never be quoted for boolean, node, int and float types, fixes #11927

* Update gfunc.ts
 2018-08-14 08:52:51 +02:00
Torkel Ödegaard e37931b79d Update CHANGELOG.md 2018-08-14 08:52:30 +02:00
Torkel Ödegaard 277a696fa5 fix: added missing ini default keys, fixes #12800 (#12912) 2018-08-14 08:49:56 +02:00
Torkel Ödegaard 2459b177f9 change: Set User-Agent to Grafana/%Version% Proxied-DS-Request %DS-Type% in all proxied ds requests 2018-08-13 18:09:01 +02:00
Torkel Ödegaard c521f51780 tech: removed js related stuff now that 99% is typescript (#12905) 2018-08-13 15:56:11 +02:00
Torkel Ödegaard b0f3ca16d9 Update CHANGELOG.md 2018-08-13 15:40:37 +02:00
Torkel Ödegaard f2b1fabd5c fix: Alerting rendering timeout was 30 seconds, same as alert rule eval timeout, this should be much lower so the rendering timeout does not timeout the rule context, fixes #12151 (#12903) 2018-08-13 15:38:28 +02:00
Torkel Ödegaard 974359534f Update CHANGELOG.md 2018-08-13 07:54:49 +02:00
Torkel Ödegaard 4a387a9655 Update ROADMAP.md 2018-08-07 11:43:04 +02:00
Torkel Ödegaard 433b0abf6d Update ROADMAP.md 2018-08-07 11:36:17 +02:00
Torkel Ödegaard e115e600db Update ROADMAP.md 2018-08-07 11:35:05 +02:00
Torkel Ödegaard 624f3a0173 refactor: take submenu into account PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard b1b8a38061 refactor: renaming variables, refactoring PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard 013f8cd8ea refactor: moving code around a bit, refactoring PR #12796 2018-08-05 11:39:46 +02:00
Torkel Ödegaard 169fcba520 Update CHANGELOG.md 2018-08-02 11:51:41 +02:00
Torkel Ödegaard 89eae1566d fix: team email tooltip was not showing 2018-07-31 17:31:45 +02:00
Torkel Ödegaard 276a5e6eb5 fix: test data api route used old name for test data datasource, fixes #12773 2018-07-31 17:29:02 +02:00
Torkel Ödegaard e413f026b9 fix: postgres/mysql engine cache was not being used, fixes #12636 (#12642) 2018-07-18 07:21:32 -07:00
Torkel Ödegaard ce64a3ccbc added: replaces added to grafana 2018-07-18 15:40:30 +02:00
Torkel Ödegaard a4587cdeee fix: datasource search was not working properly 2018-07-18 14:28:38 +02:00
Torkel Ödegaard 29291f88b1 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 13:20:56 +02:00
Torkel Ödegaard 913b8576f8 docs: minor docs fix 2018-07-18 13:20:28 +02:00
Torkel Ödegaard 3fa2ec0762 Merge branch 'ldap-grafana-admin' 2018-07-18 13:02:49 +02:00
Torkel Ödegaard c63f142578 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 13:02:27 +02:00
Torkel Ödegaard 660dc09fa9 Merge branch 'master' of github.com:grafana/grafana 2018-07-18 12:46:42 +02:00
Torkel Ödegaard e318489bd4 Fix default browser th font-weight 2018-07-17 11:56:33 +02:00
Torkel Ödegaard c189262bac ldap: Make it possible to define Grafana admins via ldap setup, closes #2469 2018-07-16 16:56:42 +02:00
Torkel Ödegaard f0508aa526 Merge branch 'master' of github.com:grafana/grafana 2018-07-16 13:52:34 +02:00
Torkel Ödegaard 09c3569caa Update README.md 2018-07-16 12:36:35 +02:00
Torkel Ödegaard c6bcf13d78 Devenv testdata dashboards (#12615) 
* devenv: working on dev env setup & dashboards

* devenv: refactored testdata app to a built in datasource instead, and moved dashboards to a devenv provisioned dashboards
 2018-07-16 03:12:13 -07:00
Torkel Ödegaard 2dd60f78d9 devenv: working on dev env setup & dashboards 2018-07-16 10:53:41 +02:00
Torkel Ödegaard 964620c38c fix: panel embedd scrolbar fix, fixes #12589 (#12595) 2018-07-13 05:07:04 -07:00
Torkel Ödegaard c03764ff8a Refactor team pages to react & design change (#12574) 
* Rewriting team pages in react

* teams to react progress

* teams: getting team by id returns same DTO as search, needed for AvatarUrl

* teams: progress on new team pages

* fix: team test

* listing team members and removing team members now works

* teams: team member page now works

* ux: fixed adding team member issue

* refactoring TeamPicker to conform to react coding styles better

* teams: very close to being done with team page rewrite

* minor style tweak

* ux: polish to team pages

* feature: team pages in react & everything working

* fix: removed flickering when changing tabs by always rendering PageHeader
 2018-07-11 11:23:07 -07:00
Torkel Ödegaard b4e0ace7a2 fix: folder picker did not notify parent that the initial folder had been changed, fixes #12543 (#12554) 2018-07-11 10:58:06 -07:00
Torkel Ödegaard 2c22a7b4ba Don't build-all for PRs 2018-07-11 13:31:34 +02:00
Torkel Ödegaard d85fa66fb4 redid redux poc, old branch was to old and caused to many conflicts 2018-07-09 10:28:20 +02:00
Torkel Ödegaard 3740d56491 wip: redux poc 2018-07-09 09:17:38 +02:00
Torkel Ödegaard 5a925461f1 Update CHANGELOG.md 2018-07-09 07:00:11 +02:00
Torkel Ödegaard b464a28cca devenv: updated devenv provision scripts 2018-07-07 14:40:17 +02:00
Torkel Ödegaard 645974ec8d ux: minor fix/tweak to inactive view mode, think logo should be visible & fixes dashboard title alignment 2018-07-07 10:25:41 +02:00
Torkel Ödegaard 1f97df46c1 devenv: open ldap docker block now prepopulating data with correct member groups 2018-07-03 12:58:17 +02:00
Torkel Ödegaard 37efa934f1 ldap: improved ldap test env with more structured users and groups 2018-07-02 17:27:16 +02:00
Torkel Ödegaard 6286c31d4b refactoring: making api wrap public 2018-07-02 14:13:18 +02:00
Torkel Ödegaard b8724ae0c4 refactoring: enterprise build/hooks refactorings (#12478) 2018-07-02 04:33:39 -07:00
Torkel Ödegaard 10e86eda69 fix: #12461 introduced issues with route registration ordering, adding plugin static routes before plugins package had been initiated (#12474) 2018-07-01 23:35:50 -07:00
Torkel Ödegaard 7a7c6f8fab fix: log close/flush was done too early, before server shutdown log message was called, fixes #12438 2018-06-28 04:38:23 -07:00
Torkel Ödegaard 713a87fb5b Webpack 4 (WIP) (#12098) 
* Webpack 4

* webpack: force angular version 1.6 as 1.7 has removed a legacy feature toggle Grafana needs, switched from awesome-typescript-loader to ts-loader & forked ts checker

* Webpack 4

* webpack: force angular version 1.6 as 1.7 has removed a legacy feature toggle Grafana needs, switched from awesome-typescript-loader to ts-loader & forked ts checker

* upgrade ts loader

* simplified splitChunks

* upgrade circle node image to v8

* webpack: minor changes, using the new mode option, removed unused awesome-typescript loader, investigating karma issue but no solution yet

* fix: change angular mocks version restriction to be more strict

* add babel-loader for HMR support, fix karma debug runner

* babel-loader to yarn.lock

* webpack: changed from ExtractTextPlugin  to MiniCssExtractPlugin, and updated the minification step to use new webpack4 optimization config section

* webpack: remove css minifcation from general css processing as it's done in the webpack optimization step

* limit vendors chunk to .ts and .js files

* fix: removed typescript compile error, wanted to see if we still got test failure for that

* tech: upgrade uglify-js, should be faster now
 2018-06-26 01:28:37 -07:00
Torkel Ödegaard dd7a653db9 Update ROADMAP.md 2018-06-26 08:59:37 +02:00
Torkel Ödegaard 132df4553c fix: annnotation api & sql issue 2018-06-25 16:03:38 +02:00
Torkel Ödegaard 24d0b43e62 fix: fixed permission issue with api key with viewer role in dashboards with default permissions 2018-06-19 11:10:17 +02:00
Torkel Ödegaard 5af0b924ff refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203 2018-06-15 12:46:20 +02:00
Torkel Ödegaard 442e0e437b refactoring: transaction manager PR #12203 2018-06-15 12:46:20 +02:00
Torkel Ödegaard 9e59751c07 fix: fixed problem with expanding access mode help in ds settings 2018-06-04 18:05:16 +02:00
Torkel Ödegaard ae82112c2e dep: use master branch for plugin model 2018-06-04 17:47:38 +02:00
Torkel Ödegaard 829af9425f revert: reverted singlestat panel position change PR #12004 2018-06-04 15:45:29 +02:00
Torkel Ödegaard feb5e20779 datasource: added option no-direct-access to ds-http-settings diretive, closes #12138 2018-06-04 11:17:50 +02:00
Torkel Ödegaard 6e145ad32d Merge branch 'master' of github.com:grafana/grafana 2018-05-29 14:11:36 +02:00
Torkel Ödegaard 4c9b146bda PR: minor change to PR #12004 before merge 2018-05-29 14:11:05 +02:00
Torkel Ödegaard 249e682511 Merge branch 'master' of https://github.com/mammuthus/grafana 2018-05-29 14:04:54 +02:00
Torkel Ödegaard be34417b3a fix: refactoring PR #11996 and fixing issue #11551 16706hashkey in json editors 2018-05-29 14:02:52 +02:00
Torkel Ödegaard 634a26d2eb Merge branch 'remove_hash' of https://github.com/eMerzh/grafana 2018-05-29 13:25:44 +02:00
Torkel Ödegaard ddd5e5ae70 tech: updated react-grid-layout to latest official release, closes #12100 2018-05-29 13:23:07 +02:00
Torkel Ödegaard 7b09dfe9a0 Merge branch 'davkal/split-webpack-config-hot' 2018-05-28 14:18:35 +02:00
Torkel Ödegaard 80d694d205 Backend image rendering as plugin (#11966) 
* rendering: headless chrome progress

* renderer: minor change

* grpc: version hell

* updated grpc libs

* wip: minor progess

* rendering: new image rendering plugin is starting to work

* feat: now phantomjs works as well and updated alerting to use new rendering service

* refactor: renamed renderer package and service to rendering to make renderer name less confusing (rendering is internal service that handles the renderer plugin now)

* rendering: now render key is passed and render auth is working in plugin mode

* removed unneeded lines from gitignore

* rendering: now plugin mode supports waiting for all panels to complete rendering

* fix: LastSeenAt fix for render calls, was not set which causes a lot of updates to Last Seen at during rendering, this should fix sqlite db locked issues in seen in previous releases

* change: changed render tz url parameter to use proper timezone name as chrome does not handle UTC offset TZ values

* fix: another update to tz param generation

* renderer: added http mode to renderer service, new ini setting [rendering] server_url
 2018-05-24 15:26:27 +02:00
Torkel Ödegaard a73365c3fe codespell: fixes 2018-05-18 11:49:00 +02:00
Torkel Ödegaard d0c17100cb fix: fixed some minor startup logging issues 2018-05-18 11:17:31 +02:00
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 c79b1bef15 Merge branch 'master' into master 2018-05-08 21:23:34 +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