public/grafana
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,253 Commits 655 Branches 650 Tags
592c46c8b54eca5d1b03e72e6c8def2140cd2cdd
Commit Graph
936 Commits
Author SHA1 Message Date
Matthew McGinn be0d471467 properly parse & pass upload image bool from config 2017-10-02 23:18:48 -04:00
Matthew McGinn 122e2b5c42 break out slack upload into separate function 2017-10-02 20:48:35 -04:00
Matthew McGinn 89ca4b247b fixing json for CI 2017-10-01 10:37:59 -04:00
Matthew McGinn 00726e93eb adding support for token-based slack file.upload API call for posting images to slack 2017-09-30 21:20:20 -04:00
Carl Bergquist 8a7f87b752 Merge pull request #9311 from ctrlok/ctrlok/pagerdutyinfo 
Include triggering metrics to pagerduty alerts (pretty print)
 2017-09-29 15:40:49 +02:00
coral 68ed4d45fa change pdiff to percent_diff for conditions 2017-09-29 18:14:17 +08:00
coral 9e48d54465 add diff and pdiff for conditions 2017-09-29 17:20:02 +08:00
Carl Bergquist e9e8ffc769 Merge pull request #9367 from bobrik/dualstack 
Enable dualstack in every net.Dialer, fixes #9364
 2017-09-28 11:15:49 +02:00
Ivan Babrou 9a4ae30227 Enable dualstack in every net.Dialer, fixes #9364 
Default transport enables it:

* https://github.com/golang/go/blob/d2826d3e06/src/net/http/transport.go#L42-L46

```
    DialContext: (&net.Dialer{
	Timeout:   30 * time.Second,
	KeepAlive: 30 * time.Second,
	DualStack: true,
    }).DialContext,
```

See also: https://github.com/golang/go/issues/15324
 2017-09-27 22:29:48 -07:00
Tobias Hintze af79d046db introduce smtp config option for EHLO identity 2017-09-24 20:48:20 +02:00
bergquist ed661767f8 follow go idiom and return error as second param 2017-09-21 18:04:16 +02:00
bergquist 0229d28d64 remove unused structs 2017-09-21 15:02:17 +02:00
Carl Bergquist 0db678e18f Merge pull request #9213 from grafana/dist_tracing 
Add support for distributed tracing with Jaeger
 2017-09-21 10:42:25 +02:00
