Sven Klemm
744e8617ff
add postgres test for global macros
2018-10-03 09:35:42 +02:00
Torkel Ödegaard
38637f056f
Merge pull request #13488 from grafana/org-users-to-react
...
Org users to react
2018-10-03 09:30:08 +02:00
Mitsuhiro Tanda
c2c0cdb49c
add test
2018-10-03 16:27:11 +09:00
Mitsuhiro Tanda
6770f2e940
stackdriver heatmap support
2018-10-03 16:27:04 +09:00
Torkel Ödegaard
c3a8dd28d5
Merge pull request #13500 from grafana/testdata-tables
...
Testdata tables
2018-10-03 08:54:08 +02:00
Torkel Ödegaard
ed0c2296b6
added slow queries scenario to test data source, added new panel test dashboard with slow queries
2018-10-02 13:00:54 -07:00
Torkel Ödegaard
4a77a62949
Merge pull request #13499 from dadosch/patch-1
...
Update configuration doc to include socket at [server]
2018-10-02 21:38:08 +02:00
dadosch
2500fe27f1
Fix "appropriate"-typo
2018-10-02 19:20:48 +00:00
dadosch
b138ae9d4c
Update configuration doc to include socket@server
...
`protocol=socket` and `socket=` path in [server]
fixes https://github.com/grafana/grafana/issues/8701
2018-10-02 18:59:55 +00:00
Sven Klemm
94d6d51726
move timeFrom, timeTo, unixEpochFrom and unixEpochTo macros to sql_engine
2018-10-02 20:19:34 +02:00
Torkel Ödegaard
9e72588cec
wip: began work on support for testdata tables & annotations support
2018-10-02 18:50:30 +02:00
Marcus Efraimsson
3932e4db5a
Merge remote-tracking branch 'origin/master' into concurrent-sql
2018-10-02 17:44:33 +02:00
Marcus Efraimsson
e5c376aead
docs: connection limits for sql datasources
2018-10-02 17:43:54 +02:00
Marcus Efraimsson
12230dfa71
ux: put connection limits under own section
2018-10-02 17:43:15 +02:00
Peter Holmberg
a381db3237
fiddling with validation
2018-10-02 16:50:34 +02:00
bergquist
1935497813
changelog: adds note about closing #13492
2018-10-02 16:38:13 +02:00
Peter Holmberg
7a39e5554b
view and route
2018-10-02 16:18:42 +02:00
Marcus Efraimsson
9af809ff8a
Merge pull request #13440 from grafana/reminder_refactoring
...
Transaction issues for alert reminder
2018-10-02 15:55:18 +02:00
David
321c09aec4
Merge pull request #13416 from grafana/davkal/11999-explore-from-mixed-panels
...
Explore: jump to explore from panels with mixed datasources
2018-10-02 15:42:43 +02:00
Marcus Efraimsson
0e0901874b
better comment about state changes
2018-10-02 15:11:33 +02:00
Marcus Efraimsson
418f77e70e
get or create alert notification should use transaction
2018-10-02 15:07:44 +02:00
bergquist
7b781e4c3c
use notification state id instead of notifier id
2018-10-02 14:53:39 +02:00
bergquist
9289cba625
merges defaultShouldNotify and ShouldNotify
2018-10-02 14:28:48 +02:00
bergquist
67e5f62514
move version conflict logging for mark as complete to sqlstore package
2018-10-02 14:23:18 +02:00
Peter Holmberg
c3f87b56ee
removed duplicate route
2018-10-02 14:13:30 +02:00
bergquist
9d3659d30d
improve local variable name
2018-10-02 14:04:50 +02:00
bergquist
b45a1bd45c
avoid exporting notificationState and notificationStateSlice
2018-10-02 14:03:30 +02:00
bergquist
9022e871e3
avoid sending full notification state to pending/complete
2018-10-02 13:57:41 +02:00
Peter Holmberg
908bf8e834
deleting obsolete things
2018-10-02 13:53:11 +02:00
Axel Pirek
dd09ece8c9
Make max open, max idle connections and connection max life time configurable
2018-10-02 13:42:06 +02:00
Peter Holmberg
cc57995070
snap
2018-10-02 13:30:09 +02:00
Peter Holmberg
6d6416c04d
fix after merge from master
2018-10-02 13:19:11 +02:00
bergquist
341d8af637
rename GetNotificationStateQuery to GetOrCreateNotificationStateQuery
2018-10-02 11:23:40 +02:00
bergquist
7f1d7cefc0
reminder: uses UpdatedAt to track state changes.
2018-10-02 11:19:09 +02:00
Peter Holmberg
09b681326e
Merge branch 'master' into org-users-to-react
2018-10-02 11:18:01 +02:00
Peter Holmberg
cc1e22925f
snaps
2018-10-02 11:11:36 +02:00
Peter Holmberg
a188ceacbc
invitees
2018-10-02 11:04:55 +02:00
Carl Bergquist
9e09b2b969
Merge pull request #13477 from grafana/alert_rule_state_changes_version
...
use alert state changes counter for alert notification dedupping.
2018-10-02 10:18:27 +02:00
Torkel Ödegaard
f37a60dcd5
Merge branch 'data-sources-list-to-react'
2018-10-02 09:33:58 +02:00
Torkel Ödegaard
8fd1d8a057
changed from RFC to PureComponent
2018-10-02 09:27:02 +02:00
Carl Bergquist
8e9c0a44c3
Merge pull request #13470 from mjtrangoni/fix-megacheck-issues
...
Fix megacheck issues
2018-10-01 23:14:14 +02:00
Marcus Efraimsson
35eddee2dd
devenv: add postgres ha test config example
2018-10-01 19:40:03 +02:00
Marcus Efraimsson
505ae709c9
Merge pull request #13481 from leo8a/master
...
typo in sample.ini
2018-10-01 19:31:56 +02:00
Leo Ochoa
12a99fa0b5
typo in sample.ini
2018-10-01 18:47:25 +02:00
Marcus Efraimsson
4ce8cc77e4
Merge pull request #13480 from ArcticSnowman/master
...
Update to ldap.md
2018-10-01 18:42:45 +02:00
Mario Trangoni
6c190ab713
pkg/tsdb/cloudwatch/credentials.go: Remove unnecessary variable assignment
...
See,
pkg/tsdb/cloudwatch/credentials.go:45:2⚠️ should merge variable declaration with assignment on next line (S1021) (megacheck)
2018-10-01 18:24:00 +02:00
Mario Trangoni
236e0b3814
pkg/cmd/grafana-server/main.go: '_ = <-ch' simplified to '<-ch'
...
See,
pkg/cmd/grafana-server/main.go:107:8⚠️ '_ = <-ch' can be simplified to '<-ch' (S1005) (megacheck)
2018-10-01 18:24:00 +02:00
Mario Trangoni
ec4139d56b
pkg/tsdb/stackdriver/stackdriver_test.go: return simplified
...
See,
pkg/tsdb/stackdriver/stackdriver_test.go:356:2⚠️ 'if err != nil { return data, err }; return data, nil' can be simplified to 'return data, err'
2018-10-01 18:24:00 +02:00
Mario Trangoni
dde650905d
Fix megacheck issue unused code.
...
I removed some code, and commented out other one.
See,
$ gometalinter --vendor --disable-all --disable=gotype --enable=megacheck --deadline 6m ./... | grep unused
pkg/api/avatar/avatar.go💯 26⚠️ func (*CacheServer).mustInt is unused (U1000) (megacheck)
pkg/api/folder_test.go:136:6⚠️ func callGetFolderByUID is unused (U1000) (megacheck)
pkg/api/folder_test.go:141:6⚠️ func callDeleteFolder is unused (U1000) (megacheck)
pkg/api/live/hub.go:40:15⚠️ func (*hub).removeConnection is unused (U1000) (megacheck)
pkg/components/imguploader/azureblobuploader.go:130:5⚠️ var client is unused (U1000) (megacheck)
pkg/middleware/middleware_test.go:438:28⚠️ func (*scenarioContext).withInvalidApiKey is unused (U1000) (megacheck)
pkg/services/alerting/ticker.go:40:18⚠️ func (*Ticker).updateOffset is unused (U1000) (megacheck)
pkg/services/notifications/notifications_test.go:12:6⚠️ type testTriggeredAlert is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:935:6⚠️ type scenarioContext is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:939:6⚠️ type scenarioFunc is unused (U1000) (megacheck)
pkg/services/sqlstore/dashboard_service_integration_test.go:941:6⚠️ func dashboardGuardianScenario is unused (U1000) (megacheck)
pkg/services/sqlstore/transactions_test.go:13:6⚠️ type testQuery is unused (U1000) (megacheck)
2018-10-01 18:23:59 +02:00
Peter Holmberg
3c8820ab55
invites table
2018-10-01 18:01:26 +02:00
