Erik Sundell
|
4a51d05477
|
stackdriver: add variable for gce authentication type
|
2018-10-22 16:11:17 +02:00 |
|
Erik Sundell
|
b9cb4649bb
|
stackdriver: get default project from backend. also ensure default project could be retrieved when authentication type is gce
|
2018-10-22 16:11:17 +02:00 |
|
Erik Sundell
|
09fb1760a1
|
stackdriver: only load default project from backend if it's not available on the target. this might happen when using gce authentication and provisioning
|
2018-10-22 16:08:11 +02:00 |
|
Erik Sundell
|
835f1d788e
|
stackdriver: display error message if project name is not present in jwt file
|
2018-10-22 16:03:14 +02:00 |
|
Erik Sundell
|
9fb1d3a9a6
|
stackdriver: only load project name if it's not already stored in the ds info json
|
2018-10-22 16:03:14 +02:00 |
|
Erik Sundell
|
cd7b454e25
|
stackdriver: add default value for authentication type
|
2018-10-22 16:03:14 +02:00 |
|
Erik Sundell
|
823838a839
|
stackdriver: wip - remove debug code
|
2018-10-22 16:03:14 +02:00 |
|
Erik Sundell
|
aa2e64e160
|
stackdriver: improve ui for toggling authentication type
|
2018-10-22 16:03:14 +02:00 |
|
Erik Sundell
|
0b82fda49c
|
stackdriver: only get default token from metadata server when applying route
|
2018-10-22 16:03:14 +02:00 |
|
Erik Sundell
|
2b1709b875
|
stackdriver: only get default token from metadata server when applying route
|
2018-10-22 16:03:13 +02:00 |
|
Erik Sundell
|
dd9e9ed419
|
stackdriver: make backend query a pure test datasource function
|
2018-10-22 16:03:13 +02:00 |
|
Erik Sundell
|
9c7022be86
|
stackdriver: add status code
|
2018-10-22 16:03:13 +02:00 |
|
Erik Sundell
|
412a1f6d99
|
stackdriver: wip - return metric descriptors in the format of tablew
|
2018-10-22 16:03:13 +02:00 |
|
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 |
|
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 |
|
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 |
|