IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 02:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,650 Commits 5,087 Branches 538 Tags 1.9 GiB
7307e6345b
Commit Graph

9650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bergquist
7307e6345b tech(build): remove sha calc from build step 2017-01-30 13:58:39 +01:00
bergquist
6de13e081b tech(build): deploy builds for each commit to master 2017-01-30 10:37:14 +01:00
Jay Linski
91513f0bc0 Remove deprecated dataproxy logging setting (#7398) 
This should have been removed in 06440ef57b, but was probably forgotten.

Solves #6718.
 2017-01-30 08:14:44 +01:00
Torkel Ödegaard
b191638f41 feat(packaging): Make config file not part of package to simplify upgrade, made commit always a short sha, changed RESTART_ON_UPGRADE to true by default, #7399, #7227 2017-01-30 08:08:37 +01:00
Torkel Ödegaard
2a09d4a5a6 fix(): conf file had left over of old config key, #7395 2017-01-30 07:11:12 +01:00
Oleksandr Kushchenko
edba465a75 add DeliveryStreamName dimension to AWS/Firehose Cloudwatch namespace (#7388) 2017-01-28 08:30:57 +01:00
lpic
5b699dbf0d Set time when testing ES datasource, fixes #7044 (#7390) 2017-01-28 08:30:33 +01:00
Kit Westneat
cddc9ac0a7 file_export.ts: #5325 missed exportTableDataToCsv when adding sep (#7391) 2017-01-28 08:29:57 +01:00
bergquist
1fee26925f Merge branch 'new_deploy' 2017-01-27 15:55:42 +01:00
bergquist
4b6aaec880 tech(build): create sha files after signing packages 2017-01-27 15:54:19 +01:00
bergquist
a634bd0ce8 tech(build): sign and deploy packages to s3 2017-01-27 15:21:16 +01:00
bergquist
feed804a0e tech(build): updates path to signing file 2017-01-27 15:21:16 +01:00
bergquist
0cc21669f4 tech(build): adds package signing step 2017-01-27 15:21:16 +01:00
bergquist
46e4a54a6e style: go fmt with simplify 2017-01-27 15:21:02 +01:00
bergquist
1df9c2cab3 docs(changelog): adds note about closing #7377 2017-01-27 08:54:23 +01:00
Carl Bergquist
b3847a3738 Merge pull request #7377 from solugebefola/patch-3 
Disable sign out for AuthProxyEnabled
 2017-01-27 08:51:32 +01:00
Solar Olugebefola
de7edb40f5 Disable sign out for AuthProxyEnabled 
Sign out was disabled for AuthProxyEnabled in #3122.  This is to catch the one other instance of a sign out link in the side menu.
 2017-01-26 13:10:33 -05:00
Torkel Ödegaard
2f4da15264 fix(http api): throw validation error if missing property in call to /api/admin/users/123/permissions, #7365 2017-01-26 08:54:51 +01:00
Ryan McKinley
a656d01bf5 append windows phantomjs with .exe (#7065) 2017-01-25 14:49:09 +01:00
Torkel Ödegaard
9b8760bad7 packaging(): fix rpm & SUSE compatability issue, #7293 2017-01-25 14:42:19 +01:00
Torkel Ödegaard
7c5ef2c75a Merge branch 'connection-reset-shared_tooltip' 2017-01-25 14:35:02 +01:00
Torkel Ödegaard
28f890e42f refactor(): removed commented out code 2017-01-25 14:34:55 +01:00
Torkel Ödegaard
23eab81cbe fix(): fixed minor issue with single stat tooltip, #7357 2017-01-25 14:11:30 +01:00
Torkel Ödegaard
e073d20731 updated sample config 2017-01-25 13:34:02 +01:00
Torkel Ödegaard
f196ffa07d updated docs 2017-01-25 13:33:27 +01:00
Torkel Ödegaard
40d39f8a3e refactor(): renaming alerting hide ui option, #7318 2017-01-25 13:32:26 +01:00
Torkel Ödegaard
fee4846429 Merge branch 'alerting_ui' of https://github.com/smalik03/grafana into smalik03-alerting_ui 2017-01-25 13:16:48 +01:00
Torkel Ödegaard
4e30aa9da2 docs(): changelog updated with #7112 2017-01-25 12:32:59 +01:00
Naoufel JAMALI
4e1d8c9ced Elasticsearch - Term aggregation limit fix (should fix #7112) (#7338) 
* Elasticsearch - Term aggregation limit fix  (should fix #7112)

* Elasticsearch - Term aggregation limit fix
 2017-01-25 12:29:41 +01:00
bergquist
b6305a6577 tech(build): dont upload packages from master 2017-01-24 15:24:43 +01:00
bergquist
d5e753adbc tech(build): fixes circle.yml format issue 2017-01-24 14:01:50 +01:00
bergquist
3d6698389b tech(build): adds s3 bucket for nightly 2017-01-24 13:58:37 +01:00
bergquist
f7993db73c tech(build): installs yarn in build image 2017-01-24 11:26:03 +01:00
bergquist
66fa12835a tech(build): replace grafana_branch with circle_branch; 2017-01-24 11:26:03 +01:00
bergquist
6b70fb2729 tech(build): fixes broken yum installer 2017-01-24 11:26:03 +01:00
bergquist
5f0033f3eb tech(build): path to build relative 2017-01-24 11:26:03 +01:00
bergquist
ac111bc238 tech(build): cache golang downloads. DUH! 2017-01-24 11:26:03 +01:00
bergquist
5be00191ec tech(build): Dockerfile for building grafana 2017-01-24 11:26:03 +01:00
bergquist
e504e5aaf6 tech(build): avoids setup since all deps should be in /vendor 2017-01-24 11:26:03 +01:00
bergquist
1339ce80f5 tech(build): moves builds script into main repo 2017-01-24 11:26:03 +01:00
Chris Burkhart
b1888fb8eb Update building_from_source.md (#7340) 
Add a note about the `go get` warning that the user sees when following the setup instructions.
 2017-01-24 08:31:10 +01:00
bergquist
9b57005540 tech(build): makes npm paths absolute 2017-01-23 15:53:47 +01:00
bergquist
3d5efd3350 tech(build): removes coveralls 2017-01-23 15:53:16 +01:00
Carl Bergquist
3d3958e694 Merge pull request #7328 from jubicoy/master 
Added commonly used kilo-prefixed energy units
 2017-01-23 13:56:35 +01:00
Torkel Ödegaard
697d0867fa fix(Elasticsearch): fix for alias patterns that refers to term that is numeric zero, fixes #7323 2017-01-23 10:15:02 +01:00
Teemu Huhtala
03eb98e94d Added commonly used kilo-prefixed energy units 
Kilovolt-ampere reactive (kvar)
Kilovolt (kV)
Kiloampere (kA)
 2017-01-23 10:20:11 +02:00
Torkel Ödegaard
8eae09e5e6 docs(): updated changelog with info on #7324 2017-01-23 07:29:16 +01:00
lpic
cf9790fc4c ES - Support for min_doc_count on group by terms (#7324) 2017-01-23 07:26:42 +01:00
lpic
a0c8380baf ES: Change bool queries to use 'filter' clause (#7313) 
Change all bool queries to use 'filter' clause instead of 'must' for
better performance
 2017-01-21 08:31:29 +01:00
Chris Bentivenga
9151b4034a annotationsQuery -> annotationQuery (#7321) 
Documentation calls for `annotationQuery` but the [example](205cf4cfbc/src/datasource.js (L41)) uses the method name `annotationQuery`
 2017-01-21 08:29:21 +01:00