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
15,616 Commits 5,416 Branches 554 Tags
e1beaaa0f72dd3238dfda17bf31b82fb71a2ccc2
Commit Graph

3717 Commits

Author SHA1 Message Date
Torkel Ödegaard
92ed1f04af sql: added code migration type 2018-08-21 13:53:04 +02:00
Daniel Lee
c75e071213 dsproxy: interpolate route url 
Allows for dynamic urls for plugin routes. There are a few plugins
where the route url should be configurable and this change allows
using jsonData fields in the url field for a route in the
plugin.json file for a plugin.
 2018-08-18 16:02:49 +02:00
Leonard Gram
da2822c88d alerting: inline docs for the slack channel. 
Related to #12944
 2018-08-17 16:49:27 +02:00
Marcus Efraimsson
88b96fbd15 Merge pull request #12921 from grafana/12229_provisioning 
Provisioning: Should allow one default datasource per organisation
 2018-08-17 15:37:32 +02:00
Marcus Efraimsson
0a7be2618e cleaning up test data 2018-08-17 15:00:37 +02:00
Marcus Efraimsson
313a8bd033 Merge pull request #12891 from svenklemm/unixepochgroup 
add $__unixEpochGroup and $__unixEpochGroupAlias to sql datasources
 2018-08-17 14:41:33 +02:00
Marcus Efraimsson
8af80b323a Merge pull request #12909 from grafana/ds-user-agent 
Set User-Agent header in datasource proxied requests
 2018-08-15 16:59:29 +02:00
Marcus Efraimsson
13921902b5 Set User-Agent header in all proxied datasource requests 
Header value will be Grafana/%version%, i.e. Grafana/5.3.0
 2018-08-15 09:46:59 +02:00
Marcus Efraimsson
aed89b49c0 should allow one default datasource per organisation using provisioning 2018-08-14 14:48:14 +02:00
Benoît Knecht
ce804e9981 social: gitlab_oauth: set user ID in case email changes 
Set `BasicUserInfo.Id` in the value returned by
`SocialGitlab.UserInfo()`, in case the email address of the user changes
in GitLab. That way, the user association won't be lost in Grafana.
 2018-08-14 14:11:48 +02:00
Benoît Knecht
7ec146df99 social: add GitLab authentication backend 
GitLab could already be used as an authentication backend by properly
configuring `auth.generic_oauth`, but then there was no way to authorize
users based on their GitLab group membership.

This commit adds a `auth.gitlab` backend, similar to `auth.github`, with
an `allowed_groups` option that can be set to a list of groups whose
members should be allowed access to Grafana.
 2018-08-14 14:11:48 +02:00
Marcus Efraimsson
74077be19e Merge pull request #12680 from svenklemm/timebucket 
[postgres] add timescaledb option to postgres datasource
 2018-08-14 12:12:43 +02:00
Sven Klemm
837388d13e Use variable in newPostgresMacroEngine 2018-08-14 09:44:58 +02:00
Torkel Ödegaard
4f704cec53 fix: ds_proxy test not initiating header 2018-08-14 09:18:23 +02:00
Sven Klemm
3955133f7e Don't pass datasource to newPostgresMacroEngine 2018-08-14 09:15:24 +02:00
Sven Klemm
3552a4cb86 refactor timescaledb handling in MacroEngine 2018-08-14 08:47:33 +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
Marcus Efraimsson
4cebf38ff2 Merge pull request #12807 from nyxi/master 
Support client certificates for LDAP servers
 2018-08-13 15:48:39 +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
Marcus Efraimsson
d110343e53 Merge pull request #12838 from grafana/12476-show-teams-on-profile 
show teams on profile
 2018-08-13 15:16:04 +02:00
Sven Klemm
8c4d59363e add $__unixEpochGroup to mssql datasource 2018-08-13 12:23:42 +02:00
Sven Klemm
fbc67a1c64 add $__unixEpochGroup to mysql datasource 2018-08-13 12:17:05 +02:00
Sven Klemm
bfe28ee061 Add $__unixEpochGroup macro to postgres datasource 2018-08-13 12:08:14 +02:00
Sven Klemm
d81a23becf Refactor setting fillmode 
This adds SetupFillmode to the tsdb package to be used by the sql
datasources.
 2018-08-12 10:51:58 +02:00
Sven Klemm
d2984f3b0f fix rebase error 2018-08-09 10:14:14 +02:00
Sven Klemm
c3aad10047 change timescaledb to checkbox instead of select 2018-08-09 10:05:35 +02:00
Sven Klemm
b987aee7cf add timescaledb option to postgres datasource 
This adds an option to the postgres datasource config for
timescaledb support. When set to auto it will check for
timescaledb when testing the datasource.

