IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,649 Commits 1,123 Branches 715 Tags
4c9b146bda91ad3a37923c3dcd478109553cd3fb
Commit Graph
14649 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David c67d72db63 Merge pull request #12041 from grafana/davkal/11931-table-docs 
Document table row merge for multiple queries
 2018-05-29 12:08:55 +02:00
Marcus Efraimsson e80f54c243 Merge pull request #12094 from grafana/elastic6-docker 
docker: new block for elasticsearch6
 2018-05-29 11:22:42 +02:00
Daniel Lee fb41048dd7 docker: new block for elasticsearch6 2018-05-29 11:04:16 +02:00
Marcus Efraimsson 2d5ec9b9e4 changelog: add notes about closing #12087 
[skip ci]
 2018-05-29 10:50:13 +02:00
Marcus Efraimsson 1bc94c7d5a Merge pull request #12088 from thurt/12087-better-error-when-smtp-not-configured 
inviting users: show friendlier error message when smtp is not configured
 2018-05-29 10:46:46 +02:00
Leonard Gram e6f2811b21 sql: seconds epochs are now correctly converted to ms. 
Closes #12061
 2018-05-29 08:44:03 +02:00
Brice Maron 01f80950de fix: add track by name in annotation list to avoid $$hashKey in json 2018-05-28 21:11:32 +02:00
bergquist 83b7bbd60b changelog: adds note about closing #9703 2018-05-28 20:55:11 +02:00
bergquist add791b2cc Merge branch '9703-auth-proxy' 
* 9703-auth-proxy:
  go fmt fixes
  configure proxy environments for Transport property
 2018-05-28 20:49:40 +02:00
bergquist d7b5fb4604 go fmt fixes 2018-05-28 20:48:01 +02:00
iyeonok bafe25fbd9 configure proxy environments for Transport property 
related issue: https://github.com/grafana/grafana/issues/9703
 2018-05-28 20:48:01 +02:00
David Kaltschmidt 6d8d6cdb57 Fix sourcemaps for webpack hot config 2018-05-28 20:32:33 +02:00
thurt b487aa3e6a return better error message when err is ErrSmtpNotEnabled 
fixes #12087
 2018-05-28 17:49:31 +00:00
