public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,292 Commits 655 Branches 650 Tags
3c1bcc72753e93d95b4effa2fe71cad410e2d708
Commit Graph

769 Commits

Author SHA1 Message Date
Arve Knudsen f326b79cc1 Security: Add gosec G304 auditing annotations (#29578) 
* Security: Add gosec G304 auditing annotations

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* Add gosec annotations

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* Add gosec annotations

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* add G304 auditing comment

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* Add gosec annotations

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* space

Signed-off-by: bergquist <carl.bergquist@gmail.com>

* Add gosec annotations

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

Co-authored-by: bergquist <carl.bergquist@gmail.com>
 2020-12-03 22:13:06 +01:00
Arve Knudsen f2b7fbc32a Chore: Check errors from Close calls (#29562) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-12-03 10:11:14 +01:00
Arve Knudsen 58dbf96a12 Middleware: Rewrite tests to use standard library (#29535) 
* middleware: Rewrite tests to use standard library

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-12-03 08:28:54 +01:00
Tomo Wang d33c4e5e7c Alarting: fix alarm messages in dingding (Fixes #29470) (#29482) 2020-12-02 11:09:49 +01:00
Arve Knudsen f55818ca70 Chore: Enable exhaustive linter (#29458) 
* Chore: Enable exhaustive linter

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-12-01 09:53:27 +01:00
Todd Campbell 643f790753 Alerting: Add support for Sensu Go notification channel (#28012) 
* Add support for Sensu Go notification channel

Similar to current support for the older "Core" version of
Sensu, this commit add support for the newer version.

Closes #19908

Signed-off-by: Todd Campbell <todd@sensu.io>

* fix linter errors

Signed-off-by: Todd Campbell <todd@sensu.io>

* Apply suggestions from code review

PR review suggestions

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Fix no new variables error

* Replace convey testing with testify

Signed-off-by: Todd Campbell <todd@sensu.io>

* Wording suggestions

Signed-off-by: Todd Campbell <todd@sensu.io>

* Add docker compose environment for testing/maintenance

Signed-off-by: Todd Campbell <todd@sensu.io>

* Renamed and fixed docker-compose.yaml to work in devenv

Signed-off-by: Todd Campbell <todd@sensu.io>

* Change sensugo web UI port to 3080 so as not to conflict with grafana

Signed-off-by: Todd Campbell <todd@sensu.io>

* Apply suggestions from code review

Set the API key as a secure value.

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

* Add Sensu Go information to notifications doc

Signed-off-by: Todd Campbell <todd@sensu.io>

* Update pkg/services/alerting/notifiers/sensugo.go

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>

* change assert to require for Error/NoError tests

Signed-off-by: Todd Campbell <todd@sensu.io>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2020-11-27 19:09:24 +02:00
Carl Bergquist cffc1b13ad adds tracing for all bus calls that passes ctx (#29434) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2020-11-27 14:58:45 +01:00
Will Browne d10a8b2761 Alerting: Improve Prometheus Alert Rule error message (#29390) 
* provide better ctx for prom err

* rework

* Update pkg/tsdb/prometheus/prometheus.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Update pkg/tsdb/prometheus/prometheus.go

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* call func

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-26 13:38:36 +01:00
Arve Knudsen 063f863abc WebhookNotifier: Convert tests away from goconvey (#29291) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-23 10:37:53 +01:00
Arve Knudsen 9593d57914 Chore: Enable errorlint linter (#29227) 
* Enable errorlint linter
* Handle wrapped errors

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2020-11-19 14:47:17 +01:00
Arve Knudsen 4dd7b7a82d Chore: Remove unused Go code (#28852) 
* Chore: Remove more unused Go code

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-17 11:51:31 +01:00
Arve Knudsen 676d393ec9 Chore: Fix issues reported by staticcheck; enable stylecheck linter (#28866) 
* Chore: Fix issues reported by staticcheck

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Apply suggestions from code review

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2020-11-05 15:37:11 +01:00
Arve Knudsen 7897c6b7d5 Chore: Fix staticcheck issues (#28854) 
* Chore: Fix issues reported by staticcheck

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Undo changes

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-05 11:57:20 +01:00
Arve Knudsen dff84f6a31 Chore: Remove dead code (#28664) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-11-05 11:00:00 +01:00
Sofia Papagiannaki 48e753d888 Alerting: Log alert warnings for obsolete notifiers when extracting alerts and remove spammy error (#28162) 
* Lower level of notification translation messages

* API: Log alert warnings when saving dashboard

* Remove spammy error

* Rename function parameter

* Apply suggestions from code review

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>

* Apply suggestions from code review

* Fix test

* Change alertValidator return type

* Small fix

* Rename symbol

* Revert "Rename symbol"

This reverts commit 40b619b21a.

* Revert "Small fix"

This reverts commit 2df8319d1d.

* Revert "Change alertValidator return type"

This reverts commit ad933863e3.

* Revert "Fix test"

This reverts commit f728ece2db.

* Revert "Apply suggestions from code review"

This reverts commit f35c5f52af.

* Revert "Apply suggestions from code review"

This reverts commit 7f95800c5f.

* Revert "Rename function parameter"

This reverts commit 95d3e75b00.

* Revert "API: Log alert warnings when saving dashboard"

This reverts commit 1ac5c3f281.

* Conditionally log translation failures

* Fix issue causing test to fail

* Fix test

* Log instead of propagating translations failures due to database errors

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-22 14:43:12 +03:00
Kyle Brandt e16637793d Alerting: Add labels to name when converting data frame to series (#28085) 
* also move conversion func to alerting package since it is not used in other places

Fixes #28068
 2020-10-09 08:21:16 -04:00
Harald Kubota 81bf9fc278 LINE Notify to have Alerts and OK notifications (#27639) 
* Get Alerts AND OKs for LINE Notify

* Get Alerts AND OKs for LINE Notify

* Get Alerts AND OKs for LINE Notify
 2020-09-24 15:45:53 +02:00
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
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
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
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
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
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 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 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
Mitsuhiro Tanda 528a61b86b Alerting: Store sensitive settings encrypted for alertmanager notifier (#26318) 
Ref #25967
 2020-07-17 13:56:06 +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 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
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
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
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
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