Arve Knudsen
a5d9196a53
Chore/fix lint issues ( #27704 )
...
* Chore: Fix linting issues
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-09-22 16:22:19 +02:00
Alvaro Olmedo Rodriguez
20292bdb0e
Alerting: Ensuring notifications displayed correctly in mobile device with Google Chat ( #27578 )
...
* Added previewText to Google Chat notifier
2020-09-18 09:41:34 +03:00
Wouter Smeenk
39eba5065b
Dashboard: Support configuring default timezone via config file ( #27404 )
...
Add a default timezone that the administrator can set in the settings.
This setting is be used as default for the users timezone preference.
Can be used when creating Grafana instances without administrator
intervention, in order to give user the correct default timezone.
Fixes #25654
2020-09-15 15:20:53 +02:00
Ryan McKinley
aa40320b45
Live: check logged-in-user for grafana live ( #27436 )
2020-09-15 00:01:14 -07:00
Hansuuuuuuuuuu
8d971ab2f2
Auth: Replace maximum inactive/lifetime settings of days to duration ( #27150 )
...
Allows login_maximum_inactive_lifetime_duration and
login_maximum_lifetime_duration to be configured using
time.Duration-compatible values while retaining backward compatibility.
Fixes #17554
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2020-09-14 15:57:38 +02:00
Agnès Toulet
0c4b7d3f5d
Alerting API: send 404 not found error and enrich delete with UID endpoint response with alert notification ID ( #27550 )
...
* Alerting API: Send back 404 not found error for update and delete endpoints
* Alerting API: send back alert notification id for delete with uid endpoint
2020-09-11 18:04:43 +02:00
Maksim Nabokikh
6e3e0dead8
Provisioning: Remove provisioned dashboards without parental reader ( #26143 )
2020-09-11 09:19:44 +02:00
Marcus Efraimsson
91a8937e6c
Alerting: Fix integration key so it's stored encrypted for Pagerduty notifier ( #27484 )
...
Fixes an issue introduced by migration in #25980 which
removed storing the Pagerduty integrating key encrypted.
2020-09-10 17:43:49 +02:00
Peter Holmberg
400aafa3b3
Migration: Edit notification channel ( #25980 )
...
* implement edit page
* connectWithCleanup
* remove angular related code
* use loadingindicator
* use the correct loading component
* handle secureFields
* fixed implementation of secure fields
* Keep secureFields after rerendering the form
* CollapsableSection and Page refactor
* use checkbox instead of switch
* fix comment
* add cursor to section
* Fixed issues after PR review
* Fix issue with some settings being undefined
* new reducer and start with test
* algorithm to migrate secure fields
* UX: Minor UI Tweaks
* Added field around checkboxes, and missing required field
* fixed test
* tests for util
* minor tweaks and changes
* define as records
* fix typ error
* forward invalid to textarea and inputcontrol
* merge formdata and redux data in test
* fix issue with creating channel
* do not figure out securefields in migration
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
2020-09-09 12:46:19 +02:00
Emil Tullstedt
10141c5e6c
Stats: Use more efficient SQL and add timeouts ( #27390 )
2020-09-08 09:52:08 +02:00
robert lestak
d0e980c2fa
Alerting: Change Panel Edit link to Panel View link ( #27378 )
...
Enables alerts to be sent to users who do not have edit permissions.
Addresses Issue: https://github.com/grafana/grafana/issues/26014
2020-09-08 07:01:48 +02:00
Arve Knudsen
4b1eb6e5c7
Chore: Enable gocyclo linter ( #26395 )
...
* Chore: Enable gocyclo linter
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* API: Fix linting issue
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* API: Refactor to reduce complexity
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Fix type assertion
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-09-07 22:10:06 +02:00
Andrei Lavrov
8253b9ddb3
Alerting: override PagerDuty 'dedup_key' via tags ( #27356 )
...
* Alerting: override PagerDuty 'dedup_key' via tags
Added ability to override PagerDuty 'dedup_key' via Alert tags
Updated unit tests
* Updated documentation
* add comma
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
* add space
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
2020-09-07 18:42:06 +02:00
Torkel Ödegaard
61bd33c241
System: Date formating options ( #27216 )
...
* Add support for local time formats in graph panel
* Enfore 24h format for backward compatibility
* Use existing Intl.DateTimeFormatOptions
* Pre-generate time scale, add tests
* Move localTimeFormat, add local format to units
* updated default fallback
* #25602 , use navigator.languages to enforce locale in formatting
* Making options
* Worked new system settings
* things are working
* Local browser time formats working
* Support parsing dates in different formats
* settings updated
* Settings starting to work
* Fixed graph issue
* Logs fix
* refactored settings a bit
* Updated and name change
* Progress
* Changed config names
* Updated
* Updated
* Updated test
* Synced description
* fixed ts issue
* Added version notice
* Ts fix
* Updated heatmap and test
* Updated snapshot
* Updated
* fixed ts issue
* Fixes
Co-authored-by: Alex Shpak <alex-shpak@users.noreply.github.com>
2020-09-07 16:19:33 +02:00
Carl Bergquist
20747015f6
Annotation: Add clean up job for old annotations ( #26156 )
...
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-09-02 08:07:31 +02:00
Will Browne
9feaa91bf5
Alerting: Store sensitive settings encrypted for Telegram notifier ( #27122 )
...
* encrypt bot token
* update docs
* re-add uploadImage to docs
2020-08-25 14:35:57 +02:00
Emil Tullstedt
d5687cce11
Stats: Correct the number of arguments for SQL call ( #27182 )
...
* Stats: Correct the number of arguments for SQL call
* Stats: Run admin stats call as integration test
2020-08-25 08:59:44 +02:00
Will Browne
daaa3e571b
Alerting: Store sensitive settings encrypted for Threema notifier ( #27160 )
...
* encrypt API secret
* update docs
2020-08-24 16:49:45 +02:00
Will Browne
30d6405c53
Alerting: Store sensitive settings encrypted for Pushover notifier ( #27159 )
...
* encrypt api + user keys
* update docs
* fix decrypt steps
2020-08-24 16:49:30 +02:00
Will Browne
bbbbf9ac42
Alerting: Store sensitive settings encrypted for LINE notifier ( #27157 )
...
* encrypt token
* update docs
2020-08-24 16:49:10 +02:00
Will Browne
ed6f0663c2
Alerting: Store sensitive settings encrypted for Sensu notifier ( #27131 )
...
* encrypt password
* update docs
2020-08-24 16:48:55 +02:00
Emil Tullstedt
954a2811b3
Stats: Stop counting the same user multiple times ( #26777 )
...
* Stats: Cache based stats implementation
* Stats: Correct logic and add larger scale test
* Stats: linter
* Stats: SQL implementation
* Stats: cleanup SQL
* Stats: Tab -> Spaces
* Update pkg/services/sqlstore/stats.go
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
* Stats: Quote 'user' table with dialect.Quote
* Stats: Ensure test is run as integration test
* Stats: Use boolean value
...because if (v) { true } else { false } is unnecessary at best.
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2020-08-24 11:23:14 +02:00
Arve Knudsen
45adfe7732
Data sources: Use SQL store directly, not via bus ( #27000 )
...
* Server: Make it possible to avoid getting SQL store via bus
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
2020-08-21 09:30:06 +02:00
Will Browne
9f2386a219
Alerting: Store sensitive settings encrypted for OpsGenie notifier ( #27074 )
...
* encrypt OpsGenie API key
* make whitespace consistent
* update docs
2020-08-20 16:05:48 +02:00
Kyle Brandt
96babf1268
Alerting: copy queryType prop to tsdb.Query ( #27053 )
...
fixes #27048
2020-08-19 10:03:39 -04:00
Arve Knudsen
a2fbffe48a
Server: Add health check route ( #26999 )
...
* Server: Add health check route
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Server: Remove health check middleware
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-08-18 14:58:08 +02:00
Kirchen99
5da3276db1
Dashboard: Use same min refresh interval fallback in the API as in provisioning ( #25926 )
...
* Dashboard: Solve the discrepancy between provisioning and the API, Handle min refresh interval when creating/updating dashboard via API
* Docs: Add refresh field in the example dashboard http api docs
* Update create dashboard API docs
Add refresh field in the create dashboard example response
* Fix create dashboard API docs
* Fix create dashboard API docs
* Update docs/sources/http_api/dashboard.md
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
2020-08-17 12:00:10 -07:00
Joan López de la Franca Beltran
ef631582ba
Users: Improve conflict error handling ( #26958 )
...
* API: Improve error handling (#26934 )
* New ErrUserAlreadyExists error has been introduced
* Create user endpoint returns 412 Precondition Failed on ErrUserAlreadyExists errors
* Make ErrUserAlreadyExists error message clearer
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
* Use errors.Is instead of equality comparator on AdminCreateUser handler
* Improve sqlstore/user test definition
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* Improve sqlstore/user tests for ErrUserAlreadyExists cases
* Remove no needed string fmt and err declaration on sqlstore/user tests
* Code improvements for sqlstore/user tests
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* Use err.Error() instead of sentinel error value on AdminCreateUser
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* Add ErrUserAlreadyExists handling for signup & org invite use cases
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-08-13 14:38:54 +02:00
Arve Knudsen
1698c74ec1
Chore: Fix tests for Go 1.15 ( #26957 )
...
* Chore: Fix tests for Go 1.15
2020-08-12 17:45:03 +02:00
Benjamin Blattberg
3403db190d
API: Support paging in the admin orgs list API ( #26932 )
...
* Add page/limit to org search
* Update docs
* Fix test per PR feedback
2020-08-12 10:59:07 +03:00
Maksim Nabokikh
b646a1d627
Provisioning: describe which folder caused an error while provisioning from files structure ( #26771 )
...
* Provisioning: describe which folder caused an error while provisioning from files structure
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
* Apply suggestions from code review
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* Remove unused DashType constants
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-08-04 09:03:09 -07:00
Arve Knudsen
e344ff01ec
SQL: Fix missing org error messages ( #26785 )
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-08-04 17:06:37 +02:00
Leonard Gram
c266f45858
LDAP: users without org mappings are marked as disabled ( #26650 )
...
* LDAP: users without org mappings are marked as disabled
* Update pkg/services/ldap/ldap.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* LDAP: verifies that unmapped users are tagged as isDisabled
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-31 14:41:31 +02:00
Arve Knudsen
35c67606ce
Chore: Use errors.Is for comparing errors ( #26719 )
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-31 10:16:49 +02:00
Arve Knudsen
16c185c3b9
Chore: Drop xerrors dependency ( #26718 )
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-31 09:45:20 +02:00
Arve Knudsen
5a6afd9096
OAuth: Add some debug logs ( #26716 )
...
* OAuth: Add some debug logs
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-31 09:41:13 +02:00
Maksim Nabokikh
ba2524cd88
Provisioning: Add validation for missing organisations in datasource, dashboard, and notifier configurations ( #26601 )
...
* Provisioning: Check that org. from config exists
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
* Apply suggestions from code review
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* Fix some code after applying suggestions
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
* Add negative test case
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-30 12:59:12 +03:00
Ryan McKinley
339138d61a
Live: include a streaming event manager ( #26537 )
2020-07-27 00:26:16 -07:00
Arve Knudsen
94d0934e90
CloudWatch: Fix a few API status codes ( #26578 )
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-24 12:34:56 +02:00
Sofia Papagiannaki
ad4f8b7091
Alerting: Change settings column type to mediumtext ( #26549 )
...
* Alerting: Change settings column type to mediumtext
* Remove unnecessary newline
2020-07-24 08:40:06 +03:00
Arve Knudsen
102448040d
SQLite: Set 0640 permissions on SQLite database file ( #26339 )
...
* SQLite: Set 640 permissions on SQLite database file
2020-07-23 15:47:26 +02:00
Arve Knudsen
415638cdda
Chore: Use interfaces where possible ( #26392 )
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-23 08:17:20 +02:00
Arve Knudsen
4c56eb3991
Chore: Enable goprintffuncname and nakedret linters ( #26376 )
...
* Chore: Enable goprintffuncname linter
* Chore: Enable nakedret linter
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-23 08:14:39 +02:00
gastonqiu
f427f90a45
Chore: Aggregate save dashboard error ( #26443 )
...
* Chore: Aggregate save dashboard error
* Use errors package for error detection
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
2020-07-21 11:12:01 +02:00
Maksim Nabokikh
a1f40195be
Provisioning: Validate that datasource access field equals to direct or proxy ( #26440 )
...
* Validate that datasource access field equals to allowed value (direct or proxy)
2020-07-20 10:01:25 +02:00
Mitsuhiro Tanda
528a61b86b
Alerting: Store sensitive settings encrypted for alertmanager notifier ( #26318 )
...
Ref #25967
2020-07-17 13:56:06 +02:00
Marcus Efraimsson
7969d6645a
Provisioning: Support alert notification channel secure settings ( #26168 )
...
Closes #25968
2020-07-17 13:54:01 +02:00
Arve Knudsen
d4e4cb4c71
Chore: Enable Go linter gocritic ( #26224 )
...
* Chore: Enable gocritic linter
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-16 14:39:01 +02:00
Mitsuhiro Tanda
92767f00e0
Alerting: Store sensitive settings encrypted for pagerduty notifier ( #26319 )
...
Store pagerduty integration key in secure setting.
Ref #25967
2020-07-16 10:53:35 +02:00
Marcus Efraimsson
b97d1f4170
Provisioning: Fix bug when provision app plugins using Enterprise edition ( #26340 )
...
In OSS provisioning service init after plugin registration, but in
Enterprise it's the opposite order and installed app plugin check
fails. This adjusts service registry init priority to make sure plugins
are registered before provisioning inits.
Which issue(s) this PR fixes:
Fixes #26336
2020-07-16 10:36:08 +02:00
Arve Knudsen
d28d495235
Chore: Enable PR testing in Drone ( #26189 )
...
* Add Drone configuration
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Add more steps
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Add more steps
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Build front-end before testing it
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Upgrade grafana/build-container
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Add packaging step
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Trigger on push
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Remove some steps
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Enable steps
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Install Dockerize
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Use node image for test-frontend
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Increase number of test workers
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Make plugin installation depend on frontend tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Make integration tests depend on frontend tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Use grafana/build-container also for front-end tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Upgrade dependencies in order to fix front-end tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Depend on es-check
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Dont' depend on tests before building front-end
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Add more steps
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Fix packaging
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Simplify
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Try to build images
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Fix e2e tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Remove steps
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Install netcat
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Include golangci-lint with grafana/build-container
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Build storybook and docs website
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Fix e2e tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Use build image with root user
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Drop CircleCI dependencies
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Fix e2e tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Fix e2e under Drone
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Execute e2e server separately
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Use own plugin for building Docker images
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Use Starlark to configure Drone
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Add enterprise steps to pipeline
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Add more enterprise steps to pipeline
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Maintain Yarn cache
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Build enterprise Docker images
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Build Ubuntu Docker images
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Refactor
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Add Postgres integration test
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Add MySQL integration test
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Fix integration tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Parameterize integration test DB connections
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Categorize integration tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Use grabpl integration-tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Remove unintended change
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Drone: Disable Ubuntu Docker images for PR pipeline
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Regenerate yarn.lock
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Upgrade grabpl
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Restore Yarn cache before installing in grafana-enterprise
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Use separate pipelines for OSS and enterprise
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Let OSS builds depend on tests
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Restore Go cache before building back-end
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Reduce number of variants built for PRs
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Fix building of Docker images
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Drone: Simplify logic
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Drone: Use Starlark
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Drone: Fix syntax error
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Convert .drone.star to YAML
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Upgrade AWS Go SDK
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Drone: Fix Go linting
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Undo irrelevant changes
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Revert "Undo irrelevant changes"
This reverts commit 5152f65972
2020-07-10 16:09:21 +02:00
Marcus Efraimsson
c91e5adfcc
Alerting: Don't encrypt username for webhook notifier ( #26170 )
...
Can be hard for users to understand what user is configured
when encrypting the username field why this reverts to
store the username in cleartext.
Also, we don't encrypt username for data sources.
Ref #25967
2020-07-08 19:13:59 +02:00
Marcus Efraimsson
3223d4b419
Alerting: Store sensitive settings encrypted for webhook notifier ( #26164 )
...
Store sensitive settings (username and password) encrypted for webhook notifier.
Ref #25967
2020-07-08 17:46:34 +02:00
Mitsuhiro Tanda
292c985b76
Alerting: Support storing sensitive notifier settings securely/encrypted ( #25114 )
...
Support storing sensitive notification settings securely/encrypted.
Move slack notifier url and api token to secure settings.
Migrating slack notifier to store token and url encrypted is currently
a manual process by saving an existing slack alert notification channel.
saving an existing slack alert notification channel will reset the stored
non-secure url and token.
Closes #25113
Ref #25967
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2020-07-08 10:17:05 +02:00
Arve Knudsen
41d432b5ae
Chore: Enable whitespace linter ( #25903 )
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-07-06 20:17:28 +02:00
annegies
a2737c0896
Remove break from ldap, get all groups from all the group base searches specified ( #25825 )
...
Signed-off-by: Annegies van 't Zand <ace.vtzand@gmail.com>
2020-07-06 12:02:39 +02:00
Carl Bergquist
26852ca788
Instrument dashboard versions and annotation count ( #26044 )
2020-07-03 15:47:46 +02:00
Dan Cech
b5ca2381bc
provide license token directly via plugin environment ( #25987 )
...
* provide license token directly via plugin environment
2020-07-01 13:02:53 -04:00
Carl Bergquist
db8d7ffbf6
Linting fixes for the provisioning package ( #25690 )
2020-06-30 22:46:41 +02:00
Maksim Nabokikh
810ec4c5f8
Provisioning: Use folders structure from the file system to create desired folders in dashboard provisioning. ( #23117 )
...
Fixes #12016
2020-06-30 15:33:26 +02:00
Arve Knudsen
3651a8e976
Chore: Disable scopelint for tests ( #25923 )
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-06-30 11:05:47 +02:00
Arve Knudsen
d1e6214a4a
Chore: Enable scopelint Go linter ( #25896 )
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-06-29 17:04:38 +02:00
Arve Knudsen
5070f7a75b
Chore: Start harmonizing linting with plugin SDK ( #25854 )
...
* Chore: Harmonize linting with plugin SDK
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
* Chore: Fix linting issues
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-06-29 14:08:32 +02:00
Peter Holmberg
6465b2f0a3
Migration: Migrate New notification channel page ( #25265 )
...
* creating page
* add types select
* adding switches
* start with converting angular templates to json
* converting more alert channels to new format
* convert remaining channels
* typing the form
* add validation, update models
* fix default value in type select
* fix type
* fix issue with validation rule
* add missing settings
* fix type errors
* test notification
* add comments to structs
* fix selectable value and minor things on each channel
* More typings
* fix strictnull
* rename ModelValue -> PropertyName
* rename show -> showWhen
* add enums and adding comments
* fix comment
* break out channel options to component
* use try catch
* adding default case to OptionElement if element not supported
2020-06-29 13:39:12 +02:00
Mitsuhiro Tanda
9f82cd4713
Slack: Support use of chat.postMessage ( #25818 )
...
* set bearer token if token is provided
* update slack notification document
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-06-26 20:47:06 +02:00
Emil Tullstedt
5d7cd2e9fc
Teams: Add index for permission check ( #25736 )
...
* Teams: Add indices for permission check
* Teams: Remove user_id index
2020-06-26 15:13:53 +02:00
Arve Knudsen
084542a006
Chore: Consolidate on golangci-lint ( #25834 )
...
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-06-26 08:46:08 +02:00
Emil Tullstedt
112c28033d
Provisioning: Apply settings expanders ( #25692 )
...
* Provisioning: Apply settings expanders
Adds support for the variable expanders introduced to the configuration file in #25075 to provisioning.
* Update pkg/services/provisioning/values/values_test.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* Update pkg/services/provisioning/values/values.go
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
* Provisioning: Handle errors when expanding JSON maps
2020-06-25 12:04:42 +02:00
Agnès Toulet
b5b019dfcf
Notifications: fix reply-to option for emails ( #25748 )
2020-06-22 18:56:49 +02:00
Marcus Efraimsson
cc95754e0d
Provisioning: Adds support for enabling app plugins ( #25649 )
...
Adds support for enabling app plugins using provisioning.
Ref #11409
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
2020-06-22 17:49:13 +02:00
Emil Tullstedt
e8b5f2330d
Settings: Expand variables in configuration ( #25075 )
2020-06-10 14:58:42 +02:00
Marcus Efraimsson
53175a41c9
Make tsdb dataframes response able to carry encoded/decoded frames ( #25454 )
...
Make tsdb dataframes response able to carry encoded and/or decoded frames
2020-06-09 13:13:06 +02:00
Alexander Zobnin
c4eca530ce
Fix active LDAP sync ( #25321 )
...
* LDAP: sync only users with 'ldap' module as a most recent auth module
* LDAP: tests for searching ldap users
2020-06-03 16:28:13 +03:00
Sofia Papagiannaki
1e543d5ac1
Alerting: Ignore obsolete notification channels referenced by alerts ( #25302 )
...
* Ignore obsolete notification channel
* Fix tests
* Update pkg/services/alerting/rule.go
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2020-06-02 19:33:13 +03:00
Josh Soref
e4fcc39e55
Chore: spelling in Go code ( #24433 )
2020-06-02 14:42:34 +02:00
Arve Knudsen
07582a8e85
Chore: Fix various spelling errors in back-end code ( #25241 )
...
* Chore: Fix various spelling errors in back-end code
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Josh Soref <jsoref@users.noreply.github.com>>
2020-06-01 17:11:25 +02:00
Andrew Burian
a0e5f51d05
Alerting: Remove message from PagerDuty summary field ( #24813 )
...
closes #16930
2020-05-25 21:01:29 +02:00
Victor Coutellier
3a0f2dc160
Alerting: Adds support for multiple URLs in Alertmanager notifier ( #24196 )
...
* Alerting: Adds support for multiple URLs in Alertmanager notifier
Adds support for multiple URLs in Alertmanager notifier following
alertmanager documentation for high availability setup.
Update the documentation for alertmanager notifier.
Closes #24195
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: bergquist <carl.bergquist@gmail.com>
2020-05-20 08:49:53 +02:00
Carl Bergquist
c62591e77b
Provisioning: Makes file the default dashboard provisioner type ( #24856 )
...
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-05-19 15:01:04 +02:00
Rob Russo
9fa551cc32
Alerting: updating the victorops alerter to handle the no_data alert type ( #23761 )
2020-05-19 09:58:57 +02:00
Kamal Galrani
319051c70e
Capitalize Grafana in test email notification ( #24770 )
2020-05-17 13:57:43 +02:00
Carl Bergquist
7610d5717a
Provisioning: Use proxy as default access mode in provisioning ( #24669 )
...
fixes #24591
fixes #19501
2020-05-14 12:40:00 +02:00
Torkel Ödegaard
2f22781cd8
Orgs: Add future deprecation notice ( #24502 )
...
* Orgs: Fist draft of orgs deprecation infobox
* adds warning about potentially deprecating orgs (#24512 )
* Updates
* Fixed ts issue
Co-authored-by: Carl Bergquist <carl@grafana.com>
2020-05-14 12:16:26 +02:00
thameezb
16297da298
Email Notifications: Add StartTLSPolicy config flag ( #24574 )
2020-05-13 16:33:40 +02:00
Emil Tullstedt
078d08d036
Search: Support multiple order filters ( #24230 )
2020-05-06 11:42:52 +02:00
Mario Trangoni
5116420e9a
Fix misspell issues ( #23905 )
...
* Fix misspell issues
See,
$ golangci-lint run --timeout 10m --disable-all -E misspell ./...
Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
* Fix codespell issues
See,
$ codespell -S './.git*' -L 'uint,thru,pres,unknwon,serie,referer,uptodate,durationm'
Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
* ci please?
* non-empty commit - ci?
* Trigger build
Co-authored-by: bergquist <carl.bergquist@gmail.com>
Co-authored-by: Kyle Brandt <kyle@grafana.com>
2020-04-29 21:37:21 +02:00
Marcus Efraimsson
b22649bf8d
Dashboard: Handle min refresh interval when importing dashboard ( #23959 )
...
If refresh interval is lower than minimum refresh interval
when importing dashboard, use the minimum refresh interval
instead of returning error.
Fixes #23099
2020-04-27 21:17:28 +02:00
Alexander Zobnin
fa710a3172
Rendering: Add metrics ( #23827 )
...
* Rendering: base metrics
* Rendering: rendering_queue_size metric
* Chore: fix linter error
* Rendering metrics: refactoring
* Apply suggestions from code review
Co-Authored-By: Marcus Efraimsson <marcus.efraimsson@gmail.com>
* Rendering metrics: handle DeadlineExceeded errors
* Rendering metrics: don't measure canceled request time
* Rendering metrics: revert deleting summary for canceled requests
* Update pkg/services/rendering/rendering.go
Co-Authored-By: Marcus Efraimsson <marcus.efraimsson@gmail.com>
* Rendering: return ErrTimeout if context deadline exceeded
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2020-04-27 15:29:46 +03:00
Emil Tullstedt
830e8dc5fd
Search: Replace search implementation ( #23855 )
2020-04-27 14:16:03 +02:00
kay delaney
f48ba11d4c
Datasource/Cloudwatch: Adds support for Cloudwatch Logs ( #23566 )
...
* Datasource/Cloudwatch: Adds support for Cloudwatch Logs
* Fix rebase leftover
* Use jsurl for AWS url serialization
* WIP: Temporary workaround for CLIQ metrics
* Only allow up to 20 log groups to be selected
* WIP additional changes
* More changes based on feedback
* More changes based on PR feedback
* Fix strict null errors
2020-04-25 22:48:20 +02:00
Marcus Efraimsson
58de0dabd4
Alerting: Upload error image when image renderer unavailable ( #23713 )
...
When Include image is enabled for an alert notification channel, but there's
no image renderer available/installed when sending notification an error
image will be uploaded/attached explaining that you need to install the
Grafana Image Renderer plugin.
Ref #13802
Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>
2020-04-24 11:35:55 +02:00
Omar Nahhas Sanchez
cf23f15a08
Adding debug line to search ldap. ( #23824 )
2020-04-24 09:53:42 +02:00
Leonard Gram
ebdbb0c96d
Rendering: makes sure IsAvailable can be used during init of other services ( #23817 )
...
* Rendering: makes sure service knows if it is configured after Init()
* Rendering: refactor
2020-04-23 14:44:52 +02:00
Marcus Efraimsson
61de19250d
Image Rendering: Make it work using serve_from_sub_path configured ( #23706 )
...
Make rendering work when using serve_from_sub_path and not have rendering.renderer_url configured.
Fixes #21925
2020-04-21 19:57:11 +02:00
Marcus Efraimsson
871ad73414
Backend plugins: Renderer v2 plugin ( #23625 )
...
grafana-plugin-model is legacy and is replaced by new backend
plugins SDK and architecture. Renderer is not part of SDK and
we want to keep it that way for now since it's highly unlikely there
will be more than one kind of renderer plugin.
So this PR adds support for renderer plugin v2.
Also adds support sending a Device Scale Factor parameter to the
plugin v2 remote rendering service and by that replaces #22474 .
Adds support sending a Headers parameter to the plugin v2 and
remote rendering service which for now only include
Accect-Language header (the user locale in browser when using
Grafana), ref grafana/grafana-image-renderer#45 .
Fixes health check json details response.
Adds image renderer plugin configuration settings in defaults.ini
and sample.ini.
Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>
2020-04-21 16:16:41 +02:00
Leonard Gram
8620b7c2aa
Search: raise service init prio ( #23740 )
2020-04-21 15:30:09 +02:00
Emil Tullstedt
83193aed3d
Search: Fix title search null pointer ( #23705 )
2020-04-20 17:29:35 +02:00
Emil Tullstedt
55c306eb6d
Refactor search ( #23550 )
...
Co-Authored-By: Arve Knudsen <arve.knudsen@grafana.com>
Co-Authored-By: Leonard Gram <leonard.gram@grafana.com>
2020-04-20 16:20:45 +02:00
Andrej Ocenas
e5dd7efdee
Provisioning: Allows specifying uid for datasource and use that in derived fields ( #23585 )
...
* Add uid to datasource
* Fix uid passing when provisioning
* Better error handling and Uid column type change
* Fix test and strict null error counts
* Add backend tests
* Add tests
* Fix strict null checks
* Update test
* Improve tests
* Update pkg/services/sqlstore/datasource.go
Co-Authored-By: Arve Knudsen <arve.knudsen@gmail.com>
* Variable rename
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-04-20 15:48:38 +02:00
Carl Bergquist
46fd7c094b
Alertmanager: Basic auth should not be required ( #23691 )
2020-04-20 11:19:31 +02:00