bergquist 8d400b8f7b changelog: adds note about closing #9847 2018-05-28 17:50:36 +02:00
Ryan McKinley 17b9609209 Sparklines should scale to the data range (#12010) 
* Add a full range option to sparklines

* line zero=false
 2018-05-28 16:30:44 +02:00
Torkel Ödegaard 7b09dfe9a0 Merge branch 'davkal/split-webpack-config-hot' 2018-05-28 14:18:35 +02:00
David Kaltschmidt ebe8e62bd5 Split webpack dev config into dev and hot 
Motivation:

* too many conditionals for config, better to be explicit
* different priorities: faster build for hot mode
* working SCSS sources for styles in hot mode

The biggest differences:

* removed linter from TS loader in hot (should be editor or precommit
 or responsibility)
* simplified styles loading
* hot needs more extensions to resolve
* removed commons chunking for hot
* removed devServer from dev

Reduced HMR time from 8s to 4s on my machine.
 2018-05-28 13:49:15 +02:00
David ced8c5f0e4 Upgrade webpack loaders (#12081) 
* upgrade all webpack loaders to recent version
* keep TS loader at 4.0.0 (5.0.0 requires webpack 4)
* remove unused json-loader
 2018-05-28 13:46:57 +02:00
Marcus Efraimsson 5a96863eed pin versions of xorm to resolve sql tests 
Resolves issue with postgres tests.
Also sets timezone of test instance and database to utc to resolve
mysql tests.
Closes #12065
 2018-05-28 13:07:41 +02:00
Carl Bergquist 519e58a267 Merge pull request #12071 from grafana/12056_usage_stats 
Additional anonymous usage stats
 2018-05-28 11:23:16 +02:00
bergquist a2ed0b15da build: fixes broken path for bra run 
removes os and arch from binary path
when building in dev mode
 2018-05-28 10:39:42 +02:00
Marcus Efraimsson c9e9f25699 use sql builder for the get system stats sql query 2018-05-28 10:37:17 +02:00
Carl Bergquist 6c259eb04d Merge pull request #12077 from roidelapluie/logout 
Fix #9847 Add a generic signout_redirect_url to enable oauth logout
 2018-05-28 08:06:00 +02:00
Daniel Lee de295af231 Merge pull request #12003 from mageo/master 
Added Swiss franc currency
 2018-05-28 01:13:21 +02:00
Julien Pivotto a5e6cb9a02 Fix #9847 Add a generic signout_redirect_url to enable oauth logout 
Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
 2018-05-27 14:52:50 +02:00
bergquist 238139fad6 alerting: refactor tests 2018-05-25 16:12:34 +02:00
Marcus Efraimsson fbc44025dc add usage stats for datasource access mode 2018-05-25 16:06:35 +02:00
David Kaltschmidt 27e7a28b37 Review feedback (heading, typos) 
* iff and therefor
* mention merge in heading
* add note about checking query inspector
 2018-05-25 14:47:46 +02:00
Marcus Efraimsson 2ea5b6fe33 add additional usage stats metrics 
nr of folders
nr of folder permissions
nr of dashboard permissions
nr of snapshots
nr of teams
nr of provisioned dashboards
 2018-05-25 14:33:37 +02:00
Marcus Efraimsson a6a12d36d7 add tests for sending usage stats 2018-05-25 13:32:55 +02:00
bergquist 21ade3f64f changelog: fix broken link to contributor 2018-05-25 10:14:13 +02:00
bergquist 94ee9c63a8 changelog: adds note about closing #11788 2018-05-25 07:41:15 +02:00
balyn fac0333f47 The old code for centering removed 
Old code removed
 2018-05-24 19:35:04 +03: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
Carl Bergquist ca7bbc44c0 Merge pull request #12050 from aarongarciah/patch-1 
Fix typo in README.md
 2018-05-24 15:18:56 +02:00
Aarón García Hervás 4c5e1cacfe Fix typo in README.md 2018-05-24 12:39:11 +02:00
Leonard Gram f80810081b build: updates publisher to support arm archs for deb and rpm. 2018-05-24 11:12:10 +02:00
Leonard Gram 7a30f72902 Merge pull request #12046 from fg2it/package 
fix names of foreign arch packages
 2018-05-24 09:34:15 +02:00
Dan Cech 417db13efb Fix dashboard snapshot deletion (#12025) 
* fix issue deleting dashboard snapshots by deleteKey, add dedicated endopoint for authenticated requests, update frontend, tests & docs.
 2018-05-24 08:55:16 +02:00
fg2it 22638db532 fix names of foreign arch packages 2018-05-23 23:53:59 +02:00
Marcus Efraimsson ed110bc312 Merge pull request #11967 from grafana/migrate-jquery-lodash-extended-to-ts 
chore: migrate files to ts
 2018-05-23 17:58:37 +02:00
David Kaltschmidt 61b296afad Document table row merge for multiple queries 
* added section to table feature docs
* marked as 5.0+ feature
* concrete examples of what works and the limits
 2018-05-23 17:08:54 +02:00
Leonard Gram 0bfbb1c161 Merge pull request #11920 from grafana/crosscompile 
Crosscompile and packages Grafana on arm, windows, linux and darwin
 2018-05-23 17:03:25 +02:00
Leonard Gram bea4741a12 build: always build for all platforms. 2018-05-23 16:03:21 +02:00
Carl Bergquist 64053e1954 Merge pull request #11788 from mtanda/prom_query_timeout 
add query timeout option for Prometheus
 2018-05-22 09:40:29 +02:00