IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-01 21:19:28 -06:00
Code Issues Packages Projects Releases Wiki Activity
27,436 Commits 5,114 Branches 538 Tags 1.9 GiB
0c8498401e
Commit Graph

5705 Commits

Author SHA1 Message Date
Sofia Papagiannaki
9fce64c6aa
Chore: Fix conversion of a 64-bit integer to a lower bit size type uint (#28425) 2020-10-21 11:25:56 +03:00
Arve Knudsen
ec40e49dcb
Chore: Rewrite some tests to use testify (#28420) 
* Chore: Improve tests to use testify

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-21 10:09:42 +02:00
Joan López de la Franca Beltran
68efedfa88
App Plugins: Add backend support (#28272) 
* Add backend support for app plugins

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-21 09:10:54 +02:00
jgulick48
5bc6c447e3
Alerting: Return proper status code when trying to create alert notification channel with duplicate name or uid (#28043) 
* Alerting: Return proper status code when trying to create an Alert Notification where the name or UID already exists.

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-20 13:53:48 +02:00
Alexander Zobnin
d13c6b4c5a
OAuth: Able to skip auto login (#28357) 
* OAuth: able to skip auto login

* OAuth: tests for internal login param

* OAuth: rename internal -> disableAutoLogin

* OAuth: update log message

* OAuth: fix tests
 2020-10-20 14:51:06 +03:00
Arve Knudsen
af17f9fd9b
CloudWatch: Fix custom metrics (#28391) 
* CloudWatch: Fix querying for custom metrics

Co-authored by Mitch McKenzie <mitch.mckenzie@outlook.com>

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-20 13:33:38 +02:00
Carl Bergquist
edbaa9d681
Instrumentation: Add histogram for request duration (#28364) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2020-10-20 09:44:38 +02:00
Carl Bergquist
b036112444
remove status label from histogram (#28387) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>
 2020-10-20 09:25:22 +02:00
Alexander Zobnin
8032b43838
OAuth: configurable user name attribute (#28286) 
* OAuth: more user-frienly logging

* OAuth: custom user name attribute

* OAuth: remove deprecated nameAttributeName option

* OAuth: nameAttributePath tests

* OAuth: add name_attribute_path config option

* OAuth: docs for name_attribute_path option

* move docs to the separate branch
 2020-10-20 09:56:48 +03:00
Carl Bergquist
74d1d3c6a8
Instrumentation: Add counters and histograms for database queries (#28236) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-19 20:06:12 +02:00
Marcus Efraimsson
0e17a15fbd
CloudWatch: Adding support for additional Amazon CloudFront metrics (#28378) 
Follow up to #28069 where some metrics was missed.

Ref #28069
 2020-10-19 18:14:27 +02:00
Arve Knudsen
89d10c706a
Plugins: Compose filesystem paths with filepath.Join (#28375) 
* plugins: Fix filesystem path composition

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

* plugins: Use filepath.Join to join filesystem paths

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-19 17:35:31 +02:00
Carl Bergquist
89ebb97fca
Instrumentation: Adds environment_info metric (#28355) 
Signed-off-by: bergquist <carl.bergquist@gmail.com>

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-19 16:58:16 +02:00
Kyle Brandt
44a795cb17
AlertingNG: remove warn/crit from eval prototype (#28334) 
and misc cleanup
 2020-10-16 12:33:57 -04:00
Sofia Papagiannaki
4937f0daab
SQLStore: Run tests as integration tests (#28265) 
* sqlstore: Run tests as integration tests

* Truncate database instead of re-creating it on each test

* Fix test description

See https://github.com/grafana/grafana/pull/12129

* Fix lint issues

* Fix postgres dialect after review suggestion

* Rename and document functions after review suggestion

* Add periods

* Fix auto-increment value for mysql dialect

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2020-10-16 10:46:14 +03:00
Arve Knudsen
a2c7c5b912
API: Fix short URLs (#28300) 
* API: Fix short URLs

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-16 09:22:24 +02:00
The Rock Guy
c9cc82ea55
CloudWatch: Add EC2CapacityReservations Namespace (#28309) 2020-10-16 09:08:50 +02:00
Pete Davids
65940c7726
Dashboard: Allow shortlink generation (#27409) 
* intial frontend resolution/redirection logic

* backend scaffolding

* enough of the frontend to actually test end to end

* bugfixes

* add tests

* cleanup

* explore too hard for now

* fix build

* Docs: add docs

* FE test

* redirect directly from backend

* validate incoming uids

* add last_seen_at

* format documentation

* more documentation feedback

* very shaky migration of get route to middleware

* persist unix timestamps

* add id, orgId to table

* fixes for orgId scoping

* whoops forgot the middleware

* only redirect to absolute URLs under the AppUrl domain

* move lookup route to /goto/:uid, stop manually setting 404 response code

* renaming things according to PR feedback

* tricky deletion

* sneaky readd

* fix test

* more BE renaming

* FE updates -- no more @ts-ignore hacking :) and accounting for subpath

* Simplify code

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

* Short URLs: Drop usage of bus

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

* ShortURLService: Make injectable

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

* Rename file

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

* Add handling of url parsing and creating of full shortURL to backend

* Update test, remove unused imports

* Update pkg/api/short_urls.go

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

* Add correct import

* Pass context to short url service

* Remove not needed error log

* Rename dto and field to denote URL rather than path

* Update api docs based on feedback/suggestion

* Rename files to singular

* Revert to send relative path to backend

* Fixes after review

* Return dto when creating short URL that includes the full url

Use full url to provide shorten URL to the user

* Fix after review

* Fix relative url path when creating new short url

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Ivana <ivana.huckova@gmail.com>
Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2020-10-14 12:48:48 +02:00
Karine Valença
e1e05cad7d
Database: Adds new indices to alert_notification_state and alert_rule_tag tables (#28166) 
Add non-unique indices to alert_notification_state and alert_rule_tag tables for 
column alert_id.

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

Fixes #22890
 2020-10-13 13:51:54 +02:00
Will Browne
a189cd1832
Users: Expire old user invites (#27361) 
* expire with existng cleanup service

* expire with new temp user service

* make Drone happy :)

* add expiry status

* remove other approach

* cleanup

* add test for idempotency

* add migration from datetime to unix ts

* update cmd names

* change lifetime config to duration

* remove unnecessart formatting

* add comment

* update docs

* remove max bound and introduce min error

* simplify sql

* remove comment

* allow any outstanding to exist for at least 24 hours

* revert created ts change

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* add extra state check to cleanup step

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2020-10-13 12:30:09 +02:00
Will Browne
ef22ff7315
Snapshots: Store dashboard data encrypted in the database (#28129) 
* end 2 end

* fix import

* refactor

* introduce securedata

* check err

* use testify instead of convey

* cleanup test

* cleanup test

* blob time

* rename funcs
 2020-10-13 10:19:42 +02:00
Sofia Papagiannaki
4ab90f9397
Fix linting: remove commented code (#28208) 2020-10-13 08:35:41 +02:00
Sofia Papagiannaki
4acbcd7053
AlertingNG: POC of evaluator under feature flag. (#27922) 
* New feature toggle for enabling alerting NG

* Initial commit

* Modify evaluate alert API request

* Check for unique labels in alert execution result dataframes

* Remove print statement

* Additional minor fixes/comments

* Fix lint issues

* Add API endpoint for evaluating panel queries

* Push missing renaming

* add refId for condition to API

* add refId for condition to API

* switch dashboard based eval to get method

* add from/to params to dashboard based eval

* add from/to params to  eval endpoint

Co-authored-by: kyle <kyle@grafana.com>
 2020-10-12 21:51:39 +03:00
Arve Knudsen
957c88eaca
CloudWatch: Re-implement authentication (#25548) 
* CloudWatch: Revisit authentication

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

* CloudWatch: Simplify auth code

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

* Use ARN

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

* Add Drone configuration

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

* Remove unused code

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

* Remove .drone.yml

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

* Fix external ID usage

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

* CloudWatch: Fix issues after merge

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

* Remove stale code

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

* Remove stale code

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

* Use auth type enum

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

* Fix test snapshot

* Coordinate frontend and backend option names

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

* Remove old comments

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

* Fix front-end tests

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

* Introduce session cache

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

* Use constants

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

* Fix field alignment

* CloudWatch: Fix log message

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

* Tidy go.mod

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

* CloudWatch: Handle arn auth type

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

* CloudWatch: Fix role assumption duration

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

* Fix test

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

* CloudWatch: Inline unnecessary constants

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

* CloudWatch: Use serial comma in UI

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

* CloudWatch: Inline unnecessary constants

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

* CloudWatch: Fail if missing region

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

* CloudWatch: Handle unconfigured region

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

* CloudWatch: Log when using cached session

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

* CloudWatch: Include region in cache key

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

* Add UI warnings for lecagy support

* Do not clear ARN fields whenging change authentication provider

* Graph NG: annotations display (#27972)

* Annotations support POC

* Fix markers memoization

* dev dashboard update

* Update public/app/plugins/panel/graph3/plugins/AnnotationsPlugin.tsx

* CloudWatch: Remove errors.BadRequest

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

* CloudWatch: Undo unintentional change

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

* Remove log line

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

* Fix cache key computation

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

* Add region to cache key

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

* Improve log messages

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

* CloudWatch: Add documentation

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

* Improve tooltip

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

* Improve docs

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

* Improve docs

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

* Improve docs

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

* Improve tooltip

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

* Add role assumption provisioning example

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

* Add upgrade notes

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

* Improve docs

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

* Apply suggestions from code review

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* backend: use latest sdk (#28147)

fixes #27713 via https://github.com/grafana/grafana-plugin-sdk-go/pull/227

* Docs: Update Permissions documentation (#28144)

* removed overview.md

* content updates

* Update datasource_permissions.md

* update content

* content updates

* Update organization_roles.md

* Update docs/sources/enterprise/saml.md

Co-authored-by: Kyle Brandt <kyle@grafana.com>

* Update dashboard_folder_permissions.md

Co-authored-by: Kyle Brandt <kyle@grafana.com>

* area/grafana/toolkit: ci-package needs to use synchronous writes (#28148)

* ci needs to use synchronous writes or the file ends up with zero length

* <Enterprise Docs> Add instructions to upload license via UI (#28067)

* Add UI license upload option, reformat Enterprise license activation section

Added the option to upload a license file through the Server Admin UI, and did a little reformatting to make license activation look more like a process.

* Headers not bold, hyphens not asterisks

* Github: run metrics collector workflow every 10min (#28153)

* GithubActions: Updated cron schedule

* Updated

* Docs: Update explore docs: remove dot at the end of line (#28151)

HI - Removed Dot(.) at the end of line to make it consistent with other 2 points.

Thanks,
Ashish

* Fix frontend tests

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

* Fix frontend tests

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

* Docs: Update upgrade notes

Co-authored-by: Sofia Papagiannaki <sofia@grafana.com>
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Kyle Brandt <kyle@grafana.com>
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Brian Gann <briangann@users.noreply.github.com>
Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
Co-authored-by: ashishagarwal06 <34888589+ashishagarwal06@users.noreply.github.com>
 2020-10-12 17:58:58 +02:00
Marcus Efraimsson
519ec93c7d
Datasource: Prefix SigV4 json data keys with sigV4 (#28195) 
Prefixes SigV4 json data and secure json data keys with sigV4 to make 
sure they don't collide with any other settings. Also minor fixes to UI.

Ref #27552
 2020-10-12 17:52:17 +02:00
Kyle Hinton
92c2a6c239
Fix: Add additional settings for dataproxy to help with network proxy timeouts (#27841) 
* adding additional settings for datasource cache transport

* added documentation for the new changes

* fixing small typo in defaults.ini comment

* fixing small typo in configuration.md comment

* Update conf/defaults.ini keepalive comment per review

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update conf/defaults.ini idle conn comment per review

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update conf/defaults.ini anon user comment per review

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* Update docs/sources/administration/configuration.md idle conn comment per review

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>

* adding suggestions from papagian

* fixing configuration.md

* fixing configuration.md typo

* Apply suggestions from code review aknuds1

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

* updating sample.ini

* Apply suggestions for docs from code review papagian

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

* Update docs/sources/administration/configuration.md fix typo

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

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
 2020-10-12 11:36:47 +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
Kyle Brandt
c9a5d1ad4b
AzureMonitor: pass through null values instead of 0 (#28126) 
fixes #28001
 2020-10-09 08:15:19 -04:00
Ryan McKinley
2567e5202a
Live: remove admin pages, add alpha panel (#28101) 2020-10-08 08:42:15 -07:00
Alexander Zobnin
b55a51e270
SAML Single Logout (#27995) 
* SAML: single logout WIP

* SAML: sign SAML requests

* SAML: remove unnecessary logs

* fix go mod file

* Docs: Single Logout

* SAML: use api endpoint for single logout

* Apply suggestions from code review

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* SAML: save context for single logout

* Chore: add SAML dependencies

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
 2020-10-08 17:42:55 +03:00
Will Browne
7d63b2c473
Auth: Add Sigv4 auth option to datasources (#27552) 
* create transport chain

* add frontend

* remove log

* inline field updates

* allow ARN, Credentials + Keys auth in frontend

* configure credentials

* add tests and refactor

* update frontend json field names

* fix tests

* fix comment

* add app config flag

* refactor tests

* add return field for tests

* add flag for UI display

* update comment

* move logic

* fix config

* pass config through props

* update docs

* pr feedback and add docs coverage

* shorten settings filename

* fix imports

* revert docs changes

* remove log line

* wrap up next as round tripper

* only propagate required config

* remove unused import

* remove ARN option and replace with default chain

* make ARN role assume as supplemental

* update docs

* refactor flow

* sign body when necessary

* remove unnecessary wrapper

* remove newline

* Apply suggestions from code review

* PR fixes

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-08 10:03:20 +02:00
Darryl
21fc3e702b
Cloudwatch: Adding support for additional Amazon CloudFront. (#27891) (#28069) 
* Cloudwatch: Adding support for additional Amazon CloudFront metrics.
 2020-10-07 19:03:05 +02:00
garanews
61749dee23
Fix typos (#28074) 
Parsed all repo with a regexp of common misspelled words and fixed.
 2020-10-07 11:29:30 +01:00
jgulick48
9cd3ab0340
Cloudwatch: Adding support for Amazon ElastiCache Redis metrics. (#28040) 
* Cloudwatch: Adding support for Amazon ElastiCache Redis metrics.
 2020-10-06 19:52:02 +02:00
Spencer Taylor
3606e282ba
CloudWatch: Add missing TransitGateway dimension (#28061) 
Adding missing TransitGatewayAttachment dimension to the AWS/TransitGateway namespace.
 2020-10-06 19:22:03 +02:00
Arve Knudsen
0a2ef086b3
Chore: Convert CloudWatch metrics to data frames (#27449) 
* CloudWatch: Convert metrics results to data frames

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

Co-authored-by: kay delaney <kay@grafana.com>
 2020-10-06 13:45:58 +02:00
jgulick48
7c2999709c
Cloudwatch: Add support for AWS DirectConnect virtual interface metrics and add missing dimensions (#28008) 
* Cloudwatch: Add support for AWS DirectConnect virtual interface metrics.

* Cloudwatch: Adding dimentions to the AWS/DX namespace for virtual network interface based DirectConnect.
 2020-10-05 19:19:40 +03:00
Amos Law
3a498e80ff
Registry: Fix service shutdown mode trigger location (#28025) 2020-10-05 13:30:46 +02:00
Arve Knudsen
531c579341
Plugins: Let descendant plugins inherit their root's signature (#27970) 
* plugins: Let descendant plugins inherit their root's signature

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-05 13:28:18 +02:00
Ryan McKinley
726bb4477b
Live: cleanup and simple changes (#28028) 2020-10-04 23:53:52 -07:00
Matheus Alcantara
7d7e727f22
Cloudwatch: Convert go convey tests to standard test library (#28003) 
* Cloudwatch: Convert go convey tests to standard test library

* Fix tests

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

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-02 19:40:15 +02:00
Arve Knudsen
a078e40238
Settings: Rename constants/variables to follow Go naming standards (#28002) 
* settings: Rename constants/variables to follow Go naming standards
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-10-02 15:45:45 +02:00
Matheus Alcantara
b4b3f6a088
Test: Create unit test to SplitEmails (#27985) 2020-10-02 08:42:10 +02:00
Carl Bergquist
a28a2fba51
healthchecks should work regardless domain (#27981) 2020-10-02 07:14:26 +02:00
Ryan McKinley
8a5fc00330
Live: broadcast events when dashboard is saved (#27583) 
Co-authored-by: kay delaney <45561153+kaydelaney@users.noreply.github.com>
Co-authored-by: Torkel Ödegaard <torkel@grafana.org>
 2020-10-01 10:46:14 -07:00
Marcus Efraimsson
747513d444
Plugins: Fix loading of backend plugins (#27951) 
Ref #27921
 2020-10-01 10:39:42 +02:00
Carl Bergquist
7b891d10ee
Instrumentation: Removes invalid chars from label names (#27921) 2020-09-30 20:12:57 +02:00
Joan López de la Franca Beltran
e03da3760e
Add index at user_auth_token.user_id column (#27908) 2020-09-30 01:20:29 +02:00
Will Browne
c764e3c37b
remove org deprecation logs (#27788) 2020-09-25 16:51:12 +02:00
Bill Oley
334cb41a99
Move error log in social.go inside err != nil (#27804) 2020-09-25 15:24:16 +02:00
Torkel Ödegaard
adc1b965f3
PanelData: Adds annotations and QueryResultMeta dataTopic (#27757) 
* topics round two

* more props

* remove Data from enum

* PanelData: Simplify ideas a bit to only focus on the addition of annotations in panel data

* Test data scenario

* Old graph panel showing annotations from PanelData

* Fixed comment

* Fixed issues trying to remove use of event.source

* Added unit test

Co-authored-by: Ryan McKinley <ryantxu@gmail.com>
 2020-09-24 21:01:31 +02:00
Sofia Papagiannaki
42476811a4
Cloudwatch: Fix loading custom credentials profile (#27684) 
* Store credentials profile in JSON

* Update docs example

* Apply suggestions from code review

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-09-24 19:21:17 +03: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
Ryan McKinley
93a01eb1d9
Live: improved channel state (#27672) 2020-09-23 08:02:01 -07:00
Giordano Ricci
4c7131425b
Revert "Elasticsearch: add frozen indices search support (#27472)" (#27726) 
This reverts commit 61a3160c34.
 2020-09-23 12:24:46 +01:00
Jorge Vallecillo
9e3def4214
Fix typos (#27711) 2020-09-22 11:00:59 -07: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
Arve Knudsen
ffc11cb63c
Server: Don't clutter trace.Stop by exiting (#27700) 
* Server: Don't clutter trace.Stop by exiting

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-09-22 15:28:54 +02:00
Giordano Ricci
61a3160c34
Elasticsearch: add frozen indices search support (#27472) 
* Elasticsearch: Add frozen indices support for alerting
 2020-09-18 18:27:25 +01:00
Domas
564d7ecea7
DataProxy: Ignore empty URL's in plugin routes (#27653) 
This adds a check to see if plugin route URL is empty, and in such case 
does not modify request schema and host of the request to be proxied.
This behavior is now the same as in the plugin proxy.
 2020-09-18 13:22:07 +02:00
Carl Bergquist
6dc73a6712
add /healthz endpoint (#27536) 
kuberentes (and Im sure other orchastrators does as well) support two
kind of checks. readiness checks and liveness checks. Grafanas current
`/api/health` endpoint requires database access which might not
always be required for the instance to be considered active.
 2020-09-18 13:03:18 +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
Kyle Brandt
50c680f3d7
BackendPlugins: Point to request Headers in the wrapper (#27599) 
In particular, so plugins can see the FromAlert header
 2020-09-16 10:12:39 -04: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
Dan Cech
53153c82fc
add method to get usage report (#27555) 2020-09-15 09:01:15 -04: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
Sofia Papagiannaki
f529223455
Fix instrumentation panic if there is no response (#27567) 2020-09-14 14:05:47 +03:00
Agnès Toulet
eb970a4985
Org API: enrich add user to org endpoints with user ID in the response (#27551) 2020-09-14 08:58:23 +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
Bill Oley
19caa100dc
OAuth: Fix token refresh failure when custom SSL settings are configured for OAuth provider (#27523) 
OAuth token refresh fails when custom SSL settings are configured for 
oauth provider. These changes makes sure that custom SSL settings 
are applied for HTTP client before refreshing token.

Fixes #27514
 2020-09-11 17:25:03 +02:00
Marcus Efraimsson
1983de962c
BootData: Fix nav tree sort regression (#27533) 
#26395 introduced a regression regarding sort order of nav tree
items set in Grafana boot data and used for rendering the sidemenu.
This fixes so that sort happens after RunIndexDataHooks is called
in case the hook make changes to the nav tree.
 2020-09-11 15:17:41 +02:00
Sofia Papagiannaki
924224eefb
Revert "Alerting: New feature toggle for enabling standalone alerts (#25984)" (#27531) 
This reverts commit 20b603ee1a.
 2020-09-11 13:57:46 +03:00
Maksim Nabokikh
6e3e0dead8
Provisioning: Remove provisioned dashboards without parental reader (#26143) 2020-09-11 09:19:44 +02:00
Marcus Efraimsson
e85b266f2e
Azure/Insights: Fix handling of none dimension values (#27513) 
Properly handle legacy dimension values in the backend.

Fixes #27512
 2020-09-10 18:21:56 +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
kay delaney
22d6cfc358
DataSource/CloudWatch: Adds metadata to grouped CW Logs dataframe (#27454) 2020-09-09 08:38:53 +01:00
Ryan McKinley
6b0f56b726
InfluxDB: Alerting issue, reasonable defaults for interval and maxDataPoints (#27463) 2020-09-09 09:34:17 +02:00
Carl Bergquist
f9752f0e7a
Instrumentation: Adds instrumentation for outgoing datasource requests (#27427) 2020-09-09 07:47:05 +02:00
Kyle Brandt
9bab551d8b
AzureMonitor: change filterDimensions property to match what is stored (#27459) 
Changes the dimensionsFilters property to dimensionsFilter in the Azure Monitor Datasource's AzureMonitor service to make what is sent to match the saved model.

Before this, the property that the backend was expecting was not available in the case of alerting, where the stored model is fetched.

This also fixes a panic when there is a dimension alias but no dimension
 2020-09-08 15:12:08 -04:00
Arve Knudsen
581d2eaaf4
Revert "Convert CloudWatch to use dataframes (#26702)" (#27448) 
This reverts commit 7762839853.
 2020-09-08 15:06:58 +02:00
Arve Knudsen
7762839853
Convert CloudWatch to use dataframes (#26702) 
* CloudWatch: Convert metrics queries to return data frames

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-09-08 13:35:17 +02:00
Ato Araki
561920f18b
Cloud monitoring: fix missing title and text from cloud monitoring annotations (#27187) 
* cloudmonitoring: fix empty title and text annotation

* cloudmonitoring: use metricQuery value
 2020-09-08 13:18:41 +03:00
Torkel Ödegaard
5c31f07904
Settings: Remove unnessary error handling code (#27420) 
* Settings: Remove unnecessary error handling code

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

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-09-08 11:33:04 +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
Marcos Mendez
4e94c0959a
Image Store: Add support for using signed URLs when uploading images to GCS (#26840) 
Enables creating signed URLs when uploading images to Google Cloud Storage. 
By using signed urls, not only is the public URL expiration configurable but the 
images in the bucket are not publicly accessible.

Fixes #26773

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2020-09-07 19:10:14 +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
Kamal Galrani
f6c31c2e10
Fixes signup workflow and UI (#26263) 
* fixes signup flow

* Apply suggestions from code review

Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>

* Update ForgottenPassword.tsx

* fixes build failure

* fixes build failure

Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com>
 2020-09-07 18:24:46 +03:00
Agnès Toulet
6dd109b927
API: return resource ID for auth key creation, folder permissions update and user invite complete endpoints (#27419) 
* API: add ID to auth key and folder endpoints

* API: add test for folder permissions update

* API: add created user id for /invite/complete endpoint
 2020-09-07 17:06:11 +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
Bill Oley
b70fefe642
OAuth2: Handle DEFLATE compressed JWT payloads for generic OAuth (#26969) 2020-09-07 11:42:11 +02:00
Agnès Toulet
a9daaadd50
API: send Login actions (#27249) 
* API: first version to send events about login actions

* API: improve login actions events

* Login: update auth test with new behavior

* Login: update auth test for auth module

* Login OAuth: improve functions structure

* API: make struct public to use for saml

* API: add send login log tests for grafana and ldap login

* API: remove log from tests

* Login API: fix test linting

* Update pkg/api/login_oauth.go

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>

* Login API: refactor using defer

Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>
 2020-09-04 14:54:59 +02:00
Ryan McKinley
ae385983f4
InfluxDB: support flux editor for template queries (#27370) 2020-09-03 14:11:39 -07:00
Szymon Szypulski
a8db544e85
Cloudwatch: Update list of AmazonMQ metrics and dimensions (#27332) 
Update list of AmazonMQ metrics and Dimensions based on the current list
from the official AWS documentation.

Also, change InflightCount to InFlightCount.
 2020-09-02 21:32:43 +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
Ryan McKinley
0bc67b032a
InfluxDB: return a table rather than an error when timeseries is missing time (#27320) 2020-09-01 15:06:38 -07:00
Carl Bergquist
8faaa1a520
OAuth: Increase state cookie max age (#27258) 
60s can be too short if the oauth provider is slow
for some reason and its defintly too slow if the
OAuth provider requires 2FA.

Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2020-09-01 10:57:43 +02:00
Kyle Brandt
06323b8e52
AzureMonitor: select plugin route from cloudname (#27273) 
* AzureMonitor: select plugin route from cloudname
fixes #27243
 2020-08-31 11:10:31 -04:00
Joan López de la Franca Beltran
57b2d08755
Core: Add go-grpc-middleware dependency (#27231) 2020-08-28 15:33:21 +02:00
Arve Knudsen
4cd42ed898
Chore: Simplify settings loading code (#26404) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-26 13:11:57 +02:00
Amir Szekely
c5a7afce44
Fix AWS action name (#27205) 
The action name is `tag:GetResources`, not `tags:GetResources`. This creates a confusing error message that can have the user add the wrong permission to the IAM role.
 2020-08-26 11:01:50 +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
Joan López de la Franca Beltran
c91bfd8299
Core: Add loki/logproto dependency (#27124) 
* Add grafana/loki dependency and update its dependencies

* Update grpcplugin log_wrapper to implement the latest version of hclog.Logger

* Remove panic handling + test case no longer needed since the source of panics (bug) was fixed
 2020-08-25 11:52:21 +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
Ryan McKinley
cd9a773427
InfluxDB: use converters from SDK (#27138) 2020-08-24 13:19:32 -07: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
Kyle Brandt
1778e9f034
Alerting: remove LongToWide call in alerting (#27140) 
causing issues and currently as we use it, the query
should be requesting it as part of the query model via fromat as time series
fixes #27132
 2020-08-24 10:05:52 -04: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
c207ea12a4
InfluxDB: Clean up tests (#27135) 
* InfluxDB: Clean up tests

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

* InfluxDB: Platform agnostic paths

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-21 18:34:21 +02:00
Kyle Brandt
c724449d3d
AzureMonitor: fix panic introduced in 7.1.4 (#27113) 
happens when unit was "Unspecified" and alias is being used
 2020-08-21 11:37:30 -04:00
Arve Knudsen
d53fe64913
Server: Support custom TCP listener (#27066) 
* Server: Support custom TCP listener

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-21 10:41:10 +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
Ryan McKinley
a2a6b9448f
InfluxDB: exclude result and table column from Flux table results (#27081) 2020-08-20 10:52:46 -07: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
Hugo Häggmark
9e357d84a4
BackendSrv: Queues data source requests but passes through api requests (#26947) 
* Refactor: initial commit

* wip

* Refactor: getting into a simpler model

* Refactor: adds some comments

* Refactor: renames statuses according to PR comments

* Refactor: adds more comments

* Tests: adds tests for FetchQueue

* Tests: adds tests for ResponseQueue

* Tests: adds tests for FetchQueueWorker

* Tests: simplified the tests for ResponseQueue

* Refactor: adds http2 scenario

* Refactor: using Cfg instead of global variable

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

* Refactor: reverted change in frontendsettings.go

* Tests: fix test mocks

* Fix: changes how cfg.Protocol gets its value

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-20 11:32:10 +02:00
Kyle Brandt
660510084c
AzureAnalytics: Use fillmode Null with format as time series (#27054) 
previously was using fillmode previous, which is not what we want here.
Also we do not have fill missing with this data source anyways
Fixes #27013
 2020-08-19 10:42:54 -04:00
kay delaney
a1f90521a0
CloudWatch Logs: Move query response stats to appropriate FrameMeta property (#26732) 
* CloudWatch Logs: Move query response stats to appropriate FrameMeta property
 2020-08-19 15:18:04 +01:00
Kyle Brandt
96babf1268
Alerting: copy queryType prop to tsdb.Query (#27053) 
fixes #27048
 2020-08-19 10:03:39 -04:00
Arve Knudsen
1717476984
Server: Add protocol to Cfg (#27071) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-19 14:39:13 +02:00
Arve Knudsen
0e1e85656b
InfluxDB: Upgrade InfluxDB in devenv (#26983) 
* InfluxDB: Upgrade InfluxDB in devenv
* InfluxDB: De-export symbols
* InfluxDB: Remove unused code
* devenv: Make InfluxDB version configurable

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-19 09:23:11 +02: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
Arve Knudsen
7896836deb
Chore: Reduce TSDB Go code complexity (#26401) 
* tsdb: Make code less complex
 2020-08-18 14:43:18 +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
Sean Lafferty
900eb8070e
Proxy: Fix updating refresh token in OAuth pass-thru (#26885) 
* Handle updating refresh token in oauth pass-thru

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-17 18:38:32 +02:00
Arve Knudsen
be3bf80749
InfluxDB: Upgrade to latest InfluxDB Go client (#27021) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-17 08:32:26 +02:00
Arve Knudsen
50ebbb625e
InfluxDB: Upgrade Go client, use data source HTTP client (#27012) 
* InfluxDB: Upgrade Go client, use data source HTTP client

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

* Remove unnecessary Close

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-14 18:40:02 +02:00
Emil Tullstedt
b68634fbb4
Tests: Batch of GoConvey to Testify conversions (#27008) 2020-08-14 14:43:25 +02:00
Sofia Papagiannaki
7ad1e3663c
Playlists: Remove API validation for empty playlists and remove redundant API call (#26982) 
* Remove validation from empty playlists

* Remove redundant API call

Frontend used to call /api/playlists/:id/items directly after /api/playlists/:id but items are already included in the first response
 2020-08-14 11:59:50 +03:00
Kyle Brandt
f9f60c9193
AzureMonitor: map more units (#26990) 
add BitsPerSecond and Seconds
 2020-08-13 12:57:16 -04:00
Arve Knudsen
c63bbbaec3
InfluxDB: Close Flux query results (#26917) 
* InfluxDB: Drop ctxhttp usage
* InfluxDB: Clean up code
* InfluxDB: Close query results

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-13 17:50:53 +02: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
Emil Tullstedt
d664853179
Tests: Change util GoConvey tests to use testify (#26724) 2020-08-13 11:10:48 +02:00
Arve Knudsen
9f159c5e3d
grafana-cli: Fix file path processing, returning of errors (#26954) 
* grafana-cli: Fix file path processing, returning of errors
 2020-08-13 09:38:05 +02:00
Kyle Brandt
f432e153ca
Dataframe/Alerting: to tsdb.TimeSeriesSlice - accept "empty" time series (#26903) 
this is in order to trigger no data when used with alerting.
fixes #26897.

This is perhaps better solved in the SDK but that needs more thought and is tracked in grafana/grafana-plugin-sdk-go#214
 2020-08-12 12:30:45 -04: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
Adrián López
2093f7c1f0
grafana-cli: Fix installing of plugins missing directory entries in zip (#26945) 2020-08-12 17:08:12 +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
Arve Knudsen
b1ddbaa395
CloudWatch: Fix sorting of metrics results (#26835) 
* CloudWatch: Fix sorting of metrics results
 2020-08-07 11:48:40 +02:00
Arve Knudsen
37c278c8f3
InfluxDB: Less chatty logging (#26850) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-07 09:18:57 +02:00
Kyle Brandt
62b103b843
Azuremonitor: do not set unit if literal "Unspecified" (#26839) 
part of #26828
 2020-08-06 16:03:25 -04:00
Arve Knudsen
e6e5cc6e80
Chore: Simplify generic OAuth code (#26779) 
* Generic OAuth: Simplify

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

* Rename test variables for consistency

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-08-04 18:28:53 +02: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
Alexander Zobnin
df11cdad62
Generic OAuth: customize login and id_token attributes (#26577) 
* OAuth: add login_attribute_path to generic oauth

* OAuth: remove default client_secret values (able to use empty client_secret)

* OAuth: allow to customize id_token attribute name

* Docs: describe how login_attribute_path and id_token_attribute_name params work

* Docs: review fixes

* Docs: review fixes

* Chore: fix go linter error

* Tests: fix test code style
 2020-08-03 17:33:27 +03:00
Sofia Papagiannaki
41f7bccb24
Cloud monitoring: do not create deep link if there are no timeseries (#26737) 2020-08-03 09:28:03 +03:00
Paul Sneddon
a0c1e53fd0
Flux: Increase series limit for Flux queries (#26746) 2020-07-31 15:14:58 -07:00
Paul Sneddon
ec756f3729
Flux: Ensure connections to InflxuDB are closed (#26735) 
* Flux: Ensure connections to InflxuDB are closed
 2020-07-31 23:11:51 +02:00
Arve Knudsen
7589b1b517
OAuth: Refactor user syncing (#26721) 
* OAuth: Refactor user syncing

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

* Don't ignore error

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-31 20:29:27 +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
Agnès Toulet
8dc75f79f7
API: Enrich endpoints with ID (#26691) 2020-07-31 08:22:09 +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
Arve Knudsen
e08972d567
login/social: Simplify test (#26679) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-29 19:52:26 +02:00
Agnès Toulet
7a5464fe10
Chore: use Wrap for all admin API (#26673) 
* Chore: use Wrap for all admin API

* API: fix admin tests
 2020-07-29 18:00:14 +02:00
waqark3389
642e904048
Show FileSystemId as a dimension key (#26662) 
FileSystemId can be used to filter by filesystem ID if needed. Right now it just returns blank
 2020-07-29 09:35:07 +03:00
Ryan McKinley
339138d61a
Live: include a streaming event manager (#26537) 2020-07-27 00:26:16 -07:00
Torkel Ödegaard
3defb4441e
Settings: Remove global variable (#26613) 2020-07-26 23:36:36 -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
5e73a92327
DashboardImport: Fix variable interpolation when property contains multiple variable expressions (#26574) 2020-07-24 11:12:44 +03:00
Arve Knudsen
2446ee08f1
CloudWatch: Fix passing of namespace for getting custom metrics (#26515) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-24 08:37:24 +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
Patrik Karlström
43ef052d57
cloudwatch: Consolidate client logic (#25555) 
* cloudwatch: Consolidate client logic

Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-23 18:52:22 +02: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
Ruan Bekker
b972963934
Cloudwatch: Add af-south-1 region (#26513) 
* Adds af-south-1 region to cloudwatch datasource

* Fix test

Co-authored-by: Sofia Papagiannaki <papagian@gmail.com>
 2020-07-23 14:02:25 +03:00
Agnès Toulet
1ba95183f6
HTTPServer: add possibility to use additional middlewares (#26514) 2020-07-23 09:54:07 +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
3a8854b1b9
API: Recognize dashboard errors when saving a folder (#26499) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-23 08:15:47 +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
Josh Soref
7d08a8497a
Chore: fix spelling of GitHub (#26182) 
Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
 2020-07-22 08:12:50 -07:00
waqark3389
fabd879cbe
CloudWatch: Add FreeStorageCapacity (#26503) 
* Add FreeStorageCapacity metric in AWS/FSx namespace
 2020-07-22 16:11:53 +02:00
Kyle Brandt
fb5ff6a70f
Azure: Insights metrics - do not sort if no data (#26486) 
fixes #26473
 2020-07-21 10:24:55 -04: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
Ryan McKinley
5d09e4539c
Azure: convert azure units to grafana units (#26429) 2020-07-20 12:29:13 -07: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
Kyle Brandt
c980f37509
Azure: Insights Analytics, fix possible panics and return error body (#26361) 
missing return statements can result in panic
 2020-07-15 15:55:10 -04:00
Arve Knudsen
5fe27ee959
Fix back-end tests on Windows (#26355) 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-15 20:09:03 +02:00
Sofia Papagiannaki
9d8ae39108
Cloud monitoring: Add query parameter (#26354) 2020-07-15 19:31:17 +03:00
Kyle Brandt
590702c497
Azure: Handle real type nan/inf values in Log/Insights Analytics (#26342) 
Before this, if the user were to divide by 0.0, "Infinity" would be returned in the result and the user would get an error: "unexpected type, expected json.Number but got string". Now these values are properly set as Inf values (and also made sure to handle NaN as well).
 2020-07-15 09:39:41 -04:00
Ryan McKinley
1f271d06e9
InfluxDB: flux query result can cause crash (#26329) 2020-07-14 11:06:27 -07:00
kay delaney
54ad5b869e
CloudWatch Logs: Fixes grouping of results by numeric field (#26298) 
* CloudWatch Logs: Fixes grouping of results by numeric field
Closes #25721
 2020-07-14 11:13:03 +01:00
Arve Knudsen
c863fd3da9
CloudWatch: Clean up code (#26259) 
* CloudWatch: Clean up code
 2020-07-14 08:23:23 +02:00
Ryan McKinley
07f8178995
InfluxDB: include sample response data for each test case (#26248) 2020-07-13 11:15:36 -07:00
Sofia Papagiannaki
20b603ee1a
Alerting: New feature toggle for enabling standalone alerts (#25984) 
* Add feature toggle for standalone alerts

* Add IsStandaloneAlertsEnabled exported func
 2020-07-13 18:04:42 +03:00
Kamal Galrani
6a0f530fdf
fixes spelling error (#26253) 2020-07-11 08:56:02 +02:00
Kyle Brandt
c1ede4fc71
backend: use latest go plugin sdk (0.74.0) to sort wide frames (#26207) 
This makes it so results are more stable between refreshes of data and fixes sorting issues with Azure Application Insights service as well as the two Azure Analytics services.

fixes #22937
 2020-07-10 12:22:50 -04: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.

* Undo irrelevant changes

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

* e2e: Support Circle

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

* Remove unused script

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

* TypeScript fixes

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

* TypeScript fixes

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

* Remove unused script

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

* More Drone support

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

* Remove unused script

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

* Fix build on Circle

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

* Remove TODO comment

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
 2020-07-10 16:09:21 +02:00
Andrej Ocenas
64bc85963b
Explore: Unification of logs/metrics/traces user interface (#25890) 
Removes "Metrics"/"Logs" mode switcher from Explore, allowing for both
metrics and logs queries at the same time.

Co-authored-by: kay delaney <kay@grafana.com>
 2020-07-09 15:14:55 +01:00