IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
29,096 Commits 5,416 Branches 554 Tags
8dea72a763aa2151c1f789fd8caa217e18a227db
Commit Graph

6109 Commits

Author SHA1 Message Date
dependabot[bot]
8dea72a763 Chore(deps): Bump go.opentelemetry.io/collector from 0.22.0 to 0.25.0 (#33365) 
* Chore(deps): Bump go.opentelemetry.io/collector from 0.22.0 to 0.25.0

Bumps [go.opentelemetry.io/collector](https://github.com/open-telemetry/opentelemetry-collector) from 0.22.0 to 0.25.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.22.0...v0.25.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Apply changes to tempo code

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>
 2021-04-29 15:01:48 +02:00
Kyle Brandt
d32fcbe2bc Alerting: Eval pkg tests and more specific error handling (#33496) 
* comment updates
* more friendly error messages, in particular if it looks like time series data
 2021-04-29 07:27:32 -04:00
Emil Tullstedt
840828b5d2 Access control: Allow empty scope requirement lists (#33518) 2021-04-29 13:22:13 +02:00
Sofia Papagiannaki
fcd674ec58 Fix deleting prom rules endpoints via ds_proxy (#33491) 2021-04-29 10:20:51 +03:00
Owen Diehl
ec37b4cb87 [Alerting] Automatic request instrumentation (#33444) 
* alerting: automatic request instrumentation

* always expose alerting prom metrics

* globally register alerting metrics
 2021-04-28 16:59:15 -04:00
Kyle Brandt
914443c816 Alerting: Fix state cache id duplication (#33480) 2021-04-28 11:42:19 -04:00
Marcus Efraimsson
7e6db1ee7e Permissions: Fix inherited folder permissions can prevent new permissions being added to a dashboard (#33329) 
In the case permissions has been added on dashboard(s). Later permissions for the 
parent folder of the dashboard is edited in such a way that dashboard in that folder 
has a permission that is a duplicate of an inherited one. This PR changes so that 
duplicate permissions are now filtered out from /api/dashboards/id/<dashboard id>/permissions.
Duplicate permission are not filtered out if the permission on dashboard is higher 
than on the inherited folder.

Fixes #33296

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2021-04-28 14:42:18 +02:00
ying-jeanne
748778fff0 new endpoint to post/get trimmed dashboard json (#33465) 
* new endpoint to post/get trimed dashboard json

* add isdisabled check in dashboard.go
 2021-04-28 19:38:33 +08:00
Christian Haudum
076e2ce06a Return 404 when deleting non-existing API key (#33346) 
The server needs to return a HTTP 404 (Not Found) when an API key that does not exist is deleted.
 2021-04-28 13:30:09 +02:00
Joan López de la Franca Beltran
c41b08bd59 Settings: Encapsulate settings within an extensible provider (#32219) 
* Encapsulate settings with a provider with support for runtime reloads

* SettingsProvider: reload is controlled by the services

* naive impl of reload handlers for settings

* working naive detection on new changes

* Trigger settings reload from API endpoint

* validation step added

* validation of settings

* Fix linting errors

* Replace DB_Varchar by DB_NVarchar

* Reduce settings columns (section, key) lenghts

* wip db update logic

* Db Settings: separate updates and removals

* Fix: removes incorrectly added code

* Minor code improvements

* Runtime settings: moved oss -> ee

* Remove no longer used setting.Cfg SAML-related fields

* Rename file setting/settings.go => setting/provider.go

* Apply suggestions from code review

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

* Minor code improvements on OSS settings provider

* Fix some login API tests

* Correct some GoDoc comments

* Apply suggestions from code review

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>

Co-authored-by: Leonard Gram <leo@xlson.com>
Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
 2021-04-28 11:26:58 +02:00
Sofia Papagiannaki
7ccb022c03 Alerting: validate condition before updating rulegroup (#33367) 
* Alerting: validate condition before updating rulegroup

* Apply suggestions from code review
 2021-04-28 11:31:51 +03:00
Hugo Häggmark
20ee0e9601 LibraryPanels: Adds panel type filter and sorting (#33425) 
* Wip: inital commit

* Chore: updating api

* Refactor: adds description search and sorting

* Refactor: adds panel filtering

* Refactor: limits the height of select

* Tests: updates snapshot

* Refactor: small UI improvements
 2021-04-28 09:18:13 +02:00
Kyle Brandt
968935b8b7 TestData: Change predictable csv scenario to multi-series (#33442) 
Allow multiple series in Predictable CSV Wave testdata scenario

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
 2021-04-27 16:35:43 -04:00
Kyle Brandt
b590e95682 AlertingAPI: Change list response query prop (#33419) 
* Alerting: change to full []AlertQuery as json in a string and not just model.
 2021-04-27 22:15:00 +02:00
Vardan Torosyan
5bf6d7dad8 Access control: Update evaluator to authorize when at least one of the scopes is a match (#33393) 2021-04-27 18:22:18 +02:00
Ganesh Vernekar
467ab124dd NGAlert: Fix GET for Alertmanager config (#33379) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-27 20:48:19 +05:30
Alexander Emelin
50795bc760 live: better comment, code style, show disconnect reason (#33430) 2021-04-27 17:01:12 +02:00
Kyle Brandt
adcba36d39 AlertingAPI: update swagger json files match datasourceUid change (#33332) 
* update swagger json files match datasourceUid change
underlying change made in https://github.com/grafana/grafana/pull/33282
* Document DatasourceUID field in AlertQuery model
* Run spec generation from inside a docker container
* Generate latest spec

Co-authored-by: Sofia Papagiannaki <sofia@grafana.com>
 2021-04-27 16:50:30 +02:00
Alexander Emelin
e6f9f65fdf Live: use ReqSignedIn middleware for ws routes (#33381) 2021-04-27 16:19:36 +02:00
Owen Diehl
86c8eed386 Instrument/ruler api (#33290) 
* ruler api histogram instrumentation

* register ruler metrics
 2021-04-27 08:25:32 -04:00
Ganesh Vernekar
be1affe0a4 NGAlert: Fix flaky test (#33415) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-27 17:03:22 +05:30
Kyle Brandt
f5efe97763 SSE: limit allowed input/output to/from classic conditions (#33337) 
* add tests for graph and specific cases in this pr
 2021-04-27 07:22:11 -04:00
Carl Bergquist
58a325a4e4 Instrumentation: Add success rate metrics for email notifications (#33359) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2021-04-27 11:15:07 +02:00
Alexander Emelin
2abd9bc3b9 live: rename url param - assume stable schema by default (#33383) 2021-04-26 20:46:26 +03:00
Giordano Ricci
c88af6e221 Elasticsearch: Add generic support for template variables (#32762) 
* Elasticsearch: Add generic support for template variables

* format MovingAverage settings as numbers

* Move formatting logic to query builder & forma serial_diff settings as numbers

* modify presence check

* add todo

* minor fixes

* transform string values to numbers

* Move casting logic

* Slightly cleaner implementation

* Add BE tests

* Leverage elastic validation when string doesn't resolve to a numeric value

* move newly introduced test to testify

* add FE query_builder tests

* check error

* Parse values to float instead of int

* Fix tests & ParseFloat bit size
 2021-04-26 16:54:23 +01:00
Will Browne
8e6205c107 Plugins: Move plugin installing + uninstalling logic from CLI to plugins package (#33274) 
* move guts from cli to server

* renaming + refactoring

* add pluginsDir arg

* arg fixes

* add support for repo URL override

* add funcs to interface

* use pluginID consistently

* swap args

* pass mandatory grafanaVersion field

* introduce logger interface

* create central logger for CLI

* add infra log wrapper

* re-add log initer step

* remove unused logger

* add checks for uninstalling

* improve debug blue

* make sure to close file

* fix linter issues

* remove space

* improve newline usage

* refactor packaging

* improve logger API

* fix interface func names

* close file and reformat zipslip catch

* handle G305 linter warning

* add helpful debug log
 2021-04-26 16:13:40 +02:00
Alexander Emelin
7501a2deb6 Live: pure websocket push endpoint (#33339) 2021-04-26 13:17:49 +03:00
Ryan McKinley
693915de35 Live: Simplify live interface (#33196) 2021-04-23 23:21:38 +02:00
Ryan McKinley
1dd9e9b184 Live: support a dashboard gitops channel (#33291) 2021-04-23 21:55:31 +02:00
David Parrott
788bc2a793 Alerting: refactor state tracker (#33292) 
* set processing time

* merge labels and set on response

* use state cache for adding alerts to rules

* minor cleanup

* add support for NoData and Error results

* rename test

* bring in changes from other PRs tha have been merged

* pr feedback

* add integration test

* close state tracker cleanup on context.Done

* fixup test

* rename state tracker

* set EvaluationDuration on Result

* default labels set as constants

* separate cache and state from manager

* use RWMutex in cache
 2021-04-23 21:32:25 +02:00
David Parrott
ca79206498 Alerting: Handle NoData and Error evaluation results (#33194) 
* set processing time

* merge labels and set on response

* use state cache for adding alerts to rules

* minor cleanup

* add support for NoData and Error results

* rename test

* bring in changes from other PRs tha have been merged

* pr feedback

* add integration test

* close state tracker cleanup on context.Done

* fixup test

* not those annotations
 2021-04-23 20:47:52 +02:00
Kyle Brandt
5e818146de Alerting/Expr: New SSE Request/QueryType, alerting move data source UID (#33282) 2021-04-23 16:52:32 +02:00
Ganesh Vernekar
659ea20c3c NGAlert: Run the maintenance cycle for the silences (#33301) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-23 16:19:03 +02:00
Vardan Torosyan
bf83fb80b7 Access control: Combine permissions through predefined roles (#33275) 
* Access control: Combine permissions through predefined roles

When certain permission is required for built-in role, instead of adding those permissions to the existing predefined roles, we need to have granular predefined roles with those permissions.

* Better copy...

* Adding and fixing tests

* Remove duplicated permission
 2021-04-23 15:44:42 +02:00
Ganesh Vernekar
d66a5e65a4 AlertingNG: Add webhook notification channel (#33229) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-23 18:59:28 +05:30
Ryan McKinley
7627b55ef4 TSDB: add deprecation comments to many tsdb structs (#33281) 2021-04-23 03:03:11 +02:00
David Parrott
aa5bdff97d Call server.Shutdown() as go routine (#33288) 
server.Shutdown() blocks trying to write to s.shutdownFinished in some cases when using a test Grafana instance for a series of integration tests. 

See https://github.com/grafana/grafana/blob/master/pkg/server/server.go#L222-L224
 2021-04-22 13:23:08 -07:00
Ganesh Vernekar
a0e567f80f AlertingNG: Add Dingding notification channel (#32995) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-22 19:30:49 +02:00
Ganesh Vernekar
4ec1edfca3 AlertingNG: Add Teams notification channel (#32979) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-22 18:16:26 +02:00
Ganesh Vernekar
c9cd7ea701 AlertingNG: Add Telegram notification channel (#32795) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-22 17:24:59 +02:00
Ganesh Vernekar
0a03d5c29e AlertingNG: Correctly set StartsAt, EndsAt, UpdatedAt after alert reception (#33109) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-22 20:42:18 +05:30
Ganesh Vernekar
3056f86f76 AlertingNG: Fix TODOs in email notification channel (#33169) 
* AlertingNG: Fix TODOs in email notification channel

Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>

* Test fixup

* Remove the receiver field it is not needed for the email notification

Co-authored-by: Josue Abreu <josue@grafana.com>
 2021-04-22 10:01:55 -04:00
Arve Knudsen
6408b55a7c Slack: Use chat.postMessage API by default (#32511) 
* Slack: Use only chat.postMessage API

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

* Slack: Check for response error

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

* Slack: Support custom webhook URL

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

* Simplify

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

* Fix tests

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

* Rewrite tests to use stdlib

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

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

Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>

* Clarify URL field name

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

* Fix linting issue

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

* Fix test

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

* Fix up new Slack notifier

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

* Improve tests

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

* Fix lint

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

* Slack: Make token not required

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

* Alerting: Send validation errors back to client

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

* Document how token is required

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

* Make recipient required when using Slack API

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

* Fix field description

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

Co-authored-by: Dimitris Sotirakis <sotirakis.dim@gmail.com>
 2021-04-22 16:00:21 +02:00
Alexander Zobnin
0e020a40a5 Access control: Fix invite endpoint permissions (#33262) 2021-04-22 16:15:57 +03:00
Ganesh Vernekar
6cc7a20789 NGAlert: Remove all pending references to the old API package (#33269) 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
 2021-04-22 18:36:32 +05:30
Erik Sundell
743b77771f fix dimension name (#33271) 2021-04-22 15:02:40 +02:00
Alexander Zobnin
dd9f701cd9 Access control: Fix predefined roles (#33260) 2021-04-22 12:49:24 +02:00
Alexander Zobnin
a7e721e987 Access control: Make Admin/Users UI working with the permissions (#33176) 
* API: authorize admin/users views

* Render admin/users components based on user's permissions

* Add LDAP permissions (required by admin/user page)

* Extend default admin role by LDAP permissions

* Show/hide LDAP debug views

* Render LDAP debug page if user has access

* Authorize LDAP debug view

* fix permissions definitions

* Add LDAP page permissions

* remove ambiguous permissions check

* Hide logout buttons in sessions table

* Add org/users permissions

* Use org permissions for managing user roles in orgs

* Apply permissions to org/users

* Apply suggestions from review

* Fix tests

* remove scopes from the frontend

* Tweaks according to review

* Handle /invites endpoints
 2021-04-22 13:19:41 +03:00
Arve Knudsen
66020b419c NGAlert: Consolidate on standard errors package (#33249) 
* NGAlert: Don't use pkg/errors

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

* Update pkg/services/ngalert/notifier/alertmanager.go

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>

* Fix logging

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

Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
 2021-04-22 11:18:25 +02:00
Gábor Farkas
7ff6665ac2 Alerting: InfluxDB: InfluxQL: convert backend-code to use dataframes (#32950) 
* alerting: influxdb: refactor unit-tests

* alerting: influxdb: converted code from timeseries-mode to dataframe-mode

* influxdb: simplify code

* influxdb: better function name

* influxdb: alerting: more tests

* influxdb: alerting: more tests

* influxdb: refactor

* influxdb: improved unit-test

* influxdb: simplified code

* influxdb: refactor reponse-parser code

* influxdb: refactor unit tests

* influxdb: alerting: use nicer names

Co-authored-by: dsotirakis <sotirakis.dim@gmail.com>
 2021-04-22 08:43:17 +02:00