Vsevolod Polyakov d355862328 Make details more clean in PD description 2017-09-20 13:03:18 +03:00
Aaron Kirkbride 442f625a4e Remove duplicate bus.AddHandler() (#9289) 
`bus.AddHandler("sql", SetUsingOrg)` is already called on line 24.

Very minor change.
 2017-09-18 15:52:15 +02:00
bergquist 353bb57a6f use same key as mt 2017-09-18 14:59:59 +02:00
bergquist 6c7454fc2b tag alert queries that return no_data 2017-09-18 14:53:30 +02:00
bergquist bc678899f7 better formating for error trace 2017-09-18 11:08:58 +02:00
bergquist 8c8fdadb78 trace failed executions 2017-09-18 11:08:58 +02:00
bergquist e128310045 use tags instead of logs 2017-09-18 11:08:58 +02:00
bergquist 2e350bbb8e adds basic traces using open traces 2017-09-18 11:08:58 +02:00
bergquist 89eda76f29 require dashboard panels to have id 
closes #9234
 2017-09-18 10:32:58 +02:00
bergquist c7698a09ed pass context to image uploaders 2017-09-15 16:11:02 +02:00
bergquist 491e6897e7 metrics: set summary unit 
we have to use milleseconds since graphite
doesnt support float64
 2017-09-14 19:28:54 +02:00
bergquist 2de94d6548 convert old metrics to prom metrics 2017-09-14 14:26:32 +02:00
bergquist 057b8a6b2d improve error message for timeouts 
closes #9220
 2017-09-11 20:07:57 +02:00
mxlxm c5400ffe76 mysql: use collation instead of charset (#9156) 
- use charset would issue additional 'SET NAMES <VALUE>' queries, set
collation would be better. see: https://github.com/go-sql-driver/mysql#charset
 2017-09-04 12:32:07 +02:00
Callum Loh 74ddebc8ea Fix spelling for Hipchat notifier (#9112) 2017-08-29 08:08:51 +02:00
Jason Stangroome 632a5e9b97 Support Azure MySQL (#8618) 
Azure's MySQL implementation appears to always respond with an Authentication Method Switch Request Packet requesting `mysql_native_password` auth even though the client's initial Handshake Response already included the native password credentials.

Most MySQL client libraries support this but Golang's go-sql-driver/mysql requires the `allowNativePasswords` DSN parameter set to enable it. Without this parameter, Grafana fails to authenticate to the database with the error message "this user requires mysql native password authentication."

References:

* https://web.archive.org/web/20160814002743/http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::AuthSwitchRequest
* https://web.archive.org/web/20160814002743/http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse
* https://github.com/go-sql-driver/mysql#user-content-allownativepasswords
 2017-08-24 10:24:10 +02:00
Torkel Ödegaard 4f9fbcc211 dataproxy: added caching of datasources when doing data proxy requests, #9078 2017-08-23 13:31:26 +02:00
Andrei Burd 3222677493 Datasource Print the received error (#9043) 2017-08-16 16:56:51 +02:00
Torkel Ödegaard 668cb3c1ef Merge branch 'v4.4.x' 2017-08-09 10:37:06 +02:00
Torkel Ödegaard e8a20643d6 feat: store last seen date for users and present in stats and user lists, closes #9007 2017-08-09 10:36:41 +02:00
Torkel Ödegaard 7c14ade623 Merge branch 'v4.4.x' 2017-08-08 09:28:41 +02:00
Torkel Ödegaard 7031f7e772 fix: sqlite3 and storing/displaying dates used wrong timezone, fixes #8996 2017-08-08 09:28:16 +02:00
David Wittman 8f5fbb4254 Fix typo in PagerDuty notifier options template (#8978) 2017-08-03 08:57:59 +02:00
Torkel Ödegaard 24a79a6bea Merge branch 'v4.4.x' 2017-07-24 12:30:28 +02:00
Torkel Ödegaard 723f5bc9e8 fix: dsahboard_version data column type changed to MEDIUMTEXT, fixes #8813 2017-07-24 12:30:13 +02:00
Liang Jiameng f8d22385ce add a placeholder to DingTalk Url (#8820) 2017-07-10 16:51:03 +02:00
0x6875790d0a a622c55b1b (feat) Add image to LINE notify (#8771) 2017-07-07 11:20:27 +02:00
Daniel Lee 6d4c29ea9b migrations: dashboard version migration handles nulls 
If a dashboard has a null value for updated_by then the migration
for the dashboard version table fails. This change uses coalesce to
set -1 instead of null when inserting into the created_by column
which has a non-null constraint. Fixes #8783.
 2017-07-05 22:14:03 +02:00
Daniel Lee 16cda723d3 migrations: dashboard version migration handles nulls 
If a dashboard has a null value for updated_by then the migration
for the dashboard version table fails. This change uses coalesce to
set -1 instead of null when inserting into the created_by column
which has a non-null constraint. Fixes #8783.
 2017-07-05 22:06:00 +02:00
Liang Jiameng 109fd998ed Add a new notifier : DingTalk (#8473) 
* add alerting notifier: DingDing

* add alerting notifier: DingDing

* add dingding unit test

* add dingding unit test

* delete debug code & format code style.

* fix build failed: dingding_test.go
 2017-07-04 15:16:32 +02:00
Daniel Lee b8aa203707 signup: fix email sent logic for tempuser 
Fixes #8656 and properly sets the email_sent and email_sent_on fields
for a tempuser (signup user).
 2017-06-30 20:21:08 +02:00
Torkel Ödegaard 08b37186a5 fix: fixed failing sql unit test 2017-06-07 15:42:48 +02:00
Torkel Ödegaard e7e675e471 Merge branch 'walmartlabs-master' (Dashboard History Feature, #8472) 2017-06-07 14:30:03 +02:00
Torkel Ödegaard 391dc1e225 dasboard_history: fixed sql integration test 2017-06-07 14:25:46 +02:00
Torkel Ödegaard 46412c8475 dasboard_history: security fix, added orgId filter to dashboard version lookup 2017-06-07 14:21:40 +02:00
Torkel Ödegaard 7b5f7ed553 dashboard_history: SQL did not work when using MySQL, fixes to dashboard version numbering, so inserts start at 1, added migration to fix old dashboards with version 0 2017-06-06 15:40:10 +02:00
Torkel Ödegaard 5409f4c0eb dashboard_history: fixed issue with save as & overwrite 2017-06-06 14:39:57 +02:00