IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,159 Commits 5,454 Branches 554 Tags 1.9 GiB
2e02a8c855
Commit Graph

17159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Sundell
ff5f281508 stackdriver: wip - get metric descriptors in the backend 2018-10-22 16:03:13 +02:00
Erik Sundell
60617d0bf7 stackdriver: wip - add logic for retrieving token from gce metadata server in the auth provider 2018-10-22 16:03:13 +02:00
Erik Sundell
77e4c4249d stackdriver: wip - add very basic checkbox for gce auto authentication 2018-10-22 16:03:13 +02:00
Erik Sundell
102f531c1e stackdriver: break out project name resolving into its own function in the stackdriver.go file 2018-10-22 16:03:12 +02:00
Erik Sundell
3f9ed2efaa stackdriver: wip - temp remove jwt token auth 2018-10-22 16:03:12 +02:00
Erik Sundell
b2de0d8c3e stackdriver: wip - always use gce default account for stackdriver 2018-10-22 16:03:12 +02:00
Erik Sundell
2002162073 stackdriver: wip - add scope and remove debug code 2018-10-22 16:03:12 +02:00
Erik Sundell
df215d9d09 stackdriver: WIP - test retrieving project id from gce metadata 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
fbe0ffd10b skip jwt token auth if privateKey is empty 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
43aa6603a3 fetch token from GCE metadata server 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
022a45becd Revert "for development" 
This reverts commit cf2f110e42bb0ca041be7bb0ebf549bf565c51bc.
 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