When this option is enabled the $__timeGroup macro will
use the time_bucket function from timescaledb to group
times by an interval.

This also passes the datasource edit control to testDatasource
to allow for setting additional settings, this might be useful
for other datasources aswell which have optional or version
dependant features which can be queried.
 2018-08-09 10:05:35 +02:00
Marcus Efraimsson
8952137ea2 Merge pull request #12753 from svenklemm/sql-fillmode-last 
Add fill mode to fill in previously seen value when point is missing to SQL datasources
 2018-08-08 10:29:56 +02:00
Marcus Efraimsson
beddfdd86b add api route for retrieving teams of signed in user 2018-08-08 10:26:05 +02:00
Marcus Efraimsson
89298d0cf5 Merge pull request #12815 from tariq1890/url_query_fix 
Fixing bug in url query reader and added test cases
 2018-08-08 09:18:32 +02:00
tariq1890
e8dfbe94b1 Fixing bug in url query reader and added test cases 2018-08-07 18:43:59 -07:00
Sven Klemm
ee7602ec1f change fillmode from last to previous 2018-08-07 21:01:41 +02:00
Marcus Efraimsson
eb1b9405b2 return proper payload from api when updating datasource 2018-08-07 17:56:02 +02:00
Emil Flink
5bea54eaaa Support client certificates for LDAP servers 2018-08-03 12:00:20 +02:00
Sven Klemm
bfc66a7ed0 add fillmode "last" to sql datasource 
This adds a new fill mode last (last observation carried forward) for grafana
to the sql datasources. This fill mode will fill in the last seen value in a
series when a timepoint is missing or NULL if no value for that series has
been seen yet.
 2018-08-02 20:35:09 +02:00
Marcus Efraimsson
5cca478656 Merge pull request #12760 from svenklemm/postgres-timegroup 
remove alias from postgres $__timeGroup macro

add $__timeGroupAlias macro to all sql datasources
 2018-08-02 16:36:01 +02:00
Marcus Efraimsson
4962bf9d44 remove info logging 2018-08-02 15:49:50 +02:00
Alban Perillat-Merceroz
f3d400f1a7 Add new Redshift metrics and dimensions for Cloudwatch datasource 
AWS/Redshift has new dimensions (`latency`, `service class`, `wmlid`) and metrics (`QueriesCompletedPerSecond`, `QueryRuntimeBreakdown`, `QueryDuration`,  `WLMQueriesCompletedPerSecond`, `WLMQueryDuration`, `WLMQueueLength`) in Cloudwatch: https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/rs-metricscollected.html
 2018-08-02 14:45:24 +02:00
Sven Klemm
b71d10a7a4 add $__timeGroupAlias to mysql and mssql 2018-08-01 20:58:51 +02:00
Sven Klemm
dc22e24642 add compatibility code to handle pre 5.3 usage 2018-08-01 15:06:18 +02:00
Marcus Efraimsson
951679d50b Merge pull request #12561 from activeshadow/aws-rds-burst-balance 
Added BurstBalance metric to list of AWS RDS metrics.
 2018-08-01 12:28:15 +02:00
Sven Klemm
42f1892826 Add $__timeGroupAlias to postgres macros 2018-08-01 09:03:34 +02:00
Sven Klemm
43295f9c18 remove alias from postgres $__timeGroup macro 2018-08-01 08:50:19 +02:00
Marcus Efraimsson
dfda51a9be Merge pull request #12762 from sohonet/add_cloudwatch_aws_dx 
add AWS/DX metrics and dimension to cloudwatch
 2018-07-31 17:58:32 +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
Marcus Efraimsson
3cecc0b54e Merge pull request #12301 from franciscocpg/cloudwatch-app-sync 
Adding Cloudwatch AWS/AppSync metrics and dimensions
 2018-07-31 11:38:31 +02:00
Jason Pereira
88d8072be3 add aws_dx to cloudwatch datasource 2018-07-30 15:51:15 +01:00
Marcus Efraimsson
38a52c2489 mssql: update tests 2018-07-30 13:50:52 +02:00
Marcus Efraimsson
e32cf75c2d fix usage of metric column types so that you don't need to specify metric alias 2018-07-30 13:50:18 +02:00
Sven Klemm
3aa4790979 add tests for metric column prefix to mssql 2018-07-27 18:13:19 +02:00