Commit Graph

16731 Commits

Author SHA1 Message Date
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
Steven Arnott
043d5f1c05
Update ldap.md 2018-10-01 11:41:19 -04:00
Marcus Efraimsson
a4f5aafe22
Merge pull request #13422 from grafana/1815_admin_reset
cli: fix reset-admin-password
2018-10-01 16:48:32 +02:00
bergquist
75f832cda8 use alert state changes counter as secondary version 2018-10-01 15:58:30 +02:00
Leonard Gram
b29ac5c509 docs: stackdriver version notice. 2018-10-01 14:35:20 +02:00
Peter Holmberg
13666c8462 tests 2018-10-01 14:17:28 +02:00
Peter Holmberg
a43ede70bc added default prop instead of specifying prop 2018-10-01 14:02:13 +02:00
Leonard Gram
28a9caa34d
Update CHANGELOG.md 2018-10-01 13:45:34 +02:00
Peter Holmberg
3211df7303 filter users in selector based on search 2018-10-01 13:45:00 +02:00
David Kaltschmidt
68dfc5699b Moved explore helpers to utils/explore 2018-10-01 12:56:26 +02:00
David Kaltschmidt
54c9beb146 Explore: jump to explore from panels with mixed datasources
- extends handlers for panel menu and keypress 'x'
- in a mixed-datasource panel finds first datasource that supports
  explore and collects its targets
- passes those targets to the found datasource to be serialized for
  explore state
- removed `supportMetrics` and `supportsExplore`
- use datasource metadata instead (set in plugin.json)
- Use angular timeout to wrap url change for explore jump
- Extract getExploreUrl into core/utils/explore
2018-10-01 12:03:57 +02:00
Peter Holmberg
94971abd9c functions and tests 2018-10-01 12:01:53 +02:00
David
7b543ca4b5
Merge pull request #13463 from grafana/davkal/explore-url-state
Explore: Store UI state in URL
2018-10-01 10:09:15 +02:00
Torkel Ödegaard
c0996e7a39
Merge pull request #13444 from grafana/13411-react-api-key
13411 react api key
2018-10-01 09:46:18 +02:00
Marcus Efraimsson
1be8fb76b8
cleanup alert_notification_state when deleting alert rules and channels 2018-09-30 21:57:15 +02:00
Marcus Efraimsson
5ec086dc56
don't notify if notification state pending
If notification state is pending and last update of state was made
less than a minute ago. In the case of a grafana instance is shut down/crashes
between setting pending state and before sending the notification/marks as complete
this logic should allow the notification to be sent after some time instead of
being left in an inconsistent state where no notifications are being sent.
2018-09-30 21:52:50 +02:00
Marcus Efraimsson
d412aafb7e
remove unused code 2018-09-30 20:16:01 +02:00
Daniel Lee
bf2abc6940 stackdriver: set default view parameter to FULL 2018-09-29 23:45:28 +02:00
Daniel Lee
9c2bca411c
Merge pull request #13289 from grafana/stackdriver-plugin
Stackdriver Datasource - Fixes #6733
2018-09-28 19:36:01 +02:00
Daniel Lee
cf0189ab1a stackdriver: no tags for annotations (yet)
fixes glitch where an empty tag shows up
2018-09-28 19:17:34 +02:00
Daniel Lee
296fd35d47 stackdriver: add help section for annotations 2018-09-28 19:12:50 +02:00
Marcus Efraimsson
d313ffa847
devenv: enable some debug logging for ha test setup 2018-09-28 18:35:43 +02:00
Marcus Efraimsson
8551ffa0b0
alert -> ok with reminders enabled should send 2018-09-28 18:34:20 +02:00
Daniel Lee
a1f486bbfa stackdriver: revert an accidental commit for text template variable
with dummy change in readme to be able to make a commit
2018-09-28 18:19:57 +02:00
David
b2758b2ad0
Merge pull request #13408 from grafana/limit-number-of-series-in-explore
Limit number of time series in explore
2018-09-28 17:45:33 +02:00
David Kaltschmidt
12c43d6436 Added test for url state in Explore 2018-09-28 17:39:53 +02:00
David Kaltschmidt
c3e0d4205c Make Explore a pure component 2018-09-28 17:38:50 +02:00
Peter Holmberg
8f99276606 first crude display 2018-09-28 17:21:00 +02:00
Daniel Lee
399e83f91b stackdriver: remove metric.category alias pattern
After discussions with the Stackdriver team, they did not think this was
needed.
2018-09-28 17:16:35 +02:00
Erik Sundell
a25389332c stackdriver: remove commented code 2018-09-28 17:11:06 +02:00
Erik Sundell
db8bbe3cad stackdriver: unit test group by and aggregation dropdown changes 2018-09-28 17:06:24 +02:00
Erik Sundell
3572692fd5 stackdriver: make it impossible to select no aggregation when a group by is selected 2018-09-28 16:55:39 +02:00
David Kaltschmidt
200784ea4a Explore: Store UI state in URL
Storing queries, split state, and time range in URL.

- harmonize query serialization when generating Explore URLs in
  dashboards (use of `renderUrl`)
- move URL parse/serialization to Wrapper
- keep UI states under two keys, one for left and one for right Explore
- add option to angular router to not reload page on search change
- add lots of types
- fix time service function that gets triggered by URL change
2018-09-28 16:44:07 +02:00
Erik Sundell
cdcb14f3e6 Merge branch 'stackdriver-plugin' of https://github.com/grafana/grafana into stackdriver-plugin 2018-09-28 16:37:11 +02:00
Erik Sundell
fc1e214987 stackdriver: add relevant error message for when a user tries to create a template variable 2018-09-28 16:36:43 +02:00
Daniel Lee
aedd518186 Merge remote-tracking branch 'origin/stackdriver-plugin' into stackdriver-plugin 2018-09-28 16:34:28 +02:00
Erik Sundell
9748a9487b stackdriver: merge commit" 2018-09-28 16:21:54 +02:00