5b53c0497a for development 2018-10-22 16:03:11 +02:00
Leonard Gram
6c473d33f4
Enterprise crosscompilation (#13783) 
* build: crosscompilation and release of enterprise.
 2018-10-22 14:33:19 +02:00
Torkel Ödegaard
16a2b207cc fix: DataPanel isFirstLoad state fix 2018-10-22 09:54:43 +02:00
Emil Hessman
30baaa48fe ux: remove duplicate placeholder attribute 2018-10-20 15:08:38 +02:00
Marcus Efraimsson
8be4490e75
Merge pull request #13760 from grafana/stackdriver-provisioning-documentation 
Add defaultProject to Stackdriver provisioning documentation
 2018-10-19 15:55:11 +02:00
David Kaltschmidt
374fe9dcb4 Explore: reuse table merge from table panel 
- Extracted table panel's merge logic to combine multiple tables into one
- Put the merge logic into the table model as it merges multiple table
  models
- make use of merge in Explore's table query response handler
- copied tests over to table model spec, kept essential tests in
  transformer spec
 2018-10-19 15:29:58 +02:00
Erik Sundell
93a9885d67 stackdriver: add default project to provisioning documentation 2018-10-19 15:15:45 +02:00
Marcus Efraimsson
eabb04cec2
changelog: add notes about closing #13667 
[skip ci]
 2018-10-19 13:27:21 +02:00
Torkel Ödegaard
4f4bba7f8c
Merge pull request #13578 from grafana/react-panels-step1 
WIP: React panels step1
 2018-10-19 12:59:09 +02:00
Marcus Efraimsson
4e6d59d4f4
changelog: add notes about closing #13718 
[skip ci]
 2018-10-19 11:39:18 +02:00
Torkel Ödegaard
5b8178cdae fixed gofmt issue after go update 2018-10-19 11:32:36 +02:00
Torkel Ödegaard
b95d64e7a0 fix: fixed variable srv tests 2018-10-19 11:14:02 +02:00
Marcus Efraimsson
b124ba9a83
Merge pull request #13726 from mtanda/cw_unit_override 
Allow unit overwrite if cloudwatch/stackdriver datasource response doesn't include unit
 2018-10-19 11:02:42 +02:00
Erik Sundell
b2932058c7 stackdriver: only add unit to resonse obj if it has a value 2018-10-19 10:42:57 +02:00
Torkel Ödegaard
936fe56080 fix: another set of fixes for refresh 2018-10-19 10:05:48 +02:00
Torkel Ödegaard
11f66bb909 fixed issue with template refresh 2018-10-19 09:43:54 +02:00
Torkel Ödegaard
dddbe62d6c Merge branch 'master' into react-panels-step1 2018-10-19 09:15:37 +02:00
Torkel Ödegaard
5bd11744dd
Merge pull request #13670 from svenklemm/metrics-segment-xss 
Escape values in metric segment and sql part
 2018-10-18 17:24:47 +02:00
Erik Sundell
0f0763b6b8 stackdriver: fix failing tests 2018-10-18 16:45:46 +02:00
Erik Sundell
d1740f090a stackdriver: make sure unit is not returned to the panel if mapping from stackdriver unit to grafana unit can't be made 2018-10-18 16:42:08 +02:00
Sven Klemm
2803cdca40 Fix variable highlighting 2018-10-18 15:04:54 +02:00
David Kaltschmidt
34ef5e77b7 Fixed yarn.lock (previous merge took out integrity) 2018-10-18 14:51:26 +02:00
Marcus Efraimsson
9f2bdea99d
changelog: add notes about closing #13710 
[skip ci]
 2018-10-18 14:50:00 +02:00
Torkel Ödegaard
5c95a01229 Merge branch 'master' of github.com:grafana/grafana 2018-10-18 14:38:43 +02:00
Torkel Ödegaard
0f592679f9
Merge pull request #13742 from Cdiscount/feature/fix_ldap_server_admin 
fix LDAP Grafana admin logic
 2018-10-18 14:15:47 +02:00
Mitsuhiro Tanda
4687ce2f7b allow unit override if cloudwatch response unit is none 2018-10-18 20:51:46 +09:00
Mitsuhiro Tanda
e465b2d53a Revert "don't overwrite unit if user set" 
This reverts commit 9dd33b79e037fc75ddc5f3a6b294edba99e99b94.
 2018-10-18 20:51:46 +09:00
Mitsuhiro Tanda
287ba77abf don't overwrite unit if user set 2018-10-18 20:51:46 +09:00
Marcus Efraimsson
d3c28a814a
changelog: add notes about closing #13674 
[skip ci]
 2018-10-18 13:45:50 +02:00
Marcus Efraimsson
77f23018a5
Merge pull request #13684 from mtanda/cw_concurrent_map 
fix concurrent map writes
 2018-10-18 13:41:39 +02:00
Torkel Ödegaard
0b490912bd
Merge pull request #13716 from grafana/davkal/13613-fix-split-layout 
Explore: fix render issues in split view
 2018-10-18 13:00:23 +02:00
David
bf1a0585ed
Merge pull request #13712 from grafana/davkal/explore-react-table 
Explore: Use react-table as table component
 2018-10-18 12:44:56 +02:00
Adrien Fillon
781e66ba3c fix LDAP Grafana admin logic 
Co-authored-by: Adrien Fillon <adrien.fillon@cdiscount.com>
Co-authored-by: Remi Buisson <remi.buisson@cdiscount.com>
 2018-10-18 12:36:48 +02:00
Leonard Gram
287d0e8333 docs: cleanup of how to build for docker. 
[skip ci]
 2018-10-18 11:10:39 +02:00
David Kaltschmidt
9e647590ac Review feedback, increased height 2018-10-18 10:42:25 +02:00
Marcus Efraimsson
367a2af1c2
changelog: add notes about closing #12342 
[skip ci]
 2018-10-18 09:50:21 +02:00
Marcus Efraimsson
a776120bee
update changelog 
[skip ci]
 2018-10-18 09:47:18 +02:00
Marcus Efraimsson
1d0dee189c
Merge pull request #13705 from Yukinoshita-Yukino/master 
Add socket support for mysql data source
 2018-10-18 09:45:50 +02:00
Peter Holmberg
ab2be340f7 remove not used file 2018-10-18 09:34:51 +02:00