Compare commits

...

5684 Commits
v5.3.1 ... test

Author SHA1 Message Date
ryan
461b97ee80 fix folder paths 2019-07-10 00:33:50 -07:00
ryan
724731fddc merge all dist folders into one 2019-07-10 00:14:18 -07:00
ryan
905f2c3e16 Packages: publish packages@6.3.0-alpha.40 2019-07-09 23:26:20 -07:00
ryan
807594fd65 add download task 2019-07-09 23:16:17 -07:00
ryan
38c288bb9a bump version 2019-07-09 10:56:08 -07:00
ryan
82996d6f0a Packages: publish packages@6.3.0-alpha.39 2019-07-09 10:45:55 -07:00
ryan
f9d0c6525f merge master 2019-07-09 10:04:56 -07:00
Dominik Prokop
c32365f424 Packages: Use lerna for release orchestration (#17985) 2019-07-09 09:43:53 -07:00
Ryan McKinley
6599bdc7f1 AnnoList: add alpha annotations list plugin (#17187)
adding an alpha panel
2019-07-09 09:28:19 -07:00
Dominik Prokop
b44be990bc grafana/toolkit: Use babel-plugin-angularjs-annotate (#18005)
This fixes error caused by ng-annotate mentioned in #17819 (comment)
2019-07-09 17:22:17 +02:00
Tobias Skarhed
9e87dbb153 CSV Export: Timezone based on dashboard setting (#18002)
* Timezone export CSV based on dashboard setting

* Add options object and interface
2019-07-09 16:16:46 +02:00
Leonard Gram
25506829be LDAP: Adds back support for single bind. (#17999) 2019-07-09 14:12:17 +02:00
Ryan McKinley
d918d1f5f4 Reducers: consistent result for first/last reducer shortcut (#17911)
* find the last non-null value

* also fix first

* check empty first

* remove unused import

* adding lastNotNull
2019-07-09 13:56:00 +02:00
gotjosh
332920954e SAML: Show SAML login button even if OAuth is disabled (#17993)
* Move the SAML button outside of the oauth div
* Don't attempt to search cookies with an empty name
2019-07-09 10:15:52 +01:00
Sofia Papagiannaki
78ca55f3d7 Fix: Break redirect loop if oauth_auto_login = true and OAuth login fails (#17974)
* Add tests for login view

* Fix OAuth auto login redirect loop

login_error cookie is only set when the OAuth login fails
for some reason. Therefore, the login view should return
immediately if a login_error cookie exists before trying
to login the user using OAuth again.

* Fix test

Use 'index-template' instead of 'index' for testing

* Add some comments
2019-07-09 09:37:24 +03:00
ryan
26d5db2b63 use axios for basic testing 2019-07-08 20:53:09 -07:00
ryan
a13b96521d use ci-work folder rather than build 2019-07-08 16:56:29 -07:00
ryan
e7d1f1df14 add stubs for each ci task 2019-07-08 16:00:06 -07:00
ryan
42e7cd7d65 Merge branch 'gtk/verify' of github.com:grafana/grafana into grafana/gtk/verify
* 'gtk/verify' of github.com:grafana/grafana:
  update comments
  copy all svg and png, useful if people don't use the img folder
  validate type and id
2019-07-08 14:16:35 -07:00
Ryan McKinley
66a4d1a57e Refactor: fix range util imports (#17988) 2019-07-08 10:12:02 -07:00
Ryan McKinley
ccc3d88cee Refactor: move dom utils to @grafana/ui (#17976) 2019-07-08 10:02:16 -07:00
ryan
282dd029aa update comments 2019-07-08 09:22:49 -07:00
ryan
15fd54b21b Merge branch 'master' into gtk/verify
* master:
  Docs: Documents new features available with Loki data source in Explore (#17984)
  Prometheus: added time range filter to series labels query (#16851)
  Explore: Adds support for new loki 'start' and 'end' params for labels endpoint (#17512)
  Chore: Removes custom debounce utility in favor of lodash/debounce (#17977)
  Api: Fix auth tokens returning wrong seenAt value (#17980)
2019-07-08 09:15:46 -07:00
kay delaney
98ba3f34a6 Docs: Documents new features available with Loki data source in Explore (#17984)
* Docs: Documents new features available with Loki data source in Explore
Closes #17898

* Docs: Formats note as a quote and adds additional detail regarding live tailing
2019-07-08 17:48:47 +02:00
Martin Chodur
c284a11a95 Prometheus: added time range filter to series labels query (#16851)
* fix datasource/prometheus: added time range filter to prom series labels

* fix datasource/prometheus: added missing method to test mock
2019-07-08 17:48:09 +02:00
kay delaney
246358344c Explore: Adds support for new loki 'start' and 'end' params for labels endpoint (#17512)
* Explore: Adds support for new loki 'start' and 'end' params for labels endpoint
Also initializes absoluteRange when explore is initialized
Closes #16788

* Explore: Dispatches updateTimeRangeAction instead of passing absoluteRange when initializing
Also removes dependency on sinon from loki language provider test

* Loki: Refactors transformation of absolute time range to URL params into small utility function

* Makes use of rangeToParams() util function in loki language provider test
Also updates LanguageProvider.request() interface so that url should be type string, and adds optional params argument
2019-07-08 16:14:48 +01:00
Ryan McKinley
8f5df80161 Chore: Removes custom debounce utility in favor of lodash/debounce (#17977) 2019-07-08 15:20:29 +01:00
Marcus Efraimsson
962d4daabd Api: Fix auth tokens returning wrong seenAt value (#17980)
Changes so a non-set seenAt property gets the createdAt value.

Fixes #17953
2019-07-08 14:30:02 +02:00
ryan
1d9c4cbdfe copy all svg and png, useful if people don't use the img folder 2019-07-07 23:04:46 -07:00
ryan
315476e20a validate type and id 2019-07-07 21:59:59 -07:00
Ryan McKinley
bdaf0aa81a Refactor: move more files to @grafana/data (#17972) 2019-07-06 09:18:23 -07:00
Ryan McKinley
fcdc29746f @grafana/data: export dateMath and rangeUtil (#17971) 2019-07-05 23:43:12 -07:00
Ryan McKinley
3f15170914 Refactor: move some files to @grafana/data (#17952)
* moving to data WIP

* more refactoring

* add missing test

* mock full path

* remove sinon from grafana-ui
2019-07-06 08:05:53 +02:00
Tobias Skarhed
baed5d7bd9 noImplicitAny: Azure Monitor (#17966) 2019-07-06 07:01:22 +02:00
Ryan McKinley
83366b91de grafana/toolkit: initial CI task and various small improvements (#17914) 2019-07-05 15:09:30 -07:00
Dominik Prokop
8219fdf7c0 First version of prettier checks in toolkit (#17964) 2019-07-05 12:52:51 -07:00
Oleg Gaidarenko
e2cf7c9698 LDAP: finishing touches (#17945)
* LDAP:Docs: `active_sync_enabled` setting

Mention `active_sync_enabled` setting and enable it by default

* LDAP: move "disableExternalUser" method

Idea behind new design of the LDAP module is to minimise conflation
between other parts of the system, so it would decoupled as much as
possible from stuff like database, HTTP transport and etc.

Following "Do One Thing and Do It Well" Unix philosophy principal, other things
could be better fitted on the consumer side of things.

Which what this commit trying to archive

* LDAP: correct user/admin binding

The second binding was not happening, so if the admin login/password
in LDAP configuration was correct, anyone could had login as anyone using
incorrect password
2019-07-05 17:49:00 +03:00
Tobias Skarhed
88a2c6fce7 Graphite: Refactor lexer and parser (#17958) 2019-07-05 16:47:21 +02:00
Tobias Skarhed
9b468caea4 noImplicitAny: Datasource files, under 2500 (#17959)
* noImplicitAny on Graphite

* More noImplicitAny
2019-07-05 16:46:46 +02:00
Leonard Gram
b67905a963 Auth: saml enabled check. (#17960) 2019-07-05 16:39:52 +02:00
Leonard Gram
e574147b1e Auth: SAML login button. (#17932)
* Auth: SAML login button.

* Fixed ts issue
2019-07-05 15:24:52 +02:00
Dominik Prokop
c5b6365858 grafana/toolkit: Add support for extensions styling (#17938)
* Add support for static files

* Use url-loader in single css setup

* Add postcss setup

* Expose emotion to plugins and externalise it in toolkit

* Add readme note about emotion
2019-07-05 13:33:42 +02:00
Tobias Skarhed
17b5f48cf6 Datasource: Refactor Graphite to class (#17942)
* Rewrite Graphite Datasources to class

* Graphite: removed unused prop
2019-07-05 13:26:14 +02:00
gotjosh
e6b8a1529b SAML: Configuration defaults, examples and dependencies (#17954)
* Add SAML configuration options

* Add crewjam/saml as a depdency

Needed as part of the enterprise SAML integration.

* Vendor github.com/stretchr/testify/require

The package require implements the same assertions as the `assert` package but stops test execution when a test fails.
2019-07-05 11:27:14 +01:00
Alexander Zobnin
48d5a1bcd3 OAuth: deny login for disabled users (#17957) 2019-07-05 11:35:04 +02:00
Hugo Häggmark
b1a0bd115c Build: Adds pre-commit check that fails if node versions are not synced (#17820)
* Build: Adds pre-commit check that fails if node versions are not synced

* Build: Throws error instead

* Minor refactoring and testing
2019-07-05 10:46:25 +02:00
Torkel Ödegaard
315177fad7 Docs: minor ha-setup edit (#17950)
* Docs: minor ha-setup edit

* Docs: minor ha-setup edit2
2019-07-05 09:13:15 +02:00
Torkel Ödegaard
d1588ec455 Docs: Added very basic docs about revoking user sessions (#17931)
* Docs: Added very basic docs that mention you can log yourself and other out

* Docs: fixed spelling issue
2019-07-05 08:20:21 +02:00
kay delaney
b2aa236bdf Docs: Updates documentation regarding logs integration in Explore (#17896)
Closes #17786
2019-07-05 08:18:22 +02:00
Tobias Skarhed
418dba4b21 noImplicitAnys: Fix InfluxDB type issues #17937) 2019-07-05 07:52:23 +02:00
Torkel Ödegaard
de71875e6b TimePicker: align position between dashboard and explore (#17940) 2019-07-05 07:49:45 +02:00
Daniel Lee
7e95ded164 AzureMonitor: remove duplicate query logic on the frontend (#17198)
* feat: AzureMonitor implements legend key on backend

To be able to remove the duplicated query logic on the
frontend, the backend code needs to implement alias
patterns for legend keys as well as allowing the default
list of allowed time grains to be overridden. Some metrics
do not support all the time grains and the auto timegrain
calculation can be incorrect if the list is not overridden.

* feat: AzureMonitor - removes duplicate query logic on frontend

* AzureMonitor small refactoring

Extracted method and tidied up the auto time grain
code.

* azuremonitor: support for auto time grains for alerting

Converts allowed timegrains into ms and saves in dashboard json.
This makes queries for alerting with an auto time grain work in
the same way as the frontend.

* chore: typings -> implicitAny count down to 3413

* azuremonitor: add more typings
2019-07-04 22:47:24 +02:00
Tobias Skarhed
55b63905ea UserProfilePage: Fix team avatar urls #17866 (#17930) 2019-07-04 16:54:44 +02:00
kay delaney
d4e9a8c009 Explore: Introduces storage keys for last used data source on per-orgId basis (#17934)
* Explore: Introduces storage keys for last used data source on per-orgId basis
Closes #17903
2019-07-04 15:31:15 +01:00
Torkel Ödegaard
57c220c93d Docs: added version notice to new ldap feature docs (#17929) 2019-07-04 14:39:11 +02:00
kay delaney
3a18098760 Explore: Restricts query text edit toggle to metrics mode (#17921)
* Explore: Adds datasource plugin config option 'modesSupportingTextEdit'
This allows one to specify which modes support toggling query text edit on and off
Closes #17904

* Explore: Restricts query text edit toggle to metrics mode
2019-07-04 14:10:44 +02:00
Dominik Prokop
cf37b5439f grafana/runtime: Expose SystemJS from @grafana/runtime (#17927)
In 4281344 the loadPluginCss util was migrated to @grafana/runtime package. This made SystemJS to fail loading the css files for a plugin. Root cause was that core and runtime used different SystemJS instances.

To solve the issue, I am exposing SystemJS from @grafana/runtime package to make sure we are always using the same instance. Also, the SystemJS dependency was moved to runtime.
2019-07-04 13:32:09 +02:00
Eduard Sergeev
19ae5351fb Templating: Correctly display __text in multi-values variable after refresh (#17918)
Fixes: #17915 - Templating: __value's are displayed instead of __text's after variable is updated
2019-07-04 08:34:42 +02:00
Dominik Prokop
9f351156c3 grafana/toolkit: bundle plugins with webpack (#17850) 2019-07-03 09:25:12 -07:00
kay delaney
164fb13d99 Explore: Adds orgId to URL for sharing purposes (#17895)
Also replaces one-off segment detection functions in explore.ts with general purpose function
Closes #15462
2019-07-03 16:36:12 +01:00
Ryan McKinley
22e2ac270b grafana/toolkit: copy sass files (#17888)
include sass files in toolkit
2019-07-03 08:17:18 -07:00
Shavonn Brown
874b8abcc0 ChangePassword: Rewrite change password page to react (#17811)
* ChangePassword to React, created PasswordInput component, attempting UserProvider wrapper component, adding flex to btn row

* UserAPI interface, force classes on PasswordInput, remove api call from ChangePassword

* refactored out form

* clean up

* removed unnecessary bind, added loading state and loading component to change password form

* should be OR

* arrow funcs instead of binds, inline-block instead of flex, isSaving instead of isLoading, disabled button instead of spinner

* inline-flex on the react btn

* change state instatiatiation
2019-07-03 17:02:11 +02:00
Torkel Ödegaard
b1126cb0ed AngularPanels: Fixed loading state indication for angular panels (#17900) 2019-07-03 16:58:38 +02:00
kay delaney
98147fd52b Explore: Adds support for toggling text edit mode in explore (#17870)
* Explore: Adds support for toggling text edit mode in explore
Also modifies query-row-status css to use relative position instead of absolute
Closes #16770

* Explore: Defines State interface for <QueryRow /> and removes unnecessary constructor
2019-07-03 15:42:03 +01:00
Oleg Gaidarenko
444c4d5999 LDAP: Divide the requests (#17885)
* LDAP: Divide the requests

Active Directory does indeed have a limitation with 1000 results
per search (default of course).

However, that limitation can be workaround with the pagination search feature,
meaning `pagination` number is how many times LDAP compatible server will be
requested by the client with specified amount of users (like 1000). That feature
already embeded with LDAP compatible client (including our `go-ldap`).

But slapd server has by default stricter settings. First, limitation is not 1000
but 500, second, pagination workaround presumably (information about it a bit
scarce and I still not sure on some of the details from my own testing)
cannot be workaround with pagination feature.

See
https://www.openldap.org/doc/admin24/limits.html
https://serverfault.com/questions/328671/paging-using-ldapsearch
hashicorp/vault#4162 - not sure why they were hitting the limit in
the first place, since `go-ldap` doesn't have one by default.

But, given all that, for me `ldapsearch` command with same request
as with `go-ldap` still returns more then 500 results, it can even return
as much as 10500 items (probably more).

So either there is some differences with implementation of the LDAP search
between `go-ldap` module and `ldapsearch` or I am missing a step :/.

In the wild (see serverfault link), apparently, people still hitting that
limitation even with `ldapsearch`, so it still seems to be an issue.

But, nevertheless, I'm still confused by this incoherence.

To workaround it, I divide the request by no more then
500 items per search
2019-07-03 17:39:54 +03:00
Leonard Gram
2596974cd2 Build: fixes missing shebang in release tagging script. (#17894) 2019-07-03 16:00:34 +02:00
Alexander Zobnin
3d848d0fdf Teams: show proper label for each auth provider (#17860)
* Teams: show proper label for each auth provider

Teams: don't sore AuthModule in team_member table, use JOIN to get it instead

* Teams: fix AddTeamMember after last changes

* Teams: add more auth provider labels

* Teams: show external sync badge if LDAP is not enabled

* Teams: tests for getting auth module
2019-07-03 16:52:10 +03:00
Anthony Templeton
0d2be0a7ed Logging: Login and Logout logging actions (#17760) (#17883) 2019-07-03 15:16:00 +02:00
kay delaney
1c291e26f8 Loki: Adds comment explaining usage of RFC3339Nano string (#17872)
* Loki: Adds comment explaining usage of RFC3339Nano string
2019-07-03 13:54:06 +01:00
kay delaney
b06ad02a74 Explore: Query rows are now reset when changing data sources (#17865)
Except when those data sources are compatible, via query import.
Closes #17861
2019-07-03 13:49:47 +01:00
Sofia Papagiannaki
2ae6adef26 Codestyle: add guidelines for removing the m alias for models (#17890)
* Add guidelines for avoiding use of m alias for models

* Add suggestion for elimination of existing aliases
2019-07-03 11:36:01 +03:00
Tobias Skarhed
498572d2d8 Docs: How to work with themes (#17876)
* Add docs for themes

* Edit description a little bit

* Update themes.md
2019-07-03 09:50:42 +02:00
Marcus Efraimsson
a2c1462675 Docs: Fix developing plugins index page (#17877)
Fixes #17874
2019-07-02 18:06:02 +02:00
Tobias Skarhed
3aed4d3613 StatsPicker: Fix multiple value input layout etc. (#17827)
* Add padding and centering

* Vertically center input

* Add noOptions styles

* Move reove button to same line

* StatsPicker: style tweak
2019-07-02 16:42:08 +02:00
Marcus Efraimsson
9620ac4b92 Chore: Build grafana-cli when running bra run (#17788) 2019-07-02 15:25:31 +02:00
Oleg Gaidarenko
caa1314f44 Build: use golangci-lint as a make command (#17739)
* Build: use golangci-lint as a make command

* Since gometalinter was deprecated in favor of golangci-lint so it was
  replaced by it. Responsibilities held by the gometalinter was moved to
  golangci-lint

* There was some changes in implementation (that was also mentioned in
  the code comment) between the tools, which uncovered couple errors
  in the code. Those issues were either solved or disabled by
  the inline comments

* Introduce the golangci-lint config, to make their
  configuration more manageable

* Build: replace backend-lint.sh script with make
2019-07-02 16:06:59 +03:00
kay delaney
364f1f2e55 Explore: Log highlights only update when user stops typing (#17845)
Reverts performance enhancements made to LogsContainer as they are no
longer needed, and complicated things.
Closes #17818
2019-07-02 09:06:21 +01:00
kay delaney
0a1bb97a2f Loki: getHighlighterExpressionsFromQuery Returns null if filter term is not quoted (#17852)
Closes #17687
2019-07-02 09:06:04 +01:00
Leonard Gram
8f150c67aa Docs upgrading deps (#17657)
* Docs: correct link to the Grafana build-container.

* Docs: documents usage on the gopath when upgrading deps.

* Dev docs: info for upgrading deps only in one location.
2019-07-02 09:43:25 +02:00
Leonard Gram
d71043609e Testing: Include BatchRevoke for all tokens in the fake. (#17728) 2019-07-02 09:42:35 +02:00
Ryan McKinley
e7c3d0ed97 Refactor: rename SeriesData to DataFrame (#17854) 2019-07-01 12:00:29 -07:00
Kyle Brandt
c9f4cf8b53 devenv: switch OpenTSDB docker block (#17849)
old docker image, https://hub.docker.com/r/opower/opentsdb/,  seems to be gone
2019-07-01 09:11:25 -04:00
Oleg Gaidarenko
ca136c7c22 Devenv:LDAP: couple simplifications for LDAP (#17807)
* Add LDAP config instead sed use

* Add container name

* Add SizeLimit option to client and to server.
  Probably useless at this point, but it's better to have it then otherwise
2019-07-01 15:09:04 +03:00
Oleg Gaidarenko
5836427794 Login: divide login errors by pkg and service (#17835)
Define errors in the login module only if they are used
2019-07-01 14:32:17 +03:00
Sofia Papagiannaki
f3f03ceb6a Auth Proxy: Respect auto_sign_up setting (#17843)
* Add test for disabled auth proxy auto signup option

* Set correctly auth proxy auto signup
2019-07-01 14:29:41 +03:00
Alexander Zobnin
c2affdee1e OAuth: return github teams as a part of user info (enable team sync) (#17797)
* OAuth: github team sync POC

* OAuth: minor refactor of github module

* OAuth: able to use team shorthands for github team sync

* support passing a list of groups via auth-proxy header
2019-07-01 12:30:17 +03:00
Tobias Skarhed
4e27ba9646 noImplicitAny: Sub 3000 errors (#17821)
* noImplicitAny Stackdriver

* Sub 3000 noImplicitAny

* Update error count limit

* Add DataQueryRequest type
2019-07-01 11:11:57 +02:00
Torkel Ödegaard
bd4a7ddf3a TimePicker: Style and responsive fixes, restored dashboard settings (#17822)
* TimePicker: Restore time picker settings

* CleanUp: removed unuused angular-ui (calendar) components

* Fix angular boot dependency list

* TimePicker: set time to 23:59:00 when setting To time using calendar
2019-07-01 10:16:33 +02:00
Eduard Sergeev
d94bdb930f Templating: Correctly display __text in multi-values variable (#17840)
Fixes #17839: __value is displayed instead of __text when single item is selected
2019-07-01 09:42:36 +02:00
Marcus Efraimsson
0833f26b43 Elasticsearch: Fix default max concurrent shard requests (#17770)
Elasticsearch v7.0 changed the behavior of max concurrent shard
requests and the default to 5. v5.6 and before 7.0 the default
is 256. This adds some additional behavior given certain
version is selected when configure the datasource to set
default max concurrent shard requests.
Changing from a version pre-v7.0+ to v7.0+ sets max
concurrent shard requests to 5.
Changing from a version v7.0+ to a pre-v7.0 sets max
concurrent shard requests to 256.

Fixes #17454
2019-06-28 18:38:16 +02:00
Marcus Efraimsson
53db823511 Explore: Fix filter by series level in logs graph (#17798)
Adds back support for filtering log messages by series level 
in logs graph which seem to have been broken since merging
of #17027.

Fixes #17769
2019-06-28 17:05:59 +02:00
Marcus Efraimsson
c392a492ae Docs: Add v6.3 version notes and encryption format information (#17825)
Adds version note for alert rule tags.
Adds version note for graph data links.
Adds information about secret_key and encryption format in use

Fixes #17815
Fixes #17803
2019-06-28 16:32:42 +02:00
Sofia Papagiannaki
d9fea07e6e Graphite: use POST for /metrics/find requests (#17814)
* Add test that expects a POST request

* Change graphite /metric/find request to POST

Query parameter can become large enough
to exceed GET URI limits.

* Fix requests with time range

Initialise httpOptions.params

* Fix for supporting queries referencing template variable
2019-06-28 16:21:32 +03:00
Ryan McKinley
70d4dfe9f7 Dashboard: Force update after dashboard resize (#17808) 2019-06-28 14:25:38 +02:00
Dominik Prokop
742e0d56eb Toolkit: moved front end cli scripts to separate package and introduced very early version of plugin tools
* Move cli to grafana-toolkit

* Moving packages, fixing ts

* Add basics of plugin build task

* Add toolkit build task

* Circle - use node 10 for test-frontend

* Prettier fix

* First attempt for having shared tsconfig for plugins

* Add enzyme as peer depencency

* Do not expose internal commands when using toolkit from npm package

* Introduce plugin linting

* Fix missing file

* Fix shim extenstion

* Remove rollup typings

* Add tslint as dependency

* Toolkit - use the same versions of enzyme and tslint as core does

* Remove include property from plugin tsconfig

* Take failed suites into consideration when tests failed

* Set ts-jest preset for jest

* Cleanup tsconfig.plugins

* Add plugin:test task

* Rename file causing build failute

* Fixing those missed renames

* Add ts as peer dependency

* Remove enzyme dependency and tweak test plugin task

* Allow jest options overrides via package.json config

* Improvements

* Remove rollup node packages

* TMP : Fix ts errors when linked

* use local tslint if it exists

* support coverage commands

* Fix merge

* fix build

* Some minors

* Make jest pass when no tests discovered
2019-06-28 14:11:12 +02:00
Hugo Häggmark
ead4b1f5c7 Explore: Uses new TimePicker from Grafana/UI (#17793)
* Wip: Intiail commit

* Refactor: Replaces TimePicker in Explore

* Refactor: Removes Angular TimePicker folder

* Refactor: Adds tests for getShiftedTimeRange

* Fix: Fixes invalid import to removed TimePicker

* Fix: Fixes dateTime tests

* Refactor: Reuses getShiftedTimeRange for both Explore and Dashboards

* Refactor: Shares getZoomedTimeRange between Explore and Dashboard
2019-06-28 12:07:55 +02:00
Hugo Häggmark
2379de53c4 Explore: Uses RFC3339Nano string to retrieve LogRow contexts from Loki API (#17813)
* Refactor: Uses nanosecond string to retreive LogRow contexts

* Reafactor: Small changes to comments after PR comments
2019-06-28 10:47:19 +02:00
Tobias Skarhed
0b9de3f761 noImplicitAny: Lower count to about 3450 (#17799) 2019-06-27 15:56:02 +02:00
Torkel Ödegaard
8fcc370fe9 Graphite: Fixes issue with seriesByTag & function with variable param (#17795)
Fixes #17696
2019-06-27 14:10:43 +02:00
Tobias Skarhed
3045daedbd noImplicitAny: Reduce errors to 3800-ish (#17781)
* Reduce noImplicitAny errors to 3900-ish

* Fix lots of errors

* Add interface
2019-06-27 13:21:04 +02:00
Torkel Ödegaard
013a1abb6f Graphite: remove feature that moves alias function last (#17791) 2019-06-27 11:16:11 +02:00
kay delaney
5f3a71bc7a Explore: Adds URL support for select mode (#17755)
Adds URL support for mode state (Metrics/Logs). It's important 
to be able to share a link to logs when a data source supports 
both metrics and logs.

Closes #17101
2019-06-27 11:11:49 +02:00
Ryan McKinley
021f5351fa TestData: add option to increase the number of test streams (#17789)
* variable number of points

* add variable number of bands
2019-06-27 10:28:35 +02:00
Marcus Efraimsson
0a3f977ea2 Usage Stats: Update known datasource plugins (#17787) 2019-06-26 21:15:45 +02:00
kay delaney
3af7eeb331 Docs: Adds section on Querying Logs for Elasticsearch (#17730)
Closes #17713
2019-06-26 20:06:32 +02:00
Hugo Häggmark
f53f0c8063 Docs: Adds section on Querying Logs for InfluxDB (#17726)
Fixes #17715
2019-06-26 19:40:38 +02:00
Leonard Gram
8493965d31 Devenv: makes the grafana users default for saml. (#17782) 2019-06-26 16:10:45 +01:00
Hugo Häggmark
7cac7435ce Explore: Displays only one Time column as configured in TimeZone settings (#17775)
* Refactor: Removes switches for TimeStamp and LocalTime and displays time as configured for user

* Styles: Updates classname used to display timeUtc

* Refactor: Adds switch for Time column
2019-06-26 13:35:23 +02:00
Tobias Skarhed
8541214c9e Markdown: Replace rendering library (#17686)
* Replace remarkable with marked

* Add wrapper and options for marked
2019-06-26 13:15:45 +02:00
Sofia Papagiannaki
6fb36e705f ApiKeys: Fix check for UTC timezone (#17776)
getTimeZone() no longer returns an object, but a string
2019-06-26 10:26:16 +02:00
Torkel Ödegaard
40e5c4f8ba Prometheus: Minor style fix (#17773)
* Prometheus: Minor style fix

* Updated snapshot
2019-06-26 09:56:11 +02:00
Torkel Ödegaard
7acbb94bb8 Docs: fixed notifications table 2019-06-26 09:44:19 +02:00
Sofia Papagiannaki
dc9ec7dc91 Auth: Allow expiration of API keys (#17678)
* Modify backend to allow expiration of API Keys

* Add middleware test for expired api keys

* Modify frontend to enable expiration of API Keys

* Fix frontend tests

* Fix migration and add index for `expires` field

* Add api key tests for database access

* Substitude time.Now() by a mock for test usage

* Front-end modifications

* Change input label to `Time to live`
* Change input behavior to comply with the other similar
* Add tooltip

* Modify AddApiKey api call response

Expiration should be *time.Time instead of string

* Present expiration date in the selected timezone

* Use kbn for transforming intervals to seconds

* Use `assert` library for tests

* Frontend fixes

Add checks for empty/undefined/null values

* Change expires column from datetime to integer

* Restrict api key duration input

It should be interval not number

* AddApiKey must complain if SecondsToLive is negative

* Declare ErrInvalidApiKeyExpiration

* Move configuration to auth section

* Update docs

* Eliminate alias for models in modified files

* Omit expiration from api response if empty

* Eliminate Goconvey from test file

* Fix test

Do not sleep, use mocked timeNow() instead

* Remove index for expires from api_key table

The index should be anyway on both org_id and expires fields.
However this commit eliminates completely the index for now
since not many rows are expected to be in this table.

* Use getTimeZone function

* Minor change in api key listing

The frontend should display a message instead of empty string
if the key does not expire.
2019-06-26 09:47:03 +03:00
fxmiii
19185bd0af 17278 prometheus step align utc (#17477)
* Update datasource.ts

* Update datasource.test.ts

* utcOffset reverse

from moment docs, utcOffset "function returns the real offset from UTC, not the reverse offset"

* add utcOffset() to DateTime interface

method returns the UTC offset as a number of minutes

* Fixed test
2019-06-26 07:55:36 +02:00
Tobias Skarhed
654f1f2eb6 Docs: Update release guide (#17759)
and add comment about Rollup namedExports
2019-06-26 07:35:58 +02:00
Kyle Brandt
5aa13eeb76 release: update latest.json to v6.2.5 (#17767) 2019-06-25 21:16:01 +02:00
Kyle Brandt
b9fda28e27 release: 6.2.5 changelog (#17766) 2019-06-25 15:10:42 -04:00
Alexandre de Verteuil
4f1d495ba1 Fix typo s/Applicaiton/Application/ in error messages (#17765) 2019-06-25 20:59:58 +02:00
Alexander Zobnin
77375f3772 UserAdmin: UI for disabling users (#17333)
* Feat: initial disable user UI

* batch disable users

* batch revoke users tokens

* split batch disable user and revoke token

* API: get users with auth info and isExternal flag

* fix tests for batch disable users

* Disable users: show is user external or not

* Users: refactor /api/users/search endpoint

* Users: use alias for "user" table

* Chore: add BatchDisableUsers() to the bus

* Users: order user list by id explicitly

* Chore: switch back to /api/users/search endpoint

* Users: move disable button to user profile page

* Users: return AuthModule from /api/users/:id endpoint

* Users: do not return unused fields

* Users: mute auth badge for disabled users

* Users: move disable button to the user section

* Users: fix SearchUsers method after last changes

* User: return auth module as array for future purposes

* User: tests for SearchUsers()

* User: return only latest auth module in SearchUsers()

* User: fix JOIN, get only most recent auth module

* Users: fix ldap badge after backed changes

* Users: show tooltip for inactive disable/enable button

* Users: move delete button to edit user view

* Users: put deactivated badge on the user list

* Users: minor refactor

* Users: adjust deactivated badge style

* Minor design changes
2019-06-25 18:49:12 +02:00
Alexander Zobnin
dad894f1cc API: get list of users with additional auth info (#17305)
* batch disable users

* batch revoke users tokens

* split batch disable user and revoke token

* API: get users with auth info and isExternal flag

* fix tests for batch disable users

* Users: refactor /api/users/search endpoint

* Users: use alias for "user" table

* Chore: add BatchDisableUsers() to the bus

* Users: order user list by id explicitly

* Users: return AuthModule from /api/users/:id endpoint

* Users: do not return unused fields

* Users: fix SearchUsers method after last changes

* User: return auth module as array for future purposes

* User: tests for SearchUsers()

* User: return only latest auth module in SearchUsers()

* User: fix JOIN, get only most recent auth module
2019-06-25 18:29:07 +03:00
Torkel Ödegaard
40708bef10 TimePicker: fixed minor issues with new timepicker (#17756) 2019-06-25 16:39:48 +02:00
Hugo Häggmark
2c5400c61e Explore: Parses and updates TimeSrv in one place in Explore (#17677)
* Wip: Adds timeEpic

* Refactor: Introduces absoluteRange in Explore state

* Refactor: Removes changeTime action

* Tests: Adds tests for timeEpic

* Refactor: Spells AbsoluteRange correctly
2019-06-25 13:44:19 +01:00
Tobias Skarhed
6be1606bd8 @grafana/ui: release (#17754)
* Specifying named exports for slate

* Make sure tests are performed at the beginning

* Version bump
2019-06-25 14:13:39 +02:00
Tobias Skarhed
0904607eda Password: Remove PasswordStrength (#17750)
* Closes #17748

* Remove remaining occurences

* And the last one
2019-06-25 13:56:35 +02:00
Oleg Gaidarenko
e83953f24e Devenv:SAML: devenv block with saml test app (#17733)
* Devenv:SAML: devenv block with saml test app

Includes documentation, couple custom users and
actual docker-compose of course :)

Ref: #4780
2019-06-25 13:31:27 +02:00
Oleg Gaidarenko
31d2905490 LDAP:Docs: add information on LDAP sync feature and update LDAP sync default (#17689)
* Docs: for LDAP active sync feature
2019-06-25 12:54:13 +02:00
Torkel Ödegaard
335cec07a5 Graph: Add data links feature (click on graph) (#17267)
* WIP: initial panel links editor

* WIP: Added dashboard migration to new panel drilldown link schema

* Make link_srv interpolate new variables

* Fix failing tests

* Drilldown: Add context menu to graph viz (#17284)

* Add simple context menu for adding graph annotations and showing drilldown links

* Close graph context menu when user start scrolling

* Move context menu component to grafana/ui

* Make graph context menu appear on click, use cmd/ctrl click for quick annotations

* Move graph context menu controller to separate file

* Drilldown: datapoint variables interpolation (#17328)

* Add simple context menu for adding graph annotations and showing drilldown links

* Close graph context menu when user start scrolling

* Move context menu component to grafana/ui

* Make graph context menu appear on click, use cmd/ctrl click for quick annotations

* Add util for absolute time range transformation

* Add series name and datapoint timestamp interpolation

* Rename drilldown link variables tot snake case, use const values instead of strings in tests

* Bring LinkSrv.getPanelLinkAnchorInfo for compatibility reasons and add deprecation warning

* Rename seriesLabel to seriesName

* Drilldown: use separate editors for panel and series links (#17355)

* Use correct target ini context menu links

* Rename PanelLinksEditor to DrilldownLinksEditor and mote it to grafana/ui

* Expose DrilldownLinksEditor as an angular directive

* Enable visualization specifix drilldown links

* Props interfaces rename

* Drilldown: Add variables suggestion and syntax highlighting for drilldown link editor (#17391)

* Add variables suggestion in drilldown link editor

* Enable prism

* Fix backspace not working

* Move slate value helpers to grafana/ui

* Add syntax higlighting for links input

* Rename drilldown link components to data links

* Add template variabe suggestions

* Bugfix

* Fix regexp not working in Firefox

* Display correct links in panel header corner

* bugfix

* bugfix

* Bugfix

* Context menu UI tweaks

* Use data link terminology instead of drilldown

* DataLinks: changed autocomplete syntax

* Use singular form for data link

* Use the same syntax higlighting for built-in and template variables in data links editor

* UI improvements to context menu

* UI review tweaks

* Tweak layout of data link editor

* Fix vertical spacing

* Remove data link header in context menu

* Remove pointer cursor from series label in context menu

* Fix variable selection on click

* DataLinks: migrations for old links

* Update docs about data links

* Use value time instead of time range when interpolating datapoint timestamp

* Remove not used util

* Update docs

* Moved icon a bit more down

* Interpolate value ts only when using __value_time variable

* Bring href property back to LinkModel

* Add any type annotations

* Fix TS error on slate's Value type

* minor changes
2019-06-25 11:38:51 +02:00
kay delaney
cbe057fce8 Explore: Changes LogsContainer from a PureComponent to a Component (#17741) 2019-06-25 09:10:20 +01:00
Dominik Prokop
48570c4286 Chore: Remove tether and tether drop dependency in grafana/ui (#17745) 2019-06-25 09:57:57 +02:00
Tobias Skarhed
1b17b7893f noImplicitAny: time region manager etc. (#17729)
* Fix errors

* Wrong branch

* minor type fix
2019-06-25 09:49:31 +02:00
Tobias Skarhed
75c29566a6 Panel: Fully escape html in drilldown links (was only sanitized before) (#17731)
* Sanitize HTML

* Replace sanitization lib and check for config

* Add htmlToText

* Refactor: Renaming htmlToText to escapeHtml
2019-06-25 09:06:28 +02:00
Marcus Efraimsson
5713048f48 Alerting: Improve alert rule testing (#16286)
* tsdb: add support for setting debug flag of tsdb query

* alerting: adds debug flag in eval context

Debug flag is set when testing an alert rule and this debug
flag is used to return more debug information in test aler rule
response. This debug flag is also provided to tsdb queries so
datasources can optionally add support for returning additional
debug data

* alerting: improve test alert rule ui

Adds buttons for expand/collapse json and copy json to clipboard,
very similar to how the query inspector works.

* elasticsearch: implement support for tsdb query debug flag

* elasticsearch: embedding client response in struct

* alerting: return proper query model when testing rule
2019-06-25 08:52:17 +02:00
Marcus Efraimsson
eecd8d1064 Elasticsearch: Visualize logs in Explore (#17605)
* explore: try to use existing mode when switching datasource

* elasticsearch: initial explore logs support

* Elasticsearch: Adds ElasticsearchOptions type
Updates tests accordingly

* Elasticsearch: Adds typing to query method

* Elasticsearch: Makes maxConcurrentShardRequests optional

* Explore: Allows empty query for elasticsearch datasource

* Elasticsearch: Unifies ElasticsearchQuery interface definition
Removes check for context === 'explore'

* Elasticsearch: Removes context property from ElasticsearchQuery interface
Adds field property
Removes metricAggs property
Adds typing to metrics property

* Elasticsearch: Runs default 'empty' query when 'clear all' button is pressed

* Elasticsearch: Removes index property from ElasticsearchOptions interface

* Elasticsearch: Removes commented code from ElasticsearchQueryField.tsx

* Elasticsearch: Adds comment warning usage of for...in to elastic_response.ts

* Elasticsearch: adds tests related to log queries
2019-06-24 21:15:03 +01:00
gotjosh
2fb45eeec8 Grafana-CLI: Wrapper for grafana-cli within RPM/DEB packages and config/homepath are now global flags (#17695)
* Feature: Introduce a grafana-cli wrapper

When our users install the *nix packed version of grafana, tendency is to use the services and scripts installed as part of the package for grafana-server. These leverage the default configuration options by specifying the several default paths.

This introduces a similar approach for the grafana-cli binary. We exposed it through a wrapper to ensure a proper configuration is in place. To enable that, we add the .real suffix to the original binary (grafana-cli.real) and then use a bash script named grafana-cli as the wrapper.

* Make the config and homepath flags global

* Introduce `configOverrides` as a global flag

This flag allows us to pass configuration overrides as a string.

The string follows the convention of configuration arguments separated by a space e.g. "cfg:default.paths.data=/dev/nullX cfg:default.paths.logs=/dev/nullX"

Also, it is backwards compatible with similar the previous configuration method through tailing arguments. Tailing arguments take presedence over the configuration options string.

* Only log configuration information in debug mode

* Move the grafana-cli binary to $GRAFANA_HOME/bin

As part of the package install process, we copy all the release files and
directories into the grafana home directory. This includes the /bin folder
from where we copied the binaries into their respective destinations.
After that, the /bin folder gets deleted as we don't want to keep
duplicates of the binaries around.

As part of this commit, we moved the re-creation of /bin within
grafana-home and the copy of the original binary (again) after the
folder gets deleted.
2019-06-24 20:20:21 +01:00
Sofia Papagiannaki
e7e9d3619e Add guidelines for SQL date comparisons (#17732) 2019-06-24 20:39:28 +03:00
Leonard Gram
4c97d26102 Docs: clarified usage of go get and go mod (#17637) 2019-06-24 18:29:57 +02:00
Marcus Efraimsson
c41eba92fe Project: Issue triage doc improvement (#17709)
Adds some fixes of types and a new section describing how 
you can help with the Grafana project related to issues.

Ref #17648
2019-06-24 18:00:21 +02:00
gotjosh
bc94f85dee Improvement: Grafana release process minor improvements (#17661)
* Don't display changelog category title when no items

The output of the changelog is meant to be copy/pasted with ease. When a
changelog category does not contain items is better to not display title
at all thus avoiding having the manually modify the output as we include
it in the steps of the process.

* Introduce a CLI task to close milestones whilst doing a Grafana release

As part of a Grafana release, we need to eventually close the GitHub
milestone to indicate is done and remove all the cherry-pick labels from
issues/prs within the milestone to avoid our cherry-pick CLI command to
pick them up on the next release.

* Abstract the GitHub client into a module

* Introduce `GitHubClient` to all CLI tasks
2019-06-24 16:00:01 +01:00
Johannes Schill
0412a28d2e TimePicker: New time picker dropdown & custom range UI (#16811)
* feat: Add new picker to DashNavTimeControls

* chore: noImplicitAny limit reached

* chore: noImplicityAny fix

* chore: Add momentUtc helper to avoid the isUtc conditionals

* chore: Move getRaw from Explore's time picker to grafana/ui utils and rename to getRawRange

* feat: Use helper functions to convert utc to browser time

* fix: Dont Select current value when pressing tab when using Time Picker

* fix: Add tabIndex to time range inputs so tab works smoothly and prevent mouseDown event to propagate to react-select

* fix: Add spacing to custom range labels

* fix: Updated snapshot

* fix: Re-adding getRaw() temporary to fix the build

* fix: Disable scroll event in Popper when we're using the TimePicker so the popup wont "follow" the menu

* fix: Move all "Last xxxx" quick ranges to the menu and show a "UTC" text when applicable

* fix: Add zoom functionality

* feat: Add logic to mark selected option as active

* fix: Add tooltip to zoom button

* fix: lint fix after rebase

* chore: Remove old time picker from DashNav

* TimePicker: minor design update

* chore: Move all time picker quick ranges to the menu

* fix: Remove the popover border-right, since the quick ranges are gone

* chore: Remove function not in use

* Fix: Close time picker on resize event

* Fix: Remove border bottom

* Fix: Use fa icons on prev/next arrows

* Fix: Pass ref from TimePicker to TimePickerOptionGroup so the popover will align as it should

* Fix: time picker ui adjustments to get better touch area on buttons

* Fix: Dont increase line height on large screens

* TimePicker: style updates

* Fix: Add more prominent colors for selected dates and fade out dates in previous/next month

* TimePicker: style updates2

* TimePicker: Big refactorings and style changes

* Removed use of Popper not sure we need that here?
* Made active selected item in the list have the "selected" checkmark
* Changed design of popover
* Changed design of and implementation of the Custom selection in the dropdown it did not feel like a item you
could select like the rest now the list is just a normal list

* TimePicker: Refactoring & style changes

* TimePicker: use same date format everywhere

* TimePicker: Calendar style updates

* TimePicker: fixed unit test

* fixed unit test

* TimeZone: refactoring time zone type

* TimePicker: refactoring

* TimePicker: finally to UTC to work

* TimePicker: better way to handle calendar utc dates

* TimePicker: Fixed tooltip issues

* Updated snapshot

* TimePicker: moved tooltip from DashNavControls into TimePicker
2019-06-24 14:39:59 +02:00
Kyle Brandt
0adbb001db RemoteCache: redis connection string parsing test (#17702) 2019-06-24 11:51:38 +02:00
Sofia Papagiannaki
d0852f0618 Fix link in pkg/README (#17714)
Remove leading backslash from url
2019-06-24 10:34:51 +03:00
David
4ddeb94f52 Dashboard: Use Explore's Prometheus editor in dashboard panel edit (#15364)
* WIP prometheus editor same in panel

* Dont use panel in plugin editors

* prettiered modified files

* Fix step in external link

* Prevent exiting edit mode when slate suggestions are shown

* Blur behavior and $__interval variable

* Remove unused query controller

* Basic render test

* Chore: Fixes blacklisted import

* Refactor: Adds correct start and end time
2019-06-24 08:42:08 +02:00
Sergey Goppikov
dda8b731e8 Settings: Fix typo in defaults.ini (#17707)
`backround` -> `backGround`
2019-06-23 17:38:30 +02:00
Marcus Efraimsson
70b4fc8483 Project: Adds a security policy (#17698)
Adds a security policy document. For reference, https://help.github.com/en/articles/adding-a-security-policy-to-your-repository.

Closes #17649
2019-06-23 00:25:29 +02:00
Marcus Efraimsson
0a74a3329c Project: Adds support resource docs (#17699)
Adds a support resource document. For reference, 
https://help.github.com/en/articles/adding-support-resources-to-your-project.

Closes #17650
2019-06-22 13:51:32 +02:00
Marcus Efraimsson
ec3b91e6b2 Document issue triage process (#17669)
Adds a first version of project documentation/guideline for triaging 
of issues. This adds some additional content and context so that 
the issue triage process can be understood by both maintainers 
and existing/new contributors and other interested parties.

Co-Authored-By: Andrej Ocenas <mr.ocenas@gmail.com>

Closes #17648
2019-06-21 02:20:45 +02:00
Tobias Skarhed
219d711597 noImplicitAny: slate (#17681)
* Update slate types

* Fix noImplicitAny
2019-06-20 20:41:01 +02:00
Kyle Brandt
49f0f0e89e config: fix connstr for remote_cache (#17675)
fixes #17643 and adds test to check for commented out lines (but will only catch `;`, not `#`).
2019-06-20 10:15:21 -04:00
kay delaney
57dadebbd8 Explore: Improves performance of Logs element by limiting re-rendering (#17685)
* Explore: Improves performance of Logs element by limiting re-rendering
Re-renders only when query has finished executing or when deduplication
strategy changes.
Closes #17663

* Explore: Adds logsHighlighterExpressions as prop to consider when re-rendering Logs
2019-06-20 12:56:47 +01:00
Jared Burns
6fd4aa4b46 Docs: Flag serve_from_sub_path as available in 6.3 (#17674)
Follow-up to PR #17048. Flag the new serve_from_sub_path option as available in 6.3.
2019-06-20 07:06:09 +02:00
Ryan McKinley
428134482d @grafana/runtime: expose config and loadPluginCss (#17655)
* move config to grafana runtime

* set defaults

* defaults in constructor

* use @types/systemjs

* rename Settings to GrafanaBootConfig
2019-06-19 11:31:47 -07:00
Tobias Skarhed
c9ad411d8e noImplicitAny: Fix basic errors (#17668)
* Fix basic noImplicitAny errors

* noImplicitAny HeatmapCtrl

* Update error limit
2019-06-19 19:59:03 +02:00
Dominik Prokop
433e5ac049 Docs: Update readme to reference correct repo (#17666) 2019-06-19 16:10:45 +02:00
Oleg Gaidarenko
1c08e58605 LDAP: small improvements to various LDAP parts (#17662)
* Add multildap config example

* Publicize mocks for multildap module
2019-06-19 15:46:04 +02:00
Tobias Skarhed
17826796da Chore: Fix noImplicitAny issues (#17636)
* noImplicitAny: TableRenderer

* noImplicitAny and add types

* HeatmapData interface

* Heatmap rendering

* Fix optional type

* Remove use of lodash
2019-06-19 13:40:42 +02:00
Tobias Skarhed
7eb820081d AddPanel: Fix issue when removing moved add panel widget (#17659)
* Fixes #17592

* Remove console.log
2019-06-19 13:12:04 +02:00
Ryan McKinley
35e1524b02 TablePanel: fix annotations display (#17646) 2019-06-18 11:56:09 -07:00
Kyle Brandt
bd08d8ce8e middleware: fix Strict-Transport-Security header (#17644)
fixes #17641
2019-06-18 14:24:23 -04:00
Ryan McKinley
401615847c Build: add @grafana/data package (#17436)
first step in moving non-ui components to their own package
2019-06-18 08:17:27 -07:00
Josue Abreu
efdfb1fce3 Update latest.json for 6.2.4 2019-06-18 13:36:17 +01:00
Josue Abreu
c784dadafe Update latest.json for 6.2.3 2019-06-18 13:36:17 +01:00
Josue Abreu
b6350fe6fb Update the changelog with v6.2.4 information 2019-06-18 13:20:41 +01:00
Hugo Häggmark
eca706f7c4 Build: Updates node image for e2e job (#17632) 2019-06-18 12:14:59 +02:00
kay delaney
477d5643b6 Explore: Prometheus query errors now show (#17470)
* Explore: Prometheus query errors now show
Fixes: #17435

* Explore: Adds test to ensure prometheus query errors are reported

* Explore: removes implicit anys introduced previously
2019-06-18 11:07:09 +01:00
Hugo Häggmark
12e417f2df Chore: Lowered implicit anys limit to 4599 (#17631)
Progress: #14714
2019-06-18 11:59:38 +02:00
Tobias Skarhed
8b8f2c4540 noImplicitAny: SingleStat panel (#17616)
* noImplicitAny on Singlestat

* Lower threshold

* Fix fixes
2019-06-18 11:44:17 +02:00
Hugo Häggmark
c75d026186 Build: Update node image for test-frontend job step (#17628) 2019-06-18 11:32:11 +02:00
gotjosh
7d68d6ede2 grafana-cli: Fix receiving flags via command line (#17617)
`grafana-cli` uses the third-party library to define the flags and not
the standard library. Using `flag.Parse` conflicts with the defined
flags from our third-party library.

In the case where `flag.Parse` is used, the CLI assumes that definitions
provided are not needed and will not define them; producing errors of
the kind `flag provided but not defined --example-flag`.

Using the context to read any arguments (including flags) is the
recommended approach by the third-party library.
2019-06-18 10:25:37 +01:00
Hugo Häggmark
3424b64299 Typescript: Removes implicit anys (#17625)
* Chore: Remove implicit anys from ResultProcessor and tests

* Chore: Removes implicit anys for /loki/**/*.ts

* Chore: Removes implicit anys for prometheus/**/*
2019-06-18 11:01:12 +02:00
kay delaney
d6ee96ee64 Explore: Removes minus button in adhoc query field (#17573)
Closes #17571
2019-06-18 09:48:32 +01:00
Remi Verchere
4c4c689907 Correct 6.2.3 release date (#17624) 2019-06-18 09:40:08 +02:00
Carl Bergquist
b98bb48d59 codestyle: styleguide and arch for grafanas backend (#17545) 2019-06-18 09:31:51 +02:00
srid12
b950eebf99 JsonTree: fix jsonTree angular binding (#17608)
The API changed so it expects a numeric level rather than a boolean flag.  Since 6.1 plugins using jsonTree just show an empty div
2019-06-17 15:10:56 -07:00
Yann Verry
ed613194ac HTTPServer: Fix X-XSS-Protection header formatting (#17620)
Fixes #17619
2019-06-17 23:46:35 +02:00
Marcus Efraimsson
64841fe417 Changelog: Add known issues for v6.2.3 (#17615) 2019-06-17 17:35:13 +02:00
gotjosh
3563f71ba2 Update the changelog with v6.2.3 information (#17612) 2019-06-17 15:42:11 +01:00
Tobias Skarhed
6de75de755 Refactor buttons (#17611) 2019-06-17 16:15:49 +02:00
Hugo Häggmark
8192fa538e Tests: Replaces e2e tests truth screenshot (#17609) 2019-06-17 13:41:29 +02:00
gotjosh
6fbca90269 cli: grafana-cli should receive flags from the command line (#17606)
grafana-cli should allow configuration overrides to be received from the command line. e.g.

```
grafana-cli admin reset-password cfg:default.paths.logs=custom/log/directory/
```

Seems like we missed the inclusion of `flag.Parse` as we run the command,  to be able to consume them.

Additionally, it'll be useful for the user to know whenever these are being overriden or not - hence the addition of logging the configuration to be used as we run the command.
2019-06-17 11:27:26 +01:00
Martin Brenner
aa1f9cdd40 AppPlugin: Fix load legacy plugin app (#17574)
* first init meta befor set legacy components

* add load legacy app test

* AppPlugin: minor refactor
2019-06-15 08:26:31 +02:00
Tobias Skarhed
8ffef57178 Typescript: A batch of implicit any fixes (#17590)
* Reduce noImplicitAny errors

* Lower err count

* Static version

* Fix noImplicitAny

* Table: moved type file
2019-06-15 08:25:33 +02:00
Tobias Skarhed
2f00087a08 RefreshPicker: Handle empty intervals (#17585)
* Refresh picker empty

* RefreshPicker: refactoring
2019-06-15 08:24:52 +02:00
Carl Bergquist
f9b691bd54 Docker: Switch base to ubuntu:latest (#17066) 2019-06-14 22:57:55 +02:00
Oleg Gaidarenko
c853ef7318 SQLStore: extend user.SearchUsers method (#17514)
* SQLStore: extend `user.SearchUsers` method

Allow `user.SearchUsers` to search users based on their auth type
2019-06-14 09:50:38 +01:00
Hugo Häggmark
51c6b50582 Explore: Tag and Values for Influx are filtered by the selected measurement (#17539)
* Fix: Filters Tags and Values depending on options passed
Fixes: #17507

* Fix: Makes sure options is not undefined

* Fix: Fixes tests and small button refactor

* Chore: PR comments
2019-06-14 10:13:06 +02:00
Leonard Gram
37e9988e95 ldap: makes mocks available for testing. (#17576)
* ldap: makes mocks available for testing.
2019-06-14 09:54:19 +02:00
Andrej Ocenas
97f7c92455 Devenv: Add nginx proxy for mac (#17572) 2019-06-13 21:29:33 +02:00
Torkel Ödegaard
2c5c333858 Graph: Added new fill gradient option (#17528)
* Graph: Added new fill gradient option

* Graph: changed gradient area fill option, added test dashboard
2019-06-13 20:06:04 +02:00
Tobias Skarhed
375dc333f2 Typescript: Reduce implicit any errors (#17550)
* Fix types on linkSrv

* Lower err count, shoot down some errs, add type pkg

* Fix changes and add test

* Update public/app/features/panel/panel_ctrl.ts

Co-Authored-By: Hugo Häggmark <hugo.haggmark@gmail.com>

* Update public/app/features/panel/panel_ctrl.ts

Co-Authored-By: Hugo Häggmark <hugo.haggmark@gmail.com>

* Update public/app/features/panel/panellinks/link_srv.ts

Co-Authored-By: Hugo Häggmark <hugo.haggmark@gmail.com>

* Update public/app/features/panel/panel_ctrl.ts

Co-Authored-By: Hugo Häggmark <hugo.haggmark@gmail.com>

* Fix last types to compile

* Fix formatting issue

* Update public/app/features/panel/panel_ctrl.ts

Co-Authored-By: Hugo Häggmark <hugo.haggmark@gmail.com>
2019-06-13 20:04:15 +02:00
Daniele Ruggieri
74829f4898 SinglestatPanel: Manages when getColorForValue() function returns null value. Closes #9747 (#17552) 2019-06-13 20:00:13 +02:00
Oleg Gaidarenko
1b1d951495 LDAP: refactoring (#17479)
* LDAP: use only one struct

* Use only models.ExternalUserInfo

* Add additional helper method :/

* Move all the helpers to one module

* LDAP: refactoring

* Rename some of the public methods and change their behaviour

* Remove outdated methods

* Simplify logic

* More tests
  There is no and never were tests for settings.go, added tests for helper
  methods (cover is now about 100% for them). Added tests for the main
  LDAP logic, but there is some stuff to add. Dial() is not tested and not
  decoupled. It might be a challenge to do it properly

* Restructure tests:
   * they wouldn't depend on external modules
   * more consistent naming
   * logical division

* More guards for erroneous paths

* Login: make login service an explicit dependency

* LDAP: remove no longer needed test helper fns

* LDAP: remove useless import

* LDAP: Use new interface in multildap module

* LDAP: corrections for the groups of multiple users

* In case there is several users their groups weren't detected correctly

* Simplify helpers module
2019-06-13 16:47:51 +02:00
Dave
c78b6e2a67 Elasticsearch: Fix empty query request to send properly (#17488)
* ensure that empty Elasticsearch queries are properly set to *.  Fixes issue that appears when passing raw data from variables.

* combine null check and empty check into one
2019-06-13 15:45:31 +02:00
☃ pitr
a2370a379d SinglestatPanel: fix min/max config in singlestat sparklines (#17543) 2019-06-13 15:43:42 +02:00
Sofia Papagiannaki
7b70e7db2d AuthProxy: Optimistic lock pattern for remote cache Set (#17485)
* Implementation of optimistic lock pattern

Try to insert the remote cache key and handle integrity error

* Remove transaction

Integrity error inside a transaction results in deadlock

* Remove check for existing remote cache key

Is no longer needed since integrity constrain violations are handled

* Add check for integrity constrain violation

Do not update the row if the insert statement fails
for other than an integrity constrain violation

* Handle failing inserts because of deadlocks

If the insert statement fails because of a deadlock
try to update the row

* Add utility function for returning SQL error code

Useful for debugging

* Add logging for failing expired cache key deletion

Do not shallow it completely

* Revert "Add utility function for returning SQL error code"

This reverts commit 8e0b82c79633e7d8bc350823cbbab2ac7a58c0a5.

* Better log for failing deletion of expired cache key

* Add some comments

* Remove check for existing cache key

Attempt to insert the key without checking if it's already there
and handle the error situations

* Do not propagate deadlocks created during update

Most probably somebody else is trying to insert/update
the key at the same time so it is safe enough to ignore it
2019-06-13 15:36:09 +02:00
kay delaney
e11edf3fc2 Explore: Includes context parameter when invoking getExploreState() from Prometheus datasource (#17569)
Closes #17457
2019-06-13 14:14:09 +01:00
Hugo Häggmark
c59f308414 Tests: Replaces truth image (#17570) 2019-06-13 14:45:15 +02:00
Hugo Häggmark
fabc6f4241 Fix: Fixes merge conflict (#17568) 2019-06-13 12:46:10 +02:00
Hugo Häggmark
9e9fdb9cf1 Build: Fix failing e2e tests and implicit any check (#17567)
* Tests: Updates truth screen shot

* Fix: Fixes an implicit any error
2019-06-13 12:37:18 +02:00
kay delaney
d612beec25 Explore: Fixes implicit any error in AdHocFilterField.test.tsx (#17565) 2019-06-13 11:28:03 +01:00
Marcus Efraimsson
e1df51109e Fix so that correct cache is provided to di registry (#17566)
This fix prevents Grafana from crashing after being logged in.

Ref #17519
2019-06-13 12:15:52 +02:00
Kyle Brandt
073851f9c7 Build: Upgrades to golang 1.12.6 (#17542) 2019-06-13 11:08:48 +02:00
kay delaney
6170a039e5 Explore: Adds ability to remove filter from <AdHocFilterField /> key dropdown (#17553)
Also adds tests to validate behaviour
Query now reruns when filter is removed
Changes <AdHocFilterField /> such that after a measurement and field have been chosen,
just a '+' button is displayed, rather than an empty <AdHocFilter />

Closes #17544
Closes #17497
2019-06-13 10:00:53 +01:00
Carl Bergquist
6809d2bb29 codestyle: moves cache to infra (#17519) 2019-06-13 10:55:38 +02:00
Zayn-ul-Abdin
df917663e6 Docs feedback: installation/debian.md (#17563)
Closes #17129
2019-06-13 09:52:44 +02:00
Hugo Häggmark
8e1dfd32f9 Chore: Lowered implicit anys limit to 5131 (#17562)
Progress: #14714
2019-06-13 08:12:30 +02:00
Marcus Efraimsson
d168057fc6 Influx: Reset logs query field on clear all and clear row in explore (#17549)
Resets influx logs query field when hitting clear all and clear row 
in explore logs mode.

Fixes #17506
2019-06-12 17:27:13 +02:00
Marcus Efraimsson
f41a6c8962 Devenv: Add telegraf with log parsing to influxdb docker block (#17546) 2019-06-12 15:30:33 +02:00
kay delaney
0a3af385e1 Explore: Runs query when measurement/field and pairs are selected in logs mode for influx (#17523)
* Explore: Runs query when measurement/field and pairs are select in logs mode for influx
Closes #17500

* Explore: Modifies logic determining when to auto-run query during influx logs mode
Also adds test to validate this logic
2019-06-12 14:14:39 +01:00
kay delaney
2a47c315df Influx: Adds start page for logs in Explore (#17521)
* Influx: Adds start page for logs in Explore
Closes #17499

* Influx: Rebased with master and removed conditional display of cheat sheet in explore
Cheat sheet now displays during both Metrics and Logs mode, though this is only
temporary.
2019-06-12 14:01:48 +01:00
Maxim Ivanov
151fe240fc OAuth: Fix for wrong user token updated on OAuth refresh in DS proxy (#17541) 2019-06-12 13:47:38 +02:00
Kyle Brandt
599514ad68 middleware: add security related HTTP(S) response headers (#17522)
* x_xss_protection
  * strict_transport_security (HSTS)
  * x_content_type_options

these are currently defaulted to false (off) until the next minor release.

fixes #17509
2019-06-12 13:15:50 +02:00
Hugo Häggmark
41fb38d522 Docs: Clarifies from which version the Patch VERB is available (#17532)
* Docs: Clarifies from which version the Patch VERB is available

Closes: #17508

* Docs: Removes setting after PR comments
2019-06-12 11:14:30 +02:00
Johannes Schill
3da8cff6e9 Chore: Hugo upgrade (#17494)
* Fix: Upgrade hugo wip

* Chore: Rename index to _index for latest hugo

* Chore: Use relative refs, no starting slash

* Feat: Add possibility to mount layouts from grafana.org project
2019-06-12 08:01:44 +02:00
Mario Trangoni
ab4e1526b3 Codestyle: Fix some goconst issues (#17530)
Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
2019-06-12 07:27:47 +02:00
Hugo Häggmark
39e23ba672 Docs: Adds clarification to the provider name for provisioned dashboards (#17524)
Closes: #17516
2019-06-12 06:36:14 +02:00
☃ pitr
3e64214338 Singlestat: Add y min/max config to singlestat sparklines (#17527)
* Add scaling toggle to Singlestat panel

This toggle allows a user to choose between auto scaling or
zero-based scaling.

* Update Singlestat docs to include Zero Scale option

* Add min/max config to Singlestat sparklines y axis
2019-06-11 21:39:09 +02:00
Marcus Efraimsson
fcd2fb8b04 Explore: Clear queries when switching between metrics and logs (#17505)
This will clear the existing queries when switching between metrics and logs. 

Closes #17496
2019-06-11 16:18:33 +02:00
Shavonn Brown
40f95a95c0 16223 user auth token list and revoke (#17434)
* Start user auth token list on user profile (#16223)

* Now session found and first, better os regex (#16223)

* Revoke for user and admin user token manage (#16223)

* Tidying and styling (#16223)

* Tidying and styling (#16223)

* Update to use #16222 (#16223)

* Update for changes to 16222

* update per api issue
2019-06-11 14:23:54 +02:00
Shavonn Brown
a20309d7d2 Feature: Parse user agent string in user auth token api response (#16… (#17504)
* Feature: Parse user agent string in user auth token api response (#16222)

* Adding UA Parser Go modules attempt (#16222)

* Bring user agent vals up per req

* fix tests

* doc update

* update to flatten, no maps

* update doc
2019-06-11 14:12:52 +02:00
Hugo Häggmark
20f81539b8 Tests: Adds better logging to e2e tests (#17511) 2019-06-11 11:41:11 +02:00
Mario Trangoni
756989c10b Codestyle: Add typecheck and unused linters (#17491)
Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
2019-06-11 09:16:41 +02:00
Alexandre de Verteuil
4121b5da6b Docs: Add CircleCI step trigger-docs-update (#17481)
* Add CircleCI step trigger-docs-update

* Check changes to docs/* in CI/CD job trigger-docs-update
2019-06-10 16:23:23 +02:00
Kyle Brandt
c09fe3c3b4 remote_cache: Fix redis (#17483)
* wip: fix remote cache for redis
connstr parsing and non-negative expires for #17377
TODO: finish parse, check zero case, find out why negative duration in the first place

* finish parse.
Still TODO, find out negative value, and decide if would be better to make database specific entries in the .ini file

* update ini files

* remove accidental uncomment in defaults.ini

* auth_proxy: expiration non-negative so expiration is not in the past

* fix test, revert neg in redis

* review: use errutil
2019-06-10 15:27:08 +02:00
Kyle Brandt
826d33ea37 auth_proxy: non-negative cache TTL (#17495)
fixes setex error with redis on #17377
2019-06-10 15:25:23 +02:00
Hugo Häggmark
591ea0bfe3 Explore: Adds LogQueryField for InfluxDb (#17450)
* Wip: Intial commit

* Wip: Adds intial InfluxLogsQueryField

* Refactor: Adds measurements to InfluxLogQueryField

* Style: Tweaks styles and adds chosen measurement to measurements

* Refactor: Adds remove filter row

* refactor: make influx datasource typed

Uses the new api for exporting the plugin.

* adds metricFindQuery to DataSourceApi

metricFindQuery, getTagKeys and getTagValues now returns a promise

* influx: minor improvements

Limits logs result to 1000.
Don't show adhoc filter until measurement have been selected.

* Refactor: Adds fields to Cascader and uses chosen field as log column

Co-authored-by: Marcus <marcus.efraimsson@gmail.com>
2019-06-10 14:39:53 +02:00
Kyle Brandt
a95c7bfa6f sqlstore: clean quota and user_auth_tokens when removing users (#17487)
fixes #17392
2019-06-10 13:35:47 +02:00
Oleg Kovalov
6a76a92aff Prometheus: Preallocate data for Prometheus backend response parsing (#17490) 2019-06-10 08:12:46 +02:00
Qianli Ma
4ddb860727 Docs: Fix a typo in Elasticsearch docs (#17492) 2019-06-10 07:55:49 +02:00
Carl Bergquist
912df2e284 gtime: some code style refactoring (#17369) 2019-06-10 07:38:31 +02:00
Oleg Gaidarenko
bc7c420ee8 Build: make bra a local dependency (#17414)
Same idea as with the `gosec`, `revive` and etc.
Allows you to execute `make bra` as pinned local dependency instead
as global one. And therefore alleviates dependency installation issues.

README also updated - I was thinking to provide verbose installation instructions
for it. Since with that way we assume make is installed on the
developer system.

But it might be premature right now?
2019-06-07 16:42:08 +03:00
Oleg Gaidarenko
2316414786 Add tests for multildap (#17358)
That should get us to 100% coverage
2019-06-07 15:16:00 +03:00
Dominik Prokop
b17967e001 RefreshPicker: SetInterval comments to rxjs code added (#17404) 2019-06-07 11:54:25 +02:00
Carl Bergquist
1aadb4426a metrics: expose stats about roles as metrics (#17469) 2019-06-06 16:39:35 +02:00
rrFeng
c31b939e10 Explore: Handle newlines in LogRow Highlighter (#17425) 2019-06-06 13:55:04 +02:00
Thibault Chataigner
e06abb30aa Alerting: Add tags to alert rules (#10989)
Ref #6552
2019-06-06 13:29:30 +02:00
Tom McClellan
34f314552d Config: Add comment before log_queries in sample ini file (#17462) 2019-06-06 11:13:27 +02:00
Torkel Ödegaard
ad3f9c6663 CLI: Search perf test data (#17422)
* Search perf testdata cli task

* Test index

* REmoved test index
2019-06-06 10:05:08 +02:00
Patrick Hahn
606825703f Prometheus: Use overridden panel range as $_range instead of dashboard range (#17352)
The range variables get filled with the range from the query options,
not with the range in the timeSrv object. This means that panels that
use a relative time override get the correct values from the __range
variables.

Fixes #17102
2019-06-06 10:03:14 +02:00
Andrej Ocenas
0fa60a8450 Update latest (#17456) 2019-06-05 17:35:04 +02:00
Torkel Ödegaard
ad744beb60 NavModel: Fixed page header ui tabs issues for some admin pages (#17444) 2019-06-05 15:18:31 +02:00
Andrej Ocenas
dd52ff5ac5 Update changelog for 6.2.2 (#17452)
* Update changelog

* Fix whitespace
2019-06-05 15:05:44 +02:00
Torkel Ödegaard
de7856cf93 PluginConfig: Fixed plugin config page navigation when using subpath (#17364) 2019-06-05 13:24:48 +02:00
Jonathan Rockway
02975256d1 Tracing: allow propagation with Zipkin headers (#17009)
Closes #17006
2019-06-05 13:12:05 +02:00
Andrej Ocenas
1c3ad78672 Perf: Fix slow dashboards ACL query (#17427)
Fix slow ACL query for dashboards that was used as subquery on multiple places slowing down search and login in instances with many dashboards.
2019-06-05 10:55:50 +02:00
kay delaney
8a602e86f3 Explore: Fixes crash when parsing date math string with whitespace (#17446)
Fixes: #16257
2019-06-05 09:48:28 +01:00
Utkarsh Bhatnagar
a9da7b5f1f Cloudwatch: Add AWS DocDB metrics (#17241)
Closes #16535
2019-06-05 08:49:48 +02:00
Augustin Husson
c8382ba435 Provisioning: Support folder that doesn't exist yet in dashboard provisioning (#17407)
closes #17320
2019-06-04 22:23:08 +02:00
Mario Trangoni
87760d4fde Codestyle: Fix govet issues (#17178)
ref #10381

Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
2019-06-04 22:00:05 +02:00
Ryan McKinley
574a37e46f @grafana/runtime: expose location update (#17428) 2019-06-04 16:20:55 +02:00
Hugo Häggmark
10a4a89902 Fix: Adds context to list of keys that are not part of query (#17423)
Fixes: #17408
2019-06-04 14:07:25 +02:00
Charlie Briggs
8ef961bba5 Prometheus: Correctly escape '|' literals in interpolated PromQL variables (#16932)
This escape is currently not happening which breaks multi-value queries with
'|' characters in the variable value.

Added tests for 'interpolateQueryExpr' which should possibly be private, but is difficult to
test due to TemplateSrv calling it.

Closes #16840
2019-06-04 13:07:39 +02:00
Marcus Efraimsson
d1ab29c36d Explore: Makes it possible to use a different query field per mode (#17395) 2019-06-04 12:35:16 +02:00
Ryan McKinley
1e76f1a728 DataSourceApi: remove ExploreDataSourceApi (#17424) 2019-06-04 10:30:07 +02:00
Ryan McKinley
4066c55298 Fix: change angular loader paths (#17421) 2019-06-04 09:19:55 +02:00
Oleg Gaidarenko
f43af0e644 Build: specify build flag for docker-compose up (#17411)
Otherwise changed data will not get refreshed to the previous
state.

Which I think is not evident (unless you are familar with docker-compose).
and therefore error-prone (at least it did for me)
2019-06-03 21:09:29 +03:00
Ryan McKinley
96ba32d0c8 Add a @grafana/runtime package with backendSrv interface (#16533)
grafana-runtime/tsconfig.json imports query to avoid a build error  ¯\_(ツ)_/¯
2019-06-03 17:55:59 +02:00
Marcus Efraimsson
b7a9533476 Database: Initialize xorm with an empty schema for postgres (#17357)
xorm introduced some changes in
https://github.com/go-xorm/xorm/pull/824 and
https://github.com/go-xorm/xorm/pull/876 which by default will use
public as the postgres schema and this was a breaking change compared
to before. Grafana has implemented a custom postgres dialect so above
changes wasn't a problem here. However, Grafana's custom database
migration was using xorm dialect to check if the migration table exists
or not.
For those using a custom search_path (schema) in postgres configured on
server, database or user level the migration table check would not find
the migration table since it was looking in public schema due to xorm
changes above. This had the consequence that Grafana's database
migration failed the second time since migration had already run
migrations in another schema.
This change will make xorm use an empty default schema for postgres and
by that mimic the functionality of how it was functioning before
xorm's changes above.
Fixes #16720

Co-Authored-By: Carl Bergquist <carl@grafana.com>
2019-06-03 16:45:03 +02:00
Carl Bergquist
fbf37eb402 docs: configuring custom headers in the dataproxy (#17367)
closes #17348
2019-06-03 15:22:59 +02:00
Hugo Häggmark
fb39831df2 Explore: Queries the datasource once per run query and uses DataStreamObserver (#17263)
* Refactor: Removes replaceUrl from actions

* Refactor: Moves saveState thunk to epic

* Refactor: Moves thunks to epics

* Wip: removes resulttype and queries once

* Refactor: LiveTailing uses observer in query

* Refactor: Creates epics folder for epics and move back actioncreators

* Tests: Adds tests for epics and reducer

* Fix: Checks for undefined as well

* Refactor: Cleans up previous live tailing implementation

* Chore: merge with master

* Fix: Fixes url issuses and prom graph in Panels

* Refactor: Removes supportsStreaming and adds sockets to DataSourcePluginMeta instead

* Refactor: Changes the way we create TimeSeries

* Refactor: Renames sockets to streaming

* Refactor: Changes the way Explore does incremental updates

* Refactor: Removes unused method

* Refactor: Adds back Loading indication
2019-06-03 14:54:32 +02:00
Hugo Häggmark
5761179ad9 Feature: Adds redux action logging toggle from url params (#17368)
With live tailing introduced in Explore we now have a lot of actions dispatching and the Redux Dev Tools doesn't cope with the amount and rate of actions and crashes. This PR turns on redux action logging when you add logActions=true in the url and turns it off if you refresh the page or add logActions=false in the url.
2019-06-03 13:40:33 +02:00
Hugo Häggmark
20229a40eb Build: Adds e2e tests back to master workflow with better error messages and with artifacts (#17374)
* Refactor: Adds better error message and removes chromium download progess

* Test: Adds e2e tests to pr builds for testing purpose

* Tests: Changes path to screenshots

* Tests: Adds failing test just to test message and artifacts

* Tests: Removes failing test
2019-06-03 13:39:36 +02:00
Marcus Efraimsson
4fe6eaa0f7 Explore: Handle datasources with long names better in ds picker (#17393) 2019-06-03 11:41:41 +02:00
Dieter Plaetinck
95012271ac Annotations: Improve annotation option tooltips (#17384)
* should be 'Tags' not 'All'
* fix poor wording in 'Match any' tooltip
* add tooltip for 'Tags' input (untested! and can probably be worded
  better, i just don't know enough about the implementation)
2019-06-03 11:32:35 +02:00
Matthias Steffen
936308366e InfluxDB: Fixes single quotes are not escaped (#17398)
Fixes #17397
2019-06-03 11:25:46 +02:00
Johannes Schill
76e5657b47 Chore: Bump axios to 0.19.0 (#17403) 2019-06-03 11:22:54 +02:00
Carl Bergquist
d8736a2547 Alerting: golint fixes for alerting (#17246) 2019-06-03 10:25:58 +02:00
Alexander Zobnin
60ddad8fdb Batch disable users (#17254)
* batch disable users

* batch revoke users tokens

* split batch disable user and revoke token

* fix tests for batch disable users

* Chore: add BatchDisableUsers() to the bus
2019-05-31 13:22:22 +03:00
Marcus Efraimsson
1497f3d79a Chore: Remove unused properties in explore (#17359)
This removes unused properties in explore and datasource 
meta data (tables and explore properties in plugin.json).
2019-05-31 09:45:53 +02:00
Bernard Duggan
a0bb01103e MySQL/Postgres/MSSQL: Add parsing for day, weeks and year intervals in macros (#13086)
closes #11431
2019-05-30 09:58:29 +02:00
Dan Cech
5e7537878e Security: Prevent csv formula injection attack (#17363)
* mitigate https://www.owasp.org/index.php/CSV_Injection

- prepend csv cell values that begin with -, +, = or @ with '
- trim trailing whitespace from all csv values

* test for csv formula injection mitigation
2019-05-30 07:07:19 +02:00
Oleg Gaidarenko
a3092dc57b LDAP: remove unused function (#17351) 2019-05-29 16:12:42 +03:00
Oleg Gaidarenko
d4ef19737e Enterprise: remove gofakeit dep (#17344)
* Enterprise: remove gofakeit dep

Since we decided to use our uuid generation inside util module

* Enterprise: result of execution of `go mod ...`
2019-05-29 15:55:51 +03:00
Marcus Efraimsson
e951e71843 Explore: Update time range before running queries (#17349)
This makes sure that refresh/update/run query are parsing a
relative time range to get proper epoch time range before
running queries.

Fixes #17322
2019-05-29 13:47:05 +02:00
Oleg Gaidarenko
0a92de623d Build(package.json): improve npm commands (#17022)
Remove some of the repetitions in the npm commands
2019-05-29 11:54:07 +03:00
Carl Bergquist
fd741cbea4 Chore: upgrade webpack analyser (#17340)
* webpack: upgrade webpack analyser
* yarn.lock update
2019-05-29 10:27:57 +02:00
Torkel Ödegaard
afbdfe7cb4 NewDataSourcePage: Add Grafana Cloud link (#17324)
* NewDataSource: adding initial grafana cloud link

* Minor update

* Updated
2019-05-29 09:37:29 +02:00
Joshua Piccari
5fa5d4bdd5 CloudWatch: Avoid exception while accessing results (#17283)
When accessing the `series` property of query results, if a query is
hidden, an exception is thrown. This is caused by lack of checks to
verify that the query result exists before accessing the `series`
property.

Closes #17112
2019-05-29 09:10:09 +02:00
Oleg Gaidarenko
a1a498f96c Build: ignore absence of docker-compose (#17331)
If devenv/docker-compose.yaml file is missing, `devenv-down`
and subsequently `devenv` is not going to work
2019-05-28 20:08:27 +03:00
Oleg Gaidarenko
9ff44b5037 Build(makefile): improve error handling (#17281)
* Build(makefile): improve error handling

Ref baa55ab6ae
2019-05-28 19:32:14 +03:00
Marcus Efraimsson
1e508d7288 adds auth example for the cli cherrypick task (#17307) 2019-05-28 16:34:28 +02:00
Carl Bergquist
2dc660d533 docs: remove my email from docs examples (#17325)
I dont want emails from companies who test
alert notifiers :)
2019-05-28 16:02:14 +02:00
Shavonn Brown
27874a1881 16365 change clashing variable names (#17140)
* Fix: change  and  to  and  so not clashing with grafana vars (#16365)

* Fix: change  and  to  and  so not clashing with grafana vars (#16365)

* Fix: update now to datetime (#16365)

* Fix: test should look for datetime instead of now (#16365)

* Fix: _az suffix to datasource convention (#16365)

* Fix: convert vars to macro, update doc (#16365)

* Fix: convert vars to macro, update doc (#16365)

* Fix: remove support for time vars (#16365)

* Fix: confilct from master

* add migration on editor open

* fix migration var name
2019-05-28 15:04:42 +02:00
Ryan McKinley
382ebd6362 Frontend/SeriesData: Fix for convert SeriesData to Table format (#17314) 2019-05-28 10:18:09 +02:00
Šimon Podlipský
4b0ad174ff Frontend/utils: Import has only from lodash (#17311) 2019-05-28 10:17:03 +02:00
Šimon Podlipský
83af1bdff3 Frontend/utils: Add missing type (#17312) 2019-05-28 10:13:49 +02:00
Marcus Efraimsson
83187fd8ea update v6.2-beta1 changelog with missing pr (#17308) 2019-05-28 09:06:30 +02:00
Marcus Efraimsson
a07296bf24 explore: don't parse log levels if provided by field or label (#17180)
If a field or a label named level is returned from datasource that is 
used as log level for the logs result instead of parsing the log level 
from the message.

Closes #17122
2019-05-27 18:43:04 +02:00
Abhilash Gnan
04d473b3e5 HTTP Server: Serve Grafana with a custom URL path prefix (#17048)
Adds a new [server] setting `serve_from_sub_path`. By enabling 
this setting and using a subpath in `root_url` setting, e.g.
`root_url = http://localhost:3000/grafana`, Grafana will be accessible 
on `http://localhost:3000/grafana`. By default it is set to `false` 
for compatibility reasons.

Closes #16623
2019-05-27 17:47:29 +02:00
Marcus Efraimsson
b547a0cb34 update latest.json to latest stable version (#17306) 2019-05-27 16:15:25 +02:00
Marcus Efraimsson
0b3768e551 release: v6.2.1 changelog update (#17303) 2019-05-27 14:59:42 +02:00
Hugo Häggmark
4965e10db1 Build: Removes e2e-tests from Grafana master workflow (#17301) 2019-05-27 13:16:33 +02:00
Oleg Gaidarenko
2146f837cf Build(devenv): correct the context issue (#17291)
With the previous configuration `docker-compose build` was always failing.
This moves the dockerfiles in the parent dir and changes paths as a result.

Ref moby/moby#2745
2019-05-27 14:05:32 +03:00
Hugo Häggmark
db32c7dcf5 Build: Enables end-to-end tests in build-master workflow (#17268)
* Fix: Adds back necessary aria-labels for e2e tests

* Build: Adds end-to-end-tests job to build-master workflow

* Build: Changes grafana image used
2019-05-27 12:22:43 +02:00
Torkel Ödegaard
5358c5fe6b Gauge/BarGauge: font size improvements (#17292) 2019-05-27 12:13:08 +02:00
Torkel Ödegaard
3dda812f12 Chore: Update jquery to 3.4.1 in grafana ui (#17295) 2019-05-27 11:48:17 +02:00
Andrej Ocenas
151b24b95f CLI: Add command to migrate all datasources to use encrypted password fields (#17118)
closes: #17107
2019-05-27 10:47:21 +02:00
Marcus Efraimsson
b9181df212 Auth Proxy: Log any error in middleware (#17275)
Fixes so that errors happening in auth proxy middleware is logged.

Ref #17247
2019-05-27 10:38:17 +02:00
Marcus Efraimsson
1a2841e244 devenv: metricbeat and kibana for elasticsearch 7 block (#17262) 2019-05-27 09:55:58 +02:00
Oleg Gaidarenko
de92c360a1 LDAP: reduce API and allow its extension (#17209)
* Removes Add/Remove methods

* Publicise necessary fields and methods so we could extend it

* Publicise mock API

* More comments and additional simplifications

* Sync with master

Still having low coverage :/ - should be addressed in #17208
2019-05-27 10:36:49 +03:00
Marcus Efraimsson
5884e235fc database: retry transaction if sqlite returns database is locked error (#17276)
Adds an additional sqlite error code 5 (SQLITE_BUSY) to the
transaction retry handler to add retries when sqlite
returns database is locked error.
More info: https://www.sqlite.org/rescode.html#busy

Ref #17247 #16638
2019-05-27 09:24:15 +02:00
Tim Butler
df6a4914c4 Tech: Update jQuery to 3.4.1 (#17290)
Fixes #17289

Special notes for your reviewer:
Updates jQuery to 3.4.1 (from 3.4.0) to fix the jQuery bug: https://blog.jquery.com/2019/05/01/jquery-3-4-1-triggering-focus-events-in-ie-and-finding-root-elements-in-ios-10/
2019-05-27 07:11:30 +02:00
olcbean
07d37b4a92 fix typo in basic_concepts.md (#17285) 2019-05-25 20:41:25 +02:00
Oleg Gaidarenko
baa55ab6ae Feature: do dev environment via makefile (#17136)
Simplifies dev environment creation. I also planing to utilize
this logic for the LDAP benchmarking
2019-05-25 04:38:01 +03:00
Marcus Efraimsson
bc3a718107 devenv: adds auth proxy load test (#17271) 2019-05-24 17:51:10 +02:00
Ryan McKinley
2a52dbfb74 Table: various minor fixes (alpha panel) (#17258) 2019-05-24 08:49:17 -07:00
Torkel Ödegaard
6acc7d37da Singlestat: fixes issue with value placement and line wraps (#17249)
Fixes #17237
2019-05-24 08:52:47 +02:00
Dominik Prokop
a7aaed49b5 Devenv: Update Graphite port in dev datasources (#17255) 2019-05-24 08:09:51 +02:00
Ryan McKinley
b0ea3a8c88 Chore: bump grafana-ui version (#17256) 2019-05-23 11:03:10 -07:00
Torkel Ödegaard
0d6c9d371f Release: Updated latest.json 2019-05-23 19:56:16 +02:00
Alexander Zobnin
a3a7916597 Auth: Logout disabled user (#17166)
* Feature: revoke user token when disabled

* Chore: fix linter error
2019-05-23 15:54:47 +03:00
Carl Bergquist
c87b2c9913 docs: fixes typo in provisioning docs (#17248)
closes #17196
2019-05-23 13:06:34 +02:00
Utkarsh Bhatnagar
8e434ad163 CloudWatch: Made region visible for AWS Cloudwatch Expressions (#17243)
Fixes #14933
2019-05-23 12:02:19 +02:00
Filip Barl
a04bf0cded Panel: Pass transparency prop down to React panels. (#17235) 2019-05-23 11:58:50 +02:00
Brian Gann
972df40af8 Build: Fix filter for building msi during release (#17236) 2019-05-23 11:56:34 +02:00
Ryan McKinley
9e7fa74682 DataSourcePlugin: Avoid anuglar injector if only one parameter (#17239) 2019-05-23 11:56:00 +02:00
Abhilash Gnan
ca6151e23f Alerting: Support for configuring content field for Discord alert notifier (#17017) 2019-05-23 08:31:02 +02:00
Dominik Prokop
a9c94ec93b Explore: Update the way Loki retrieve log context (#17204)
* Move log's typings into grafana/ui
* Update the way context is retrieved for Loki

Major changes:

1. getLogRowContext expects row to be of LogRowModel type
2. getLogRowContext accepts generic options object, specific to a datasource of interest. limit option has been removed, and now it's a part of Loki's context query options (see below)
3. LogRowContextProvider performs two queries now. Before, it was Loki ds that performed queries in both directions when getLogRowContext.
4. Loki's getLogRowContext accepts options object of a type:

interface LokiContextQueryOptions {
    direction?: 'BACKWARD' | 'FORWARD';
    limit?: number;
}

This will enable querying in either direction independently and also slightly simplifies the way query errors are handled.

LogRowContextProvider maps the results to a Loki specific context types, basically string[][], as raw log lines are displayed in first version.
2019-05-22 23:10:05 +02:00
bendem
8749574975 Docs: Fix grammar in docs (#17233)
Use of singular and added an article for consistency with other titles.
2019-05-22 17:54:08 +02:00
Oleg Gaidarenko
9b7f9dd9be LDAP: consistently name the LDAP entities (#17203) 2019-05-22 15:30:03 +03:00
Filip Barl
87688930a2 Panels: Show Drilldown links in top-left corner of custom React panels (#17142) 2019-05-22 14:21:43 +02:00
Dominik Prokop
e9130210cc Build: Fix final prompt for @grafana/ui npm publish confirmation
Fixes issue of the final confirmation prompt (the one to confirm the actual npm publish) being invisible, making it impossible to release by anyone but me.

Also, before the release is created I'm assuring previous release bundle is remove (otherwise tests and checks would fail)
2019-05-22 14:10:13 +02:00
Torkel Ödegaard
c31aaa1a25 Docs: Updated versions selector 2019-05-22 13:55:20 +02:00
Oleg Gaidarenko
23a941e880 Docs: Example for multiple LDAP servers (#17216)
Fixes #16898
2019-05-22 13:53:33 +02:00
Torkel Ödegaard
7df4d635e3 Release: Updated changelog 2019-05-22 13:44:45 +02:00
Torkel Ödegaard
350190e669 Release: updated changelog with v6.2 entries (#17201)
* Release: updated changelog with v6.2 entries

* Release: Updated changelog
2019-05-22 13:40:37 +02:00
Torkel Ödegaard
e421723992 Search: removed old not working search shortcuts (#17226) 2019-05-22 12:23:30 +02:00
Daniel Lee
577beebcca azuremonitor: revert to clearing chained dropdowns (#17212)
* azuremonitor: revert to clearing chained dropdowns

After feedback from users, changing back to clearing
dropdowns to the right in the chain. E.g. if the user
changes the subscription dropdown which is first in
the chain then all the dependent dropdowns to the right
should be cleared (reset to default values).

Also, now triggers getting subscriptions every time the
dropdown menu is shown rather than just the first time.
It is apparently common to add subscriptions while
building queries.
2019-05-22 11:34:54 +02:00
Torkel Ödegaard
a96b522a42 Search: changed how search filter on current folder works (#17219) 2019-05-22 11:28:11 +02:00
Daniel Lee
cd9517c58b AzureMonitor: docs for multiple subscriptions (#17194)
* AzureMonitor: docs for multiple subscriptions

Also, links to images in Grafana.org instead of the images
in the plugin GitHub repo.

* Update docs/sources/features/datasources/azuremonitor.md

Co-Authored-By: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* Update docs/sources/features/datasources/azuremonitor.md

Co-Authored-By: Marcus Efraimsson <marcus.efraimsson@gmail.com>

* docs: fix auto format errors

VS code automatically escapes the dollar sign.
2019-05-22 11:22:55 +02:00
CodeLingo Bot
3ff3e0f2ac Defer closing of files (#17213)
Signed-off-by: CodeLingo Bot <bot@codelingo.io>
2019-05-22 08:48:47 +02:00
Dominik Prokop
9cdf0f4f9c Docs: Add guidelines for PR/commit messages (#17190) 2019-05-21 13:58:14 +02:00
Alexander Zobnin
2d03815770 Users: Disable users removed from LDAP (#16820)
* Users: add is_disabled column

* Users: disable users removed from LDAP

* Auth: return ErrInvalidCredentials for failed LDAP auth

* User: return isDisabled flag in user search api

* User: mark disabled users at the server admin page

* Chore: refactor according to review

* Auth: prevent disabled user from login

* Auth: re-enable user when it found in ldap

* User: add api endpoint for disabling user

* User: use separate endpoints to disable/enable user

* User: disallow disabling external users

* User: able do disable users from admin UI

* Chore: refactor based on review

* Chore: use more clear error check when disabling user

* Fix login tests

* Tests for disabling user during the LDAP login

* Tests for disable user API

* Tests for login with disabled user

* Remove disable user UI stub

* Sync with latest LDAP refactoring
2019-05-21 14:52:49 +03:00
Marcus Efraimsson
8d1909c56d docs: what's new in v6.2 fixes (#17193) 2019-05-21 13:50:57 +02:00
Ryan McKinley
1033f0f905 DataSourceMeta: add an option to get hidden queries (#17124)
* add an option to get hidden queries

* make sure you have meta

* supportsHiddenQueries

* remove spaces

* DataSources: hidden queries flag
2019-05-21 13:46:19 +02:00
Dominik Prokop
73e4178aef Panel: Apply option defaults on panel init and on save model retrieval (#17174)
* Apply panel options defaults on panel init and on save model retrieval

* Remove unnecessary argument, added tests

* Make FieldPropertiesEditor statefull to enable onBlur changes

* Remove unnecessary import

* Post-review updates

Fixes #17154
2019-05-21 13:19:19 +02:00
Torkel Ödegaard
874039992f BarGauge: Fix for negative min values (#17192) 2019-05-21 13:10:23 +02:00
Daniel Lee
fa9ffe38d2 Azuremonitor: multiple subscription support for alerting (#17195)
* fix: azuremonitor adds multi-sub support to alerting

* fix: AzureMonitor missing parameter in metadata func

getMetricMetadata function when called in the query ctrl
was missing a parameter for Subscription Id.

Also, made some tweaks to what happens when a chained
dropdown is changed to not reset all the fields that
are dependent on it.
2019-05-21 12:28:30 +02:00
Ryan McKinley
744682e648 AppPlugin: add types for jsonData (#17177)
* add types for App jsonData

* add types for App jsonData

* add value as possible type

* make it extend {}
2019-05-21 10:39:29 +02:00
Brian Gann
f98095d629 MSI: Generate sha256sum during MSI build process in circleci (#17120)
* build: generate sha256 during msi build
2019-05-21 09:58:07 +02:00
Marcus Efraimsson
5414a31101 explore: fix null checks (#17191) 2019-05-21 09:37:31 +02:00
Hugo Häggmark
3b35e9d5e8 Fix: Fixes so new data is pushed during live tailing (#17189)
Fixes: #17188
2019-05-21 09:34:41 +02:00
Marcus Efraimsson
3b008d06b4 testdata: logs scenario (#17182)
Adds logs scenario which is quite basic and not that smart 
to begin with. This will hopefully ease development of 
Explore and support for logs in Grafana.
2019-05-21 09:21:59 +02:00
Marcus Efraimsson
c82df97bb2 testdata: scenarios returned are now sorted in a consistent way (#17181)
This makes sure the scenarios returned from API are sorted in a consistent
way and by that makes the values in scenario drop down always presented
ordered instead of jumping around.
2019-05-21 09:20:57 +02:00
Shavonn Brown
b695dcd0eb TablePanel: Check for table using keys (#17185)
* Fix: the type is not set so can check for columns and rows to validate is table (#16996)

* Fix: the type is not set so can check for columns and rows to validate is table (#16996)

* Fix: fix no table check and tests (#16996)
2019-05-21 08:56:34 +02:00
Mario Trangoni
66ba2aa524 Fix gosimple issues (#17179)
Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com>
2019-05-21 07:50:44 +02:00
Ryan McKinley
7e3ac4ebde AppPlugin: add an init function (#17150) 2019-05-20 13:05:23 -07:00
Hugo Häggmark
458bb3b0e3 Fix: Changes WebSocket protocol to wss:// for https (#17173) 2019-05-20 15:24:48 +02:00
Carl Bergquist
bfa7c3d963 alerting: golint fixes for alert notifiers. (#17167) 2019-05-20 15:23:06 +02:00
Oleg Gaidarenko
a0f5923b95 LDAP: add tests for initialBind (#17132)
* LDAP: add tests for initialBind

* LDAP: clarify comment for Login()
2019-05-20 15:57:52 +03:00
Hugo Häggmark
db48ec1f08 Explore: Adds Live option for supported datasources (#17062)
* Wip: Initial commit

* Refactor: Adds support in Loki datasource for streaming

* Refactor: Adds Live option to RefreshInterval

* Refactor: Adds styles to logrows

* Style: Reverses the order of Explore layout on Live

* Refactor: Adds LiveLogs component

* Tests: Adds tests for epics

* Style: Adds animation to Live in RefreshPicker

* Refactor: Adds ElapsedTime and progress line to LiveLogs

* Style: Adds specific colors to each theme

* Refactor: Adds support for Lokis new API

* Fix: Adds null to resulting empty array

* Refactor: Limits the rate of incoming messages from websockets

* Refactor: Throttles messages instead for simplicity

* Refactor: Optimizes row processing performance

* Refactor: Adds stop live button

* Fix: Fixes so that RefreshPicker shows the correct value when called programmatically

* Refactor: Merges with master and removes a console.log

* Refactor: Sorts rows in correct order and fixes minor UI issues

* Refactor: Adds minor improvments to sorting and container size
2019-05-20 13:28:23 +02:00
Carl Bergquist
bd5bcea5d0 alerting: fix a bunch of lint issues. (#17128) 2019-05-20 12:13:32 +02:00
Marcus Efraimsson
a564a54b13 chore: mocks plugin loader for DataSourceSettingsPage tests (#17157)
Properly mocks the plugin loader in DataSourceSettingsPage tests 
and by that removes console logs.
2019-05-20 11:41:22 +02:00
Torkel Ödegaard
058f5a1682 Release: Improved cherry pick task (#17087)
* Release: Improved cherry pick task

* Minor tweak to formatting
2019-05-20 11:18:56 +02:00
Marcus Efraimsson
0e210dc271 Explore: Fix selection/copy of log lines (#17121)
This adds some logic to identify if the user is selecting 
text and if so disables parsing of log messages on hover. 
This should resolve the issue of selecting log lines to be 
copied and the selection is truncated.

Fixes #17072
2019-05-20 09:51:57 +02:00
Marcus Efraimsson
2b32e768bd Explore: Fix empty space in toolbar on smaller devices (#17110)
Removes the empty space in Explore toolbar when on mobile/tablet.

Co-Authored-By: Hugo Häggmark <hugo.haggmark@gmail.com>
2019-05-20 09:38:41 +02:00
Dominik Prokop
12e0616413 Explore: display log line context (#17097)
* Extend DataSourceAPI to enable log row context retrieval

* Add react-use package

* Display log row context in UI

* Make Loki datasource return "after" log context in correct order

* Don't show Load more context links  when there are no more new results

* Update getLogRowContext to return DataQueryResponse

* Use DataQueryResponse in log row context provider, filter out original row  being duplicated in context
2019-05-20 08:44:37 +02:00
Ryan McKinley
ae1df1cf89 Plugins: expose rxjs matching 6.4.0 (#17148)
* expose rxjs

* remove super old observable export
2019-05-18 08:31:25 -07:00
Ryan McKinley
0d34dfc775 Chore: fix codespell issue with build (#17144) 2019-05-17 13:14:01 -07:00
Oleg Gaidarenko
35f227de11 Feature: LDAP refactoring (#16950)
* incapsulates multipleldap logic under one module

* abstracts users upsert and get logic

* changes some of the text error messages and import sort sequence

* heavily refactors the LDAP module – LDAP module now only deals with LDAP related behaviour

* integrates affected auth_proxy module and their tests

* refactoring of the auth_proxy logic
2019-05-17 14:57:26 +03:00
Marcus Efraimsson
1a80885180 explore: fix issues when loading and both graph/table are collapsed (#17113)
Removes the functionality of being able to collapse/expand the logs 
container.
When both graph and table are collapsed and you reload the page 
then the start page should not be displayed.
When both graph and table are collapsed and you reload the page 
then the graph and table panels should be displayed.
Fix so that reducer tests are run. On of the test used fit() instead of 
it() which had the consequence of only 1 reducer test was executed 
and the rest skipped. There was some failing tests that now is 
updated and now passes.

Fixes #17098
2019-05-17 12:45:11 +02:00
Marcus Efraimsson
32cdab4cbf explore: make sure datasource is added to target (#17116)
Fixes a regression introduced in #16959 which removed datasource 
property from changed query for angular query editors having the 
result of loading explore URL's without datasource loaded the 
default query in query editor and Explore.

Ref #16808
2019-05-17 10:11:55 +02:00
Oleg Gaidarenko
756da8a134 Fix: tighten revive exit code & make it happy (#17127)
* Revive should fail the build

* Fix the associated errors
2019-05-17 08:35:37 +03:00
Shavonn Brown
0a9863a8b4 GraphPanel: Don't sort series when legend table & sort column is not visible (#17095)
* Fix: if current sort key is not active column, do not use for sort and select next available active (#16980)

* Fix: only sort if sortkey is active column and table is active (#16980)

* Fix: sorting stacked series as legend. current descending order test (#16980)

* Fix: existing sort tests and added additional to prevent bug from resurfacing (#16980)
2019-05-16 21:16:05 +02:00
Dominik Prokop
9bf577d125 Chore: Update grafana-ui version to 6.2.0-alpha.0 (#17109) 2019-05-16 16:39:50 +02:00
Tom Petr
73e405978b add support for periodically reloading mysql client certs (#14892) 2019-05-16 13:45:22 +02:00
Andrej Ocenas
3dbc3251d1 Chore: Deduplicate sqlstore transaction code (#17069)
* Deduplicate transaction code

* More deduplication
2019-05-16 12:39:59 +02:00
Carl Bergquist
2904e2d9fe Alertmanager: Replace illegal chars with underscore in label names (#17002)
closes #16624
2019-05-16 11:41:57 +02:00
Jannik F
8196642f25 Adjusted documentation for gcs to reflect the code (#16947)
The key name for the bucket in GCS configuration is called bucket, not bucket name or bucket_name.
2019-05-16 11:11:08 +02:00
Johannes Schill
b11eeadbd9 fix: Initial url update in Explore should replace existing url history #17030 (#17061) 2019-05-16 11:02:21 +02:00
Marcus Efraimsson
e6001f57a2 Explore: Allow switching between metrics and logs (#16959)
Adds basic support for switching between Metrics and Logs in Explore. 
Currently only test datasource that supports both Metrics and Logs.
Summary of changes:
* Moves mode (Metric, Logs) selection to the left of datasource 
picker and add some quick styling.
* Only trigger change in ToggleButton if not selected
* Set correct mode if datasource only supports logs

Closes #16808
2019-05-16 09:52:22 +02:00
Oleg Gaidarenko
be66ed9dab Chore: explore possibilities of using makefile (#17039)
* Chore: explore possibilities of using makefile

This is an exploratory commit - I wanted to see how
revive/gosec linters could be integrated with makefile and our build scripts.

Looks better then I expected :)

* Chore: make revive happy

Revive execution was not supplied with path, if you restore there is couple
errors that were popping up - so I fixed them

* Chore: make revive happy
2019-05-16 00:29:26 +03:00
Johannes Schill
8483a8366f Chore: Bump jest to 24.8.0 (#17094) 2019-05-15 14:41:31 +02:00
Johannes Schill
f30e5cce59 Chore: Bump ts-node to 8.1.0 (#17093) 2019-05-15 14:40:53 +02:00
Torkel Ödegaard
b8e67a2a4c Release: Updated changelog 2019-05-15 13:54:36 +02:00
Carl Bergquist
c55e6016bf backend: replace /pkg/errors with errutil (#17065) 2019-05-15 12:20:17 +02:00
Hugo Häggmark
fdd421e24c Explore: Fixes filtering in Prometheus queries when clicking in Table (#17083)
Fixes: #17071
2019-05-15 11:43:27 +02:00
Carl Bergquist
aed3d0d3ad Remotecache: Avoid race condition in Set causing error on insert. (#17082)
* remotecache: avoid race condition in set

since set called the database twice without transactions another
operation could insert a value before the first operation completed.
which would raise an error on insert since the data have been inserted
by the other request.

closes #17079
2019-05-15 11:24:04 +02:00
Brian Gann
d0ea98f6bd Build: Support publishing MSI to grafana.com (#17073)
* add test for msi, and support for publishing msi
* update arch and os in test
* Build: Fixed issues with os naming
2019-05-15 10:58:25 +02:00
Ryan McKinley
d8280b895d InputDataSource: better empty value support (#17075) 2019-05-15 07:20:27 +02:00
Torkel Ödegaard
238a929262 Panels: Fixed alert icon position in panel header (#17070) 2019-05-14 18:47:35 +02:00
Ryan McKinley
a0b6ef4d01 GraphPanel: use SeriesData directly (skip legacy transformation) (#17037)
* support streaming in angular panels

* keep the same dashboard number

* skip the legacy data conversion

* fix tests
2019-05-14 18:43:26 +02:00
Ryan McKinley
7333f7ca17 Streaming: support streaming in MetricsPanelCtrl (#17034)
* support streaming in angular panels

* keep the same dashboard number
2019-05-14 17:47:41 +02:00
Torkel Ödegaard
68ad93f410 Gauge: Fix switching orientation issue when switching from BarGauge to Gauge (#17064) 2019-05-14 16:33:47 +02:00
Carl Bergquist
3df94c6f27 serverlock: run tests async should be more linear time wise (#17059) 2019-05-14 15:38:18 +02:00
Torkel Ödegaard
6c7224c74d InfoPopover: Fixes transclude undefined error (#17063) 2019-05-14 15:28:09 +02:00
Torkel Ödegaard
74a31bd9b4 Dashboard: Fixes lazy loading & expanding collapsed rows on mobile (#17055)
* Dashboard: Fixes lazy loading & expanding collapsing rows on mobile

Fixes #16978

* Updated dashboard tags
2019-05-14 14:41:24 +02:00
Daniel Lee
4bc1a66fe4 fix: Azure Monitor adds missing closing div tag to query editor (#17057) 2019-05-14 14:27:47 +02:00
Andrej Ocenas
fd10aa902d Chore: Use executable dir instead of pwd in CLI for isDev check (#16974)
* Use executable dir for the dev check

* Handle executable in bin and platform dirs

* Remove commented code

* Rename variable
2019-05-14 14:13:41 +02:00
Johannes Schill
ceb21bd653 Search: Set element height to 100% to avoid Chrome 74's overflow (#17054)
Fixes #16981
2019-05-14 11:08:36 +02:00
Carl Bergquist
51c99fc68d Docs: adds note about removing session storage (#17003)
closes #17000
2019-05-14 10:30:05 +02:00
Oleg Gaidarenko
79ac3fd699 Chore: remove use of == false (#17036)
Interestingly enough, golint or revive doesn't not prohibit
the use that construction :)

Ref #17035
2019-05-14 10:18:28 +03:00
Dominik Prokop
34f9b3ff2b Explore: use @grafana/ui legend (#17027) 2019-05-14 08:46:35 +02:00
Carl Bergquist
13f137a17d tech: avoid alias for importing models in alerting (#17041)
ref #14679
2019-05-14 08:15:05 +02:00
Ryan McKinley
a87a763d83 DataSourcePlugin: support custom tabs (#16859)
* use ConfigEditor

* add tabs

* add tabs

* set the nav in state

* remove actions

* reorder imports

* catch plugin loading errors

* better text

* keep props

* fix typo

* update snapshot

* rename tab to page

* add missing pages
2019-05-14 07:55:49 +02:00
Johannes Schill
1001cd7ac3 Dashboard: Fixes scrolling issues for Edge browser (#17033)
* Fix: Only set scrollTop on CustomScroll element when it's needed and move arrow functions out of the props

* Fix: Update snapshots

* Minor refactoring to reuse same functions when rendering custom scrollbar

Fixes #16796
2019-05-14 07:36:19 +02:00
Ryan McKinley
bbb1427f46 SeriesData: remove color from Field (#17044) 2019-05-14 07:26:55 +02:00
Marcus Efraimsson
01a7c1f098 chore: remove x character in explore 2019-05-13 16:33:27 +02:00
Torkel Ödegaard
3ce2f3b58d Dashboard: show refresh button in kiosk mode (#17032)
Fixes #16945
2019-05-13 15:49:54 +02:00
Torkel Ödegaard
719c1c277f Devenv: Updated gauge test dashboard 2019-05-13 14:09:25 +02:00
Oleg Gaidarenko
29ad72f048 Chore: reintroduce gosec (#17021)
It seems gosec memory issue was recently fixed.
We should be good to go again

Ref securego/gosec#307
2019-05-13 14:56:36 +03:00
Torkel Ödegaard
597c380ead Gauge: tweaks to background color and height usage (#17019) 2019-05-13 13:18:14 +02:00
Oleg Gaidarenko
db95414d02 Feature: provide multildap server configuration (#16914)
* Feature: provide multildap server configuration

* Add multildap server configuration for devenv

* Change some of the notes for openldap devenv configuration

* Change the maintainer label for *main* dockerfile and of the devenv one

Re-checked the multildap logic - everything seems to be working fine
2019-05-13 11:51:16 +03:00
David
927e1cbd27 (feat/explore): Support for new LogQL filtering syntax (#16674)
* (feat/explore): Support for new LogQL filtering syntax

Loki is adding syntax to support chained filtering.
This PR adapts Grafana to support this.

- Send only `query` parameter in loki request
- Automatically wrap search text in simple syntax, e.g., `{} foo` is
sent as `{} |~ "foo"`.


* Adapted to regexp parameter staying on in Loki

* Dont wrap single regexp in new filter syntax

* Fix datasource test

* Fallback regexp parameter for legacy queries

* Fix search highlighting

* Make highlighting work for filter chains

* Fix datasource test
2019-05-13 09:58:26 +02:00
David
bf5b60f74a fix(explore): Prevent double querying for Prometheus and Loki (#17004)
* fix(explore): Prevent double querying for Prometheus and Loki

- queries were triggered twice because two Enter handlers existed
- removed runner plugin from Loki and Prom query fields (runner plugin
is still being used in azure)

Part of #16995

* Set loki's mtrics capability to false

Loki is not a metrics store. Explore was using the `metrics` field in
the plugin definition to issue a second query run. But Loki shows only
one result viewer.

Fixes #16995
2019-05-13 09:55:20 +02:00
Torkel Ödegaard
e0b760e08e Chore: No implict any fixes (#17020) 2019-05-13 09:38:19 +02:00
zhulongcheng
2fff8f77dc move log package to /infra (#17023)
ref #14679

Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
2019-05-13 08:45:54 +02:00
Hugo Häggmark
0efb8821f9 Chore: Lowered implicit anys limit to 5386
Progress: #14714
2019-05-13 07:47:07 +02:00
Torkel Ödegaard
ce38de4ad7 Chore: Updated snapshot 2019-05-12 20:18:58 +02:00
Torkel Ödegaard
aa400d54e1 Select: Fixed isOpen issue 2019-05-12 20:03:44 +02:00
Torkel Ödegaard
f12d47ef52 Chore: Typescript no-implicit any fixes progress (#17018)
* Chore: Typescript no-implicit any fixes progress

* Fixed tests

* Updated snapshot
2019-05-12 14:15:23 +02:00
Ryan McKinley
813e3ffc15 GraphPanel: show results for all SeriesData (#16966)
* Graph panel should support SeriesData

* Graph panel should support SeriesData

* same path for all series

* merge master

* support docs

* add test for processor

* Graph: removed old unused data processing logic

* Graph: minor refactoring data processing

* fix histogram

* set Count as title
2019-05-11 07:41:32 +02:00
Andrej Ocenas
cf39a264ca Fix: Wrap value of multi variable in array when coming from URL (#16992)
*  Wrap variable value in array if multi

* Fix typo

* Fix case with multiple custom values
2019-05-10 22:19:46 +02:00
Ryan McKinley
37011dd8f3 GettingStarted: add key and remove ng-class (#17007) 2019-05-10 11:48:27 -07:00
Marcus Efraimsson
e7930a27b5 explore: add some extra time for angular query editors to update query (#16955)
Now when loading a query editor which changes the default query in the
constructor this will result in the actual updated query is used in
explore when running the query. Without this, the query used is sort
of out of sync between query editor and executed query.
2019-05-10 14:09:07 +02:00
Hugo Häggmark
6dbaa704bc Explore: Align Explore with Dashboards and Panels (#16823)
* Wip: Removes queryTransactions from state

* Refactor: Adds back query failures

* Refactor: Moves error parsing to datasources

* Refactor: Adds back hinting for Prometheus

* Refactor: removed commented out code

* Refactor: Adds back QueryStatus

* Refactor: Adds scanning back to Explore

* Fix: Fixes prettier error

* Fix: Makes sure there is an error

* Merge: Merges with master

* Fix: Adds safeStringifyValue to error parsing

* Fix: Fixes table result calculations

* Refactor: Adds ErrorContainer and generic error handling in Explore

* Fix: Fixes so refIds remain consistent

* Refactor: Makes it possible to return result even when there are errors

* Fix: Fixes digest issue with Angular editors

* Refactor: Adds tests for explore utils

* Refactor: Breakes current behaviour of always returning a result even if Query fails

* Fix: Fixes Prettier error

* Fix: Adds back console.log for erroneous querys

* Refactor: Changes console.log to console.error
2019-05-10 14:00:39 +02:00
Marcus Efraimsson
8eb78ea931 Explore: Fix empty result from datasource should render logs container (#16999)
Make sure to return an empty logs model instead of undefined so that 
the logs container renders an empty graph and log result in Explore.

Fixes #16997
2019-05-10 12:45:26 +02:00
Hugo Häggmark
d5a35f3631 Explore: Fixes zoom exception in Loki/Graph (#16991)
Fixes: #16986
2019-05-10 12:10:32 +02:00
Torkel Ödegaard
675d43c753 PanelEditor: Fix queries tab now showing, wrong skipDataQuery logic (#16994) 2019-05-10 11:38:18 +02:00
Ryan McKinley
1d7bb2a763 DataSourceApi: convert interface to abstract class (#16979)
* DataSourceApi as class

* add diff signature

* Prometheus: moved directUrl to jsonData
2019-05-10 11:37:43 +02:00
Torkel Ödegaard
5573d28582 Panels: Fixed error panel tooltip (#16993)
Fixes #16989
2019-05-10 11:35:55 +02:00
Will Medlar
5e44f001fb Docker: Prevent a permission denied error when writing files to the default provisioning directory (#16831)
* build: Grant ownership of provisioning directory to runtime user
2019-05-10 09:03:17 +02:00
zhulongcheng
34f6dda6e6 Notification: attempt to send notifications to all given email addresses (#16881)
Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
2019-05-10 08:39:51 +02:00
Ryan McKinley
f617cd8975 GettingStarted: convert to react panel plugin (#16985)
* getting started

* getting started
2019-05-10 07:48:31 +02:00
Ryan McKinley
56702902a1 Plugins: Remove dataFormats key and add skipDataQuery (#16984) 2019-05-10 07:46:14 +02:00
Torkel Ödegaard
4a9aff0b00 AlertList: removed icon 2019-05-10 07:33:33 +02:00
Ryan McKinley
3c733638ee MetricsPanelCtrl: use shared queryRunner to support query execution (#16659)
* move queryRunner to panelModel

* remove isEditing from PanelChrome

* move listener to QueriesTab

* use queryRunner on MetricsPanelCtrl

* Added interval back as prop, not used yet

* QueryRunner: worked on tests

* PanelQueryRunner: Refactoring, added getQueryRunner to PanelModel

* PanelQueryRunner: interpolatel min interval

* merge master and remove grafana-live
2019-05-10 07:09:48 +02:00
Ryan McKinley
30bf9bf00f TableData: support name (#16983) 2019-05-09 10:29:24 -07:00
Julien Pivotto
d4a35213e1 Changelog: Typo guage -> gauge (#16982) 2019-05-09 19:06:28 +02:00
Ryan McKinley
edcbc11774 TestData: stream via fetch (#16963)
Stream from fetch CSV
2019-05-09 09:42:35 -07:00
Marcus Efraimsson
0c1530c7a8 plugins: fix how datemath utils are exposed to plugins (#16976)
Fixes a regression accidentally introduced by #16890 so that datemath 
utils are exposed to plugins in a backward-compatible way.

Fixes #16962
2019-05-09 15:27:52 +02:00
Torkel Ödegaard
10098082b5 NewDataSource: Updated page header title 2019-05-09 14:21:02 +02:00
tolwi
f0109be2bc fix(prometheus): issue with click label to filter for recording rules in Explore 2019-05-09 13:54:48 +02:00
Hugo Häggmark
a04b3a13e0 Explore: Removes Promise.All from runQueries thunk (#16957) 2019-05-09 12:24:48 +02:00
Andrej Ocenas
2abb009d68 Chore: Add prometheus basic auth proxy (#16882) 2019-05-09 12:08:27 +02:00
zhulongcheng
7ebbeb09cb Snapshot: use given key and deleteKey (#16876)
Signed-off-by: zhulongcheng <zhulongcheng.me@gmail.com>
2019-05-09 11:53:04 +02:00
Ryan McKinley
7b92c56055 DataSourcePlugins: more generics improvements (#16965)
* more types for query editor

* generic datasources

* update

* change ComponentClass to ComponentType

* more types

* remove input
2019-05-09 11:48:13 +02:00
Torkel Ödegaard
e1d408a66f AddDataSource: Updated page design & categories (#16971)
* minor refactoring

* Added category

* Minor progress

* Progres

* Updated descriptions

* Added custom sort

* NewDataSource: progress

* Updated design

* NewDataSource: Updated design

* Updated link

* Feedback changes
2019-05-09 11:45:39 +02:00
r66ad
99c754c4a5 Templating: Support selecting all filtered values of multi-value variable (#16873)
* Closes #15821

* sorry, now prettier

* select and deselect on filtered values works with Selected option now. Should the clearSelections function rather be renamed to selectOrClearValues? Selected should have another name too.
2019-05-09 07:51:14 +02:00
Andrej Ocenas
568d7373f7 Chore: Add Input stories (#16897) 2019-05-09 07:45:57 +02:00
Dominik Prokop
1ef15283a4 FieldDisplay: Don't use group ui elements in field editors (#16953)
* FieldDisplay editor - minor refactor not to use panel group ui elements
* FieldPropertiesEditor - minor refactor not to use panel group ui elements
2019-05-08 17:25:41 +02:00
Torkel Ödegaard
a9e01d8b04 GettingStarted: Fixes layout issues, fixes #16926 (#16941) 2019-05-08 17:22:25 +02:00
Torkel Ödegaard
f58ab7945b PanelModel: Fix crash after window resize, fixes #16933 (#16942) 2019-05-08 17:21:46 +02:00
Torkel Ödegaard
e97853abc9 Singlestat: fixed centering issue for very small panels (#16944) 2019-05-08 17:21:17 +02:00
Hugo Häggmark
a4d287d2e1 Tests: Adds end-to-end tests skeleton and basic smoke test scenario (#16901)
* Chore: Adds neccessary packages

* Wip: Initial dummy test in place

* Feature: Downloads Chromium if needed

* Fix: Adds global config object

* Refactor: Adds basic e2eScenario

* Build: Adds end to end tests to config

* Build: Changes end to end job

* Build: Adds browsers to image

* Build: Adds failing test

* Refactor: Adds first e2e-test scenario

* Fix: Ignores test output in gitignore

* Refactor: Adds compare screenshots ability

* Refactor: Removes unnecessary code

* Build: Removes jest-puppeteer

* Fix: Replaces test snapshots

* Refactor: Creates output dir if missing

* Refactor: Changes aria-labels to be more consistent

* Docs: Adds section about end to end tests

* Fix: Fixes snapshots

* Docs: Adds information about ENV variables
2019-05-08 16:50:21 +02:00
Hugo Häggmark
ceb9f0855b Chore: Replaces moment with Grafanas DateTime (#16919)
* Wip: Initial commit

* Refactor: Replaces moment.utc(

* Refactor: replaces the last isMoment statements

* Refactor: Removes almost all moment imports

* Refactor: Moves moment_wrapper to grafana/ui

* Refactor: Renames momentWrapper

* Refactor: Removes one more moment import

* Refactor: Removes unitOfTime import

* Fix: Fixes Prettier error

* Refactor: Renames DateTimeType to DateTime

* Refactor: Renames isDateTimeType to isDateTime

* Refactor: Renames dateTime to dateTime

* Feature: Bans moment imports and types
2019-05-08 13:51:44 +02:00
Stephen SORRIAUX
e7a9afe983 InfluxDB: Fix HTTP method should default to GET (#16949)
Fixes #16929
2019-05-08 13:02:39 +02:00
Dominik Prokop
4762cd671a Chore: Skip unnecessary checks on pre commit (#16946)
* Skip unnecessary checks on pre commit

* Remove grunt precommit task

* Separate go and fe tesrt lint
2019-05-08 11:43:37 +02:00
Carl Bergquist
a86b8c8a04 http: remove dualstack since its deprecated (#16940)
Deprecated: Fast Fallback is enabled by default. To
disable, set FallbackDelay to a negative value.

https://golang.org/src/net/dial.go
2019-05-08 10:37:48 +02:00
Carl Bergquist
b426ff5292 devenv: add slow reverse proxy (#16943)
this can be useful when testing timeouts etc
in the dataproxy

ref #16923
2019-05-08 10:09:48 +02:00
Ryan McKinley
17ce1273ca AppPlugin: Menu Edit Url Fix (#16934) 2019-05-08 09:38:40 +02:00
Ryan McKinley
1d8786e3a6 DataSource Plugins: consistent generics order <TQuery,TOptions> (#16936)
* consistent TQuery,TOptions

* add json for azure

* cloudwatch
2019-05-08 09:37:50 +02:00
Ryan McKinley
b08cf1e7ac Plugins: update beta notice style (#16928) 2019-05-07 15:58:03 -07:00
Ryan McKinley
b24358aaba Chore: update version number for 6.3 (#16927) 2019-05-07 15:02:05 -07:00
Brian Gann
b07d0b1026 Plugins: Support templated urls in routes (#16599)
This adds support for using templated/dynamic urls in routes.
* refactor interpolateString into utils and add interpolation support for app plugin routes.
* cleanup and add error check for url parse failure
* add docs for interpolated route urls

Closes #16835
2019-05-07 18:55:39 +02:00
Marcus Efraimsson
336655a46a changelog: add 5.4.4 release 2019-05-07 18:41:08 +02:00
Marcus Efraimsson
08cdeb0eb1 docs: add download link to what's new in v6.2 2019-05-07 18:16:59 +02:00
Marcus Efraimsson
b1fb113648 update changelog 2019-05-07 18:06:15 +02:00
Andrej Ocenas
1b61344096 Update changelog for 6.2.0-beta1 2019-05-07 16:05:12 +02:00
Daniel Lee
befa40ef3a AzureMonitor: adds support for multiple subscriptions per datasource (#16922)
* chore: AzureMonitor typescript typings

Removes some types and using @grafana/ui types instead.
Adds some typing for the AzureMonitor query.

Also adds a getSubscriptions function that will used in the query
editor.

* fix: AzureMonitor adds back editor for annotation queries

This must have been broken for a month or more. Now possible to
edit annotation queries again.

* feat: Azure Monitor - support for multiple subscriptions

Adds a new dropdown for subscriptions in the query editor.

Defaults to the subscription id in jsonData for queries
that have no subscription id.

* feat: adds Azure Logs multi subscriptions support

The subscription id is needed for fetching the list of
workspaces. Adds support to the Log Analytics datasource
and to the annotations for Log Analytics to be able to
choose between multiple subscriptions.

* feat: AzureMonitor config page with multiple subs

Adds support for multiple subscriptions for the different
variations of configuring Azure Monitor and Azure Logs.

To be able to show a list of subscriptions, the config
has to be saved first - the plugin route fetches the
tenant id, client id and client secret from the database
so a call to get subscriptions requires that those
fields are saved first. If the page has not saved then
the use can manually paste in a subscription id.

* feat: support for multi subs in Azure Monitor variables

Adds an optional subscription parameter to the template
variable macros. Also adds a Subscriptions macro.

* fix: remove some implicit anys from tests
2019-05-07 15:45:15 +02:00
Marcus Efraimsson
70abb19537 docs: what's new in v6.2 (#16909)
Draft of What's new in v6.2 for the beta.

Closes #16902
2019-05-07 13:47:05 +02:00
Dominik Prokop
f397c14db8 Chore: ban importing from @grafana/ui in grafana ui files (#16920) 2019-05-07 12:57:59 +02:00
Torkel Ödegaard
6d6242c153 BarGauge: New multi series enabled gauge like panel with horizontal and vertical layouts and 3 display modes (#16918)
* BarGauge: switched to beta and updated beta notice design

* Updated snapshot
2019-05-07 12:18:08 +02:00
Carl Bergquist
f001815d9d alerting: no notification when going from nodata -> pending (#16905)
ref #16496
2019-05-07 10:34:00 +02:00
Carl Bergquist
b8674f4ec1 rpm: start grafana after mysqld process (#16917)
closes #16850
2019-05-07 09:47:03 +02:00
Dominik Prokop
da4932e7c2 Build: fix failing grafana/ui build (#16913)
* Bump version of @types/react and regenerate yarn.lock
* Fix imports in grafana/ui
2019-05-07 09:07:54 +02:00
Torkel Ödegaard
108eb5f07c BarGauge: Updated test dashboards and threshold fix (#16911) 2019-05-07 06:07:33 +02:00
Torkel Ödegaard
f8393fb339 PanelModel: Clear queryRunner on destroy (#16906)
* PanelModel: Clear queryRunner on destroy

* fix test asumptions
2019-05-06 19:35:10 +02:00
Torkel Ödegaard
48ae93048b Panels: No title will no longer make panel header take up space (#16884)
* Panels: Initial poc of no panel titles

* moving panel-container to DashboardPanel

* Starting to work

* Gauge fix

* Panels: tweaked panel padding and title z-index stuff

* Panels: changed panel padding a bit and simplified it by having same padding in vertical and horizontal

* Lots of tweaks to panel padding related stuff

* Updated snapshot

* Added test dashboard

* Final refactorings

* Trim title befgor applying panel-container--no-title class

* Remove unnecessary type annotation

* Panels: hasTitle no need to trim

* Gauge: fixed font family
2019-05-06 15:26:09 +02:00
Marcus Efraimsson
32a45077e7 Elasticsearch: Fix pre-v7.0 and alerting error (#16904)
This fixes a regression introduced in #16646 where using Elasticsearch 
pre-v7.0 and alerting resulted in an error when trying to deserialize the 
response of total number of hits.
Total number of hits is not in use by the backend so we're removing it 
for now to make ES 6 and 7 being able to deserialize search responses 
without errors.

Closes #15622
2019-05-06 15:12:18 +02:00
Torkel Ödegaard
575fe7ad5a Gauge: Better handling of gauge repeat title (#16886)
* Gauge: began looking at gauge title

* Gauge: title improvements

* Minor progres

* Gauge: title improvements, still needs more tweaking

* Gauge: title is starting to work ok

* Use selectThemeVariant

* Remove unused type
2019-05-06 13:50:17 +02:00
Ryan McKinley
d881976c9d Refactor: move datemath to grafana/ui (#16890)
* move datemath to grafana/ui

* don't reference @grafana/ui from its own component
2019-05-06 12:36:42 +02:00
Ryan McKinley
513c79d392 PanelQueryState: check for existing running query (#16894)
Fixes #16880
2019-05-06 12:09:53 +02:00
Carl Bergquist
ec500ed416 devenv: add alert list panel (#16896) 2019-05-06 10:15:14 +02:00
Marcus Efraimsson
1c1427520d Security: Add new setting allow_embedding (#16853)
When allow_embedding is false (default) the Grafana backend 
will set the http header `X-Frame-Options: deny` in all responses 
to non-static content which will instruct browser to not allow 
Grafana to be embedded in `<frame>`, `<iframe>`, 
`<embed>` or `<object>`.

Closes #14189
2019-05-06 09:56:23 +02:00
Mark Goodwin
44e6da6b41 build: fix integer overflow in pkg/tsdb tests on 32bit platforms (#16818)
Several pkg/tsdb tests fail to compile on 32bit platforms due to
integer overflow.
2019-05-06 09:27:45 +02:00
Marcus Efraimsson
f778c1d971 Security: Responses from backend should not be cached (#16848)
Currently all API requests set Cache-control: no-cache to avoid browsers 
caching sensitive data. This fixes so that all responses returned from 
backend not are cached using http headers. The exception is the data proxy 
where we don't add these http headers in case datasource backend needs 
to control whether data can be cached or not.

Fixes #16845
2019-05-06 09:22:59 +02:00
psschand
d5245a98b1 Alert: Support variables in Alert List filters (#12583) (#16892) 2019-05-06 09:21:08 +02:00
Hugo Häggmark
9a8a6d9dda Chore: Lowered implicit anys limit to 5617
Progress: #14714
2019-05-06 07:08:24 +02:00
Ryan McKinley
073c84179f FieldDisplay: shared options model for singlestat panels (#16703)
* update single stat data model

* update single stat data model

* update single stat data model

* show limit default

* merge master

* change stat selector to single until #15954

* add tooltip

* begin children

* move options under display

* align gauge options

* add migration tests

* Docs: Updated changelog

* SingleStatPanels: show title if manual specified

* FieldPropEditor: Max should change max

* change stats to calcs in config

* remove prefix/suffix

* add test

* abort field cycle when passed the limit

* stub a better test

* move title to Field

* remove title
2019-05-04 10:08:48 +02:00
Ryan McKinley
493bf0c7b3 Refactor: rename statsCalculator to fieldReducer (#16867) 2019-05-03 13:16:33 -07:00
Ryan McKinley
bb64a0673d PanelModel: expose isInView property to PanelModel (#16877) 2019-05-03 12:55:22 -07:00
psschand
2af69ccf0f CSV: escape quotes in toCSV (#16874) 2019-05-03 09:31:13 -07:00
Ryan McKinley
c3a5204933 Dashboard: Lazy load out of view panels (#15554)
* try this again

* use element rather than grid position

* adding back console output to debug gridPos alternative

* less logging

* simplify

* subscribe/unsubscribe to event streams when view changes

* Panels: Minor change to lazy loading
2019-05-03 15:35:37 +02:00
Samuel
846b9327a5 LDAP: Added reload endpoint for LDAP config (#15470)
* 4843 - Added reload endpoint for LDAP config

closes #4843

* Refactor to make the reload work after master drifted
2019-05-03 14:53:07 +02:00
Fernando Kramer
16d5df1cba PluginsList: Removed icons and updated snapshots (#16872)
Fixes #16833
2019-05-03 13:19:01 +02:00
Torkel Ödegaard
40b771c04d Panels: Fixed issue with panel type change and data updates (#16871) 2019-05-03 10:29:22 +02:00
Mark Goodwin
a05ee6cd6e Chore: fix modes for non-executable files (#16864)
Fix file modes for various html, svg and ts files.
These should not be executable (rpmlint complains).
2019-05-03 09:51:53 +02:00
Torkel Ödegaard
20dada0159 DataSourceSettings: Minor fix for uncontrolled input (#16863) 2019-05-03 08:30:09 +02:00
Hugo Häggmark
f3f762065a Chore: Lowered implicit anys limit to 5623
Progress: #14714
2019-05-03 07:11:23 +02:00
Ryan McKinley
86729f37c8 TestData: Add dashboards to testdata (#16855) 2019-05-03 06:57:30 +02:00
Ryan McKinley
0d02ceb452 Input Datasource: convert from angular config to react ConfigEditor (#16856)
* use ConfigEditor

* use ConfigEditor

* update readme

* make the jsondata generic
2019-05-03 06:56:54 +02:00
Ryan McKinley
ece4d2201c DataSources: minor typescript cleanups and comments (#16860)
* datasource interface cleanup

* more types

* use PluginInclude
2019-05-03 06:26:30 +02:00
Ryan McKinley
3e6104f45a TestDataDatasource: Add config editor (#16861) 2019-05-03 06:20:31 +02:00
Ryan McKinley
013f1b8d19 App Plugins: support react pages and tabs (#16586) 2019-05-02 10:15:39 -07:00
Brian Gann
31ea0122a0 Add Windows MSI generation to build process (#16502)
- add MSI generation to build process
2019-05-02 10:47:58 -05:00
Stephen SORRIAUX
3866839b19 Datasources: add support for POST HTTP verb for InfluxDB (#16690)
A new parameter `queryMode` is added to the InfluxDB datasource to provide a way to use POST instead of GET when querying the database. This prevents to get any error when querying the database with a heavy request.
Default configuration is kept to GET for backward compatibility. Tests and documentation have been added for this new behaviour.
2019-05-02 15:30:37 +02:00
Andrej Ocenas
2596ce5076 Add pattern validation in configs (#16837)
Datasources: Add pattern validation for time input on datasource config pages
2019-05-02 11:02:00 +02:00
Dominik Prokop
7194c6d9bf Search: Enable filtering dashboards in search by current folder (#16790)
* Added search-query-parser package

* Migrate search input field to react and enable current folter filtering

* Reveiw changes

* FIx tags

* Fix event handlers  passed to html elements directly

* noImplicitAny fix

* Debounce search method in search controller

* Search: have clear reset query as well
2019-05-02 08:49:03 +02:00
Ryan McKinley
2e326d1cb8 FormLabel: allow any rather than just a string for tooltip (#16841) 2019-05-01 15:47:51 -07:00
Marcus Efraimsson
9d01b216f9 prometheus: fix regression after adding support for tracing headers (#16829)
This fixes a regression introduced by #16724 when datasource is configured
to use HTTP method POST and testing the datasource which results in an
'options.headers is undefined'. Same error probably happens if datasource
is configured to use basic auth and testing datasource.
2019-05-01 17:23:47 +02:00
Brian Gann
157f330cf2 area/circleci: Speed up circleci build process for branches and pr (#16778)
* speed up circleci build
* convert build.sh to functions and add args for different build types
* add yarn cache
* add build latest to packaging step
* fast build should not try to tag non-amd builds
* remove signing step for prs-and-branches
2019-05-01 10:20:01 -05:00
Marcus Efraimsson
e210725d3d DataProxy: Restore Set-Cookie header after proxy request (#16838)
If Grafana rotates the user's auth token during a request to the data 
source proxy it will set the Set-Cookie header with new auth token in 
response before proxying the request to the datasource.
Before this fix the Set-Cookie response header was cleared after the 
proxied request was finished to make sure that proxied datasources 
cannot affect cookies in users browsers. This had the consequence 
of accidentally also clearing the new auth token set in Set-Cookie 
header.
With this fix the original Set-Cookie value in response header is now 
restored after the proxied datasource request is finished. The existing
logic of clearing Set-Cookie response header from proxied request 
have been left intact.

Fixes #16757
2019-05-01 16:32:03 +02:00
Marcus Efraimsson
e5971eef1f docs: clarify page parameter version support for folder/dashboard search (#16836)
Adds a version disclaimer for the page parameter in folder/dashboard search docs.

Fixes #16827
2019-05-01 11:42:03 +02:00
Oleg Gaidarenko
c1289b308f Chore: revise some of the gosec rules (#16713) 2019-05-01 11:36:02 +02:00
Ryan McKinley
51a98565dc Refactor: consistant plugin/meta usage (#16834) 2019-04-30 22:36:46 -07:00
Marcus Efraimsson
fe20dde5db Explore: Use SeriesData format for loki/logs (#16793)
This is the first step moving towards Explore supporting logs for 
more datasources than Loki. In the first step we move all the log 
processing from Loki into Explore.
- Make explore convert logs result returned from datasources to SeriesData, 
if needed, and for now convert SeriesData to LogsModel.
- Loki datasource query now returns SeriesData and all
processing have been moved into explore instead.
- Removed key from LogRowModel and use log row indexes as 
the unique key instead.
- Removed id from LogsModel since it looks like it's not in use.
- Introduced a new class FieldCache which is convenient to use when
looking up multiple fields and/or field types and series values.

Closes #16287
2019-04-30 18:21:22 +02:00
Ryan McKinley
26bd76b4c2 Refactor: move NavModel to @grafana/ui (#16813) 2019-04-30 07:46:46 -07:00
Carl Bergquist
9660356638 Auth: Enable retries and transaction for some db calls for auth tokens (#16785)
the WithSession wrapper handles retries and connection
management so the caller dont have to worry about it.
2019-04-30 14:42:01 +02:00
Andrej Ocenas
eb82a75668 Provisioning: Show file path of provisioning file in save/delete dialogs (#16706)
* Add file path to metadata and show it in dialogs

* Make path relative to config directory

* Fix tests

* Add test for the relative path

* Refactor to use path relative to provisioner path

* Change return types

* Rename attribute

* Small fixes from review
2019-04-30 13:32:18 +02:00
Stanislav Putrya
76ab0aa059 Add tracing headers for prometheus datasource (#16724)
Prometheus: Adds tracing headers for Prometheus datasource
2019-04-30 13:28:35 +02:00
Andrej Ocenas
0433af6385 Config: Fixes bug where timeouts for alerting was not parsed correctly (#16784)
* Fix parsing of the config

* Remove unnecessary conversion

* Remove timeout modification

Co-Authored-By: aocenas <mr.ocenas@gmail.com>

* Remove unused import
2019-04-30 12:05:38 +02:00
Carl Bergquist
fef3638018 build: removes gopkg files from dev docker file (#16817) 2019-04-30 12:01:43 +02:00
Torkel Ödegaard
9b68952482 Provisioning: Trying to fix failing test (#16800)
* Provisioning: Trying to fix test

* Use better sync strategy for test

* Lower the timeout

* Remove commented code

Co-Authored-By: aocenas <mr.ocenas@gmail.com>
2019-04-30 10:35:54 +02:00
Ryan McKinley
af1e2615b2 Table: React table fix rotate support in storybook (#16816) 2019-04-30 09:21:49 +02:00
Ryan McKinley
27dcd0edb1 TestData: add log level in dummy message (#16815) 2019-04-30 09:20:38 +02:00
bergquist
4beed35890 removes gopkg.lock from root folder 2019-04-30 07:52:12 +02:00
Marcus Efraimsson
02cb7ff436 Explore: Support user timezone (#16469)
Explore now uses the timezone of the user to decide if local browser 
time or UTC should be used. 
- Now uses TimeRange instead of RawTimeRange in explore item
state tree and only parsing actual time in a few action
handlers.
- Time picker should now properly handle moving back/forward and
apply time range when both utc and non utc time zone.
- URL range representation is changed from YYYY-MM-DD HH:mm:ss
to epoch ms.
- Now uses AbsoluteTimeRange in graph component instead of moment.
- Makes a copy of the time range passed to timeSrv to make sure immutability
of explore time range when for example elasticsearch test datasources uses
timeSrv and sets a time range of last 1 min.
- Various refactorings and cleanup.

Closes #12812
2019-04-29 18:28:41 +02:00
Ryan McKinley
7dbe719fda Plugins: rename vizPlugin to panelPlugin (#16802) 2019-04-29 09:20:58 -07:00
Ryan McKinley
c5097e2ef3 Plugins: move app/feature/plugin properties into PluginMeta (#16809) 2019-04-29 09:14:39 -07:00
Ryan McKinley
5c2d38126d Plugins: move PanelPluginMeta to grafana/ui (#16804) 2019-04-29 08:17:35 -07:00
Ryan McKinley
7146d576e6 Plugins: move datasource specific meta out of the main meta type (#16803) 2019-04-29 07:38:17 -07:00
bergquist
945cbf4710 updates changelog for 6.1.6 2019-04-29 16:06:01 +02:00
Hugo Häggmark
ddefcb2694 Fix: Fetch histogram series from other api route (#16768)
Closes: #15992
2019-04-29 15:42:58 +02:00
bergquist
f7c8d90d1a phantomjs: set web-security to true 2019-04-29 14:37:52 +02:00
Hugo Häggmark
b803ba2689 Chore: Lowered implicit anys limit to 5668
Progress: #14714
2019-04-29 06:38:48 +02:00
Marcus Efraimsson
decd65671c build: restore postgres integration tests (#16801)
This fixes the CI script for postgres integration tests so that
all tests are run.
2019-04-28 12:28:01 +02:00
Reiner Gerecke
928f9516de docs: explain correct access control model of GCS buckets (#16792) 2019-04-28 11:49:36 +02:00
Torkel Ödegaard
a4f5c54871 Chore: Fixed no implicit any Typescript errors (#16799) 2019-04-28 09:58:12 +02:00
Oleg Gaidarenko
66c9297c36 Feature: introduce LdapActiveSyncEnabled setting (#16787)
* Feature: introduce LdapActiveSyncEnabled setting

We probably remove it after the active sync is done.
But at the moment we do not want to affect the current users
with not fully tested feature

* Chore: move settings in more logical order
2019-04-27 09:03:59 +03:00
Torkel Ödegaard
060e97bea8 Plugins: ReactPanelPlugin to VizPanelPlugin (#16779)
* Plugins: ReactPanelPlugin renamed

* Plugins: renamed PanelPlugin to PanelPluginMeta and VizPanelPlugin to PanelPlugin
2019-04-26 19:16:38 +02:00
Torkel Ödegaard
e38762665b UX: Improve Grafana usage for smaller screens (#16783)
* Mobile: Switch to mobile view already at md or lower breakpoint

* UX: Tweaked breakpoint so that media-breakpoint-up(md) will only apply to screens larger than normal ipad

* Updated snapshots
2019-04-26 19:16:03 +02:00
Torkel Ödegaard
e694fd8fb6 ThresholdEditor: Minor style fix for smaller screens (#16791) 2019-04-26 19:15:37 +02:00
Marcus Efraimsson
c2530be07d Build: Use isolated modules for ts-jest (#16786) 2019-04-26 19:14:48 +02:00
Oleg Gaidarenko
62b85a886e LDAP Refactoring to support syncronizing more than one user at a time. (#16705)
* Feature: add cron setting for the ldap settings

* Move ldap configuration read to special function

* Introduce cron setting (no docs for it yet, pending approval)

* Chore: duplicate ldap module as a service

* Feature: implement active sync

This is very early preliminary implementation of active sync.
There is only one thing that's going right for this code - it works.

Aside from that, there is no tests, error handling, docs, transactions,
it's very much duplicative and etc.

But this is the overall direction with architecture I'm going for

* Chore: introduce login service

* Chore: gradually switch to ldap service

* Chore: use new approach for auth_proxy

* Chore: use new approach along with refactoring

* Chore: use new ldap interface for auth_proxy

* Chore: improve auth_proxy and subsequently ldap

* Chore: more of the refactoring bits

* Chore: address comments from code review

* Chore: more refactoring stuff

* Chore: make linter happy

* Chore: add cron dep for grafana enterprise

* Chore: initialize config package var

* Chore: disable gosec for now

* Chore: update dependencies

* Chore: remove unused module

* Chore: address review comments

* Chore: make linter happy
2019-04-26 15:47:16 +03:00
bergquist
a8326e3e93 build: removes unused vendored files 2019-04-26 13:35:48 +02:00
rrFeng
daea9e9fc0 (fix/explore): remove vertical-align looks better for long logs (#16736) 2019-04-26 11:33:40 +02:00
Carl Bergquist
85e5835ddc Chore: bump jQuery to 3.4.0 in grafana/ui (#16781)
CVE-2019-5428
Vulnerable versions: < 3.4.0
Patched version: 3.4.0
A prototype pollution vulnerability exists in jQuery versions < 3.4.0 that
allows an attacker to inject properties on Object.prototype.

https://nvd.nist.gov/vuln/detail/CVE-2019-5428
2019-04-26 10:29:40 +02:00
Torkel Ödegaard
19fddf556b Devenv: Updated home dashboard and added new influxdb test dashboard 2019-04-26 09:48:00 +02:00
Hugo Häggmark
86a6fa26af Chore: Lowered implicit anys limit to 5946
Progress: #14714
2019-04-26 07:34:01 +02:00
Torkel Ödegaard
ccffe0e9cc RefreshPicker: minor design update (#16774)
Fixes #16627
2019-04-25 22:22:20 +02:00
Ryan McKinley
470634e2d6 Streaming: support streaming and a javascript test datasource (#16729) 2019-04-25 14:01:02 -04:00
Ryan McKinley
ab3860a334 GraphLegendEditor: use stats picker rather than switches (#16759) 2019-04-25 10:29:18 -04:00
Oleg Gaidarenko
78cd9058a3 Feature: add cron setting for the ldap settings (#16673)
* Feature: add cron setting for the ldap settings

* Move ldap configuration read to special function

* Introduce cron setting (no docs for it yet, pending approval)

* Chore: address code review comments
2019-04-25 17:12:56 +03:00
Carl Bergquist
8ca5add4ec Build: Disables gosec until identified performance problems (#16764) 2019-04-25 14:49:32 +02:00
Dominik Prokop
25ea5fcaf2 Chore: bump jQuery to 3.4.0 including prototype pollution vulnerability fix (#16761)
Ref: https://nvd.nist.gov/vuln/detail/CVE-2019-5428
2019-04-25 09:42:32 +02:00
Alcides Viamontes E
cff2be0d66 elasticsearch: add 7.x version support (#16646)
Adds a new version option 7.0+ (70 internally).
Version 7.0+ doesn't include document types in index mappings 
so support for handling this have been added.
Version 7.0+ returns number of hits in a different way so 
support for handling this have been added.
Version 7.0+ doesn't support sending 
max_concurrent_shard_requests in multisearch header so 
support for sending this in query string have been added.
Update elastic6 docker block and dashboards (devenv) to use 
6.7.1 images, filebeat index name is now filebeat-YYYY.MM.DD 
and dashboard include correct tags and links.
Add elastic7 docker block and provisioning (devenv).
Updates documentation regarding new version.

Closes #15622
2019-04-25 09:41:13 +02:00
Andrej Ocenas
42b745a098 Provisioning: Add API endpoint to reload provisioning configs (#16579)
* Add api to reaload provisioning

* Refactor and simplify the polling code

* Add test for the provisioning service

* Fix provider initialization and move some code to file reader

* Simplify the code and move initialization

* Remove unused code

* Update comment

* Add comment

* Change error messages

* Add DashboardProvisionerFactory type

* Update imports

* Use new assert lib

* Use mutext for synchronizing the reloading

* Fix typo

Co-Authored-By: aocenas <mr.ocenas@gmail.com>

* Add docs about the new api
2019-04-25 09:06:44 +02:00
Hofls
b3bfbc6f77 Config: Show user-friendly error message instead of stack trace (#16564)
Fixes #16283
2019-04-25 08:29:07 +02:00
Hugo Häggmark
afd55cb411 Chore: Lowered implicit anys limit to 5954
Progress: #14714
2019-04-25 06:47:19 +02:00
Dominik Prokop
7aeae84c52 Feature: Enable React based options editors for Datasource plugins (#16748) 2019-04-24 23:18:51 +02:00
Tom Petr
2d6b33ab61 sqlstore: use column name in order by (#16583)
Use column name in ORDER BY in GetDashboardAclInfoList().
2019-04-24 16:05:35 +02:00
Mitsuhiro Tanda
1e98c10235 user friendly guide (#16743)
CloudWatch: Update docs for setting auth provider
2019-04-24 15:41:13 +02:00
Andrej Ocenas
fcebd713a5 Provisioning: Interpolate env vars in provisioning files (#16499)
* Add value types with custom unmarshalling logic

* Add env support for notifications config

* Use env vars in json data tests for values

* Add some more complexities to value tests

* Update comment with example usage

* Set env directly in the tests, removing patching

* Update documentation

* Add env var to the file reader tests

* Add raw value

* Post merge fixes

* Add comment
2019-04-24 15:39:47 +02:00
Carl Bergquist
eb8af01a8a admin: add more stats about roles (#16667)
closes #14967
2019-04-24 13:18:16 +02:00
Dominik Prokop
739cdcfb6e Feature: Migrate Legend components to grafana/ui (#16468)
* Introduced Abstract list, List and InlineList components for easier lists generation
* Enable custom item key on abstract list items
* Enable $.flot in storybook
* Expose onOptionsChange to react panel. Allow React panels to be function components
* Update type on graph panel options to group graph draw options
* Introduce GraphPanelController for state and effects handling of new graph panel
* Group visualisation related stories under Visualisations
2019-04-24 10:14:18 +02:00
Marcus Efraimsson
7dadebb3f0 playlist: fix loading dashboards by tag (#16727)
Fixes #16704
2019-04-24 10:10:16 +02:00
Utkarsh Bhatnagar
89a01a680c CloudWatch: Use default alias if there is no alias for metrics (#16732)
Fixes #16605
2019-04-24 10:00:02 +02:00
Josh
fca5ee4bea Provisioning: Support FolderUid in Dashboard Provisioning Config (#16559)
* add folderUid to DashbaordsAsConfig structs and DashbardProviderConfigs struct, set these values in mapping func
look for new folderUid values in config_reader tests
set dashboard folder Uid explicitly in file_reader, which has no affect when not given

* formatting and docstrings

* add folderUid to DashbaordsAsConfig structs and DashbardProviderConfigs struct, set these values in mapping func
look for new folderUid values in config_reader tests
set dashboard folder Uid explicitly in file_reader, which has no affect when not given

* formatting and docstrings

* add folderUid option, as well as documentation for the rest of the fields

* add blank folderUid in devenv example.

* add folderUid to provisioning sample yaml

* instead of just warning, return error if unmarshalling dashboard provisioning file fails

* Removing the error handling and adding comment

* Add duplicity check for folder Uids


Co-authored-by: swtch1 <joshua.thornton@protonmail.com>
2019-04-24 08:57:42 +02:00
Dominik Prokop
19e824006a Refactor: Make SelectOptionItem a generic type to enable select value typing (#16718)
* Make SelectOptionItem a generic type to enable select value typing
* TS ignores added because of optional value on Select items (it's no longer any)
2019-04-23 20:44:16 +02:00
Marcus Efraimsson
f4a8240d0d docs: fix upgrade instructions 2019-04-23 16:53:28 +02:00
Andrej Ocenas
e4f649e2c8 Chore: Small improvements to grafana-cli (#16670)
* Small improvements

* Better error handling
2019-04-23 12:34:34 +02:00
Andrej Ocenas
c429934a66 Chore: Use x/xerrors instead of pkg/errors (#16668)
* Use xerrors instead of pkg/errors

* Add Wrap util func

* Move Wrap to errutil package
2019-04-23 11:50:31 +02:00
Oleg Gaidarenko
54c1bf0cc9 Chore: a bit of spring cleaning (#16710)
* Chore: use early return technic everywhere

And enable "indent-error-flow" revive rule

* Chore: remove if-return rule from revive config

* Chore: improve error messages

And enable "error-strings" revive rule

* Chore: enable "error-naming" revive rule

* Chore: make linter happy

* Chore: do not duplicate gofmt execution

* Chore: make linter happy

* Chore: address the pull review comments
2019-04-23 11:24:47 +03:00
Alex Mabry
5ce5840ae0 Fixes #15863 (#16684) 2019-04-23 08:04:15 +02:00
Timo Schwarzer
5f9dc48fb0 Docs: Update notification services (#16657)
* Update notifications.md

* Update notification services docs
2019-04-23 08:00:55 +02:00
Ryan McKinley
ff870e08b2 PanelQueryRunner: add datasource name to queries (#16712) 2019-04-22 19:14:42 -07:00
Oleg Gaidarenko
db584b3d28 Chore: remove session storage references (#16445)
* Chore: remove session storage references

* Small refactoring of the settings module

* Update docs - remove references for the session storage

* Update config files (sample and default configs)

* Add tests for warning during the config load on defined storage cache

* Remove all references to session storage

* Remove macaron session dependency

* Remove leftovers

* Fix: address review comments

* Fix: remove old deps

* Fix: add skipStaticRootValidation = true to tests

* Fix: improve the docs and warning message

As per discussion in here - https://github.com/grafana/grafana/pull/16445/files#r273026255

* Chore: make linter happy

Fixes #16148
Ref #16114
2019-04-22 18:58:24 +03:00
Patrick O'Carroll
f175046bc1 Dashboard: Minor settings UI Update (#16669)
* removed settings header in aside, added header next to search button, tweaked paddings

* Minor tweak
2019-04-22 16:04:35 +02:00
Roman Khavronenko
532abe2fc2 Templating: Do not copy hide option (#16696)
* Do not override default `hide` value of variables

Some variables like `constant` are configured to
be hidden by default and this setting must be
treated with respect.

* make textBox variable visible by default

Fixes #16695
2019-04-22 13:11:05 +02:00
Christian Franke
6c3f93c974 Docs: Fix advanced variable formatting examples (#16691) 2019-04-21 09:27:04 +02:00
Ryan McKinley
b9ff1923e7 QueryEditors: pass PanelData and filtered PanelData to each editor (#16692) 2019-04-20 12:26:49 -07:00
Ryan McKinley
2bc76471d3 Chore: remove extra logging (#16688) 2019-04-19 17:21:38 -07:00
Ryan McKinley
36d88cc994 DashboardSrv: export getDashboardSrv to react (#16687) 2019-04-19 15:12:35 -07:00
Ryan McKinley
e7f56a74fc Refactor: split PanelQueryRunner into runner and state (#16685)
* check for running

* split out panel state

* adding test file

* remove bad test
2019-04-19 15:11:55 -07:00
Alex Mabry
178ce8eec8 Docs: Googlechat provisioning config example (#16682)
Fixes #1690
2019-04-19 20:50:55 +02:00
Ryan McKinley
544abfd3c5 TestDataDatasource: add the query refId to each result 2019-04-19 11:06:34 -07:00
teajo
80cca9c12e AppPlugin: avoid app plugin navigation slowness (#16675)
navigation between pages in app plugin is slow, due to use of non angular native promise

Fixes #16672
2019-04-19 08:41:59 -07:00
Ryan McKinley
4e54509dde Refactor: improvements to PanelQueryRunner (#16678)
merged DataQueryOptions + DataRequestInfo info: DataQueryRequest
2019-04-18 21:56:27 -07:00
Ryan McKinley
5f474c6328 Refactor: move getQueryRunner() to PanelModel (#16679)
* move queryRunner to panelModel
* Added interval back as prop, not used yet
* PanelQueryRunner: Refactoring, added getQueryRunner to PanelModel
* PanelQueryRunner: interpolatel min interval
2019-04-18 14:10:18 -07:00
Alexander Zobnin
0f1ae76e33 Docs: initial backend plugins development guide (#16631)
* Docs: initial backend plugins development guide

* Some tweaks

* more tweaks

* chore: docs changes to backend plugins guide

* chore: docs tweaks to backend plugins guide
2019-04-18 13:02:19 +02:00
bergquist
b9e148f3ab build: remove dep config files since they are not used anymore 2019-04-18 11:16:16 +02:00
Andrej Ocenas
79299f9bca Fix typo in PULL_REQUEST_TEMPLATE.md 2019-04-18 10:58:11 +02:00
Ryan McKinley
5976b421fe refactor: move timeInfo to DataRequestInfo (#16664)
* use timeInfo from request

* move timeInfo to DataRequestInfo
2019-04-18 00:00:46 -07:00
Ryan McKinley
0643dff2f6 QueryRunner: Move queryRunner to panelModel (#16656)
* move queryRunner to panelModel

* remove isEditing from PanelChrome

* move listener to QueriesTab

* Fixed issue with isFirstLoad set to false before loading state is Done

* QueryRunner: Fixed issue with error and delayed loading state indication

* Anoter fix to issues with multiple setState calls in observable callbacks
2019-04-18 08:22:14 +02:00
Ryan McKinley
f4cd9bc73c PanelQueryRunner: move error handling to QueryRunnerOptions (#16654) 2019-04-17 21:05:57 +02:00
Ryan McKinley
ed0192104c refactor: Merge PanelChrome and DataPanel, do query execution in PanelQueryRunner (#16632)
Moves query execution logic to PanelQueryRunner and structures PanelChrome so it subscribes to the query results rather than necessarily controlling their execution.
2019-04-17 10:51:50 -07:00
Torkel Ödegaard
36d64fecea Search: Fixed search issue introduced in recent PR (#16652) 2019-04-17 19:07:13 +02:00
Carl Bergquist
e4eb0817e4 Cloudwatch: fix for flaky tests (#16649)
The iteration order over maps is not specified and is not guaranteed
to be the same from one iteration to the next. If a map entry that
has not yet been reached is removed during iteration, the corresponding
iteration value will not be produced. If a map entry is created during
iteration, that entry may be produced during the iteration or may be skipped.
The choice may vary for each entry created and from one iteration to
the next. If the map is nil, the number of iterations is 0.

https://golang.org/ref/spec#For_range
2019-04-17 19:06:32 +02:00
Patrick O'Carroll
d040e336c1 UI: Remove old icons (#16335)
* removed unsused grafana-icon classes, replaced grafana-icons with gicons

* replaced old dashboard and datasource icons with gicon, fixed so icons on plugin list are shown

* removed unsused grafana-icon classes, replaced grafana-icons with gicons

* replaced old dashboard and datasource icons with gicon, fixed so icons on plugin list are shown

* replaced fontawesome cog, eye, link and edit with gicons

* updated snapshot

* fixed color of cog in dashboard nav, removed icons from buttons, ran preitterier on some files

* changed opacity on getting started icons and fixed getting started button

* .5 -> 0.5 fix for prettier
2019-04-17 15:18:32 +02:00
Torkel Ödegaard
8b0dd4244b Search: Fixes search limits and adds a page parameter (#16458)
* Search: Fixes search limits and adds a page parameter

This adds a page parameter to search api without adding
any major breaking change.

It does at an api validation error when trying to use
a limit beyond 5000. This is a breaking change. We could
remove this and have it only in the docs and describe that this
is a limit that grafana will apply silently.

Fixes #16049

* Fix: Corrected wrong array slice change

* Docs: minor docs fix

* Search: fixed folder tests

* Fixed: Moved limit to correct inner query

* Search: moving limit check and page check

* Search: limit in handler is no longer needed
2019-04-17 13:07:50 +02:00
Torkel Ödegaard
9cc67e49b4 Chore: Upgrade lodash to v4.17.11 (#16645) 2019-04-17 13:06:31 +02:00
Johannes Schill
4606a6a894 Chore: Lock dependencies (#16644)
* fix: Lock version of dependencies

* fix: Lock version of devDependencies

* fix: Lock down grafana/ui npm versions + regenerate lockfile

* fix: Back some versions i tried to bump

* fix: Bump react and react-dom to latest

* chore: Remove types/react from resolutions

* fix: Lock eventemitter3 version in package.json
2019-04-17 12:43:00 +02:00
Carl Bergquist
3f136e0da9 tech: replace bmizerany/assert with stretchr/testify (#16625)
bmizerany is old and unsupported. so we are replacing it
with stretchr which is an drop in replacement and something
we want to use more in Grafana.
2019-04-17 10:25:58 +02:00
Ryan McKinley
01fbf972aa Chore: update yarn.lock (#16637) 2019-04-17 09:40:42 +02:00
Ryan McKinley
514818f16d Panel Plugins: pass query request/response to react panel plugins (#16577)
* pass query request/response to panel plugins

* rename finishTime to endTime

* move QueryResponseData to a sub variable

* rename to PanelData

* make data not optional

* make data not optional

* missing optional
2019-04-16 13:23:34 -07:00
Hugo Häggmark
7b63913dc1 Explore: Adds logs highlighting in Explore on keypress (#16596)
Fixes: #16277
2019-04-16 16:27:57 +02:00
Torkel Ödegaard
75f9adf44f Build: adding dependency used by extensions (#16622) 2019-04-16 15:26:39 +02:00
Johannes Schill
a0e37a00d2 TimePicker: Re-add apply button in time picker (#16619) 2019-04-16 14:09:57 +02:00
Oleg Gaidarenko
318182ccc9 Chore: refactor auth proxy (#16504)
* Chore: refactor auth proxy

Introduced the helper struct for auth_proxy middleware.
Added couple unit-tests, but it seems "integration" tests already cover
most of the code paths.

Although it might be good idea to test every bit of it, hm.
Haven't refactored the extraction of the header logic that much

Fixes #16147

* Fix: make linters happy
2019-04-16 14:09:18 +02:00
Dominik Prokop
8069a617fe Docs: updated help for changelog cli task (#16615) 2019-04-16 13:30:02 +02:00
Carl Bergquist
68f5ddf18c replace dep with go modules (#16017)
- guide shamelessly stolen from prometheus/prometheus
- updates local interface of oauth exchange
- updates local impl of hclogger
- bump jaeger client version

closes #16088
2019-04-16 12:00:55 +02:00
Dominik Prokop
d6b48ee099 Docs: Updated changelog for 6.1.4 2019-04-16 11:18:52 +02:00
Torkel Ödegaard
057577dcc5 Heatmap: Fixed auto decimals when bucket name is not number but contains dots, fixes #13019 (#16609) 2019-04-16 10:39:12 +02:00
Carl Bergquist
490515aec6 build: partially replace gometalinter with golangci-lint (#16610)
we still use gometalinter for goconst since it doesn't 
report errors for duplicated in test files
2019-04-16 10:27:07 +02:00
Johannes Schill
406ef962fc Explore & Dashboard: New Refresh picker (#16505)
* Added RefreshButton

* Added RefreshSelect

* Added RefreshSelectButton

* Added RefreshPicker

* Removed the magic string Paused

* Minor style changes and using Off instead of Pause

* Added HeadlessSelect

* Added HeadlessSelect story

* Added SelectButton

* Removed RefreshSelectButton

* Added TimePicker and moved ClickOutsideWrapper to ui/components

* Added TimePickerPopOver

* Added react-calendar

* Missed yarn lock file

* Added inputs to popover

* Added TimePicker and RefreshPicker to DashNav

* Moved TimePicker and RefreshPicker to app/core

* Added react-calendar to app and removed from ui/components

* Fixed PopOver onClick

* Moved everything back to ui components because of typings problems

* Exporing RefreshPicker and TimePicker

* Added Apply and inputs

* Added typings

* Added TimePickerInput and logic

* Fixed parsing of string to Moments

* Fixed range string

* Styling and connecting the calendars and inputs

* Changed Calendar styling

* Added backward forward and zoom

* Fixed responsive styles

* Moved TimePicker and RefreshPicker into app core

* Renamed menuIsOpen to isOpen

* Changed from className={} to className=""

* Moved Popover to TimePickerOptionGroup

* Renamed all PopOver to Popover

* Renamed popOver to popover and some minor refactorings

* Renamed files with git mv

* Added ButtonSelect and refactored RefreshPicker

* Refactored TimePicker to use new ButtonSelect

* Removed HeadlessSelect as suggested

* fix: Fix typings and misc errors after rebase

* wip: Enable time picker on dashboard and add tooltip

* Merge branch 'master' into hugoh/new-timepicker-and-unified-component

# Conflicts:
#	packages/grafana-ui/package.json
#	packages/grafana-ui/src/components/Input/Input.test.tsx
#	packages/grafana-ui/src/components/Input/Input.tsx
#	packages/grafana-ui/src/utils/validate.ts
#	public/app/features/dashboard/panel_editor/QueryOptions.tsx
#	yarn.lock

* fix: Snapshot update

* Move TimePicker default options into the TimePicker as statics, pass the tooltipContent down the line when wanted and wrap the button in a tooltip element

* fix: Override internal state prop if we provide one in a prop

* Updated snapshots

* Let dashnav control refreshPicker state

* feat: Add a stringToMs function

* wip: RefreshPicker

* wip: Move RefreshPicker to @grafana/ui

* wip: Move TimePicker to @grafana/ui

* wip: Remove comments

* wip: Add refreshPicker to explore

* wip: Use default intervals if the prop is missing

* wip: Nicer way of setting defaults

* fix: Control the select component

* wip: Add onMoveForward/onMoveBack

* Remove code related to the new time picker and refresh picker from dashnav

* Fix: Typings after merge

* chore: Minor fix after merge

* chore: Remove _.map usage

* chore: Moved refresh-picker logic out of the refresh picker since it will work a little differently in explore and dashboards until we have replaced the TimeSrv

* feat: Add an Interval component to @grafana/ui

* chore: Remove intervalId from redux state and move setInterval logic from ExploreToolbar to its own Interval component

* feat: Add refreshInterval to Explore's URL state

* feat: Pick up refreshInterval from url on page load

* fix: Set default refreshInterval when no value can be retained from URL

* fix: Update test initial state with refreshInterval

* fix: Handle URLs before RefreshPicker

* fix: Move RefreshInterval to url position 3 since the segments can take multiple positions

* fix: A better way of detecting urls without RefreshInterval in Explore

* chore: Some Explore typings

* fix: Attach refresh picker to interval picker

* chore: Sass fix for refresh button border radius

* fix: Remove refreshInterval from URL

* fix: Intervals now start when previous interval is finished

* fix: Use clearTimeout instead of clearInterval

* fix: Make sure there's a delay set before adding a timeout when we have slow explore queries

* wip: Add refresh picker to dashboard

* feat: Add util for removing keys with empty values

* feat: RefreshPicker in dashboards and tmp rem out old RefreshPicker

* fix: Remove the jumpy:ness in the refreshpicker

* Changed placement and made it hide when your in dashboard settings

* chore: Move logic related to refresh picker out of DashNav to its own component

* feat: Add tooltip to refreshpicker

* fix: Fix bug with refreshpicker not updating when setting to 'off'

* fix: Make it possible to override refresh intervals using the dashboard intervals

* chore: Change name of Interval to SetInterval to align with ecmascripts naming since its basically the same but declarative and async

* fix: Use default intervals when auto refresh is empty in dashboard settings

* fix: Hide time/interval picker when hidden is true on the model, such as on the home dashboard

* fix: Interval picker will have to handle location changes since timeSrv wont

* RefreshPicker: Refactoring refresh picker

* RefreshPicker: minor refactoring
2019-04-16 09:15:23 +02:00
Brian Gann
d23f50ab23 Build: Fix missing icon typing (#16601) 2019-04-15 19:55:12 +02:00
Torkel Ödegaard
6724aaeff9 Plugins: added missing prop to type 2019-04-15 17:55:17 +02:00
Mitsuhiro Tanda
864a6262fe CloudWatch: GetMetricData refactoring & fix label handling (#16383)
* fix label handling

* SEARCH() results could have multiple namespace, remove from legend

* divide GetMetricStatistics related code

* divide GetMetricData related code

* divide parseGetMetricDataResponse()

* divide parseGetMetricDataQuery()

* divide test code

* add test for GetMetricData

* add test for GetMetricData parse response

* fix bug of terminating gap

* fix gofmt
2019-04-15 17:55:07 +02:00
Oleg Gaidarenko
b37ee65bd3 Chore: prepare our SQL for cockroach db (#16471)
This is basically implementation of the https://github.com/grafana/grafana/issues/8900#issuecomment-435437167
points, except for the type conversion bit.

I tried to implement idea mentioned in cockroachdb ticket (see below).
And it is possible, but it complicates things as lot - not only we have to
have 4 SQL statements instead of one, but we would have to copy the column
structure as well - PK, FG, indexes and stuff, plus there will
be additional downtime with this approach.

So idea for this pull is to prepare our SQL as much as possible, so when
cockroachdb will add support for full type conversions, we could easilly add
support for it as well.

* Add `CASCADE` to `DROP INDEX` statement

* Make string conversions explicit

Thanks @Luit

Ref #8900
Ref cockroach/cockroach#9851
2019-04-15 18:49:24 +03:00
Ryan McKinley
5a0cf1a83c AppPlugins: fix app support and add an alpha example (#16528)
* app pages

* app pages

* workign example

* started alpha support

* bump controller limit

* bump controller limit

* existing plugin pages work again

* save Plugin in cache

* remove AppPage wip
2019-04-15 16:54:00 +02:00
Patrick O'Carroll
5f1b2691a3 Switch: made minor styling tweaks to switch to align to 4px grid (#16593) 2019-04-15 16:12:03 +02:00
Torkel Ödegaard
d4bb92a3c5 Docs: minor docs update for old urls 2019-04-15 14:13:03 +02:00
Andrej Ocenas
6eb8b29d70 Chore: Add more explicit typing (#16594) 2019-04-15 13:14:52 +02:00
Hugo Häggmark
83e8dedea3 Chore: Lowered implicit anys limit to 5977
Progress: #14714
2019-04-15 12:33:13 +02:00
Hugo Häggmark
7eabc282e9 Chore: Adds typings to lodash (#16590) 2019-04-15 12:11:52 +02:00
Ryan McKinley
b267e96087 PanelEditor: Change Queries heading to Query (#16536) 2019-04-15 11:57:16 +02:00
Andrej Ocenas
66f6e16916 Security: Store datasource passwords encrypted in secureJsonData (#16175)
* Store passwords in secureJsonData

* Revert unnecessary refactors

* Fix for nil jsonSecureData value

* Remove copied encryption code from migration

* Fix wrong field reference

* Remove migration and provisioning changes

* Use password getters in datasource proxy

* Refactor password handling in datasource configs

* Add provisioning warnings

* Update documentation

* Remove migration command, moved to separate PR

* Remove unused code

* Set the upgrade version

* Remove unused code

* Remove double reference
2019-04-15 11:11:17 +02:00
Torkel Ödegaard
844ec82eb0 More development dashboards (#16550)
* Dev: more dev dashboards and structure

* Moving gdev dashboards around into folders and aligning tags
2019-04-15 10:51:17 +02:00
Carl Bergquist
9134251417 build: upgrades to golang 1.12.4 (#16545)
fix govet issue in golang 1.12.4
2019-04-15 09:18:28 +02:00
Dennis Hoppe
15383510c8 Use package libfontconfig1, instead of libfontconfig (#16548) 2019-04-15 08:20:42 +02:00
Šimon Podlipský
16d0693a46 Adjust Send on all alerts to default label (#16554)
Alerting: Adjust label for send on all alerts to default
2019-04-15 08:14:22 +02:00
Hugo Häggmark
b548c6a67f Chore: Lower limit of implicit anys to 6676 2019-04-15 05:57:39 +02:00
Ryan McKinley
08a22c806f DirectInput: new alpha datasource that lets you enter data via CSV
Initial alpha datasource that saves data directly in a panel or in the shared datasource configs.
2019-04-12 10:13:36 -07:00
Ryan McKinley
d27de81a91 Plugins: expose getBackendSrv() to plugins (#15268)
Temporarily expose getBackendSrv while we figure out a long term solution.  This will unblock developing some more complex react external plugins.
2019-04-12 09:45:22 -07:00
Torkel Ödegaard
6a315bd09d DataPanel: Added built-in interval variables to scopedVars (#16556)
For react panels the scopedVars did not contain the built in __interval and __interval_ms
variables.

Fixes #16546
2019-04-12 18:07:00 +02:00
Torkel Ödegaard
514f68ea19 TestData: Add minInterval query option 2019-04-12 18:03:51 +02:00
Hugo Häggmark
3f7aaedd8c Chore: Remove implicit anys for DashboardModel and tests (#16553)
Progress: #14714
2019-04-12 17:05:44 +02:00
Hofls
c17226af95 Pushover alert, support for different sound for OK (#16525)
Closes #15889
2019-04-12 14:57:17 +02:00
Hugo Häggmark
e8d6995737 Chore: Lowered implicit anys limit to 6816 2019-04-12 14:05:15 +02:00
Mitsuhiro Tanda
8f167c47e3 CloudWatch: Fix template variable expand bug (#16405)
CloudWatch: Fix template variable issues
2019-04-12 14:00:41 +02:00
Mitsuhiro Tanda
d7d20a5b10 CloudWatch: fix color order (#16408)
* fix cloudwatch color order

* fix test

* use for-of
2019-04-12 13:57:39 +02:00
Ryan McKinley
3c21a121eb Plugins: Unifying alpha state & options for all plugins (#16530)
* app pages

* app pages

* workign example

* started alpha support

* remove app stuff

* show warning on alpha/beta panels

* put app back on plugin file

* fix go

* add enum for PluginType and PluginIncludeType

* Refactoring and moving settings to plugins section

fixes #16529
2019-04-12 13:46:42 +02:00
Carl Bergquist
30dcf0f6c5 Revert "Build: Upgrades to go 1.12.3 (#16491)" (#16544)
This reverts commit 44b365028f.
2019-04-12 11:17:31 +02:00
Patrick O'Carroll
23535c2bb2 Annotations: Annotation list style improvements (#16541)
moved page-action-bar to top and put header inside it, removed </input> to be able to run prettier
2019-04-12 10:40:48 +02:00
Torkel Ödegaard
e44d049a8e QueryInspector: Now shows error responses (#16514)
While converting this to React we missed subscribing to errors

Fixed #16512
2019-04-12 10:01:50 +02:00
Carl Bergquist
44b365028f Build: Upgrades to go 1.12.3 (#16491)
fixes go vet issue that 1.12.3 detects
2019-04-12 09:44:02 +02:00
Ryan McKinley
6aaaa89a59 Build: Update master version number (#16532) 2019-04-12 09:20:45 +02:00
Ryan McKinley
4a4ee57fab Elasticsearch: Format elasticsearch test dashboard json (#16537) 2019-04-12 09:19:53 +02:00
Dan Cech
b9cc476eb7 Update jwt regexp to include = (#16521)
Fixes #16501
2019-04-11 15:30:55 +02:00
Daniel Lee
80f0be4d5c Chore: docs fixes underscore formatting (#16516)
Fixes #16507

Markdown formatting in VS Code converts from asterisks to underscores but this can be incorrect
in a case like _label_names()_. This fix escapes the underscores that should be kept.
2019-04-11 14:42:03 +02:00
Hugo Häggmark
e5c1cbabb1 Fix: Pass missing maxDataPoints to query in Explore (#16513)
Fixes: #16490
2019-04-11 13:57:04 +02:00
Hugo Häggmark
1341f4517a Fix: Recalculate intervals in Explore on run queries (#16510)
Fixes: #16485
2019-04-11 13:56:09 +02:00
Marcus Efraimsson
276755a0e4 devenv: add elasticsearch v6 filebeat integration (#16493)
Adds filebeat (log collector) to elasticsearch v6 docker block that 
collects Grafana logs.
Also adds a new elasticsearch v6 datasource and test dashboard 
thru provisioning.
2019-04-11 10:53:23 +02:00
Marcus Efraimsson
aaaa39a48e devenv: add worldmap panel panels for elasticsearch (#16313) 2019-04-11 09:58:42 +02:00
Ryan McKinley
d6887bf77f Plugins: Optionally preload some plugins during frontend app boot (#15266)
* auto load

* update comments

* gofmt

* use preload from json

* fix formatting

* change general plugin loader to app

* Refactoring: Plugin preloading #15266
2019-04-11 08:02:22 +02:00
Ryan McKinley
5e48750868 Panels: Add types for DataList and range (#16500) 2019-04-11 07:57:24 +02:00
Hugo Häggmark
ef44a05be3 Chore: Lowered implicit anys limit to 6818 2019-04-11 07:09:31 +02:00
Dominik Prokop
5b1f0bb01d PanelData: Rename ColumnStats type to FieldStats (#16494) 2019-04-10 18:38:41 +02:00
Ryan McKinley
5bc936d2da DataSourceApi: add getCollapsedText(query) to DataSourceApi (#16482)
Add getQueryDisplayText() to DataSourceApi
2019-04-10 09:31:32 -07:00
Ryan McKinley
23d461af13 Graph: Add some typescript types for data (#16484)
* add some types on graph

* set some types in graph

* Fixed typings
2019-04-10 15:23:07 +02:00
Carl Bergquist
4f46e739a2 Build: Updates goconvey to work on go1.12 (#16483) 2019-04-10 14:08:19 +02:00
Andrej Ocenas
2d7fc55df7 Provisioning: Do not allow deletion of provisioned dashboards (#16211)
* Unprovision dashboard in case of DisableDeletion = true

* Rename command struct

* Handle removed provision files

* Allow html in confirm-modal

* Do not show confirm button without onConfirm

* Show dialog on deleting provisioned dashboard

* Changed DeleteDashboard to DeleteProvisionedDashboard

* Remove unreachable return

* Add provisioned checks to API

* Remove filter func

* Fix and add tests for deleting dashboards

* Change delete confirm text

* Added and used pkg/errors for error wrapping
2019-04-10 13:29:10 +02:00
Hugo Häggmark
9f007137b3 Chore: lower limit for implicit anys to 6829 2019-04-10 11:29:46 +02:00
Ryan McKinley
5e7f7e658d Singlestat-v2/Gauge: Show title when repeating (#16477)
* show title in singlestat2

* show title in gauge

* use CSS class for emotion

* use emotion not scss
2019-04-10 10:19:44 +02:00
Scott Leggett
06dfbb382b Docs: fix grammar in query hint, tests, and documentation (#16444)
* Fix use of "monotonically" in explore documentation

* Fix use of "monotonically" in query hints and tests
2019-04-10 10:12:57 +02:00
Alexander Zobnin
180772f169 Heatmap: Fix empty graph if panel is too narrow (#16460)
Fixes #16378
2019-04-10 10:11:17 +02:00
Torkel Ödegaard
c0bb154603 Release: updated latest.json 2019-04-09 20:39:13 +02:00
Torkel Ödegaard
0ce1b83fc5 Docs: Updated changelog 2019-04-09 20:36:49 +02:00
Marcus Efraimsson
3d82c848dd docs: fixes and update current version 2019-04-09 17:30:21 +02:00
Torkel Ödegaard
eba67276d9 Docs: Updated changelog for v6.1.3 2019-04-09 15:32:38 +02:00
Torkel Ödegaard
fed75695a1 Graph: fixed png rendering with legend to the right (#16463) 2019-04-09 15:19:49 +02:00
Hugo Häggmark
a887c344eb Fix: Disables auto open datasource picker on focus (#16398) 2019-04-09 14:59:30 +02:00
Marcus Efraimsson
80a170e62f add some mock/stub guidelines to testing guideline (#16466) 2019-04-09 14:34:34 +02:00
Hugo Häggmark
ed7ad8f6ac Feat: Suggestion list in Explore is virtualized (#16342)
* Wip: virtualize suggestions list

* Refactor: Separate components to different files

* Refactor: Made TypeaheadItem a FunctionComponent using emotion

* Refactor: Use theme to calculate width instead of hardcoded values

* Refactor: Calculate list height and item size

* Style: Adds labels to emotion classes

* Refactor: Flattens CompletionItems to one list

* Chore: merge yarn.lock

* Refactor: Adds documentation popup on the side

* Refactor: Makes position of TypeaheadInfo dynamic

* Refactor: Calculations moved to separate file
2019-04-09 14:25:13 +02:00
Torkel Ödegaard
f0eddcd8a8 Docs: Updated roadmap issue to link to the pinned roadmap issues 2019-04-09 14:22:47 +02:00
Torkel Ödegaard
52c3990412 Graph: Fixed auto decimals in legend values (#16455)
Fixes #16448
2019-04-09 13:04:09 +02:00
Patrick O'Carroll
a96194fab5 Styling: Aligned heading (#16456)
* aligned headings on profile, admin and configuration pages

* fixed snapshot
2019-04-09 12:41:02 +02:00
Mitsuhiro Tanda
d2968c73e6 add PromQL keyword for adhoc filter (#16426) 2019-04-09 09:51:15 +02:00
Torkel Ödegaard
b46b84f156 Singlestat: Use decimal override when manually specified (#16451)
Fixes #16373
2019-04-08 17:32:34 +02:00
Torkel Ödegaard
3c42fece71 Graph: follow-up graph decimals fix, #16414 (#16450) 2019-04-08 16:54:15 +02:00
Oleg Gaidarenko
67cbc7d4cf Chore: use remote cache instead of session storage (#16114)
Replaces session storage in auth_proxy middleware with remote cache

Fixes #15161
2019-04-08 14:31:46 +03:00
Torkel Ödegaard
645a6e5856 Docs: Minor changelog tweak 2019-04-08 12:02:30 +02:00
Torkel Ödegaard
32270c122b Docs: Updated changelog with v6.1.2 release issues 2019-04-08 11:41:47 +02:00
Marcus Efraimsson
4a70056d3c datasource: fix disable query when using mixed datasource (#16409)
This fixes an error that was thrown when one or several queries
was disabled using the mixed datasource.

Fixes #12977
2019-04-08 11:39:54 +02:00
Patrick O'Carroll
70dcb6a22a Graph: Fixed series legend color for hidden series (#16438)
* replaced colors for headingColor, link and linkDisabled with colors from grayscale, replaced colors for linkDisabled and linkHover with colors from grayscale, changed color for sha-modal-in-text to text-color-empahises

* fixed snapshot
2019-04-08 10:52:00 +02:00
Torkel Ödegaard
9630d812b8 Templating: Fixed loading React variable query editor (#16439)
Fixes #16439
2019-04-08 10:46:57 +02:00
Torkel Ödegaard
0968fbed49 Styles: Fixed left menu highlight (#16431)
Upgrades to webpack & css optimization caused changes
in production build that removed the left brand
gradient.

Fixes #16430
2019-04-08 10:41:49 +02:00
Oleg Gaidarenko
99605d1abf Fix: remove test artefact (#16411)
See https://github.com/grafana/grafana/pull/16200#issuecomment-479370356
Thanks @xlson

Ref #16200
2019-04-08 09:52:45 +02:00
Patrick O'Carroll
128fb8fa7e Theme: Reworking button styling (#16362)
* added new variables for height in theme, added height to gui button large, replaced add gicon with regular gicon, replaced + with gicon, changed button display to flex

* set fixed height to large button, removed xlarge button and replaced with large button

* removed button-mini and replaced with button-small, set fixed height to default button and button-small

* fixed padding for default and large button, fixed height for navbar button, fixed snapshots

* fixed padding and margin on navbar buttons

* gave special height to login btn-primary

* readded btn-mini class with same styling as btn-small and a deprecated notice

* fixed add panel widget buttons
2019-04-08 09:48:15 +02:00
Torkel Ödegaard
9b39dbc2fb Graph: Fixed tooltip highlight on white theme (#16429)
Fixes #16359
2019-04-07 19:01:59 +02:00
Torkel Ödegaard
78ef1719e2 BarGauge: Round sizing to avoid float widths
LED cell width needs to be integers
2019-04-07 15:26:21 +02:00
Torkel Ödegaard
6ef35f0a8e Graph: Allow override decimals to fully override (#16414)
Override decimals did not fully override auto scaling logic

Fixes #16068
2019-04-07 14:45:58 +02:00
Torkel Ödegaard
8a4a6b4dc1 Units: Correctly use the override decimals (#16413)
Fixes bugs introduced in PR #14716 and #15146 also restores unit tests that where lost in the
move from kbn units to @grafana/ui units

Fixes #16068
Fixes #16373
2019-04-07 14:42:42 +02:00
Reiner Gerecke
f120f5a737 Docs: Remove broken youtube link in timerange reference (#16415)
The video on youtube got removed.

Fixes #16302
2019-04-07 14:35:28 +02:00
Torkel Ödegaard
59c081e896 BarGauge: Fixed minor margin issue (#16419)
Fixed margin issue that was not accounted for in width calc (#16419)
2019-04-07 14:32:41 +02:00
Torkel Ödegaard
a5a0352dcc Docs: Updated GitHub PR Template 2019-04-05 15:09:48 +02:00
Torkel Ödegaard
566b3d178a Bar Gauge: Show tile (series name) & refactorings & tests (#16397)
* WIP: began work on adding title support to bar gauge

* Feat: BarGauge progress

* wip: trying improve text size handling in bar gauge

* BarGauge: progress on title & value auto sizing

* BarGauge: more auto size handling

* bargauge: minor tweaks

* Added tests

* Refactoring: BarGauge refactoring moving css generation to seperate functions and adding some basic tests

* Refactoring VizRepeater and more

* Fix: updated and fixed tests
2019-04-05 12:59:29 +02:00
Torkel Ödegaard
9530906822 Update CHANGELOG.md 2019-04-05 11:46:17 +02:00
Torkel Ödegaard
35e68b868e Fix: align panel padding between sass & js theme (#16404) 2019-04-05 11:34:24 +02:00
Torkel Ödegaard
6d3b6f3c2f Fix: playlist now preserve the correct url query params (#16403)
Fixes #16377
2019-04-05 11:09:57 +02:00
Torkel Ödegaard
173e7fd839 Fix: Graphite query rendering fix (#16390)
Only interpolate string parameters

Fixes #16367
2019-04-05 09:56:47 +02:00
Sean Lafferty
c2d399b059 Fix: Query editor toggle edit mode fix (#16394)
Increase timeout when waiting for datasource toggleEditorMode check 

Fixes  #16393
2019-04-05 07:36:32 +02:00
Torkel Ödegaard
47e51cb6b3 Refactor: Plugin exports & data source / panel types (#16364)
* wip: began work off removing meta and pluginExports from DataSourceApi interface

* WIP: changing how plugins are exports and loaded

* Down the refactoring rabit hole that keeps expanding

* TestData now returns DataSourcePlugin

* Refactoring: fixed app config page loading, type renamings and more typings

* Refactor: Correct casing on DatasourceStatus => DataSourceStatus
2019-04-04 18:30:15 +02:00
Andrej Ocenas
e04990752c Chore: Update lockfile (#16380) 2019-04-04 18:29:36 +02:00
Marcus Efraimsson
5da1faf454 Alerting: Notification channel http api fixes (#16379)
Fixes so it's possible to create new notification channel and providing uid.
Fixes better error/result handling when updating a notifcation channel.

Fixes #16372
Ref #16219 #16012
2019-04-04 17:52:40 +02:00
Andrej Ocenas
08ce7f6c93 Chore: Add task to find FocusConvey tests (#16381) 2019-04-04 14:48:11 +02:00
The Rock Guy
335aa7c9f2 CloudWatch: Update AWS/IoT metric and dimensions (#16337)
Closes #16334
2019-04-04 12:54:20 +02:00
Benjamin Reed
1e52087ae2 Fix: Table Panel fix to re-render panel when options are updated (#16376)
Re-render panel when date and string options are updated 

Fixes #16375
2019-04-04 10:34:59 +02:00
Kevin Hui
d35e883eac Docs: Fix typo in Prometheus documentation (#16369) 2019-04-03 18:52:54 +02:00
Leonard Gram
6baba64935 build: Fixed incorrect permissions for repo folders in ci-deploy. (#16360) 2019-04-03 15:24:34 +02:00
Torkel Ödegaard
6ef844daa4 Docs: remove embedd info about samesite cookie from app, docs only is better 2019-04-03 14:27:20 +02:00
Hugo Häggmark
99e4bbc23e Chore: Lowered error count limit 2019-04-03 13:48:11 +02:00
Leonard Gram
9b393d8f64 build: fixes bug in verification script. 2019-04-03 12:12:43 +02:00
Johannes Schill
8370a182f7 Tech: Bump typescript and jest (#16354)
* chore: Bump Typescript to 3.4.1

* chore: Bump babel-jest, jest, ts-jest

* fix: Fix tests after typescript upgrade by disabling some typings

* chore: noImplicitAny

* chore: Bump typescript in @grafana/ui
2019-04-03 11:41:08 +02:00
Torkel Ödegaard
85b4b336fd Update CHANGELOG.md 2019-04-03 11:02:56 +02:00
Torkel Ödegaard
67ab8ba521 Update CHANGELOG.md 2019-04-03 11:02:22 +02:00
Torkel Ödegaard
5aea77fc95 Automation: Updates to yarn cli cherrypick & changelog tasks (#16357)
* Automation: Updated cherrypick task to show merge sha

* Fixed changelog milestone filtering
2019-04-03 09:50:24 +02:00
Yariv Amar
c2231854fd Feat: Improve embed panel info text (#16344)
* improving documentation for Embed Panel

Fixes #16345
2019-04-03 09:37:56 +02:00
Mitsuhiro Tanda
58eb74660d Fix: Cloudwatch fix for dimension value (#16356)
Fixes autocomplete suggestion after changing dimension key

Fixes #15984
2019-04-03 09:23:15 +02:00
Leonard Gram
4e547980fb build: Script to check that our repos work and what the latest package version is (#16350)
* build: Easy version check of deb & rpm repos
2019-04-03 08:51:43 +02:00
Torkel Ödegaard
2e59166daa Fix: Autoprefixer is now working (#16351)
The autoprefixer not working broke the phantomjs backend png rendering

Fixes #16345
2019-04-02 18:15:30 +02:00
Daniel Lee
7e149fb4d3 Chore: docs updates to what's new for 6.1 (#16346)
Docs: update what's new article for 6.1
2019-04-02 15:28:03 +02:00
Leonard Gram
b48c18a1c5 build: Fix for renamed package for armv6. 2019-04-02 13:37:57 +02:00
Dominik Prokop
7764f04abf Chore: bump storybook and add build script (#16340) 2019-04-02 13:18:13 +02:00
Ryan McKinley
ede2d54849 Refactor: React Panels to only use SeriesData[] (#16306)
* only use SeriesData[] in react panels
* update target
* Refactor: Added refId filtering for queryResponse and queryError
2019-04-02 07:22:52 +02:00
Pedro Gomes
6e54a7ae05 Docs: Suggest add-apt-repository to install APT repos (#16333)
* Suggest add-apt-repository to install APT repos
* typo
2019-04-02 07:02:58 +02:00
Dripoul
fec7c3e133 Units: Add angle units, Arc Minutes and Seconds (#16271) 2019-04-01 19:19:11 +07:00
Hugo Häggmark
c3816f3a1d Chore: Lowered implicit any limit to 6850 2019-04-01 10:00:36 +02:00
Hugo Häggmark
988b7c4dc3 Feat: Adds reconnect for failing datasource in Explore (#16226)
* Style: made outlined buttons and used it in Alert component

* Refactor: clean up state on load data source failure

* Refactor: test data source thunk created

* Refactor: move logic to changeDatasource and call that from intialize

* Refactor: move load explore datasources to own thunk

* Refactor: move logic to updateDatasourceInstanceAction

* Tests: reducer tests

* Test(Explore): Added tests and made thunkTester async

* Fix(Explore): Fixed so that we do not render StartPage if there is no StartPage

* Fix(Explore): Missed type in merge

* Refactor: Thunktester did not fail tests on async failures and prevented queires from running on datasource failures

* Feat: Fadein error alert to prevent flickering

* Feat: Refresh labels after reconnect

* Refactor: Move useLokiForceLabels into useLokiLabels from PR comments

* Feat: adds refresh metrics to Prometheus languageprovider

* Style: removes padding for connected datasources

* Chore: remove implicit anys
2019-04-01 07:38:00 +02:00
Marcus Efraimsson
e69039d8d1 docs: improve alert notification channel provisioning (#16262) 2019-03-31 20:50:32 +07:00
Torkel Ödegaard
dc4bc426f5 Build: Moved the failing appveyor file so we can get green builds in master 2019-03-30 06:41:27 +01:00
Ryan McKinley
e43aa220c0 Fix: Build report the correct directives before failing (#16312) 2019-03-30 06:21:24 +01:00
Navaneesh Kumar
545da8ffb0 Fix: input elements autofill background (#16295) 2019-03-29 18:21:22 +01:00
Dominik Prokop
6b2c81bcf2 Fix: Bring back styles on Switch components when checked
Fixed bug introduced by replacing native input with @grafana/ui/Input component.

Switch's styling relies on native input checked attribute used in adjacent sibling selector. Because React based Input is wrapped in div, there was no chance for styling to work
2019-03-29 16:50:37 +01:00
Hugo Häggmark
40a1752497 Update CHANGELOG.md
Fix: change from unrelease to 2019-03-27 for 6.1.0-beta1
2019-03-29 15:41:39 +01:00
Hugo Häggmark
8368576249 Chore: breaks build if certain FrontEnd limits are exceeded (#16301)
Build: breaks build if certain FrontEnd limits are exceeded
2019-03-29 15:32:58 +01:00
Torkel Ödegaard
74ae756d02 Fix: Graphite query ast to string fix (#16297)
Fixes #16291
2019-03-29 14:25:44 +01:00
Torkel Ödegaard
5c3a0a624a Fix: Template query editor this bind exception fix (#16299)
Also fixes the default 100% width of inputs.
Fixes #16298
2019-03-29 14:25:11 +01:00
Marcus Efraimsson
79b86466fd Fix: Alerting Notification channel http api fixes (#16288)
Fix so that uid can be changed when updating notification
channels through the http api.
Update documentation
2019-03-29 09:42:38 +01:00
Ryan McKinley
bfba47c6c4 Refactor: Move LogLevel and Labels utils to @grafana/ui (#16285)
* rename Tags to Labels in SeriesData

* move some logs stuff to grafana/ui

* add roundtrip tests
2019-03-29 09:41:37 +01:00
Ryan McKinley
d0d5b38572 Refactor: Rename Tags to Labels in SeriesData (simple) (#16284)
* rename Tags to Labels in SeriesData

* copy timeseries tags to labels
2019-03-29 09:24:16 +01:00
Igor Ratsuk
930fd8b43a Elasticsearch: Fix view percentiles metric in table without date histogram (#15686)
Fix for properly display percentiles metrics in table panel when 
using a query without date histogram and for example grouping by 
terms.

Fixes #3786
2019-03-29 13:22:04 +07:00
kleph
7ddb770e3b Configuration: Improve session_lifetime comments (#16238) 2019-03-29 13:10:20 +07:00
Zzy
1b84a924a3 Alerting: Makes timeouts and retries configurable (#16259)
Adds new alert settings for configuring timeouts and retries named 
evaluation_timeout_seconds, notification_timeout_seconds 
and max_attempts.

Closes #16240
2019-03-29 12:58:37 +07:00
Ryan McKinley
e6d9a524b4 Fix: Correct SnapshotData typing (#16279) 2019-03-28 20:59:59 +01:00
Ryan McKinley
03951c00cb Feat: Angular panels & SeriesData to Table/TimeSeries (#16266)
Similar to how the react panels make sure all data is SeriesData before passing it to the react panels, this makes sure SeriesData is converted to TableData|TimeSeries before passing it to the angular panels.

It also changes the typing to encourage using SeriesData for future development
2019-03-28 18:21:53 +01:00
Ryan McKinley
236074ea47 Fix: React Graph & Show message on no data (#16278) 2019-03-28 18:15:20 +01:00
Dominik Prokop
9fd824960f Feature: added actionable message in Explore when no datasource configured (#16252) 2019-03-28 17:17:01 +01:00
Steven Sheehy
0bc314a47b Feature: Case insensitive Loki search (#15948)
* Case insensitive Loki search
* Make Loki case insensitivity work with highlighting

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-28 15:58:19 +01:00
Ryan McKinley
c8b2102500 Feat: Singlestat panel react progress & refactorings (#16039)
* big value component

* big value component

* editor for font and sparkline

* less logging

* remove sparkline from storybook

* add display value link wrapper

* follow tooltip

* follow tooltip

* merge master

* Just minor refactoring

* use series after last merge

* Refactoring: moving shared singlestat stuff to grafana-ui

* Refactor: Moved final getSingleStatDisplayValues func
2019-03-28 14:57:49 +01:00
Oleg Gaidarenko
1d955a8762 Chore: Implement gosec (#16261)
See https://github.com/securego/gosec for more info.

Disabled a lot of rules. I guess we should go through them
and recheck if we really need to disable some

Fixes #16204
2019-03-28 14:17:07 +01:00
Torkel Ödegaard
ad939b0583 Fix: Updated snapshot unit test that was failing 2019-03-28 11:31:46 +01:00
Patrick O'Carroll
fbcc10994e Refactor: Theme & Removed the last rems (#16245)
* repalced rems with pixels and variables

* replaced rems with pixels and variables

* removed last rems by deleting unused classes or replacing with pixels and variables

* restored edit-sidemenu etc with comment
2019-03-28 11:14:30 +01:00
Patrick O'Carroll
52851a38b8 Refactor: Theme input padding variables (#16048)
* removed input padding variables and replaced with new inset variables, also removed unused class in _gf-form

* removed last input padding variable

* removed table-cell-padding variable

* added input padding variable to template file

* fixed input-padding variable

* removed regualt inset variable(for now), added input-padding to a class

* removed empty line
2019-03-28 11:13:53 +01:00
Ryan McKinley
0112bdeb6a Feat: More robust csv support (#16170)
* stream csv

* merged master

* merged master

* fix test failures

* add csv files

* update boolean parsing

* add toCSV

* add toCSV

* add toCSV

* add streaming datasource

* set time range

* streaming to a graph

* streaming datasource

* streaming table

* add server to the streaming

* remove react streaming
2019-03-28 10:49:09 +01:00
Dennis Hoppe
749c76f2a1 Docs: Fix rpm dependencies example (#16272)
The current version of Grafana requires the package ```urw-fonts```.
2019-03-28 10:12:22 +01:00
flopp999
0bca6bcb27 Fix: HTML meta tags fix for iOS (#16269) 2019-03-28 09:23:43 +01:00
Dominik Prokop
206921d21b Feature: Introduced CallToActionCard to @grafana/ui (#16237)
CallToActionCard is an abstraction to display a card with message, call to action element and a footer. It is used i.e. on datasource add page.
2019-03-27 22:33:20 +01:00
Ryan McKinley
5324bb4f11 Refactor: Rename TimeSeriesVM to GraphSeriesXY (#16216)
* Rename TimeSeriesVM to Trace

* remove TimeSeriesVM from types

* rename to GraphSeriesVM

* rename again

* now GraphSeriesXY
2019-03-27 21:51:10 +01:00
Oleg Gaidarenko
04b3afcd15 Chore: Implement revive (#16200)
Since we do not like some of the default golint rules,
this commit proposes to use https://github.com/mgechev/revive.

And potential revive speed-up should't hurt :).

Right now, presented config (./conf/revive.toml) is permissive,
we might improve it over time however. Fixes for found revive
issues in the code are very limited so it wouldn't be large to review.

Also in this commit:

* Add annotations for makefile commands and declare phony targets

* Rename "gometalinter" script and CI command to "lint"
  since we are doing there a bit more then using gometalinter package

* Add Makefile rules to .editorconfig

* Documentation which mentioned "golint" replaced with revive

Fixes #16109
Ref #16160
2019-03-27 17:53:49 +01:00
Floyd May
33d1d427bc InfluxDB: Fix tag names with periods in alerting (#16255)
Updates regex to match tag names with periods when generating
series names in alerting evaluation (backend).

Fixes #9148
2019-03-27 23:13:12 +07:00
Šimon Podlipský
00a07c855d Fix: Table Panel and string values & numeric formatting (#16249) 2019-03-27 15:18:15 +01:00
Šimon Podlipský
ad6b11c90a Tech: Patch lib updates, update yarn.lock (#16250) 2019-03-27 15:13:45 +01:00
Daniel Lee
0e2d279e3a Chore: docs whats new article for the 6.1 release (#16251) 2019-03-27 13:43:37 +01:00
Dominik Prokop
58109ec5ac Chore: Storybook improvements (#16239)
- Fixed BarGauge story throwing an error
- Added helpers for aligning stories
2019-03-27 12:49:27 +01:00
Dominik Prokop
c9e4fedaa8 Feat: Introduce Button and LinkButton components to @grafana/ui (#16228)
- Bumped Storybook to v5
- Introduced Emotion
- Add additional config for storybook (combinations add-on, default padding in preview pane)
- Added basic react based button components
- Introduced AbstractButton, Button and LinkButton components together with stories
- Exposed button components from @grafana/ui
2019-03-27 11:50:36 +01:00
Daniel Lee
232b7fd698 Chore: changelog adds note for #16234 2019-03-27 11:46:47 +01:00
Daniel Lee
8a8a1b8e11 Fix: Prometheus regex ad-hoc filters w/ wildcards (#16234)
Fixes #14615.

Removes extra escaping for regex filter values when using ad hoc
filters for Prometheus. The extra escaping causes queries with
regex characters to be invalid.
2019-03-27 11:43:17 +01:00
Daniel Lee
bbdc1e6bd8 Chore: changelog notes for #13825,#15205,#14877,#16227 2019-03-27 09:49:23 +01:00
Navaneesh Kumar
5ea823a65a Fix: Alert email variable name typo fixed (#16232) 2019-03-27 09:42:20 +01:00
Daniel Lee
3146500de5 Fix: scripts changelog cli per page set to 100
GitHub pagination was limiting the result to 30 issues.
This fix makes the changelog script return up to 100
issues. Will have to add a loop to fetch more once we
merge more than 100 PR's that should be added to the
changelog.

Also, fixes a bug where issues that were not included
in the milestone were being returned.
2019-03-27 09:38:28 +01:00
Navaneesh Kumar
ab541e2e13 Fix: Dashboard history diff & white theme fix (#16231) 2019-03-27 09:24:44 +01:00
Hugo Häggmark
7f9ad77153 Merge pull request #16241 from grafana/hugoh/no-implicit-any
Chore: Eliminate implicit anys in backend_srv
2019-03-27 09:14:16 +01:00
Patrick O'Carroll
2271471826 Chore: Theme consistency, rems => pixels or variables (#16235)
* repalced rems with pixels and variables

* replaced rems with pixels and variables
2019-03-27 09:14:02 +01:00
Patrick O'Carroll
75e3d3e59a Chore: Theme consistency, rems => pixels (#16145)
* replaced rem with pixels or variables

* replaced rems with pixels or variables

* repalced rems with pixels and variables
2019-03-27 08:48:24 +01:00
Daniel Lee
2637c653ef changelog: adds notes for #16229 and #16227 2019-03-26 17:03:08 +01:00
Daniel Lee
462e0d0c6f Fix: Elasticsearch fix template variables in the alias field (#16629)
Fixes #16040

Fix so that a template variable in the alias field is not interpolated on blur and only the value sent in the query is interpolated. Does a deep clone of the options.targets to avoid changing the original alias field.
2019-03-26 16:15:23 +01:00
Torkel Ödegaard
c02782c0ec Fix: TablePanel column color style now works even after removeing styles, fixes #16162 (#16227) 2019-03-26 15:18:46 +01:00
Torkel Ödegaard
6ef11872f7 Docs: Updated changelog for 6.1 release (#16224)
* Docs: Updated changelog for 6.1 release

Also Updates the changelog cli task to group issues into bug fixes
and not bug fixes.

* Minor changelog fixes
2019-03-26 13:26:20 +01:00
Marcus Efraimsson
2ae63e70c0 Alerting: Notification channel http api enhancements (#16219)
Now returns uid in response to get notification channel by id.
Adds GET/PUT/DELETE support for notification channel by uid, 
  /api/alert-notifications/uid/:uid.
Break apart alerting and alert notification http api docs in two 
  pages and update documentation to make it up to date
  with current implementation.

Fixes #16012
2019-03-26 18:37:02 +07:00
Daniel Lee
9f58b85693 Merge pull request #16210 from grafana/16187_docs
docs: loki provisioning
2019-03-26 09:46:14 +01:00
Ryan McKinley
f963033d2a Upgrades: Patch updates to yarn lock (#16215) 2019-03-26 08:49:09 +01:00
Ryan McKinley
6bec36ea04 Fix: DatasourceApi query response typing fix (#16214) 2019-03-26 08:45:15 +01:00
Marcus Efraimsson
6b8e3122f8 chore(influx): no point of reading response when bad status (#16212)
There's no point in reading the body response without using
the result so removing it.

Fixes #9199
Ref #16207
2019-03-26 12:10:24 +07:00
Marcus Efraimsson
29fc1ed77b docs: loki provisioning 2019-03-26 11:59:12 +07:00
Daniel Lee
fda7e686f3 Merge pull request #15205 from seanlaff/12556-oauth-pass-thru
Add oauth pass-thru option for datasources
2019-03-25 21:52:20 +01:00
Andrej Ocenas
516b7ce845 docs(dev): Update docs about devenv dir (#16208)
* Update readmes

* Fix devenv dasboard query

* Update devenv readme

* Add link to devenv from docs
2019-03-25 21:14:24 +01:00
Marcus Efraimsson
6c9b9b360a fix(dashboard): time regions spanning across midnight (#16201)
Fixes #14590
2019-03-25 23:51:10 +07:00
Ramon Carvalho Maciel
d791a6211d fix(InfluxDB): Reads body and close request body even for error status codes (#16207) 2019-03-25 17:42:26 +01:00
Ryan McKinley
941b770c46 chore: more TableData to SeriesData renaming (#16206) 2019-03-25 17:30:53 +01:00
Torkel Ödegaard
dbc2f2761a fix(panels/graph): Default option name for spaceLength was accidentally changed (#16205) 2019-03-25 17:12:39 +01:00
Dominik Prokop
9655eeda18 fix(explore): only show split close button when split is active (#16203) 2019-03-25 16:44:09 +01:00
Torkel Ödegaard
8ef1c75aa1 fix(react2angular): Fixed react to angular wrapper watching function expressions causing infinte digest loop, fixes #16194 (#16196) 2019-03-25 16:29:09 +01:00
Torkel Ödegaard
7c81f4dfd8 fix(Alerting): Fixed alert rules with eval in day units, fixes #16174 (#16182) 2019-03-25 16:27:58 +01:00
Peter Holmberg
8a396acdb4 fix(panel/table): Fix for white text on white background when value is null 2019-03-25 16:21:07 +01:00
Peter Holmberg
4898502e4e refactor(grafana/ui): Replace <input />with Input component from grafana/ui (#16085)
* replace with Input component from grafana/ui

* removing placeholder classname

* change import

* fix import
2019-03-25 15:53:05 +01:00
Steven Sheehy
dd388ed578 fix(loki): Hide empty labels column
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-25 15:23:54 +01:00
Leonard Gram
8dfa1f4c12 build: fixes publishing version. 2019-03-25 15:01:45 +01:00
Ryan McKinley
77b3da3e8b refactor(data models): Renamed TableData to SeriesData (#16185) 2019-03-25 14:46:16 +01:00
Daniel Lee
c7d108264d Merge pull request #16137 from mtanda/cloudwatch_update_metrics_list
update cloudwatch metrics/dimensions list
2019-03-25 14:42:15 +01:00
Andrej Ocenas
a978e28e7c chore(core/utils): Add typings to datemath.ts (#16195)
* Add typings

* Remove explicit cast
2019-03-25 14:32:55 +01:00
Ryan McKinley
e5c8375ec2 only call onPanelMigration when the version actually changes (#16186)
* set the plugin version if there is a migration handler
* only call panel migration if the version changes
* set the version after change also
* avoid NPE... check that we have options
* destroy is based on the previous panel type, not the next one
* Panels: Minor refactoring on panel plugin version code, #16186
2019-03-25 14:10:23 +01:00
Dominik Prokop
a8c50ed6ba feat(explore): make it possible to close left pane of split view (#16155)
* feat(explore): make it possible to close left pane of split view

* Use action's type prop instead of enum
2019-03-25 12:49:15 +01:00
Dominik Prokop
c2e9daad1e feat(Explore): make sure Loki labels are up to date (#16131)
* Migrated loki syntax and labels logic to useLokiSyntax hook

* Enable loki labels  refresh after specified interval has passed

* Enable periodic loki labels refresh when labels selector is opened

* Fix prettier

* Add react-hooks-testing-library and disable lib check on typecheck

* Add tests for loki syntax/label hooks

* Move tsc's skipLibCheck option to tsconfig for webpack to pick it up

* Set log labels refresh marker variable when log labels fetch start

* Fix prettier issues

* Fix type on activeOption in useLokiLabel hook

* Typo fixes and types in useLokiSyntax hook test fixes

* Make sure effect's setState is not performed on unmounted component

* Extract logic for checking if is component mounted to a separate hook
2019-03-25 12:08:28 +01:00
Leonard Gram
cf7a5b552b build: makes sure grafana.version is available when deploying. 2019-03-25 11:40:56 +01:00
Hugo Häggmark
d563505dd3 fix: added missing event to function signature
Fixes: #16055
2019-03-25 11:23:59 +01:00
Torkel Ödegaard
e578e8d2dc Merge pull request #16189 from grafana/hugoh/explore-graphite-url-not-working
Added target as isMetric property
2019-03-25 10:54:22 +01:00
Leonard Gram
f0c6a480cd build: refactoring 2019-03-25 09:48:45 +01:00
Leonard Gram
768c7b6f4a build: updated build container with support for rpi1. 2019-03-25 09:48:45 +01:00
Leonard Gram
ff977331f4 build: support for publishing armv6. 2019-03-25 09:48:45 +01:00
Leonard Gram
6e802dc94d build: builds armv6 with rpi1 compat gcc. 2019-03-25 09:48:45 +01:00
Hugo Häggmark
b42dec7353 fix: added target and datasource as isMetric property
Fixes: #15862
2019-03-25 09:08:17 +01:00
Torkel Ödegaard
35965e0efd Merge pull request #16184 from grafana/remove-implicit-anys-progress
chore: Removed implicit anys in react container and test helpers
2019-03-25 07:50:00 +01:00
Torkel Ödegaard
e3d33e6c4a chore: Removed implicit anys in react container and test helpers 2019-03-24 20:27:12 +01:00
Torkel Ödegaard
090b3f6c6d Merge pull request #16166 from ryantxu/drop-panel-plugin-setters
Refactor ReactPanelPlugin change hooks -> handler & add panel version to json
2019-03-24 19:07:06 +01:00
Torkel Ödegaard
7b97565550 Merge branch 'master' into drop-panel-plugin-setters 2019-03-24 18:37:14 +01:00
Torkel Ödegaard
f4f5eeeb18 Pamels: Options are always there 2019-03-24 18:34:43 +01:00
Torkel Ödegaard
e03c7bf1a3 Panels: Support angular -> react migration via PanelMigrationHandler 2019-03-24 17:11:00 +01:00
Torkel Ödegaard
20fec4d261 Panels: Added more tests for change panel plugin 2019-03-24 16:39:55 +01:00
Torkel Ödegaard
0d55141a2d Panels: Refactoring how panel plugins sets hooks and components, #16166 2019-03-24 15:56:32 +01:00
Marcus Efraimsson
24ad47aa64 Merge pull request #16179 from paulfantom/patch-1
clarify notifications API docs
2019-03-24 18:22:25 +07:00
Paweł Krupa
2a207d6970 clarify notifications API docs 2019-03-24 11:49:20 +01:00
Torkel Ödegaard
292f54ba37 Merge branch 'drop-panel-plugin-setters' of https://github.com/ryantxu/grafana into ryantxu-drop-panel-plugin-setters 2019-03-24 07:54:07 +01:00
Torkel Ödegaard
5572323581 Merge pull request #16173 from ryantxu/no-process-timeseries
remove TimeSeriesStats and processTimeSeries
2019-03-24 07:43:06 +01:00
ryan
e48767a14a remove processTimeSeries 2019-03-23 13:18:00 -07:00
ryan
d6ae76c8a3 merge master 2019-03-23 13:13:09 -07:00
ryan
009cd086aa merge master 2019-03-23 13:07:46 -07:00
Torkel Ödegaard
5d1450dee1 Merge branch 'master' into no-process-timeseries 2019-03-23 17:59:20 +01:00
Torkel Ödegaard
4db914578c Merge pull request #16171 from ryantxu/pie-display
use displayValue in pie chart
2019-03-23 17:57:05 +01:00
Torkel Ödegaard
0d62d1b47f Merge pull request #16172 from ryantxu/rename-stat-to-show
rename stat to show in UI
2019-03-23 17:56:04 +01:00
Torkel Ödegaard
fa81ba8ffc Merge pull request #16165 from ryantxu/rename-float-test
renamed floatPairs.test.ts
2019-03-23 07:24:21 +01:00
ryan
65476d4044 don't use process timeseries 2019-03-22 15:40:17 -07:00
ryan
56e1528c0e rename stat to show in UI 2019-03-22 15:23:51 -07:00
ryan
2e079659f8 use display value in pie chart 2019-03-22 15:16:04 -07:00
ryan
6da2f132c7 keep plugin versions 2019-03-22 13:45:09 -07:00
ryan
82be27a42a remove panel plugin setters 2019-03-22 13:12:35 -07:00
ryan
47b3fc5e63 renamed float to flot 2019-03-22 12:48:16 -07:00
Torkel Ödegaard
0f0f76b602 Merge pull request #15938 from ryantxu/table-reducer
Calculate stats on TableData
2019-03-22 20:44:05 +01:00
ryan
f9fb1210e9 prevOptions should be optional 2019-03-22 10:55:31 -07:00
ryan
d8595e9f4e moved migration hook to its own function 2019-03-22 10:22:25 -07:00
Torkel Ödegaard
a6c2a8c3cc Merge branch 'master' into table-reducer 2019-03-22 15:55:21 +01:00
Torkel Ödegaard
beba9676f6 Minor refactoring of stats picker / shared singlestat code 2019-03-22 15:25:33 +01:00
Hugo Häggmark
eedbc485dd Makes it possible to navigate back/forward with browser buttons in Explore (#16150)
Make it possible to navigate back/forward with browser buttons in Explore
2019-03-22 15:24:30 +01:00
Torkel Ödegaard
bfc54b6424 Merge pull request #16134 from grafana/auto-decimals-graph-panels
Auto decimals react singlestat panels
2019-03-22 14:57:15 +01:00
Torkel Ödegaard
dba64a4e88 Moved DisplayValueOptions type back, #16134 2019-03-22 14:33:17 +01:00
Torkel Ödegaard
7cae6d5271 Merge pull request #16149 from grafana/graphite-variable-quoting
Graphite: fixed variable quoting when variable value is nummeric
2019-03-22 13:39:48 +01:00
Torkel Ödegaard
0ece3abbd0 Merge pull request #16152 from grafana/mtanda-prometheus_annotation_deduplication
Prometheus: Dedup annotations events with same timestamp
2019-03-22 13:38:47 +01:00
Torkel Ödegaard
e0ecbc4c68 Merge branch 'table-reducer' of https://github.com/ryantxu/grafana into ryantxu-table-reducer 2019-03-22 13:36:49 +01:00
Peter Holmberg
5a5aed10a1 adding check for decimals 2019-03-22 13:35:40 +01:00
Peter Holmberg
94d129e479 add one more test 2019-03-22 13:07:39 +01:00
Torkel Ödegaard
10d46bb61c Merge pull request #16144 from markelog/license-2
Link license corrections
2019-03-22 13:00:22 +01:00
Torkel Ödegaard
732ea8eea5 Graphite: fixed variable quoting when variable value is nummeric, fixes #2078 2019-03-22 12:57:07 +01:00
Torkel Ödegaard
d5a56b0bed Minor refactoring of #16127 2019-03-22 12:51:12 +01:00
Torkel Ödegaard
c7c0ba5a5a Merge branch 'prometheus_annotation_deduplication' of https://github.com/mtanda/grafana into mtanda-prometheus_annotation_deduplication 2019-03-22 12:45:46 +01:00
Torkel Ödegaard
a0d2e5861d Merge pull request #16136 from grafana/rem-removal-2
Replaced rems with pixels or variables (part 2)
2019-03-22 12:30:06 +01:00
Torkel Ödegaard
31dc3cfcf4 Merge pull request #16111 from grafana/graphite-series-by-tag-issue
Graphite: Fixed issue with using series ref and series by tag
2019-03-22 12:24:40 +01:00
Torkel Ödegaard
229d73b609 Update provisioning.md 2019-03-22 11:49:27 +01:00
Torkel Ödegaard
50a10706b0 Graphite: Fixed issue with using series ref and series by tag, fixes #15237 2019-03-22 11:42:09 +01:00
Peter Holmberg
08a4c9f6fa move typings to types, 2019-03-22 10:42:17 +01:00
Oleg Gaidarenko
8ac5c91004 Link license corrections
Follow-up for 7316bdc99f
2019-03-22 09:52:09 +01:00
Torkel Ödegaard
46a75099d8 Merge pull request #16116 from SGI495/master
Don't include non-existing image in MS Teams alert
2019-03-22 09:34:56 +01:00
Dominik Prokop
d3a321cac1 Merge pull request #16138 from grafana/tooling/storybook-sass-theme
Enable sass theme change in Storybook
2019-03-22 09:27:50 +01:00
Torkel Ödegaard
268dca5b3d Merge pull request #16112 from ryantxu/show-all-columns
show all numeric columns in singlestats/graph2
2019-03-22 09:19:18 +01:00
Torkel Ödegaard
ded73c9733 Merge pull request #16140 from markelog/license
Small license correction
2019-03-22 08:33:31 +01:00
ryan
78a9243721 remove logging 2019-03-22 00:21:04 -07:00
ryan
658f419cab add stat picker to single stat 2019-03-22 00:14:50 -07:00
ryan
8e6279cbca removed option to not check strings 2019-03-21 22:25:02 -07:00
ryan
3f44445dd6 drop one level of nesting 2019-03-21 21:58:10 -07:00
ryan
7498de044c cleanup and guess all columns 2019-03-21 21:52:58 -07:00
Oleg Gaidarenko
7316bdc99f Small license correction
It seems the license should be applied little bit differently -
https://github.com/search?l=&o=desc&q=license%3Aapache-2.0&s=stars&type=Repositories.

Also see https://apache.org/licenses/LICENSE-2.0#apply
2019-03-21 16:36:24 +01:00
Mitsuhiro Tanda
4d8eb76dca update cloudwatch metrics/dimensions list 2019-03-22 00:08:17 +09:00
Dominik Prokop
35f6039da7 Enable sass theme change in Storybook 2019-03-21 16:06:55 +01:00
ryan
f8094a6e09 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (107 commits)
  another change that didn't come with earlier commit
  change that didn't come with in last commit
  reversed dashboard-padding
  Update CloudWatch metrics/dimension list (#16102)
  brought back dashboard-padding and panel-padding variables, made dashboard-padding more specific
  fix(prometheus): Change aligment of range queries (#16110)
  Minor refactoring of testdata query order PR #16122
  cleaner version
  maintain query order
  Update PLUGIN_DEV.md
  Merge with master, and updated logo and name
  update table data model
  fix(graphite): nonNegativeDerivative argument hidden if 0, fixes #12488
  Correct table names of sql storage for remotecache
  more fixes to snapshot
  more fixes to snapshot
  Fixed gofmt issue in PR #16093
  removed empty space in snapshot
  fix: Update snapshot related to new jest version
  fixed snapshot for test
  ...
2019-03-21 08:01:11 -07:00
ryan
50ebc768c8 Merge remote-tracking branch 'grafana/master' into show-all-columns
* grafana/master: (56 commits)
  another change that didn't come with earlier commit
  change that didn't come with in last commit
  reversed dashboard-padding
  Update CloudWatch metrics/dimension list (#16102)
  brought back dashboard-padding and panel-padding variables, made dashboard-padding more specific
  fix(prometheus): Change aligment of range queries (#16110)
  Minor refactoring of testdata query order PR #16122
  cleaner version
  maintain query order
  Update PLUGIN_DEV.md
  Merge with master, and updated logo and name
  more fixes to snapshot
  more fixes to snapshot
  removed empty space in snapshot
  fixed snapshot for test
  removed dashboard variables, removed headings-font-family variable, created theme variables for links and z-index, removed unused class in _panel_editor and _dashboard
  Tooltip: show percent instead of value
  Right tooltip position
  Add "No data points" message
  Improve tooltip look
  ...
2019-03-21 07:59:58 -07:00
Torkel Ödegaard
f2e1bfcde7 Merge pull request #16099 from grafana/dashboard-variables-and-some-more
Removed dashboard variables + minor things
2019-03-21 15:56:32 +01:00
ijin08
85bfb1dba8 replaced rems with pixels or variables 2019-03-21 15:44:14 +01:00
Peter Holmberg
6e05b9f41c adding test 2019-03-21 14:05:45 +01:00
Peter Holmberg
528f085c96 updating usages in singlestat 2019-03-21 14:03:53 +01:00
Peter Holmberg
205a5baa56 Sorting imports 2019-03-21 13:49:12 +01:00
Peter Holmberg
c0ab877966 adding function 2019-03-21 13:45:50 +01:00
Sean Lafferty
50c5854430 Use grafana's logger implementation 2019-03-21 08:13:03 -04:00
ijin08
eaaa1681e2 another change that didn't come with earlier commit 2019-03-21 12:29:13 +01:00
ijin08
45e361ef13 change that didn't come with in last commit 2019-03-21 12:26:35 +01:00
ijin08
8d03db2474 reversed dashboard-padding 2019-03-21 12:15:13 +01:00
Mitsuhiro Tanda
56251ca546 Update CloudWatch metrics/dimension list (#16102)
update cloudWatch metrics/dimension list
2019-03-21 11:13:06 +01:00
ijin08
29e68ba1fc brought back dashboard-padding and panel-padding variables, made dashboard-padding more specific 2019-03-21 11:10:44 +01:00
ijin08
2db02bd240 replaced rem with pixels or variables 2019-03-21 10:43:06 +01:00
David
9008fcc790 fix(prometheus): Change aligment of range queries (#16110)
- future alignment cause issues with rate charts and the display of last
values
- this change modifies the alignment to use the last available aligned
end date and no longer possibly requests data from the future
2019-03-21 10:25:20 +01:00
Mitsuhiro Tanda
38457fabc1 fix, assign by event.time 2019-03-21 16:39:37 +09:00
Torkel Ödegaard
8847da0d69 Merge pull request #16121 from joshuawoodward/patch-1
Update PLUGIN_DEV.md
2019-03-21 08:36:52 +01:00
Torkel Ödegaard
6b6029d82d Merge pull request #16117 from grafana/very-alpha-pie-chart
Very alpha pie chart
2019-03-21 08:36:25 +01:00
Torkel Ödegaard
85b0df551c Minor refactoring of testdata query order PR #16122 2019-03-21 08:01:44 +01:00
Mitsuhiro Tanda
e868475c5b simplify 2019-03-21 15:48:22 +09:00
Mitsuhiro Tanda
e1a2b258af deduplicate same value annotation 2019-03-21 10:26:46 +09:00
ryan
c91e5a2db4 cleaner version 2019-03-20 14:50:46 -07:00
ryan
80d6475224 maintain query order 2019-03-20 12:50:58 -07:00
Sean Lafferty
b3461c9806 Remove sleeps in test code by overriding time.Now() 2019-03-20 15:34:31 -04:00
Joshua Woodward
742a76e4c5 Update PLUGIN_DEV.md 2019-03-20 12:24:54 -07:00
Sean Lafferty
3b9b6c571a Abstract encrypt/encode and decode/decrypt into their own functions 2019-03-20 15:18:22 -04:00
Sean Lafferty
b696492891 Rename dispatched commands to make them easy to grok 2019-03-20 14:32:41 -04:00
ryan
0558b17b9e show all colums in graph 2019-03-20 11:27:56 -07:00
Sean Lafferty
be6e76ee35 Use structured logging instead of printf 2019-03-20 14:25:26 -04:00
Sean Lafferty
dba2df19e8 Make all http auth setting labels the same width 2019-03-20 14:19:29 -04:00
Torkel Ödegaard
e4e553b5a2 Merge with master, and updated logo and name 2019-03-20 19:17:23 +01:00
ryan
e7a6041d22 Merge remote-tracking branch 'grafana/master' into show-all-columns
* grafana/master:
  flot pairs
2019-03-20 11:16:03 -07:00
Torkel Ödegaard
ac82fc03d9 Merge branch 'piechart-react' of https://github.com/CorpGlory/grafana into CorpGlory-piechart-react 2019-03-20 19:01:37 +01:00
Magnus Berglund
e6623de6b2 Rewrote creation of images tag 2019-03-20 18:59:13 +01:00
Torkel Ödegaard
93677f16d3 Merge pull request #16095 from ryantxu/flot-pairs
calculate flot pairs
2019-03-20 18:52:10 +01:00
Magnus Berglund
0511095303 Added missing commas 2019-03-20 18:42:48 +01:00
ryan
0cfa929d4c incorporate torkels feedback 2019-03-20 10:32:34 -07:00
Magnus Berglund
0de77598d7 Don't include non-existing image in MS Teams alert
If an image section is included in the JSON payload for MS Teams alerts
when no image URL exists, rendering of the alert in the client fails.
This change makes sure that an image section is only included in the
JSON payload if an image URL exists.

Closes #16082
2019-03-20 18:23:36 +01:00
Torkel Ödegaard
3884ac855e Merge pull request #16105 from grafana/graphite-fix-0-arg
Graphite: fixed nonNegativeDerivative argument hidden if 0
2019-03-20 18:18:47 +01:00
Torkel Ödegaard
bb14be9148 Merge pull request #16115 from ryantxu/column-types
update TableData model
2019-03-20 18:12:10 +01:00
ryan
5947c1f76d cast to column 2019-03-20 09:56:53 -07:00
ryan
a9cc8a8992 update table data model 2019-03-20 09:45:19 -07:00
ryan
c4a503dbc5 show all columns in singlestats 2019-03-20 09:07:11 -07:00
ryan
2c8e1cbdb1 merge with master 2019-03-20 08:16:34 -07:00
Torkel Ödegaard
78d93315a9 fix(graphite): nonNegativeDerivative argument hidden if 0, fixes #12488 2019-03-20 15:35:34 +01:00
Oleg Gaidarenko
30f0c35006 Merge pull request #16104 from markelog/remotecache-small-fix
Correct table names of sql storage for remotecache
2019-03-20 14:08:02 +01:00
Oleg Gaidarenko
c5bc723a6e Correct table names of sql storage for remotecache 2019-03-20 13:24:56 +01:00
ijin08
6471f6feb0 more fixes to snapshot 2019-03-20 11:37:45 +01:00
ijin08
67e802c595 more fixes to snapshot 2019-03-20 11:13:19 +01:00
Torkel Ödegaard
e5d84f8c74 Merge pull request #15967 from grafana/bump-webpack
Bump npm packages related to the dev process
2019-03-20 11:00:45 +01:00
Torkel Ödegaard
665f7acade Merge branch 'master' of github.com:grafana/grafana 2019-03-20 10:59:41 +01:00
Torkel Ödegaard
1085055d61 Merge PR https://github.com/grafana/grafana/pull/16093 2019-03-20 10:59:05 +01:00
Torkel Ödegaard
d11695b8b5 Fixed gofmt issue in PR #16093 2019-03-20 10:58:20 +01:00
Torkel Ödegaard
ab5848ca14 Merge pull request #16096 from grafana/fix/15691-refresh-issue-playlists
Fixing issue with refresh playlists
2019-03-20 10:52:16 +01:00
Torkel Ödegaard
fd4ee6b032 Merge branch 'patch-1' of https://github.com/sairam0903/grafana into sairam0903-patch-1 2019-03-20 10:50:11 +01:00
ijin08
7fcb9777c0 removed empty space in snapshot 2019-03-20 10:49:34 +01:00
Johannes Schill
13f70be5f0 fix: Update snapshot related to new jest version 2019-03-20 10:36:33 +01:00
ijin08
2a53be050c fixed snapshot for test 2019-03-20 10:29:28 +01:00
Torkel Ödegaard
0091b86e9c Merge pull request #16078 from grafana/secret-input-field-component
Secret input field component
2019-03-20 10:15:33 +01:00
Johannes Schill
e0e6dd8fb0 Regenerate lockfile due to the amount of merge conflicts. 2019-03-20 09:50:53 +01:00
ijin08
9e57195b1d removed dashboard variables, removed headings-font-family variable, created theme variables for links and z-index, removed unused class in _panel_editor and _dashboard 2019-03-20 09:48:19 +01:00
Johannes Schill
7dec4a9f2d Merge branch 'master' into bump-webpack
# Conflicts:
#	package.json
#	yarn.lock
2019-03-20 09:43:33 +01:00
Andrej Ocenas
a26dc64ebe Remove commented code 2019-03-20 09:20:30 +01:00
Peter Holmberg
81afd68752 Merge branch 'master' into fix/15691-refresh-issue-playlists 2019-03-20 09:17:57 +01:00
Torkel Ödegaard
abd8948478 Merge pull request #15864 from ryantxu/all-data-as-table
Use TableData for all data in react
2019-03-20 09:15:06 +01:00
Torkel Ödegaard
0a2d69c794 Merge pull request #16089 from grafana/no-implicit-any-fixes-p4
Fixed no implicit any for form dropdown & panel model
2019-03-20 07:01:14 +01:00
Torkel Ödegaard
b203868a9f Merge pull request #16034 from ryantxu/table-cell-measure
Don't measure cell widths in react table
2019-03-20 06:59:19 +01:00
ryan
2f8dd898b0 flot pairs 2019-03-19 22:22:38 -07:00
ryan
7e56514c5a add more functions and tests 2019-03-19 21:19:58 -07:00
ryan
37bb5ef790 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (101 commits)
  refactor: merged types and updated references
  Remove leftover from first iteration
  Snapshot update
  fix: ts issue on SelectOption test
  chore: Bump react and react-dom to 16.8.4
  Update latest.json
  Update templating.md
  Update CHANGELOG.md
  chore: cleaning up noimplicit anys in search_srv and tests progress: #14714
  Fix threshold editor color picker not working for custom colors
  Updated threshold editor test
  Re-render gauge / singlestat panels when changing options
  fix: refactored so members are loaded by TeamPages and use hideFromTabs instead of filtering out children in navModel
  teams: explains the external property of a team membership.
  fix: fixed snapshots and permission select not beeing able to click
  fix: new team link goes nowhere for viewers
  teams: refactor so that you can only delete teams if you are team admin
  permissions: removes global access to bus from MakeUserAdmin.
  teams: local access to bus, moving away from dep on global.
  teams: better names for api permissions.
  ...
2019-03-19 20:30:11 -07:00
Sai Ram Gupta
6929593eb6 Update org_user.go
Add check for, if current role is ROLE_VIEWER, return true if the role I'm checking for is ROLE_VIEWER. Fixes #16092
2019-03-19 11:31:55 -07:00
Torkel Ödegaard
f69f0c2c31 Merge pull request #16079 from grafana/fix/threshold-custom-color
Fix threshold editor color picker not working for custom colors
2019-03-19 18:39:17 +01:00
Torkel Ödegaard
4f134ea4b8 Merge pull request #16080 from grafana/hugoh/no-implicit-any
Cleaning up no implicit anys in search_srv and tests
2019-03-19 18:26:28 +01:00
Torkel Ödegaard
42c87141a5 Minor progress on fixing no-implicit any issues 2019-03-19 18:24:47 +01:00
Hugo Häggmark
d845aacbdc refactor: merged types and updated references 2019-03-19 17:44:58 +01:00
ryan
08d6540cbb merge master 2019-03-19 09:26:15 -07:00
Torkel Ödegaard
b8be6aa3b8 Merge pull request #16084 from yalhyane/patch-1
Fixing docs typo in templating.md
2019-03-19 17:06:10 +01:00
Torkel Ödegaard
a1a60ceae0 Merge pull request #16087 from grafana/chore/bump-react
chore: Bump react and react-dom to 16.8.4
2019-03-19 17:00:11 +01:00
Dominik Prokop
9205b82f19 Remove leftover from first iteration 2019-03-19 16:38:14 +01:00
Peter Holmberg
5adb923ace Only keep certain query params when going to next playlist 2019-03-19 16:34:33 +01:00
Dominik Prokop
12d452ce92 Snapshot update 2019-03-19 16:31:26 +01:00
Dominik Prokop
1178115d50 fix: ts issue on SelectOption test 2019-03-19 16:15:19 +01:00
Dominik Prokop
512f2dd024 chore: Bump react and react-dom to 16.8.4 2019-03-19 16:11:47 +01:00
Hugo Häggmark
124bedbf24 Update latest.json 2019-03-19 15:44:10 +01:00
yalhyane
9a4a8b0f85 Update templating.md
fix a typo in the example of `percentencode` option
2019-03-19 14:39:26 +00:00
Hugo Häggmark
40978ee08a Update CHANGELOG.md 2019-03-19 15:10:00 +01:00
Leonard Gram
f2b06a89f2 Merge pull request #15977 from grafana/admin-on-create-poc
Editors becomes admin when creating dashboards, folders & teams
2019-03-19 15:02:52 +01:00
Torkel Ödegaard
531176b559 Merge pull request #16077 from grafana/gauge-change-options-render
Re-render gauge / singlestat panels when changing options
2019-03-19 15:01:26 +01:00
Torkel Ödegaard
c19a47d34f Merge pull request #16008 from grafana/bar-gauge-refactoring
Refactoring the bar gauge and the orientation modes
2019-03-19 15:00:30 +01:00
Hugo Häggmark
c1d585b156 chore: cleaning up noimplicit anys in search_srv and tests
progress: #14714
2019-03-19 14:48:35 +01:00
Dominik Prokop
97a000c319 Fix threshold editor color picker not working for custom colors
When user selected Custom as an option for a threshold colors, the Custom color picker did not work. The problem was caused by threshold model not including the default colors for fill and line colors when custom was selected. Now, when changing the type to custom, the default valoues are set.
2019-03-19 14:47:48 +01:00
Andrej Ocenas
aa14d7528c Updated comments 2019-03-19 14:16:01 +01:00
Leonard Gram
95f7a91328 Merge pull request #16069 from xlson/ci-deploy-speedup
build: crcmod speedups rsync to gcp for deploy.
2019-03-19 14:13:15 +01:00
Torkel Ödegaard
2ca5149c67 Updated threshold editor test 2019-03-19 14:12:47 +01:00
Leonard Gram
2ca8d17874 Merge pull request #16071 from xlson/include-build-container
build: migrates the build container into the main repo.
2019-03-19 14:10:02 +01:00
Torkel Ödegaard
d597271844 Re-render gauge / singlestat panels when changing options 2019-03-19 14:07:48 +01:00
Hugo Häggmark
53322a51e2 fix: refactored so members are loaded by TeamPages and use hideFromTabs instead of filtering out children in navModel 2019-03-19 14:01:22 +01:00
Leonard Gram
978c20a604 teams: explains the external property of a team membership. 2019-03-19 14:01:22 +01:00
Hugo Häggmark
e23e6a8bdc fix: fixed snapshots and permission select not beeing able to click 2019-03-19 14:01:21 +01:00
Hugo Häggmark
b71c9803a9 fix: new team link goes nowhere for viewers 2019-03-19 14:01:21 +01:00
Hugo Häggmark
53c74fa2f5 teams: refactor so that you can only delete teams if you are team admin 2019-03-19 14:01:21 +01:00
Leonard Gram
a615b78f8a permissions: removes global access to bus from MakeUserAdmin. 2019-03-19 14:01:20 +01:00
Leonard Gram
adf0390b2c teams: local access to bus, moving away from dep on global. 2019-03-19 14:01:20 +01:00
Leonard Gram
6589a4e55f teams: better names for api permissions. 2019-03-19 14:01:20 +01:00
Leonard Gram
9f33f00343 teams: refactor. 2019-03-19 14:01:19 +01:00
Leonard Gram
9f8e43916d permissions: refactor. 2019-03-19 14:01:19 +01:00
Leonard Gram
b796027bc6 teams: refactor. 2019-03-19 14:01:19 +01:00
Hugo Häggmark
13ed10495a teams: hide tabs settings and groupsync for non team admins 2019-03-19 14:01:18 +01:00
Leonard Gram
d1481cac50 teams: refactored db code. 2019-03-19 14:01:18 +01:00
Hugo Häggmark
8c34f595f0 teams: disable new team button if user is viewer 2019-03-19 14:01:18 +01:00
Hugo Häggmark
e3fc61b326 refactor: moved test from TeamMembers to TeamMemberRow 2019-03-19 14:01:17 +01:00
Hugo Häggmark
178d637b4e refactor: splitted TeamMembers to TeamMemberRow 2019-03-19 14:01:17 +01:00
Hugo Häggmark
6a63725df0 teams: comment explaining input validation
Co-Authored-By: xlson <leo@xlson.com>
2019-03-19 14:01:17 +01:00
Leonard Gram
3f57a81c47 teams: cleanup. 2019-03-19 14:01:16 +01:00
Leonard Gram
ccfd6789ca teams: cleanup. 2019-03-19 14:01:16 +01:00
Leonard Gram
fc0461134f dashboards: simplified code. 2019-03-19 14:01:15 +01:00
Hugo Häggmark
b82b94a247 teams: disable buttons for team members 2019-03-19 14:01:15 +01:00
Hugo Häggmark
b60e71c28b teams: moved logic for searchteams to backend 2019-03-19 14:01:15 +01:00
Hugo Häggmark
782b5b6a3a teams: viewers and editors can view teams 2019-03-19 14:01:14 +01:00
Leonard Gram
c420af16b1 teams: editor/viewer team admin cant remove the last admin. 2019-03-19 14:01:14 +01:00
Hugo Häggmark
246e128048 teams: changed permission to permission type instead of int 2019-03-19 14:01:14 +01:00
Hugo Häggmark
c826f39a8b teams: defaulting invalid permission level to member permission level 2019-03-19 14:01:13 +01:00
Leonard Gram
c823ad5de7 team: uses PermissionType instead of int64 for permissions. 2019-03-19 14:01:13 +01:00
Leonard Gram
21d3d27452 teams: editors can't remove the last admin from a team. 2019-03-19 14:01:13 +01:00
Leonard Gram
8593668ab2 teams: tests use the new message for modifying team members. 2019-03-19 14:01:12 +01:00
Leonard Gram
b783fa7039 team: renames teams.CanUpdate teamguardian.CanAdmin 2019-03-19 14:01:12 +01:00
Hugo Häggmark
96aa4ae19f teams: remov permission select for non admin users 2019-03-19 14:01:12 +01:00
Hugo Häggmark
b9cf09a296 docs: First take on describing feature toggle 2019-03-19 14:01:11 +01:00
Hugo Häggmark
a90b3e331e config: updated feature toggle name 2019-03-19 13:59:39 +01:00
Leonard Gram
a6a3d698da teams: cleanup. 2019-03-19 13:57:30 +01:00
Leonard Gram
0b209de5d1 dashboard: only admin permission added to dashboard in folder. 2019-03-19 13:57:30 +01:00
Leonard Gram
d593ffe3c1 dashboards: better error handling 2019-03-19 13:57:30 +01:00
Leonard Gram
89d4db8eb6 teams: team listing shows only your teams (editors). 2019-03-19 13:57:29 +01:00
Leonard Gram
1f949e58e1 teams: teams guard on all teams update methods. 2019-03-19 13:57:29 +01:00
Leonard Gram
23231e6d51 teams: added delete team guard 2019-03-19 13:57:29 +01:00
Leonard Gram
8e7a8282c1 teams: removed feature toggle as it is already in middleware 2019-03-19 13:57:28 +01:00
Leonard Gram
d668550aa2 teams: added feature toggle and refactor tests 2019-03-19 13:57:28 +01:00
Leonard Gram
0d61f89577 teams: cleanup. 2019-03-19 13:57:28 +01:00
Leonard Gram
3be1d71f1f teams: test refactorings. 2019-03-19 13:57:27 +01:00
Leonard Gram
319879cfa8 teams: bugfix, user pointer. 2019-03-19 13:57:27 +01:00
Leonard Gram
90e9fda90c teams: start of team update guardian for editors 2019-03-19 13:57:26 +01:00
Hugo Häggmark
5adde259d3 teams: team update test 2019-03-19 13:57:26 +01:00
Hugo Häggmark
3c46b786d2 teams: change back to permissionlevel for Member to 0 2019-03-19 13:57:26 +01:00
Hugo Häggmark
1315a67022 teams: make sure we use TeamPermissionLevel enum 2019-03-19 13:57:25 +01:00
Hugo Häggmark
3c74ac3044 teams: update only the selected user 2019-03-19 13:57:25 +01:00
Hugo Häggmark
074ebf0f48 teams: only write error message if error 2019-03-19 13:57:25 +01:00
Hugo Häggmark
eea2dcc605 teams: enabled so that user can update permission for team members 2019-03-19 13:57:24 +01:00
Hugo Häggmark
467b7a40d8 teams: feature toggle component 2019-03-19 13:57:24 +01:00
Leonard Gram
aedc478208 teams: test for update team member. 2019-03-19 13:57:24 +01:00
Leonard Gram
2a88052c14 teams: can update team members permission. 2019-03-19 13:57:23 +01:00
Hugo Häggmark
7888457aae teams: basic ui for permission in team members view 2019-03-19 13:57:23 +01:00
Leonard Gram
af4994ba16 teams: editor added as admin for created teams. 2019-03-19 13:57:22 +01:00
Leonard Gram
22e098b830 teams: editors can work with teams. 2019-03-19 13:57:22 +01:00
Hugo Häggmark
efbd93f824 teams: show teams and plugins for editors that can own 2019-03-19 13:57:22 +01:00
Hugo Häggmark
124fb743e8 teams: make test cases pass again 2019-03-19 13:57:21 +01:00
Leonard Gram
da3dcd1918 folder: uses service to make user admin of created folder. 2019-03-19 13:57:21 +01:00
Leonard Gram
c8c004095c permissions: broken out func for making creator admin. 2019-03-19 13:57:21 +01:00
Leonard Gram
e174f7c20b folders: admin for created folders 2019-03-19 13:57:20 +01:00
Leonard Gram
e294252e92 dashboards: user automatically becomes admin for created dashboards 2019-03-19 13:57:20 +01:00
Torkel Ödegaard
b8c355514d Merge branch 'master' into bar-gauge-refactoring 2019-03-19 13:43:49 +01:00
Torkel Ödegaard
abbb7b81c7 fix(ci): frontend tests was accidentially commented out 2019-03-19 13:42:40 +01:00
Hugo Häggmark
9f6b793563 Update CHANGELOG.md 2019-03-19 13:41:47 +01:00
Andrej Ocenas
150b97692d Use SecretFormField in MSSql and Postgres datasources 2019-03-19 13:40:18 +01:00
Andrej Ocenas
d8167ffb88 Add SecretFormField component 2019-03-19 13:40:17 +01:00
Andrej Ocenas
0d84a3fbe2 Add possibility to pass custom input component to FormField 2019-03-19 13:40:17 +01:00
Andrej Ocenas
8f0d92ef85 Allow angular react bridge to use kebab case attribute names 2019-03-19 13:40:16 +01:00
Torkel Ödegaard
6be416dd93 Merge branch 'master' into bar-gauge-refactoring 2019-03-19 13:40:02 +01:00
Torkel Ödegaard
8af1326a95 Merge pull request #16075 from grafana/fix-thresholds-tests
Fix for Thresholds tests
2019-03-19 13:38:47 +01:00
Peter Holmberg
d075af2b67 adding story and fixing tests 2019-03-19 13:14:32 +01:00
Leonard Gram
4dceb60d20 build: migrates the build container into the main repo. 2019-03-19 11:34:01 +01:00
Leonard Gram
4152e5c16c build: updated deploy container with crcmod. 2019-03-19 10:57:17 +01:00
Leonard Gram
39e75d75b4 build: crcmod speedups rsync to gcp for deploy. 2019-03-19 10:48:41 +01:00
Carl Bergquist
d9db457b87 Merge pull request #16033 from bergquist/backend_codestyle
Adds backend code style guide
2019-03-19 08:16:36 +01:00
Leonard Gram
6673915f2e Update style_guides/backend.md
Co-Authored-By: bergquist <carl@grafana.com>
2019-03-19 08:16:19 +01:00
ryan
9b4d2a5ffa remove the error collector 2019-03-18 15:06:57 -07:00
Torkel Ödegaard
25cd196c09 Merge pull request #16006 from grafana/fix-explore-refId
Explore: Query row using character refId instead of number
2019-03-18 22:59:47 +01:00
Torkel Ödegaard
32d80f2da8 Merge pull request #16045 from grafana/hugoh/no-implicit-any
Cleaning up implicit anys in DashboardExporter and tests
2019-03-18 22:50:23 +01:00
Torkel Ödegaard
89bf94b07c Merge pull request #16054 from grafana/input-to-grafanaui2
Input to grafanaui2
2019-03-18 22:49:40 +01:00
Torkel Ödegaard
5617db36b2 Merge pull request #16014 from alexanderzobnin/fix-15993
Panels: fix loading panels with non-array targets
2019-03-18 22:34:24 +01:00
ryan
ed1b515f82 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master:
  docs: renamed file and added redux framework file
  docs: moved examples to frontend.md
  docs: intial draft for frontend review doc
  Use ora#fail instead of console.log
  Remove .only function
  Add more patterns to no-only-test task
2019-03-18 14:19:50 -07:00
Daniel Lee
8859d16a41 Merge pull request #16052 from markelog/ora-fail
Use ora#fail instead of console.log
2019-03-18 17:35:54 +01:00
Andrej Ocenas
cdced6e43f Merge pull request #16047 from grafana/grunt-no-only-tests-add-patterns
Add patterns to no-only-tests grunt task
2019-03-18 17:14:50 +01:00
Peter Holmberg
384e11fd68 Copied from new timepicker and unified component branch 2019-03-18 15:41:46 +01:00
Hugo Häggmark
ed1b001904 docs: renamed file and added redux framework file 2019-03-18 06:39:34 -07:00
Hugo Häggmark
f251345b68 docs: moved examples to frontend.md 2019-03-18 06:39:34 -07:00
Hugo Häggmark
f3b9ce317e docs: intial draft for frontend review doc 2019-03-18 06:39:34 -07:00
Oleg Gaidarenko
2b9cf1132f Use ora#fail instead of console.log
Since with ora#fail you can stderr it instead of using the stdout,
and it's a bit nicer since it will show that cross sign :)
2019-03-18 13:45:58 +01:00
Peter Holmberg
be7a5dab69 reorder imports 2019-03-18 11:23:40 +01:00
Peter Holmberg
cb9bda810f test 2019-03-18 11:21:40 +01:00
Peter Holmberg
39728c885b rename to char 2019-03-18 11:17:58 +01:00
Peter Holmberg
515fb5903e sorting imports 2019-03-18 10:44:00 +01:00
Peter Holmberg
c0eb140297 moving 2019-03-18 10:41:28 +01:00
Andrej Ocenas
dcc5373e77 Remove .only function 2019-03-18 10:40:04 +01:00
Andrej Ocenas
854644f46c Add more patterns to no-only-test task 2019-03-18 10:39:14 +01:00
Hugo Häggmark
0eb2ca3ffd chore: Cleaning up implicit anys in DashboardExporter and tests
progress: #14714
2019-03-18 07:42:43 +01:00
ryan
c210417736 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master:
  Explore: Fix log stats for long labels
  dont test exists in the test... it will fail if not found
  add random_walk_table scenario
  add test file
  add startAt to random walk scenario
2019-03-17 18:10:35 -07:00
ryan
a0fa5698e0 rename reducer to statsCalculator 2019-03-17 18:02:09 -07:00
ryan
2969507784 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (75 commits)
  Explore: Fix log stats for long labels
  dont test exists in the test... it will fail if not found
  add random_walk_table scenario
  add test file
  add startAt to random walk scenario
  get values from base options
  use singlestat base where appropriate
  feature(explore/table): Add tooltips to explore table (#16007)
  Update changelog
  Add check for Env before log
  Update index.md
  chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts progress: #14714
  chore: Cleaning up implicit anys in app.ts progress: #14714
  changelog: adds note about closing #15836
  changelog: adds note about closing #6359 and #15931
  add partial
  no inheratance
  improve single stat display
  revert most options sharing
  add migration tests
  ...
2019-03-17 16:48:54 -07:00
Torkel Ödegaard
1303a66725 Great progress on bar gauge look 2019-03-17 13:59:26 +01:00
Torkel Ödegaard
d1e48a07b2 Merge pull request #16031 from ryantxu/random-walk-start-at
add startValue to random_walk testdata scenario and random_walk_table
2019-03-17 13:18:40 +01:00
Torkel Ödegaard
34b6405fd9 Merge pull request #16036 from steven-sheehy/log-stats-overflow
Explore: Fix log stats with long labels
2019-03-17 13:16:43 +01:00
Steven Sheehy
ec34099ea7 Explore: Fix log stats for long labels
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-16 00:55:10 -05:00
ryan
a6132d7648 merge singlestat refactor 2019-03-15 15:37:56 -07:00
Torkel Ödegaard
bfa54d2e26 Merge pull request #15925 from ryantxu/reusable-formatting-options
make value processing/formatting more reusable
2019-03-15 22:13:46 +01:00
ryan
9bcc9b062c calculate the column width 2019-03-15 13:52:32 -07:00
ryan
e6cba97b45 disable react table cell measure 2019-03-15 13:31:40 -07:00
ryan
bd811b4a95 dont test exists in the test... it will fail if not found 2019-03-15 12:36:55 -07:00
ryan
24ead3a4a4 add random_walk_table scenario 2019-03-15 12:33:45 -07:00
bergquist
98911e0708 adds backend code style guide 2019-03-15 20:19:24 +01:00
ryan
2b5ac6bafa add test file 2019-03-15 11:07:20 -07:00
ryan
e787176bca add startAt to random walk scenario 2019-03-15 11:02:41 -07:00
ryan
ff3c25ad79 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master: (57 commits)
  feature(explore/table): Add tooltips to explore table (#16007)
  Update changelog
  Add check for Env before log
  Update index.md
  chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts progress: #14714
  chore: Cleaning up implicit anys in app.ts progress: #14714
  changelog: adds note about closing #15836
  changelog: adds note about closing #6359 and #15931
  add partial
  Add check so that header is not sent for anonymous users
  Update config docs
  Add custom header with grafana user and a config switch for it
  changelog: adds note about closing #10816
  use constants for cache type
  makes variables template prettier complient
  white space formating
  changelog: adds note about #15744
  updates old distcache names
  dont allow inifinite expiration
  return error if cache type is invalid
  ...
2019-03-15 09:19:01 -07:00
ryan
0bb772aba7 get values from base options 2019-03-15 09:03:47 -07:00
ryan
b1b5e8d74c use singlestat base where appropriate 2019-03-15 08:38:29 -07:00
ryan
77b78e36e5 Merge remote-tracking branch 'grafana/master' into reusable-formatting-options
* grafana/master: (44 commits)
  feature(explore/table): Add tooltips to explore table (#16007)
  Update changelog
  Add check for Env before log
  Update index.md
  chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts progress: #14714
  chore: Cleaning up implicit anys in app.ts progress: #14714
  changelog: adds note about closing #15836
  changelog: adds note about closing #6359 and #15931
  add partial
  Add check so that header is not sent for anonymous users
  Update config docs
  Add custom header with grafana user and a config switch for it
  changelog: adds note about closing #10816
  use constants for cache type
  updates old distcache names
  dont allow inifinite expiration
  return error if cache type is invalid
  use `Get` instead of `Find`
  avoid exposing cache client directly
  add docs about remote cache settings
  ...
2019-03-15 08:23:55 -07:00
Steven Sheehy
fff6e0a522 feature(explore/table): Add tooltips to explore table (#16007)
Longer labels are now viewable as a tooltip in the Explore table

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-15 14:11:40 +01:00
Carl Bergquist
011e8c4a35 Merge pull request #16022 from grafana/connection-string-log-fix-simple
Only log connection string in dev environment
2019-03-15 14:03:01 +01:00
Carl Bergquist
b1b0082e36 Merge pull request #16020 from JacobEriksson/patch-1
Update index.md
2019-03-15 14:00:23 +01:00
Andrej Ocenas
38f82cfb0e Update changelog 2019-03-15 13:34:39 +01:00
Torkel Ödegaard
91ff146d7d Bar gauge gradient mode 2019-03-15 13:34:38 +01:00
Torkel Ödegaard
714e03c162 Bar gauge auto lcd cell count 2019-03-15 12:45:37 +01:00
Andrej Ocenas
09b9b595b2 Add check for Env before log 2019-03-15 11:53:30 +01:00
JacobEriksson
e2fd85854c Update index.md
Added information about Amazon Timestream and Oracle Database
2019-03-15 11:07:22 +01:00
Hugo Häggmark
96af051cb2 chore: Cleaning up implicit anys in manage_dashboard.ts and manage_dashboard.test.ts
progress: #14714
2019-03-15 01:59:16 -07:00
Hugo Häggmark
aa4b593dfa chore: Cleaning up implicit anys in app.ts
progress: #14714
2019-03-15 01:59:16 -07:00
Alexander Zobnin
c028d410ec panels: fix loading panels with non-array targets (add tests) 2019-03-15 11:30:41 +03:00
bergquist
1db7913a1c changelog: adds note about closing #15836 2019-03-15 09:25:58 +01:00
Peter Holmberg
6ca1ae309a set correct return type 2019-03-15 08:52:25 +01:00
Alexander Zobnin
fe798239b2 panels: fix loading panels with non-array targets (refactor) 2019-03-15 10:31:58 +03:00
Torkel Ödegaard
707d188428 Bar gauge styling tweaks 2019-03-15 08:29:11 +01:00
Alexander Zobnin
e3b3b35dca panels: fix loading panels with non-array targets 2019-03-15 10:14:56 +03:00
bergquist
1ddf6dafb6 changelog: adds note about closing #6359 and #15931 2019-03-15 07:32:33 +01:00
Torkel Ödegaard
6a87c9ec7f Merge pull request #16010 from ryantxu/partial-change-hook
use Partial<TOptions> with new PanelTypeChangedHooks
2019-03-15 06:58:05 +01:00
ryan
75710d0f2b add partial 2019-03-14 14:58:46 -07:00
ryan
1fa07a8254 no inheratance 2019-03-14 14:47:01 -07:00
ryan
8be56f8a0e improve single stat display 2019-03-14 13:31:50 -07:00
ryan
985f057ab3 revert most options sharing 2019-03-14 13:20:24 -07:00
Torkel Ödegaard
09eddd1676 Refactoring the bar gauge and the orientation modes 2019-03-14 18:48:12 +01:00
Sean Lafferty
3f9a19dcd5 Merge branch 'master' into 12556-oauth-pass-thru 2019-03-14 13:18:00 -04:00
ryan
8299c95459 add migration tests 2019-03-14 09:51:40 -07:00
ryan
ccf66154bb add migration tests 2019-03-14 09:50:59 -07:00
Peter Holmberg
52dcb9bf00 renaming function 2019-03-14 17:39:56 +01:00
Andrej Ocenas
8221c4273f Merge pull request #15998 from grafana/add-grafana-user-proxy-header
Add custom header with grafana user when using proxy
2019-03-14 17:29:06 +01:00
Peter Holmberg
cf55d68894 using refId from panel model 2019-03-14 17:20:33 +01:00
Carl Bergquist
23852b59c9 Merge pull request #15839 from grafana/15836_revoke_auth_tokens
Support list and revoke of user auth tokens in HTTP API
2019-03-14 17:12:49 +01:00
corpglory-dev
dbec66b3d6 Tooltip: show percent instead of value 2019-03-14 18:40:44 +03:00
Andrej Ocenas
697a87b7b2 Add check so that header is not sent for anonymous users 2019-03-14 16:33:21 +01:00
Andrej Ocenas
6587a967eb Update config docs 2019-03-14 16:33:20 +01:00
Andrej Ocenas
bbdc1c0e64 Add custom header with grafana user and a config switch for it 2019-03-14 16:33:19 +01:00
bergquist
191a7e4b8d changelog: adds note about closing #10816 2019-03-14 16:19:12 +01:00
corpglory-dev
4ba5217a08 Right tooltip position 2019-03-14 18:18:40 +03:00
Carl Bergquist
291ffcb75b Merge pull request #15457 from bergquist/distributed_cache
Distributed cache
2019-03-14 16:16:39 +01:00
corpglory-dev
d36b07bd68 Add "No data points" message 2019-03-14 18:09:24 +03:00
bergquist
6d42d43b22 use constants for cache type 2019-03-14 15:48:20 +01:00
bergquist
5f059038c6 makes variables template prettier complient 2019-03-14 13:52:36 +01:00
Sean Lafferty
f3c52710df Make recently used auth_module test more robust by adding another 'log in' 2019-03-14 08:40:19 -04:00
Torkel Ödegaard
12219a1d7e Merge pull request #15957 from ryantxu/panel-options-init
improve the new PreservePanelOptionsHandler
2019-03-14 13:05:09 +01:00
bergquist
f059c25f95 white space formating 2019-03-14 10:59:13 +01:00
bergquist
7b692c1cfd changelog: adds note about #15744 2019-03-14 10:10:58 +01:00
Carl Bergquist
11d9122cf5 Merge pull request #15916 from zhulongcheng/victorops-noti
Add more info to victorOps alert notifications
2019-03-14 10:02:44 +01:00
bergquist
0a86a1d7b6 updates old distcache names 2019-03-14 09:23:35 +01:00
bergquist
c001cfe1d9 dont allow inifinite expiration 2019-03-14 09:22:03 +01:00
Johannes Schill
df453d15de chore: Upgrade all babel related packages that is lagging behind 2019-03-14 09:01:27 +01:00
bergquist
5186273731 return error if cache type is invalid 2019-03-14 08:57:38 +01:00
zhulongcheng
755f60358b Add more info to victorOps alert notifications 2019-03-14 15:47:11 +08:00
Johannes Schill
8a2865aedf fix: papaparse must have gone missing during rebase 2019-03-14 08:36:56 +01:00
Johannes Schill
8dee1a27bf chore: Bump jest to 24 2019-03-14 08:28:15 +01:00
Johannes Schill
d6a74a5c90 fix: describe() should not be async 2019-03-14 08:26:01 +01:00
Johannes Schill
be3f9fcbfe fix: Use proper syntax for plugin-syntax-dynamic-import 2019-03-14 08:26:00 +01:00
Johannes Schill
1680dbac7d fix: Downgrade ts-node to 8.0.2 due to broken theme generation 2019-03-14 08:26:00 +01:00
Johannes Schill
c41db1325b chore: Bump ora 2019-03-14 08:25:59 +01:00
Johannes Schill
522afc6f99 chore: Bump tslint (again) 2019-03-14 08:25:59 +01:00
Johannes Schill
1d2ffe2b4b chore: Bump axios 2019-03-14 08:25:58 +01:00
Johannes Schill
b4dd476104 chore: Bump npm 2019-03-14 08:25:57 +01:00
Johannes Schill
5c05afea0a chore: Bump glob 2019-03-14 08:25:57 +01:00
Johannes Schill
95382f9920 fix: Invalid css 2019-03-14 08:25:56 +01:00
Johannes Schill
bdce61d02a chore: Bump clean-webpack-plugin, html-webpack-harddisk-plugin, postcss-reporter 2019-03-14 08:25:56 +01:00
Johannes Schill
da644a700f chore: Bump file-loader and css optimizer webpack plugin 2019-03-14 08:25:55 +01:00
Johannes Schill
79f6b4f8e6 chore: Bump css-loader and remove minimize option since its removed in css-loader 2019-03-14 08:25:54 +01:00
Johannes Schill
e29a7b35f5 chore: Bump npm packages and lock down some versions 2019-03-14 08:25:54 +01:00
Johannes Schill
628b4a43ec chore: Bump mini-css-extract-plugin 2019-03-14 08:25:53 +01:00
Johannes Schill
28fe1dc0c7 chore: Lock down versions of expose-loader and html-loader 2019-03-14 08:25:53 +01:00
Johannes Schill
4964627eea chore: Bump fork-ts-checker-webpack-plugin 2019-03-14 08:25:52 +01:00
Johannes Schill
76eff009d2 chore: Prod builds should not cache 2019-03-14 08:25:51 +01:00
Johannes Schill
8eab2bef33 chore: Replace Uglify with Terser 2019-03-14 08:25:51 +01:00
Johannes Schill
51e01eff0a chore: Bump webpack, webpack-bundle-analyzer, webpack-cli and webpack-dev-server to latest 2019-03-14 08:25:50 +01:00
Carl Bergquist
9ac69fefc6 Merge pull request #15987 from fetzerch/tags
docs: Change type of 'tags' in annotationQuery result example to list
2019-03-14 07:48:38 +01:00
Carl Bergquist
89709e34e4 Merge pull request #15989 from utkarshcmu/fix-#15665
Added cloudwatch metric math docs
2019-03-14 07:47:33 +01:00
ryan
c023635780 reuse more gauge settings in bargauge 2019-03-13 22:59:38 -07:00
ryan
4600aac7d5 set the unit on time data 2019-03-13 22:31:54 -07:00
ryan
ff2e238662 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master:
  generic repeater
  generic repeater
  explore/logs: Hide empty duplicates column
  fix for firefox checkboxes not appearing properly, added appearance as none
  used regex instead of string replacing
2019-03-13 21:30:51 -07:00
ryan
c690598557 add error when not found 2019-03-13 17:16:20 -07:00
utkarshcmu
78e08da2ef Added metric math docs 2019-03-13 15:00:41 -07:00
ryan
734a209535 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master:
  generic repeater
  generic repeater
  explore/logs: Hide empty duplicates column
  fix for firefox checkboxes not appearing properly, added appearance as none
  used regex instead of string replacing
2019-03-13 13:28:49 -07:00
ryan
c38000d445 merge 2019-03-13 13:27:08 -07:00
ryan
68f7e046ab check types better 2019-03-13 13:11:49 -07:00
ryan
0c086795e3 check types better 2019-03-13 13:07:01 -07:00
Christian Fetzer
0cd59fdbcc docs: Change type of 'tags' in annotationQuery result example to list
A datasource plugin must return a list of tags in the 'tags' field of
the annotationQuery result. A string 'test' would otherwise result in
4 tags in Grafana: 't','e','s','t'.
2019-03-13 20:48:49 +01:00
ryan
75022ebd63 single hook 2019-03-13 12:46:04 -07:00
Torkel Ödegaard
9c4abc9d0c Merge pull request #15982 from steven-sheehy/hide-duplicate-column
explore/logs: Hide empty duplicates column
2019-03-13 20:38:18 +01:00
Torkel Ödegaard
010b45d75e Merge pull request #15981 from srid12/firefox-checkbox-15854
Fix for firefox checkboxes not appearing properly
2019-03-13 20:36:25 +01:00
Torkel Ödegaard
bfc84c0f2b Merge pull request #15980 from srid12/custom-variable-issue-15921
used regex instead of string replacing
2019-03-13 20:34:56 +01:00
Torkel Ödegaard
614b4251de Merge pull request #15985 from ryantxu/generic-viz-repeat
VisRepeater should not care about the value type
2019-03-13 20:33:16 +01:00
Sean Lafferty
fcc18d8121 Change import path for social in the tests 2019-03-13 14:55:22 -04:00
Sean Lafferty
8d8119aa98 Change import path for social since it has moved 2019-03-13 14:34:55 -04:00
ryan
6472c2bcd9 generic repeater 2019-03-13 11:30:52 -07:00
Sean Lafferty
8d19ca005f Merge branch 'master' into 12556-oauth-pass-thru 2019-03-13 14:25:43 -04:00
ryan
36d67f22e9 generic repeater 2019-03-13 11:24:18 -07:00
ryan
1bc8e7a8d1 merge master, works with bar gauge now 2019-03-13 11:12:11 -07:00
Sean Lafferty
de338338bf Remove todo about index on user_id in user_auth because it exists 2019-03-13 13:46:49 -04:00
Sean Lafferty
7e62394d01 Add function in ds_proxy to handle oauthPassThru headers 2019-03-13 13:45:32 -04:00
Sean Lafferty
f79dc0a89b Remove auth_module settings from oauthPassThru ui 2019-03-13 13:34:10 -04:00
Sean Lafferty
4324a7f51a Remove auth module from ds_proxy oauth test 2019-03-13 13:28:49 -04:00
Sean Lafferty
3b15e110a5 Get most recent oauth token from db, rather than lookup by auth_module 2019-03-13 13:22:22 -04:00
corpglory-dev
2bd64d2c31 Improve tooltip look 2019-03-13 19:44:18 +03:00
corpglory-dev
a550e5388a Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-03-13 19:31:40 +03:00
Steven Sheehy
17184257af explore/logs: Hide empty duplicates column
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-13 11:12:29 -05:00
ryan
011b2cdf09 merge master 2019-03-13 09:10:21 -07:00
sridhar-komati
8acc00aa66 fix for firefox checkboxes not appearing properly, added appearance as none 2019-03-13 21:38:16 +05:30
ryan
b4a3aecbbc merge master 2019-03-13 09:03:32 -07:00
ryan
a17b1912c2 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (95 commits)
  Fixed issue with alert links in alert list panel causing panel not found errors, fixes #15680
  Add comments
  Add simple test for the ColorPicker
  Use render props pattern in color picker
  Move ColorPicker trigger to separate component and cleanup css
  Improved error handling when rendering dashboard panels, fixes #15913
  fix return type
  Only send ci metrics to hosted metrics instance
  adding types
  Added back branch guard
  moved delete button from sidebar to general tab and renamed it
  Refactoring the ci metrics a bit more making it easier to re-use
  removed unused and very specific variables, also variables with same value as general variable
  reduce loglevel to debug
  Updated bar gauge snapshot
  added some comments about state of components things
  heatmap: fix for negative values
  move sort to table processing
  onCellClick
  rotate!
  ...
2019-03-13 08:38:25 -07:00
ryan
b933c57c62 merge master 2019-03-13 08:36:51 -07:00
Sean Lafferty
f17307bb97 Always return most recently used auth_module from GetAuthInfo 2019-03-13 11:29:13 -04:00
sridhar-komati
03d4b61208 used regex instead of string replacing 2019-03-13 20:42:19 +05:30
Torkel Ödegaard
4bbd6ab79c Merge pull request #15975 from grafana/fixed-alert-link-issue
Fixed issue with AlertList panel links resulting in panel not found errors
2019-03-13 15:52:14 +01:00
Torkel Ödegaard
91fc73bf82 Fixed issue with alert links in alert list panel causing panel not found errors, fixes #15680 2019-03-13 13:51:22 +01:00
Andrej Ocenas
f7a8df6ebd Merge pull request #15926 from grafana/create-color-picker-trigger-component
Create default ColorPickerTrigger component
2019-03-13 12:47:52 +01:00
Andrej Ocenas
fc199a35ca Add comments 2019-03-13 12:23:41 +01:00
Andrej Ocenas
dfb2dd2500 Add simple test for the ColorPicker 2019-03-13 12:23:40 +01:00
Andrej Ocenas
96285c4f56 Use render props pattern in color picker 2019-03-13 12:23:39 +01:00
Andrej Ocenas
4a2905de97 Move ColorPicker trigger to separate component and cleanup css 2019-03-13 12:23:38 +01:00
Torkel Ödegaard
d6bab53d3b Merge pull request #15626 from grafana/davkal/15607-explore-line-colors
Explore: Make sure line graphs get different colors
2019-03-13 12:21:44 +01:00
Torkel Ödegaard
d8c2264670 Merge pull request #15970 from grafana/dashboard-rendering-error-handling
Improved error handling when rendering dashboard panels
2019-03-13 12:19:58 +01:00
Torkel Ödegaard
2333cf3fd1 Improved error handling when rendering dashboard panels, fixes #15913 2019-03-13 11:43:16 +01:00
Peter Holmberg
1994b18b5a fix return type 2019-03-13 11:37:33 +01:00
Torkel Ödegaard
e31029adaa Merge pull request #14877 from papagian/feature-histogram-min-max
Optionally set histogram x-axis min/max
2019-03-13 11:23:30 +01:00
Torkel Ödegaard
9e7d1f4275 Merge pull request #15466 from grafana/bar-gauge-poc
New Bar Gauge panel
2019-03-13 11:12:33 +01:00
Torkel Ödegaard
7164412d84 Merge pull request #15968 from grafana/move-delete-dashboard
Moved delete button in Dashboard settings
2019-03-13 11:09:41 +01:00
Torkel Ödegaard
6445d6cb64 Merge pull request #15963 from grafana/sass-variable-cleanout
Cleaned out some sass variables
2019-03-13 11:09:18 +01:00
Torkel Ödegaard
78b2978846 Only send ci metrics to hosted metrics instance 2019-03-13 10:55:20 +01:00
Torkel Ödegaard
6f226edcc0 Merge branch 'ci-metrics-take2' 2019-03-13 10:50:34 +01:00
Peter Holmberg
9c33a9410f adding types 2019-03-13 10:50:21 +01:00
Torkel Ödegaard
988cc198d2 Added back branch guard 2019-03-13 10:50:17 +01:00
ijin08
c96b3995e4 moved delete button from sidebar to general tab and renamed it 2019-03-13 10:24:26 +01:00
Torkel Ödegaard
4f6fdd8665 Refactoring the ci metrics a bit more making it easier to re-use 2019-03-13 10:10:46 +01:00
ijin08
e632309ab9 removed unused and very specific variables, also variables with same value as general variable 2019-03-13 09:40:56 +01:00
bergquist
f13263eb54 reduce loglevel to debug 2019-03-13 09:01:45 +01:00
Torkel Ödegaard
613e233440 Updated bar gauge snapshot 2019-03-13 08:50:44 +01:00
Torkel Ödegaard
aa6a9329c3 Merge pull request #15842 from ryantxu/alpha-react-virtualized-table
Alpha react-virtualized table
2019-03-13 08:42:51 +01:00
Torkel Ödegaard
af4de51a9a added some comments about state of components things 2019-03-13 08:39:40 +01:00
Torkel Ödegaard
71159fb606 Merge remote-tracking branch 'origin/master' into bar-gauge-poc 2019-03-13 08:26:06 +01:00
Torkel Ödegaard
6f683a8e9f Merge pull request #15953 from alexanderzobnin/fix-heatmap-negative-values
Heatmap: fix for negative values
2019-03-13 07:27:23 +01:00
ryan
15c111b39d better comments 2019-03-12 21:30:48 -07:00
ryan
8cca611727 comment cleanup 2019-03-12 21:25:35 -07:00
ryan
f5e8734c6b force circleci to try again 2019-03-12 21:11:11 -07:00
ryan
4652138987 format 2019-03-12 21:05:33 -07:00
ryan
f165139bae touch 2019-03-12 17:03:21 -07:00
ryan
227d28154b touch 2019-03-12 17:02:44 -07:00
ryan
4e5e548902 merge master 2019-03-12 16:57:30 -07:00
ryan
09ba8cd5d3 make sure the validator is called before setState 2019-03-12 16:35:22 -07:00
ryan
7311b14da1 API to fix/update properties before load 2019-03-12 16:10:14 -07:00
ryan
c82a7b9bd5 Merge remote-tracking branch 'grafana/master' into table-reducer
* grafana/master: (32 commits)
  Fixed more typescript no implicit any issues
  Also push to ci metrics to new shared HM instance
  Fixed type issues introduced by adding angular types
  Typescript noAny fixes, start of a long journey
  Updated code stats collection
  Updated path to new script
  POC on collecting metrics in ci process
  changelog: add notes about heatmap issues #15683 #14019
  added two new variables in default theme for panel padding, replaced panelhorizontalpadding and variables.panelverticalpadding with new variables
  renamed default variables: s -> sm, m -> md, l -> lg
  removed gf-form-margin variable and replaced with space- variables where it was used
  heatmap: able to hide buckets with zero value #12080
  s -> sm, m -> md, l -> lg
  heatmap: fix prometheus buckets sorting, closes #15637
  s -> sm, m -> md, l -> lg
  removed headings-margin-bottom variable
  remove kbn test
  Added scopedVars argument in datasourceSrv.get in DataPanel
  heatmap: able to reverse Y buckets order, #15683
  Refactoring of multi-value datasource PR #15812
  ...
2019-03-12 14:34:15 -07:00
ryan
e84ddc8e30 more tests 2019-03-12 14:34:01 -07:00
ryan
0446fb9171 more options in storybook 2019-03-12 14:26:07 -07:00
ryan
9016c18088 adding simple widget to pick the reducer 2019-03-12 10:53:28 -07:00
Alexander Zobnin
fb3ea93f9d heatmap: fix for negative values 2019-03-12 20:44:05 +03:00
Torkel Ödegaard
54f92514d5 Merge pull request #15950 from grafana/typescript-any-part2
Fixed more typescript no implicit any issues
2019-03-12 18:17:19 +01:00
Torkel Ödegaard
e3dd70bce6 Merge pull request #15937 from alexanderzobnin/heatmap-fixes
Heatmap fixes and improvements
2019-03-12 17:57:01 +01:00
Torkel Ödegaard
37496fe6a8 Fixed more typescript no implicit any issues 2019-03-12 17:55:01 +01:00
Torkel Ödegaard
ab2caf9ef9 Merge pull request #15943 from grafana/15429-removed-sass-var-in-js
Removed SASS variables being used in JS
2019-03-12 17:18:12 +01:00
Torkel Ödegaard
fd8d45fd23 Merge pull request #15947 from grafana/ci-metrics-to-hm-instance
Also push to ci metrics to new shared HM instance
2019-03-12 17:17:07 +01:00
Torkel Ödegaard
4eef407b81 Also push to ci metrics to new shared HM instance 2019-03-12 17:11:47 +01:00
ryan
a8c985de60 move sort to table processing 2019-03-12 09:09:33 -07:00
ryan
90510b5ffb Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
* grafana/master:
  Fixed type issues introduced by adding angular types
  Typescript noAny fixes, start of a long journey
  Updated code stats collection
  Updated path to new script
  POC on collecting metrics in ci process
  renamed default variables: s -> sm, m -> md, l -> lg
  removed gf-form-margin variable and replaced with space- variables where it was used
  heatmap: able to hide buckets with zero value #12080
  s -> sm, m -> md, l -> lg
  heatmap: fix prometheus buckets sorting, closes #15637
  s -> sm, m -> md, l -> lg
  removed headings-margin-bottom variable
  remove kbn test
  Added scopedVars argument in datasourceSrv.get in DataPanel
  Refactoring of multi-value datasource PR #15812
  fixed minor misstake with dashboard padding
  removed -margin, replaced with new general variables
  added new space variables to margins in AddPanelWidget, add_data_source, dashboard_settings and sidemenu
  added new variables for spacing, set margins in _cards with new variables
  Make datasource variables multiselect and dashboard repeatable
2019-03-12 09:04:20 -07:00
Torkel Ödegaard
5cabf64fa4 Merge pull request #15946 from grafana/typescript-any-fixes-part1
Progress on fixing typescript noImplicitAny issues
2019-03-12 15:52:42 +01:00
Torkel Ödegaard
3e5016c228 Merge pull request #15941 from grafana/renamed-defaults-size
Renamed default.ts variables
2019-03-12 15:45:12 +01:00
Torkel Ödegaard
f477066097 Merge pull request #15940 from grafana/8px-system-margins3
Removed headings-margin-bottom and gf-form-margin
2019-03-12 15:39:52 +01:00
Torkel Ödegaard
4c6f2d6d4a Merge pull request #15912 from grafana/8px-system-margins2
Removed variable $panel-margin
2019-03-12 15:36:59 +01:00
Torkel Ödegaard
d7dc6ad3f4 Fixed type issues introduced by adding angular types 2019-03-12 15:27:02 +01:00
Torkel Ödegaard
25b1bec250 Typescript noAny fixes, start of a long journey 2019-03-12 15:14:45 +01:00
Torkel Ödegaard
90cacf717c Merge pull request #15944 from grafana/ci-metrics
Collecting metrics in ci process
2019-03-12 15:13:12 +01:00
Torkel Ödegaard
9f4bca503a Updated code stats collection 2019-03-12 15:08:46 +01:00
Torkel Ödegaard
94677ba874 Updated path to new script 2019-03-12 14:46:38 +01:00
Torkel Ödegaard
3e2350be87 POC on collecting metrics in ci process 2019-03-12 14:42:36 +01:00
Alexander Zobnin
c248c1f4f1 changelog: add notes about heatmap issues #15683 #14019 2019-03-12 16:41:55 +03:00
ijin08
dc98fb5e82 added two new variables in default theme for panel padding, replaced panelhorizontalpadding and variables.panelverticalpadding with new variables 2019-03-12 14:24:48 +01:00
ijin08
c54f2912e4 renamed default variables: s -> sm, m -> md, l -> lg 2019-03-12 13:01:22 +01:00
Patrick O'Carroll
b2a0c2b6d2 Merge branch 'master' into 8px-system-margins3 2019-03-12 12:42:23 +01:00
Patrick O'Carroll
c2f5c12e5a Merge branch 'master' into 8px-system-margins2 2019-03-12 12:41:41 +01:00
Torkel Ödegaard
51c06a8c46 Merge pull request #15901 from grafana/8px-system-margins
8px system margins
2019-03-12 12:31:31 +01:00
ijin08
7a15528223 removed gf-form-margin variable and replaced with space- variables where it was used 2019-03-12 12:30:34 +01:00
Torkel Ödegaard
4ed1fdf754 Merge pull request #15932 from alexanderzobnin/fix-prom-heatmap-sorting
Heatmap: Fixes Y-axis tick labels being in wrong order for some Prometheus queries
2019-03-12 12:27:06 +01:00
Torkel Ödegaard
6f34b1541d Merge pull request #15914 from grafana/multi-valued-datasource-variable
Multi valued datasource variable
2019-03-12 09:48:02 +01:00
Torkel Ödegaard
3e4153a9e3 Merge pull request #15934 from alexanderzobnin/heatmap-hide-zero-buckets
heatmap: able to hide buckets with zero value
2019-03-12 09:32:14 +01:00
ryan
b7963f8e87 add table reducer 2019-03-12 01:29:01 -07:00
Dominik Prokop
6d87e82151 Merge pull request #15930 from ryantxu/remove-kbn-test
Remove deprecated kbn test
2019-03-12 09:25:33 +01:00
Alexander Zobnin
9ee2a08def heatmap: able to hide buckets with zero value #12080 2019-03-12 10:59:55 +03:00
ijin08
1432fdd102 Merge branch '8px-system-margins2' of github.com:grafana/grafana into 8px-system-margins3 2019-03-12 08:39:44 +01:00
ijin08
d47f6e5bb3 s -> sm, m -> md, l -> lg 2019-03-12 08:34:55 +01:00
ijin08
3e6c15a88a Merge branch '8px-system-margins' of github.com:grafana/grafana into 8px-system-margins2 2019-03-12 08:31:31 +01:00
Alexander Zobnin
4e22918010 heatmap: fix prometheus buckets sorting, closes #15637 2019-03-12 10:26:20 +03:00
ijin08
a418697453 s -> sm, m -> md, l -> lg 2019-03-12 08:10:31 +01:00
ijin08
204d21abbe removed headings-margin-bottom variable 2019-03-12 08:01:20 +01:00
ryan
6ae0d8e062 rename to displayValues 2019-03-11 22:17:37 -07:00
ryan
152aa76648 merge master 2019-03-11 21:16:51 -07:00
ryan
4ad5e1595b remove kbn test 2019-03-11 21:07:10 -07:00
ryan
bf0b9d9fe2 more tests 2019-03-11 21:04:47 -07:00
ryan
ada9ac1be1 use new settings 2019-03-11 19:37:10 -07:00
ryan
94799f568e fix tests 2019-03-11 17:52:46 -07:00
ryan
df8fc3f7cb Merge remote-tracking branch 'grafana/master' into reusable-formatting-options
* grafana/master:
  Call ora instead of instantiating it
2019-03-11 15:44:16 -07:00
ryan
4783ea629b merge with master 2019-03-11 15:10:11 -07:00
ryan
8cd54c94e9 make value processing reusable 2019-03-11 14:47:54 -07:00
Dominik Prokop
304912f9b4 Merge pull request #15923 from grafana/fix/cli-spinner
Call ora instead of instantiating it
2019-03-11 21:18:49 +01:00
Dominik Prokop
40916a552f Call ora instead of instantiating it 2019-03-11 20:54:11 +01:00
Torkel Ödegaard
6a34eb2d9a Merge pull request #15886 from ryantxu/table-editor
Add a basic table editor to grafana/ui
2019-03-11 18:41:42 +01:00
Torkel Ödegaard
aeb3553491 Added scopedVars argument in datasourceSrv.get in DataPanel 2019-03-11 18:36:49 +01:00
Torkel Ödegaard
a1b20c8ca9 Merge pull request #15918 from ryantxu/handle-to-on
rename handleXXX to onXX events
2019-03-11 17:58:11 +01:00
ryan
00942ec882 MutableColumn 2019-03-11 09:29:30 -07:00
ryan
455a33bd8e cleanup after review 2019-03-11 09:24:25 -07:00
ryan
f4ae0cfaa8 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master:
  fix(explore/logs) not collapsing whitespace (#15737)
  Refactoring / fixing password hint PR #15868
  chore: Move sidemenu out of context service and use the logic we have in the router already for hiding the sidemenu
  Fix deduplication results displaying wrong data (#15755)
  Revert "Fix Datasource Update to no User/Password"
  fix imageurl in notification test
  changed all rems to pixels in defaults and template, changed back root font size
  Make password hint configurable from settings/defaults.ini
  changed root font to 100%(default 16px), changed font-size from px to rem, updated rem sizes in template and default.ts files, removed display classes and variables since not used, removed lead class and variables since not usedremoved serif font since not used and probably never should be used
  fix: Update test snapshot
  fix: Logo goes Home instead of toggling side menu #15482
  Fix: #14706 Incorrect index pattern padding in alerting queries
  Removed commented code
  Fixed alias in Cloudwatch Expressions
2019-03-11 09:06:08 -07:00
ryan
59b5f88798 rename handleXXX to onXX events 2019-03-11 09:03:10 -07:00
ryan
cb51f13e69 torkel feedback 2019-03-11 08:34:09 -07:00
ryan
c84c77e664 onCellClick 2019-03-11 08:17:59 -07:00
Alexander Zobnin
abb8e71fdc heatmap: able to reverse Y buckets order, #15683 2019-03-11 18:02:25 +03:00
Steven Sheehy
aa7e348694 fix(explore/logs) not collapsing whitespace (#15737)
- Set container width to 100% so column widths can be calculated properly
- Sets duplicates, level, timestamp, local time to a fixed width based upon em units since the size of these are static
- Sets labels to be 20%
- Remove min-width:80% on message column so that it now consumes remaining space
- Additionally fixes long labels from overflowing into the messages column by properly setting a max-width per label and hiding overflow

closes #15673

Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
2019-03-11 15:55:11 +01:00
Torkel Ödegaard
bf72b26c2c Refactoring of multi-value datasource PR #15812 2019-03-11 15:44:11 +01:00
ijin08
fae2f54530 fixed minor misstake with dashboard padding 2019-03-11 15:38:10 +01:00
ijin08
1ad0c7678a removed -margin, replaced with new general variables 2019-03-11 14:47:27 +01:00
Sean Lafferty
d922285ab8 Move oauth token migrations in user_auth_mig 2019-03-11 09:31:03 -04:00
Torkel Ödegaard
a8486806aa Merge branch 'multiselect-repeatby-datasource' of https://github.com/jdoupe/grafana into jdoupe-multiselect-repeatby-datasource 2019-03-11 14:14:26 +01:00
Torkel Ödegaard
5f6838abca Merge pull request #15847 from grafana/15482-go-home-with-logo
Logo takes you Home instead of toggling side menu #15482
2019-03-11 14:10:15 +01:00
Alexander Zobnin
2085397f31 heatmap: fix middle bucket bound for prometheus 2019-03-11 15:54:40 +03:00
Torkel Ödegaard
26779e0798 Merge PR #15868 password hint 2019-03-11 13:34:39 +01:00
Torkel Ödegaard
06f7a49a61 Refactoring / fixing password hint PR #15868 2019-03-11 13:33:57 +01:00
Johannes Schill
0736b8a1fb chore: Move sidemenu out of context service and use the logic we have in the router already for hiding the sidemenu 2019-03-11 13:18:22 +01:00
Torkel Ödegaard
647cb6ddae Merge branch 'master' of https://github.com/joshuawoodward/grafana into joshuawoodward-master 2019-03-11 13:10:45 +01:00
Torkel Ödegaard
4a70d4ef61 Merge pull request #15859 from grafana/font-use-rem-and-variables
Styling update to fonts
2019-03-11 13:09:49 +01:00
Dominik Prokop
a853e2c36e Fix deduplication results displaying wrong data (#15755)
The log rows were mutated in the store, what resulted in wrong deduplication results as well as made the selector memoization quirky - for "the same results" the selector was running twice.
2019-03-11 11:48:14 +01:00
ijin08
d55f189749 added new space variables to margins in AddPanelWidget, add_data_source, dashboard_settings and sidemenu 2019-03-11 11:33:15 +01:00
bergquist
7aeab0a235 use Get instead of Find 2019-03-11 11:04:56 +01:00
Torkel Ödegaard
90a3bc2203 Merge pull request #15892 from sandlis/14706-es-weekly-pattern-fix
Fix: #14706 Incorrect index pattern padding in alerting queries
2019-03-11 11:01:22 +01:00
Torkel Ödegaard
5fab1e89d3 Merge pull request #15897 from grafana/revert-15608-fix-datasource-update
Revert "Fix Datasource Update to no User/Password"
2019-03-11 10:58:28 +01:00
bergquist
b2967fbb37 avoid exposing cache client directly 2019-03-11 10:49:56 +01:00
bergquist
085b631099 add docs about remote cache settings 2019-03-11 10:49:56 +01:00
bergquist
7e7427637c renames distcache -> remotecache 2019-03-11 10:49:55 +01:00
bergquist
66e71b66dd renames key to cache_key
apparently key is a reserved keyword in mysql.
and the error messages doesnt mention that.
can I please have 6h back?
2019-03-11 10:49:55 +01:00
bergquist
dbc1315d6f build steps for cache servers 2019-03-11 10:49:55 +01:00
bergquist
daa3b17951 code layouts and comments 2019-03-11 10:49:42 +01:00
Torkel Ödegaard
3f574d3e57 Merge pull request #15685 from utkarshcmu/fix-#15562
Fixed alias in Cloudwatch Expressions
2019-03-11 10:49:30 +01:00
bergquist
9a78c23165 rename put -> set 2019-03-11 10:49:10 +01:00
bergquist
6231095f72 reverts package.json I made during the flight >.> 2019-03-11 10:49:10 +01:00
bergquist
98f5432659 memcache -> memcached
https://github.com/memcached/memcached
2019-03-11 10:49:09 +01:00
bergquist
995647be2c removes memory as distcache option
if database caching is to expensive if should
not use distcache in the first place.
2019-03-11 10:49:09 +01:00
bergquist
b933b4efc8 test redis and memcached during integration tests 2019-03-11 10:49:09 +01:00
bergquist
196cdf9710 adds config to default settings 2019-03-11 10:49:09 +01:00
bergquist
f9f2d9fcf3 avoid exporting test helpers 2019-03-11 10:49:09 +01:00
bergquist
33935b09f0 uses set instead of add for memcache
set always sets the value regardless.
2019-03-11 10:49:09 +01:00
bergquist
8db2864fee adds memory as dist storage alt 2019-03-11 10:49:09 +01:00
bergquist
a60bb83a70 extract tests into seperate files 2019-03-11 10:49:09 +01:00
bergquist
c8ff698d90 avoid exposing internal structs and functions 2019-03-11 10:49:04 +01:00
Alexander Zobnin
57f48f17a0 heatmap: don't display cut cards 2019-03-11 12:42:16 +03:00
Alexander Zobnin
bef024e4eb heatmap: fix error when series empty 2019-03-11 11:58:52 +03:00
Alexander Zobnin
9dbcc0fb6e heatmap: middle bucket bound option, #15683 2019-03-11 11:46:30 +03:00
ryan
7054cf8bb5 rotate! 2019-03-11 01:08:00 -07:00
ijin08
7dc4853e91 added new variables for spacing, set margins in _cards with new variables 2019-03-11 08:51:32 +01:00
ryan
61053ec099 better css 2019-03-11 00:45:15 -07:00
Carl Bergquist
a6e5e777be Merge pull request #15896 from genofire/patch-1
fix imageurl in notification test
2019-03-11 07:32:14 +01:00
Carl Bergquist
f3753712e0 Revert "Fix Datasource Update to no User/Password" 2019-03-11 07:22:54 +01:00
ryan
91a2307b98 rotate! 2019-03-10 23:11:57 -07:00
genofire
6d578dd372 fix imageurl in notification test
skip unnecessary http -> https redirect, which could make problems on some notifiers
2019-03-11 00:23:07 +01:00
ryan
84fa9be29f add comment 2019-03-10 15:51:19 -07:00
ryan
eef94b3f08 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master:
  reuse deprecationWarning
  move to string.ts
  move stringToJsRegex
  minor storybook cleanup
  docs: update slack alert notification settings
2019-03-10 15:34:18 -07:00
ryan
b80c773ebe attach themes to table story 2019-03-10 15:34:02 -07:00
ryan
0a094c1226 merge master 2019-03-10 13:45:18 -07:00
Torkel Ödegaard
fc41d10b9e Merge pull request #15891 from ryantxu/string-utils
move stringToJsRegex to grafana/ui
2019-03-10 19:56:36 +01:00
Dominik Prokop
eefba7373d Merge pull request #15890 from ryantxu/storybook-cleanup
Minor storybook cleanup

- DeleteButton should use withCenteredStory like everythign else
- Clicking the 'Red' button should not pick blue :)
2019-03-10 19:42:20 +01:00
Carl Bergquist
e46e71bbf3 Merge pull request #15878 from zhulongcheng/docs-add-slack-url
docs: update slack alert notification settings
2019-03-10 19:40:01 +01:00
ryan
f7f124c56b reuse deprecationWarning 2019-03-10 10:37:44 -07:00
ryan
d13eebfe52 move to string.ts 2019-03-10 10:19:02 -07:00
ryan
b2b35fc996 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master:
  docs: Fix indentation level for OAuth2 config
  docs: update CONTRIBUTING.md
2019-03-10 00:17:01 -08:00
ryan
b2a7891b08 move stringToJsRegex 2019-03-09 23:50:46 -08:00
ryan
494acddb2f get field mapping to actually work 2019-03-09 23:39:11 -08:00
ryan
1cb03670c4 add variable size storybook 2019-03-09 23:07:42 -08:00
ryan
fe22d14e93 cell builder cleanup 2019-03-09 20:47:02 -08:00
ryan
11188b53af minor storybook cleanup 2019-03-09 15:43:49 -08:00
ryan
6494c17cfa fix typos 2019-03-09 15:27:14 -08:00
ryan
e2be194b46 autofill space rather than force with/height values 2019-03-09 15:10:06 -08:00
ryan
9134620c1a return table directly, not the debug info 2019-03-09 14:15:41 -08:00
Sofia Papagiannaki
4cf698af10 Minor fix in values to histogram conversion
Filter out values outside the min and max boundaries
because they are assigned to uninitialized buckets
(outside min and max bounds).
2019-03-09 20:36:31 +02:00
Sofia Papagiannaki
5ed3139d5a Fix histogram x-axis min/max
This commit:
*fixes histogram computation when zero x-axis min/max are set
(they used to be ignored).
*validates the user defined x-axis min/max values
and ignores them if they result in invalid bucket sizes.
2019-03-09 20:36:30 +02:00
ryan
c7f35f2dcf moved utillities to util 2019-03-09 10:16:43 -08:00
Sofia Papagiannaki
96e1804d55 Change xaxis min and max form input types to number 2019-03-09 17:20:14 +02:00
Sofia Papagiannaki
f0d1a9157f Fix histogram xaxis min/max tests 2019-03-09 17:20:14 +02:00
Sofia Papagiannaki
332ecd483f Optionally set histogram x-axis min/max 2019-03-09 17:20:14 +02:00
ryan
078d8f1210 table using MultiGrid 2019-03-09 00:27:33 -08:00
ryan
343e49decb Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
* grafana/master: (24 commits)
  docs: Fix indentation level for OAuth2 config
  docs: update CONTRIBUTING.md
  @grafana/ui - release docs v1 (#15835)
  Minor refactoring of copy tags when saving feature, #15446
  Simple implementation for preserve tags, closes #11627
  Updated prettierignore
  Refactoring of PR #14772
  fix typo in pr template
  add nil/length check when delete old login attempts
  Minor refactoring of new react text panel
  fix allow anonymous server bind for ldap search
  use pure component
  use replaceVariables
  Catch bad regex exception at controller level
  11780: invalid reg value can cause unexpected behaviour
  update
  Add string quote func
  Remove option used to control within browser
  Add pic into actionCard message
  Add new option to set where to open the message url
  ...
2019-03-08 20:52:30 -08:00
ryan
3bd26df7de cleanup 2019-03-08 20:49:45 -08:00
ryan
eca3824e2d cleanup 2019-03-08 20:36:52 -08:00
ryan
40d7ba1e6a adding toolbar 2019-03-08 18:02:52 -08:00
ryan
9df47391ea adding stub table input CSV 2019-03-08 16:49:45 -08:00
Daniel Lee
0ae9c1c5cc Merge pull request #15882 from nowke/patch-1
docs: Fix indentation level for OAuth2 config
2019-03-09 00:35:46 +01:00
Torkel Ödegaard
6d6c7698e4 Merge pull request #15881 from zhulongcheng/docs-Contributing
docs: update CONTRIBUTING.md
2019-03-08 18:55:48 +01:00
Navaneesh Kumar
ccdc82b921 docs: Fix indentation level for OAuth2 config 2019-03-08 22:38:50 +05:30
zhulongcheng
e08d8eb55d docs: update CONTRIBUTING.md 2019-03-09 00:30:20 +08:00
ryan
7ce7da1251 merge master 2019-03-08 08:27:48 -08:00
ryan
6617a382a3 Merge remote-tracking branch 'grafana/master' into all-data-as-table
* grafana/master: (23 commits)
  @grafana/ui - release docs v1 (#15835)
  Minor refactoring of copy tags when saving feature, #15446
  Simple implementation for preserve tags, closes #11627
  Updated prettierignore
  Refactoring of PR #14772
  fix typo in pr template
  add nil/length check when delete old login attempts
  Minor refactoring of new react text panel
  fix allow anonymous server bind for ldap search
  Update README.md
  use pure component
  use replaceVariables
  Catch bad regex exception at controller level
  11780: invalid reg value can cause unexpected behaviour
  update
  Add string quote func
  Remove option used to control within browser
  Add pic into actionCard message
  Add new option to set where to open the message url
  Optimize the Dingding match values format
  ...
2019-03-08 08:25:30 -08:00
zhulongcheng
7743f77e45 docs: update slack alert notification settings
closes #15878
2019-03-09 00:19:21 +08:00
Torkel Ödegaard
570187384b Merge pull request #13825 from athurg/optimize_dingding_alert_message
Optimize dingding alert message
2019-03-08 15:33:24 +01:00
Marcus Efraimsson
80ce11a4a4 docs: update admin and user http api documentation 2019-03-08 15:15:57 +01:00
Marcus Efraimsson
0cd5a6772d feat(api): support list/revoke auth token in admin/current user api 2019-03-08 15:15:38 +01:00
Marcus Efraimsson
8029e48588 support get user tokens/revoke all user tokens in UserTokenService 2019-03-08 15:15:17 +01:00
Dominik Prokop
d104ee1c15 @grafana/ui - release docs v1 (#15835)
* Readme update

* Update @grafana/ui Readme qith release process description. Allow version commit creation during release

* Run tests and checks for grafana/core before releasing grafana/ui

* Post review Readme updates
2019-03-08 14:42:19 +01:00
Torkel Ödegaard
4518604cd6 Merge pull request #15446 from grafana/preserve-tags-option
Preserve tags switch option in Save As modal
2019-03-08 14:41:51 +01:00
Marcus Efraimsson
4f48ed3350 Merge pull request #15872 from grafana/15643_fix2
fix allow anonymous server bind for ldap search
2019-03-08 14:25:58 +01:00
Marcus Efraimsson
c9e90f8957 Merge pull request #15873 from grafana/13344_fix
add nil/length check when delete old login attempts
2019-03-08 14:25:24 +01:00
Torkel Ödegaard
04c88a226b Minor refactoring of copy tags when saving feature, #15446 2019-03-08 14:24:45 +01:00
Torkel Ödegaard
60272d8a77 Simple implementation for preserve tags, closes #11627 2019-03-08 14:00:44 +01:00
Torkel Ödegaard
2bc573c840 Merge branch 'master' of github.com:grafana/grafana 2019-03-08 13:56:37 +01:00
Torkel Ödegaard
74421ceb13 Updated prettierignore 2019-03-08 13:56:21 +01:00
Torkel Ödegaard
747aa82272 Merge branch 'SamuelToh-11780_wrong_repexp_in_series' 2019-03-08 13:55:53 +01:00
Torkel Ödegaard
878da68c90 Refactoring of PR #14772 2019-03-08 13:55:39 +01:00
corpglory-dev
a7bd8d503d Simple storybook 2019-03-08 15:47:15 +03:00
Marcus Efraimsson
d7d968412b fix typo in pr template 2019-03-08 13:47:09 +01:00
Torkel Ödegaard
01eb5fade3 Merge branch '11780_wrong_repexp_in_series' of https://github.com/SamuelToh/grafana into SamuelToh-11780_wrong_repexp_in_series 2019-03-08 13:40:50 +01:00
Marcus Efraimsson
e3b3062107 add nil/length check when delete old login attempts 2019-03-08 13:31:46 +01:00
Torkel Ödegaard
48114edc86 Minor refactoring of new react text panel 2019-03-08 13:30:47 +01:00
Torkel Ödegaard
90f8179bd2 Merge branch 'alpha-text2' of https://github.com/ryantxu/grafana into ryantxu-alpha-text2 2019-03-08 13:18:06 +01:00
corpglory-dev
b8fcd3d962 Improve rendering 2019-03-08 15:17:04 +03:00
Marcus Efraimsson
c242d38301 fix allow anonymous server bind for ldap search 2019-03-08 13:16:35 +01:00
ijin08
00ce556bd0 changed all rems to pixels in defaults and template, changed back root font size 2019-03-08 13:02:55 +01:00
corpglory-dev
7bc741c4e2 piechart -> pieChart 2019-03-08 13:51:25 +03:00
corpglory-dev
e47769c185 Rename: Piechart -> PieChart 2019-03-08 13:42:41 +03:00
corpglory-dev
ef37e95bb7 Import only what is used from d3 2019-03-08 13:33:53 +03:00
ryan
229dff757c less nesting and add test 2019-03-08 02:14:35 -08:00
ryan
188dc86246 remove type field and add helper functions to check if data isTableData 2019-03-08 00:41:35 -08:00
ryan
5aef3bd139 add storybook 2019-03-08 00:28:42 -08:00
bergquist
3890bd14eb fixes typo in redis devenv 2019-03-08 09:09:28 +01:00
bergquist
11d671c637 add support for memcached 2019-03-08 09:09:28 +01:00
bergquist
5ced863f75 add support for redis storage 2019-03-08 09:09:27 +01:00
bergquist
d99af23946 add garbage collector for database cache 2019-03-08 09:09:27 +01:00
bergquist
996d5059b1 test at interface level instead impl 2019-03-08 09:09:27 +01:00
bergquist
d4f5789660 cache: initial version of db cache 2019-03-08 09:09:27 +01:00
ryan
223906654c don't include stuff from app/... 2019-03-07 18:27:51 -08:00
ryan
eed9a2010e fix scss 2019-03-07 17:55:23 -08:00
ryan
ad51b069b3 rename to Table 2019-03-07 17:51:45 -08:00
ryan
e1324289c8 rename to Table 2019-03-07 17:49:02 -08:00
ryan
ca5d7c3510 fix type errors 2019-03-07 17:08:22 -08:00
ryan
d7b1fd75e3 move to grafana/ui 2019-03-07 16:52:20 -08:00
ryan
39be5959b8 better sort function 2019-03-07 15:01:36 -08:00
ryan
1609c07fb2 use TableData, not interface 2019-03-07 14:55:30 -08:00
ryan
2db4004d62 Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
* grafana/master:
  Update README.md
  Update core:start cli command to watch theme changes again (#15856)
  Updated pull request template
  Updated pull request rtemplate
  Removed title case from issue template title
  Updated issue template titles
  Updated issue templates
  Updated templates
  fix: Update error message and replace npm with yarn #15851
  fix: Make sure we dont add &autofitpanels to the url if it already exists #15849
  Update upgrading.md for wrong spell
  return the same panelData unless it changes
  Map dataSourceTypeSearchQuery state from redux to search input.
  Revert "Fix for leaving playlist mode"
  add new issue templates
2019-03-07 14:20:42 -08:00
Woodward, Joshua
946e542412 Make password hint configurable from settings/defaults.ini 2019-03-07 14:00:04 -08:00
ryan
439b044204 move toTableData to grafana/ui 2019-03-07 13:09:53 -08:00
ryan
8bf57359ab don't require x & y columns for timeSeries 2019-03-07 12:47:21 -08:00
ryan
abf015ace2 use TableData for timeseries in react 2019-03-07 12:13:38 -08:00
Matt Toback
f9e3c33ebd Update README.md 2019-03-07 14:33:37 -05:00
Alexander Zobnin
7167fa9d07 heatmap: reduce number of legend segments to reasonable value and round x values to prevent gaps 2019-03-07 20:05:32 +03:00
Alexander Zobnin
55d5219a05 heatmap: fix legend padding 2019-03-07 19:49:14 +03:00
Alexander Zobnin
c104f31149 heatmap: fix legend for small values, #14019 #15683 2019-03-07 18:57:18 +03:00
corpglory-dev
0f9253fe9d status: alpha 2019-03-07 17:46:50 +03:00
ijin08
c5f4239703 changed root font to 100%(default 16px), changed font-size from px to rem, updated rem sizes in template and default.ts files, removed display classes and variables since not used, removed lead class and variables since not usedremoved serif font since not used and probably never should be used 2019-03-07 15:37:17 +01:00
Torkel Ödegaard
56682cb1eb Merge pull request #15850 from grafana/15849-autofitpanels-in-url
Don't add autofitpanels to the url if it already exists
2019-03-07 13:19:03 +01:00
Dominik Prokop
312ce88e25 Update core:start cli command to watch theme changes again (#15856) 2019-03-07 13:12:10 +01:00
Torkel Ödegaard
2a0122dfbc Merge pull request #15852 from grafana/15851-update-error-message
Update error message and replace npm with yarn
2019-03-07 12:28:11 +01:00
Torkel Ödegaard
f71d45b1c1 Updated pull request template 2019-03-07 12:10:25 +01:00
Torkel Ödegaard
8892b933e8 Updated pull request rtemplate 2019-03-07 11:41:07 +01:00
Torkel Ödegaard
708fd6df21 Removed title case from issue template title 2019-03-07 11:12:43 +01:00
Torkel Ödegaard
067f0561d6 Updated issue template titles 2019-03-07 11:09:16 +01:00
Torkel Ödegaard
51178b3f56 Merge pull request #15534 from grafana/issue_templates
New issue templates
2019-03-07 11:07:36 +01:00
Torkel Ödegaard
ec1bb7b995 Updated issue templates 2019-03-07 11:07:01 +01:00
Torkel Ödegaard
da49fecc30 Updated templates 2019-03-07 10:55:16 +01:00
Johannes Schill
d937f1ff21 fix: Update error message and replace npm with yarn #15851 2019-03-07 10:52:24 +01:00
Johannes Schill
f3dbdfac07 fix: Make sure we dont add &autofitpanels to the url if it already exists #15849 2019-03-07 10:32:36 +01:00
Johannes Schill
06e9c116af fix: Update test snapshot 2019-03-07 09:54:39 +01:00
Johannes Schill
d6449ee629 fix: Logo goes Home instead of toggling side menu #15482 2019-03-07 09:36:40 +01:00
Torkel Ödegaard
a826c117e2 Merge pull request #15834 from grafana/revert-15791-fix/leave-playlist
Revert "Fix for leaving playlist mode"
2019-03-07 08:46:14 +01:00
Torkel Ödegaard
12263a3f70 Merge pull request #15838 from aocenas/fix-new-datasource-search
Fix new datasource search input
2019-03-07 08:45:52 +01:00
Torkel Ödegaard
327d1d758d Merge pull request #15841 from ryantxu/fix-15840
return the same panelData unless it changes
2019-03-07 08:44:18 +01:00
Marcus Efraimsson
10d50ea728 Merge pull request #15845 from shafferjohn/patch-1
Update upgrading.md for wrong spell
2019-03-07 08:29:42 +01:00
Shaffer John
272b561958 Update upgrading.md for wrong spell 2019-03-07 11:09:17 +08:00
ryan
3b31341ad9 remove _ 2019-03-06 16:34:32 -08:00
ryan
23c3e9d80a cleanup 2019-03-06 16:25:28 -08:00
ryan
6a8a60bcdf Merge remote-tracking branch 'grafana/master' into alpha-react-virtualized-table
* grafana/master:
  Minor refactoring of PR #15770
  Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702
  fix discord notifier so it doesn't crash when there are no image generated
  Add a keybinding that toggles all legends in a dashboard
  removed color in color variables names
  changed some more color variables to use variables
2019-03-06 16:03:48 -08:00
ryan
2e8dd19636 use pure component 2019-03-06 15:54:19 -08:00
ryan
627a32e9bb Merge remote-tracking branch 'grafana/master' into alpha-text2
* grafana/master: (40 commits)
  Minor refactoring of PR #15770
  Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702
  fix discord notifier so it doesn't crash when there are no image generated
  fix: Consistency in unit labels #15709
  Update latest.json
  Update CHANGELOG.md
  position from add panel, dimensions from copied panel
  changelog: add notes about closing #14509 #15179
  fix: Add class for input fields with help icon to avoid icon hiding the text #15771
  Update CHANGELOG.md
  restore to current folder when restoring old dashboard version
  fix(renderer): Vendor ansicolor as typescript
  log phantomjs output even if it timeout and include orgId when render alert
  keep size from copied panel and not from add panel widget
  Added basic cherry pick helping task
  Prevent search in VizPicker from stealing focus (#15802)
  fix only users that can edit a dashboard should be able to update panel json
  Updated changelog task
  Fixed image rendering issue for dashboards with auto refresh, casued by missing reloadOnSearch flag on route, fixes #15631
  Updated to add PR author, skip PR issue references
  ...
2019-03-06 15:47:14 -08:00
ryan
82326fed42 return the same panelData unless it changes 2019-03-06 15:18:24 -08:00
ryan
0d8384e05d sortable class 2019-03-06 14:39:04 -08:00
Andrej Ocenas
a59e0f1b55 Map dataSourceTypeSearchQuery state from redux to search input. 2019-03-06 22:30:40 +01:00
ryan
f7c1842a2b move rendering to its own file 2019-03-06 10:54:47 -08:00
ryan
aca69df755 try virtualized 2019-03-06 10:10:04 -08:00
corpglory-dev
a23ba378d4 Initial tooltip 2019-03-06 20:32:37 +03:00
Torkel Ödegaard
bc2a798158 Merge pull request #15574 from grafana/more-color-variables-use-variables
Changed some more color variables to use variables
2019-03-06 18:07:42 +01:00
Torkel Ödegaard
1ab548f423 Merge pull request #15832 from grafana/stop-playlist
Alternative fix to detecting when to stop a playlist
2019-03-06 17:57:37 +01:00
Torkel Ödegaard
2604e9e433 Minor refactoring of PR #15770 2019-03-06 17:53:14 +01:00
Torkel Ödegaard
18d5c04ae4 Merge branch 'toggle-all-legends' of https://github.com/jsferrei/grafana into jsferrei-toggle-all-legends 2019-03-06 17:48:59 +01:00
Torkel Ödegaard
3895294f97 Revert "Fix for leaving playlist mode" 2019-03-06 17:39:18 +01:00
Torkel Ödegaard
64a7d8cefe Merge pull request #15833 from grafana/15694_fix
fix discord notifier so it doesn't crash when there are no image generated
2019-03-06 17:32:34 +01:00
Torkel Ödegaard
3375c72d56 Alternative fix to detecting when to stop a playlist, fixes #15701 and #15702 2019-03-06 17:30:57 +01:00
ryan
26e3e7146e Merge remote-tracking branch 'grafana/master' into alpha-react-table
* grafana/master: (24 commits)
  fix: Consistency in unit labels #15709
  Update latest.json
  Update CHANGELOG.md
  position from add panel, dimensions from copied panel
  changelog: add notes about closing #14509 #15179
  fix: Add class for input fields with help icon to avoid icon hiding the text #15771
  Update CHANGELOG.md
  restore to current folder when restoring old dashboard version
  fix(renderer): Vendor ansicolor as typescript
  log phantomjs output even if it timeout and include orgId when render alert
  keep size from copied panel and not from add panel widget
  Added basic cherry pick helping task
  Prevent search in VizPicker from stealing focus (#15802)
  fix only users that can edit a dashboard should be able to update panel json
  Updated changelog task
  Fixed image rendering issue for dashboards with auto refresh, casued by missing reloadOnSearch flag on route, fixes #15631
  Updated to add PR author, skip PR issue references
  Added first iteration/poc of changelog task
  Enable @grafana/ui version bump based on package.json contents
  Ensure clean master only when publishing package to npm
  ...
2019-03-06 08:21:36 -08:00
Torkel Ödegaard
878b41d666 Merge pull request #15822 from grafana/copy-panel-retain-size
Keep size from copied panel
2019-03-06 17:06:19 +01:00
Torkel Ödegaard
d4c337b152 Merge pull request #15830 from grafana/15709-bytes-sec-label
fix: Consistency in unit labels #15709
2019-03-06 17:05:40 +01:00
Marcus Efraimsson
f21c976b27 fix discord notifier so it doesn't crash when there are no image generated 2019-03-06 17:03:14 +01:00
Johannes Schill
03e0e1783d fix: Consistency in unit labels #15709 2019-03-06 16:24:49 +01:00
Hugo Häggmark
c2598e498a Update latest.json 2019-03-06 16:10:49 +01:00
Hugo Häggmark
bfde2cb46f Update CHANGELOG.md 2019-03-06 16:01:22 +01:00
Torkel Ödegaard
71311b1e79 Merge pull request #15827 from grafana/12926_fix
Fix restore to current folder when restoring old dashboard version
2019-03-06 15:38:06 +01:00
Torkel Ödegaard
8e51667371 Merge pull request #15828 from grafana/15771-datasource-url-icon
Add padding to all input fields with help icon
2019-03-06 15:37:02 +01:00
corpglory-dev
ce47032ee8 Run prettier 2019-03-06 17:36:07 +03:00
Peter Holmberg
2c1be2c37e position from add panel, dimensions from copied panel 2019-03-06 15:19:58 +01:00
corpglory-dev
3497c36002 Fix donut rendering 2019-03-06 17:12:27 +03:00
Torkel Ödegaard
8ba4eb47e7 Merge pull request #15769 from grafana/15768_xorm_upgrade
upgrade xorm packages to latest versions
2019-03-06 15:11:06 +01:00
Torkel Ödegaard
73980adb17 Merge pull request #15826 from grafana/davkal/15635-vendor-ansicolor-ts
fix(renderer): Vendor ansicolor as typescript
2019-03-06 15:06:46 +01:00
corpglory-dev
7f0e22e288 Run prettier 2019-03-06 17:04:51 +03:00
corpglory-dev
568bc1c72d Fix pieType change 2019-03-06 17:01:30 +03:00
Marcus Efraimsson
b63ef54088 changelog: add notes about closing #14509 #15179 2019-03-06 14:49:36 +01:00
corpglory-dev
4cd91ff979 Render svg instead of canvas 2019-03-06 16:49:03 +03:00
Johannes Schill
e7297fef06 fix: Add class for input fields with help icon to avoid icon hiding the text #15771 2019-03-06 14:45:13 +01:00
Torkel Ödegaard
f22f1ac3d6 Update CHANGELOG.md 2019-03-06 14:41:05 +01:00
Marcus Efraimsson
cf500f3157 restore to current folder when restoring old dashboard version 2019-03-06 14:38:40 +01:00
Torkel Ödegaard
08be3b16e3 Merge pull request #15819 from grafana/phantomjs_fixes
log phantomjs output even if it timeout and include orgId when render alert
2019-03-06 14:27:54 +01:00
David Kaltschmidt
26236b4bc3 fix(renderer): Vendor ansicolor as typescript
Fixes #15635

Importing ansicolor from node_modules or vendored as is failed because
there is no ES5 transpiler configured for ES6 libs.

- remove ansicolor from package.json
- add ansicolor to public/vendor/ansicolor and port to typescript
- adapt all ansicolor imports
- add `public/vendor` as a path to be considered by ts compiler
2019-03-06 14:22:59 +01:00
Marcus Efraimsson
1323043bd4 Merge pull request #15805 from grafana/15667_fix
fix only users that can edit a dashboard should be able to update panel json
2019-03-06 13:56:49 +01:00
Marcus Efraimsson
36f3accf0d log phantomjs output even if it timeout and include orgId when render alert 2019-03-06 13:53:23 +01:00
Torkel Ödegaard
63e7330fa0 Merge remote-tracking branch 'origin/cli/refactor-commands' 2019-03-06 13:32:16 +01:00
Torkel Ödegaard
aef09fe1df Merge pull request #15801 from grafana/changelog-cli-task
Added first iteration/poc of changelog task
2019-03-06 13:30:27 +01:00
Torkel Ödegaard
e9e2c85a72 Merge pull request #15818 from grafana/fix-15631-rendering-timeout
Fixed image rendering issue for dashboards with auto refresh, Fixes #15631
2019-03-06 13:29:18 +01:00
Peter Holmberg
db2b8ea602 keep size from copied panel and not from add panel widget 2019-03-06 13:23:11 +01:00
Torkel Ödegaard
7b67dcfbb8 Added basic cherry pick helping task 2019-03-06 13:18:13 +01:00
Peter Holmberg
4e57ead38d Prevent search in VizPicker from stealing focus (#15802)
Fixes #15569 focus issue in viz picker search
* added state to not set focus on search every render
* move to new component to handle focus
2019-03-06 13:07:08 +01:00
Marcus Efraimsson
1a588dadbe fix only users that can edit a dashboard should be able to update panel json 2019-03-06 12:57:19 +01:00
Torkel Ödegaard
153b3e5cf5 Updated changelog task 2019-03-06 12:28:07 +01:00
Torkel Ödegaard
70f1abbe37 Fixed image rendering issue for dashboards with auto refresh, casued by missing reloadOnSearch flag on route, fixes #15631 2019-03-06 11:46:38 +01:00
Torkel Ödegaard
72d5215c65 Merge pull request #15783 from grafana/cli/refactor-commands
Minor refactor of cli tasks (core start, @grafana/ui publishing)
2019-03-06 10:36:21 +01:00
ryan
123739fdb4 use props.replaceVariables rather than templateSrv 2019-03-06 01:14:53 -08:00
ryan
ea5db92996 Merge remote-tracking branch 'grafana/master' into alpha-react-table
* grafana/master:
  Fixed styling of gicon's in dropdown menus
  cleanup plugin versions
  use explore icon
  fix comments
  typescript functions on replace
  remove console.log
  add ScopedVars to replace function
  Expose onQueryChange to angular plugins
  fix allow anonymous initial bind for ldap search
2019-03-06 00:59:27 -08:00
Torkel Ödegaard
72ca51dadc Updated to add PR author, skip PR issue references 2019-03-06 09:57:45 +01:00
Torkel Ödegaard
10ff3db1ab Added first iteration/poc of changelog task 2019-03-06 09:57:44 +01:00
Dominik Prokop
3fc24fa964 Enable @grafana/ui version bump based on package.json contents 2019-03-06 09:52:31 +01:00
Torkel Ödegaard
85751d9875 Merge pull request #15803 from grafana/15643_fix
fix allow anonymous initial bind for ldap search
2019-03-06 09:35:37 +01:00
Torkel Ödegaard
2039278a93 Merge pull request #15807 from jsferrei/angular-plugin-onquerychange
Expose onQueryChange to angular plugins
2019-03-06 09:28:56 +01:00
Torkel Ödegaard
3aad4e212f Merge pull request #15816 from ryantxu/plugin-page-cleanup
cleanup plugin versions
2019-03-06 09:11:57 +01:00
Torkel Ödegaard
5efa737217 Merge pull request #15814 from ryantxu/replace-scoped-vars
add ScopedVars to props.replaceVariables()
2019-03-06 09:11:35 +01:00
Torkel Ödegaard
176315cf40 Fixed styling of gicon's in dropdown menus 2019-03-06 09:08:17 +01:00
ryan
909d425008 cleanup plugin versions 2019-03-05 23:40:03 -08:00
ryan
5524dacc9d use explore icon 2019-03-05 23:00:43 -08:00
ryan
3dd7d40718 fix comments 2019-03-05 22:18:42 -08:00
ryan
aa38a9e0b4 typescript functions on replace 2019-03-05 22:14:28 -08:00
ryan
948729e951 remove console.log 2019-03-05 22:00:12 -08:00
ryan
f5aba36814 add ScopedVars to replace function 2019-03-05 21:56:52 -08:00
Jeremy Doupe
3f27d3ea23 Make datasource variables multiselect and dashboard repeatable
closes #7492 (and #7030)
2019-03-05 22:47:22 -06:00
ryan
8cb52ee626 set height 2019-03-05 20:40:34 -08:00
ryan
f3712f748a add test file (ignored) 2019-03-05 20:11:14 -08:00
ryan
589229d8af fix variable name 2019-03-05 18:55:09 -08:00
ryan
32543cac10 use typescrit in angular table 2019-03-05 18:23:13 -08:00
ryan
372e892fab use react-table 2019-03-05 18:17:44 -08:00
ryan
f59ccdf59c add a basic alpha react table 2019-03-05 16:07:46 -08:00
Dominik Prokop
358f9cbeae Ensure clean master only when publishing package to npm 2019-03-05 21:18:26 +01:00
Dominik Prokop
b816b4e259 Remove log 2019-03-05 21:16:34 +01:00
Dominik Prokop
18999df716 Ensuring master branch when performing release 2019-03-05 21:12:21 +01:00
Marcus Efraimsson
f845a3b841 upgrade xorm packages to latest versions 2019-03-05 21:11:23 +01:00
Jon Ferreira
a3da8dc673 Expose onQueryChange to angular plugins 2019-03-05 15:04:10 -05:00
Daniel Lee
b582611004 docker: update prometheus2 block to version 2.7.2 2019-03-05 20:24:31 +01:00
ryan
94b6fc54ff use replaceVariables 2019-03-05 11:14:22 -08:00
ryan
c9396b2889 Merge remote-tracking branch 'grafana/master' into alpha-text2
* grafana/master: (57 commits)
  changelog: adds note for #8253
  use default min interval of 1m for sql datasources
  changelog: adds note about closing #15608
  Fixed scrollbar not visible due to content being added a bit after mount, fixes #15711
  Added comment to Docker file
  moving
  style: add gicon-shield to sidemenu class Closes #15591
  remove `UseBool` since we use `AllCols`
  fix: Move chunk splitting from prod to common so we get the same files in dev as prod
  fix: update datasource in componentDidUpdate Closes #15751
  changelog: add notes about closing #15739
  Moved Server Admin and children to separate menu item on Side Menu (#15592)
  update version to 6.1.0-pre
  Viewers with viewers_can_edit should be able to access /explore (#15787)
  Fixed scrolling issue that caused scroll to be locked to the bottom of a long dashboard, fixes #15712
  reordered import
  Wrapperd playlist controls in clickoutsidewrapper
  Turn off verbose output from tar extraction when building docker files, fixes #15528
  Hide time info switch when no time options are specified
  Made sure that DataSourceOption displays value and fires onChange/onBlur events (#15757)
  ...
2019-03-05 11:02:03 -08:00
Jon Ferreira
46fa09fdad Add a keybinding that toggles all legends in a dashboard 2019-03-05 13:19:40 -05:00
Torkel Ödegaard
5548aa7c05 Merge pull request #15799 from grafana/15614_fix
use default min interval of 1m for sql datasources
2019-03-05 18:37:51 +01:00
Marcus Efraimsson
3b9f0e6ef2 fix allow anonymous initial bind for ldap search 2019-03-05 18:03:07 +01:00
Torkel Ödegaard
281d9f6058 Merge pull request #15798 from grafana/fixed-scrollbar-not-visible
Fixed scrollbar not visible initially (only after manual scroll)
2019-03-05 17:34:30 +01:00
Daniel Lee
9383b04efd changelog: adds note for #8253 2019-03-05 15:55:10 +01:00
Daniel Lee
fe1c204d4a Merge pull request #15290 from mtanda/prometheus_label_names_query
(prometheus) support /api/v1/labels
2019-03-05 15:45:14 +01:00
corpglory-dev
d2843879f0 prettier 2019-03-05 17:39:51 +03:00
corpglory-dev
083cc0bbca Aftermerge fixes 2019-03-05 17:15:44 +03:00
corpglory-dev
250ee2298a Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-03-05 17:13:38 +03:00
Torkel Ödegaard
744bf6a784 Merge pull request #15790 from grafana/reduce-log-output-from-docker-build
Turn off verbose output from tar extraction when building docker file
2019-03-05 15:07:15 +01:00
Torkel Ödegaard
6da87a17ef Merge pull request #15793 from grafana/hugoh/bug-can-not-use-testdatasource-in-v6
Update datasource in componentDidUpdate so that datasource is correct in state
2019-03-05 15:06:44 +01:00
Torkel Ödegaard
ef59af5e38 Merge pull request #15795 from grafana/split-chunks-in-dev
Split javascript to a vendor chunk in dev-mode
2019-03-05 15:05:03 +01:00
Marcus Efraimsson
df60804937 use default min interval of 1m for sql datasources 2019-03-05 15:03:15 +01:00
Torkel Ödegaard
a57310efa4 Merge pull request #15796 from grafana/move-unitpicker-to-grafana-uo
Move unitpicker to grafana/ui
2019-03-05 15:01:17 +01:00
bergquist
d4c718091c changelog: adds note about closing #15608 2019-03-05 14:41:04 +01:00
Carl Bergquist
71bfefa8fb Merge pull request #15608 from Maddin-619/fix-datasource-update
Fix Datasource Update to no User/Password
2019-03-05 14:38:32 +01:00
Torkel Ödegaard
cd78f0bef2 Fixed scrollbar not visible due to content being added a bit after mount, fixes #15711 2019-03-05 14:32:33 +01:00
Torkel Ödegaard
12b6ab2ddd Merge pull request #15794 from grafana/hugoh/bug-serveradmin-icon-to-dark-in-light-theme
Add gicon-shield to sidemenu class
2019-03-05 13:59:22 +01:00
Torkel Ödegaard
a12960e476 Added comment to Docker file 2019-03-05 13:58:43 +01:00
Peter Holmberg
ee4df15526 moving 2019-03-05 13:55:29 +01:00
Hugo Häggmark
062b5f26fe style: add gicon-shield to sidemenu class
Closes #15591
2019-03-05 13:46:22 +01:00
bergquist
ae9327ff3a remove UseBool since we use AllCols 2019-03-05 13:41:40 +01:00
Torkel Ödegaard
7f283bdfb9 Merge pull request #15792 from grafana/fix-15712-scroll-issue
Fixed scrolling issue that caused scroll to be locked to bottom
2019-03-05 13:32:30 +01:00
Johannes Schill
e3ddfccb61 fix: Move chunk splitting from prod to common so we get the same files in dev as prod 2019-03-05 13:29:54 +01:00
Hugo Häggmark
09b036dc93 fix: update datasource in componentDidUpdate
Closes #15751
2019-03-05 13:08:31 +01:00
Marcus Efraimsson
ff7eaced25 changelog: add notes about closing #15739 2019-03-05 13:04:00 +01:00
Hugo Häggmark
d3642a3e91 Moved Server Admin and children to separate menu item on Side Menu (#15592)
* Moved Server Admin and children to separate menu item on Side Menu

* Removed style guide after PR comments
2019-03-05 13:02:41 +01:00
Marcus Efraimsson
e3d08e24f3 update version to 6.1.0-pre 2019-03-05 12:58:02 +01:00
Johannes Schill
a81d5486b0 Viewers with viewers_can_edit should be able to access /explore (#15787)
* fix: Viewers with viewers_can_edit should be able to access /explore #15773

* refactoring initial PR a bit to simplify function and reduce duplication
2019-03-05 12:41:01 +01:00
Torkel Ödegaard
be8f60b0bf Merge pull request #15791 from grafana/fix/leave-playlist
Fix for leaving playlist mode
2019-03-05 12:38:14 +01:00
Torkel Ödegaard
e6a83bf0e1 Fixed scrolling issue that caused scroll to be locked to the bottom of a long dashboard, fixes #15712 2019-03-05 12:37:19 +01:00
Torkel Ödegaard
a73663de41 Merge pull request #15789 from grafana/hide-time-info
Hide time info switch when no time options are specified
2019-03-05 12:15:45 +01:00
Peter Holmberg
a158a19272 reordered import 2019-03-05 12:10:20 +01:00
Peter Holmberg
978cdfba00 Wrapperd playlist controls in clickoutsidewrapper 2019-03-05 12:08:57 +01:00
Torkel Ödegaard
66d9b12981 Turn off verbose output from tar extraction when building docker files, fixes #15528 2019-03-05 12:03:48 +01:00
Torkel Ödegaard
c813a9953a Merge pull request #15786 from grafana/react-select-upgrade
Updated react select fork to 2.4.1
2019-03-05 11:44:03 +01:00
Torkel Ödegaard
a5455691b3 Hide time info switch when no time options are specified 2019-03-05 11:43:25 +01:00
Torkel Ödegaard
1711622eff Merge pull request #15784 from grafana/15782-error-fix
In error popup, fixes bug so that string errors are shown again. Fixes #15782
2019-03-05 10:52:47 +01:00
Hugo Häggmark
48570c6272 Made sure that DataSourceOption displays value and fires onChange/onBlur events (#15757)
* Fixed #15682 

* fix: Add hideTimeOverride to state since we need to control the Switch

* fix: Back the maxDataPoints change, we need to keep it as a string

Co-authored-by:johannes.schill@polyester.se
2019-03-05 10:49:45 +01:00
Torkel Ödegaard
fde63fc1cf Updated react select fork to 2.4.1 2019-03-05 10:47:52 +01:00
Daniel Lee
8b1e25b50a utils: show string errors. Fixes #15782 2019-03-05 09:32:02 +01:00
Torkel Ödegaard
590450291a Update frontend.md 2019-03-05 09:23:04 +01:00
Torkel Ödegaard
707d0e13bd Update frontend.md 2019-03-05 09:22:26 +01:00
Torkel Ödegaard
b787811da8 Merge pull request #15761 from grafana/15708_access
fix: limit access to org admin and alerting pages
2019-03-05 09:17:20 +01:00
Torkel Ödegaard
0016ad2cb3 Merge pull request #15774 from ryantxu/set-options
Rename PanelEditorProps.onChange to onOptionsChange
2019-03-05 09:11:56 +01:00
Torkel Ödegaard
57810ea5e5 Merge pull request #15775 from ryantxu/rename-interpolate
use replaceVariables rather than onInterpolate
2019-03-05 09:10:45 +01:00
Dominik Prokop
73ef864979 Minor refactor of cli tasks (core start, gui publishing) 2019-03-05 08:56:29 +01:00
Dominik Prokop
cee5f030dc Fixed url of back button in datasource edit page, when root_url configured (#15759)
* Fixed url of back button in datasource edit page, when root_url configured

* Update snapshots

* Use app config directly in ButtonRow instead of passing datasources page URL via prop

* Snapshots update
2019-03-05 07:35:45 +01:00
Leonard Gram
1e52a1f9a5 Merge pull request #15539 from grafana/repo-recreation-documentation
docs: howto for recreating our debian repositories.
2019-03-05 07:18:39 +01:00
Torkel Ödegaard
e8d6e4fb48 Merge pull request #15778 from roidelapluie/patch-2
Add #15752 in CHANGELOG
2019-03-05 06:05:28 +00:00
Julien Pivotto
8f9246dff0 Add #15752 in CHANGELOG 2019-03-04 23:17:33 +01:00
ryan
3d16528459 use onOptionsChange 2019-03-04 12:35:24 -08:00
ryan
251008f590 use replaceVariables rather than onInterpolate 2019-03-04 11:44:38 -08:00
ryan
77d709d9df use updateOptions rather than onChange 2019-03-04 11:21:05 -08:00
Marcus Efraimsson
989147a1ce changelog: add notes about closing #15650 2019-03-04 17:47:16 +01:00
Marcus Efraimsson
646ca90b10 Merge pull request #15767 from grafana/15650-autofitpanel-kiosktvmode
No scroll in autofitpanel-mode
2019-03-04 08:44:28 -08:00
Marcus Efraimsson
a6056ba565 changelog: add notes about closing #15765 2019-03-04 17:38:27 +01:00
Marcus Efraimsson
947b38b379 Merge pull request #15766 from grafana/15765-kiosk-mode-url
fix: Kiosk mode should have &kiosk appended to the url
2019-03-04 08:36:14 -08:00
Johannes Schill
92ec8757d3 fix: Kiosk mode should have &kiosk appended to the url #15765 2019-03-04 16:33:00 +01:00
Marcus Efraimsson
c36047674a changelog: add notes about closing #15077 2019-03-04 16:07:51 +01:00
Marcus Efraimsson
3832eba31f Merge pull request #15077 from activeshadow/aws-rds-max-xids
Added MaximumUsedTransactionIDs metric to list of AWS RDS metrics.
2019-03-04 07:05:19 -08:00
Marcus Efraimsson
5638c67be8 org admins should only be able to access org admin pages 2019-03-04 15:51:18 +01:00
Marcus Efraimsson
a29b99b96b only editor/admin should have access to alert list/notifications pages 2019-03-04 15:48:07 +01:00
Bryan T. Richardson
ae23773db3 Added MaximumUsedTransactionIDs metric to list of AWS RDS metrics. 2019-03-04 07:38:36 -07:00
Johannes Schill
cc40a515be fix: When in tv-mode, autofitpanel should not take space from the navbar #15650 2019-03-04 13:46:10 +01:00
Torkel Ödegaard
1312789d1d Merge pull request #15753 from xlson/devenv-influx-fix
devenv: fixes incorrect influxdb config.
2019-03-04 11:36:51 +00:00
Torkel Ödegaard
7540527010 Merge pull request #15612 from jsferrei/upstream_stacking_fix
Toggle stack should trigger a render, not a refresh
2019-03-04 10:54:36 +00:00
Torkel Ödegaard
28cac0976d Merge pull request #15752 from grafana/hugoh/bug-repeated-row-gauge
Passing scopedVars down to DataPanel from PanelChrome
2019-03-04 10:53:07 +00:00
Leonard Gram
818ccb572e devenv: fixes incorrect influxdb config.
[skip ci]
2019-03-04 11:23:33 +01:00
Hugo Häggmark
3a65e27e83 Fixes #15739 2019-03-04 10:42:59 +01:00
Torkel Ödegaard
b4df0e73cd Merge pull request #15706 from grafana/15656-playlists-with-tags-rebased
wip: Fix playlists "by tags"
2019-03-04 09:00:28 +00:00
parry
25b09168eb Don't mutate seriesList parameter in mergeSeriesByTime (#15619)
* do not mutate seriesList in mergeSeriesByTime

* extendedseriesList -> extendedDatapointsList

* remove toString() from datapoints, since the value can be null
2019-03-04 09:56:47 +01:00
Marcus Efraimsson
6fd6f893aa new stable docs version 2019-03-04 00:38:19 -08:00
Torkel Ödegaard
328eea3a29 Merge pull request #15713 from grafana/scrollbar-right-side
Fixed right side scrollbar margin on dashboard page
2019-03-04 08:13:01 +00:00
Torkel Ödegaard
c28fc9f4a7 Merge pull request #15742 from grafana/fix-15664/bits-showing-as-d
Fixing bits valueFormat
2019-03-04 08:06:36 +00:00
sandeep
e04218e550 Fix: #14706 Incorrect index pattern padding in alerting queries
When weekly index pattern is used, indices names contain single digit week number for week 1-9
This fix makes sure indice names always contain 2 digit week number for weekly pattern
2019-03-03 18:10:38 +05:30
Peter Holmberg
a9ca8e9dec fix 2019-03-02 13:51:55 -08:00
Marcus Efraimsson
0114ffc9ac Merge pull request #15671 from bendrucker/patch-1
Fix style and grammar in 6.0 announcement
2019-03-02 13:42:35 -08:00
bergquist
27dc3586b1 changelog: adds note about closing #14239 2019-03-02 21:27:09 +01:00
Marcus Efraimsson
d49f0bedd3 fix: prevent datasource json data stored as nil (#15508)
prevent datasource json data stored as nil

closes #14239
2019-03-02 21:18:26 +01:00
Carl Bergquist
06de01dc23 Merge pull request #15458 from bergquist/integration_tests_all_packages
run db tests in all packages
2019-03-02 21:11:53 +01:00
bergquist
cde3a21434 changelog: adds note about closing #10506 2019-03-02 20:37:36 +01:00
bergquist
dafd7afb97 changelog: adds note about closing #15651 2019-03-02 20:35:53 +01:00
Samuel
41024c29bb Return 404 on user not found (#15606)
Return 404 on user not found

closes #10506
2019-03-02 20:34:48 +01:00
Carl Bergquist
1e719bb3db Merge pull request #15659 from xlson/interl-metrics-fix
service: fix for disabled internal metrics.
2019-03-02 18:51:40 +01:00
SamuelToh
d2c161c2e6 Catch bad regex exception at controller level 2019-03-02 20:50:25 +10:00
corpglory-dev
6e320679d4 Prettier fix 2019-03-01 22:03:19 +03:00
corpglory-dev
0ab3a80016 Add PiechartOptionsBox 2019-03-01 21:42:15 +03:00
corpglory-dev
f4f8e0d79a Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-03-01 20:55:19 +03:00
Leonard Gram
1bcaaccb96 docs: missing field added to example
Closes #15715
2019-03-01 16:07:34 +01:00
SamuelToh
6bfbdbe20b 11780: invalid reg value can cause unexpected behaviour 2019-03-01 20:34:40 +10:00
ryan
d3cbc5638c Merge remote-tracking branch 'grafana/master' into alpha-text2
* grafana/master:
  Explore: Enable click on name label
  Bumping grafana ui version (#15669)
  Need this to be available for plugins
  docs: 6.0 whats new
  Updated latest.json with 6.0
  Update CHANGELOG.md
  docs: grafana 6.0 has been released.
  moves social package to /login
  moves tracing packge into /infra
  Update CHANGELOG.md
  changelog: adds notes for #14509 and #15179
  graph: fixes click after scroll in series override menu
  moves metric package to /infra
  stackdriver: change reducer mapping for distribution metrics
  stackdriver: fix for float64 bounds for distribution metrics
  Fixed value dropdown not updating when it's current value updates, fixes #15566
2019-02-28 10:07:53 -08:00
Torkel Ödegaard
84b2c0447e Fixed right side scrollbar margin on dashboard page 2019-02-28 08:29:18 -08:00
Johannes Schill
8d5ccc7831 fix: Return url when query dashboards by tag 2019-02-28 10:44:39 +01:00
corpglory-dev
17c4b7096e Fix prettier 2019-02-27 20:48:55 +03:00
corpglory-dev
81c140b425 Initial rendering 2019-02-27 20:07:58 +03:00
corpglory-dev
b48f8bcf4c Add PiechartType enum 2019-02-27 20:04:57 +03:00
corpglory-dev
bc9d4e07d0 Install d3 2019-02-27 17:33:52 +03:00
corpglory-dev
6114097668 Remove extra props 2019-02-27 17:33:18 +03:00
corpglory-dev
e842e86e2a Merge branch 'master' into piechart-react 2019-02-27 16:09:13 +03:00
utkarshcmu
37033080b7 Removed commented code 2019-02-27 00:33:40 -08:00
utkarshcmu
8ef3aebc29 Fixed alias in Cloudwatch Expressions 2019-02-27 00:20:29 -08:00
Dominik Prokop
1478f38dd9 Merge pull request #15678 from grafana/davkal-fork/fix-14654
Explore: Enable click on name label
2019-02-27 01:01:50 +01:00
David Kaltschmidt
539333bb01 Explore: Enable click on name label
- click on the name label in a prometheus table was disabled
- it was disabled because every query used to have a metric which is no
longer true
- this change enables it
2019-02-26 14:21:46 -08:00
Peter Holmberg
8bdf2111c4 Bumping grafana ui version (#15669)
grafana/ui 6.0.1-alpha.0 release version bump
2019-02-26 20:51:52 +01:00
Ben Drucker
e7b630e633 Style and grammar fixes 2019-02-26 11:34:49 -08:00
Torkel Ödegaard
29f53fb5ce big text option 2019-02-26 10:37:17 -08:00
Peter Holmberg
4521a3d419 Merge pull request #15668 from grafana/export-value-mapping-utils
Need this to be available for plugins
2019-02-26 09:49:39 -08:00
Peter Holmberg
1bffde57e3 Need this to be available for plugins 2019-02-26 09:22:21 -08:00
Leonard Gram
36788183d8 service: fix for disabled internal metrics.
Update of the internal metrics for Grafana was
disabled by mistake when refactoring the code.

Fixes #15651
2019-02-26 11:41:55 +01:00
Leonard Gram
c04395ce3a docs: 6.0 whats new 2019-02-25 19:25:47 +01:00
Jon Ferreira
0bdca7957a Toggle stack should trigger a render, not a refresh 2019-02-25 11:29:34 -05:00
Leonard Gram
3c3e06515e Updated latest.json with 6.0 2019-02-25 17:09:49 +01:00
Leonard Gram
e1d27bd79a Update CHANGELOG.md 2019-02-25 16:24:02 +01:00
Leonard Gram
cab90ef4f9 Merge pull request #15640 from xlson/docs-6.0-released
docs: grafana 6.0 has been released.
2019-02-25 16:19:13 +01:00
Carl Bergquist
369aa2d5dd Merge pull request #15628 from bergquist/move_tracing_infra
moves tracing packge into /infra
2019-02-25 16:16:45 +01:00
Carl Bergquist
1aeec31495 Merge pull request #15630 from bergquist/moves_social_to_login
moves social package to /login
2019-02-25 16:16:20 +01:00
Leonard Gram
38a116d0f7 docs: grafana 6.0 has been released. 2019-02-25 15:45:35 +01:00
bergquist
60fef31748 moves social package to /login
ref #14679
2019-02-25 15:30:40 +01:00
bergquist
0c67194b45 moves tracing packge into /infra 2019-02-25 15:29:25 +01:00
Leonard Gram
26dcabc2dc Update CHANGELOG.md 2019-02-25 13:00:18 +01:00
Leonard Gram
ccc97ed649 Merge pull request #15634 from grafana/15621-series-overrides
graph: fixes click after scroll in series override menu
2019-02-25 12:50:06 +01:00
Leonard Gram
5ff44bdbcf Merge pull request #15616 from grafana/fixed-variable-dropdown-update
Fixed value dropdown not updating when it's current value updates
2019-02-25 09:39:28 +01:00
Daniel Lee
9efe7674d6 changelog: adds notes for #14509 and #15179 2019-02-25 02:46:05 +01:00
Carl Bergquist
0aa61c8e12 Merge pull request #15629 from bergquist/moves_metrics_to_infra
moves metric package to /infra
2019-02-25 02:44:09 +01:00
Daniel Lee
9240d850b4 Merge pull request #15623 from grafana/stackdriver-bounds
stackdriver: fix for float64 bounds for distribution metrics
2019-02-25 02:32:28 +01:00
Daniel Lee
3a6f49837d Merge pull request #15624 from grafana/15179-reducers
stackdriver: change reducer mapping for distribution metrics
2019-02-25 02:30:08 +01:00
Daniel Lee
e76655df43 graph: fixes click after scroll in series override menu
Makes changes to dropdown-typeahead2 so that a css
class for the button can be passed in. Means it can
be used instead of dropdown-typeahead.

Switches to using dropdown-typeahead2 for series_overrides
directive and for the influxdb, mysql and postgres datasources
as it already contains a fix for this issue.

This commit also fixes the index property which
was set using an incorrectly spelled length property in the
series_overrides directive.

Closes #15621
2019-02-25 02:11:28 +01:00
bergquist
8a3a3cccc3 moves metric package to /infra
ref #14679
2019-02-24 21:12:51 +01:00
David Kaltschmidt
e6a74eb1a2 Explore: Make sure line graphs get different colors
- lines for graphs from different query rows end up in different
transactions
- within each transaction the color distribution resets leading to color
overlap
- this change takes existing transaction colors into account
2019-02-24 10:01:50 -08:00
Daniel Lee
35fc0c5329 stackdriver: change reducer mapping for distribution metrics
- Distribution metrics are now mapped to more reducers
when the metric kind is cumulative.
- The witdth of the metrics dropdown is now much wider.
- Changed the text from Select Aggregation to Select Reducer
to line up with the UI in Stackdriver.
2019-02-24 17:44:15 +01:00
Daniel Lee
d1e249a803 stackdriver: fix for float64 bounds for distribution metrics
Adds support for explicit distribution metrics and float64 bounds

Fixes #14509
2019-02-24 17:37:26 +01:00
ryan
e5ce759167 update 2019-02-23 21:53:20 -08:00
Torkel Ödegaard
88e1e83800 style tweaks 2019-02-23 15:02:25 +01:00
Torkel Ödegaard
72943af46a Refactoring orientation stuff 2019-02-23 14:59:26 +01:00
Torkel Ödegaard
bce6f75fdc Refactoring bar gauge 2019-02-23 14:00:25 +01:00
Torkel Ödegaard
92c7303615 Refactoring bar gauge 2019-02-23 13:28:27 +01:00
Torkel Ödegaard
a27c55b53d Added missing file 2019-02-23 12:14:50 +01:00
Torkel Ödegaard
5590b026d0 refactoring repeater and code in gauge and bar gauge to reuse more code 2019-02-23 11:31:35 +01:00
Marcus Efraimsson
e6830b0681 Merge pull request #15240 from grafana/azure-monitor-docs
Azure Monitor docs
2019-02-23 11:14:35 +01:00
Marcus Efraimsson
3c911cf208 docs: link to azure monitor from what's new in v6.0 2019-02-23 11:05:11 +01:00
Torkel Ödegaard
f768808b6e Fixed value dropdown not updating when it's current value updates, fixes #15566 2019-02-23 08:59:00 +01:00
Daniel Lee
31ae2813a7 docs: tweaks to AzureMonitor docs 2019-02-22 18:45:24 +01:00
Hugo Häggmark
8f62082482 Added feature toggle to defaults.ini and sample.ini after PR comments 2019-02-22 14:39:22 +01:00
Hugo Häggmark
769ad21e16 Moved variable to config struct after PR comments 2019-02-22 14:39:22 +01:00
Hugo Häggmark
9c9691f7af Added feature toggle editors_can_own 2019-02-22 14:39:22 +01:00
Maddin-619
09cd173e92 updates all cols except created so user and password
of the database can be chaned to no user and password
2019-02-22 14:19:15 +01:00
Hugo Häggmark
dafcfd70a7 Fixed bug with getting teams for user 2019-02-22 14:07:18 +01:00
Valentin Agachi
425636ff70 Improve Loki logs render with ANSI colors (#15558)
* Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors

* fixup! Improve Loki logs render with ANSI colors
2019-02-22 13:13:10 +01:00
Dominik Prokop
c4c150bd15 Merge pull request #15604 from grafana/grafanaui/version-bump
grafana/ui 6.0.0-alpha.0 release version bump
2019-02-22 11:53:23 +01:00
Dominik Prokop
34f6d9ab8e grafana/ui 6.0.0-alpha.0 release version bump 2019-02-22 11:30:45 +01:00
Torkel Ödegaard
ed06f04899 Merge pull request #15570 from grafana/15563-plugin-text-mode
panel: defensive coding that fixes #15563
2019-02-22 09:00:41 +01:00
Dominik Prokop
f6f484ebea Merge pull request #15589 from grafana/grafanaui/alpha-release
grafana/ui 1.0.0-alpha.0 release - package version bump
2019-02-22 08:58:00 +01:00
ijin08
05d5e796d7 removed color in color variables names 2019-02-22 08:33:07 +01:00
Marcus Efraimsson
d358088776 changelog: add notes about closing #15303 2019-02-22 00:29:46 +01:00
Marcus Efraimsson
ad748c0502 changelog: add notes about closing #1441 2019-02-22 00:23:10 +01:00
Marcus Efraimsson
60fab15335 update changelog 2019-02-22 00:19:08 +01:00
Dominik Prokop
c1d0f11c47 grafana/ui 1.0.0-alpha.0 release 2019-02-21 22:22:35 +01:00
Dominik Prokop
67d0bca3cb Merge pull request #15579 from grafana/fix/bring-plugins-scss-back
Bring back plugins page styles
2019-02-21 22:14:51 +01:00
Dominik Prokop
38fc55e09b Merge pull request #15561 from grafana/tooling/npm-scripts
@grafana/ui publishing scripts
2019-02-21 22:07:57 +01:00
Dominik Prokop
167a18f1f2 Merge branch 'master' into tooling/npm-scripts 2019-02-21 21:28:16 +01:00
Dominik Prokop
10916d9192 Update grafana/ui readme 2019-02-21 17:45:52 +01:00
Marcus Efraimsson
7ea361513d docs: landing page update
link to what's new in v6.0
add azure monitor and loki to datasource list
change stackdriver icon to a bigger one
2019-02-21 17:39:03 +01:00
Johannes Schill
5054e841ba Merge pull request #15551 from grafana/15281-dashboard2explore
fix: Filter out values not supported by Explore yet #15281
2019-02-21 16:38:32 +01:00
Dominik Prokop
f471be2453 Bring back plugins page styles 2019-02-21 16:37:42 +01:00
Marcus Efraimsson
ca9a528a62 docs: layout fixes 2019-02-21 16:12:25 +01:00
Peter Holmberg
73b4d817e4 prettier fix 2019-02-21 16:07:07 +01:00
Dominik Prokop
c1bacd630f Make published package public by default 2019-02-21 15:56:57 +01:00
Marcus Efraimsson
ae13352956 docs: fix link 2019-02-21 15:50:18 +01:00
Marcus Efraimsson
df984059db docs: fix order of datasources in menu/index and update alert support 2019-02-21 15:43:54 +01:00
Dominik Prokop
db58ab6c02 Fixed prettier issue in color picker 2019-02-21 15:40:43 +01:00
Marcus Efraimsson
535287608a Merge pull request #15576 from grafana/fix/yarn-docs
Update docs to match current npm scripts
2019-02-21 15:17:43 +01:00
Dominik Prokop
58e1a8bd3c Update docs to match current npm scripts 2019-02-21 15:13:59 +01:00
Dominik Prokop
394ee5dc08 Added keywords and description go grafana/ui package 2019-02-21 15:12:23 +01:00
Dominik Prokop
996588528a Fixed failing tests because of circular dependency 2019-02-21 15:12:23 +01:00
Dominik Prokop
75e9c1e8fc Fix version and name in grafana/ui package.json 2019-02-21 15:12:22 +01:00
Dominik Prokop
d4c40e4360 Imports updates 2019-02-21 15:12:22 +01:00
Peter Holmberg
362829d7ad Merge branch 'master' into bar-gauge-poc 2019-02-21 15:08:49 +01:00
Dominik Prokop
529c1ea53d Implemented scripts for building and releasing grafana/ui 2019-02-21 15:06:29 +01:00
ijin08
7be18e1a08 changed some more color variables to use variables 2019-02-21 15:05:17 +01:00
Peter Holmberg
f3ff3c1aec fixed tests 2019-02-21 14:44:21 +01:00
Daniel Lee
bd0f55cbb8 panel: defensive coding that fixes #15563
If a plugin incorrectly uses an attribute in the
query-editor-row directive, it should not throw
an exception.
2019-02-21 14:42:31 +01:00
Torkel Ödegaard
72e269c8f3 Merge pull request #15572 from grafana/gauge-minor-fix
Minor fix/polish to gauge panel and threshold editor
2019-02-21 14:29:28 +01:00
Torkel Ödegaard
b4627ec302 Minor fix/polish to gauge panel and threshold editor 2019-02-21 13:44:05 +01:00
Peter Holmberg
89883c2cf6 copying options between visualizations 2019-02-21 13:43:36 +01:00
Torkel Ödegaard
745fd68571 fixed issue in dark sass template 2019-02-21 12:39:22 +01:00
Torkel Ödegaard
67e39a5562 Merge branch 'cli/watch-sass-var-new-colors' 2019-02-21 12:33:10 +01:00
Torkel Ödegaard
3868602581 Updated body & page variables to use variables from code theme 2019-02-21 12:32:29 +01:00
Torkel Ödegaard
b21eb36909 Merge branch 'master' of github.com:grafana/grafana 2019-02-21 12:18:34 +01:00
Torkel Ödegaard
aa589d7217 Merge pull request #15564 from grafana/fixed-snapshots
fixed snapshots failing in master
2019-02-21 12:17:30 +01:00
Torkel Ödegaard
8e21717c12 updated building from source docs 2019-02-21 12:17:02 +01:00
Torkel Ödegaard
ffe5157193 Merge branch 'cli/watch-sass-var' of github.com:grafana/grafana into cli/watch-sass-var 2019-02-21 12:11:21 +01:00
Torkel Ödegaard
31511ee3cc fixed snapshots failing in master 2019-02-21 12:10:01 +01:00
Dominik Prokop
f5a520bf39 Synced variable template files 2019-02-21 11:59:47 +01:00
Dominik Prokop
0df56f9356 Merge branch 'master' into cli/watch-sass-var 2019-02-21 11:56:54 +01:00
Marcus Efraimsson
c586bc519f Merge pull request #15553 from grafana/14507_fix
fix; mysql query using __interval_ms variable throws error
2019-02-21 11:40:54 +01:00
Torkel Ödegaard
9a7866a040 Merge pull request #15560 from grafana/scrollbar-fixes
Fixed scrollbar issue introduced in theme changes
2019-02-21 11:32:19 +01:00
corpglory-dev
8bc4139bbd Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-21 12:47:05 +03:00
Peter Holmberg
58f194b483 Merge branch 'master' into bar-gauge-poc 2019-02-21 10:38:26 +01:00
Marcus Efraimsson
d8e655bbcf fix: mysql query using __interval_ms variable throws error
fixes #14507
2019-02-21 10:25:52 +01:00
Dominik Prokop
9b03815141 Merge branch 'master' into cli/watch-sass-var 2019-02-21 09:50:24 +01:00
Torkel Ödegaard
d85ea5d2be Merge pull request #15559 from grafana/fix/prettier-function-editor
Fixed issue caused by graphite function editor PR #15510
2019-02-21 09:46:50 +01:00
Torkel Ödegaard
7d105439f9 Fixed scrollbar issue introduced in theme changes 2019-02-21 09:41:53 +01:00
Dominik Prokop
f28cc871e1 Fix build 2019-02-21 09:09:24 +01:00
Peter Holmberg
8c5c953521 minor touch ups 2019-02-20 17:07:36 +01:00
Alexandre de Verteuil
1bbf7cc294 Fix heading levels in generic-oauth.md 2019-02-20 11:00:29 -05:00
ijin08
a9c5fe5be1 updated colors in light, dark and theme files, in template file basic colors uses variables from dark/light files, also changed to -basic in some files 2019-02-20 16:11:36 +01:00
corpglory-dev
5da9794a8e ValueOptions -> PiechartValueEditor 2019-02-20 17:30:12 +03:00
corpglory-dev
0f102001b6 Make it build 2019-02-20 17:27:42 +03:00
corpglory-dev
7f5459149a fixes 2019-02-20 17:15:00 +03:00
Peter Holmberg
2fc136e615 added orientation option 2019-02-20 15:07:30 +01:00
corpglory-dev
67fe351f72 export PiechartDataPoint from @grafana/ui 2019-02-20 16:52:29 +03:00
corpglory-dev
b263b3edd6 change valueOptions 2019-02-20 16:32:35 +03:00
corpglory-dev
7bb996203f get label and color from series 2019-02-20 16:30:55 +03:00
corpglory-dev
e867a8f402 prettier fix 2019-02-20 16:08:13 +03:00
corpglory-dev
4edd22589c Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-20 14:54:26 +03:00
corpglory-dev
3ab00dfb9a PieChartDataPoint -> PiechartDataPoint 2019-02-20 14:54:08 +03:00
corpglory-dev
76aa208d2a Rename PieChartPanelEditor to PiechartPanelEditor 2019-02-20 14:52:46 +03:00
Torkel Ödegaard
44af31585f Merge branch 'master' into cli/watch-sass-var 2019-02-20 11:15:30 +01:00
Torkel Ödegaard
20a03db144 Merge pull request #15510 from grafana/fix/graphite-func-editor
Display graphite function name editor in a tooltip
2019-02-20 10:48:08 +01:00
Torkel Ödegaard
cdac119397 Merge pull request #15542 from grafana/15541-dashboard-model
Pass dashboardModel to PanelCtrl class. Fixes #15541
2019-02-20 09:11:00 +01:00
Daniel Lee
8e90899c02 docs: adds Azure Monitor docs
A copy of the docs from the plugin with some additions and
new images.
2019-02-19 23:33:26 +01:00
Dominik Prokop
5f4f559d19 Fix blue in dark theme 2019-02-19 21:23:04 +01:00
Dominik Prokop
56726397e3 Readme update 2019-02-19 21:15:36 +01:00
corpglory-dev
77f848b56d Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-19 21:27:22 +03:00
corpglory-dev
d1ef95b936 Minor fixes 2019-02-19 21:26:28 +03:00
corpglory-dev
52e53e39a4 Review fixes 2019-02-19 21:14:24 +03:00
corpglory-dev
0633dba302 Fixes after merging #15468 2019-02-19 21:14:05 +03:00
Daniel Lee
c5a70e9b97 Pass dashboardModel to PanelCtrl class. Fixes #15541 2019-02-19 18:53:07 +01:00
corpglory-dev
a053fb5908 Add piechart to builtInPlugins 2019-02-19 20:24:50 +03:00
corpglory-dev
eaf60d3eb8 logo: svg -> png 2019-02-19 19:35:57 +03:00
Dominik Prokop
d19616a16b Merge branch 'master' into cli/watch-sass-var 2019-02-19 17:27:25 +01:00
Dominik Prokop
83bb3fb8d4 Remove old overwritten sass vars 2019-02-19 17:05:50 +01:00
Peter Holmberg
4c5c162045 first draft of repeater component 2019-02-19 17:03:28 +01:00
Leonard Gram
dc155dfa2f docs: howto for recreating our debian repositories. 2019-02-19 16:52:47 +01:00
Johannes Schill
6f9edf4a22 fix: Filter out values not supported by Explore yet #15281 2019-02-19 16:43:39 +01:00
Peter Holmberg
0de9c03879 Merge branch 'gauge-multi-series' into bar-gauge-poc 2019-02-19 15:53:05 +01:00
Peter Holmberg
5f56a07a23 Merge branch 'master' into bar-gauge-poc 2019-02-19 15:43:08 +01:00
Dominik Prokop
88a46e6dd4 Bump Prettier version (#15532)
* Fix prettier version to 1.16.4
2019-02-19 15:41:35 +01:00
corpglory-dev
98b22a83af Merge branch 'master' of https://github.com/grafana/grafana into piechart-react 2019-02-19 16:06:00 +03:00
ijin08
2372474ca8 updated theme variables to master 2019-02-19 13:57:56 +01:00
ijin08
547696af19 updated theme template files variables to master 2019-02-19 13:40:43 +01:00
Marcus Efraimsson
df2f33b5b1 add new issue templates 2019-02-19 13:31:32 +01:00
Torkel Ödegaard
5b1cf9c94f Merge pull request #15530 from grafana/graph2-using-reactpanelplugin
graph2 should use ReactPanelPlugin from @grafana/ui
2019-02-19 12:08:02 +01:00
Torkel Ödegaard
3f1c4c3ed9 Merge pull request #15531 from grafana/hugoh/react-switch-works-outside-switch
Surrounded Switch with div to restrict size
2019-02-19 12:06:59 +01:00
Hugo Häggmark
d2893c2d1a Fixes #15506 2019-02-19 11:17:40 +01:00
Torkel Ödegaard
baddf42c8e Merge pull request #15515 from grafana/13767_fix
fix native annotation filtered by template variable with pipe
2019-02-19 11:14:04 +01:00
Torkel Ödegaard
fb3463ba4f Merge pull request #15527 from grafana/15485-tab-in-url
fix: Remove tab param from url when leaving edit mode
2019-02-19 11:11:32 +01:00
Johannes Schill
8876d17dc0 chore: graph2 panel plugin should use the new ReactPanelPlugin from @grafana/ui 2019-02-19 11:00:23 +01:00
Leonard Gram
4df78fe7ac Update CHANGELOG.md 2019-02-19 10:47:57 +01:00
Leonard Gram
a9748f460e Update CHANGELOG.md 2019-02-19 10:46:51 +01:00
Leonard Gram
99205d5d9a Update CHANGELOG.md 2019-02-19 10:40:54 +01:00
Johannes Schill
891b2ca1a2 fix: Have the tab param removed from the url when leaving edit mode #15485 2019-02-19 09:43:35 +01:00
Torkel Ödegaard
14d8a94273 Merge pull request #15521 from grafana/hugoh/bug-type-error-in-thresholds
Fixes #15505
2019-02-19 09:07:01 +01:00
Torkel Ödegaard
104e656bd1 Merge pull request #15514 from grafana/fixed-navbar-edit-padding
Fixed navbar backbutton padding
2019-02-19 09:06:32 +01:00
bergquist
7754c37a1f reduce loglevel to debug 2019-02-19 08:22:33 +01:00
Hugo Häggmark
7f04848dea Fixes #15505 2019-02-19 07:48:54 +01:00
Marcus Efraimsson
56136a5396 fix native annotation filtered by template variable with pipe 2019-02-18 22:54:45 +01:00
Torkel Ödegaard
13e27601df Fixed navbar backbutton padding 2019-02-18 21:29:42 +01:00
Torkel Ödegaard
1eb804c655 Merge pull request #15411 from grafana/theme-files-cleanup
[wip]Cleaning up the theme .scss files
2019-02-18 20:23:40 +01:00
Torkel Ödegaard
9d78960c5e Merge pull request #15503 from grafana/explore-icon
Updated explore icon and style tweaks
2019-02-18 18:37:51 +01:00
Torkel Ödegaard
caa477591b Merge pull request #15504 from grafana/thresholds-sort-order
Fixing array direction, adding simple render test
2019-02-18 18:35:11 +01:00
Torkel Ödegaard
df170aee16 Updated explore icon and style tweaks
Lowered icon size and improved paddings, tried to align placement between dashboard and explore
2019-02-18 18:26:24 +01:00
Dominik Prokop
1069d7f5b1 Display graphite function name editor in a tooltip 2019-02-18 17:55:38 +01:00
corpglory-dev
54db887cca Merge branch 'master' into piechart-react 2019-02-18 19:40:00 +03:00
Leonard Gram
3d994b16d0 Update CHANGELOG.md 2019-02-18 16:58:15 +01:00
Leonard Gram
9738ba82e4 Update CHANGELOG.md 2019-02-18 16:54:46 +01:00
Peter Holmberg
93e8edfddd Fixing array direction, adding simple render test, fixes #15478
Fixed unit test and updated gauge
Added migration for threshold order
2019-02-18 16:46:32 +01:00
Leonard Gram
71e74181ab Update CHANGELOG.md 2019-02-18 16:38:29 +01:00
David
5e8570f822 Merge pull request #15491 from grafana/davkal/15436-loki-docs
Datasource docs for Loki
2019-02-18 16:20:40 +01:00
Daniel Lee
9ebbdbeb4b changelog: adds note for #15500 2019-02-18 15:59:37 +01:00
Daniel Lee
600bbf7e21 Merge pull request #15502 from grafana/15500-cli
cli: chmod 755 for backend plugin binaries
2019-02-18 15:53:43 +01:00
Torkel Ödegaard
e5562305e3 fixed page-header-bg 2019-02-18 15:35:27 +01:00
Torkel Ödegaard
2afd3cf5aa Merge pull request #15499 from grafana/hugoh/bug-thresholds-and-infinity
Fixes #15477
2019-02-18 15:07:24 +01:00
Daniel Lee
56c965e5df cli: chmod 755 for backend plugin binaries
Fixes #15500. Does a simple filename check if the binary names ends
with _linux_amd64 or _darwin_amd64 then sets the file mode to 755.
2019-02-18 15:05:34 +01:00
ijin08
c62f06b427 reversed most of grays in dark theme 2019-02-18 14:35:13 +01:00
Hugo Häggmark
92972eed7b Fixes #15477 2019-02-18 13:56:48 +01:00
Torkel Ödegaard
730515d8dc Merge pull request #15483 from klaernie/patch-1
Add Lux to units
2019-02-18 12:52:42 +01:00
Torkel Ödegaard
35253cb7f7 Merge pull request #15498 from grafana/fix/15463
Remove maxDataPoints and interval props from props to remember in panel model
2019-02-18 12:37:07 +01:00
Torkel Ödegaard
26d02180e5 Merge branch 'bar-gauge-poc' of github.com:grafana/grafana into bar-gauge-poc 2019-02-18 12:01:15 +01:00
Torkel Ödegaard
711e4e926b Merge branch 'master' into bar-gauge-poc 2019-02-18 11:55:37 +01:00
Torkel Ödegaard
abddb442a1 Changed how react panels store their options (#15468)
Changed how react panels store their options

* Added a ReactPanelPlugin as the interface that react panels export, this way react panels have clearer api, and gives us hooks to handle migrations and a way for panel to handle panel changes in the future
* Moved gauge value options into a sub oject and made editor more generic, will be moved out of gauge pane later and shared between singlestat, gauge, bargauge, honecomb
* Also remove nested options prop that was there due to bug
* Added missing Gauge props
* Fixed gauge issue that will require migration later and also value options editor did not handle null decimals or 0 decimals
* Fixed unit tests
* More fixes for react panels
2019-02-18 11:41:14 +01:00
Torkel Ödegaard
a6cae5b2b8 Merge pull request #15494 from grafana/minor-tweaks-panel-edit
Removed primary class from Add Query button, and changed name of panel options tab
2019-02-18 11:36:19 +01:00
Dominik Prokop
8e035676e1 Remove maxDataPoints and interval props from props to remember in panel model 2019-02-18 11:33:16 +01:00
Torkel Ödegaard
7db7a69917 Merge pull request #15496 from grafana/fix/typo
Fix typo in view mode cycle button
2019-02-18 11:32:22 +01:00
Dominik Prokop
75dd7d0036 Fix typo in view mode cykle button 2019-02-18 11:08:42 +01:00
Dominik Prokop
4721250d19 Variables regenerated 2019-02-18 11:05:02 +01:00
Dominik Prokop
6da57d4c08 Make clear that variable scss files are generated from templates 2019-02-18 11:03:52 +01:00
Torkel Ödegaard
14ba3f5891 Fixed spelling issue in templating docs 2019-02-18 10:59:22 +01:00
Torkel Ödegaard
bf826d7c81 Removed primary class from Add Query button, and changed name of Panel Options tab o General Options 2019-02-18 10:49:14 +01:00
Torkel Ödegaard
9e55fef544 improved formatting of variable docs 2019-02-18 09:52:31 +01:00
David Kaltschmidt
815affe02d Datasource docs for Loki
- adds Loki data source docs to Grafana docs
- moved query-related docs from Explore to Loki
2019-02-18 09:39:44 +01:00
Torkel Ödegaard
d285da35de Merge pull request #15487 from brunorey/master
Added enable_gzip documentation (#15322)
2019-02-18 09:30:52 +01:00
Dominik Prokop
28f42bab5b Replace require with import in start task 2019-02-18 09:26:14 +01:00
Torkel Ödegaard
db21551db2 Merge pull request #15481 from grafana/react-panel-header-issue
Fixed issue with PanelHeader and grid-drag-handle in fullscreen
2019-02-18 09:14:03 +01:00
Bruno
b488892f5f Added enable_gzip documentation (#15322) 2019-02-17 17:38:56 -03:00
Andre Klärner
4d555aceaa Add Lux to units
fixes #15479
2019-02-17 13:30:41 +01:00
Torkel Ödegaard
89ad525986 Fixed issue with PanelHeader and grid-drag-handle class still being applied in fullscreen, fixes #15480 2019-02-17 08:11:57 +01:00
Torkel Ödegaard
dede40d459 Began work on handling panel type switching and keep setting 2019-02-17 07:03:42 +01:00
Torkel Ödegaard
1d4dae7aa8 Merge branch 'react-panel-options' into bar-gauge-poc 2019-02-16 16:34:56 +01:00
Torkel Ödegaard
22b7864d72 Fixed unit tests 2019-02-16 16:33:29 +01:00
Torkel Ödegaard
d33d08fa15 Fixed gauge issue that will require migration later and also value options editor did not handle null decimals or 0 decimals 2019-02-16 16:27:12 +01:00
Torkel Ödegaard
c0b204f93b Added missing Gauge props 2019-02-16 16:06:16 +01:00
Torkel Ödegaard
42d90fdb7a Merge branch 'react-panel-options' into bar-gauge-poc 2019-02-16 16:02:31 +01:00
Torkel Ödegaard
3dae915b23 Bar gauge icon updated 2019-02-16 15:47:35 +01:00
Torkel Ödegaard
c05c3df52f Added bar gauge icon 2019-02-16 15:47:35 +01:00
Torkel Ödegaard
d31cf45cb5 Began work on adding options 2019-02-16 15:47:34 +01:00
Torkel Ödegaard
2a83d8ab95 Added basic tests 2019-02-16 15:47:34 +01:00
Torkel Ödegaard
eaedcee8de bar-gauge storybook 2019-02-16 15:47:33 +01:00
Torkel Ödegaard
83d1eb87e5 Began experimenting with a bar gauge 2019-02-16 15:47:33 +01:00
Torkel Ödegaard
4c59a91651 Also remove nested options prop that was there due to bug 2019-02-16 15:46:30 +01:00
Torkel Ödegaard
43e0ad3f93 Moved gauge value options into a sub oject and made editor more generic, will be moved out of gauge pane later and shared between singlestat, gauge, bargauge, honecomb 2019-02-16 15:46:30 +01:00
Torkel Ödegaard
074073787d Added a ReactPanelPlugin as the interface that react panels export, this way react panels have clearer api, and gives us hooks to handle migrations and a way for panel to handle panel changes in the future 2019-02-16 15:46:30 +01:00
Torkel Ödegaard
9035ce4d18 Changed how react panels store their options 2019-02-16 15:46:29 +01:00
Torkel Ödegaard
2d5fd7fdfd Fixed prettier issue (#15471)
Fixed prettier CI issue that caused build failures
2019-02-16 15:45:19 +01:00
corpglory-dev
8b4eefa768 Initial commit 2019-02-15 20:43:51 +03:00
Torkel Ödegaard
8bde9de507 Added bar gauge icon 2019-02-15 18:29:21 +01:00
Torkel Ödegaard
d611f9a4f5 Began work on adding options 2019-02-15 17:33:31 +01:00
Torkel Ödegaard
b05f1d8e63 Added basic tests 2019-02-15 17:02:02 +01:00
Torkel Ödegaard
1adc1a6097 Merge pull request #15455 from grafana/fixed-handling-of-alert-urls
Fixed handling of alert urls with true flags
2019-02-15 16:27:23 +01:00
bergquist
c68da40710 run db tests in all packages 2019-02-15 16:26:24 +01:00
Torkel Ödegaard
b34f2665fd bar-gauge storybook 2019-02-15 15:23:16 +01:00
ijin08
794fb3e039 new dark-3 became new dark-2, created new lighter dark-3, changed panel-bg, empty-cta etc to dark-2 2019-02-15 14:02:46 +01:00
Torkel Ödegaard
4c28ec83b3 Merge pull request #15444 from max-neverov/percent_diff_null
Fix percent_diff calculation when points are nulls
2019-02-15 13:03:19 +01:00
Marcus Efraimsson
bc1aec9ea6 Merge pull request #15427 from grafana/15308_docs
Improved documentation of new short-lived token solution
2019-02-15 13:00:28 +01:00
Torkel Ödegaard
843f8b04d4 Began experimenting with a bar gauge 2019-02-15 12:55:35 +01:00
Marcus Efraimsson
ff87f6d303 docs: suggested changes 2019-02-15 11:31:29 +01:00
Torkel Ödegaard
3d3db08b56 Merge pull request #15452 from grafana/grafana-ui-type-fixes
Added missing strict type checking options to grafana/ui
2019-02-15 11:28:23 +01:00
Torkel Ödegaard
a7674336ca Merge pull request #15453 from grafana/dashboard-navbar-buttons
Fixed dashboard navbar buttons being visible in fullscreen
2019-02-15 11:27:25 +01:00
Marcus Efraimsson
88fbe3adca docs: fix header 2019-02-15 11:27:21 +01:00
Torkel Ödegaard
7699706e65 fixed handling of alert urls with true flags, fixes #15454 2019-02-15 11:23:31 +01:00
Torkel Ödegaard
7b59b9cf4b Fixed dashboard navbar buttons being visible in fullscreen, fixes #15450 2019-02-15 11:03:24 +01:00
Torkel Ödegaard
d6de40cbe6 Added missing strict type checking options to grafana/ui and fixed type errors 2019-02-15 10:49:10 +01:00
Maxim Neverov
28eaac3a9c Extracted common code for diff calculation 2019-02-14 21:52:59 +01:00
bergquist
af5a2468e8 fix spelling error 2019-02-14 20:18:24 +01:00
bergquist
191f9c8407 whats new: rename security section 2019-02-14 19:42:39 +01:00
Torkel Ödegaard
0256a4dd47 Merge pull request #15417 from kiran3394/master
added support for influxdb non_negative_difference function in tsdb
2019-02-14 18:49:32 +01:00
Torkel Ödegaard
7fd89ff77a Merge pull request #15424 from grafana/move-error-boundry
Move error boundry from DataPanel to PanelChrome
2019-02-14 18:27:03 +01:00
David
2c92365969 Merge pull request #15305 from avaly/feature/ansi-colors
Support ANSI colors codes in Loki logs
2019-02-14 18:01:23 +01:00
Torkel Ödegaard
cd8f5835ec Merge pull request #15395 from briangann/20190212_adjust_notifier_render_timeout
allow 90 percent of alertTimeout for rendering to complete vs 50 percent
2019-02-14 17:21:40 +01:00
Maxim Neverov
3c2f6094b2 Fix percent_diff calculation when points are nulls 2019-02-14 16:31:15 +01:00
Carl Bergquist
0b13c96c83 Merge pull request #15419 from bergquist/contributing_bug_fixes
contributing: improve guide for bug fixes
2019-02-14 16:22:58 +01:00
Torkel Ödegaard
19a080a4d4 Restored loading spinner to DataPanel 2019-02-14 15:29:36 +01:00
bergquist
72f522bb51 rearrange bullet points in PR template
[skip ci]
2019-02-14 15:24:52 +01:00
Torkel Ödegaard
79008a7acd added another error message scenario 2019-02-14 15:23:34 +01:00
bergquist
b37e05714c link to contributing guidelines in pr template 2019-02-14 15:22:13 +01:00
Torkel Ödegaard
2bc26a01f9 Fixes to error handling and clearing, also publishing of legacy events so old query editors work with react panels fully 2019-02-14 15:18:55 +01:00
bergquist
3f714fbd1b contributing: adds link to help wanted label 2019-02-14 14:54:09 +01:00
bergquist
681269b3fe contributing: adds link to our CLA 2019-02-14 14:53:46 +01:00
bergquist
e22cba67dc removes testing instruction from contributing doc 2019-02-14 14:26:25 +01:00
bergquist
94c1335f11 docs: move alerting above session 2019-02-14 14:17:02 +01:00
bergquist
933d4729db docs: mention samesite setting 2019-02-14 14:06:50 +01:00
ijin08
3b3a5b6797 increased blue in dark-1-5, dark-3 and dark-4 2019-02-14 13:32:45 +01:00
bergquist
7f7cc85ef0 docs: adds note about new login cookie name 2019-02-14 13:24:41 +01:00
Torkel Ödegaard
cc61d9c5cc Merge branch 'master' into move-error-boundry 2019-02-14 13:10:49 +01:00
ijin08
a405be4415 Merge branch 'theme-files-cleanup' of github.com:grafana/grafana into theme-files-cleanup 2019-02-14 11:48:33 +01:00
ijin08
cbb91adb43 changed color for blue light in light theme + small changes in naming etc 2019-02-14 11:47:17 +01:00
Johannes Schill
3ca4adf51e Add missing nodemon dependency 2019-02-14 11:24:34 +01:00
Carl Bergquist
4f3b9c6c37 Merge pull request #15420 from marefr/fix_generic_oauth_doc
docs: add availability note regarding non-compliant providers
2019-02-14 10:17:58 +01:00
Marcus Efraimsson
0cbf7aaf25 Merge pull request #15412 from marefr/ha_loki
devenv: loki support in ha test
2019-02-14 10:15:51 +01:00
bergquist
982f262089 make bug/feature titles more verbose 2019-02-14 09:13:58 +01:00
bergquist
0e6800495f mentioned closes/fixes for new features 2019-02-14 09:02:51 +01:00
Marcus Efraimsson
de2f3db413 docs: improve removal of session storage for what's new in v6.0 2019-02-13 19:54:45 +01:00
Marcus Efraimsson
1bd9573f8e docs: add upgrade notes for v6.0 2019-02-13 19:53:55 +01:00
Marcus Efraimsson
592f57d0ba docs: add note regarding auth proxy and user session requirement 2019-02-13 19:53:25 +01:00
Marcus Efraimsson
3fab4d6f8c docs: fix typo 2019-02-13 19:52:27 +01:00
ijin08
6160f36121 removed more unused variables, restyled scrollbar 2019-02-13 18:04:53 +01:00
Torkel Ödegaard
4c9dba9152 Merge pull request #15423 from grafana/fixed-react-panels-dimensions
Fixed issue with react panel dimensions
2019-02-13 17:17:19 +01:00
Brian Gann
c98b00c302 allow 90 percent of alertTimeout for rendering to complete vs 50 percent 2019-02-13 09:56:37 -06:00
Peter Holmberg
0c72fb3be1 Merge branch 'master' into move-error-boundry 2019-02-13 16:52:52 +01:00
Torkel Ödegaard
ef9e74fabb Fixed issue with sass variables used from typescript, the prettier lowercases export variables 2019-02-13 16:36:59 +01:00
Peter Holmberg
aad558ce9c using error callback from datapanel instead 2019-02-13 15:54:10 +01:00
Patrick O'Carroll
65b4273551 Merge branch 'master' into theme-files-cleanup 2019-02-13 15:46:59 +01:00
Marcus Efraimsson
3b0159bf84 docs: add availability note regarding non-compliant providers
ref #15408
2019-02-13 15:36:16 +01:00
Torkel Ödegaard
c243e78913 Merge pull request #15399 from grafana/15330-vizpicker-red-when-0-hits
Red border color on input when zero hits in vizpicker
2019-02-13 15:22:00 +01:00
Torkel Ödegaard
61de0a7330 Merge pull request #15418 from grafana/change-default-devenv-datasource
Changed devenv default data source to testdata
2019-02-13 15:04:51 +01:00
Dominik Prokop
d3b90d5b78 Fixed sass vars template files 2019-02-13 14:58:27 +01:00
Dominik Prokop
4366b1588e Added deprecation warning to npm watch script - use start script instead 2019-02-13 14:58:01 +01:00
ijin08
7a4508d11e added new dark variable to dark theme(the color used for page-bg), changed some backgroud colors that doesn't use variables to use variables, made some slight tweaks to dark variables, fixed so item hover is the same as card hover 2019-02-13 14:56:28 +01:00
Torkel Ödegaard
124b3486eb Merge branch 'master' into 15330-vizpicker-red-when-0-hits 2019-02-13 14:49:11 +01:00
Dominik Prokop
a09250a309 Simple CLI for running grafana in dev env 2019-02-13 14:47:59 +01:00
Dominik Prokop
06bae9aa46 Added common theme variabless generation, created GrafanaThemeCommons interface 2019-02-13 14:45:11 +01:00
bergquist
058debee67 contributing: improve guide for bug fixes 2019-02-13 14:25:26 +01:00
Torkel Ödegaard
0ed32ebcb4 Changed devenv default data source to testdata 2019-02-13 14:09:04 +01:00
z0029c4
13974cdd28 added support for influxdb non_negative_difference function in tsdb 2019-02-13 18:12:35 +05:30
z0029c4
8cb1e5b918 added support for influxdb non_negative_difference function in tsdb for alerting 2019-02-13 17:55:31 +05:30
Dominik Prokop
4903b03d24 Remove precommit from npm scrips 2019-02-13 12:32:42 +01:00
Torkel Ödegaard
adf87dc49f Merge pull request #15413 from grafana/prettier-on-all-again
Prettier fixes
2019-02-13 12:27:04 +01:00
Torkel Ödegaard
ffdf747080 More files that has fixed with prettier 2019-02-13 11:39:41 +01:00
Torkel Ödegaard
ac9129c2b7 Added prettierignore and check script 2019-02-13 11:38:04 +01:00
Marcus Efraimsson
0f758fd1ff devenv: use grafana:dev image in ha test per default 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
e61616d829 devenv: send nginx logs to loki in ha test 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
d55a6deb97 devenv: proper fluentd conf for grafana and loki 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
7b1249ad47 devenv: use grafana/fluent-plugin-loki 2019-02-13 11:18:29 +01:00
Marcus Efraimsson
0f40b2d206 devenv: trying to make fluentd with inoffical fluent-plugin-loki work 2019-02-13 11:18:29 +01:00
Peter Holmberg
56f7cd9602 fixed issue with updatePopperPosition 2019-02-13 11:18:08 +01:00
Torkel Ödegaard
cfea8bdcae Prettier had not been running as a precommit hook for some time so had to run in on all files again 2019-02-13 11:14:53 +01:00
ijin08
09dbd6b1a6 removed _plugins.scss and _settings_permissions.scc, removed unused classes in _login.scss, reduced dark variabels in light theme and alignied light theme a bit with dark theme, turned blue-gray, dark-3 and panel-bg variables into one variable and removed gray-7 in dark theme 2019-02-13 11:04:22 +01:00
Johannes Schill
27bbadce1d feat: Add EmptySearchResult ui component and use it in VizTypePicker 2019-02-13 09:22:09 +01:00
Torkel Ödegaard
3b0ae4bd0a Merge pull request #15368 from grafana/15217-panels-without-queries
POC: Panels without queries can skip DataPanel
2019-02-13 08:06:25 +01:00
Torkel Ödegaard
6be50c952c Merge pull request #15400 from grafana/removed-icons-in-buttons
Removed some icons in action button
2019-02-13 08:05:11 +01:00
Johannes Schill
b6305c2d80 Revert "feat: Add css-support for invalid form input elements"
This reverts commit b1aa84804b.
2019-02-13 07:46:21 +01:00
Johannes Schill
44eaa3eaa8 Revert "feat: Highlight vizpicker input when there are no panels matching the search query"
This reverts commit 11db48e76e.
2019-02-13 07:46:14 +01:00
Dominik Prokop
2542a43ec0 Regenerating variabless sas on theme edit v1 2019-02-12 21:54:20 +01:00
Torkel Ödegaard
88ef2e1d32 Fixed a minor plugin json lingering issue 2019-02-12 18:31:35 +01:00
Torkel Ödegaard
960fa56033 Merge pull request #15382 from grafana/hugoh/bug-pressing-brackets-key-in-input-fields
Bug pressing special regexp chars in input fields
2019-02-12 17:55:42 +01:00
Torkel Ödegaard
f195459b01 Removed some icons in action button
Trying to align some title case issues
2019-02-12 17:51:08 +01:00
Dominik Prokop
0a66d8afc7 Merge branch 'master' into cli/watch-sass-var 2019-02-12 17:20:14 +01:00
Peter Holmberg
1c5118748a implement show error in panelcorner 2019-02-12 17:01:07 +01:00
Hugo Häggmark
90d162e608 Merge with master 2019-02-12 16:47:57 +01:00
Hugo Häggmark
222482b6be Forgot about the snapshots 2019-02-12 16:31:11 +01:00
Torkel Ödegaard
c839034f45 Merge branch '15217-panels-without-queries' of github.com:grafana/grafana into 15217-panels-without-queries 2019-02-12 16:30:41 +01:00
Torkel Ödegaard
ef7236439a Merge pull request #15391 from grafana/fixed-double-datasource-edit-page
Fixed issues with double page body and husky pre-commit hook
2019-02-12 16:28:07 +01:00
Hugo Häggmark
4c74b09a9d Renamed to FilterInput and added label and search icon 2019-02-12 16:22:57 +01:00
Johannes Schill
11db48e76e feat: Highlight vizpicker input when there are no panels matching the search query 2019-02-12 16:19:23 +01:00
Torkel Ödegaard
5708660893 Updated a few plugin json files with dataFormats 2019-02-12 16:15:05 +01:00
Johannes Schill
b1aa84804b feat: Add css-support for invalid form input elements 2019-02-12 16:14:48 +01:00
Peter Holmberg
9f88a22b4c remove comments 2019-02-12 16:14:26 +01:00
Peter Holmberg
f52aa4de4e Merge branch '15217-panels-without-queries' into move-error-boundry 2019-02-12 16:13:15 +01:00
Peter Holmberg
f0565684c7 Merge branch '15217-panels-without-queries' of https://github.com/grafana/grafana into 15217-panels-without-queries 2019-02-12 16:11:04 +01:00
Peter Holmberg
530a370379 bubble error from datapanel to panelchrome 2019-02-12 16:06:02 +01:00
Torkel Ödegaard
a1453607a9 Changed noQueries to a dataFormats array that will allow a panel to define supported formats and prefered (first in array) 2019-02-12 16:05:29 +01:00
Torkel Ödegaard
bde9e9d5a5 Merge pull request #15394 from grafana/13066-save-as-dashboard
fix: No need to have edit permissions to be able to "Save as"
2019-02-12 15:57:41 +01:00
Carl Bergquist
dcec61e1b4 Merge pull request #15378 from grafana/auth_token_quotas
use authTokenService for session quotas restrictions
2019-02-12 15:38:57 +01:00
bergquist
e163aadfe4 use authtoken for session quota restrictions
closes #15360
2019-02-12 15:10:55 +01:00
Torkel Ödegaard
8bd7e5a5f4 Merge pull request #15374 from grafana/explore/dedup-selector
Move deduplication calculation from Logs component to reselect selector
2019-02-12 14:57:06 +01:00
Torkel Ödegaard
9772497354 Merge pull request #15389 from grafana/tooltip-error-theme-text-color
fix: Tooltip error text color
2019-02-12 14:43:51 +01:00
Torkel Ödegaard
2c4cb03cd3 Fixed issues with double page body and husky pre-commit hook 2019-02-12 14:41:12 +01:00
Johannes Schill
335042b2d0 fix: No need to have edit permissions to be able to "Save as" a dashboard 2019-02-12 14:29:27 +01:00
Johannes Schill
2a655cb38a Revert "chore: wip: Replace brace with ace-builds to get latest version of ace"
This reverts commit c98b86fd6b58ac5f77c197d7551751e62d53bedd.
2019-02-12 12:41:19 +01:00
Johannes Schill
2d4e1a80bc chore: wip: Replace brace with ace-builds to get latest version of ace 2019-02-12 12:41:18 +01:00
Johannes Schill
49e0572611 fix: Error tooltip should have white text on red background. Not red text on red background 2019-02-12 12:41:18 +01:00
Dominik Prokop
dd19ec3b22 Move explore selectors to a separate file 2019-02-12 12:36:46 +01:00
bergquist
1310d356fc removes unused session code 2019-02-12 12:33:54 +01:00
Johannes Schill
c3965e332d chore: Rename renderPanel to renderPanelBody 2019-02-12 12:28:53 +01:00
Johannes Schill
d5918498da chore: Rename renderDataPanel to renderPanel 2019-02-12 12:28:53 +01:00
Johannes Schill
01208ccd68 chore: Rename renderHelper > renderDataPanel and move logic to smaller functions 2019-02-12 12:28:53 +01:00
Johannes Schill
b5dbf26dc4 chore: PR feedback, shorten boolean check 2019-02-12 12:28:53 +01:00
Johannes Schill
075fb8e91c chore: Rename isDataPanel to noQueries 2019-02-12 12:28:53 +01:00
Johannes Schill
b7b1a79405 chore: Only show Queries tab for panel plugins with isDataPanel set to true 2019-02-12 12:28:53 +01:00
Johannes Schill
d3115325a9 feat: Only use the DataPanel component when panel plugin has isDataPanel set to true in plugin.json. And fix PanelData when using snapshots 2019-02-12 12:28:53 +01:00
Johannes Schill
3f64d61fd2 feat: Add util to convert snapshotData to PanelData 2019-02-12 12:28:53 +01:00
Johannes Schill
c4b2dcefbe feat: Introduce IsDataPanel attribute to plugin.json 2019-02-12 12:28:53 +01:00
Johannes Schill
0811fbd6d0 fix: Add missing typing 2019-02-12 12:28:52 +01:00
Torkel Ödegaard
e5759fa0ed Merge pull request #15387 from grafana/hugoh/can-not-set-decimal-threshold-in-gauge
Fixes #15372 with number input and parseFloat
2019-02-12 12:22:09 +01:00
Hugo Häggmark
da80286f97 Fixes #15372 with number input and parseFloat 2019-02-12 11:10:31 +01:00
Peter Holmberg
1db5d86b12 Merge branch '15217-panels-without-queries' into move-error-boundry 2019-02-12 10:54:55 +01:00
Peter Holmberg
7d0edb285d Revert "hard move"
This reverts commit a2dad6157a.
2019-02-12 10:53:05 +01:00
Johannes Schill
be58e275a5 chore: PR feedback, shorten boolean check 2019-02-12 09:55:09 +01:00
Torkel Ödegaard
bc8418adac Merge branch 'master' of github.com:grafana/grafana 2019-02-12 09:49:01 +01:00
Johannes Schill
2db9cb3d93 chore: Rename isDataPanel to noQueries 2019-02-12 09:48:46 +01:00
Torkel Ödegaard
38a74c6444 Merge pull request #15383 from bergquist/test_provisoned_ds
enable testing provsioned datasources
2019-02-12 09:48:36 +01:00
Hugo Häggmark
25dbca9585 Merge with master 2019-02-12 08:50:05 +01:00
Hugo Häggmark
130eedc4ae Found another input that was tied to a regexp 2019-02-12 08:48:54 +01:00
Hugo Häggmark
5388541fd7 Fixes bug #12972 with a new type of input that escapes and unescapes special regexp characters 2019-02-12 08:48:54 +01:00
bergquist
3b9105e1be enable testing provsioned datasources
closes #12164
2019-02-12 08:45:21 +01:00
Torkel Ödegaard
342aa0ad01 Merge branch 'master' of github.com:grafana/grafana 2019-02-12 08:22:28 +01:00
Torkel Ödegaard
edd9576f15 Fixed elastic5 docker compose block 2019-02-12 08:04:30 +01:00
Torkel Ödegaard
1407691de2 Merge pull request #15377 from grafana/fix/named-colors-palette-default-colors
Fix error caused by named colors that are not part of named colors palette
2019-02-12 06:57:19 +01:00
Dominik Prokop
a5d158c014 Added one more test case for color resolving helper 2019-02-11 21:22:53 +01:00
Dominik Prokop
ed208f2b5f Fix error caused by named colors that are not part of named colors palette 2019-02-11 21:11:19 +01:00
Torkel Ödegaard
b590c4da40 Merge pull request #15371 from grafana/react-panels-request-id-fix
Fixed issue with gauge requests being cancelled
2019-02-11 20:47:27 +01:00
Torkel Ödegaard
fc91e1cf57 Fixed issue with gauge requests being cancelled 2019-02-11 17:47:47 +01:00
Torkel Ödegaard
e38cfc1a71 Update package.json 2019-02-11 17:43:02 +01:00
Torkel Ödegaard
0493d905f1 Update CHANGELOG.md 2019-02-11 17:42:31 +01:00
Torkel Ödegaard
a79bd42414 Merge pull request #15306 from grafana/explore/dedup-strategu-url
Persist deduplication strategy in url
2019-02-11 17:12:41 +01:00
Daniel Lee
951e5932d4 changelog: adds note for #15363 2019-02-11 17:00:16 +01:00
Dominik Prokop
1693f083cc Move deduplication calculation from Logs component to redux selector 2019-02-11 16:57:49 +01:00
Torkel Ödegaard
e50b7b3279 Merge branch 'ui-new-red-green-blue' 2019-02-11 16:51:30 +01:00
Torkel Ödegaard
99df7b87c0 Merge branch 'master' of github.com:grafana/grafana 2019-02-11 16:51:24 +01:00
Torkel Ödegaard
6d11999e20 Merge pull request #15367 from grafana/gauge-max-value
Fix issue with Max value in Gauge
2019-02-11 16:50:42 +01:00
Torkel Ödegaard
5195954681 style tweak to alert 2019-02-11 16:50:12 +01:00
Daniel Lee
18615a3357 Merge pull request #15363 from bergquist/edition_to_build_info
adds edition to build_info metric
2019-02-11 16:46:53 +01:00
Torkel Ödegaard
afc2efa56d Removed plus icons 2019-02-11 16:45:47 +01:00
Peter Holmberg
a2dad6157a hard move 2019-02-11 16:44:09 +01:00
Torkel Ödegaard
8e93b68e6d restoring green CTA 2019-02-11 16:38:05 +01:00
Torkel Ödegaard
b920ee0ea3 Merge branch 'master' into ui-new-red-green-blue 2019-02-11 16:26:58 +01:00
Torkel Ödegaard
b93cdf56fb Removed double page container 2019-02-11 16:26:02 +01:00
Johannes Schill
0019e0ffc9 chore: Only show Queries tab for panel plugins with isDataPanel set to true 2019-02-11 16:21:54 +01:00
Peter Holmberg
c332e106a2 Removing default thresholds values. 2019-02-11 16:00:08 +01:00
bergquist
e4e42fcd08 adds edition to build_info metric 2019-02-11 15:42:12 +01:00
Torkel Ödegaard
c4fa64e6dc Updated lint-staged 2019-02-11 15:23:50 +01:00
Daniel Lee
93f1a48641 changelog: adds note for #14623 2019-02-11 15:21:02 +01:00
Torkel Ödegaard
4408817e65 Fixed double page class on api keys and org details page 2019-02-11 15:18:11 +01:00
Daniel Lee
1c364b57b5 Merge pull request #15353 from grafana/14623-azure-monitor-alerting
Adds alerting for the Azure Monitor API in the Azure Monitor datasource
2019-02-11 15:16:32 +01:00
Torkel Ödegaard
931bece16e Merge branch 'master' into ui-new-red-green-blue 2019-02-11 15:00:00 +01:00
Torkel Ödegaard
962815169e Color tweaks 2019-02-11 14:58:11 +01:00
Daniel Lee
ac345312a4 azuremonitor: don't use make for maps and array 2019-02-11 14:42:12 +01:00
ijin08
56b35354c7 changed back to old green in light theme 2019-02-11 14:21:43 +01:00
Daniel Lee
52fe6b0316 Merge pull request #15198 from CorpGlory/azure-monitor-refactor-#15087
Azure Monitor: refactor #15087
2019-02-11 14:19:42 +01:00
Marcus Efraimsson
8769b7aa57 changelog: add notes about closing #15258 2019-02-11 14:17:59 +01:00
Marcus Efraimsson
757a98257d changelog: add notes about closing #15223 2019-02-11 14:17:59 +01:00
Marcus Efraimsson
1f0c7727f4 changelog: add notes about closing #15222 2019-02-11 14:17:59 +01:00
Marcus Efraimsson
63f465f0ac changelog: add notes about closing #15122 2019-02-11 14:17:59 +01:00
Marcus Efraimsson
9472d7e600 changelog: add notes about closing #15219 2019-02-11 14:17:59 +01:00
Marcus Efraimsson
a7c44c2ce7 changelog: add notes about closing #14432 2019-02-11 14:17:59 +01:00
Marcus Efraimsson
82e330a1c5 update changelog 2019-02-11 14:17:32 +01:00
Daniel Lee
e53f41e511 changelog: adds note for #15131 2019-02-11 14:10:01 +01:00
Daniel Lee
22d64a8c2a Merge pull request #15301 from grafana/azure-monitor-autocomplete
Azure Monitor: improve autocomplete for Log Analytics and App Insights editor
2019-02-11 14:06:43 +01:00
Marcus Efraimsson
c13e302cde Merge pull request #15356 from grafana/15258_fix
revert ds_proxy timeout and implement dataproxy timeout correctly
2019-02-11 14:05:51 +01:00
Marcus Efraimsson
5e6c746c9b changelog: add notes about closing #15284 2019-02-11 13:58:36 +01:00
Torkel Ödegaard
77ba734491 Fixed issue with light theme introduced by #15333 2019-02-11 13:54:50 +01:00
Peter Holmberg
c7bb563cef devenv test dashboard 2019-02-11 13:43:58 +01:00
Torkel Ödegaard
c92cd73bd8 Merge pull request #15355 from grafana/15284_fix_time_range
WIP: Datasources with custom time range handling should always take dashboard timezone into consideration
2019-02-11 13:43:47 +01:00
Torkel Ödegaard
9570394c49 minor style update 2019-02-11 13:42:37 +01:00
Marcus Efraimsson
a1cd550df4 revert ds_proxy timeout and implement dataproxy timeout correctly 2019-02-11 13:42:05 +01:00
bergquist
13f21fffc4 changelog: adds note about closing #15295
[skip ci]
2019-02-11 13:35:37 +01:00
Carl Bergquist
1f7a1f807e Merge pull request #15299 from grafana/15295_fux
Make sure alert notifier provisioning directory are created for deb and rpm packages
2019-02-11 13:31:51 +01:00
Daniel Lee
0b74860f55 azuremonitor: fix auto interval calculation on backend
Not needed for alerting (as the query intervalms will always be 0) but needed
later when being called from the frontend)
2019-02-11 13:27:08 +01:00
Torkel Ödegaard
b14958edef Minor style fixes 2019-02-11 13:24:02 +01:00
Dominik Prokop
85780eb30c Remove not related code 2019-02-11 13:18:16 +01:00
Marcus Efraimsson
b9c36e5301 make sure opentsdb takes dashboard timezone into consideration 2019-02-11 13:13:38 +01:00
Marcus Efraimsson
519dfd0899 make sure influx takes dashboard timezone into consideration 2019-02-11 13:11:56 +01:00
Torkel Ödegaard
a4dd63e224 Merge branch 'master' into ui-new-red-green-blue 2019-02-11 13:04:25 +01:00
Dominik Prokop
cee2e4788b Do not read store state from toggle panelaction creator 2019-02-11 12:56:37 +01:00
Carl Bergquist
1b22ceabbe Merge pull request #15347 from bergquist/usage_stats_naming
renames usage state metric for auth_token
2019-02-11 12:52:04 +01:00
Torkel Ödegaard
6f16f70456 Merge pull request #15354 from grafana/fix/plugin-loading-failure
Fix plugin loading failure message not being displayed
2019-02-11 12:49:08 +01:00
Torkel Ödegaard
eff82abadd Merge branch 'gauge-multi-series' of github.com:grafana/grafana into gauge-multi-series 2019-02-11 12:04:39 +01:00
Marcus Efraimsson
37a73b6b35 make sure graphite takes dashboard timezone into consideration 2019-02-11 12:04:27 +01:00
Torkel Ödegaard
7e4225c08a Merge branch 'master' of github.com:grafana/grafana into gauge-multi-series 2019-02-11 12:04:05 +01:00
Dominik Prokop
14bf960b64 Merge branch 'master' into explore/dedup-strategu-url 2019-02-11 12:03:45 +01:00
Dominik Prokop
c9fbd43231 Review changes 2019-02-11 11:59:48 +01:00
Peter Holmberg
e0adc8fa30 Merge branch 'gauge-multi-series' of https://github.com/grafana/grafana into gauge-multi-series 2019-02-11 11:52:14 +01:00
Torkel Ödegaard
ba2f698b81 Merge pull request #15352 from grafana/fixed-missing-graph-time-axis
Fixed missing time axis on graph due to width not being passed
2019-02-11 11:50:04 +01:00
Peter Holmberg
55b4162e85 return series label if selected stat is name 2019-02-11 11:47:51 +01:00
Dominik Prokop
9485c67827 Fix plugin loading failure message not being displayed 2019-02-11 11:47:12 +01:00
Torkel Ödegaard
2284175638 Merge branch 'master' into gauge-multi-series 2019-02-11 11:45:02 +01:00
Torkel Ödegaard
d970c3a686 Merge pull request #15350 from grafana/fix/clear-search-on-vizpicker-close
Clear visualization picker search on picker close
2019-02-11 11:39:07 +01:00
Torkel Ödegaard
5af1bd657f Merge pull request #15351 from grafana/15270_fix
Fix navigate to folder with only uid
2019-02-11 11:38:48 +01:00
bergquist
5dc864b47f fixes invalid folder check
-f check if a file exists. -d checks if the dir exists
2019-02-11 11:36:34 +01:00
bergquist
7ce18ec4f7 extract notifiers folder creation to new if statement 2019-02-11 11:30:41 +01:00
Daniel Lee
a54484638d interval: make the FormatDuration function public
A useful function that was ported from kbn.ts and can be used
to convert milliseconds into a kbn unit
2019-02-11 11:25:51 +01:00
Torkel Ödegaard
b780b6377a Fixed missing time axis on graph due to width not being passed 2019-02-11 11:17:23 +01:00
bergquist
217eb6310e make sure notifiers dir exists for provisioning in docker 2019-02-11 11:17:23 +01:00
Torkel Ödegaard
8f6ccce16f Merge pull request #15346 from grafana/logs-graph-series-names
Fix for logs graph series names (level names)
2019-02-11 11:13:37 +01:00
Marcus Efraimsson
f73f0e69e0 should be able to navigate to folder with only uid 2019-02-11 11:11:21 +01:00
bergquist
3ce99bca66 renames usage state name for auth token
as noted, sessions might not be a good name for this metrics.
while devices would be a better name for users I think we should
align the name with the code as much as possible. The ui listing
all auth_tokens per user should probarbly say "devices" instead
2019-02-11 11:08:31 +01:00
Dominik Prokop
f39fef2a02 Clear visualization picker search on picker close 2019-02-11 11:03:24 +01:00
Torkel Ödegaard
784d4fb70d Update README.md 2019-02-11 10:57:32 +01:00
bergquist
2c8c4729a8 changelog: adds note about closing #15288 2019-02-11 10:47:03 +01:00
Dominik Prokop
f80c8cc06c v1 2019-02-11 10:32:17 +01:00
Carl Bergquist
396a5a947f Merge pull request #15300 from bergquist/token_usage_stats
adds usage stats for sessions
2019-02-11 10:31:57 +01:00
Torkel Ödegaard
a402a3713f Merge pull request #15339 from grafana/navbar-back-btn
Navbar back btn
2019-02-11 10:28:47 +01:00
ijin08
2a2b242eb0 removed extra semi-colon 2019-02-11 10:27:58 +01:00
Torkel Ödegaard
e75e69a709 Commented out the Loki dashboard query editor 2019-02-11 10:27:04 +01:00
ijin08
1cff59731c added old green to dark-theme 2019-02-11 10:25:33 +01:00
Torkel Ödegaard
3bf0a5ffc6 Fixed issue with logs graph not showing level names 2019-02-11 10:01:43 +01:00
ijin08
9e0c795228 set secondary to new blue 2019-02-11 09:54:14 +01:00
Torkel Ödegaard
58e57a1669 removed unused directive 2019-02-11 09:46:56 +01:00
Torkel Ödegaard
9565e48f03 Fixed issue where double clicking on back button closes sidemenu 2019-02-11 09:37:13 +01:00
Patrick O'Carroll
c34021344a Merge branch 'master' into ui-new-red-green-blue 2019-02-11 09:17:19 +01:00
Marcus Efraimsson
5eea85a3a3 changelog: add notes about closing #8570 2019-02-11 09:06:20 +01:00
Marcus Efraimsson
75f89ecf1f Merge pull request #14888 from bugficks/8570-mysql-ssl-datasource
MySQL SSL CA in datasource connector
2019-02-11 09:00:18 +01:00
Marcus Efraimsson
be11da5b31 update changelog 2019-02-11 08:49:10 +01:00
Marcus Efraimsson
06972144d2 changelog: add notes about closing #14233 2019-02-11 08:48:03 +01:00
Marcus Efraimsson
7b761f0a28 changelog: add notes about closing #15189 2019-02-11 08:44:04 +01:00
Marcus Efraimsson
41217ea110 changelog: add notes about closing #13324 2019-02-11 08:39:33 +01:00
Marcus Efraimsson
bd48408e2d Merge pull request #15215 from thatsparesh/13324-mssql-pass-timerange-for-template-variable-queries
mssql: pass timerange for template variable queries
2019-02-11 08:36:47 +01:00
Daniel Lee
d6904ba9b4 azuremonitor: small refactoring 2019-02-11 01:22:15 +01:00
Daniel Lee
60327953a2 azuremonitor: handles timegrain set to auto on backend 2019-02-11 01:17:37 +01:00
Torkel Ödegaard
9ab06c6eef Merge pull request #15333 from nrichards/nrichards-patch-1
Improve usability of forms, better showing disabled metrics
2019-02-10 20:15:53 +01:00
Torkel Ödegaard
3e583707ca Merge pull request #15335 from tcpatterson/cloudwatch-ec2-api-metrics
Add aws ec2 api metrics for cloudwatch
2019-02-10 20:15:12 +01:00
Torkel Ödegaard
295bc425ff Merge pull request #15337 from grafana/time-range-to-angular-query-controllers
provide time range to angular query controllers
2019-02-10 20:02:41 +01:00
Torkel Ödegaard
f38e64cc5d Navbar back button, no title edit this time 2019-02-10 20:01:22 +01:00
Torkel Ödegaard
a0729b9b50 provide time range to angular query controllers 2019-02-10 17:05:58 +01:00
Daniel Lee
452c4f5b9b azuremonitor: add test for dimension filter 2019-02-10 01:47:38 +01:00
Daniel Lee
b94de101cd azuremonitor: refactor azure monitor api code into own file 2019-02-10 01:18:16 +01:00
Daniel Lee
b816f35c41 azuremonitor: handle multi-dimensions on backend 2019-02-10 00:23:12 +01:00
thatsparesh
105879ab5d use timeSrv in metricFindQuery as timeRange 2019-02-09 14:57:20 -06:00
thatsparesh
716db35fae remove unnecessary spy 2019-02-09 14:56:43 -06:00
Daniel Lee
a5e5db20e1 azuremonitor: add support for aggregations on backend 2019-02-09 21:52:44 +01:00
Connor Patterson
d2aed7e075 Fix formatting 2019-02-09 14:13:15 -05:00
Connor Patterson
2987a47a9b Add aws ec2 api metrics for cloudwatch 2019-02-09 13:47:08 -05:00
Nick Richards
bd6cefa53f Improve usability showing disabled lines in forms
* Use gray-3 instead of gray-2 for text-color-weak in "light" theme
2019-02-08 14:51:50 -08:00
Torkel Ödegaard
89c153d44b Merge pull request #15332 from grafana/style-fixes
Fixed issues with plus button in threshold and panel option header
2019-02-08 22:21:03 +01:00
Torkel Ödegaard
2e050d3337 Merge pull request #15331 from ryantxu/color-parsing
support three letter hex color strings
2019-02-08 22:19:56 +01:00
Torkel Ödegaard
748cb44911 Fixed issues with plus button in threshold and panel option header, and current state in viz picker, fixes #15329 2019-02-08 21:53:51 +01:00
ryan
169732997d support three letter hex color strings 2019-02-08 12:46:30 -08:00
Daniel Lee
10194df112 azuremonitor: simple alerting for Azure Monitor API
Lots of edge cases and functionality left to implement but
a simple query works for alerting now.
2019-02-08 18:15:17 +01:00
Torkel Ödegaard
db8c74c4c3 Merge pull request #15323 from ryantxu/package-license
mark grafana-ui package with Apache license
2019-02-08 18:13:41 +01:00
Marcus Efraimsson
1bc2a0af70 use unique datasource id when registering mysql tls config 2019-02-08 18:08:07 +01:00
Daniel Lee
0e228d582d azuremonitor: builds a query and sends it to Azure on the backend
Lots of edge cases not covered and the response is not parsed. It only
handles one service and will have to be refactored to handle multiple
2019-02-08 17:20:31 +01:00
ryan
3d5ae3dca3 mark packages as Apache license 2019-02-08 08:10:02 -08:00
Torkel Ödegaard
3e317b7d20 Merge pull request #15235 from grafana/core/theming
POC - Enable js defined theme to be used in SASS
2019-02-08 16:10:17 +01:00
Torkel Ödegaard
5436c28448 Minor refactoring around theme access 2019-02-08 15:38:45 +01:00
Dominik Prokop
7e03913d0d Use TS instead of JS to store theme variables@next 2019-02-08 14:06:53 +01:00
Dominik Prokop
71576a634e Do not use js theme variables in sass (poor dev experience for now) 2019-02-08 14:06:06 +01:00
Dominik Prokop
512aa62efc Update config mock in metrics panel controller test 2019-02-08 11:50:05 +01:00
Torkel Ödegaard
bb8bec5aaa Merge branch 'master' into core/theming 2019-02-08 09:05:41 +01:00
Leonard Gram
b32d420a75 ldap: refactoring. 2019-02-08 08:18:24 +01:00
Daniel Lee
21a1507c77 ldap: fixes #14432. Fix for IPA v4.6.4
IPA v4.6.4 introduced a fix that does not allow empty attributes
to be sent in a search request. This fix only adds attributes to
the request if they are mapped in the ldap toml file.
2019-02-08 08:18:24 +01:00
Daniel Lee
13d9acb1ef ldap: adds docker block for freeipa 2019-02-08 08:18:24 +01:00
Johannes Schill
ec02ddd27b feat: Only use the DataPanel component when panel plugin has isDataPanel set to true in plugin.json. And fix PanelData when using snapshots 2019-02-07 21:34:50 +01:00
Johannes Schill
8d4caa593e feat: Add util to convert snapshotData to PanelData 2019-02-07 21:31:05 +01:00
Johannes Schill
a8a9bca07b feat: Introduce IsDataPanel attribute to plugin.json 2019-02-07 21:26:23 +01:00
Johannes Schill
8d9c347cb1 fix: Add missing typing 2019-02-07 21:23:56 +01:00
Torkel Ödegaard
0bd39e5426 Merge pull request #15307 from grafana/fixed-explore-width-0
fixed explore width-0 issue
2019-02-07 19:11:02 +01:00
Torkel Ödegaard
0f96cf8662 slight tweaks 2019-02-07 19:06:51 +01:00
Torkel Ödegaard
df17f7dc45 fixed explore width-0 issue, fixes #15304 2019-02-07 18:20:16 +01:00
Dominik Prokop
229d646bfc Persis deduplication strategy in url 2019-02-07 18:01:09 +01:00
Valentin Agachi
ec0e03e547 Support ANSI colors codes in Loki logs
Closes #15114
2019-02-08 00:49:39 +08:00
bergquist
2be60887ca adds usage stats for sessions 2019-02-07 16:27:40 +01:00
Torkel Ödegaard
e080983147 Panel edit navbar poc 2019-02-07 16:14:11 +01:00
Marcus Efraimsson
9c18aa8684 make sure to create provisioning/notifiers directory for deb and rpm packages 2019-02-07 16:10:39 +01:00
Marcus Efraimsson
b4267eafb8 log root cause error when reading from provisioning directories 2019-02-07 15:46:57 +01:00
bergquist
6e7941d396 moves usage stats sender to new package 2019-02-07 14:59:50 +01:00
corpglory-dev
0cc9cbcb54 Merge branch 'master' into azure-monitor-refactor-#15087 2019-02-07 16:59:49 +03:00
Marcus Efraimsson
c71904e326 Merge pull request #15239 from grafana/auth_token_middleware_refactor
Auth token package and middleware refactoring
2019-02-07 14:24:23 +01:00
Torkel Ödegaard
78ea7ae783 Merge pull request #15212 from grafana/dashboard-react-page
Dashboard react page
2019-02-07 14:23:44 +01:00
Dominik Prokop
ac50d2b31f Merge branch 'master' into core/theming 2019-02-07 14:20:53 +01:00
Marcus Efraimsson
b545f51820 changelog: add notes about closing #15291 2019-02-07 14:18:20 +01:00
Torkel Ödegaard
8f0e9b674d Merge pull request #15282 from CorpGlory/unexpected-semver-comparison-behavior-#15280
Unexpected semver comparison behavior #15280
2019-02-07 14:17:48 +01:00
Dominik Prokop
e7917ce4e0 Removed unnecessary code from ColorPicker and extended theme type 2019-02-07 14:10:56 +01:00
Dominik Prokop
5ba3b0aa2c Selecting theme variable variant helper function 2019-02-07 14:10:20 +01:00
Torkel Ödegaard
00a676ff86 Merge pull request #15292 from mtanda/template_json_format
support json format templating
2019-02-07 14:05:09 +01:00
Torkel Ödegaard
8c65430ea3 Merge pull request #15251 from grafana/14822-use-autosizer
Remove react-sizeme and use AutoSizer
2019-02-07 14:03:25 +01:00
Torkel Ödegaard
2eca4caa5d added reducers tests 2019-02-07 13:58:24 +01:00
Mitsuhiro Tanda
89d69a6f21 update docs 2019-02-07 20:16:20 +09:00
Torkel Ödegaard
61e9148eed added way to test action called from react component 2019-02-07 12:02:01 +01:00
Torkel Ödegaard
5f808ddf22 Added annother initDashboard test 2019-02-07 11:17:31 +01:00
bergquist
487e7b5ea6 removes cleanup setting from docs 2019-02-07 11:07:55 +01:00
bergquist
170783c292 make hourly cleanup the default behavior 2019-02-07 10:51:35 +01:00
Peter Holmberg
d8f1e99249 fix single gauge 2019-02-07 09:33:22 +01:00
Peter Holmberg
58f04178a3 removed direction and series mode options, cleaned up the code somewhat 2019-02-07 09:20:17 +01:00
Torkel Ödegaard
8b080f0511 Simplified condition 2019-02-07 09:09:59 +01:00
Mitsuhiro Tanda
4bd94b8aba support json format templating 2019-02-07 14:07:41 +09:00
Mitsuhiro Tanda
d46bf75293 support /api/v1/labels 2019-02-07 13:59:42 +09:00
Marcus Efraimsson
3555997f98 devenv: update ha test and load test
better ha setup for many mysql connections
prometheus now scrapes mysql metrics in ha setup
ha setup provisions mysql dashboard
adds configurable virtual users for load test run script
2019-02-06 22:33:48 +01:00
Marcus Efraimsson
1a140ee199 run token cleanup job when grafana starts, then each hour 2019-02-06 22:27:08 +01:00
Torkel Ödegaard
6caae9167e Merge pull request #15278 from grafana/15277-remove-unused-theme-variables
Removed unused theme variables
2019-02-06 21:58:30 +01:00
Torkel Ödegaard
7edc3fdd5c Added another error object message detection 2019-02-06 21:35:01 +01:00
Torkel Ödegaard
baeec495a2 Fixed some remaining issues 2019-02-06 21:32:48 +01:00
Torkel Ödegaard
961695a61f Improved dashboard page test 2019-02-06 21:08:15 +01:00
Torkel Ödegaard
a4841a72d9 Improved dashboard page test 2019-02-06 21:04:18 +01:00
Torkel Ödegaard
dd0afd0a0b Big refactoring for dashboard init redux actions 2019-02-06 19:42:04 +01:00
corpglory-dev
ee132c1091 Fix SemVersion.isGtOrEq 2019-02-06 19:59:28 +03:00
Torkel Ödegaard
8574dca081 making changes suggested in review and improving typings 2019-02-06 17:31:52 +01:00
Marcus Efraimsson
836501186f fix 2019-02-06 17:30:17 +01:00
Peter Holmberg
9d052beddb show timeseries label under gauge 2019-02-06 17:07:32 +01:00
Dominik Prokop
dc6b27d123 Minor cleanup 2019-02-06 17:05:43 +01:00
Dominik Prokop
1e4c6b4b52 Added test for SASS variable retrieval function from JS definition 2019-02-06 17:05:22 +01:00
Dominik Prokop
7762d72ae3 Updated stories to use new theming 2019-02-06 17:03:42 +01:00
Marcus Efraimsson
8ae066ab5d move authtoken package into auth package 2019-02-06 17:02:57 +01:00
Peter Holmberg
632908ec40 vertical and horizontal, removed mode option 2019-02-06 16:56:33 +01:00
Marcus Efraimsson
8678620730 move UserToken and UserTokenService to models package 2019-02-06 16:55:12 +01:00
corpglory-dev
43b5eba8ee Add failing test 2019-02-06 18:33:24 +03:00
corpglory-dev
eb879062f9 Rename version_test to version.test 2019-02-06 18:32:22 +03:00
Marcus Efraimsson
a60124a88c change UserToken from interface to struct 2019-02-06 16:30:50 +01:00
ijin08
16e3c193ec replaced some hex values with variables 2019-02-06 16:19:56 +01:00
ijin08
0e7b420d6a some changes i forgot to save in first push in variables.dark 2019-02-06 15:51:36 +01:00
ijin08
3ef4d20f77 removed trailing whitespace 2019-02-06 15:47:03 +01:00
ijin08
27a1a9e8c5 removed unused theme variables, removed empty sections, aligned the order of sections in the files 2019-02-06 15:45:40 +01:00
Peter Holmberg
71cfcd58ba combine mode with avg value 2019-02-06 15:38:51 +01:00
Dominik Prokop
7eb2558fc5 Fix issue with graph legend color picker disapearing on color selection 2019-02-06 15:06:27 +01:00
Marcus Efraimsson
809d4b040a changelog: add notes about closing #12546 2019-02-06 14:52:17 +01:00
Marcus Efraimsson
afa87e6ab4 Merge pull request #15197 from SamuelToh/12546_annotation_nulls_existing_val
Add http patch support for annotations
2019-02-06 14:50:00 +01:00
Torkel Ödegaard
a53c3b45fc Added a basic test for initDashboard thunk 2019-02-06 14:35:53 +01:00
Marcus Efraimsson
6848fe0edf docs: update annotaions http api 2019-02-06 14:26:43 +01:00
corpglory-dev
e58f3a678d Merge branch 'master' into azure-monitor-refactor-#15087 2019-02-06 14:31:23 +03:00
Alexander Zobnin
e4446f0340 azuremonitor: improve autocomplete UX 2019-02-06 13:52:35 +03:00
Torkel Ödegaard
08a86250be Merge branch 'dashboard-react-page' of github.com:grafana/grafana into dashboard-react-page 2019-02-06 11:34:08 +01:00
Torkel Ödegaard
865d1567fc Added DashboardPage tests that tests view mode transition logic 2019-02-06 11:30:42 +01:00
Alexander Zobnin
4caea91164 azuremonitor: fix autocomplete menu height 2019-02-06 13:19:17 +03:00
Johannes Schill
c47c2528aa Revert "chore: Replace sizeMe with AutoSizer in DashboardGrid"
This reverts commit ae0b027d69.
2019-02-06 09:45:09 +01:00
Johannes Schill
9c64e3b4b9 Revert "chore: Remove react-sizeme"
This reverts commit 260b6f5de8.
2019-02-06 09:45:03 +01:00
Marcus Efraimsson
85ef2ca738 fix spelling 2019-02-06 09:43:45 +01:00
Torkel Ödegaard
1fbdd02464 wip: tests 2019-02-06 09:04:38 +01:00
Marcus Efraimsson
44275d9660 middleware fix 2019-02-06 08:45:01 +01:00
Marcus Efraimsson
d8658a765c enhanced expiration logic for lookup token
tokens are not expired if created_at > now - LoginMaxLifetimeDays and
rotated_at > now - LoginMaxInactiveLifetimeDays
2019-02-06 08:30:14 +01:00
Marcus Efraimsson
0be43948e2 changelog: add notes about closing #15265 2019-02-05 22:01:00 +01:00
Marcus Efraimsson
e87ff5a06d Merge pull request #15265 from larsjoergensen/cloudwatch/add-rds-aurora-serverlessdatabasecapacity-metrics
Added ServerlessDatabaseCapacity metric to list of AWS RDS metrics.
2019-02-05 21:56:11 +01:00
SamuelToh
4de9e3598b Address review comments 2019-02-06 06:41:39 +10:00
Marcus Efraimsson
9483506590 auth token clean up job now runs on schedule and deletes all expired tokens
delete tokens having created_at <= LoginMaxLifetimeDays or
rotated_at <= LoginMaxInactiveLifetimeDays
2019-02-05 21:20:11 +01:00
Marcus Efraimsson
871c84d195 changes needed for api/middleware due to configuration settings 2019-02-05 21:14:23 +01:00
Marcus Efraimsson
0915f931ae change configuration settings in auth package 2019-02-05 21:12:30 +01:00
Marcus Efraimsson
80d0943d9d document login, short-lived tokens and secure cookie configurations 2019-02-05 21:10:56 +01:00
Marcus Efraimsson
3c2fd02bc0 refactor login/auth token configuration settings
remove login section and reuse existing sections security and auth
2019-02-05 21:09:55 +01:00
Marcus Efraimsson
1d1b617cee remove unused code 2019-02-05 21:08:55 +01:00
Lars Jørgensen
749320002b Added ServerlessDatabaseCapacity metric to list of AWS RDS metrics. 2019-02-05 20:57:51 +01:00
Marcus Efraimsson
3e129dffa0 changelog: add notes about closing #8207 2019-02-05 19:40:46 +01:00
Torkel Ödegaard
4d2cff41ff Minor code simplification 2019-02-05 19:38:51 +01:00
Marcus Efraimsson
26df20082b Merge pull request #14803 from jeroenvollenbrock/8207-resource-arns
cloudwatch: Add resource_arns template query function
2019-02-05 19:34:59 +01:00
Torkel Ödegaard
2196b4f1c2 Delete template.html 2019-02-05 19:34:31 +01:00
jeroenvollenbrock
28aafcd789 cloudwatch: Add tests for resource_arn template query 2019-02-05 18:37:05 +01:00
jeroenvollenbrock
fa977ce090 cloudwatch: Add resource_arns template query function
Implements feature request #8207
2019-02-05 18:37:04 +01:00
jeroenvollenbrock
6fb76b7c9b update to aws-sdk-go v1.16.15 2019-02-05 18:37:04 +01:00
Torkel Ödegaard
fa32198831 Merge branch 'master' into dashboard-react-page 2019-02-05 17:56:04 +01:00
Torkel Ödegaard
80ccea3d85 Merge pull request #15254 from grafana/update-add-panel-flow
Update add panel flow
2019-02-05 17:51:49 +01:00
Torkel Ödegaard
096751b658 Updated add panel related flows 2019-02-05 17:15:21 +01:00
Dominik Prokop
6b1390b972 Update types and themes usage in components 2019-02-05 17:04:48 +01:00
Dominik Prokop
1bc007e29c Implemented theme context and renamed/moved theme related types 2019-02-05 16:53:19 +01:00
Torkel Ödegaard
a0bd022186 Merge pull request #15259 from grafana/hugoh/clicking-outside-timepicker-should-hide-it
Clicking outside TimePicker (Angular & React versions) should close it
2019-02-05 16:46:47 +01:00
Peter Holmberg
9d3d1bc669 refactor panel 2019-02-05 16:34:01 +01:00
Daniel Lee
c19baaffaa changelog: adds note for #15182 2019-02-05 16:17:22 +01:00
Daniel Lee
9959bbfdfb Merge pull request #15260 from grafana/15182-stackdriver-filter
Changes default interpolation for Stackdriver filter to be regex. Fixes #15182
2019-02-05 16:14:48 +01:00
Torkel Ödegaard
f5249d6033 Breaking init dashboard up in to fetch & init 2019-02-05 15:58:09 +01:00
Daniel Lee
1ecd70e2dd stackdriver: fixes #15182
For the filter expression, a better default is to
interpolate multi variables as a regex rather than
the default globbing pattern.

Also, uses the real TemplateSrv class rather than
stubbing it in the tests.
2019-02-05 15:42:59 +01:00
Hugo Häggmark
e42b670f5c Closing timepicker when clicking outside the picker 2019-02-05 15:41:00 +01:00
Hugo Häggmark
a344091d82 Optimized so we only do checks when dropdown is opened 2019-02-05 15:29:19 +01:00
Daniel Lee
0302c7afa7 stackdriver: add some more typings 2019-02-05 15:28:03 +01:00
Hugo Häggmark
e2ffaef88a Fixed so that we close angular TimePicker when user clicks outside the dropdown 2019-02-05 15:25:19 +01:00
Torkel Ödegaard
6dd1a8e688 Merge pull request #15256 from grafana/hugoh/bug-explore-cut-and-paste
Handle onPaste because of bug in this Slate version
2019-02-05 15:23:14 +01:00
Torkel Ödegaard
49a597fcd0 Moved remove panel logic to dashboard srv 2019-02-05 15:15:15 +01:00
Peter Holmberg
9fc87e4174 first working draft 2019-02-05 15:12:04 +01:00
Torkel Ödegaard
a624c9713a Removed unused controllers and services 2019-02-05 15:09:56 +01:00
Torkel Ödegaard
6d874dd1f1 Improved error handling 2019-02-05 14:42:29 +01:00
Johannes Schill
e103143634 fix: Update snapshot 2019-02-05 14:42:18 +01:00
Johannes Schill
f5431f5210 chore: Explore: Remove inner AutoSizer, spread the size-object to width/height, change height type to number 2019-02-05 14:42:18 +01:00
Johannes Schill
260b6f5de8 chore: Remove react-sizeme 2019-02-05 14:42:18 +01:00
Johannes Schill
d68df9d704 fix: Calculation issue with AutoSizer in explore 2019-02-05 14:42:18 +01:00
Johannes Schill
097396c517 chore: Replace withSize with AutoSizer in explore/Graph.tsx 2019-02-05 14:42:18 +01:00
Johannes Schill
ae0b027d69 chore: Replace sizeMe with AutoSizer in DashboardGrid 2019-02-05 14:42:18 +01:00
Torkel Ödegaard
da53103281 Prevent viewers from going into edit mode 2019-02-05 14:18:35 +01:00
Torkel Ödegaard
aa2bf07c71 Expand rows for panels in collapsed rows 2019-02-05 14:12:32 +01:00
Torkel Ödegaard
08925ffad8 Basic loading state for slow dashboards 2019-02-05 13:53:11 +01:00
Daniel Lee
310ee5674f Merge pull request #15252 from grafana/14940-update-checker-docs
docs: fixes #14940
2019-02-05 13:25:55 +01:00
Hugo Häggmark
9ba98b8703 Fixes #15223 by handling onPaste event because of bug in Slate 2019-02-05 13:13:52 +01:00
Torkel Ödegaard
bbc5dff7bd Fixed add panel should scroll to top 2019-02-05 12:56:03 +01:00
Peter Holmberg
2802569529 minor layout change, simple render test 2019-02-05 12:47:42 +01:00
Alexander Zobnin
181b4f9e80 azuremonitor: improve autocomplete experence 2019-02-05 14:39:24 +03:00
Daniel Lee
139fb65fa9 docs: fixes #14940 2019-02-05 12:36:12 +01:00
Torkel Ödegaard
fd1ef0a2be Added custom scrollbar and remember scroll pos to jump back to same scroll pos when going back to dashboard from edit mode 2019-02-05 12:10:42 +01:00
ijin08
0642c52693 created new color variables, changed primary to blue, changed success-btns to primary-btns. 2019-02-05 12:05:02 +01:00
Alexander Zobnin
4b5bfd3da5 azuremonitor: more autocomplete suggestions for built-in functions 2019-02-05 14:01:06 +03:00
Torkel Ödegaard
04f190c3e3 Updated playlist test 2019-02-05 11:11:17 +01:00
Torkel Ödegaard
6eb69d37de Merge pull request #15243 from ryantxu/better-stackdriver-logo
Better stackdriver logo (bigger + svg)
2019-02-05 10:22:40 +01:00
Torkel Ödegaard
44cef757e5 Merge branch 'hugoh/explore-refactor-initial-modified-queries' 2019-02-05 09:33:28 +01:00
Torkel Ödegaard
bfdfb215f3 added missing typing to explore props 2019-02-05 09:32:42 +01:00
Torkel Ödegaard
e4c92ae124 added comment to initDashboard 2019-02-05 09:24:30 +01:00
Torkel Ödegaard
3d5ca99d53 Merge branch 'dashboard-react-page' of github.com:grafana/grafana into dashboard-react-page 2019-02-05 09:24:14 +01:00
Torkel Ödegaard
28fc27c4ae Merge branch 'master' of github.com:grafana/grafana into dashboard-react-page 2019-02-05 09:23:58 +01:00
ryan
275800cca9 improve the stackdriver logo 2019-02-04 23:19:14 -08:00
ryan
693bb43452 Merge remote-tracking branch 'grafana/master'
* grafana/master: (54 commits)
  now /api/login/ping returns Response
  fix: Explore: Query wrapping on long queries #15222
  fix: Set ace editor min height to avoid problem with scrollbar overlapping ace content #15122
  fix: Data source picker in panel queries options should overlap content below, including ace scrollbar #15122
  fix util for splitting host and port
  changelog: add notes about closing #14231
  fixing logging action
  devenv: switching back using loki master plus various fixes
  Fix save provisioned dashboard modal
  Add AWS/Neptune to metricsMap and dimensionsMap
  did not add file, removing centerered
  Legend toggle should only trigger a re-render, not a refresh
  first stuff
  updated snapshot
  Adding pointer to colorpicker
  Minor post review changes
  More style tweaks to panel option group add button
  Made some style tweaks
  setting margin on label
  Make runQueries action independent from datasource loading
  ...
2019-02-04 23:06:03 -08:00
Hugo Häggmark
3b0a04c627 Fixed so onBlur event trigger an QueryChange and QueryExecute if values differ 2019-02-05 07:03:16 +01:00
Hugo Häggmark
2c255fd85a Renamed initialQueries to queries 2019-02-05 06:19:40 +01:00
SamuelToh
a7a964ec19 Added PATCH verb end point for annotation op
Added new PATCH verb annotation endpoint

Removed unwanted fmt

Added test cases for PATCH verb annotation endpoint

Fixed formatting issue

Check arr len before proceeding

Updated doc to include PATCH verb annotation endpt
2019-02-05 09:43:17 +10:00
Marcus Efraimsson
d53e64a32c move auth token middleware/hooks to middleware package
fix/adds auth token middleware tests
2019-02-05 00:21:05 +01:00
Marcus Efraimsson
7cd3cd6cd4 auth package refactoring
moving middleware/hooks away from package
exposing public struct UserToken accessible from other packages
fix debug log lines so the same order and naming are used
2019-02-05 00:10:56 +01:00
Torkel Ödegaard
d29e1278dc render after leaving fullscreen 2019-02-04 21:39:48 +01:00
Marcus Efraimsson
57457e2aa4 Merge pull request #15170 from bergquist/delete_session_on_logout
deletes auth token on signout
2019-02-04 21:37:58 +01:00
Peter Holmberg
e4dad78045 added flags to vizpicker from query param 2019-02-04 21:26:49 +01:00
Torkel Ödegaard
7d5becceb5 Merge pull request #15206 from grafana/storybook/valuemappingseditor
Adding ValueMappingsEditor to Storybook
2019-02-04 21:09:26 +01:00
Torkel Ödegaard
70974c01f2 Added playlist controls to new react DashNav 2019-02-04 21:08:30 +01:00
Marcus Efraimsson
fb3c510178 Merge branch 'master' into delete_session_on_logout 2019-02-04 20:23:05 +01:00
Torkel Ödegaard
3b1da3758d Merge pull request #15234 from grafana/15222-explore-query-wrapping
Explore: Fix issue with wrapping on long queries
2019-02-04 18:43:42 +01:00
Torkel Ödegaard
60d7d9c691 Merge pull request #15181 from marefr/fix_ping_unauthorized
auth: /api/login/ping fixes
2019-02-04 18:41:35 +01:00
Torkel Ödegaard
d978a66ef6 Fixed lots of loading flow issues and updated solo route page 2019-02-04 18:24:56 +01:00
Torkel Ödegaard
23ac9405c1 Set page title on dashboard load 2019-02-04 17:39:29 +01:00
Marcus Efraimsson
cfd8eb5167 now /api/login/ping returns Response 2019-02-04 17:37:07 +01:00
Torkel Ödegaard
3baaf2c3e4 Added handling of kiosk mode 2019-02-04 17:36:04 +01:00
Dominik Prokop
7626ce9922 WIP Enable js defined theme to be used in SASS 2019-02-04 17:28:57 +01:00
Johannes Schill
9ab5eeb7f3 fix: Explore: Query wrapping on long queries #15222 2019-02-04 17:26:20 +01:00
Alexander Zobnin
99ff8e68ff azuremonitor: fix where suggestions 2019-02-04 19:23:29 +03:00
Peter Holmberg
f6b46f7a34 prepping go to visualization 2019-02-04 17:18:46 +01:00
Alexander Zobnin
dd8ca70151 azuremonitor: use kusto editor for App Insights 2019-02-04 18:51:56 +03:00
Peter Holmberg
b9c58d88dc basic layout 2019-02-04 16:48:27 +01:00
Torkel Ödegaard
d4ecba5235 Merge pull request #15178 from marefr/loki_blocks_fixes
devenv: various fixes for Loki docker block
2019-02-04 16:26:33 +01:00
Torkel Ödegaard
3ceb436462 Merge pull request #15232 from grafana/15122-ace-editor-issues
Ace editor issues
2019-02-04 16:24:47 +01:00
Torkel Ödegaard
fdeea9144c fixed unit test 2019-02-04 15:50:47 +01:00
Torkel Ödegaard
7162583396 Made dashboard view state srv panel view state obsolete 2019-02-04 15:44:08 +01:00
Johannes Schill
648bec1807 fix: Set ace editor min height to avoid problem with scrollbar overlapping ace content #15122 2019-02-04 15:19:23 +01:00
Hugo Häggmark
f74ebdade6 Missed to save 2019-02-04 15:11:19 +01:00
Johannes Schill
bc21c9520f fix: Data source picker in panel queries options should overlap content below, including ace scrollbar #15122 2019-02-04 15:07:11 +01:00
Hugo Häggmark
a0c4837eb5 Merge with master 2019-02-04 15:06:01 +01:00
Torkel Ödegaard
f695975f65 Fixed handling of orgId 2019-02-04 15:02:35 +01:00
Torkel Ödegaard
7634e04231 Fixed template variable value changed handling 2019-02-04 14:45:13 +01:00
Hugo Häggmark
34dd1a22ab Fixed bug with removing a QueryRow thats not part of nextQueries 2019-02-04 14:16:15 +01:00
Torkel Ödegaard
b58a3c939c Merge pull request #15194 from grafana/explore/url
Explore - UI panels state persistance in url
2019-02-04 14:10:50 +01:00
Torkel Ödegaard
ae768193e3 Now handles all dashbord routes 2019-02-04 13:49:14 +01:00
Hugo Häggmark
96aef3bab8 Replaced intialQueris with queryKeys 2019-02-04 13:41:29 +01:00
Torkel Ödegaard
09708dfe20 Merge pull request #15226 from grafana/15189_fix
fix util for splitting host and port
2019-02-04 13:39:00 +01:00
Marcus Efraimsson
d433ca7d40 fix util for splitting host and port
Now you can provide both a default host and a default port
2019-02-04 13:10:32 +01:00
Alexander Zobnin
ad821cf629 azuremonitor: where clause autocomplete 2019-02-04 14:11:49 +03:00
Alexander Zobnin
df9ecc6816 azuremonitor: don't go back to dashboard if escape pressed in the editor 2019-02-04 14:11:49 +03:00
Alexander Zobnin
0c3657da7e azuremonitor: suggest tables initially 2019-02-04 14:11:49 +03:00
Alexander Zobnin
f2d2712a95 azuremonitor: add more builtin functions and operators 2019-02-04 14:11:49 +03:00
Hugo Häggmark
efa48390b7 Reverted redux-logger 2019-02-04 12:09:06 +01:00
Hugo Häggmark
5e2b9e40a2 Added more typings 2019-02-04 11:25:07 +01:00
Torkel Ödegaard
217468074f added submenu, made sure submenu visibility is always up to date 2019-02-04 11:19:45 +01:00
Marcus Efraimsson
eb8dfefb23 changelog: add notes about closing #14231 2019-02-04 11:16:11 +01:00
Marcus Efraimsson
7436723686 Merge pull request #15214 from tcpatterson/cloudwatch-neptune-metrics
Add support for AWS/Neptune in Cloudwatch
2019-02-04 11:12:49 +01:00
Hugo Häggmark
6b98b05976 Removed modifiedQueries from state 2019-02-04 11:07:32 +01:00
Peter Holmberg
c61e905434 fixing logging action 2019-02-04 10:22:45 +01:00
Torkel Ödegaard
c15ab1b2bc Merge pull request #15219 from grafana/fix-provisioned-modal
Fix save provisioned dashboard modal
2019-02-04 10:18:22 +01:00
Marcus Efraimsson
fdd5ac1895 devenv: switching back using loki master plus various fixes 2019-02-04 09:55:23 +01:00
Torkel Ödegaard
f5084045f2 Fix save provisioned dashboard modal 2019-02-04 09:32:39 +01:00
Hugo Häggmark
d9578bc485 Merge with master 2019-02-04 08:17:18 +01:00
Hugo Häggmark
1f5bb76718 Refactor of action, actionTypes and reducer 2019-02-04 07:50:17 +01:00
Hugo Häggmark
2d0fd96621 More types and some refactoring 2019-02-04 07:50:17 +01:00
Hugo Häggmark
acea1d7f00 Alignment of interfaces and components 2019-02-04 07:50:17 +01:00
Hugo Häggmark
43f8098981 Removed the on every key change event 2019-02-04 07:48:25 +01:00
Connor Patterson
48c8ff8899 Add AWS/Neptune to metricsMap and dimensionsMap 2019-02-03 16:29:35 -05:00
Torkel Ödegaard
883f7a164b added time picker 2019-02-03 21:06:07 +01:00
Torkel Ödegaard
0324de37d2 refactorings and cleanup 2019-02-03 20:38:13 +01:00
Paresh
1f3fafb198 mssql: pass timerange for template variable queries 2019-02-03 13:07:33 -06:00
Torkel Ödegaard
d7151e5c88 improving dash nav react comp 2019-02-03 18:25:13 +01:00
Torkel Ödegaard
4a8effddf5 fixed panel removal 2019-02-03 17:15:23 +01:00
Torkel Ödegaard
09efa24f28 Added more buttons in dashboard nav 2019-02-03 15:29:14 +01:00
Torkel Ödegaard
2cb1733c59 wip: progress 2019-02-03 14:53:42 +01:00
Torkel Ödegaard
cba2ca5531 Url state -> dashboard model state sync starting to work 2019-02-03 12:29:47 +01:00
Torkel Ödegaard
8dec74689d Dashboard settings starting to work 2019-02-03 10:55:58 +01:00
Torkel Ödegaard
83937f59c0 wip: dashboard in react starting to work 2019-02-02 23:01:48 +01:00
Torkel Ödegaard
d86e773c75 wip: minor progress 2019-02-02 22:43:19 +01:00
Torkel Ödegaard
60f700a1d2 wip: dashboard react 2019-02-02 19:23:19 +01:00
Sean Lafferty
fa22311a95 base64 encode encrypted oauth token fields 2019-02-02 09:03:04 -05:00
Athurg Feng
70b23ab73b Add string quote func 2019-02-02 13:36:10 +08:00
Athurg Feng
bba92c0746 Remove option used to control within browser 2019-02-02 13:35:17 +08:00
Sean Lafferty
4a7cf82f5f Remove length from text columns 2019-02-01 19:45:27 -05:00
Sean Lafferty
5a59cdf0ef Add oauth pass-thru option for datasources 2019-02-01 19:40:57 -05:00
Peter Holmberg
9ac960a803 did not add file, removing centerered 2019-02-02 00:48:13 +01:00
Peter Holmberg
a4d35e2fbc Merge branch 'master' into storybook/valuemappingseditor 2019-02-02 00:31:48 +01:00
Torkel Ödegaard
9e33f8b7c4 Merge pull request #15203 from jsferrei/optimize_legend
Legend toggle should only trigger a re-render, not a refresh
2019-02-01 20:57:29 +01:00
Jon Ferreira
e2c958eb43 Legend toggle should only trigger a re-render, not a refresh 2019-02-01 14:16:27 -05:00
Torkel Ödegaard
cab6a872cf Merge pull request #15200 from grafana/fix/add-pointer-to-color-picker
Add pointer cursor to colorpicker
2019-02-01 16:05:33 +01:00
Peter Holmberg
bd6fed54de first stuff 2019-02-01 15:45:47 +01:00
Torkel Ödegaard
35693d3b23 Merge pull request #15199 from grafana/fix/label-margin-datasource-list
setting margin on label in datasourcelist
2019-02-01 15:43:28 +01:00
Torkel Ödegaard
16f30664f5 Merge branch 'collapseable-panel-option-groups' 2019-02-01 15:39:47 +01:00
Torkel Ödegaard
59dfe794f5 updated snapshot 2019-02-01 15:39:20 +01:00
Torkel Ödegaard
3a5f03c772 Merge pull request #15191 from bergquist/samesite_for_cookies
introduce samesite setting for login cookie
2019-02-01 15:37:43 +01:00
Torkel Ödegaard
3f1fd6c6f2 Merge pull request #15193 from w4tsn/patch-1
Clearify the Run from master instructions
2019-02-01 15:37:04 +01:00
Torkel Ödegaard
116e70740c Merge pull request #15012 from grafana/loki-query-editor
WIP: Loki query editor for dashboard panels
2019-02-01 15:33:23 +01:00
Peter Holmberg
7d958080c1 Adding pointer to colorpicker 2019-02-01 15:31:42 +01:00
Dominik Prokop
1a0b21b8d1 Minor post review changes 2019-02-01 15:27:02 +01:00
Torkel Ödegaard
24ccfb9ccc More style tweaks to panel option group add button 2019-02-01 15:23:32 +01:00
Torkel Ödegaard
3be1deea44 Made some style tweaks 2019-02-01 15:19:18 +01:00
Peter Holmberg
4b03e7c31f setting margin on label 2019-02-01 15:03:19 +01:00
Dominik Prokop
3c358e406e Make runQueries action independent from datasource loading 2019-02-01 14:56:54 +01:00
Peter Holmberg
609129c039 fixing test 2019-02-01 14:23:03 +01:00
Peter Holmberg
025d37e9a2 add button in header 2019-02-01 14:19:53 +01:00
Torkel Ödegaard
d1d5bbf697 Merge pull request #15188 from grafana/fix/table-data-to-component
React panel table data fix
2019-02-01 13:57:26 +01:00
Torkel Ödegaard
2a4b10a5c8 minor fix 2019-02-01 13:40:46 +01:00
Torkel Ödegaard
740e1a0540 Made really good progress on loki support in dashboards 2019-02-01 13:30:15 +01:00
Dominik Prokop
2ddccb4a21 Temporarily run queries independently from UI state of explore panels 2019-02-01 12:57:09 +01:00
corpglory-dev
6d03766ace Remove extra newline 2019-02-01 14:54:38 +03:00
Alexander Wellbrock
ab1ae1b2a7 Clearify the Run from master instructions
Especially for new developers to the go and yarn ecosystems this readme part is quite confusing.
2019-02-01 12:51:40 +01:00
corpglory-dev
9a3f4def98 Use slate-plugins from app/features/explore 2019-02-01 14:49:04 +03:00
corpglory-dev
bdd59de877 Remove newline && runner plugins 2019-02-01 14:47:33 +03:00
corpglory-dev
cf60ae79c3 Move prism to app/features/explore 2019-02-01 14:47:17 +03:00
Dominik Prokop
6ab9355146 Restoring explore panels state from URL 2019-02-01 12:33:15 +01:00
corpglory-dev
ce2209585c Remove version.ts 2019-02-01 14:32:40 +03:00
bergquist
a6bd2c73a0 introduce samesite setting for login cookie
ref #15067
2019-02-01 11:47:21 +01:00
Torkel Ödegaard
6e0b873739 Merge branch 'master' into loki-query-editor 2019-02-01 11:17:22 +01:00
Peter Holmberg
57596462a4 sending paneldata to component, gauge can handle table data 2019-02-01 10:53:58 +01:00
bergquist
a1b3986532 always delete session cookie even if db delete fails 2019-02-01 09:59:53 +01:00
Torkel Ödegaard
68ae17e4a4 Merge pull request #15155 from grafana/solo-panel-rewrite
New react container route for solo panels
2019-02-01 09:55:00 +01:00
Torkel Ödegaard
3d78cb4f8c Merge pull request #15158 from grafana/hugoh/redux-poc
WIP: Reducing boilerplate code for Redux
2019-02-01 09:41:40 +01:00
Torkel Ödegaard
82f0388af6 Merge pull request #15183 from grafana/dashboard-row-fixes
Fixed dashboard row title not updating when variable changed
2019-02-01 08:19:15 +01:00
Torkel Ödegaard
aeaac7480b New solo panel route working in all scenarios I can test 2019-02-01 08:15:21 +01:00
Torkel Ödegaard
c4f55fecbe Merge branch 'master' into solo-panel-rewrite 2019-02-01 07:09:45 +01:00
Hugo Häggmark
efec897fd4 Removed unused factory and fixed index based mapper lookup 2019-02-01 06:52:25 +01:00
Torkel Ödegaard
ac0140d596 Fixed dashboard row title not updating when variable changed, fixes #15133 2019-02-01 06:38:59 +01:00
Torkel Ödegaard
e54689a964 Removed comment from panel editor 2019-02-01 06:20:54 +01:00
Marcus Efraimsson
bd83078025 signout user if /api/login/ping returns 401 unauthorized 2019-02-01 01:22:56 +01:00
Marcus Efraimsson
dd5a8275f1 must return json response from /api/login/ping
Even though http error 401 was returned, the result was still a http 200
2019-02-01 01:21:23 +01:00
bergquist
91bd908e03 adds more tests signing out session 2019-01-31 22:24:04 +01:00
ryan
5739ad3cfc Merge remote-tracking branch 'grafana/master'
* grafana/master: (835 commits)
  changes some info logging to debug
  add missing ngInject annotation
  typing data
  changelog: adds note about closing #10780
  Do not render time region line or fill if colors not provided
  Fixed row options html template location, fixes #15157
  creating table data type
  build: enterprise release co project.
  Moved dashboard state components to state folder
  Moved time_srv to services folder, this should not belong to dashboard feature but it is too dependant on dashboard to move it out now, needs a bigger refactoring to isolate from dashboard
  Moved a few things around
  Updated what's new article
  Update CHANGELOG.md
  Update CHANGELOG.md
  Replace usages of kbn.valueFormats with ui/getValueFormat
  Fix anchor
  Added download links to docs
  Updated docs
  Updated version again
  Updated version and made some changes to changelog and what's new article
  ...
2019-01-31 12:56:07 -08:00
bergquist
11c4967bdc changes some info logging to debug 2019-01-31 21:51:14 +01:00
Dominik Prokop
f9bab9585a wip 2019-01-31 19:38:49 +01:00
Marcus Efraimsson
0442a86400 tailing grafana logs and temporaily using an older build 2019-01-31 19:22:25 +01:00
Torkel Ödegaard
1e0de188b0 Merge pull request #15172 from grafana/15171_fix
add missing ngInject annotation
2019-01-31 18:38:05 +01:00
Marcus Efraimsson
c7b5fca885 add missing ngInject annotation 2019-01-31 16:45:32 +01:00
bergquist
88ca54eba9 renames signout function 2019-01-31 16:26:36 +01:00
bergquist
43ac79685a delete auth token on signout 2019-01-31 16:13:35 +01:00
Torkel Ödegaard
59dc91ada3 Merge pull request #15163 from grafana/table-data-support
Table data support
2019-01-31 14:45:03 +01:00
Peter Holmberg
ed0f5b71c7 Merge branch 'master' into table-data-support 2019-01-31 14:16:06 +01:00
Peter Holmberg
7def403018 typing data 2019-01-31 13:59:25 +01:00
bergquist
53331772ef changelog: adds note about closing #10780 2019-01-31 13:43:04 +01:00
Torkel Ödegaard
06a9c7bacc Merge pull request #15160 from grafana/fix/time-region-missing-colors
Do not render time region line or fill if colors not provided
2019-01-31 13:23:12 +01:00
Dominik Prokop
a2cba6685c Do not render time region line or fill if colors not provided 2019-01-31 12:20:55 +01:00
Torkel Ödegaard
6c1f8a9cfe Merge pull request #15159 from grafana/row-options-fix
Fixed row options html template location,
2019-01-31 12:13:35 +01:00
Torkel Ödegaard
a43c00ce70 Fixed row options html template location, fixes #15157 2019-01-31 11:37:34 +01:00
Carl Bergquist
e2c2b70a61 Merge pull request #14852 from jpenalbae/pushover-attach
pushover: add support for attaching images (closes #10780)
2019-01-31 11:18:08 +01:00
Peter Holmberg
88cb38adde creating table data type 2019-01-31 09:59:21 +01:00
Torkel Ödegaard
6a4777eafc wip: New react container route for solo panels that supports both angular and react panels 2019-01-31 09:44:37 +01:00
Torkel Ödegaard
7e1b6f59fe Merge pull request #15149 from grafana/dashboard-refactorings
Dashboard organization refactorings (file names / locations)
2019-01-31 09:43:26 +01:00
Leonard Gram
ddfccec2ea build: enterprise release co project. 2019-01-31 09:42:50 +01:00
Hugo Häggmark
7e64ee8225 Fixed another type of fluent reducerFactory 2019-01-31 09:18:40 +01:00
Torkel Ödegaard
aafd4a339a Moved dashboard state components to state folder 2019-01-31 08:56:17 +01:00
Torkel Ödegaard
6663b2fab9 Moved time_srv to services folder, this should not belong to dashboard feature but it is too dependant on dashboard to move it out now, needs a bigger refactoring to isolate from dashboard 2019-01-31 08:44:46 +01:00
Torkel Ödegaard
474185c977 Moved a few things around 2019-01-31 08:37:15 +01:00
Hugo Häggmark
99b500c740 Removed then clauses, no need to test the test within the test 2019-01-31 07:48:33 +01:00
Torkel Ödegaard
ab812e73f6 Updated what's new article 2019-01-31 07:47:55 +01:00
Hugo Häggmark
6a84a85a80 Added reducerTester, reducer tests and tests 2019-01-31 07:37:36 +01:00
Torkel Ödegaard
08cfa5e32a Update CHANGELOG.md 2019-01-31 07:31:12 +01:00
Torkel Ödegaard
ca7afc10a9 Update CHANGELOG.md 2019-01-31 07:30:45 +01:00
Torkel Ödegaard
bcae94f8ca Merge pull request #15135 from grafana/tooling/stortybook-from-root
Add storybook script to run it from root dir
2019-01-31 07:25:52 +01:00
Torkel Ödegaard
36a2b9c015 Merge pull request #15136 from grafana/react-snapshots
React snapshots
2019-01-31 07:24:25 +01:00
Torkel Ödegaard
f643e2abe6 Merge pull request #15144 from Rohlik/patch-1
Fix anchor
2019-01-31 07:23:13 +01:00
Torkel Ödegaard
17ef221c68 Merge pull request #15146 from atjeff/remove-kbn-value-formats
Replace usages of kbn.valueFormats with ui/getValueFormat
2019-01-31 07:22:41 +01:00
Hugo Häggmark
2f47b225a0 Removed ActionTypes and fixed a noPayloadActionCreatorFactory 2019-01-31 06:38:40 +01:00
Jeff Hage
f13018ce05 Replace usages of kbn.valueFormats with ui/getValueFormat 2019-01-30 18:57:33 -05:00
Hugo Häggmark
d3815beb1c Refactored Datasources as POC 2019-01-30 20:07:14 +01:00
Thomas Rohlik
e83831904a Fix anchor 2019-01-30 18:52:40 +01:00
Torkel Ödegaard
e3472f6d81 Added download links to docs 2019-01-30 17:53:41 +01:00
Torkel Ödegaard
b8427ba379 Updated docs 2019-01-30 17:28:43 +01:00
Torkel Ödegaard
6fd60c639f Updated version again 2019-01-30 17:20:43 +01:00
Torkel Ödegaard
d7f81c4795 Updated version and made some changes to changelog and what's new article 2019-01-30 17:14:42 +01:00
Torkel Ödegaard
3ad48ff7e5 docs: Added version notice for time range variables 2019-01-30 16:54:09 +01:00
Torkel Ödegaard
b32c3a9d84 Merge branch 'whatsnew-6-0' 2019-01-30 16:52:22 +01:00
Torkel Ödegaard
70c35d646f Added loki video 2019-01-30 16:51:59 +01:00
Torkel Ödegaard
26096c65a5 spell fixes 2019-01-30 16:15:56 +01:00
Torkel Ödegaard
bd688449f8 Merge pull request #15119 from grafana/explore/queries-import-changes
Fix queries being imported incorrectly on datasource change
2019-01-30 16:11:36 +01:00
Torkel Ödegaard
c33e94f438 Merge pull request #15141 from grafana/14946-panel-menu-on-move
Don't show panel menu on move
2019-01-30 16:11:10 +01:00
Johannes Schill
3165305377 chore: Add typings for react-grid-layout and react-virtualized 2019-01-30 15:44:34 +01:00
Johannes Schill
1afc590c70 fix: Don't open panel menu when dragging (react-)panel in dashboard #14946 2019-01-30 15:38:59 +01:00
Johannes Schill
ef4611eb56 chore: Add missing typings in PanelResizer 2019-01-30 15:32:29 +01:00
Johannes Schill
1230f3e48d chore: Fix typings and remove bindings for arrow functions in DashboardGrid 2019-01-30 15:28:41 +01:00
Torkel Ödegaard
8aed401640 Updated explore section again 2019-01-30 14:47:23 +01:00
Torkel Ödegaard
5fa8c53d2e Updated explore section 2019-01-30 14:44:35 +01:00
Torkel Ödegaard
2ca34376a0 fixe merge issue 2019-01-30 14:33:49 +01:00
Torkel Ödegaard
5b67ebde0c Merge branch 'whatsnew-6-0' of github.com:grafana/grafana into whatsnew-6-0 2019-01-30 14:23:40 +01:00
Torkel Ödegaard
909acb08ef updated what's new article 2019-01-30 14:17:34 +01:00
Peter Holmberg
4b47e857f2 adjusting types to match 2019-01-30 13:43:17 +01:00
Dominik Prokop
d784accdec Add storybook script to run it from root dir 2019-01-30 12:54:24 +01:00
Hugo Häggmark
2236a1a36d Minor change to Action interfaces 2019-01-30 12:03:30 +01:00
Hugo Häggmark
94ce065f74 Simplified inteface for reducerFactory 2019-01-30 11:59:00 +01:00
Hugo Häggmark
65fb77ce73 Fixed a small bug and added case sensitivity 2019-01-30 11:28:23 +01:00
Torkel Ödegaard
67756c43a7 Merge pull request #15118 from grafana/1909/from-to-template-variables
Time range from & to as template variables
2019-01-30 11:17:22 +01:00
Daniel Lee
3bb5930c54 docs: whats new tweaks 2019-01-30 11:16:26 +01:00
Torkel Ödegaard
7dc3303e05 Merge branch 'whatsnew-6-0' of github.com:grafana/grafana into whatsnew-6-0 2019-01-30 11:14:51 +01:00
Hugo Häggmark
0ddaa95d0e Added reducerFactory and tests 2019-01-30 11:13:36 +01:00
Torkel Ödegaard
ce617bc02e Minor updates to text and image placements 2019-01-30 11:12:07 +01:00
Daniel Lee
0b971d48c2 docs: add video link to what's new 2019-01-30 11:11:27 +01:00
bergquist
445b427fb6 whats new: note about session storage 2019-01-30 10:52:42 +01:00
Peter Holmberg
ae0b9692be first implementation 2019-01-30 10:39:42 +01:00
Hugo Häggmark
62341ffe56 Added actionCreatorFactory and tests 2019-01-30 10:31:38 +01:00
bergquist
dfd87c3b93 whats new: provisioning for alert notifiers 2019-01-30 09:54:08 +01:00
Dominik Prokop
661de1efe1 Rename SetInitialQueries action to QueriesImported 2019-01-30 09:50:28 +01:00
Dominik Prokop
d746df485c Add missing code 2019-01-30 09:36:23 +01:00
Dominik Prokop
ca0d2996f2 Merge branch 'master' into explore/queries-import-changes 2019-01-30 09:30:10 +01:00
Daniel Lee
a21f6777c1 changelog: adds note for #15129 2019-01-30 00:50:07 +01:00
Daniel Lee
782c4eae98 Merge pull request #15127 from challengerdeep/fix-stackdriver-aggparams-reducer
Change primaryAggregation to crossSeriesReducer in Stackdriver
2019-01-30 00:45:22 +01:00
Daniel Lee
368494bb16 docs: update to what's new 2019-01-30 00:25:32 +01:00
Daniel Lee
13579b76d9 docs: wip - what's new for 6.0 2019-01-29 23:51:16 +01:00
Torkel Ödegaard
0c4f59a7f1 Minor style fix to button group 2019-01-29 21:30:31 +01:00
Torkel Ödegaard
9a598be4f7 Fixed failing unit test 2019-01-29 21:17:56 +01:00
Torkel Ödegaard
416562bd90 Merge pull request #15102 from mjtrangoni/fix-golint-issues
Fix golint issues
2019-01-29 21:12:34 +01:00
Torkel Ödegaard
77bb3ddf62 Added basic docs 2019-01-29 20:53:49 +01:00
Torkel Ödegaard
8b68ba5cbb Minor refactoring and adding some typing 2019-01-29 20:49:54 +01:00
Marcus Efraimsson
6756931bcd changelog: add notes about closing #14709 2019-01-29 20:33:34 +01:00
Torkel Ödegaard
4c689fce96 Merge pull request #15121 from grafana/davkal/15011-fix-query-change-twice
Explore: query field should not propagate non-text change
2019-01-29 20:29:47 +01:00
Torkel Ödegaard
a747023b28 Merge pull request #15128 from grafana/sqlite-fix
fixed sqlite issue introduced by #14709
2019-01-29 20:28:35 +01:00
Torkel Ödegaard
a2dd6f378f fixed sqlite issue introduced by #14709 2019-01-29 20:27:01 +01:00
Marcus Efraimsson
a067862a0a Merge pull request #14709 from tpetr/extra-connection-string-args
add support for defining additonal database connection string args
2019-01-29 20:13:17 +01:00
Torkel Ödegaard
ff8db0a530 Merge pull request #15120 from grafana/panel-option-styles
Tweaked panel option group styles
2019-01-29 20:06:03 +01:00
Torkel Ödegaard
e5eb66a27c Merge pull request #15123 from grafana/fix/remove-alpha-from-gauge
Remove alpha from Gauge panel
2019-01-29 20:05:42 +01:00
Torkel Ödegaard
af6a7b1f55 Merge pull request #15125 from grafana/15108-page-title-update
Update <title> when navModel is changed
2019-01-29 20:05:19 +01:00
Robert Edström
9b6746d808 Change primaryAggregation to crossSeriesReducer in Stackdriver 2019-01-29 19:11:54 +01:00
Marcus Efraimsson
920f51f2db update changelog 2019-01-29 18:20:25 +01:00
Marcus Efraimsson
51451d10a3 changelog: add notes about closing #12764 2019-01-29 18:15:45 +01:00
Johannes Schill
7d8607c1b3 fix: Remove legacy title-prop and update document.title when navModel is changed #15108 2019-01-29 17:03:40 +01:00
Daniel Lee
365de9de20 Merge pull request #14626 from grafana/azure-monitor
Azure Monitor: move files into grafana
2019-01-29 16:11:17 +01:00
David Kaltschmidt
8d44ed8d8f Explore: query field should not propagate non-text change
- after mounting with an initial value, the onChange of a query field is triggered
- even though the slate documents are not the same, their text values are identical, hence the change propagation is useless
- added check to propagate text change only when text has actually changed
2019-01-29 15:53:51 +01:00
Dominik Prokop
9ddbfed730 Wait for queries to be imported before proceeding with datasource change 2019-01-29 15:52:36 +01:00
Peter Holmberg
6164427efd removing alpha 2019-01-29 15:46:55 +01:00
Dominik Prokop
8ea72eeaf7 Remove commented code 2019-01-29 15:40:01 +01:00
Torkel Ödegaard
0ac0588583 Merge pull request #15107 from grafana/explore-query-styles
Updated Explore query styles to align them to other query editors
2019-01-29 15:38:06 +01:00
Torkel Ödegaard
f28d38ceef Merge pull request #15117 from grafana/explore-time-range-fix
Fixed issue with explore changeTime redux action not being hooked up
2019-01-29 15:37:41 +01:00
Torkel Ödegaard
7196f7b093 Tweaked panel option group styles 2019-01-29 15:37:22 +01:00
Daniel Lee
a3e09d8bbc azuremonitor: fixes merge conflict in yarn.lock 2019-01-29 15:35:43 +01:00
Dominik Prokop
010f902003 Import queries before datasource is changed 2019-01-29 15:34:28 +01:00
Torkel Ödegaard
a803435b27 fixed prettier on switch component 2019-01-29 15:16:04 +01:00
Torkel Ödegaard
e1dad8488b Merge pull request #15109 from grafana/fix/explore-switches
Propagate event to onChange prop in Switch component
2019-01-29 15:15:23 +01:00
Torkel Ödegaard
f7a1e4c185 Merge pull request #15106 from grafana/tooltip-restyling
Tooltip restyling
2019-01-29 15:07:54 +01:00
Peter Holmberg
78cb3239b8 adding from and to built in variables 2019-01-29 15:05:28 +01:00
Daniel Lee
2d3e02d58b azuremonitor: adds macros to slate intellisense
and adds tab as well as enter key for autocomplete
2019-01-29 15:02:46 +01:00
Torkel Ödegaard
ab322bebf0 Merge pull request #15110 from grafana/15053/gauge-value-font-size
Automatically scale font size on Gauge value
2019-01-29 15:01:03 +01:00
Torkel Ödegaard
d53a430c82 Fixed issue with explore changeTime redux action not being hooked up, fixes #15115 2019-01-29 14:58:57 +01:00
Torkel Ödegaard
0216f087b7 Merge pull request #15113 from grafana/fix/explore-set-state-on-unmounted
Fix setState on unmounted component in Loki and Prometheus QueryField
2019-01-29 14:42:35 +01:00
Torkel Ödegaard
8b70a8dd50 Fixed explore query editor styling issues 2019-01-29 14:36:09 +01:00
Alexander Zobnin
a1609a8d53 azuremonitor: remove wrong completions 2019-01-29 16:03:30 +03:00
Alexander Zobnin
a0cae98e0d azuremonitor: autocomplete on enter 2019-01-29 16:02:25 +03:00
Torkel Ödegaard
71d0fae3a9 Progress on tooltip style update 2019-01-29 13:42:29 +01:00
Alexander Zobnin
2a1558cefc azuremonitor: fix tests 2019-01-29 15:39:16 +03:00
Daniel Lee
cab1e9445b Merge pull request #15112 from grafana/loki-docker-block
docker: block for loki
2019-01-29 13:32:02 +01:00
Marcus Efraimsson
60967de2b4 devenv: loki provisioned datasource 2019-01-29 13:03:49 +01:00
Alexander Zobnin
cbcf557a34 azuremonitor: revert "memory for webpack build" 2019-01-29 14:33:58 +03:00
Alexander Zobnin
15d42ba414 Merge remote-tracking branch 'upstream/azure-monitor' into azure-monitor 2019-01-29 14:29:31 +03:00
Alexander Zobnin
fefb2c2ba2 Azure Monitor: replace monaco by slate with initial Kusto syntax 2019-01-29 14:19:31 +03:00
Daniel Lee
62a04d8ef5 docker: block for loki 2019-01-29 12:14:26 +01:00
Dominik Prokop
27948b1308 Make language provider cancelable in Loki and Prometheus QueryField, to avoid setting state on unmounted component 2019-01-29 12:11:48 +01:00
Dominik Prokop
db17262ea4 Add util for handling promise cancelation to avoid setting state on unmounted components
https://github.com/facebook/react/issues/5465
2019-01-29 12:10:03 +01:00
Daniel Lee
4a057ef725 stackdriver: remove beta notice from config page 2019-01-29 12:00:52 +01:00
Peter Holmberg
b0984cd503 Merge branch 'master' into 15053/gauge-value-font-size 2019-01-29 11:20:16 +01:00
Torkel Ödegaard
0e2310de8e Merge branch 'master' into tooltip-restyling 2019-01-29 11:02:40 +01:00
Peter Holmberg
462bdb6d13 increasing font size on longer strings 2019-01-29 11:01:35 +01:00
Peter Holmberg
4b0df606d5 magic number solution 2019-01-29 10:35:42 +01:00
Dominik Prokop
628c5c1da6 Propagate event to onChange prop in Switch component 2019-01-29 09:53:45 +01:00
Torkel Ödegaard
433c88a616 two minor bug fixes introduced in recent refactorings 2019-01-29 09:47:41 +01:00
Torkel Ödegaard
0de861a3a8 Minor progress on react query editor support, solving updating query persisted state 2019-01-29 09:39:23 +01:00
ijin08
fe51e85050 did some styling changes 2019-01-29 08:47:28 +01:00
Torkel Ödegaard
57fe7d5050 Merge pull request #15103 from grafana/14762-page-component-everywhere
Page component on all React pages pt2
2019-01-29 08:15:46 +01:00
Torkel Ödegaard
6dad4cce07 Updated Explore query styles to align them to other query editor to make them fit in better 2019-01-29 08:14:07 +01:00
Torkel Ödegaard
e4244d8bf8 Merge branch 'master' into loki-query-editor 2019-01-29 07:10:06 +01:00
Torkel Ödegaard
459a93da10 Merge pull request #15100 from grafana/annotation-dashboard-switch-fix
Fix for annotations not clearing when switching dashboards
2019-01-29 06:53:20 +01:00
Johannes Schill
186ed1a333 chore: Fix typings and add Page-component to FolderPermissions #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
ab62a09fe6 chore: Fix typings and add Page-component to ServerStats #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
d54c4173ca chore: Fix typings and add Page-component to AlertRuleList #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
e448a140f5 chore: Fix typings and add Page-component to DataSourceDashboards #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
acbcca1102 fix: Add plugins to StoreState interface 2019-01-28 23:19:19 +01:00
Johannes Schill
7df00747d3 chore: Fix typings and add Page-component to NewDataSourcePage #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
98fa17f0e4 chore: Fix typings and add Page-component to DataSourceSettingsPage #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
3372dc9441 chore: Fix typings and add Page-component to FolderSettingsPage #14762 2019-01-28 23:19:19 +01:00
Johannes Schill
d9a25ee505 test: Updated snapshot 2019-01-28 23:19:18 +01:00
Johannes Schill
730036e18d chore: Fix typings and add Page-component to TeamPages #14762 2019-01-28 23:19:18 +01:00
Johannes Schill
03cebecac3 fix: Add pageName default to avoid "Loading undefined..." 2019-01-28 23:19:18 +01:00
bergquist
c1d778c704 changelog: adds note about closing #10487 2019-01-28 22:56:24 +01:00
Carl Bergquist
c6f80ecec2 Merge pull request #14229 from pbakulev/configurable-alert-notification
Configurable alert notification
2019-01-28 22:47:12 +01:00
Mario Trangoni
b7628f2060 pkg/util/{filepath.go,shortid_generator.go}: Fix golint issues
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=golint  ./...
filepath.go:12:5⚠️ error var WalkSkipDir should have name of the form ErrFoo (golint)
shortid_generator.go:11:5⚠️ var validUidPattern should be validUIDPattern (golint)
shortid_generator.go:19:6⚠️ func IsValidShortUid should be IsValidShortUID (golint)
shortid_generator.go:24:6⚠️ func GenerateShortUid should be GenerateShortUID (golint)
2019-01-28 22:37:44 +01:00
Mario Trangoni
8261613b51 pkg/util/{ip.go,url.go}: Fix some golint issues
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=golint  ./...
ip.go:8:6⚠️ func SplitIpPort should be SplitIPPort (golint)
url.go:14:6⚠️ func NewUrlQueryReader should be NewURLQueryReader (golint)
url.go:9:6⚠️ type UrlQueryReader should be URLQueryReader (golint)
url.go:37:6⚠️ func JoinUrlFragments should be JoinURLFragments (golint)
2019-01-28 22:29:20 +01:00
Mario Trangoni
5f6383a750 pkg/util/*: Add missing function comments.
See,

$ gometalinter --vendor --deadline 10m --disable-all --enable=golint  ./...
encoding.go:15:1⚠️ comment on exported function GetRandomString should be of the form "GetRandomString ..." (golint)
encoding.go:30:1⚠️ exported function EncodePassword should have comment or be unexported (golint)
encoding.go:35:1⚠️ comment on exported function EncodeMd5 should be of the form "EncodeMd5 ..." (golint)
encoding.go:42:1⚠️ comment on exported function PBKDF2 should be of the form "PBKDF2 ..." (golint)
encoding.go:80:1⚠️ exported function GetBasicAuthHeader should have comment or be unexported (golint)
encoding.go:85:1⚠️ exported function DecodeBasicAuthHeader should have comment or be unexported (golint)
encoding.go:105:1⚠️ exported function RandomHex should have comment or be unexported (golint)
encryption.go:14:1⚠️ exported function Decrypt should have comment or be unexported (golint)
encryption.go:39:1⚠️ exported function Encrypt should have comment or be unexported (golint)
ip.go:7:1⚠️ exported function SplitIpPort should have comment or be unexported (golint)
json.go:3:6⚠️ exported type DynMap should have comment or be unexported (golint)
md5.go:22:1⚠️ comment on exported function Md5SumString should be of the form "Md5SumString ..." (golint)
strings.go:10:1⚠️ exported function StringsFallback2 should have comment or be unexported (golint)
strings.go:14:1⚠️ exported function StringsFallback3 should have comment or be unexported (golint)
strings.go:27:1⚠️ exported function SplitString should have comment or be unexported (golint)
strings.go:35:1⚠️ exported function GetAgeString should have comment or be unexported (golint)
url.go:8:6⚠️ exported type UrlQueryReader should have comment or be unexported (golint)
url.go:12:1⚠️ exported function NewUrlQueryReader should have comment or be unexported (golint)
url.go:23:1⚠️ exported method UrlQueryReader.Get should have comment or be unexported (golint)
url.go:32:1⚠️ exported function JoinUrlFragments should have comment or be unexported (golint)
validation.go:16:1⚠️ exported function IsEmail should have comment or be unexported (golint)
2019-01-28 22:09:40 +01:00
bergquist
e218cc7637 docs: updates docs to refer to using uid 2019-01-28 22:03:16 +01:00
Daniel Lee
e813a6d522 azuremonitor: increase memory for webpack build
The gigantic monaco dependency needs more memory so
it fails on CircleCI with the default memory allocation
of 2GB for a worker.
2019-01-28 21:34:20 +01:00
bergquist
7c93335d28 gofmt issue 2019-01-28 21:04:08 +01:00
Torkel Ödegaard
daab7a5f6e Merge pull request #15099 from grafana/tooling/storybook-poc
Named colors & storybook
2019-01-28 20:47:46 +01:00
bergquist
809019d4ee moves test files into testdata folder 2019-01-28 20:44:10 +01:00
bergquist
8f0e65a150 renames alert_notifications -> notifiers 2019-01-28 20:39:09 +01:00
Marcus Efraimsson
bc34ccc9b2 changelog: add notes about closing #14711 2019-01-28 20:31:21 +01:00
Marcus Efraimsson
fce354875c Merge pull request #14711 from ander26/nanosecond-postgresql
sql datasources: nanosecond timestamp support
2019-01-28 20:26:45 +01:00
Marcus Efraimsson
7023c957d7 Merge branch 'master' into nanosecond-postgresql 2019-01-28 20:04:46 +01:00
Marcus Efraimsson
3a53f75ebb update inline documentation 2019-01-28 19:52:35 +01:00
Marcus Efraimsson
f157c19e16 extract parsing of datasource tls config to method 2019-01-28 19:38:56 +01:00
Marcus Efraimsson
7df5e3cebf extract tls auth settings directive from datasource http settings directive 2019-01-28 19:37:19 +01:00
Daniel Lee
e4f4cb814c Merge branch 'master' into azure-monitor 2019-01-28 19:23:34 +01:00
Marcus Efraimsson
f09c4608c2 changelog: add notes about closing #13711 2019-01-28 18:35:48 +01:00
Marcus Efraimsson
ed6cca61c9 Merge pull request #15051 from ellisvlad/13711_parse_database_config_ipv6_host
Parse database host correctly when using IPv6
2019-01-28 18:32:09 +01:00
Marcus Efraimsson
577f35f6ba changelog: add notes about closing #5699 2019-01-28 18:24:13 +01:00
Marcus Efraimsson
f701c610fb Merge pull request #15054 from RangerRick/master
add global datasource proxy timeout setting
2019-01-28 18:21:27 +01:00
Torkel Ödegaard
c3c8cd3f4d Fix for annotations not clearing when switching dashboards, fixes #15063 2019-01-28 18:19:12 +01:00
Torkel Ödegaard
8510f0cd11 Merge pull request #15084 from grafana/fix/explore-datasource-change
Update datasource before the loading has started
2019-01-28 17:55:33 +01:00
Torkel Ödegaard
a7b486d998 Merge pull request #15040 from grafana/14807-enable-webit-scrollbar-styles
Re-enable webit-prefixed scrollbar styles
2019-01-28 17:51:39 +01:00
Torkel Ödegaard
adf08bf222 Merge pull request #15098 from xlson/build-dont-push-latest
build: ignore latest
2019-01-28 17:49:47 +01:00
Dominik Prokop
44a7bd68be Import fix 2019-01-28 17:46:42 +01:00
Torkel Ödegaard
2bed762950 Merge pull request #15097 from benjamingorman/feature/grammar-fixes
Spelling/grammar fixes in top level markdown files
2019-01-28 17:37:34 +01:00
Dominik Prokop
7a8eb8c115 Merge branch 'master' into tooling/storybook-poc 2019-01-28 17:36:41 +01:00
Torkel Ödegaard
6d9246d447 Merge pull request #15093 from grafana/fix/explore-do-not-clear-results
Do not clear query results on transaction start
2019-01-28 17:17:13 +01:00
Torkel Ödegaard
fd06e51776 Merge branch 'master' into fix/explore-do-not-clear-results 2019-01-28 17:16:39 +01:00
Torkel Ödegaard
50b140f6ce Merge pull request #15082 from bergquist/explore_by_default
enables explore by default
2019-01-28 17:09:17 +01:00
Leonard Gram
584c97320a build: ignore latest 2019-01-28 17:08:27 +01:00
Torkel Ödegaard
ca68a88ee1 Merge pull request #14914 from grafana/named-colors
Named colors picker
2019-01-28 17:08:26 +01:00
Torkel Ödegaard
5768593da7 Merge pull request #15095 from grafana/hugoh/bug-inifinite-loop-when-scan-for-older-logs-clicked
Making sure we do not pass a long invalid queries and save to state
2019-01-28 17:01:24 +01:00
Ben Gorman
d56d9a0c12 Spelling/grammar fixes in top level markdown files 2019-01-28 15:58:32 +00:00
Leonard Gram
55f2495afa build: publishes armv6 to grafana.com.
Stops using the old publisher completely.

Closes #13008
2019-01-28 16:33:24 +01:00
Torkel Ödegaard
a1a905cbb1 Removed the initial data source as I could not see it being used anywhere 2019-01-28 16:31:38 +01:00
Dominik Prokop
00cb751eab Merge branch 'named-colors' of github.com:grafana/grafana into named-colors 2019-01-28 15:54:58 +01:00
Dominik Prokop
9a08a994f4 Initialize named colors palete lazily 2019-01-28 15:49:59 +01:00
Dominik Prokop
053d4060e8 Fix thresholds default colors not being applied 2019-01-28 15:48:54 +01:00
bergquist
21fff415ed removes unnessecary db request 2019-01-28 15:37:52 +01:00
Hugo Häggmark
08f5a3338a Making sure we do not pass a long invalid queries and save to state 2019-01-28 15:27:35 +01:00
Torkel Ödegaard
91d926f180 single import for types from @grafana/ui 2019-01-28 15:27:23 +01:00
bergquist
935da14f7d tab/spaces formatting 2019-01-28 15:27:02 +01:00
Torkel Ödegaard
2c9a867bde Merge branch 'master' into fix/explore-datasource-change 2019-01-28 15:24:14 +01:00
Marcus Efraimsson
6584ca20d2 Merge branch 'master' into 8570-mysql-ssl-datasource 2019-01-28 15:12:33 +01:00
Torkel Ödegaard
2dc2471b5c Revert "Updated home dashboard, removed home dashboard header"
This reverts commit 0151846e1e.
2019-01-28 15:01:42 +01:00
Torkel Ödegaard
994c79b59b Merge branch '15048/navigate-from-not-saved-panel' 2019-01-28 14:45:49 +01:00
Torkel Ödegaard
520756fb4c Fixed wrong line in test 2019-01-28 14:44:35 +01:00
Hugo Häggmark
dc125f1e4d Made sure we only resetTypeahead if mounted 2019-01-28 14:43:59 +01:00
bergquist
6a8643b3d1 Merge branch 'master' into configurable-alert-notification
* master: (250 commits)
  Firing off an action instead of listening to location changes
  Changes after PR Comments
  Made ExplorerToolbar connected and refactored away responsabilities from Explore
  Removed some split complexity
  Fixed some more styling
  Fixed close split look and feel
  Fixed position of Closesplit
  Fixed small issue with TimePicker dropdown position
  Simplified some styles and dom elements
  Fixed some more with the sidemenu open and smaller screens
  Fixed so heading looks good with closed sidemenu
  Restructure of component and styling
  Refactored out ExploreToolbar from Explore
  Fixed reinitialise of Explore
  changelog: add notes about closing #13929
  changelog: add notes about closing #14558
  changelog: add notes about closing #14484
  changelog: add notes about closing #13765
  changelog: add notes about closing #11503
  changelog: add notes about closing #4075
  ...
2019-01-28 14:16:43 +01:00
Dominik Prokop
d947748dd4 Delayed explore query loading indicator and implemented minor ux improvements to it 2019-01-28 14:07:45 +01:00
Peter Holmberg
d433a4792a fixing test 2019-01-28 14:07:37 +01:00
bergquist
48aa173f67 support both uid and id for showing/removing notifiers 2019-01-28 14:00:55 +01:00
David
edfce0893e Merge pull request #15090 from grafana/hugoh/bug-explore-cant-go-from-dashboard-to-explore
Fixed reinitialise of Explore
2019-01-28 13:43:32 +01:00
Dominik Prokop
07331b4c07 Revert "Use the same panel loading indicator in explore as on dashboard's panel"
This reverts commit 05edb3e5ad.
2019-01-28 13:40:41 +01:00
Hugo Häggmark
6b0400eed2 Firing off an action instead of listening to location changes 2019-01-28 13:27:56 +01:00
Dominik Prokop
957c659291 Handle undefined graph and table results 2019-01-28 13:09:51 +01:00
bergquist
6e672eb291 enable explore by default
closes #15037
2019-01-28 13:02:54 +01:00
Dominik Prokop
05edb3e5ad Use the same panel loading indicator in explore as on dashboard's panel 2019-01-28 12:58:10 +01:00
Dominik Prokop
2ff62c42ac Prevents query result cleaning when new query trransaction starts 2019-01-28 12:57:09 +01:00
Hugo Häggmark
9298876ef0 Changes after PR Comments 2019-01-28 12:47:01 +01:00
Hugo Häggmark
1e6d50df7a Made ExplorerToolbar connected and refactored away responsabilities from Explore 2019-01-28 12:47:01 +01:00
Hugo Häggmark
21df0c90a9 Removed some split complexity 2019-01-28 12:47:01 +01:00
Hugo Häggmark
0a094a13f2 Fixed some more styling 2019-01-28 12:47:01 +01:00
Hugo Häggmark
18727dce23 Fixed close split look and feel 2019-01-28 12:47:01 +01:00
Hugo Häggmark
42f700054f Fixed position of Closesplit 2019-01-28 12:47:01 +01:00
Hugo Häggmark
d2a5477654 Fixed small issue with TimePicker dropdown position 2019-01-28 12:47:01 +01:00
Hugo Häggmark
032a82feed Simplified some styles and dom elements 2019-01-28 12:47:01 +01:00
Hugo Häggmark
9caaf25078 Fixed some more with the sidemenu open and smaller screens 2019-01-28 12:47:01 +01:00
Hugo Häggmark
b2c284e42c Fixed so heading looks good with closed sidemenu 2019-01-28 12:47:01 +01:00
Hugo Häggmark
ffe03ee22d Restructure of component and styling 2019-01-28 12:47:01 +01:00
Hugo Häggmark
1aefc4cc2d Refactored out ExploreToolbar from Explore 2019-01-28 12:47:01 +01:00
Peter Holmberg
c9cab9b677 updating state if no panel 2019-01-28 12:20:16 +01:00
ijin08
b28e9b01fd updated the color palette 2019-01-28 11:52:36 +01:00
Hugo Häggmark
40f410562a Fixed reinitialise of Explore 2019-01-28 11:45:15 +01:00
Marcus Efraimsson
c7e50a79d7 changelog: add notes about closing #13929 2019-01-28 11:29:50 +01:00
Marcus Efraimsson
5807fc1383 changelog: add notes about closing #14558 2019-01-28 11:20:23 +01:00
Marcus Efraimsson
c52dde4c1b changelog: add notes about closing #14484 2019-01-28 11:18:37 +01:00
Marcus Efraimsson
4678f43aeb changelog: add notes about closing #13765 2019-01-28 11:15:00 +01:00
Marcus Efraimsson
2a0689a1f5 changelog: add notes about closing #11503 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
a9fd076470 changelog: add notes about closing #4075 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
5869eba467 changelog: add notes about closing #14722 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
ec41c4a572 update changelog 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
ac17da624d changelog: add notes about closing #10322 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
9eddb59705 changelog: add notes about closing #12991 2019-01-28 11:08:16 +01:00
Marcus Efraimsson
1d1d085b96 update changelog 2019-01-28 11:08:16 +01:00
Dominik Prokop
05f9eb0766 Update datasource before the loading has started 2019-01-28 11:06:50 +01:00
Torkel Ödegaard
642e1115f7 Merge pull request #15076 from grafana/minor-moving-task
Moving a few things from dashboard folder
2019-01-28 10:57:04 +01:00
Carl Bergquist
5082b66e3d Merge pull request #15078 from grafana/golang_1.11.5
upgrade golang to 1.11.5
2019-01-28 10:20:20 +01:00
Dominik Prokop
778ed912b8 Add cursor pointer to color swatches 2019-01-28 09:25:35 +01:00
Torkel Ödegaard
de79c27bcb Fixed import path 2019-01-28 09:20:54 +01:00
bergquist
019848484b changelog: adds note about closing #14701 2019-01-28 08:35:14 +01:00
Carl Bergquist
711f9bc034 Merge pull request #14883 from sharkpc0813/14701-fix-alert-context
fix that alert context and result handle context do not use the same derived context.
2019-01-28 08:30:45 +01:00
bergquist
0cbc89b063 Merge branch 'master' into 14701-fix-alert-context
* master: (262 commits)
  pkg/services/dashboards/dashboard_service.go: simplify return
  Updated url query param encoding to exctly match angular encoding
  Updated snapshot
  Added missing props not being passed to scrollbar component, fixes #15058
  Document /api/health
  changelog: adds note for #15062
  change default rotate_token_minutes to 10 minutes
  fix
  load test/ha fixes
  set low login cookie rotate time in ha mode
  fix multiple piechart instances bug
  scripts/build/*: Fix some golint issues
  scripts/build/*: Fix golint issues Url => URL
  build: fixes building grafana completely within docker.
  dont specify domain for auth cookies
  New snapshot reflecting changes
  Makes the clickable side menu header look great in light theme again
  org id fix for load test
  user auth token load tests using k6.io
  moves cookie https setting to [security]
  ...
2019-01-28 08:09:52 +01:00
bergquist
d75f53e895 upgrade golang to 1.11.5 2019-01-28 08:08:29 +01:00
bergquist
364154d81f moves timeout tests to an integration test 2019-01-28 07:56:31 +01:00
Carl Bergquist
87d44490e6 Merge pull request #15072 from mjtrangoni/fix-megacheck-issue
pkg/services/dashboards/dashboard_service.go: simplify return
2019-01-27 23:41:37 +01:00
Torkel Ödegaard
7f2c2a913e Moving a few things from dashboard folder 2019-01-27 17:33:13 +01:00
Vlad Ellis
9692955d4f Correct formatting of sqlstore_test.go 2019-01-27 16:28:02 +00:00
Mario Trangoni
bf90ff87cf pkg/services/dashboards/dashboard_service.go: simplify return
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck  ./...
pkg/services/dashboards/dashboard_service.go:167:2⚠️ 'if err != nil { return err }; return nil' can be simplified to 'return err' (S1013) (megacheck)
2019-01-26 14:23:10 +01:00
Torkel Ödegaard
84d1ce8fe3 Merge pull request #15071 from grafana/explore-url-fixes
Updated url query param encoding to exctly match angular encoding
2019-01-26 12:41:32 +01:00
Torkel Ödegaard
0975f816aa Updated url query param encoding to exctly match angular encoding 2019-01-26 12:05:37 +01:00
Torkel Ödegaard
7956c74406 Merge pull request #15070 from grafana/scrollbar-fixes
Added missing props not being passed to scrollbar component
2019-01-26 11:48:48 +01:00
Torkel Ödegaard
f3dc5381ee Merge pull request #15018 from miroswan/14961-constructor-as-rvalue
Bug Fix #14961
2019-01-26 11:11:32 +01:00
Torkel Ödegaard
27858c0272 Updated snapshot 2019-01-26 11:04:50 +01:00
Torkel Ödegaard
c9d060c0fe Merge pull request #15041 from grafana/14752-explore-custom-scrollbar
Use CustomScrollbar in explore
2019-01-26 10:57:13 +01:00
Torkel Ödegaard
5e1a3c9ee2 Merge pull request #15023 from grafana/improve-organization
More file re-organization & clean-up
2019-01-26 10:53:09 +01:00
Torkel Ödegaard
c748b53f17 Added missing props not being passed to scrollbar component, fixes #15058 2019-01-26 10:51:16 +01:00
Torkel Ödegaard
ecbda1af23 Merge pull request #15068 from finkr/finkr-patch-doc-healthapi
Document /api/health
2019-01-26 07:06:03 +01:00
Torkel Ödegaard
aaad9e3e49 Merge pull request #15057 from grafana/hugoh/sidemenu-dropdown-looks-funky-in-light-theme
Makes the clickable side menu header look great in light theme again
2019-01-26 07:05:28 +01:00
Vlad Ellis
c208186f26 Parse database host correctly when using IPv6 2019-01-25 21:56:19 +00:00
Frank lin Piat
1fc5ea181a Document /api/health
Document the health check implemented in #3302 (and #935), see  https://github.com/grafana/grafana/issues/3302#issuecomment-297066201
2019-01-25 17:52:28 +01:00
Peter Holmberg
142ebc7546 some working solution, needs refactor 2019-01-25 16:38:51 +01:00
Daniel Lee
d1608510ef changelog: adds note for #15062 2019-01-25 15:52:53 +01:00
Daniel Lee
684b588126 Merge pull request #15062 from alexanderzobnin/fix-piechart
fix multiple piechart instances bug
2019-01-25 15:38:23 +01:00
Dominik Prokop
07b9735263 Do not update color picker popover position on tab change
Position update caused tabs to move up and down. This led to confusing user experience, as tabs position was dependent on tab's content.
2019-01-25 14:07:22 +01:00
Carl Bergquist
d5c1f8e526 Merge pull request #14912 from grafana/poc_token_auth
WIP. POC for session replacement base hashed tokens.
2019-01-25 13:58:35 +01:00
Marcus Efraimsson
e4924795a2 change default rotate_token_minutes to 10 minutes 2019-01-25 13:30:26 +01:00
Dominik Prokop
5f41c5ca5e Rename deprecation warning helper 2019-01-25 13:30:02 +01:00
Dominik Prokop
3c60f98d13 Implemented tests for ColorPickerPopover and NamedColorsPalette 2019-01-25 13:24:20 +01:00
Marcus Efraimsson
42fa41e78d fix 2019-01-25 13:18:17 +01:00
Marcus Efraimsson
806ddd63a0 load test/ha fixes 2019-01-25 13:16:19 +01:00
bergquist
95d9328c66 set low login cookie rotate time in ha mode 2019-01-25 12:59:50 +01:00
Dominik Prokop
e75b0a3c70 Fix light theme issues with named colors disabled 2019-01-25 12:13:36 +01:00
Dominik Prokop
f01441f4a7 Stories cleanup 2019-01-25 12:03:42 +01:00
Alexander Zobnin
7fb1b3a11a fix multiple piechart instances bug 2019-01-25 13:56:00 +03:00
Mario Trangoni
4b68055c16 scripts/build/*: Fix some golint issues
See,

$ gometalinter --vendor --disable-all --enable=golint ./...
build/release_publisher/externalrelease.go:55:6⚠️ type getHttpContents should be getHTTPContents (golint)
build/release_publisher/publisher.go:18:2⚠️ struct field apiUri should be apiURI (golint)
build/release_publisher/publisher.go:66:6⚠️ exported type ReleaseType should have comment or be unexported (golint)
build/release_publisher/publisher.go:69:2⚠️ exported const STABLE should have comment (or a comment on this block) or be unexported (golint)
build/release_publisher/publisher.go:185:16⚠️ should replace errors.New(fmt.Sprintf(...)) with fmt.Errorf(...) (golint)
build/release_publisher/publisher_test.go:102:6⚠️ type mockHttpGetter should be mockHTTPGetter (golint)
2019-01-25 11:21:47 +01:00
Mario Trangoni
d5f63d9988 scripts/build/*: Fix golint issues Url => URL
$ gometalinter --vendor --disable-all --enable=golint ./... | grep -i URL
build/publish.go:18:5⚠️ var apiUrl should be apiURL (golint)
build/publish.go:184:2⚠️ struct field WhatsNewUrl should be WhatsNewURL (golint)
build/publish.go:185:2⚠️ struct field ReleaseNotesUrl should be ReleaseNotesURL (golint)
build/publish.go:191:2⚠️ struct field Url should be URL (golint)
build/release_publisher/externalrelease.go:17:53⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/externalrelease.go:17:69⚠️ method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/externalrelease.go:17:89⚠️ method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/localrelease.go:20:45⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/localrelease.go:20:61⚠️ method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/localrelease.go:20:81⚠️ method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/localrelease.go:45:41⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/localrelease.go:51:84⚠️ func parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/main.go:12:6⚠️ var whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/main.go:13:6⚠️ var releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/main.go:40:6⚠️ var baseUrl should be baseURL (golint)
build/release_publisher/main.go:94:6⚠️ func createBaseUrl should be createBaseURL (golint)
build/release_publisher/publisher.go:21:2⚠️ struct field baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:26:17⚠️ interface method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:26:33⚠️ interface method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher.go:26:53⚠️ interface method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/publisher.go:29:31⚠️ method parameter whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher.go:29:51⚠️ method parameter releaseNotesUrl should be releaseNotesURL (golint)
build/release_publisher/publisher.go:91:24⚠️ method getUrl should be getURL (golint)
build/release_publisher/publisher.go:91:31⚠️ method parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:190:15⚠️ func parameter baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher.go:199:21⚠️ method apiUrl should be apiURL (golint)
build/release_publisher/publisher.go:257:2⚠️ struct field WhatsNewUrl should be WhatsNewURL (golint)
build/release_publisher/publisher.go:258:2⚠️ struct field ReleaseNotesUrl should be ReleaseNotesURL (golint)
build/release_publisher/publisher.go:264:2⚠️ struct field Url should be URL (golint)
build/release_publisher/publisher_test.go:10:3⚠️ struct field whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher_test.go:11:3⚠️ struct field relNotesUrl should be relNotesURL (golint)
build/release_publisher/publisher_test.go:17:3⚠️ struct field expectedUrl should be expectedURL (golint)
build/release_publisher/publisher_test.go:18:3⚠️ struct field baseArchiveUrl should be baseArchiveURL (golint)
build/release_publisher/publisher_test.go:109:2⚠️ var whatsNewUrl should be whatsNewURL (golint)
build/release_publisher/publisher_test.go:110:2⚠️ var relNotesUrl should be relNotesURL (golint)
2019-01-25 11:21:47 +01:00
Leonard Gram
674ab73806 build: fixes building grafana completely within docker.
Fixes #15060
2019-01-25 10:52:47 +01:00
bergquist
75760aa892 dont specify domain for auth cookies 2019-01-25 10:40:50 +01:00
Alexander Zobnin
96ffa9d797 monaco-kusto: fix imports 2019-01-25 11:23:46 +03:00
Alexander Zobnin
0dc6e86b3b use @alexanderzobnin/monaco-kusto package for kusto syntax highlight 2019-01-25 11:15:18 +03:00
bergquist
b5572b23b6 Merge branch 'master' into poc_token_auth
* master: (32 commits)
  Fixed react key warning for loki start page
  Disable query should trigger refresh
  added docs entry for check_for_updates config flag, fixes ##14940
  Explore: Fix scanning for logs
  Moved ad hoc filters and upload directive
  Moved dashboard srv and snapshot ctrl
  Moved share modal
  Moved dashboard save modals to components folder
  Moved unsaved changes service and modal
  Removed unused alertingSrv
  Moved view state srv to services
  Moved timepicker to components
  Moved submenu into components dir
  Moved dashboard settings to components
  Moved dashboard permissions into components dir
  Moved history component, added start draft of frontend code style guide
  fix: Use custom whitelist for XSS sanitizer to allow class and style attributes
  Began work on improving structure and organization of components under features/dashboard, #14062
  Fix a typo in changelog
  Update ROADMAP.md
  ...
2019-01-25 08:28:24 +01:00
Hugo Häggmark
bd745959d2 New snapshot reflecting changes 2019-01-25 06:49:15 +01:00
Hugo Häggmark
72a0ba29f5 Makes the clickable side menu header look great in light theme again 2019-01-25 06:44:32 +01:00
Marcus Efraimsson
cfd8bd711b org id fix for load test 2019-01-24 23:49:45 +01:00
Marcus Efraimsson
6454de74e4 user auth token load tests using k6.io 2019-01-24 22:47:53 +01:00
Benjamin Reed
9108fd1b9d add global datasource proxy timeout setting
closes grafana#5699
2019-01-24 14:06:48 -05:00
bergquist
d6edaa1328 moves cookie https setting to [security] 2019-01-24 19:04:58 +01:00
Alexander Zobnin
00de497663 Azure Monitor: build monaco with webpack WIP 2019-01-24 18:43:48 +03:00
Dominik Prokop
5032c74b79 Use Switch to control y-axis in series color picker 2019-01-24 15:36:28 +01:00
Dominik Prokop
1d3122632f Move Switch component to grafana-ui 2019-01-24 15:35:50 +01:00
bergquist
9153b6ed96 improves readability of loginping handler 2019-01-24 15:17:09 +01:00
Demitri Swan
186e488ace Bug Fix #14961 2019-01-24 14:11:31 +00:00
ijin08
ce440b85fc minor styling changes to gaps, font-size and width 2019-01-24 14:39:52 +01:00
bergquist
516037fbdd makes sure rotation is always higher than urgent rotation 2019-01-24 13:54:45 +01:00
bergquist
9ae306e417 use defer to make sure we always release session data 2019-01-24 13:48:36 +01:00
Dominik Prokop
8d8f944a1f Enable custom picers on color color picker popovers (for y-axis support in legend picker) 2019-01-24 13:18:21 +01:00
Johannes Schill
2706f09de8 feat: Use CustomScrollbar in explore #14752 2019-01-24 12:59:12 +01:00
Johannes Schill
cf44c0cf87 chore: Better comment 2019-01-24 12:51:11 +01:00
Johannes Schill
a91037fb50 chore: Remove comment and unneeded export 2019-01-24 12:43:25 +01:00
Johannes Schill
45fc9c1860 fix: Enable -webkit-scrollbar related css when there's no overlay scrollbar #14807 2019-01-24 12:43:25 +01:00
bergquist
fd0f9f2dd2 fixes broken test 2019-01-24 12:06:44 +01:00
Dominik Prokop
40dc29d135 Make series overrides color picker display correctly 2019-01-24 12:01:15 +01:00
bergquist
f257101c41 removes unused/commented code 2019-01-24 11:26:45 +01:00
bergquist
ff483f3782 removes old cookie auth configuration 2019-01-24 10:55:10 +01:00
bergquist
56a521b264 makes auth token rotation time configurable 2019-01-24 10:50:18 +01:00
Dominik Prokop
1e69a7b8b7 Update story for NamedColorsPalette 2019-01-24 10:37:53 +01:00
Dominik Prokop
d414e463bd Update imports of NamedColorsPalette 2019-01-24 10:37:34 +01:00
Dominik Prokop
549e0993c4 Restore missing styles 2019-01-24 10:28:48 +01:00
Dominik Prokop
071b1f8478 Fixed issue with color name retrieval not being aware of current theme 2019-01-24 09:56:52 +01:00
Torkel Ödegaard
05738258bb Fixed dashboard import issue after move 2019-01-24 09:47:06 +01:00
Torkel Ödegaard
e713b0f029 Moved add panel panel and renamed it to add panel widget 2019-01-24 09:23:48 +01:00
Torkel Ödegaard
c7b556c0e4 Merge pull request #15017 from grafana/explore-fixes
Fixed react key warning for loki start page
2019-01-23 22:02:21 +01:00
Torkel Ödegaard
6419a30377 Fixed react key warning for loki start page 2019-01-23 21:19:42 +01:00
Torkel Ödegaard
11c306abde Moved row options to it's own component folder 2019-01-23 20:29:05 +01:00
Torkel Ödegaard
adacdf98b7 Removed old query inspector (that was opened by clickin error in panel title)
think the new query insector from Queries tab can replace this old one.
2019-01-23 20:26:18 +01:00
Torkel Ödegaard
9d5560afe2 Moving files to better locations 2019-01-23 20:21:07 +01:00
Torkel Ödegaard
b5bc69253f Merge pull request #15016 from grafana/fix-disable-query
Disable query should trigger refresh
2019-01-23 20:03:35 +01:00
Torkel Ödegaard
81981cf45d Merge pull request #15014 from grafana/docs-fix-updates-flag
added docs entry for check_for_updates config flag,
2019-01-23 19:35:12 +01:00
Torkel Ödegaard
b1ef3c43f9 Disable query should trigger refresh 2019-01-23 19:34:56 +01:00
Torkel Ödegaard
d88b7608a5 Merge pull request #15013 from grafana/revert-11635-patch-1
Revert "Specify expected encoding for access/secret key"
2019-01-23 18:26:35 +01:00
Torkel Ödegaard
05a976fdb1 added docs entry for check_for_updates config flag, fixes ##14940 2019-01-23 18:24:57 +01:00
Torkel Ödegaard
02083d71c8 Loki query editor is starting to work, had to make changes to explore query field in order to update query from the outside without unmount between 2019-01-23 17:44:22 +01:00
bergquist
4626f083bb store oauth login error messages in an encrypted cookie 2019-01-23 17:01:09 +01:00
Dominik Prokop
d13efb3372 Removed sass import of spectrum.scss 2019-01-23 16:37:23 +01:00
ijin08
7bdbe3ea9d Merge branch 'named-colors' of github.com:grafana/grafana into named-colors 2019-01-23 16:25:51 +01:00
ijin08
387c40c6d2 replaced palette colors with current palette adjusted for dark and light theme 2019-01-23 16:23:48 +01:00
Dominik Prokop
573e64ef11 Remove spectrum.js vendor dependency from grafana/ui 2019-01-23 16:02:21 +01:00
ijin08
30f27a966b changed light-theme tool-tip to be a bit lighter, trying different paddings 2019-01-23 15:39:13 +01:00
Torkel Ödegaard
d420024178 Merge pull request #15009 from grafana/davkal/14997-fix-scanner
Explore: Fix scanning for logs
2019-01-23 15:35:31 +01:00
Torkel Ödegaard
3dca65c6b8 Merge pull request #14958 from aocenas/refresh-playlist-counter
Add loop counter for full refresh in playlist
2019-01-23 15:34:49 +01:00
Dominik Prokop
580b919424 Fix hide timeout for color picker 2019-01-23 15:34:39 +01:00
Dominik Prokop
e5f74fdf93 Rename colorsPalette util to namedColorsPalette 2019-01-23 15:31:41 +01:00
Dominik Prokop
511895c079 Make small swatches react to theme changes 2019-01-23 15:30:33 +01:00
bergquist
df85cc9bb1 redirect logged in users from /login to home 2019-01-23 15:28:33 +01:00
David Kaltschmidt
c0277ab595 Explore: Fix scanning for logs
- Redux migration caused the scanner to not be set
- this change adds the setting/unsetting of the scanner in the reducer
- added test
2019-01-23 15:05:54 +01:00
Dominik Prokop
3c7a5bdf7b Update styles of selected named color swatch 2019-01-23 14:59:43 +01:00
bergquist
5998646da5 restrict session usage to auth_proxy 2019-01-23 14:56:48 +01:00
Dominik Prokop
8cce80a851 Implement pointer component for spectrum palette sliders 2019-01-23 14:46:38 +01:00
Torkel Ödegaard
90787a5299 Merge pull request #14999 from grafana/dashboard-component-organization
WIP: Re-organize components under features/dashboard
2019-01-23 14:00:03 +01:00
Torkel Ödegaard
8a9582dad5 minor updates 2019-01-23 13:54:34 +01:00
Dominik Prokop
ab7756ecb4 Make default color picker close on trigger mouse leave 2019-01-23 13:46:13 +01:00
Torkel Ödegaard
f0eef79c1a Moved ad hoc filters and upload directive 2019-01-23 13:31:45 +01:00
Dominik Prokop
53f52a67e1 Added deprecation warning to old color picker API props. Moved named color support handling to color popovers 2019-01-23 13:29:56 +01:00
ijin08
2ec55d0650 changed color for label tooltips from blue/red-yellow gradient to black/white 2019-01-23 13:28:39 +01:00
Torkel Ödegaard
2f08c56260 Moved dashboard srv and snapshot ctrl 2019-01-23 13:10:49 +01:00
Torkel Ödegaard
80da19010e Moved share modal 2019-01-23 13:07:20 +01:00
Torkel Ödegaard
720fa87b89 Moved dashboard save modals to components folder 2019-01-23 13:00:05 +01:00
Torkel Ödegaard
4358732d21 Moved unsaved changes service and modal 2019-01-23 12:52:46 +01:00
Torkel Ödegaard
a4824085e3 Removed unused alertingSrv 2019-01-23 12:09:58 +01:00
Torkel Ödegaard
d9f11fa658 Merge pull request #15005 from grafana/xss-filter-allow-class-style
XSS sanitizer allows class and style attributes
2019-01-23 12:06:57 +01:00
Torkel Ödegaard
874792dfcb Moved view state srv to services 2019-01-23 12:02:47 +01:00
Torkel Ödegaard
ec37f84727 Moved timepicker to components 2019-01-23 11:55:52 +01:00
Torkel Ödegaard
2356057f20 Moved submenu into components dir 2019-01-23 11:51:43 +01:00
Torkel Ödegaard
08f7e55ae5 Moved dashboard settings to components 2019-01-23 11:48:27 +01:00
Torkel Ödegaard
dfe9252f54 Moved dashboard permissions into components dir 2019-01-23 11:45:23 +01:00
Torkel Ödegaard
0c16d3cd6a Moved history component, added start draft of frontend code style guide 2019-01-23 11:37:46 +01:00
Johannes Schill
5c72e4e668 fix: Use custom whitelist for XSS sanitizer to allow class and style attributes 2019-01-23 11:27:02 +01:00
Carl Bergquist
766122856b Merge pull request #14995 from bergquist/token_oauth
Stores hashed state code in cookie for OAuth logins.
2019-01-23 10:39:12 +01:00
Dominik Prokop
5c5265829a Reduce padding in color picker popover 2019-01-23 09:39:59 +01:00
Torkel Ödegaard
26385dea8f Began work on improving structure and organization of components under features/dashboard, #14062 2019-01-22 21:36:36 +01:00
Torkel Ödegaard
909d89077d Merge pull request #14998 from roidelapluie/patch-1
Fix a typo in changelog
2019-01-22 21:14:11 +01:00
Julien Pivotto
2bdc92f7dd Fix a typo in changelog 2019-01-22 20:42:56 +01:00
Dominik Prokop
9fd9bba1f4 Implemented new spectrum palette 2019-01-22 20:00:22 +01:00
Torkel Ödegaard
2264c27504 Merge pull request #14989 from grafana/hugoh/bug-folder-name-appears-misleadingly-when-using-viewers-can-edit
fixes:#14282 - Do not change folder for persisted dashboards
2019-01-22 17:47:12 +01:00
Torkel Ödegaard
3a390a994b Update ROADMAP.md 2019-01-22 17:46:38 +01:00
Torkel Ödegaard
2a50777001 use resetfolder instead so it shows current folder 2019-01-22 17:41:36 +01:00
Torkel Ödegaard
0151846e1e Updated home dashboard, removed home dashboard header 2019-01-22 17:23:24 +01:00
Torkel Ödegaard
5d3ef4e500 Merge pull request #14992 from grafana/hugoh/bug-explore-toggle-table-does-not-work
fix: Dispatch the correct action (#14985)
2019-01-22 16:43:36 +01:00
bergquist
c3ff3d644c fixes nil ref in tests 2019-01-22 16:16:32 +01:00
Torkel Ödegaard
db99b86591 Merge pull request #12765 from cxcv/master
added percentencode formatting option
2019-01-22 15:55:36 +01:00
bergquist
31b5db06f1 Merge branch 'master' into poc_token_auth
* master: (156 commits)
  Fixed issues with the sanitizie input in text panels, added docs, renamed config option
  build: removes arm32v6 docker image.
  Updated version in package.json to 6.0.0-pre1
  Update CHANGELOG.md
  build: armv6 docker image.
  build: skips building rpm for armv6.
  build: builds for armv6.
  Explore: mini styling fix for angular query editors
  Removed unused props & state in PromQueryField
  chore: Remove logging and use the updated config param
  chore: Reverse sanitize variable so it defaults to false
  feat: wip: Sanitize user input on text panel
  fix: Text panel should re-render when panel mode is changed #14922
  Minor rename of LogsProps and LogsState
  Splitted up LogLabels into LogLabelStats and LogLabel
  Refactored out LogRow to a separate file
  Removed strange edit
  Added link to side menu header and fixed styling
  Moved ValueMapping logic and tests to separate files
  Fixed data source selection in explore
  ...
2019-01-22 15:39:54 +01:00
bergquist
64124b5042 add setting for how to long we should keep expired tokens 2019-01-22 15:31:43 +01:00
bergquist
12f8338977 stores hashed state code in cookie 2019-01-22 15:22:24 +01:00
bergquist
d3ec8e1ccb creates new config section for login settings 2019-01-22 15:22:11 +01:00
Benjamin Schweizer
bde4b76c16 based on encodeURIComponent() using strict RFC 3986 sub-delims 2019-01-22 15:09:58 +01:00
Hugo Häggmark
85838a40d6 fix: Dispatch the correct action (#14985) 2019-01-22 13:59:58 +01:00
Marcus Efraimsson
59d0c19ba8 passing middleware tests 2019-01-22 13:51:55 +01:00
Dominik Prokop
ba4b774c96 Stories update for color picker 2019-01-22 13:36:21 +01:00
Dominik Prokop
c3e5737fb8 Make named colors optional in color picker, enable named colors in graph legend series picker 2019-01-22 13:35:57 +01:00
Dominik Prokop
5b63ee4bfb Storybook - add actions addon 2019-01-22 13:19:47 +01:00
Hugo Häggmark
151b838f0b fixes:#14282 - Do not change folder for persisted dashboards 2019-01-22 13:07:03 +01:00
Torkel Ödegaard
75e3d90089 Merge pull request #14988 from grafana/sanitize-input-fixes
Fixed issues with the sanitizie input in text panels
2019-01-22 12:26:51 +01:00
Marcus Efraimsson
4096449aec extract auth token interface and remove auth token from context 2019-01-22 12:00:33 +01:00
Torkel Ödegaard
f0e61af8e0 Fixed issues with the sanitizie input in text panels, added docs, renamed config option 2019-01-22 11:56:35 +01:00
Leonard Gram
caa9a90bfd build: removes arm32v6 docker image. 2019-01-22 11:44:02 +01:00
Torkel Ödegaard
39fa0aec5d Updated version in package.json to 6.0.0-pre1 2019-01-22 11:37:14 +01:00
Torkel Ödegaard
cd3157fa68 Update CHANGELOG.md 2019-01-22 11:36:38 +01:00
Torkel Ödegaard
cfdef66f8c Merge pull request #14984 from grafana/4117-xss-sanitize-text-panels
XSS sanitize text panels
2019-01-22 11:29:50 +01:00
Torkel Ödegaard
bc7842e324 Merge pull request #14972 from grafana/hugoh/rendering-null-as-valuemapping
Added check for null value in ValueMappings and added tests
2019-01-22 11:28:44 +01:00
Benjamin Schweizer
8a09d84707 Merge branch 'master' of https://github.com/grafana/grafana 2019-01-22 11:20:56 +01:00
Leonard Gram
ec11d5a90a build: armv6 docker image. 2019-01-22 11:09:27 +01:00
Leonard Gram
2bdc147e55 build: skips building rpm for armv6. 2019-01-22 11:09:27 +01:00
Leonard Gram
5f188058e3 build: builds for armv6. 2019-01-22 11:09:27 +01:00
Dominik Prokop
dd8f7aa7a9 CustomScrollbar - expose underlying's react-custom-scrollbars API to allow scroll tracks config.
Updated config for Graph legend not to display horizontal scroll track which caused legend being not accessible in ceertain situations (e.g. when native OS scroll overlay disabled)
2019-01-22 10:58:31 +01:00
Torkel Ödegaard
e43fafd96e Explore: mini styling fix for angular query editors 2019-01-22 10:46:21 +01:00
Torkel Ödegaard
a03faba9a3 Merge pull request #14983 from grafana/hugoh/logs-refactoring
Logs refactoring
2019-01-22 10:32:05 +01:00
Torkel Ödegaard
40b73a1fcd Removed unused props & state in PromQueryField 2019-01-22 09:57:27 +01:00
Torkel Ödegaard
e8e1d35340 Merge pull request #14981 from grafana/hugoh/sidemenu-should-be-clickable
Added link to side menu header and fixed styling
2019-01-22 09:36:58 +01:00
Johannes Schill
08dc5a4f97 chore: Remove logging and use the updated config param 2019-01-22 09:36:07 +01:00
Johannes Schill
1ed35f3dc1 chore: Reverse sanitize variable so it defaults to false 2019-01-22 09:36:07 +01:00
Johannes Schill
15d560a1c0 feat: wip: Sanitize user input on text panel 2019-01-22 09:36:07 +01:00
Johannes Schill
a3e13b333e fix: Text panel should re-render when panel mode is changed #14922 2019-01-22 09:36:07 +01:00
Torkel Ödegaard
5446f49f19 Merge pull request #14977 from grafana/explore-fix-datasource-selector
Fixed data source selection in explore
2019-01-22 09:36:02 +01:00
Hugo Häggmark
bcb3824e6a Minor rename of LogsProps and LogsState 2019-01-22 09:25:40 +01:00
Hugo Häggmark
c369279401 Splitted up LogLabels into LogLabelStats and LogLabel 2019-01-22 09:22:38 +01:00
Dominik Prokop
d86d063900 Make popover hide delay configurable to enable better UX 2019-01-22 09:14:30 +01:00
Dominik Prokop
2b34933554 Stories - fix import 2019-01-22 09:14:30 +01:00
Dominik Prokop
93bb30a561 Enable new color picker in Gauge and Thresholds editor, use ThemeProvider instead of ContextSrv 2019-01-22 09:14:30 +01:00
Dominik Prokop
ed48ecfe1d Updated table tests to new behavior for colors (values are always rendered as hex/rgb) 2019-01-22 09:11:30 +01:00
Dominik Prokop
84caf0bc9d Make named colors usable in angular code pt 1 2019-01-22 09:11:30 +01:00
Dominik Prokop
597cbb5b9b Story updates 2019-01-22 09:11:30 +01:00
Dominik Prokop
b560dcac3d Update grafana/ui exports 2019-01-22 09:11:30 +01:00
Dominik Prokop
a214b5748e Refactor color picker to remove code duplicartion (introduced colorPickerFactory). Allow popver position update on content change 2019-01-22 09:11:30 +01:00
Dominik Prokop
4f516faa82 Fix lint 2019-01-22 09:11:30 +01:00
Dominik Prokop
25e60565ad Updated stories 2019-01-22 09:11:30 +01:00
Dominik Prokop
c8ac23f3c1 Rendering arrows for color picker, applying color changes to time series 2019-01-22 09:11:30 +01:00
Dominik Prokop
e35e266c81 Fix TS errors 2019-01-22 09:11:30 +01:00
Dominik Prokop
b02c89c3ba Stories updates 2019-01-22 09:11:30 +01:00
Dominik Prokop
e33614ade3 Unified color picker API, allowed for color specified for theme selection, updated code to changes in PopperController API 2019-01-22 09:11:30 +01:00
Dominik Prokop
977d53c8c9 Get rid of unused renderContent prop on PopperController 2019-01-22 09:11:30 +01:00
Dominik Prokop
0505add7f6 Enabled knobs for storybook and implemented some stories 2019-01-22 09:11:30 +01:00
Dominik Prokop
3d2955f24f Lint fix 2019-01-22 09:11:30 +01:00
Dominik Prokop
5420a816e7 Render series color picker with correct theme 2019-01-22 09:11:30 +01:00
Dominik Prokop
4b9e933691 Added config provider to be able to access config easily from react components 2019-01-22 09:11:30 +01:00
Dominik Prokop
33fa40a1f3 Migrating color pickers to Popper from drop.js pt1 2019-01-22 09:11:30 +01:00
Dominik Prokop
c74b39696c Updates to Popper to be positions correctly within window 2019-01-22 09:11:30 +01:00
Dominik Prokop
4384eb2f0b Move tooltip themes to Tooltip component making Popper/PopperController theme agnostic 2019-01-22 09:11:30 +01:00
Dominik Prokop
ac37879016 WIP Basics of named color picker 2019-01-22 09:11:30 +01:00
Dominik Prokop
7ad430a6be Merge branch 'master' into tooling/storybook-poc 2019-01-22 09:11:07 +01:00
Hugo Häggmark
23202ab130 Refactored out LogRow to a separate file 2019-01-22 08:59:22 +01:00
Hugo Häggmark
bf0333e329 Removed strange edit 2019-01-22 08:18:03 +01:00
Hugo Häggmark
a6428fef0c Added link to side menu header and fixed styling 2019-01-22 08:12:48 +01:00
Hugo Häggmark
a9c33ab658 Moved ValueMapping logic and tests to separate files 2019-01-22 06:40:04 +01:00
Marcus Efraimsson
366e356e08 more auth token tests 2019-01-21 21:48:18 +01:00
Torkel Ödegaard
9c8dea062a Merge pull request #14975 from grafana/default-datasource-query-editor
Fix for default datasource query editor
2019-01-21 21:43:01 +01:00
Torkel Ödegaard
79bd7f4077 Fixed data source selection in explore 2019-01-21 21:36:30 +01:00
Torkel Ödegaard
018fef0400 Added refId to missing queries on panel model init 2019-01-21 20:35:24 +01:00
bergquist
777bd9ea18 adds cleanup job for old session tokens 2019-01-21 19:03:32 +01:00
Torkel Ödegaard
db2a15daf0 Fixed loading of default query editor 2019-01-21 18:54:57 +01:00
Hugo Häggmark
bbb7596113 Changed null logic for range value mappings after PR comments 2019-01-21 17:30:47 +01:00
Marcus Efraimsson
f040f9a400 fix tests after renaming now 2019-01-21 16:53:00 +01:00
Hugo Häggmark
38ea11d110 Added check for null value in ValueMappings and added tests 2019-01-21 16:07:55 +01:00
Marcus Efraimsson
38efc1d7d2 s/print/log 2019-01-21 15:53:40 +01:00
bergquist
92620af75f avoid calling now() multiple times 2019-01-21 15:48:17 +01:00
Marcus Efraimsson
dd8476d81a passing auth token tests 2019-01-21 15:06:33 +01:00
Torkel Ödegaard
96d28703f7 Merge pull request #14963 from grafana/hugoh/bug-viewers-can-edit-not-working-for-explore
Viewers can edit now means that viewers have access to Explore
2019-01-21 13:51:46 +01:00
Torkel Ödegaard
721e40db90 fixed trailing whitespace 2019-01-21 13:51:33 +01:00
Torkel Ödegaard
c188a44ba8 Merge pull request #14969 from grafana/gotmetalinter-script
Gometalinter changes & megacheck fix
2019-01-21 13:49:35 +01:00
Torkel Ödegaard
778e1f78c2 Merge branch 'master' into hugoh/bug-viewers-can-edit-not-working-for-explore 2019-01-21 13:31:05 +01:00
Marcus Efraimsson
565408194a handle expired tokens 2019-01-21 13:22:20 +01:00
Torkel Ödegaard
829e3024ce fixed circleci script run path for gometalinter 2019-01-21 13:20:24 +01:00
Torkel Ödegaard
f24e6ebf67 Fixed circleci name for gometalinter exec step 2019-01-21 13:10:00 +01:00
Torkel Ödegaard
37e917939a moved script and added exit_if_fail 2019-01-21 13:07:28 +01:00
Torkel Ödegaard
d5e49845f3 Moved gometalinter to a script instead of seperate commands in circleci file, removed megacheck and added staticcheck 2019-01-21 13:03:05 +01:00
Dominik Prokop
c8ec35ce1f Merge branch 'master' into tooling/storybook-poc 2019-01-21 12:20:10 +01:00
bergquist
697ddccd8e set userToken on request when logging in 2019-01-21 11:42:10 +01:00
bergquist
55b3013eb3 moves initWithToken to auth package 2019-01-21 11:37:44 +01:00
Marcus Efraimsson
734a7d38b2 set cookie name from configuration 2019-01-21 11:21:43 +01:00
Hugo Häggmark
b95650d19c Added function hasAccessToExplore in ContextSrv and refactored tests 2019-01-21 10:50:34 +01:00
Marcus Efraimsson
766cfab374 change rotate time 2019-01-21 10:22:18 +01:00
Marcus Efraimsson
0d1e3759eb mixor fixes 2019-01-21 10:20:23 +01:00
Marcus Efraimsson
f3125b447b dead code 2019-01-21 10:20:23 +01:00
Marcus Efraimsson
0495499b4f fix ip address parsing of loopback address 2019-01-21 10:20:23 +01:00
bergquist
2e97d39abe removes commented code 2019-01-21 10:01:48 +01:00
bergquist
47a7d93fd9 moves rotation into auth since both happens before c.Next() 2019-01-21 08:59:01 +01:00
Hugo Häggmark
9d6ac2c3d4 fix: Viewers can edit means that viewers have acces to Explore #14281 2019-01-21 08:47:41 +01:00
Andrej Ocenas
382a12c0fd Add loop counter for full refresh in playlist 2019-01-19 16:58:26 +01:00
Torkel Ödegaard
d843044841 decreased panel height in edit mode 2019-01-19 08:31:20 +01:00
Torkel Ödegaard
f94a6b2431 Merge pull request #14956 from grafana/query-editor-row-style-update
Query editor row style update & sass cleanup
2019-01-19 08:24:28 +01:00
Torkel Ödegaard
17aebf8462 Merge pull request #14955 from grafana/datasource-typings
Datasource typings
2019-01-19 08:24:06 +01:00
Torkel Ödegaard
4cbed807d6 toggle collapse when clicking on collapse state text 2019-01-19 08:22:56 +01:00
Torkel Ödegaard
16d476d228 Query editor row style update & sass cleanup 2019-01-18 19:22:40 +01:00
Torkel Ödegaard
12468c6033 Delete .all.ts@neomake_22624_74.ts 2019-01-18 19:14:22 +01:00
Torkel Ödegaard
5ab9a7c2b8 Further refinements of typings 2019-01-18 19:11:30 +01:00
Torkel Ödegaard
5d17ad1103 more typings work around data query and data source 2019-01-18 18:59:32 +01:00
Torkel Ödegaard
1d2902715f wip: progress on adding query types 2019-01-18 18:14:27 +01:00
Torkel Ödegaard
a69f79caed wip: more typings 2019-01-18 17:43:58 +01:00
Torkel Ödegaard
98fabfae3e wip: typings 2019-01-18 17:23:00 +01:00
Torkel Ödegaard
a231e57c08 Merge pull request #14954 from grafana/minor-style-change
Panel edit mode style tweaks
2019-01-18 16:41:16 +01:00
Torkel Ödegaard
4712a87733 Revert "Specify expected encoding for access/secret key" 2019-01-18 16:37:43 +01:00
Torkel Ödegaard
521c8f34f7 Moved add query button to the right 2019-01-18 15:29:58 +01:00
Pavel Bakulev
43c3d5b8ba Updated removing notification channel by uid 2019-01-18 16:26:23 +02:00
Pavel Bakulev
c27bf6e688 Check that alert notification with id already exists in notification settings 2019-01-18 16:19:06 +02:00
Torkel Ödegaard
4c9046d6c0 Merge pull request #14951 from SamuelToh/14947_gitlab_doc_correction
14947: fixed incorrect flag
2019-01-18 15:10:32 +01:00
Torkel Ödegaard
8a4ce3e4cc Merge pull request #14945 from grafana/hugoh/bug-misalignment-of-explore-panels
Hack for getting the same height in splitted view
2019-01-18 15:09:17 +01:00
Torkel Ödegaard
916f9befa1 Merge pull request #14944 from grafana/explore-datasource-editor-fix
Fixed issue with explore angular query editor support
2019-01-18 14:40:17 +01:00
Torkel Ödegaard
90a324b456 Merge pull request #14953 from flopp999/patch-11
change enabled to true
2019-01-18 14:39:12 +01:00
flopp999
5f4e4a813d change enabled to true
if it is false it will not work
2019-01-18 14:06:15 +01:00
SamuelToh
69e3dc2d4f 14947: fixed incorrect flag 2019-01-18 22:46:43 +10:00
Torkel Ödegaard
453ca25847 Merge branch 'master' of github.com:grafana/grafana 2019-01-18 13:32:58 +01:00
Torkel Ödegaard
a0eddad323 Merge pull request #14934 from grafana/hugoh/refactor-gauge-to-work-with-thresholds
Refactor gauge to work with thresholds
2019-01-18 13:24:52 +01:00
Torkel Ödegaard
46ff9dda71 Fixed scrollbar issue where it jumped to the top 2019-01-18 13:24:26 +01:00
Torkel Ödegaard
3a827fc2f1 Added test case dashboard 2019-01-18 13:12:32 +01:00
Hugo Häggmark
11944adc9c fix: Hack for getting the same height in splitted view, view could use refactor IMHO #14853 2019-01-18 12:03:16 +01:00
Torkel Ödegaard
f16101101d Minor refactoring and name changes 2019-01-18 11:58:29 +01:00
Torkel Ödegaard
f2498645d0 Fixed issue with explore angular query editor support introduced by recent angular query editor changes 2019-01-18 11:20:55 +01:00
Hugo Häggmark
4cc0be2568 Redid logic for fontcolor and thresholds in Gauge and added tests 2019-01-18 09:54:25 +01:00
Torkel Ödegaard
bc8f3374a3 Merge pull request #14936 from grafana/plugin-types-refactor
Plugin types refactor
2019-01-18 08:21:29 +01:00
Hugo Häggmark
c17ccf2289 Make sure we do not change -Infinity 2019-01-18 07:10:00 +01:00
Hugo Häggmark
5448b72f7c Passed the theme to Gauge 2019-01-18 06:57:00 +01:00
Hugo Häggmark
8ccf212f34 Added tests for formatted value 2019-01-18 06:40:30 +01:00
Hugo Häggmark
4f6e87bbbf Small refactor of Gauge and tests 2019-01-18 06:40:30 +01:00
Hugo Häggmark
a6e2be862c Added typings and refactored valuemappings code 2019-01-18 06:40:30 +01:00
Hugo Häggmark
9a01f3e517 Moved Gauge to ui/components 2019-01-18 06:40:30 +01:00
Hugo Häggmark
554d010332 Preparing move to ui/viz 2019-01-18 06:40:30 +01:00
Hugo Häggmark
9dcf3d58ea Fixed getFontColor, added tests and fixed thresholds logic 2019-01-18 06:40:30 +01:00
Hugo Häggmark
533b938fcd Removed baseColor 2019-01-18 06:40:30 +01:00
sharkpc0813
35013a28cd add timeout test for alert handling. 2019-01-18 11:23:00 +09:00
bergquist
fd937e3d95 remove maxage from session token 2019-01-17 21:03:27 +01:00
Marcus Efraimsson
81879f0162 fix broken code 2019-01-17 20:29:26 +01:00
Marcus Efraimsson
97c7963f17 fix cannot set cookie when response is written 2019-01-17 20:27:53 +01:00
Torkel Ödegaard
20c8b9c4a0 began work on react query editor props and integration 2019-01-17 20:02:43 +01:00
Torkel Ödegaard
205e2acdd8 Added data source type to explore state 2019-01-17 19:17:29 +01:00
Torkel Ödegaard
a6f6ed4191 updated snapshot 2019-01-17 19:04:53 +01:00
Torkel Ödegaard
ecab597e5e renaming DataSource type to DataSourceSettings and moved to grafana ui 2019-01-17 18:51:07 +01:00
Torkel Ödegaard
e89746c3d0 Merge pull request #14920 from grafana/12133-autofill-event-hack
iOS login button should be enabled when using browser autofill
2019-01-17 18:41:24 +01:00
Torkel Ödegaard
df0f654da6 Merge pull request #14937 from grafana/fixed-teams-user-picker
Fixed issue with team and user picker
2019-01-17 18:41:04 +01:00
Torkel Ödegaard
32f917557f Fixed issue with team and user picker, fixes #14935 2019-01-17 18:03:46 +01:00
Torkel Ödegaard
febb9e7168 Moved data source and data query types 2019-01-17 17:59:47 +01:00
Torkel Ödegaard
4fc9d794ca Moved plugin types to @grafana/ui 2019-01-17 17:37:34 +01:00
Marcus Efraimsson
8b3fe41b0a log fix 2019-01-17 17:32:33 +01:00
bergquist
c2accfa4c0 inital code for rotate 2019-01-17 17:11:52 +01:00
Torkel Ödegaard
a201c76c5f wip: moved plugin exports 2019-01-17 17:04:24 +01:00
Leonard Gram
dce180e8ac Merge pull request #14924 from xlson/repo-update-improvements
Repo update stability improvements
2019-01-17 16:56:10 +01:00
Leonard Gram
aafa66f644 build: usage instruction for repo test. 2019-01-17 16:55:12 +01:00
Leonard Gram
a95fe15437 build: comments 2019-01-17 16:42:27 +01:00
Torkel Ödegaard
dfe1b20f3d Merge pull request #14930 from grafana/react-query-editor
React query editor (part1)
2019-01-17 15:41:12 +01:00
Torkel Ödegaard
3cb73e7948 Minor fix scrollpos when duplicating 2019-01-17 15:11:38 +01:00
Torkel Ödegaard
a6683dd90e Merge branch 'master' into react-query-editor 2019-01-17 14:57:49 +01:00
David
6f6c4652dc Merge pull request #14928 from grafana/davkal/14926-loki-missing
Explore: Fix datasource selector being empty with single datasource
2019-01-17 14:49:55 +01:00
Torkel Ödegaard
c913263b23 Merge pull request #14875 from grafana/page-layout-component
CustomScrollbar on all-React-pages
2019-01-17 14:49:19 +01:00
Torkel Ödegaard
bfadcd2968 Merge branch 'master' into page-layout-component 2019-01-17 14:48:54 +01:00
Leonard Gram
a585a919b3 build: updates ci deploy. 2019-01-17 14:42:20 +01:00
Leonard Gram
9ecfc39ba5 build: fixes the path for gsutil and gcloud. 2019-01-17 14:02:10 +01:00
Torkel Ödegaard
7c22848cf6 Merge pull request #14897 from grafana/14812/formgroup-component
FormField component
2019-01-17 13:43:14 +01:00
Leonard Gram
18004562a6 build: fixes permissions issue. 2019-01-17 13:40:40 +01:00
Torkel Ödegaard
3047579cdd removed unused props from angular query component interface 2019-01-17 13:27:01 +01:00
Torkel Ödegaard
f041928e58 Additional query editor row tweaks 2019-01-17 13:15:25 +01:00
Torkel Ödegaard
cc4564cf8b Query editor row in react is working 2019-01-17 13:08:20 +01:00
Peter Holmberg
3ce45e7154 shortening callback functions 2019-01-17 11:57:15 +00:00
David Kaltschmidt
648a775acb Explore: Fix datasource selector being empty with single datasource
- The "missing" action was triggered unless the number of datasource >1 🤦
- Made datasource preselection more robust in case the requested datasource is already gone
2019-01-17 12:07:42 +01:00
Torkel Ödegaard
548708a8d3 Scroll to top when visualization picker is opened 2019-01-17 11:27:32 +01:00
Torkel Ödegaard
9cb49d14cd Made scrollbar have scrollTop and setScrollTop props so we can control scroll position 2019-01-17 11:25:44 +01:00
Leonard Gram
d71f1bf4bc build: only build amd64 for enterprise. 2019-01-17 11:00:34 +01:00
Daniel Lee
44c07eb2e9 azuremonitor: guard for when switching from monaco editor
before it has fully loaded.
2019-01-17 10:55:03 +01:00
Daniel Lee
dd96f2a522 azuremonitor: move files into grafana
Initial port of the code from the plugin - lots of small things to fix.
2019-01-17 10:55:03 +01:00
Marcus Efraimsson
af8425da08 Merge pull request #14918 from ScottBrenner/patch-1
cloudwatch.md - quick typo fix
2019-01-17 10:50:05 +01:00
Torkel Ödegaard
bc956057c3 Query editor row react progress, buttons working 2019-01-17 10:26:08 +01:00
Leonard Gram
7ac859715d build: test script for rpm repo. 2019-01-17 10:17:59 +01:00
Johannes Schill
1dfabf498a chore: Replace the deprecated SFC with FC 2019-01-17 09:27:43 +01:00
Johannes Schill
71121e1dbe chore: Wrap footer with React's memo hoc 2019-01-17 09:15:47 +01:00
Johannes Schill
00646b80c6 chore: Reduce code duplication by letting the page component adding the header and taking care of the page title 2019-01-17 09:01:17 +01:00
Torkel Ödegaard
5681370680 mini stylefix to select component 2019-01-17 08:40:23 +01:00
Scott Brenner
a6a70db066 cloudwatch.md - quick typo fix
"you grafana" ➡️ "your Grafana"
2019-01-16 22:03:29 -08:00
Peter Holmberg
736db86d6e removing Label and going with FormLabel 2019-01-16 18:02:27 +00:00
Dominik Prokop
c08313842c Use light theme in storybook 2019-01-16 18:22:08 +01:00
Torkel Ödegaard
6a66d462aa Toggle edit mode works 2019-01-16 17:53:40 +01:00
bergquist
aba6148c43 login users based on token cookie 2019-01-16 16:44:40 +01:00
Johannes Schill
234713466e test: Update snapshots and mocks 2019-01-16 16:29:07 +01:00
Leonard Gram
cae2bdf994 build: deb repo update test usage instructions. 2019-01-16 16:18:10 +01:00
Johannes Schill
3ca7523a02 fix: Use Page component on "Api Keys" and "Preferences" under Configuration 2019-01-16 16:16:19 +01:00
Leonard Gram
38bcb88d8a build: uploads binaries before metadata in deb repo. 2019-01-16 16:05:45 +01:00
Johannes Schill
feeb3ea56d feat: Generate page titles from navModel 2019-01-16 16:03:15 +01:00
Johannes Schill
25304629bd test: Updated snapshots 2019-01-16 16:03:15 +01:00
Johannes Schill
6bd87098cf chore: Better way of getting the body node 2019-01-16 16:03:15 +01:00
Johannes Schill
1e80bac2d2 chore: Reactify footer 2019-01-16 16:03:15 +01:00
Johannes Schill
d426981d1d fix: Add Pages component to Plugins and TeamList 2019-01-16 16:03:15 +01:00
Johannes Schill
b2961a4b4a fix: Configuration: Users should also use the Page component 2019-01-16 16:03:15 +01:00
Johannes Schill
06d8243ab5 feat: Possibility to change document title on pages using the Page component 2019-01-16 16:03:15 +01:00
Johannes Schill
8237c22e24 fix: Add CustomScroller on DataSources page 2019-01-16 16:03:15 +01:00
Johannes Schill
47d86ee818 fix: Proper types for linter 2019-01-16 16:01:42 +01:00
Johannes Schill
9e0e91a90a test: Snapshot update 2019-01-16 16:01:42 +01:00
Johannes Schill
1d8e036bcb fix: Fix import path after Scrollbar move to @grafana/ui 2019-01-16 16:01:42 +01:00
Torkel Ödegaard
7f4a479451 POC of page layout component 2019-01-16 16:01:42 +01:00
Pavel Bakulev
6a8e39ba17 Added uid to AlertNotification json 2019-01-16 16:52:00 +02:00
Pavel Bakulev
f461d52004 Converted notification id to uid via fmt for old alert notification settings 2019-01-16 16:52:00 +02:00
Pavel Bakulev
2de32756c2 Returned id for alert notifications which were created without uid 2019-01-16 16:52:00 +02:00
Pavel Bakulev
4bcace567b Formatted errors to err 2019-01-16 16:50:00 +02:00
Pavel Bakulev
d0370ea7ad Using func InitNotifier for verifying notification settings 2019-01-16 16:50:00 +02:00
Pavel Bakulev
f132e929ce Added uid for alert notifications 2019-01-16 16:50:00 +02:00
Pavel Bakulev
6d1ec19fe9 Renamed validation funcs for alert notification 2019-01-16 16:45:42 +02:00
Pavel Bakulev
7b09dd38d8 Commented alert_notifications sample config 2019-01-16 16:45:42 +02:00
Pavel Bakulev
5c10a897f8 Instantiating notifiers from config before using 2019-01-16 16:45:42 +02:00
Pavel Bakulev
e1b87fc597 Added parameter org_name of alert notification to documentation 2019-01-16 16:45:42 +02:00
Pavel Bakulev
4fa45253cf Added orgName parameter for alert_notifications 2019-01-16 16:45:42 +02:00
Pavel Bakulev
6e3e9a337d Added alert_notification configuration 2019-01-16 16:45:42 +02:00
Peter Holmberg
01251927b3 redoing input props 2019-01-16 14:43:22 +00:00
Pavel
8011a6f45b Merge pull request #6 from grafana/master
Updating master
2019-01-16 16:35:59 +02:00
Torkel Ödegaard
8fef2138b2 another minor style change 2019-01-16 15:35:32 +01:00
Peter Holmberg
0d95527924 Merge branch 'master' into 14812/formgroup-component 2019-01-16 14:27:47 +00:00
Torkel Ödegaard
05b82bede3 More style tweaks to thresholds 2019-01-16 15:13:59 +01:00
Johannes Schill
a558e76a68 fix: Manually trigger a change-event when autofill is used in webkit-browsers #12133 2019-01-16 15:10:37 +01:00
Peter Holmberg
4c4e88910d move styling 2019-01-16 13:52:38 +00:00
Peter Holmberg
4c40274313 renaming after pr feedback 2019-01-16 13:46:57 +00:00
Torkel Ödegaard
cc8b450799 minor style change 2019-01-16 14:36:01 +01:00
Torkel Ödegaard
ff8592d1fe Merge pull request #14909 from grafana/hugoh/move-valuemappings-to-ui-components
Move ValueMappings to UI Components
2019-01-16 14:10:25 +01:00
Torkel Ödegaard
166e5edebd wip: testing new query editor row design 2019-01-16 14:00:29 +01:00
Hugo Häggmark
8df11e93a1 Removed snapshot 2019-01-16 12:46:43 +01:00
Hugo Häggmark
013d46b707 Refactored ValueMappings 2019-01-16 12:29:43 +01:00
Hugo Häggmark
c90979a8f0 Moved ValueMappings to grafana/ui/component and renamed it ValueMappingsEditor 2019-01-16 12:29:04 +01:00
Hugo Häggmark
639dc6c3c3 Moved Label to grafana/ui/components 2019-01-16 12:29:04 +01:00
Torkel Ödegaard
4bad76c0f4 Merge branch 'master' into react-query-editor 2019-01-16 12:23:25 +01:00
Torkel Ödegaard
6edc4e9f02 Merge pull request #14898 from grafana/hughag/template-variable-support-for-react-panels
Template variable support for react panels
2019-01-16 11:39:30 +01:00
David
25e6d075ab Merge pull request #14821 from grafana/davkal/explore-redux
Explore: Redux migration
2019-01-16 11:13:30 +01:00
Leonard Gram
b3512f43a3 build: repo update testable and more robus.
- adds script for integration testing
- package path parameterized
- more robust updates
2019-01-16 11:11:00 +01:00
Dominik Prokop
6d3e6b1fcb Experimenting with generating doc for ui component 2019-01-16 10:27:09 +01:00
David Kaltschmidt
9575a4a2c0 Move action properties to payload 2019-01-16 10:21:11 +01:00
Torkel Ödegaard
824a9a85db Merge pull request #14890 from grafana/14871-unit-picker-scroll-issue
fix: It should be possible to scroll in the unit picker before select…
2019-01-16 09:53:30 +01:00
Hugo Häggmark
45a08792be Fixed small bug with entries outside the min max values 2019-01-16 09:50:05 +01:00
Hugo Häggmark
f16a2c0f48 Fixed NaN issue when parsing 2019-01-16 09:50:05 +01:00
Hugo Häggmark
38c0e91666 Remove BasicGaugeColor from state 2019-01-16 09:50:05 +01:00
Hugo Häggmark
0b1aea905a Fixed so that we can not change base threshold 2019-01-16 09:50:05 +01:00
Hugo Häggmark
aaaf3f7ff1 Fixed so added threshold colors are always unique 2019-01-16 09:50:05 +01:00
Hugo Häggmark
2836bc2a13 Fixed issue with changing value not changing index 2019-01-16 09:50:05 +01:00
Hugo Häggmark
92a1b55a4a Fixed styling for small screens 2019-01-16 09:50:05 +01:00
Hugo Häggmark
ad1505b346 Reordered the input row 2019-01-16 09:50:05 +01:00
Hugo Häggmark
39c672cb1f Fixed the circle 2019-01-16 09:50:05 +01:00
Hugo Häggmark
7934116e5c Fixed styling 2019-01-16 09:50:05 +01:00
Hugo Häggmark
a431efa0da Refactored logic in ThresholdEditor 2019-01-16 09:50:05 +01:00
Torkel Ödegaard
030d20d90d Merge pull request #14896 from grafana/scrollbar-select-fix
Scrollbar select fix
2019-01-16 09:46:10 +01:00
Carl Bergquist
f9560f949d Merge pull request #14885 from bergquist/remove_log2
removes global log 2 functions
2019-01-16 09:34:40 +01:00
David Kaltschmidt
6ff15039a9 File organization, action naming, comments
- moved ActionTypes to `./state/actionTypes`
- renamed click-related actions
- added comments to actions and state types
- prefixed Explore actions with `explore/`
- fixed query override issue when row was added
2019-01-15 20:04:05 +01:00
David Kaltschmidt
9aede9e636 Fix reducer issues 2019-01-15 20:04:03 +01:00
David Kaltschmidt
546a3a9d98 Connect Explore child components to store 2019-01-15 20:04:01 +01:00
David Kaltschmidt
607f7c25de Update comments 2019-01-15 20:03:59 +01:00
David Kaltschmidt
f02f41c9b0 Move types to types/explore 2019-01-15 20:03:57 +01:00
David Kaltschmidt
be172d3e4a Save state in URL and fix tests 2019-01-15 20:03:55 +01:00
David Kaltschmidt
68c039b289 Allow multiple Explore items for split 2019-01-15 20:03:53 +01:00
David Kaltschmidt
2be2deddb8 WIP Explore redux migration 2019-01-15 20:03:51 +01:00
Hugo Häggmark
5c9c024475 Fixed a bug with prefix and suffix not showing when using value mappings 2019-01-15 18:41:04 +01:00
Peter Holmberg
83fbf52aac fixing imports, minor fix on mapping row 2019-01-15 17:33:42 +00:00
Peter Holmberg
58094faa12 test and minor fix on mapping row 2019-01-15 17:31:42 +00:00
Torkel Ödegaard
9bf3d49393 updated snapshot 2019-01-15 18:26:21 +01:00
Peter Holmberg
219da09f0e Merge branch 'master' into 14812/formgroup-component 2019-01-15 17:19:13 +00:00
Hugo Häggmark
6bb2d5ff24 Added suffix interpolation 2019-01-15 18:05:55 +01:00
Torkel Ödegaard
7105d16131 Scrollbar select fix 2019-01-15 18:02:05 +01:00
Dominik Prokop
b7451bc774 Merge pull request #14894 from grafana/grafana-ui/move-spectrum
Move ColorPicker leftovers to @grafana/ui
2019-01-15 17:57:24 +01:00
Dominik Prokop
8cfa2c00d1 Remove duplicated import 2019-01-15 17:35:24 +01:00
Hugo Häggmark
1faa5819a8 Initial commit 2019-01-15 17:15:46 +01:00
Daniel Lee
3bdd4a5c33 changelog: adds note for #14795 2019-01-15 17:14:58 +01:00
Daniel Lee
8e771f9a8f Merge pull request #14876 from grafana/davkal/14795-annotation-step
Prometheus: Fix annotation step calculation
2019-01-15 17:12:07 +01:00
Dominik Prokop
2991b64b60 Merge branch 'grafana-ui/move-spectrum' into tooling/storybook-poc 2019-01-15 16:14:01 +01:00
Dominik Prokop
89a0d1090d Move ColorPicker leftovers to @grafana/ui 2019-01-15 15:43:17 +01:00
Marcus Efraimsson
8764fb5aa6 inject login/logout hooks 2019-01-15 15:16:20 +01:00
Marcus Efraimsson
b0df7280be begin user auth token implementation 2019-01-15 15:16:20 +01:00
Marcus Efraimsson
e08f61059b utils 2019-01-15 15:16:20 +01:00
Johannes Schill
d59f1fe629 fix: It should be possible to scroll in the unit picker before selecting a value #14871 2019-01-15 14:15:04 +01:00
bugficks
f31fe495e9 fix go fmt 2019-01-15 13:54:25 +01:00
bugficks
7db848f153 [Feature request] MySQL SSL CA in datasource connector
https://github.com/grafana/grafana/issues/8570
2019-01-15 13:29:56 +01:00
bergquist
3cd0cb3d3f removes debug2 logging 2019-01-15 11:52:39 +01:00
bergquist
1b6203e430 removes error2 logger 2019-01-15 11:49:18 +01:00
Torkel Ödegaard
33feb26fb5 WIP: good progress on react query editor support 2019-01-15 11:40:12 +01:00
Leonard Gram
d907b1ec6b Updates to latest checking. 2019-01-15 11:00:45 +01:00
Leonard Gram
85c68cc734 5.4.3 changelog 2019-01-15 10:49:53 +01:00
bergquist
1c0a385df1 changelog: adds ntoe about closing #12864 2019-01-15 10:37:56 +01:00
Carl Bergquist
1a7eb2f462 Merge pull request #14868 from bergquist/provisioning_inifinite_loop
Avoid infinite loop in the dashboard provisioner
2019-01-15 10:34:18 +01:00
sharkpc0813
e172bade40 fix that alert context and result handle context do not use the same derived context. 2019-01-15 17:51:50 +09:00
Daniel Lee
191f603459 docs: add a title to the Explore docs 2019-01-15 09:36:23 +01:00
Leonard Gram
f5e0d02eb8 Merge pull request #14872 from xlson/build-fixes
build: fixes release problems.
2019-01-15 09:35:32 +01:00
Daniel Lee
16881f64dd Merge pull request #14751 from grafana/reactify-stackdriver
Reactify stackdriver
2019-01-15 00:08:56 +01:00
Daniel Lee
7b1aed6caf stackdriver: converts some variables from any to types 2019-01-14 23:43:31 +01:00
Peter Holmberg
ac62e4a992 FormGroup component and implements 2019-01-14 22:09:06 +00:00
Torkel Ödegaard
0941097dc4 Merge pull request #14880 from grafana/restored-http-settings
Restored http settings directive that was hidden in an unused angular controller
2019-01-14 21:44:30 +01:00
Torkel Ödegaard
6b4dcb38ea Restored http settings directive that was hidden in an unused angular controller page 2019-01-14 21:21:58 +01:00
Daniel Lee
18abb87cbb stackdriver: small fixes after reactifying 2019-01-14 18:23:01 +01:00
Leonard Gram
03c6cc59a7 changelog 2019-01-14 18:01:19 +01:00
Daniel Lee
b4a51ad7ce stackdriver: add help text for bucket alias 2019-01-14 17:52:06 +01:00
David Kaltschmidt
ce3117507a Prometheus: Fix annotation step calculation
- since e731c248d7 step calculation for
annotation queries was broken
- this change puts the interval in the correct parameter so it gets
considered in `createQuery`
- added tests
2019-01-14 17:40:47 +01:00
Daniel Lee
d7a3f91b3c stackdriver: fixes space before caret icon in query editor 2019-01-14 17:25:43 +01:00
Torkel Ödegaard
b0aa1bc71c Merge pull request #14874 from coder-salman/patch-1
Fixed Syntax for folder permission's JSON
2019-01-14 17:02:48 +01:00
Mohammed Salman Khan
aa799c6f0b Fixed Syntax for folder permission's JSON 2019-01-14 10:53:16 -05:00
bergquist
8880829eda avoid infinite loop in the dashboard provisioner
if one dashboard with an uid is refered to by two
provsioners each provsioner overwrite each other.
filling up dashboard_versions quite fast if using
default settings.

ref #12864
2019-01-14 16:38:39 +01:00
Leonard Gram
7b43b9e272 build: fixes release problems. 2019-01-14 16:23:48 +01:00
Marcus Efraimsson
7da544a52b changelog: add notes about closing #5968 2019-01-14 16:03:30 +01:00
Marcus Efraimsson
130e4aa666 Merge pull request #14608 from marefr/es_bucket_script
Fix support bucket script pipeline aggregations
2019-01-14 15:58:42 +01:00
Daniel Lee
a2f6c503a2 Merge remote-tracking branch 'origin/master' into reactify-stackdriver 2019-01-14 15:48:13 +01:00
Torkel Ödegaard
0260c779e8 wip: another wip commit 2019-01-14 15:44:58 +01:00
Torkel Ödegaard
23f84ba5c5 Merge branch 'master' into react-query-editor 2019-01-14 15:39:05 +01:00
Torkel Ödegaard
574760c7e1 Merge pull request #14869 from grafana/clean-ups-and-moves
Clean ups and moves
2019-01-14 15:38:28 +01:00
Dominik Prokop
ad9c96abb5 Merge branch 'master' into tooling/storybook-poc 2019-01-14 15:26:13 +01:00
Torkel Ödegaard
c41171d451 Merge pull request #14859 from grafana/fix/gauge-sizing
Fixed Gauge being cropped when resizing panel
2019-01-14 15:21:42 +01:00
Torkel Ödegaard
827a292777 Moved panel editing components to it's own folder 2019-01-14 15:17:48 +01:00
Torkel Ödegaard
b9a3239edb removed old unused angular stuff, rename 2019-01-14 15:01:47 +01:00
Torkel Ödegaard
0644410b99 wip: react query editors 2019-01-14 14:55:22 +01:00
Torkel Ödegaard
bcf88f6157 Merge pull request #14867 from grafana/value-format-fixes2
Updated singlestat to use new value format function signature
2019-01-14 14:50:17 +01:00
Dominik Prokop
0c8f0416a0 Move panel width/height calculation to PanelChrome 2019-01-14 14:47:41 +01:00
Torkel Ödegaard
37c5ced009 Updated singlestat to use new value format function syntax and capitalized unit categories, fixes #12871 2019-01-14 14:03:08 +01:00
Leonard Gram
b1f5a232da build: build specific enterprise version when releasing. 2019-01-14 13:43:59 +01:00
Dominik Prokop
b3b1c21d77 Fixed Gauge being cropped when resizing panel
Enabled import of SASS viariables into TS
2019-01-14 09:45:55 +01:00
Torkel Ödegaard
46f2808eaf Merge pull request #14849 from grafana/panel-option-section
WIP: Panel option section moved to grafana-ui and new panel option grid
2019-01-14 09:44:33 +01:00
Torkel Ödegaard
9d4354b7c9 Merge pull request #14857 from grafana/14851-velocity-units
units: adds back velocity units.
2019-01-14 08:30:02 +01:00
Daniel Lee
1fea09ba54 units: adds back velocity units. Fixes #14851 2019-01-13 23:37:53 +01:00
bergquist
db448b5d53 Merge branch 'fredbcode-master'
* fredbcode-master:
  Fix bug tls renegociation problem in Notification channel (webhook) #14800
2019-01-13 21:43:47 +01:00
fredbcode
110ffb69de Fix bug tls renegociation problem in Notification channel (webhook) #14800 2019-01-13 21:42:33 +01:00
Carl Bergquist
9793c08613 Merge pull request #14855 from papagian/14841-api-error-unexisting-alert-notification
Fix Error 500 on unexisting /api/alert-notification/<id>
2019-01-13 21:05:54 +01:00
Sofia Papagiannaki
8def73ba13 Fix Error 500 on unexisting /api/alert-notification/<id> 2019-01-13 21:30:20 +02:00
Torkel Ödegaard
9e0f961fd5 updated snapshot 2019-01-13 12:51:21 +01:00
Torkel Ödegaard
c11ec79056 Minor renames and other fixes 2019-01-13 12:42:21 +01:00
NighterMan
ec0fe11939 pushover: add support for attaching images (closes #10780)
Use native pushover native attachment support to deliver images
2019-01-13 04:09:51 +01:00
Torkel Ödegaard
8f5300dd2a Merge pull request #14848 from grafana/grafana-ui-simple-layout
Simplified folder structure in grafana-ui lib
2019-01-12 21:47:07 +01:00
Torkel Ödegaard
5b59d59afa panel option section moved to grafana-ui and new panel option grid component 2019-01-12 21:43:41 +01:00
Torkel Ödegaard
9c54da8f5d Simplified folder structure in grafana-ui lib 2019-01-12 20:43:15 +01:00
Torkel Ödegaard
1cc6d0e787 Merge pull request #14716 from grafana/kbn-formats-refactor
WIP: Move value formats to @grafana/ui
2019-01-12 19:43:08 +01:00
Torkel Ödegaard
10bbb32d00 Merge pull request #14842 from grafana/time-overrides-test
Panel time override tests
2019-01-12 19:36:23 +01:00
Dominik Prokop
7289e6e500 Addedd assertions about raw time range when panel time overriden 2019-01-11 16:49:29 +01:00
Dominik Prokop
c3fdc1a0fb Panel time override tests 2019-01-11 16:21:44 +01:00
Erik Sundell
b6171fa3c7 add feedback to what interval is being used (calculated in the backend) 2019-01-11 15:14:35 +01:00
Erik Sundell
e73d363129 Merge remote-tracking branch 'origin/master' into reactify-stackdriver
# Conflicts:
#	public/app/core/angular_wrappers.ts
#	yarn.lock
2019-01-11 15:12:29 +01:00
Torkel Ödegaard
ba9d5115d2 Merge branch 'master' into kbn-formats-refactor 2019-01-11 14:33:04 +01:00
Erik Sundell
b596550210 use typings for ds and template srv 2019-01-11 13:53:04 +01:00
Torkel Ödegaard
9e6411bf4b value formats: another rename and updates code to use new valueFormats func 2019-01-11 13:31:25 +01:00
Hugo Häggmark
f5ae40cf54 Merge pull request #14811 from grafana/move-threshold-component-to-ui-components
Moved Thresholds and styles to grafana/ui/components
2019-01-11 12:14:09 +01:00
Hugo Häggmark
d97cd450c9 Merge 2019-01-11 11:41:08 +01:00
Torkel Ödegaard
8aae6e8c09 value formats: renamed folder 2019-01-11 11:31:40 +01:00
Hugo Häggmark
d2b71cff37 Reverted move of defaults for GaugePanelOptions 2019-01-11 11:25:49 +01:00
Torkel Ödegaard
bc78c8d56e Merge pull request #14817 from grafana/grafana-ui/select
Migrate Select components to @grafana/ui
2019-01-11 11:13:12 +01:00
Erik Sundell
3871ef29f9 refactoring alias by 2019-01-11 10:29:53 +01:00
Dominik Prokop
391253ee2d Merge branch 'master' into grafana-ui/select 2019-01-11 09:52:26 +01:00
Dominik Prokop
537e2534a6 Move Select styles to grafana/ui 2019-01-11 09:50:05 +01:00
Torkel Ödegaard
11ad92c08e Merge pull request #14831 from grafana/fix/time-range-overrides
Fix panel time overrides not being applied fully
2019-01-11 09:38:15 +01:00
Torkel Ödegaard
fda0f92cf9 Merge pull request #12991 from pgiraud/repeat_min_span
Repeating panels - Max per row
2019-01-11 09:31:21 +01:00
Torkel Ödegaard
5d53f7e68b Merge pull request #14834 from grafana/14793/loading-placeholder-to-grafanaui
Loading placeholder to grafanaui
2019-01-11 09:25:34 +01:00
Hugo Häggmark
5ceedc4ac4 Moved defaultProps to ui/components 2019-01-11 09:16:53 +01:00
Torkel Ödegaard
6d669e2c74 Merge branch 'master' into 14793/loading-placeholder-to-grafanaui 2019-01-11 09:10:49 +01:00
Hugo Häggmark
0b8165fee2 Merge branch 'move-threshold-component-to-ui-components' of https://github.com/grafana/grafana into move-threshold-component-to-ui-components 2019-01-11 08:46:59 +01:00
Hugo Häggmark
c54ec5f52f Moved the rest of Threshold dependencies to ui/components 2019-01-11 08:30:30 +01:00
Hugo Häggmark
c05b92c2e0 Renamed Threshold files 2019-01-11 07:14:28 +01:00
Hugo Häggmark
0b6e21e9ac Renamed Thresholds to ThresholdsEditor 2019-01-11 07:12:53 +01:00
Hugo Häggmark
1581662a6c Moved Thresholds and styles to grafana/ui/components 2019-01-11 07:11:40 +01:00
Hugo Häggmark
dc9b83030f Removed default export for colors 2019-01-11 07:03:12 +01:00
Hugo Häggmark
6f2bbb7378 Fixed typings 2019-01-11 07:03:12 +01:00
Hugo Häggmark
37dae043d7 Small change in SeriesColorPickerPopoverProps 2019-01-11 07:03:12 +01:00
Hugo Häggmark
d376fae393 Moved colorpicker to ui/components 2019-01-11 07:03:12 +01:00
Peter Holmberg
2f0ab99ae5 Fixing test and small refactor 2019-01-10 22:15:37 +00:00
Peter Holmberg
08ac2959a4 Moving to grafana ui, fix issue with TestRuleResult 2019-01-10 21:47:09 +00:00
Torkel Ödegaard
7e106b0f49 Merge pull request #14805 from SamuelToh/11503_prevent_end_of_regexpr
11503: escape measurement filter regex value
2019-01-10 20:29:07 +01:00
Dominik Prokop
60fadcf1e5 Fix panel time overrides not being applied fully
When both relative and time shift were applied, only time shift was taken into consideration
2019-01-10 20:15:03 +01:00
Erik Sundell
b64115e5f5 access scope directly from this. update tests 2019-01-10 17:18:24 +01:00
Leonard Gram
0f82fffed6 build: makes sure all builds use the latest container. 2019-01-10 16:52:21 +01:00
Leonard Gram
cdfdc676ae changelog: docker images for arm. 2019-01-10 16:50:36 +01:00
Dominik Prokop
d322717f3e Renamed Select related components: Picker* to Select*, Option* to SelectOption* 2019-01-10 15:21:11 +01:00
Carl Bergquist
0a98306e4b Merge pull request #14813 from bergquist/zero_frequency
Make sure that frequency is never set to zero
2019-01-10 15:20:01 +01:00
Leonard Gram
c22ef628f3 build: removes curl install from build. 2019-01-10 15:12:43 +01:00
Leonard Gram
a82f0ed393 build: tags arm as well as amd64 as latest. 2019-01-10 14:41:02 +01:00
Johannes Würbach
702d449001 Docker image for ARM 2019-01-10 14:41:02 +01:00
Dominik Prokop
53f0f08efa Fixing TS and updating snapshot 2019-01-10 14:24:24 +01:00
bergquist
fbb3ad5fc4 make sure frequency cannot be zero
frequency set to zero causes division by zero
panics in the alert schedular.

closes #14810
2019-01-10 14:17:10 +01:00
Erik Sundell
6a2f5eb61e refactoring. fix broken test 2019-01-10 13:49:11 +01:00
Dominik Prokop
7819529d45 Migrate Select components to @grafana/ui 2019-01-10 13:29:53 +01:00
Erik Sundell
5fed50713d provide angular directive scope props correctly 2019-01-10 12:02:38 +01:00
Daniel Lee
96759e39a6 docker: enable flux in influxdb docker block 2019-01-10 09:47:39 +01:00
Hugo Häggmark
5fc0766341 Moved Thresholds and styles to grafana/ui/components 2019-01-10 09:37:32 +01:00
Torkel Ödegaard
1dc1af7e00 Update README.md 2019-01-10 08:37:40 +01:00
Torkel Ödegaard
322a3efb25 Merge pull request #14779 from grafana/tooling/ignore-not-found-export-warnings
Removes unnecessary warnings from webpack output about missing exports
2019-01-10 07:25:35 +01:00
Torkel Ödegaard
4c42db9e95 Merge pull request #14804 from SamuelToh/4075_support_templatevar_on_alias_es_ds
4075: Interpolate tempvar on alias
2019-01-10 07:24:17 +01:00
Torkel Ödegaard
b25214bfe1 Merge pull request #14786 from grafana/14729-move-testrulebutton-to-toolbar
14729 move testrulebutton to toolbar
2019-01-10 07:11:45 +01:00
SamuelToh
9e3ab71e40 11503: escape measurement filter regex value 2019-01-10 10:47:22 +10:00
SamuelToh
e1f6870fce 4075: Interpolate tempvar on alias 2019-01-10 09:53:06 +10:00
Peter Holmberg
31d35a6884 rename 2019-01-09 22:21:42 +00:00
Peter Holmberg
13e6d2c5cb fixing unitpicker 2019-01-09 22:05:29 +00:00
Peter Holmberg
78fe2db5e5 removing tests 2019-01-09 21:35:01 +00:00
Peter Holmberg
cf4f98857a Merge branch 'master' into move-value-formats 2019-01-09 21:13:53 +00:00
Torkel Ödegaard
032d69fc21 Merge pull request #14801 from grafana/reorganize-gauge-panel
Minor refactor of Gauge panel
2019-01-09 18:26:17 +01:00
Torkel Ödegaard
ddaec8db58 Merge pull request #14796 from grafana/14271-tooltip-themes
feat: Tooltip theme and use it on panel edit tabs
2019-01-09 17:36:49 +01:00
Dominik Prokop
cdc99e129f React graph panel options component rename 2019-01-09 17:21:14 +01:00
Dominik Prokop
1618e90844 Minor refactor of Gauge panel 2019-01-09 17:00:10 +01:00
Leonard Gram
13a962cc50 Revert "Docker image for ARM"
This reverts commit 5f7e6a5c73.
2019-01-09 16:25:07 +01:00
Leonard Gram
a237a495b0 Revert "build: fixes docker push."
This reverts commit be57f6878c.
2019-01-09 16:25:07 +01:00
Leonard Gram
be57f6878c build: fixes docker push. 2019-01-09 15:52:04 +01:00
Johannes Schill
d8a91fa355 feat: Add brand as tooltip theme and use it on panel edit tabs #14271 2019-01-09 15:36:53 +01:00
Johannes Würbach
5f7e6a5c73 Docker image for ARM 2019-01-09 15:09:13 +01:00
Torkel Ödegaard
ba19773347 Merge pull request #14792 from grafana/adios-scrollbar
chore: Remove ScrollBar component, superseded by CustomScrollbar
2019-01-09 14:51:33 +01:00
Erik Sundell
23996b364e fix broken test 2019-01-09 14:44:47 +01:00
Erik Sundell
92121cacd1 Merge remote-tracking branch 'origin/master' into reactify-stackdriver
# Conflicts:
#	yarn.lock
2019-01-09 14:33:41 +01:00
Johannes Schill
6ab1abc131 chore: Remove ScrollBar component, superseded by CustomScrollbar 2019-01-09 14:02:22 +01:00
Dominik Prokop
602bbcb0db Update storybook static files option to load statics correctly 2019-01-09 14:01:46 +01:00
Erik Sundell
d51f91f54b unregister event listener correctly 2019-01-09 13:56:15 +01:00
Torkel Ödegaard
2d16c29a1a Merge pull request #14766 from grafana/fix-toggle-button-group-corners
Fix toggle button group corners
2019-01-09 13:41:40 +01:00
Hugo Häggmark
236d7b1213 Changes after PR comments 2019-01-09 13:20:50 +01:00
Dominik Prokop
525367c591 Merge branch 'master' into fix-toggle-button-group-corners 2019-01-09 13:15:34 +01:00
Dominik Prokop
6e3225c29e Removed unused refClassNameprops from Propper 2019-01-09 13:09:26 +01:00
Torkel Ödegaard
34c4e245f3 Merge pull request #14775 from grafana/14759-customscrollbar2grafanaui
chore: Move CustomScrollbar to @grafana/ui #14759
2019-01-09 12:28:30 +01:00
Torkel Ödegaard
d248643881 Merge pull request #14774 from grafana/14773-light-theme-page-bg
Changed light-theme page background gradient
2019-01-09 11:52:58 +01:00
Hugo Häggmark
67e8958aec Fixed a small bug when toggling items in toolbar 2019-01-09 11:49:17 +01:00
Leonard Gram
ad61bff377 build: deploys enterprise to its own repo. 2019-01-09 11:42:55 +01:00
Leonard Gram
76e9607b25 build: inline docs 2019-01-09 11:42:55 +01:00
Leonard Gram
b9c4eb70b1 build: publishes beta releases to separate repos. 2019-01-09 11:42:55 +01:00
Leonard Gram
8f5886e6d4 refactoring 2019-01-09 11:42:55 +01:00
Leonard Gram
bbbeb78c17 build: makes repo update enterprise compatible. 2019-01-09 11:42:55 +01:00
Leonard Gram
89956a6a41 build: uses official deployment image. 2019-01-09 11:42:55 +01:00
Leonard Gram
a98c75121f build: adds aptly and createrepo to deploy tools. 2019-01-09 11:42:55 +01:00
Leonard Gram
31066aebb4 build: handles unexpected cases. 2019-01-09 11:42:55 +01:00
Leonard Gram
919617ef96 build: only adds the correct packages to the repo. 2019-01-09 11:42:55 +01:00
Leonard Gram
c3e23d7574 build: rpm repo deploy. 2019-01-09 11:42:55 +01:00
Leonard Gram
a26a10cfd1 build: repo update input error. 2019-01-09 11:42:55 +01:00
Leonard Gram
7fea1f84c0 build: release of debs to our debian repo. 2019-01-09 11:42:55 +01:00
Hugo Häggmark
9b8a5333cb Added tests for TestRuleButton 2019-01-09 11:39:56 +01:00
Hugo Häggmark
8b8af6436c Removed Test Rule button from Angular and view 2019-01-09 11:38:10 +01:00
Hugo Häggmark
e2fe663dba Added TestRuleButton 2019-01-09 11:34:22 +01:00
Pierre GIRAUD
f374da032e Hint for user on when the repeat is applied 2019-01-09 11:34:13 +01:00
Dominik Prokop
0571ad5ad7 Removes unnecessary warnings from webpack output about missing exports
This should not break anything as ForkTsCheckerWebpackPlugin takes care of that
2019-01-09 11:33:08 +01:00
Pierre GIRAUD
97b087f5a5 Use factors for max repeated panels per row 2019-01-09 11:17:48 +01:00
Dominik Prokop
0b4d212bd2 Fixing TS errors and updating snapshot 2019-01-09 10:56:40 +01:00
Dominik Prokop
fae8ff5750 Move Portal to @grafana/ui 2019-01-09 10:55:38 +01:00
Johannes Schill
702e1b01bb chore: Move sass code related to custom scrollbar into @grafana/ui #14759 2019-01-09 10:35:03 +01:00
Dominik Prokop
076defdc0b Post merge updates 2019-01-09 10:33:20 +01:00
ijin08
7133b79928 Merge branch 'master' into 14773-light-theme-page-bg 2019-01-09 10:21:48 +01:00
Dominik Prokop
1e7f3f2892 Merge branch 'master' into grafana-ui/tooltip 2019-01-09 10:19:45 +01:00
Johannes Schill
6ac25d41fa chore: Move CustomScrollbar to @grafana/ui #14759 2019-01-09 09:49:45 +01:00
ijin08
fb76f41a15 changed light theme page background gradient 2019-01-09 09:42:30 +01:00
Dominik Prokop
0fb23bd334 WIP 2019-01-09 09:40:57 +01:00
Pierre GIRAUD
a881497908 Max number of repeated panels per row
Instead of min width
2019-01-09 08:01:42 +01:00
Dominik Prokop
79c6fdc0e8 wip 2019-01-08 20:51:00 +01:00
Torkel Ödegaard
a9808ef518 Merge pull request #14763 from grafana/14528-panel-errors
Panel errors
2019-01-08 17:41:31 +01:00
Dominik Prokop
22c9ce7de8 Make tooltips persistent when hovered 2019-01-08 17:01:50 +01:00
Leonard Gram
023e496108 docs: rpm/deb beta repo. 2019-01-08 16:49:29 +01:00
Erik Sundell
ae50d83608 update snapshot 2019-01-08 16:21:38 +01:00
Erik Sundell
6c00f3e511 add form grow 2019-01-08 16:08:09 +01:00
Johannes Schill
12a3edd6e5 fix: Clean up per PR feedback. Thanks @dprokop 2019-01-08 16:04:46 +01:00
Torkel Ödegaard
badd00d962 Merge pull request #14768 from grafana/14729-move-alerttab-and-statehistory
Moved AlertTab and StateHistory to app/features/alerting
2019-01-08 15:57:43 +01:00
Peter Holmberg
38dcbeb2fd removing duplicated things 2019-01-08 15:56:01 +01:00
Torkel Ödegaard
df83c4650d minor code refactor 2019-01-08 15:54:52 +01:00
Torkel Ödegaard
6f6825c53a Merge pull request #14767 from grafana/14667-edit-panel
fix: When loki is default data source, datasource is passed as undefi…
2019-01-08 15:29:53 +01:00
Peter Holmberg
de38769973 splitting into more files 2019-01-08 15:25:23 +01:00
Hugo Häggmark
8d210afd76 Moved AlertTab and StateHistory to app/features/alerting 2019-01-08 15:18:29 +01:00
Johannes Schill
bf478a40b1 fix: When loki is default data source, datasource is passed as undefined to QueryOptions #14667 2019-01-08 14:58:57 +01:00
Erik Sundell
d215eecf63 remove redundant max-width. it's already declared in gf-form-select-box__menu-list 2019-01-08 14:05:30 +01:00
Erik Sundell
b8c2ba3320 add typing for metric descriptor 2019-01-08 14:03:52 +01:00
Dominik Prokop
e03461cea2 Removed unused Popover component 2019-01-08 13:54:54 +01:00
Dominik Prokop
ec904cf662 Update components to fit updated PopperController API 2019-01-08 13:53:59 +01:00
Erik Sundell
8867d8e99c make templateSrv a prop 2019-01-08 13:52:19 +01:00
Dominik Prokop
de4e1a91f7 Refactored withPoper HOC to PopperController using render prop 2019-01-08 13:44:10 +01:00
Erik Sundell
dc7f98de6a use correct event handler name convention. register directive on startup 2019-01-08 13:37:08 +01:00
Johannes Schill
f428db282c fix: Remove the onRenderError prop and add an ErrorBoundary component 2019-01-08 13:32:08 +01:00
Erik Sundell
f9f51d6819 replace fragment with empty jsx tags 2019-01-08 13:00:31 +01:00
Erik Sundell
e71e2b3035 refactoring tests 2019-01-08 12:52:47 +01:00
Erik Sundell
803d546c70 ugly fix. will be removed later on 2019-01-08 12:44:43 +01:00
Daniel Lee
8e8b759b21 adds note for #13914 and #14581 2019-01-08 10:47:14 +01:00
Daniel Lee
f95b4b3882 Merge pull request #14735 from challengerdeep/14581_fix-stackdriver-series-aggregation-merge
Fix stackdriver aggregation series merge
2019-01-08 10:40:37 +01:00
Peter Holmberg
abb98a25e4 moved all units 2019-01-08 10:35:10 +01:00
Johannes Schill
bcb94cc0ec fix: GraphPanel should be a PureComponent 2019-01-08 10:30:00 +01:00
Erik Sundell
d6e7fccc97 fix more broken tests 2019-01-08 10:00:10 +01:00
Johannes Schill
4f943687d8 feat: Display error when plot fail to render 2019-01-08 09:55:23 +01:00
Erik Sundell
c964d6d7ef wip: fix broken tests 2019-01-08 08:51:34 +01:00
Peter Holmberg
36e4bf5985 adding more units and functions 2019-01-07 17:00:10 +01:00
Torkel Ödegaard
56edba5a63 Merge pull request #14746 from jaken551/master
14722 - removing unnecessary arn check that breaks assume role featur…
2019-01-07 16:49:35 +01:00
Torkel Ödegaard
a9077e1a1c Merge pull request #14758 from grafana/explore/run-query-button-glitch-fix
Remove the jump effect on run query button
2019-01-07 16:15:48 +01:00
Dominik Prokop
96be5fe8a3 Remove the jump effect on run query button
Caused by the return and loading spinner icons having different widths. Used fa-fw helper class to ensure fixed width on icons. Also, made the spacing between icon and button label slightly smaller, as the rotated level-down icon used as return icon has significantly smaller width compared to the loading spinner and it looked oddly far from the label as compared to timepicker's icon
2019-01-07 15:26:43 +01:00
Erik Sundell
87cb3d4caa ugly temporary fix for scope issue. will be removed later on 2019-01-07 14:52:36 +01:00
Erik Sundell
e75aec9954 refactoring 2019-01-07 14:51:20 +01:00
Erik Sundell
e61fa37db4 fix filter bug 2019-01-07 14:15:53 +01:00
Erik Sundell
49144f07e4 Merge branch '14293-metric-display-names' into reactify-stackdriver
# Conflicts:
#	public/app/plugins/datasource/stackdriver/partials/query.aggregation.html
#	public/app/plugins/datasource/stackdriver/partials/query.editor.html
#	public/app/plugins/datasource/stackdriver/partials/query.filter.html
#	public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
#	public/app/plugins/datasource/stackdriver/query_ctrl.ts
#	public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
#	public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts
2019-01-07 13:59:36 +01:00
Johannes Schill
0b89f81609 fix: Light theme corner bg color update 2019-01-07 13:56:36 +01:00
Erik Sundell
4d07f56354 set max width on the whole menu list instead 2019-01-07 13:46:15 +01:00
Johannes Schill
a6abe50dba Merge branch '14528-panel-errors' of https://github.com/grafana/grafana into 14528-panel-errors
# Conflicts:
#	public/app/features/dashboard/dashgrid/DataPanel.tsx
2019-01-07 13:41:22 +01:00
Erik Sundell
9ec6831713 bind array instead of function 2019-01-07 13:37:39 +01:00
Johannes Schill
79fd8a7eda feat: Add "theme" to Tooltip 2019-01-07 13:31:50 +01:00
Johannes Schill
dadbaccfeb Notify user on query error 2019-01-07 13:29:10 +01:00
Johannes Schill
5143a2669d feat: Add "theme" to Tooltip 2019-01-07 13:05:27 +01:00
Erik Sundell
92d6442948 Revert "Revert "add max width to group header description""
This reverts commit d25138060f.
2019-01-07 11:44:10 +01:00
Erik Sundell
d25138060f Revert "add max width to group header description"
This reverts commit 86a39183ee.
2019-01-07 11:27:48 +01:00
Erik Sundell
7b4b1a4f90 remove not used property 2019-01-07 11:26:06 +01:00
Erik Sundell
899811a934 fix broken tests 2019-01-07 11:26:06 +01:00
Erik Sundell
126ceb9780 use correct type for select option 2019-01-07 11:26:06 +01:00
Erik Sundell
4928984825 set issearchable default value to true 2019-01-07 11:26:06 +01:00
Erik Sundell
102a130a2d make variable type more slim 2019-01-07 11:26:06 +01:00
Erik Sundell
786df7920e remove group name from select component. let the parent set group name instead 2019-01-07 11:26:06 +01:00
Erik Sundell
03856b4e55 move component to components dir. also move directive registration out from datasource 2019-01-07 11:26:06 +01:00
Erik Sundell
58bea1de79 add template variable type 2019-01-07 11:26:06 +01:00
Erik Sundell
96d65b55b6 rename template variables prop 2019-01-07 11:26:06 +01:00
Erik Sundell
ff762c213f rename selected prop 2019-01-07 11:26:06 +01:00
Erik Sundell
3ca5abf5e9 rename searchable prop 2019-01-07 11:26:06 +01:00
Erik Sundell
1e5f2f56e0 improve component performance 2019-01-07 11:26:05 +01:00
Erik Sundell
86a39183ee add max width to group header description 2019-01-07 11:26:05 +01:00
Erik Sundell
5eb22388c3 remove debug logging 2019-01-07 11:26:05 +01:00
Erik Sundell
243c4bfe29 rollback test state to before template variables were added 2019-01-07 11:26:05 +01:00
Erik Sundell
2b8185cb80 cleanup 2019-01-07 11:26:05 +01:00
Erik Sundell
02b745f106 move template variable logic to component 2019-01-07 11:26:05 +01:00
Erik Sundell
d42e39a072 remove extra arrow div 2019-01-07 11:26:05 +01:00
Erik Sundell
bdf2573db9 fix condition that expands group if it has a selected child. also make it possible to pass expanded as a prop 2019-01-07 11:26:05 +01:00
Erik Sundell
93bc7e8fa5 align input widths 2019-01-07 11:26:05 +01:00
Erik Sundell
b9b25e766f remove console log 2019-01-07 11:26:05 +01:00
Erik Sundell
a441251cf5 rename directive 2019-01-07 11:26:04 +01:00
Erik Sundell
b385c105fe remove linebreak 2019-01-07 11:26:04 +01:00
Erik Sundell
793d3d9afa remove old group heading 2019-01-07 11:26:04 +01:00
Erik Sundell
07f0d90718 use new generic picker 2019-01-07 11:26:04 +01:00
Erik Sundell
1090e0ae2f remove on metric type change 2019-01-07 11:26:04 +01:00
Erik Sundell
de9ace731d fix remove filter bug 2019-01-07 11:26:04 +01:00
Erik Sundell
d632be849a use same color for label as in explore dropdown 2019-01-07 11:26:03 +01:00
Erik Sundell
329d4652fb cleanup query filter 2019-01-07 11:26:03 +01:00
Erik Sundell
b683a19ff6 update failing tests 2019-01-07 11:26:03 +01:00
Erik Sundell
2bc38b7907 remove redundant default value 2019-01-07 11:26:03 +01:00
Erik Sundell
caedbc67b8 use new option group in aggregation directive 2019-01-07 11:26:03 +01:00
Erik Sundell
eea91d2885 remove redundant default value 2019-01-07 11:26:03 +01:00
Erik Sundell
1f3f336352 wip: add option group component 2019-01-07 11:26:02 +01:00
Erik Sundell
d75860a72c wip: add basic option header 2019-01-07 11:26:02 +01:00
Erik Sundell
ad4f39101a Wrap react select component in angular directive 2019-01-07 11:26:02 +01:00
Torkel Ödegaard
cfd1467a76 Merge pull request #14750 from grafana/gometalinter-fixes
Fixed new gometalinter issues
2019-01-07 11:20:08 +01:00
Torkel Ödegaard
85ecf54751 updated scrollbar snapshot 2019-01-07 11:19:44 +01:00
Erik Sundell
4340e81605 remove not used files 2019-01-07 11:06:36 +01:00
Torkel Ödegaard
c0e7e54b81 Merge pull request #14747 from m0nhawk/patch-1
fix JSON in responses for Admin API documentation
2019-01-07 11:03:49 +01:00
Torkel Ödegaard
0a936a55b4 Fixed new gometalinter issues 2019-01-07 11:01:31 +01:00
Torkel Ödegaard
cfa3e05eee Merge pull request #14745 from grafana/legend-firefox-fix
Fixed issue with cut legend in firefox & mobile devices,
2019-01-07 08:20:37 +01:00
Andrew Prokhorenkov
294fb7b3bc fix JSON in responses for Admin API documentation 2019-01-06 16:57:44 -06:00
jaken551
64163f0198 14722 - removing unnecessary arn check that breaks assume role feature in other AWS partitions 2019-01-06 15:21:58 -05:00
Torkel Ödegaard
179b19c71b Fixed issue with cut legend in firefox & mobile devices, fixes #14744 and #14489 2019-01-06 17:03:38 +01:00
Torkel Ödegaard
0affb23cb1 Merge pull request #14740 from simPod/some-cleanups
Some cleanup
2019-01-05 16:39:31 +01:00
Simon Podlipsky
c39dc1fb15 Some cleanup 2019-01-05 15:25:07 +01:00
tpetr
db61fc1dd1 EqualFold() 2019-01-05 00:17:31 -05:00
tpetr
32dfc4e8b1 forgot go fmt 2019-01-05 00:02:15 -05:00
tpetr
5bc8d50864 pull connection string args from url instead 2019-01-04 23:52:36 -05:00
Michael Inthilith
9759ee53ca Add mean on distribution as well 2019-01-04 16:58:27 +01:00
Leonard Gram
dd6f606cda docs: updated debian and centos repo. 2019-01-04 16:36:32 +01:00
Michael Inthilith
1eca81139b Fix stackdriver aggregation series merge
Fixes #14581
2019-01-04 16:05:17 +01:00
Peter Holmberg
ffc9b7ac03 first stuff 2019-01-04 15:45:39 +01:00
Ander Arguiñano
49133b0012 Updated documentation for new macros 2019-01-04 14:36:07 +01:00
Torkel Ödegaard
2de57f095c Merge pull request #14707 from grafana/14388/alert-tab-ux-update
Alert tab ux update
2019-01-04 12:53:08 +01:00
Torkel Ödegaard
bb15eb3091 Merge pull request #14727 from simPod/fix-timepicker-2
Fixed timepicker css issue introduced by PR #14700 and remove hotfix …
2019-01-04 12:41:23 +01:00
Torkel Ödegaard
e0c28ba770 Minor refactoring of EditorTabBody 2019-01-04 12:38:50 +01:00
Simon Podlipsky
35f6f50f40 Fixed timepicker css issue introduced by PR #14700 and remove hotfix from 297241c 2019-01-04 12:24:22 +01:00
Torkel Ödegaard
f749ced36e AlertTab style fixes 2019-01-04 12:18:49 +01:00
Torkel Ödegaard
2eeba9dae1 Updated alert tab layout & markup 2019-01-04 11:57:16 +01:00
Torkel Ödegaard
769e9f2d8e Merge pull request #14725 from grafana/14719/gauge-issues
14719/gauge issues
2019-01-04 10:57:03 +01:00
Torkel Ödegaard
0ca0670e00 Changed datasource list page default layout mode 2019-01-04 09:58:24 +01:00
Torkel Ödegaard
297241c4ab Fixed timepicker css issue introduced by PR #14700 2019-01-04 09:35:16 +01:00
Ander Arguiñano
089d85af63 Added macros to mysql 2019-01-03 22:29:57 +01:00
Ander Arguiñano
3801a75131 FIxed syntaxis mistake unixEpochNanoFrom and unixEpochNanoTo 2019-01-03 22:25:10 +01:00
Ander Arguiñano
ed6782402b Merge remote-tracking branch 'upstream/master' into nanosecond-postgresql 2019-01-03 21:48:10 +01:00
Ander Arguiñano
b4eac406d5 Added previous macros to mssql 2019-01-03 21:43:08 +01:00
Ander Arguiñano
9105625f24 Added unixEpochNanoTo and unixEpochNanoFrom macros to postgresql 2019-01-03 21:31:47 +01:00
Ander Arguiñano
4d8d2a9690 Renamed unixEpochFilterNano to unixEpochNanoFilter 2019-01-03 20:40:17 +01:00
Erik Sundell
0c178f8623 cleanup 2019-01-03 16:21:20 +01:00
Erik Sundell
cc7b754e77 add aggregation tests 2019-01-03 16:00:42 +01:00
Erik Sundell
d23c3d2b64 add tests 2019-01-03 15:12:03 +01:00
Peter Holmberg
44e2fd4b22 Fix issue with value disappearing when selecting stat 2019-01-03 14:31:45 +01:00
Peter Holmberg
4892d3f54b Fixing issue with value color being wrong 2019-01-03 14:21:58 +01:00
Pavel
ea4223f923 Merge pull request #5 from grafana/master
Update master
2019-01-03 12:33:57 +02:00
Peter Holmberg
168b8c389d Merge remote-tracking branch 'origin/master' into 14388/alert-tab-ux-update 2019-01-03 11:29:03 +01:00
Torkel Ödegaard
5d3f4422c5 initial design for way to build value formats lazily and a backward compatability layer via Proxy 2019-01-03 09:39:46 +01:00
Erik Sundell
3ce4287e8c fix template variable bug 2019-01-03 09:15:49 +01:00
Torkel Ödegaard
3e873a2500 Merge pull request #14710 from grafana/fixed-gometalinter
Fixed new gotmetalinter warning
2019-01-03 07:23:45 +01:00
Torkel Ödegaard
873a77ed3c Merge pull request #14712 from svenklemm/postgres_subsecond_timerange
Don't cut off subsecond precision for postgres macros
2019-01-03 07:20:07 +01:00
ryan
6435df0a22 Merge remote-tracking branch 'grafana/master'
* grafana/master: (54 commits)
  s/initialDatasourceId/initialDatasource/
  Fixed issues with panel size in edit mode, fixes #14703
  Tweak datetime picker layout for mobile
  Explore: Remember last use datasource
  Update yarn.lock
  Logs data model: add more log levels
  Review feedback
  Explore: fix loading indicator z-index on panel container
  Loki: change query row to be single field again
  Explore: logging UI style fixes
  Loki: query limit configurable in datasource
  Removed rxjs compat
  ldap: adds extra debug logging
  adds orgId to user dto for provisioned dashboards
  Update rxjs
  closes the body properly on successful webhooks
  makes cache mode configurable
  Fix general tab typos
  added node-sass as dev dependency, needed after I removed grunt-sass
  Husky and sasslint fixes, fixes #14638
  ...
2019-01-02 17:04:54 -08:00
Sven Klemm
4c51e8df20 Don't cut off subsecond precision for postgres macros
Change time format to RFC3339Nano for $__timeFilter, $__timeFrom and
$__timeTo macros
2019-01-02 23:38:09 +01:00
Ander Arguiñano
1a67a8db80 Nanosecond timestamp support postgresql 2019-01-02 23:00:21 +01:00
Erik Sundell
93d2588c22 remove not used file 2019-01-02 20:58:03 +01:00
Torkel Ödegaard
80e441f48b Fixed new gotmetalinter warning 2019-01-02 19:17:35 +01:00
tpetr
a693d42e31 add support for defining additonal database connection string args via extra_connection_string_args 2019-01-02 13:02:40 -05:00
Torkel Ödegaard
a7d4e6caa3 Merge pull request #14699 from grafana/davkal/fix-14398
Explore: Remember last used datasource
2019-01-02 18:59:44 +01:00
Peter Holmberg
6b5f9d5821 clear history 2019-01-02 16:07:29 +01:00
Erik Sundell
1ab9fc871c cleanup. remove comments, not used files etc 2019-01-02 15:35:36 +01:00
Peter Holmberg
e7d9bbf781 state history tab 2019-01-02 15:22:22 +01:00
Erik Sundell
0e49225d1d merge from 14293-metric-display-names 2019-01-02 15:07:38 +01:00
Erik Sundell
b7503407e6 fix broken tests 2019-01-02 13:03:21 +01:00
Erik Sundell
4dbd113e20 use correct type for select option 2019-01-02 13:03:21 +01:00
Erik Sundell
b22bf9359f set issearchable default value to true 2019-01-02 13:03:21 +01:00
Erik Sundell
681f1f31e1 make variable type more slim 2019-01-02 13:03:21 +01:00
Erik Sundell
d741295795 remove group name from select component. let the parent set group name instead 2019-01-02 13:03:21 +01:00
Erik Sundell
e180cf54ce move component to components dir. also move directive registration out from datasource 2019-01-02 13:03:20 +01:00
Erik Sundell
4662335f80 add template variable type 2019-01-02 13:03:20 +01:00
Erik Sundell
70071e5dad rename template variables prop 2019-01-02 13:03:20 +01:00
Erik Sundell
cf50cf167c rename selected prop 2019-01-02 13:03:20 +01:00
Erik Sundell
ed673d35f5 rename searchable prop 2019-01-02 13:03:20 +01:00
Erik Sundell
e4d18a1933 improve component performance 2019-01-02 13:03:20 +01:00
Erik Sundell
5f8ccfb9a0 add max width to group header description 2019-01-02 13:03:20 +01:00
Erik Sundell
53ac3c8fd2 remove debug logging 2019-01-02 13:03:20 +01:00
Erik Sundell
c70e90cb48 rollback test state to before template variables were added 2019-01-02 13:03:20 +01:00
Erik Sundell
01fc950511 cleanup 2019-01-02 13:03:19 +01:00
Erik Sundell
00a763511e move template variable logic to component 2019-01-02 13:03:19 +01:00
Erik Sundell
3f05364eb9 remove extra arrow div 2019-01-02 13:03:19 +01:00
Erik Sundell
e7670cacf4 fix condition that expands group if it has a selected child. also make it possible to pass expanded as a prop 2019-01-02 13:03:19 +01:00
Erik Sundell
9715260151 align input widths 2019-01-02 13:03:19 +01:00
Erik Sundell
3afe8a0763 remove console log 2019-01-02 13:03:18 +01:00
Erik Sundell
55f558cb7c rename directive 2019-01-02 13:03:18 +01:00
Erik Sundell
843e9fb4dc remove linebreak 2019-01-02 13:03:18 +01:00
Erik Sundell
566001aaf2 remove old group heading 2019-01-02 13:03:18 +01:00
Erik Sundell
4734788db4 use new generic picker 2019-01-02 13:03:17 +01:00
Erik Sundell
478cfc195a remove on metric type change 2019-01-02 13:03:17 +01:00
Erik Sundell
014457c486 fix remove filter bug 2019-01-02 13:03:17 +01:00
Erik Sundell
85a434568f use same color for label as in explore dropdown 2019-01-02 13:03:17 +01:00
Erik Sundell
f68db4eded cleanup query filter 2019-01-02 13:03:17 +01:00
Erik Sundell
b6c6cc1ff6 update failing tests 2019-01-02 13:03:17 +01:00
Erik Sundell
615fa6fc7d remove redundant default value 2019-01-02 13:03:16 +01:00
Erik Sundell
4d19ac5c02 use new option group in aggregation directive 2019-01-02 13:03:16 +01:00
Erik Sundell
406c0d15a5 remove redundant default value 2019-01-02 13:03:16 +01:00
Erik Sundell
b5d6cd1cc8 wip: add option group component 2019-01-02 13:03:16 +01:00
Erik Sundell
488e92e7f5 wip: add basic option header 2019-01-02 13:03:16 +01:00
Erik Sundell
70c2efd711 Wrap react select component in angular directive 2019-01-02 13:03:15 +01:00
David Kaltschmidt
757d6f322e s/initialDatasourceId/initialDatasource/ 2019-01-02 11:32:12 +00:00
Torkel Ödegaard
24ee10ca01 Merge pull request #14705 from grafana/panel-size-fixes
Fixed issues with panel size in edit mode, fixes #14703
2019-01-02 11:48:02 +01:00
Peter Holmberg
ce01bd696e add alert in react instead of angular 2019-01-02 10:57:12 +01:00
Torkel Ödegaard
9aef3f4fb1 Fixed issues with panel size in edit mode, fixes #14703 2019-01-02 10:54:57 +01:00
Peter Holmberg
d9c93e572e hide protip if not defined 2019-01-02 10:50:52 +01:00
Erik Sundell
fd88f637b2 fix filter bug 2019-01-02 09:41:26 +01:00
Erik Sundell
f9380a2634 add help text component 2019-01-02 09:36:32 +01:00
Torkel Ödegaard
f59541b490 Merge pull request #14698 from simPod/update-lock
Update yarn.lock
2019-01-01 15:39:17 +01:00
Torkel Ödegaard
9e91d91788 Merge pull request #14689 from grafana/davkal/loki-limit
Loki: query limit configurable in datasource
2019-01-01 15:38:59 +01:00
Torkel Ödegaard
46f9418605 Merge pull request #14696 from grafana/davkal/fix-14686
Logs data model: add more log levels
2019-01-01 15:37:37 +01:00
Torkel Ödegaard
940692189b Merge pull request #14700 from simPod/timepicker
Tweak datetime picker layout for mobile
2019-01-01 15:33:28 +01:00
Simon Podlipsky
a5c05d273f Tweak datetime picker layout for mobile 2018-12-31 19:47:42 +01:00
David Kaltschmidt
67ebdcbcc3 Explore: Remember last use datasource
- use local storage to store last used database
- renamed `datasourceName` property to `initialDatasourceId` for consistency
- adapted tests
2018-12-31 18:30:32 +00:00
Simon Podlipsky
5f4eeea481 Update yarn.lock 2018-12-31 19:17:07 +01:00
Dan Cech
efa738ddf6 Merge pull request #14540 from grafana/session-skip-update
only update session in mysql database when required
2018-12-31 11:54:04 -05:00
Torkel Ödegaard
22399b336f Merge pull request #14577 from marefr/14351_db_migration
fix only create/drop database indices if not exists/exists
2018-12-31 16:20:07 +01:00
David Kaltschmidt
a364487b3a Logs data model: add more log levels
- add `eror` used in github.com/inconshreveable/log15 (used by Grafana as well)
- add levels from SYSLOG
2018-12-31 14:44:13 +00:00
David Kaltschmidt
f4b4ee3ff8 Review feedback 2018-12-31 14:10:45 +00:00
David
b712337a3b Merge pull request #14693 from grafana/davkal/loki-single-query
Loki: change query row to be single field again
2018-12-31 14:55:44 +01:00
Torkel Ödegaard
75f9d173ff Merge pull request #14691 from grafana/davkal/fix-14690
Explore: logging UI style fixes
2018-12-31 14:34:18 +01:00
Torkel Ödegaard
68897c18b2 Merge pull request #14694 from grafana/davkal/fix-14668
Explore: fix loading indicator z-index on panel container
2018-12-31 14:33:52 +01:00
David Kaltschmidt
652c149ca2 Explore: fix loading indicator z-index on panel container
- existing z-index placed the loading indicator above dropdowns of the panel children
- removed z-index for natural ordering
2018-12-31 12:55:03 +00:00
David Kaltschmidt
32438c4716 Loki: change query row to be single field again
- tried split selector and search for a week, and it did not feel natural
- keeping some of the original modifications in QueryField from splitting PR
- adapted CheatSheet and placeholder text
- added new label selector state: No labels found
2018-12-31 12:38:13 +00:00
David Kaltschmidt
39833b0df7 Explore: logging UI style fixes
- baseline aligment for meta field labels
- use variables for font sizes and margins
2018-12-31 12:05:07 +00:00
David Kaltschmidt
26a5e07737 Loki: query limit configurable in datasource
- Loki queries must contain a limit
- this change makes this limit configurable in the datasource
- keep default at 1000, add tooltip on why inc/dec makes sense
- added tests
2018-12-31 11:25:28 +00:00
Torkel Ödegaard
6f998541c8 Merge branch 'master' of github.com:grafana/grafana 2018-12-31 09:00:39 +01:00
Torkel Ödegaard
8a2d1b98e9 Removed rxjs compat 2018-12-31 08:57:01 +01:00
Torkel Ödegaard
e18256e417 Merge branch 'rxjs-update' of https://github.com/simPod/grafana into simPod-rxjs-update 2018-12-31 08:40:24 +01:00
Torkel Ödegaard
983b85139c Merge pull request #14665 from bergquist/sqlite_cache_mode_setting
WIP: makes cache mode configurable
2018-12-31 08:35:27 +01:00
Torkel Ödegaard
6eb9f83647 Merge pull request #14678 from bergquist/set_orgid_for_provisioned_dashboards
Adds orgId to user dto for provisioned dashboards
2018-12-31 08:34:01 +01:00
Daniel Lee
ce50e9331a ldap: adds extra debug logging 2018-12-30 22:53:00 +01:00
Erik Sundell
5ba429387f reactify annotation query editor 2018-12-28 19:45:24 +01:00
bergquist
9895b1e6d0 adds orgId to user dto for provisioned dashboards 2018-12-28 10:49:00 +01:00
Simon Podlipsky
d42f821c87 Update rxjs 2018-12-27 20:37:44 +01:00
Carl Bergquist
136f6986e1 Merge pull request #14666 from bergquist/close_body
Closes the body properly on successful webhooks
2018-12-27 16:22:39 +01:00
bergquist
24636da800 closes the body properly on successful webhooks
this commit also adds a test docker container
for receiving alerting web hook requests
2018-12-27 16:08:13 +01:00
Carl Bergquist
b798a5412b Merge pull request #14661 from pfree/fix_typo
Fix general tab typos
2018-12-27 14:31:08 +01:00
bergquist
74124ec8ed makes cache mode configurable
this makes the cache mode in the sqlite connection
string configurable. the default also changed from
shared to private to solve #107272 but allow the user
to use shared if performance is more important.

ref #10727
2018-12-27 10:48:11 +01:00
Patrick Freeman
ca7f75f353 Fix general tab typos 2018-12-26 13:36:12 -05:00
Torkel Ödegaard
8a976f5cb4 Merge pull request #14656 from grafana/husky-and-sasslint-fixes
Husky and sasslint fixes
2018-12-26 08:13:35 +01:00
Torkel Ödegaard
9cd449ed52 added node-sass as dev dependency, needed after I removed grunt-sass 2018-12-25 21:11:18 +01:00
Torkel Ödegaard
ce0dcd5cab Husky and sasslint fixes, fixes #14638 2018-12-25 20:20:59 +01:00
Torkel Ödegaard
66a13b281c Merge branch 'grafana-lib' 2018-12-25 19:26:46 +01:00
Torkel Ödegaard
98d26354c1 Added a form component to @grafana/ui 2018-12-25 11:42:23 +01:00
Torkel Ödegaard
2dfa3269c3 created visualizations folder 2018-12-25 10:20:20 +01:00
Torkel Ödegaard
493714c27d Fixed JQuery typing issues 2018-12-25 09:59:23 +01:00
Torkel Ödegaard
19da963a19 Typings issues 2018-12-25 08:55:44 +01:00
Torkel Ödegaard
a38490f4b2 wip: moving react graph component to grafana/ui 2018-12-24 14:14:06 +01:00
Torkel Ödegaard
513434cada Merge pull request #14652 from grafana/test-frontend-change
Don't do a full frontend release build in test-frontend
2018-12-24 12:37:17 +01:00
Torkel Ödegaard
21a25f2c27 Don't do a full frontend release build in test-frontend job, added typescheck (tsc noEmit) instead, fixes #14639 2018-12-24 07:12:49 +01:00
Torkel Ödegaard
4b323d9879 Moved sass for component to @grafana/ui lib 2018-12-24 07:05:18 +01:00
Torkel Ödegaard
17de1f2887 Merge pull request #14646 from grafana/fix-dashboard-links
Fixed dashboard links not updating after variable or time range change
2018-12-23 20:41:51 +01:00
Torkel Ödegaard
0fd403a783 Merge pull request #14647 from grafana/explore-options-margin-increase
Increased margin between controls in logs panel
2018-12-23 17:45:49 +01:00
Torkel Ödegaard
a02b4b47b6 Moving a couple of types to @grafana/ui 2018-12-23 09:15:32 +01:00
Torkel Ödegaard
0ff572efbf Testing moving out one type to grafana/ui 2018-12-23 08:28:37 +01:00
Torkel Ödegaard
270d52495d Increased margin between controls in logs panel, fixes #14637 2018-12-23 07:18:11 +01:00
Torkel Ödegaard
002f57ae00 Fixed dashboard links not updating after variable or time range change, fixes #14493 2018-12-23 07:11:24 +01:00
Torkel Ödegaard
4bb8249ffc Merge pull request #14627 from cykl/influxdb-timezone-clause
Add support for InfluxDB's time zone clause
2018-12-23 07:03:48 +01:00
Torkel Ödegaard
a138bf27d1 Merge pull request #14642 from jacobrichard/master
Update/Improve Docs for Auth Proxy Whitelist
2018-12-23 07:01:41 +01:00
Torkel Ödegaard
ef219dd72b Merge pull request #14645 from grafana/fix-tooltip-placement
Fixed group button tooltip placement from auto to bottom
2018-12-23 07:00:56 +01:00
Torkel Ödegaard
41712c3957 Fixed group button tooltip placement from auto to bottom, fixes #14634 2018-12-23 06:46:26 +01:00
Jacob Richard
47c0b5770b Removing erroneous backtick in docs 2018-12-22 18:18:15 -06:00
Jacob Richard
b785b06598 Updating docs for auth_proxy whitelist CIDR support 2018-12-22 18:17:32 -06:00
David
b05e7aaecb Merge pull request #14636 from grafana/davkal/fix-14635
Loki: fix timestamp field
2018-12-22 17:52:59 +01:00
David Kaltschmidt
d1dec8bd44 Add timestamp back to log entry type 2018-12-22 17:36:35 +01:00
Dan Cech
b8fdacd81f Update public/app/plugins/datasource/loki/result_transformer.ts
Co-Authored-By: davkal <david.kaltschmidt@gmail.com>
2018-12-22 17:28:51 +01:00
David Kaltschmidt
e694604be5 Loki: fix timestamp field
- timestamp was renamed to `ts` in grafana/loki#152
- renamed here in result transformer and tests
2018-12-22 17:19:58 +01:00
David
b2401e37fa Merge pull request #14414 from grafana/davkal/explore-logging-search
Explore: Split logging query into selector and search
2018-12-22 17:00:57 +01:00
Torkel Ödegaard
f8e2e11734 Merge pull request #14631 from grafana/firefox-height-bugfix
Fixed panel height & scroll issue with flexbox in firefox,
2018-12-22 09:54:58 +01:00
Torkel Ödegaard
9aa2764753 Fixed panel height & scroll issue with flexbox in firefox, fixes #14620 2018-12-22 08:58:08 +01:00
Erik Sundell
8a916757d7 remove segment srv prop 2018-12-21 23:28:21 +01:00
Erik Sundell
b9cf15786d use ds template srv reference 2018-12-21 23:21:55 +01:00
Erik Sundell
2f342b8917 remove not used stuff 2018-12-21 23:07:46 +01:00
Erik Sundell
31254e1c72 add event handler 2018-12-21 22:04:46 +01:00
Erik Sundell
0515605b9a add help component 2018-12-21 21:38:46 +01:00
Clément MATHIEU
c29c9d1664 Add support for InfluxDB's time zone clause (backend) 2018-12-21 16:49:01 +01:00
Peter Holmberg
acf8390d57 note to future me 2018-12-21 14:57:54 +01:00
Peter Holmberg
4002f80ab8 delete works 2018-12-21 14:56:49 +01:00
Torkel Ödegaard
7268f16c54 grunt test task update 2018-12-21 14:37:38 +01:00
Jürgen Kreileder
41eb0ba52e Add support for InfluxDB's time zone clause 2018-12-21 14:37:02 +01:00
Torkel Ödegaard
52f583fee7 @grafana/ui lib now contains one components, seperate lint & tsc steps 2018-12-21 14:23:32 +01:00
Marcus Efraimsson
8b4083a602 changelog: add notes about closing #14519 2018-12-21 13:01:25 +01:00
Marcus Efraimsson
45e92a116d Merge pull request #14605 from kjedamzik/add-blood-glucose-level-units
Add units for blood sugar concentration 💉
2018-12-21 12:54:43 +01:00
Torkel Ödegaard
2fec5c7577 Grafana ui lib is starting to work 2018-12-21 12:27:43 +01:00
Peter Holmberg
6aacd0734b typings and renamings 2018-12-21 11:57:21 +01:00
Peter Holmberg
25a46c60f1 Merge branch 'master' into 14388/alert-tab-ux-update 2018-12-21 11:25:09 +01:00
Peter Holmberg
bbd77d8f0b adding extra props 2018-12-21 11:24:31 +01:00
Torkel Ödegaard
6e66b2b906 breaking up grafana into multiple packages poc 2018-12-20 16:56:46 +01:00
Erik Sundell
e2ed163779 add project and help component 2018-12-20 16:55:02 +01:00
Erik Sundell
06f771afd3 add alias by component 2018-12-20 15:59:21 +01:00
Erik Sundell
861f911cda add alignment periods component 2018-12-20 13:36:10 +01:00
Erik Sundell
7a31076f09 cleanup aggregation picker 2018-12-20 13:27:47 +01:00
Erik Sundell
1452bc2e8a move alignment population code to parent component. make alignment a stateless component instead. 2018-12-20 11:26:05 +01:00
Erik Sundell
ec68c65660 flatten target obj 2018-12-20 11:00:16 +01:00
Pavel
c041bf2488 Merge pull request #4 from grafana/master
Update master
2018-12-20 11:57:39 +02:00
Torkel Ödegaard
f089c7ee5e Grafana ui library poc 2018-12-20 09:25:04 +01:00
Marcus Efraimsson
b45f72a140 elasticsearch: support bucket script pipeline aggregations 2018-12-20 01:24:36 +01:00
Kofi Jedamzik
281312ffcd Add units for blood sugar concentration 💉 2018-12-19 22:23:25 +01:00
Erik Sundell
095407c8cf on deselect when reducer is set to none 2018-12-19 21:08:38 +01:00
ryan
9c086be591 Merge remote-tracking branch 'grafana/master'
* grafana/master: (41 commits)
  Fixes undefined issue with angular panels and editorTabs
  changelog: adds note about closing #14562
  Update field name
  Add documentation
  Rename the setting and add description
  export init notifier func
  Increase recent and starred limit in search and home dashboard, closes #13950
  changelog: adds note about closing #14486
  Panel help view fixes
  Add min/max height when resizing and replace debounce with throttle
  changelog: adds note about closing #14546
  Adding tests for auth proxy CIDR support
  changelog: adds note about closing #14109
  fix signed in user for orgId=0 result should return active org id
  Another take on resizing the panel, now using react-draggable
  Raise datasources number to 5000
  copy props to state to make it visible in the view
  refactor to not crash when no links
  updating snaps
  renaming component
  ...
2018-12-19 11:35:44 -08:00
Erik Sundell
945b0aeb86 add alignment component 2018-12-19 17:12:50 +01:00
Torkel Ödegaard
2325c5dbed Merge pull request #14603 from grafana/minor-angular-editmode-fix
Fixes undefined issue with angular panels and editorTabs
2018-12-19 17:09:23 +01:00
Torkel Ödegaard
5b83f6d49d Fixes undefined issue with angular panels and editorTabs 2018-12-19 17:00:26 +01:00
bergquist
7637ea55e4 changelog: adds note about closing #14562 2018-12-19 16:11:35 +01:00
Erik Sundell
603ef1c37d refactor aggregation picker 2018-12-19 16:08:18 +01:00
Carl Bergquist
c201fc170f Merge pull request #14563 from tdabasinskas/broken_oauth_provider
Support OAuth providers that are not RFC6749 compliant
2018-12-19 16:05:53 +01:00
Erik Sundell
9b1b4c09f5 use render props pattern 2018-12-19 15:54:45 +01:00
Tomas Dabasinskas
eb517a3791 Update field name 2018-12-19 15:36:45 +02:00
Torkel Ödegaard
71837fe137 Merge pull request #12681 from simPod/fix-variable-array-display
Fix array display from url
2018-12-19 14:34:21 +01:00
Tomas Dabasinskas
e8823f71b0 Add documentation 2018-12-19 15:29:49 +02:00
Erik Sundell
07dc9d06d7 use template variable prop 2018-12-19 14:29:00 +01:00
Erik Sundell
a955caa9ac cleanup 2018-12-19 14:19:27 +01:00
Tomas Dabasinskas
3aa24b3afa Rename the setting and add description 2018-12-19 14:59:33 +02:00
Carl Bergquist
52ccb49167 Merge pull request #14593 from bergquist/export_create_notifier_func
export init notifier func
2018-12-19 13:51:40 +01:00
bergquist
69489993c3 export init notifier func
makes it possible to validate that an notifier can be
initialzed from the provisioning package
2018-12-19 13:38:49 +01:00
Torkel Ödegaard
d0f8d034df Quick refactoring of time picker styles, needs a much bigger redesign 2018-12-19 13:13:46 +01:00
Peter Holmberg
f3ba3b4df0 render editor toolbar buttons 2018-12-19 13:09:53 +01:00
Johannes Schill
f95359fb34 Notify user on query error 2018-12-19 12:58:10 +01:00
Torkel Ödegaard
1260301099 Merge pull request #14589 from grafana/search-increase-recent-starred-limit
Increase recent and starred limit in search and home dashboard
2018-12-19 12:09:54 +01:00
Torkel Ödegaard
9e92609313 Merge pull request #14113 from cinaglia/fix-csv-decimal-places
Retain decimal precision when exporting CSV
2018-12-19 11:56:27 +01:00
Torkel Ödegaard
16ad0f65ea Increase recent and starred limit in search and home dashboard, closes #13950 2018-12-19 11:40:38 +01:00
Torkel Ödegaard
cbeefcd376 Merge pull request #14574 from grafana/14543_org_redirect
fix signed in user for orgId=0 result should return active org id
2018-12-19 11:31:06 +01:00
Torkel Ödegaard
36154e59b0 Merge pull request #14571 from oiooj/pr-ds-limit
Raise datasources number to 5000
2018-12-19 11:26:16 +01:00
Torkel Ödegaard
6154f89d96 Merge pull request #14587 from grafana/panel-help-fixes
Panel help view fixes
2018-12-19 11:25:12 +01:00
Torkel Ödegaard
d21b5899c1 Merge branch 'master' of github.com:grafana/grafana 2018-12-19 11:24:25 +01:00
Torkel Ödegaard
6542bfb83e Merge branch 'fix-misspell-issues' of https://github.com/mjtrangoni/grafana into mjtrangoni-fix-misspell-issues 2018-12-19 11:21:34 +01:00
Torkel Ödegaard
87cc3902b7 Merge pull request #14558 from hahnjo/flops
Add units for Floating Point Operations per Second
2018-12-19 11:11:14 +01:00
Torkel Ödegaard
8375c23de9 Merge pull request #14569 from grafana/14537/time-range-and-relative-time
Show current values for relative time and time shift
2018-12-19 11:05:42 +01:00
Johannes Schill
9607b27935 changelog: adds note about closing #14486 2018-12-19 11:04:40 +01:00
Torkel Ödegaard
60ea99078e Panel help view fixes 2018-12-19 11:03:54 +01:00
Peter Holmberg
2046309de5 rewrite angular view 2018-12-19 10:42:57 +01:00
Torkel Ödegaard
9fec202668 Merge pull request #14565 from grafana/panel-help-view
Panel help view
2018-12-19 10:25:02 +01:00
Carl Bergquist
fdb48b7bbc Merge pull request #14531 from grafana/golang_1.11.4
Upgrade go version to 1.11.4
2018-12-19 10:09:56 +01:00
Torkel Ödegaard
5f2937431f Merge pull request #14572 from grafana/develop-draggable-panel
Another take on resizing the panel, now using react-draggable
2018-12-19 10:07:45 +01:00
Erik Sundell
9e558b70d7 Merge branch '14293-metric-display-names' into reactify-stackdriver
# Conflicts:
#	public/app/plugins/datasource/stackdriver/partials/query.aggregation.html
#	public/app/plugins/datasource/stackdriver/partials/query.editor.html
#	public/app/plugins/datasource/stackdriver/partials/query.filter.html
#	public/app/plugins/datasource/stackdriver/query_aggregation_ctrl.ts
#	public/app/plugins/datasource/stackdriver/query_ctrl.ts
#	public/app/plugins/datasource/stackdriver/query_filter_ctrl.ts
#	public/sass/_grafana.scss
2018-12-19 09:21:35 +01:00
Johannes Schill
9cd0067187 Add min/max height when resizing and replace debounce with throttle 2018-12-19 09:08:56 +01:00
bergquist
a6d90151da changelog: adds note about closing #14546 2018-12-19 08:58:14 +01:00
Carl Bergquist
251e80aa5e Merge pull request #14547 from jacobrichard/master
Adding CIDR capability to auth_proxy whitelist
2018-12-19 08:55:03 +01:00
Jacob Richard
34d3086ec8 Adding tests for auth proxy CIDR support 2018-12-18 21:16:29 -06:00
Marcus Efraimsson
12f3c8f9d6 fix only add column if not exists for mysql 2018-12-18 23:02:08 +01:00
bergquist
ea84ec6229 changelog: adds note about closing #14109 2018-12-18 22:49:38 +01:00
Carl Bergquist
854487acab Merge pull request #14441 from cinaglia/delete-external-snapshot
Add support for deleting external snapshots from Snapshots List
2018-12-18 22:43:12 +01:00
Marcus Efraimsson
a451c20129 fix handling of indices with multiple columns (mysql) 2018-12-18 22:28:27 +01:00
Marcus Efraimsson
09b3014683 fix only create/drop database indices if not exists/exists 2018-12-18 21:47:45 +01:00
Marcus Efraimsson
e82b3632f6 fix signed in user for orgId=0 result should return active org id 2018-12-18 20:02:27 +01:00
ryan
f7170829ce Merge remote-tracking branch 'grafana/master'
* grafana/master: (421 commits)
  Minor update
  Make sure panel id is unique since some datasources (Graphite) will cancel ongoing requests with the same panel id
  changelog: adds note about closing #14548
  Minor cleanup now that angular panel edit is no longer
  Gauge option form markup fixes
  filter out table responses that don't have columns and rows
  enable goto explore from query panel editor for all datasources
  moves migrations to /sqlstore/migrations
  adds integration tests to ci build
  renames main lock function
  clean up integration tests
  change from db_text to nvarchar
  adds server lock package
  initial verison of server lock
  Minor react graph panel refactorings and fixes
  sorting tests for change value
  Fixes issues with user and team picker
  fixing coloring
  remove printed index
  updating test
  ...
2018-12-18 10:56:30 -08:00
Johannes Schill
a007730f5d Another take on resizing the panel, now using react-draggable 2018-12-18 17:22:30 +01:00
Dan Cech
3f85901c4a only update session in mysql database when required 2018-12-18 11:19:32 -05:00
Baokun Lee
f51222027d Raise datasources number to 5000 2018-12-18 23:59:14 +08:00
Erik Sundell
8e9cd83ee8 improve component performance 2018-12-18 16:56:16 +01:00
Erik Sundell
575d7f8941 add max width to group header description 2018-12-18 16:41:47 +01:00
Peter Holmberg
8f92e23e98 copy props to state to make it visible in the view 2018-12-18 16:39:59 +01:00
Erik Sundell
74c2b22a77 remove debug logging 2018-12-18 16:27:24 +01:00
Erik Sundell
3c2ab68290 rollback test state to before template variables were added 2018-12-18 16:19:49 +01:00
Erik Sundell
7ef0995257 cleanup 2018-12-18 16:09:32 +01:00
Erik Sundell
9507dfe13c move template variable logic to component 2018-12-18 16:01:12 +01:00
Erik Sundell
5a9dd620a6 remove extra arrow div 2018-12-18 15:58:33 +01:00
Peter Holmberg
659b5a3c15 refactor to not crash when no links 2018-12-18 15:30:34 +01:00
Peter Holmberg
bf7ba9a4d1 updating snaps 2018-12-18 14:54:50 +01:00
Peter Holmberg
95656e1e95 renaming component 2018-12-18 14:49:59 +01:00
Peter Holmberg
a44a07593f panel help working 2018-12-18 14:40:54 +01:00
Victor Cinaglia
48fe92a945 snapshots: Close response body after error check 2018-12-18 08:32:49 -05:00
Erik Sundell
5e4841cc6e fix condition that expands group if it has a selected child. also make it possible to pass expanded as a prop 2018-12-18 14:30:46 +01:00
Erik Sundell
0c596a0274 align input widths 2018-12-18 13:03:29 +01:00
Tomas Dabasinskas
08c12313fe Update sample and default configs 2018-12-18 13:51:17 +02:00
Tomas Dabasinskas
54b73025dc Add OAuth provider flag to indicate if it's broken 2018-12-18 13:50:37 +02:00
Tomas Dabasinskas
052772ea2e Register BrokenAuthHeaderProviders if needed 2018-12-18 13:48:25 +02:00
Jonas Hahnfeld
0cf3e94934 Add units for Floating Point Operations per Second
This is an important metric for computation throughput in the context
of High Performance Computing (HPC). I've never heard of the kilo
prefix here, nowadays it's mostly measured in MFLOP/s.
2018-12-18 12:11:21 +01:00
Erik Sundell
738fd997ce remove console log 2018-12-18 11:46:07 +01:00
Erik Sundell
d23d4c2ca0 rename directive 2018-12-18 11:31:11 +01:00
Torkel Ödegaard
a4091813bf Merge pull request #14534 from grafana/14409/threshold-ux-changes
14409/threshold ux changes
2018-12-18 11:30:48 +01:00
Erik Sundell
b46be0b638 remove linebreak 2018-12-18 11:28:35 +01:00
Erik Sundell
ea1ce578ff remove old group heading 2018-12-18 11:26:42 +01:00
Erik Sundell
8430c5a491 use new generic picker 2018-12-18 11:25:13 +01:00
Torkel Ödegaard
e56b478709 Merge pull request #14551 from grafana/explore-ds-fixes
Explore: Datasource fixes
2018-12-18 10:38:31 +01:00
Erik Sundell
47b3901e7d remove on metric type change 2018-12-18 10:37:47 +01:00
Erik Sundell
a5f64a5668 fix remove filter bug 2018-12-18 10:37:47 +01:00
Erik Sundell
a7bdd757ef use same color for label as in explore dropdown 2018-12-18 10:37:47 +01:00
Erik Sundell
15ba05d7ee cleanup query filter 2018-12-18 10:37:47 +01:00
Erik Sundell
5affc55756 update failing tests 2018-12-18 10:37:46 +01:00
Erik Sundell
8afe48bb3e remove redundant default value 2018-12-18 10:37:46 +01:00
Erik Sundell
dcbe12989f use new option group in aggregation directive 2018-12-18 10:37:46 +01:00
Erik Sundell
2ac1fe2a17 remove redundant default value 2018-12-18 10:37:46 +01:00
Erik Sundell
fe4c77a8a4 wip: add option group component 2018-12-18 10:37:46 +01:00
Erik Sundell
5370f78ee7 wip: add basic option header 2018-12-18 10:37:46 +01:00
Erik Sundell
73b5bc680f Wrap react select component in angular directive 2018-12-18 10:36:59 +01:00
Torkel Ödegaard
e8f9174d08 Minor update 2018-12-18 09:58:27 +01:00
Erik Sundell
ad3d36e6b7 Make sure panel id is unique since some datasources (Graphite) will cancel ongoing requests with the same panel id 2018-12-18 09:44:51 +01:00
bergquist
3c6bcde8b2 changelog: adds note about closing #14548 2018-12-18 08:22:02 +01:00
Carl Bergquist
ac458a4e4b Merge pull request #14511 from grafana/go-ldap-v3
ldap: upgrades go-ldap to v3
2018-12-18 08:18:40 +01:00
Torkel Ödegaard
1b1f8ebadc Merge pull request #14541 from grafana/minor-cleanup
Minor cleanup now that angular panel edit is no longer
2018-12-18 07:36:31 +01:00
Jacob Richard
0b50582b56 Adding CIDR capability to auth_proxy whitelist 2018-12-17 23:43:14 -06:00
Torkel Ödegaard
705cbb4095 Minor cleanup now that angular panel edit is no longer 2018-12-17 21:29:25 +01:00
Torkel Ödegaard
1ee1247912 Gauge option form markup fixes 2018-12-17 17:54:40 +01:00
Peter Holmberg
65db6a7638 toolbaritems viztab 2018-12-17 16:54:29 +01:00
Carl Bergquist
7653d8a197 Merge pull request #14468 from bergquist/db_lock
Infra package for creating distributed lock to make sure functions are executed once even in HA mode.
2018-12-17 16:51:11 +01:00
Erik Sundell
2835c4336d filter out table responses that don't have columns and rows 2018-12-17 16:46:22 +01:00
Torkel Ödegaard
7d248cb415 Merge remote-tracking branch 'origin/master' into 14409/threshold-ux-changes 2018-12-17 16:45:46 +01:00
Erik Sundell
18b39967fc enable goto explore from query panel editor for all datasources 2018-12-17 16:44:57 +01:00
Peter Holmberg
cda7897323 started with component for generic panel help 2018-12-17 16:42:02 +01:00
bergquist
7aa84aeb61 moves migrations to /sqlstore/migrations 2018-12-17 16:36:57 +01:00
bergquist
dbcc2e868d adds integration tests to ci build 2018-12-17 16:36:57 +01:00
bergquist
11cde7ed71 renames main lock function 2018-12-17 16:36:57 +01:00
bergquist
c565b018c5 clean up integration tests 2018-12-17 16:36:57 +01:00
bergquist
823bba8d98 change from db_text to nvarchar 2018-12-17 16:36:57 +01:00
bergquist
dc49bebb00 adds server lock package 2018-12-17 16:36:57 +01:00
bergquist
ff136b6ba8 initial verison of server lock 2018-12-17 16:36:57 +01:00
Torkel Ödegaard
c0fc236fcb Merge pull request #14535 from grafana/react-graph-changes
React graph changes
2018-12-17 16:29:00 +01:00
Torkel Ödegaard
c20e10a584 Merge branch 'master' into 14409/threshold-ux-changes 2018-12-17 16:25:33 +01:00
Torkel Ödegaard
0fe452ec26 Minor react graph panel refactorings and fixes 2018-12-17 15:38:51 +01:00
Torkel Ödegaard
cfae98fae2 Merge pull request #14532 from grafana/fixes-to-user-and-team-picker
Fixes issues with user and team picker
2018-12-17 14:56:05 +01:00
Peter Holmberg
adebbd9559 sorting tests for change value 2018-12-17 14:37:12 +01:00
Torkel Ödegaard
e80a287f7a Merge pull request #14510 from grafana/14484-table-format-string-epochs
In Table Panel, renders epoch string as date if date column style
2018-12-17 14:37:00 +01:00
Torkel Ödegaard
e38a04ba9a Fixes issues with user and team picker 2018-12-17 14:31:43 +01:00
Peter Holmberg
e7f966d002 fixing coloring 2018-12-17 14:26:19 +01:00
bergquist
17f8be90ae upgrade to golang 1.11.4 2018-12-17 14:25:47 +01:00
Peter Holmberg
98490084a1 remove printed index 2018-12-17 14:18:28 +01:00
Peter Holmberg
e11834e950 updating test 2018-12-17 14:16:29 +01:00
Peter Holmberg
ade2f297a7 adding threshold 2018-12-17 14:15:04 +01:00
Torkel Ödegaard
0fd92ef6fb Refactoring react graph 2018-12-17 13:55:25 +01:00
Torkel Ödegaard
3efaf52049 Merge pull request #14274 from grafana/develop
Develop (New Panel Edit UX & Explore All Datasources suppport) -> Master
2018-12-17 13:35:59 +01:00
Torkel Ödegaard
1ac81c3ad0 updated dropdown typeahead to place down instead of up, works better when inside scrollable area 2018-12-17 13:08:09 +01:00
Torkel Ödegaard
7455dfcc84 minor style tweak 2018-12-17 12:57:40 +01:00
Erik Sundell
f673d60dae Merge branch 'develop' of https://github.com/grafana/grafana into develop 2018-12-17 11:17:58 +01:00
Erik Sundell
e84e6740e6 propagate initial state back to explore query runner 2018-12-17 11:17:16 +01:00
Torkel Ödegaard
d912677d80 Merge pull request #14520 from Soitora/patch-1
OAuth Title Fix
2018-12-17 07:22:48 +01:00
Simon Mattila
c4126f9910 Update gitlab.md
Change title from Google to GitLab
2018-12-17 00:26:23 +01:00
Simon Mattila
5d190769e6 Update github.md
Change title from Google to GitHub
2018-12-17 00:24:52 +01:00
Torkel Ödegaard
d7e5582c76 minor style fixes 2018-12-16 10:31:37 -08:00
Torkel Ödegaard
e6b8bfe7e6 Updated snapshot 2018-12-16 10:10:25 +01:00
Torkel Ödegaard
72b9cb9b9f Switched to react-select fork 2018-12-16 09:58:37 +01:00
Torkel Ödegaard
660c9fd467 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-16 09:21:15 +01:00
Daniel Lee
167e8815d3 ldap: upgrades go-ldap to v3 2018-12-16 01:05:14 +01:00
Daniel Lee
0ebd5e0c80 table: fixes #14484. Renders epoch string if date column style 2018-12-16 00:03:03 +01:00
Daniel Lee
217596b4a1 changelog: adds note for #14483 2018-12-16 00:01:56 +01:00
Torkel Ödegaard
38b5d7862f Fix for no metrics panels, now goes to viz tab and does not show queries tab 2018-12-15 12:08:33 -08:00
Torkel Ödegaard
e99dbefb98 minor style fix 2018-12-15 11:29:50 -08:00
Torkel Ödegaard
1b3a520b94 minor change to table panel edit options 2018-12-15 18:09:18 +01:00
Torkel Ödegaard
68b7b6cd97 minor tweaks to text panel 2018-12-15 17:53:52 +01:00
Torkel Ödegaard
f67e0827b2 Fixes and cleanup 2018-12-15 10:04:25 +01:00
Simon Podlipsky
2d296715ec Show predefined time ranges as first in timepicker on small screens 2018-12-15 00:55:24 +01:00
Torkel Ödegaard
9773a2d419 Merge pull request #14502 from banjeremy/13765-annotation-editor-outside-viewport
remove check on axis.used in flot
2018-12-14 21:33:40 +01:00
Torkel Ödegaard
248015c937 code cleanup in add panel, and switched off grid css transforms to fix z-index issuse 2018-12-14 20:53:42 +01:00
Torkel Ödegaard
bd2c9853ec minor tweaks to alert tab 2018-12-14 19:34:51 +01:00
Torkel Ödegaard
b10f558a99 fixed name of alert tab 2018-12-14 17:45:35 +01:00
Torkel Ödegaard
2cf246f946 removed unnessary test 2018-12-14 17:42:14 +01:00
Torkel Ödegaard
9ac11f1d9d updated add panel a bit 2018-12-14 17:39:33 +01:00
Torkel Ödegaard
9d8d5b18ef Merge remote-tracking branch 'origin/develop-addpanelpanel' into add-panel-rewrite 2018-12-14 17:04:33 +01:00
Torkel Ödegaard
b15bb4fb95 Merge remote-tracking branch 'origin/master' into develop 2018-12-14 17:02:08 +01:00
Torkel Ödegaard
cf1cd4d60f Merge pull request #14500 from grafana/select-refactor
Select refactor
2018-12-14 16:57:38 +01:00
Torkel Ödegaard
6e2f6701ac minor style fix 2018-12-14 16:48:13 +01:00
Torkel Ödegaard
beff16bc8d updated snapshot 2018-12-14 16:38:52 +01:00
Torkel Ödegaard
677eb6d179 fixes to unit picker 2018-12-14 16:27:48 +01:00
Peter Holmberg
7c83d7ba82 updates on thresholds component 2018-12-14 16:27:42 +01:00
Jeremy Jones
8d8ef8f97f remove check on axis.used in flot #13765 2018-12-14 09:04:47 -06:00
Torkel Ödegaard
84df0e2dde Added custom scrollbar to select component 2018-12-14 15:25:49 +01:00
ijin08
3c059bc9d6 removed a test that isn't neccessery any more 2018-12-14 14:50:46 +01:00
ijin08
3215f8abfe replaced content in addpanelpanel with three buttons that can create new panel, paste copied panel, and add a new row, to paste panel one must copy one first, code is still quite rough 2018-12-14 14:33:49 +01:00
Torkel Ödegaard
9e4547f787 fixed cloudwatch issue 2018-12-14 14:25:35 +01:00
Torkel Ödegaard
cb7ffb4415 select refactor fixes 2018-12-14 14:19:39 +01:00
Peter Holmberg
f8c8f2ec2c gauge working without thresholds 2018-12-14 14:18:18 +01:00
Daniel Lee
3581d619f3 Merge pull request #14499 from grafana/14483/copy-invite-link-fix
Fix for copy invite link
2018-12-14 14:17:36 +01:00
Peter Holmberg
a7548cd294 Merge remote-tracking branch 'origin/develop' into 14409/threshold-ux-changes 2018-12-14 14:08:53 +01:00
Peter Holmberg
5f4eaad8a7 changin colors 2018-12-14 14:08:29 +01:00
Torkel Ödegaard
ae76ddcc3b explore using data source picker 2018-12-14 14:05:47 +01:00
Peter Holmberg
d37dae34f2 fixing issue with copy invite link 2018-12-14 13:49:14 +01:00
Peter Holmberg
3662f1c007 getting closer with no thresholds 2018-12-14 13:23:22 +01:00
Torkel Ödegaard
24825dc899 renamed folder to select 2018-12-14 12:59:45 +01:00
Torkel Ödegaard
ab31d52b77 Merge branch 'panel-edit-style-changes' into select-refactor 2018-12-14 12:39:35 +01:00
Torkel Ödegaard
58cc2e34d6 User picker using common select componnet 2018-12-14 12:38:36 +01:00
Torkel Ödegaard
b9a05a8543 Merge pull request #14494 from grafana/panel-edit-style-changes
Panel edit style changes
2018-12-14 12:27:45 +01:00
Torkel Ödegaard
104292df63 wip: unifying select components 2018-12-14 11:23:05 +01:00
Torkel Ödegaard
e40d21459a fixing input unit test failure 2018-12-14 11:03:42 +01:00
Torkel Ödegaard
42ee81a97c fixed issue with switching panels 2018-12-14 10:47:18 +01:00
Torkel Ödegaard
0823712c9a refactored panel-option-section into react component 2018-12-14 09:44:48 +01:00
Pavel
0fe9bfbc3c Merge pull request #3 from grafana/master
Merge master
2018-12-14 09:54:08 +02:00
Torkel Ödegaard
ec035d6847 removed console log 2018-12-13 21:35:15 +01:00
Torkel Ödegaard
9c13520e97 updated styles 2018-12-13 21:24:41 +01:00
Peter Holmberg
234095e6df starting with threshold refactor 2018-12-13 16:46:10 +01:00
Erik Sundell
146aa7abab wip: convert angular directives to react components 2018-12-13 16:40:14 +01:00
Torkel Ödegaard
dc22beadca wip: style change progress 2018-12-13 16:02:14 +01:00
Carl Bergquist
82adf5393e Merge pull request #14482 from joesis/logging-provisioning-file-reader
log error when resolvePath
2018-12-13 15:16:15 +01:00
Torkel Ödegaard
3517029ede Update CHANGELOG.md 2018-12-13 14:34:30 +01:00
Torkel Ödegaard
8a6ed4814c Update latest.json 2018-12-13 14:31:05 +01:00
Torkel Ödegaard
3f1adf1390 wip: styles are starting to come together 2018-12-13 14:28:44 +01:00
Torkel Ödegaard
889518e8e1 wip: styles 2018-12-13 13:27:33 +01:00
Torkel Ödegaard
fe0f66b3f2 wip: testing new styles 2018-12-13 13:14:39 +01:00
Torkel Ödegaard
5fde977185 wip: style changes 2018-12-13 13:05:43 +01:00
Torkel Ödegaard
226e55b188 fixed ordering changing panel types, fixes issues with loading panel options 2018-12-13 11:35:07 +01:00
Peter Holmberg
c78d5fb24e Merge remote-tracking branch 'origin/develop' into 14409/threshold-ux-changes 2018-12-13 11:19:16 +01:00
Peter Holmberg
8615de8119 moving min/max to gauge options 2018-12-13 11:16:31 +01:00
Joesis
92a8c5b81b log error when resolvePath 2018-12-13 02:10:29 -08:00
Torkel Ödegaard
1d325cf66f Merge pull request #14423 from grafana/14378-develop-table-options-ux
Removed side menu for column styles
2018-12-13 09:12:05 +01:00
Torkel Ödegaard
a9e98feea0 Merge pull request #14476 from grafana/metrics-tab-changes-2
Metrics tab changes 2
2018-12-13 09:11:14 +01:00
Torkel Ödegaard
8994f3c283 Merge pull request #14461 from grafana/gauge-value-mappings
Gauge value mappings
2018-12-13 09:11:01 +01:00
Torkel Ödegaard
633ae8c37a Merge pull request #14457 from grafana/fix/new-datasource-check-lowercase
Check with lowercase
2018-12-13 09:09:56 +01:00
Torkel Ödegaard
77963e68b5 Merge pull request #14472 from grafana/loki-db-mig
migration: renames logging ds to loki ds in data_source table
2018-12-13 09:05:18 +01:00
Torkel Ödegaard
f39fd7655e wip: minor style changes 2018-12-13 08:56:20 +01:00
Torkel Ödegaard
666e8e8330 wip: changes 2018-12-13 07:44:58 +01:00
Erik Sundell
ad55be9865 break out metric picker and filter 2018-12-13 00:16:48 +01:00
Daniel Lee
90e2175716 migration: renames logging ds to loki ds in data_source table 2018-12-12 20:54:05 +01:00
Daniel Lee
8e00bb340c Merge pull request #14471 from grafana/loki-image
loki: updates the logo
2018-12-12 20:45:22 +01:00
Daniel Lee
2d2254293b loki: updates the logo 2018-12-12 20:34:33 +01:00
Peter Holmberg
1f533ddfe2 fixing tests 2018-12-12 16:20:47 +01:00
Peter Holmberg
dbba523d3b mixing color when 2018-12-12 16:16:05 +01:00
Torkel Ödegaard
e08e38bd88 Merge pull request #14460 from grafana/14435_fix
Add oauth_auto_login setting to defaults file
2018-12-12 14:51:51 +01:00
Torkel Ödegaard
1751a51088 wip 2018-12-12 14:44:40 +01:00
Torkel Ödegaard
5adb0f79df wip 2018-12-12 14:25:07 +01:00
Erik Sundell
7cc42d7c13 remove on metric type change 2018-12-12 14:08:47 +01:00
Torkel Ödegaard
be7e7fcb40 things are working 2018-12-12 13:59:19 +01:00
Erik Sundell
f6109d21d2 fix remove filter bug 2018-12-12 13:59:13 +01:00
Erik Sundell
d154d16061 use same color for label as in explore dropdown 2018-12-12 13:58:25 +01:00
Erik Sundell
ac416ba880 cleanup query filter 2018-12-12 13:57:32 +01:00
Marcus Efraimsson
fada00f87e changelog: add notes about closing #8843 #11175 2018-12-12 13:27:25 +01:00
Marcus Efraimsson
c46d01dc83 Merge pull request #14090 from marefr/8843_pipeline_doc_count
Fix pipeline aggregations on doc count
2018-12-12 13:21:13 +01:00
Torkel Ödegaard
9f0d7314dd fixed unit tests 2018-12-12 13:05:24 +01:00
Erik Sundell
ad9a35198d update failing tests 2018-12-12 12:57:57 +01:00
Erik Sundell
bcb218f57c remove redundant default value 2018-12-12 12:55:23 +01:00
Torkel Ödegaard
b6a5375af1 wip 2018-12-12 12:51:39 +01:00
Torkel Ödegaard
21e1d7b05b wip 2018-12-12 11:24:18 +01:00
Peter Holmberg
80a2c3b151 redone state 2018-12-12 11:23:33 +01:00
Peter Holmberg
50cd8d995b display value map or range map 2018-12-12 11:04:34 +01:00
Marcus Efraimsson
b9e91cab0e add oauth_auto_login setting to defaults file
Making the setting configurable thru environment variable
2018-12-12 10:42:37 +01:00
Erik Sundell
ae922747db use new option group in aggregation directive 2018-12-12 09:57:30 +01:00
Torkel Ödegaard
7161b2dc9b wip 2018-12-12 09:51:17 +01:00
Erik Sundell
33146b248e remove redundant default value 2018-12-12 09:14:06 +01:00
Torkel Ödegaard
8497c854f6 Adding mixed query 2018-12-12 08:54:12 +01:00
Peter Holmberg
29bcdef104 Check with lowercase 2018-12-12 08:47:08 +01:00
Torkel Ödegaard
87e6f86f87 wip metrics tab changes 2018-12-12 08:33:49 +01:00
bergquist
ed2a9b8e73 changelog: adds note about closing #13754 2018-12-12 08:08:30 +01:00
Torkel Ödegaard
3452ee5a9c wip: making things work again 2018-12-12 06:52:08 +01:00
Torkel Ödegaard
fa4fddf7b5 React-select refactorings 2018-12-11 22:17:32 +01:00
Erik Sundell
ab5e5de814 wip: add option group component 2018-12-11 20:12:33 +01:00
Erik Sundell
b18f064817 wip: add basic option header 2018-12-11 20:11:18 +01:00
Torkel Ödegaard
1d7d72b49d wip: react select css refactoring 2018-12-11 18:49:48 +01:00
Daniel Lee
ee275cf2dc Merge pull request #14453 from grafana/readme-explore-link-fix
docs: fix broken link on explore page
2018-12-11 17:26:51 +01:00
Daniel Lee
46565efc04 docs: fix broken link on explore page 2018-12-11 17:17:01 +01:00
Torkel Ödegaard
d998527128 wip 2018-12-11 17:03:38 +01:00
Daniel Lee
d7ba9c1a54 Merge pull request #14325 from grafana/docs-explore
WIP docs for the new Explore feature
2018-12-11 16:45:35 +01:00
Torkel Ödegaard
45fde57ef9 Merge branch 'develop' into metrics-tab-changes 2018-12-11 16:45:04 +01:00
Torkel Ödegaard
b0c014bf24 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-11 16:44:52 +01:00
Peter Holmberg
f7cb5a1fd5 changing type and started on Gauge 2018-12-11 16:44:42 +01:00
Torkel Ödegaard
4dbfcde782 Merge pull request #14446 from grafana/14274-develop-viz-keynav
Change KeyboardNavigation HOC to a component with render prop instead
2018-12-11 16:44:30 +01:00
Peter Holmberg
0ba75a88a5 fix threshold test 2018-12-11 16:06:36 +01:00
Peter Holmberg
5f7bc13678 Adding label 2018-12-11 15:58:48 +01:00
Peter Holmberg
6ab93982ae styling on dropdowns 2018-12-11 15:47:30 +01:00
Torkel Ödegaard
076a1be03a Merge pull request #14449 from grafana/14437-tag-filter
Filter tags select box on text input #14437
2018-12-11 15:21:51 +01:00
Peter Holmberg
c2b1f504a0 Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-11 15:19:28 +01:00
Peter Holmberg
346f5f2595 Using drop down instead 2018-12-11 15:14:53 +01:00
Johannes Schill
6bb9415b0e Filter tags select box on text input #14437 2018-12-11 15:04:40 +01:00
Peter Holmberg
db87c5126b fixed id bug 2018-12-11 14:45:18 +01:00
Peter Holmberg
ddf080dab6 Using an id to identify mappings 2018-12-11 14:17:58 +01:00
Johannes Schill
a0da303f80 Change KeyboardNavigation from hoc to render prop component 2018-12-11 13:50:01 +01:00
Johannes Schill
07ce88f685 Clean up hoc and extend component props automatically 2018-12-11 13:50:01 +01:00
Johannes Schill
645812f643 Let VizTypePicker use the keyboard navigation hoc 2018-12-11 13:50:01 +01:00
Torkel Ödegaard
4591c3555c Moved more metrics tab to react 2018-12-11 13:36:44 +01:00
Erik Sundell
847f5491bf Wrap react select component in angular directive 2018-12-11 13:14:55 +01:00
Torkel Ödegaard
d6c6ba642e Don't show heading for first tab 2018-12-11 10:33:09 +01:00
Torkel Ödegaard
5d4034be5a Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-11 10:13:57 +01:00
Torkel Ödegaard
f9110f7902 Merge branch 'master' into develop 2018-12-11 10:00:29 +01:00
Torkel Ödegaard
71bf5ca8c6 Merge pull request #14429 from grafana/docker-blocks-links
Docker blocks: Use links instead of bridge network
2018-12-11 09:14:54 +01:00
Torkel Ödegaard
75a1536c91 Merge pull request #14434 from grafana/14274-reset-search
14274 develop - Reset DsPicker and VizPicker state when closed
2018-12-11 09:14:41 +01:00
Torkel Ödegaard
479869085c Merge pull request #14433 from grafana/14274-develop-viz-keynav
14274 develop - VizPicker keyboard navigation
2018-12-11 09:14:26 +01:00
Torkel Ödegaard
0253792dad Merge pull request #14438 from grafana/davkal/explore-enhanced-log-parsing
Explore: Improved line parsing for logging
2018-12-11 09:10:45 +01:00
ryan
7d6c1dd825 Merge remote-tracking branch 'grafana/master'
* grafana/master: (93 commits)
  updated publish script
  Update CHANGELOG.md
  fix time regions bugs
  fixed issue with colorpicker position above window, fixes #14412
  fixed issue with singlestat and repeated scopedVars, was only working for time series data sources, and only if there was any series, now scoped vars is always set, fixes #14367
  fix search tag issues, fixes #14391
  Clear query models when changing data source type, fixes #14394
  Use correct variable name in fail text
  Fix logs panel meta wrap
  Explore: dont pass all rows to all rows, fixes profiler
  Explore: Logging dedup tooltips
  Explore: Hide scanning again after result was found
  Explore: Fix timepicker inputs for absolute dates
  Switch to global match for full browser support of escaped custom vars
  Allow backslash escaping in custom variables
  Fixed issue with logs graph and stacking
  align yellow collor with graph in logs table
  Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate.  Pull request #14399
  allow sidemenu sections without children still have a hover menu/header
  changelog: adds note about closing #11221
  ...
2018-12-10 16:52:19 -08:00
Victor Cinaglia
411d67cae7 snapshots: Add support for deleting external snapshots 2018-12-10 18:47:23 -05:00
Daniel Lee
a2f4775b8d docs: explore
Documentation for the new Explore feature.

Describes both the Prometheus-specific features and the
Loki (logging) features.
2018-12-10 23:51:14 +01:00
Victor Cinaglia
9d6da10e82 snapshots: Move external snapshot creation to backend 2018-12-10 16:36:32 -05:00
Victor Cinaglia
d9d6a4481f snapshots: Add external_delete_url column 2018-12-10 16:25:02 -05:00
Johannes Schill
20134c902b Add keyboard navigation to datasource picker via a hoc. 2018-12-10 21:42:53 +01:00
Johannes Schill
1ffac5a33d Use react's onKeyDown event on the input instead of event listener on document 2018-12-10 21:38:07 +01:00
David Kaltschmidt
71429d7210 Explore: Improved line parsing for logging
- changed log parser API to be more semantic: getting fields, getting values
- regexps become an implementation detail of parser and are no longer part of the API
- improved JSON parser to not be tripped by nested quotation marks
- improved JSON parser to support numbers
- added more tests
2018-12-10 10:05:57 -08:00
Peter Holmberg
76f296e299 fixed typings and remove 2018-12-10 16:57:34 +01:00
Torkel Ödegaard
b380f74131 updated publish script 2018-12-10 16:39:54 +01:00
Johannes Schill
6ac8f5c7a5 Unmount component when fading out to reset its state, such as search.. 2018-12-10 15:51:41 +01:00
Torkel Ödegaard
6c3f9effd4 Update CHANGELOG.md 2018-12-10 15:40:43 +01:00
Johannes Schill
cdcc316310 Variable rename. Did not make sense at all. 2018-12-10 15:29:51 +01:00
Johannes Schill
856c0ee052 Fix styling for vizPicker keyboard nav and change so only arrow up/down is OK to use 2018-12-10 15:20:32 +01:00
Peter Holmberg
4a57d594e5 fixed styling 2018-12-10 14:50:32 +01:00
Johannes Schill
ae5bc366c2 Start adding keyboard navigation to VizPicker 2018-12-10 14:45:49 +01:00
Torkel Ödegaard
a0fc013472 Merge pull request #14428 from grafana/14425_time_regions
Fix time regions bugs
2018-12-10 14:40:48 +01:00
Torkel Ödegaard
512b617120 Merge pull request #14427 from grafana/color-picker-position-fix
Fixed issue with colorpicker position above window
2018-12-10 14:39:26 +01:00
Erik Sundell
49e756aa93 use links instead of bridge network 2018-12-10 14:25:29 +01:00
Marcus Efraimsson
8f26fe0fbb fix time regions bugs 2018-12-10 14:25:03 +01:00
Torkel Ödegaard
aea74f0e7f Merge pull request #14426 from grafana/fix-singlestat-repeat-variable-issue
fixed issue with singlestat and repeated scopedVars
2018-12-10 14:17:23 +01:00
Torkel Ödegaard
6f061ab159 Merge pull request #14403 from grafana/logs-graph-stacking
Fixed issue with logs graph and stacking
2018-12-10 14:16:28 +01:00
Torkel Ödegaard
0c5fd21327 fixed issue with colorpicker position above window, fixes #14412 2018-12-10 14:07:20 +01:00
Torkel Ödegaard
976d25d6ae fixed issue with singlestat and repeated scopedVars, was only working for time series data sources, and only if there was any series, now scoped vars is always set, fixes #14367 2018-12-10 13:40:32 +01:00
Torkel Ödegaard
6433ff4bdc Merge pull request #14424 from grafana/fix-search-tag-issues
Fix search tag UI issues
2018-12-10 13:39:04 +01:00
Torkel Ödegaard
e05f6c5397 fix search tag issues, fixes #14391 2018-12-10 13:23:38 +01:00
Torkel Ödegaard
acf24bd679 Clear query models when changing data source type, fixes #14394 2018-12-10 12:56:49 +01:00
Torkel Ödegaard
74b3a509f7 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-10 12:32:37 +01:00
Torkel Ödegaard
514c8a0210 fixed issue with grid responsive mode 2018-12-10 12:20:14 +01:00
Torkel Ödegaard
336fb4180f Merge pull request #14285 from grafana/14280_fix_time_region
Fix time regions using zero hours
2018-12-10 12:12:19 +01:00
Torkel Ödegaard
7e0bc8f30d fixed max height issue not being respected by react select dropdown 2018-12-10 12:02:27 +01:00
ijin08
ee55a9c18b removed side menu for column styles, added small header to column styles with a border 2018-12-10 11:59:02 +01:00
Carl Bergquist
1b6ed5815e Merge pull request #14405 from IntegersOfK/master
Allow backslash escaping in custom variables
2018-12-10 07:40:18 +01:00
Carl Bergquist
e61d87704d Merge pull request #14417 from Napsty/fix-variable-name-in-rp-warning
Use correct variable name in fail text
2018-12-10 07:13:59 +01:00
Claudio Kuenzler
1dc3728f6a Use correct variable name in fail text 2018-12-10 06:54:12 +01:00
David Kaltschmidt
117adbbe5d Fix search field styles 2018-12-09 14:39:25 -08:00
David Kaltschmidt
9293ff06cd Enable search also after editing 2018-12-09 18:53:03 +01:00
David Kaltschmidt
6b9200a606 Explore: Split logging query into selector and search
- add second query field to logging datasource query component
- second field manages search term, first field manages stream selectors
- improved logging cheat sheet to get started
2018-12-09 18:44:59 +01:00
Torkel Ödegaard
1f7fece802 Merge pull request #14413 from grafana/davkal/fix-logging-meta-wrapping
Fix logs panel meta wrap
2018-12-09 18:44:47 +01:00
Torkel Ödegaard
a9fc77b411 Merge pull request #14408 from grafana/davkal/fix-14407
Explore: Hide scanning again after result was found
2018-12-09 17:46:14 +01:00
Torkel Ödegaard
837a621502 Merge pull request #14410 from grafana/davkal/explore-logging-dedup-description
Explore: Logging dedup tooltips
2018-12-09 17:44:45 +01:00
Torkel Ödegaard
c58f818ea2 Merge pull request #14411 from grafana/davkal/fix-14362
Explore: dont pass all rows to all rows, fixes profiler
2018-12-09 17:42:47 +01:00
David Kaltschmidt
b0c431ae67 Fix logs panel meta wrap 2018-12-09 17:22:35 +01:00
David Kaltschmidt
61924e9130 Explore: dont pass all rows to all rows, fixes profiler
- react profiler seems to evaluate all props of all components down the tree
- this becomes slow when 1000 rows are passed to 1000 rows and their labels
- use getter function instead to ask for rows on demand
2018-12-09 13:23:44 +01:00
David Kaltschmidt
487de2b832 Explore: Logging dedup tooltips
- use title attribute of toggle button group
- add descriptions for all dedup options
2018-12-09 13:06:34 +01:00
David
e5c547c504 Merge pull request #14406 from grafana/davkal/fix-14390
Explore: Fix timepicker inputs for absolute dates
2018-12-09 11:45:17 +01:00
David Kaltschmidt
1bcc866341 Explore: Hide scanning again after result was found
- when query result was found, stop scanning
- this hides the scan status again
2018-12-09 11:42:35 +01:00
Torkel Ödegaard
6dc050d01e Merge pull request #14401 from evergage/14399-cloudwatch-bouncerate
Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate.  …
2018-12-09 11:06:01 +01:00
David Kaltschmidt
60ee4499e7 Explore: Fix timepicker inputs for absolute dates
- Timepicker needs to keep from and to internally as strings
for the fully controlled inputs
- make sure from and to are strings when time is reset
2018-12-09 07:05:27 +01:00
AJ West
6c95acc837 Switch to global match for full browser support of escaped custom vars 2018-12-08 18:23:08 -05:00
AJ West
2b3d366f7c Allow backslash escaping in custom variables 2018-12-08 17:31:05 -05:00
Torkel Ödegaard
14cf846e73 Fixed issue with logs graph and stacking 2018-12-08 11:15:02 -08:00
Torkel Ödegaard
683b718e2b align yellow collor with graph in logs table 2018-12-08 09:45:02 -08:00
Torkel Ödegaard
a3dd29fb66 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-08 13:03:58 +01:00
Torkel Ödegaard
912dc0f2a9 Merge pull request #14392 from grafana/14377-develop-graph-options
Removed graph side menu
2018-12-08 13:03:42 +01:00
Torkel Ödegaard
1bb535bbe3 minor style change 2018-12-08 12:54:36 +01:00
Scott Glajch
62a5cd27ba Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate. Pull request #14399 2018-12-07 16:42:29 -05:00
Torkel Ödegaard
3d0c54a946 logs style polish 2018-12-07 12:13:23 -08:00
Torkel Ödegaard
efede26eea Merge pull request #14382 from grafana/davkal/remove-explore-tab
Remove Explore > "New tab" from sidebar
2018-12-07 20:24:13 +01:00
Torkel Ödegaard
30c2cc4b5c allow sidemenu sections without children still have a hover menu/header 2018-12-07 11:14:32 -08:00
Torkel Ödegaard
cb59f388ca explore logs options styling 2018-12-07 17:23:35 +01:00
Torkel Ödegaard
bfbb44af03 transparent toggle style and new button group style 2018-12-07 17:15:46 +01:00
Peter Holmberg
a0a06911d8 Toggle buttons 2018-12-07 17:08:28 +01:00
Peter Holmberg
368f1f67e4 render a value mapping row 2018-12-07 16:55:58 +01:00
ijin08
bd589b61bd removed side menu from display options, kept overrides in display options, moved thresholds and time regions to its own section in visualization 2018-12-07 15:18:43 +01:00
Peter Holmberg
4f39df900c Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-07 15:10:32 +01:00
Torkel Ödegaard
79933299c7 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-07 15:09:09 +01:00
Peter Holmberg
d474fd1b58 Merge remote-tracking branch 'origin/develop' into gauge-value-mappings 2018-12-07 15:08:24 +01:00
Torkel Ödegaard
eb6d0e9f51 Merge branch 'master' into develop 2018-12-07 14:59:38 +01:00
bergquist
2b5b16f5d3 changelog: adds note about closing #11221 2018-12-07 14:50:41 +01:00
Carl Bergquist
93dee6d4c2 Merge pull request #11410 from PatrickSchuster/add_google_hangouts_chat_notifier
Add Google Hangouts Chat notifier.
2018-12-07 14:49:28 +01:00
bergquist
9eea585773 removes unused code 2018-12-07 14:39:44 +01:00
bergquist
5d720674e3 Merge branch 'master' into add_google_hangouts_chat_notifier
* master: (322 commits)
  graphInterval needs to update after query execution, fixes #14364
  Explore: Parse initial dates
  Aligned styling of stats popover/box with rest of grafana & minor css refactoring
  Prometheus: Make result transformer more robust for empty responses
  Rebase fixes
  Explore: Logging line parsing and field stats
  fixed unit tests
  made unknown color theme aware and sync with graph color, some minor cleanup
  Explore: improve error handling
  use render props instead of cloneElement
  sort of a hacky way to figure if the small variation should be used for the label
  add basic button group component, using the the same label style as is
  explore logs styling
  wip: alternative level styling & hover effect
  wip: explore logs styling
  more detailed error message for loki
  If user login equals user email, only show the email once #14341
  UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons.  #14341
  wip: explore logs styling
  restoring monospace & making sure width are correct when hiding columns
  ...
2018-12-07 14:31:13 +01:00
bergquist
a90bba859a fixes merge error 2018-12-07 14:17:09 +01:00
Erik Sundell
569f5e8d5e remove result format. might add this later 2018-12-07 14:13:05 +01:00
Erik Sundell
68c2d2631e filter out build in datasources. add unit test 2018-12-07 14:11:40 +01:00
Daniel Lee
687cf013bd Merge pull request #14385 from grafana/davkal/fix-explore-date-parsing
Explore: Parse initial dates
2018-12-07 14:10:36 +01:00
Erik Sundell
b1a40992d3 Merge branch 'develop' of https://github.com/grafana/grafana into develop 2018-12-07 13:58:07 +01:00
Torkel Ödegaard
5d22cdab28 click on dashboard title moves you back to dashboard instead of search 2018-12-07 13:50:50 +01:00
Torkel Ödegaard
619b4b4872 Merge pull request #14336 from grafana/davkal/explore-line-parsing
Explore: Logging line parsing and field stats
2018-12-07 13:24:43 +01:00
Torkel Ödegaard
a89e21c561 Merge pull request #14386 from grafana/explore-fix-interval-update
Explore: graphInterval needs to update after query execution
2018-12-07 13:21:43 +01:00
Torkel Ödegaard
ef08b9cd2b graphInterval needs to update after query execution, fixes #14364 2018-12-07 13:07:08 +01:00
David Kaltschmidt
a990b69baa Explore: Parse initial dates
- parse dates passed from URL
- keep everything local time for now
2018-12-07 12:41:47 +01:00
Daniel Lee
140205a783 Merge pull request #14381 from grafana/davkal/fix-prometheus-transformation-error
Prometheus: Make result transformer more robust for empty responses
2018-12-07 12:22:45 +01:00
Torkel Ödegaard
7cb456ea23 Aligned styling of stats popover/box with rest of grafana & minor css refactoring 2018-12-07 11:28:22 +01:00
David Kaltschmidt
80d62013b2 Remove Explore > "New tab" from sidebar
- we don't support tabs yet, might as well remove the entry
2018-12-07 11:27:46 +01:00
Erik Sundell
45fbbe8021 initialize empty variables array in constructor so that datasources can use the array in explore 2018-12-07 11:27:11 +01:00
David Kaltschmidt
c0c06e4dd8 Prometheus: Make result transformer more robust for empty responses
- some prometheus-compatible backends may return `null` instead of empty lists
- test for lists before iterating
- added tests for empty responses
2018-12-07 11:22:55 +01:00
Torkel Ödegaard
b8b468f733 Merge pull request #14343 from grafana/develop-14333
Update react panel header when changing angular panel settings
2018-12-07 10:54:00 +01:00
Torkel Ödegaard
dbb34020ca Merge pull request #14375 from moznion/fix_quota_updating
Fix quota updating
2018-12-07 10:38:32 +01:00
Erik Sundell
260d0189b6 add table support flag in influx config 2018-12-07 10:29:38 +01:00
Erik Sundell
97180d5106 add scoped vars to query options 2018-12-07 10:28:51 +01:00
David Kaltschmidt
fb4925a8c2 Rebase fixes 2018-12-07 10:22:52 +01:00
David Kaltschmidt
acd52e6a93 Explore: Logging line parsing and field stats
Lazily parse lines and display stats for field when clicked on.

- log line parsers for JSON (basic), and logfmt
- delayed parsing in case user moves to other line
- reuse label stats for field stats
2018-12-07 09:59:55 +01:00
Torkel Ödegaard
9cc4e05205 Merge pull request #14366 from grafana/14341-wide-picker-no-button
Pickers with min-width instead of width
2018-12-07 09:05:22 +01:00
Torkel Ödegaard
ef77748a1b Merge pull request #14368 from grafana/explore-logs-styling-alt2
Explore logs styling
2018-12-06 22:30:06 +01:00
Torkel Ödegaard
e7fe0bd668 fixed unit tests 2018-12-06 12:29:55 -08:00
David
be2d9edd1f Merge pull request #14353 from grafana/14249-multi-button-group
Multi button group
2018-12-06 21:27:34 +01:00
Torkel Ödegaard
9ac3821454 made unknown color theme aware and sync with graph color, some minor cleanup 2018-12-06 11:55:01 -08:00
Torkel Ödegaard
9c9d6c15e0 Merge branch 'master' into explore-logs-styling-alt2 2018-12-06 11:32:11 -08:00
Torkel Ödegaard
940dda6c30 Merge pull request #14369 from grafana/davkal/explore-error-handling
Explore: improve error handling
2018-12-06 20:26:47 +01:00
Marcus Efraimsson
093c9425e9 Merge pull request #14313 from dhenneke/postgres-use-table-not-schema-constraint
Improve PostgreSQL Query Editor if using different Schemas
2018-12-06 17:21:48 +01:00
Carl Bergquist
985576b482 Merge pull request #14365 from bergquist/loki_error_message
more detailed error message for loki
2018-12-06 17:17:19 +01:00
Peter Holmberg
6fff8e4a1c initial stuff 2018-12-06 17:09:32 +01:00
David Kaltschmidt
15eb3bb2f8 Explore: improve error handling 2018-12-06 16:47:36 +01:00
Erik Sundell
b74c099773 use render props instead of cloneElement 2018-12-06 16:38:50 +01:00
Erik Sundell
6f8293af4e sort of a hacky way to figure if the small variation should be used for the label
improve light theme look

use new toggle button group in logs

stop propagation on click event

clean up styles

improve support for small when a label is present

refactoring - move toggle button to the group file. turn it into a stateless component

improve support for light theme

rename dedupe to dedup

use radius variable
2018-12-06 16:37:23 +01:00
Erik Sundell
0d7b09b0f6 add basic button group component, using the the same label style as is
remove not used code

cleanup
2018-12-06 16:37:09 +01:00
Johannes Schill
fadabd997a Restore PluginEditCtrl accidently removed 2018-12-06 16:06:47 +01:00
Torkel Ödegaard
9a06fad24d Merge pull request #14352 from grafana/explore-logs-css-refactor
Explore logs css refactor
2018-12-06 15:52:25 +01:00
Torkel Ödegaard
5ac3b5a561 explore logs styling 2018-12-06 15:51:42 +01:00
Torkel Ödegaard
03b5f32e07 wip: alternative level styling & hover effect 2018-12-06 15:13:00 +01:00
Torkel Ödegaard
b9517d1104 wip: explore logs styling 2018-12-06 14:03:57 +01:00
bergquist
e230827c06 more detailed error message for loki
if grafana tries to access loki without promtail running
it will return an error.
2018-12-06 13:59:19 +01:00
Johannes Schill
02b14d33a6 If user login equals user email, only show the email once #14341 2018-12-06 13:46:04 +01:00
Johannes Schill
114a264da4 UserPicker and TeamPicker should use min-width instead of fixed widths to avoid overflowing form buttons. #14341 2018-12-06 13:46:04 +01:00
Torkel Ödegaard
25b5520345 Merge pull request #14361 from grafana/explore-logs-bucket-increase
fixed logs to time series calculation issue, increased bucket size
2018-12-06 13:31:59 +01:00
Torkel Ödegaard
86bb36fe97 wip: explore logs styling 2018-12-06 13:30:48 +01:00
Torkel Ödegaard
665ac229b6 restoring monospace & making sure width are correct when hiding columns 2018-12-06 12:49:28 +01:00
Torkel Ödegaard
2e6690428f fixed logs to time series calculation issue, increased bucket size, fixes #14248 2018-12-06 12:12:43 +01:00
Johannes Schill
8460b48c24 Always open panel links in new window if user asked for it #14333 2018-12-06 11:19:41 +01:00
Johannes Schill
276f2567ee Changing from PureComponent to Component to re-render on link updates made in Angular #14333 2018-12-06 10:54:31 +01:00
Torkel Ödegaard
e884cf6250 minor tweaks, now table renders faster and changes less on second stage rendering 2018-12-06 10:53:01 +01:00
Torkel Ödegaard
afd7580598 explore logs css refactoring, step1 2018-12-06 10:53:01 +01:00
Torkel Ödegaard
c7d701c8fa explore logs styling poc, WIP 2018-12-06 10:53:01 +01:00
Daniel Lee
8bac55ca70 Merge pull request #14350 from grafana/rename-logging-ds
Rename Grafana Logging Datasource to Loki
2018-12-06 10:34:30 +01:00
Johannes Schill
d62cd8a5c5 Fix transparent option #14333 2018-12-06 10:34:27 +01:00
Johannes Schill
a516ff81c9 Add prop key to panelPropsString to avoid a bug when changing another value and the render doesnt trigger 2018-12-06 09:39:17 +01:00
Daniel Lee
40898e1cd6 loki: adds proper error handling for config page
This handles three different error cases for the
config page so that the user gets an error and not
just a blank red error box.
2018-12-06 00:42:31 +01:00
Daniel Lee
721e1d7555 renames Grafana Logging ds to Loki 2018-12-06 00:42:31 +01:00
Torkel Ödegaard
8fa7a71d32 Merge pull request #14340 from grafana/datasource-settings-isdefault
Datasource settings isdefault
2018-12-05 20:37:44 +01:00
Johannes Schill
827ffaccd3 Pass some panel props down as strings to trigger render #14333 2018-12-05 14:57:57 +01:00
Johannes Schill
ed034b4288 Trigger panel.render on title, description, links change #14333 2018-12-05 14:56:29 +01:00
moznion
4397ee61d0 Put issue number to test code 2018-12-05 22:47:41 +09:00
moznion
d1e1cde00e Fix bug what updating user quota doesn't work
Reason is same as 061e06c226
2018-12-05 22:29:07 +09:00
moznion
061e06c226 Fix bug what updating org quota doesn't work
3c330c8e4c/pkg/services/sqlstore/quota.go (L106)

In the real use case, `has` that is described by the above code is always `false` because it includes `Updated` in a query.

So this commit fixes this issue.
2018-12-05 22:19:40 +09:00
Torkel Ödegaard
128168ec92 Merge pull request #14328 from grafana/gauge-icon
add icon
2018-12-05 13:36:17 +01:00
Torkel Ödegaard
09380399ef Merge pull request #14331 from grafana/develop-tooltip-css
Portal component
2018-12-05 13:36:03 +01:00
Mario Trangoni
37bb8840f0 public/app/plugins/*: Fix some misspell issues 2018-12-05 13:13:29 +01:00
Mario Trangoni
400db64db5 public/sass/*: Fix misspell issue 2018-12-05 13:09:27 +01:00
Mario Trangoni
ab9f65a4cf public/app/features/*: Fix some misspell issues 2018-12-05 13:08:00 +01:00
Mario Trangoni
0f74843332 public/app/core/*: Fix some misspell issues 2018-12-05 13:02:58 +01:00
Mario Trangoni
b2ef857020 README.md: Fix small typo 2018-12-05 12:59:56 +01:00
Peter Holmberg
690e701f6d fix snapshots 2018-12-05 12:50:14 +01:00
Peter Holmberg
72b7497d66 Added isDefault switch on settings 2018-12-05 11:47:02 +01:00
Torkel Ödegaard
e4e408676f Merge branch 'develop' of github.com:grafana/grafana into develop 2018-12-05 11:20:25 +01:00
Torkel Ödegaard
e01c196d88 fix to switch component 2018-12-05 11:19:38 +01:00
Johannes Schill
7d6db12f34 Rename BodyPortal to Portal and accept prop "root" which is where the portal should be placed 2018-12-05 10:50:26 +01:00
Torkel Ödegaard
aa6c52a1ba Merge pull request #14323 from grafana/develop-tooltip-css
Small tooltip css-adjustments and add css for position "bottom-start"…
2018-12-05 10:40:10 +01:00
Johannes Schill
1bbe48e9c5 Create a portal and use it with our popper component (tooltip and popover) to avoid potential overflow-/zindex-bugs 2018-12-05 10:38:53 +01:00
Carl Bergquist
3c330c8e4c Merge pull request #14317 from mjtrangoni/fix-misspell-issues
pkg/*: Fix misspelling issues using locale US
2018-12-05 10:34:28 +01:00
Peter Holmberg
2de984cbde add icon 2018-12-05 10:33:15 +01:00
Torkel Ödegaard
825b819270 Merge pull request #14316 from grafana/embedding-fix
fix for panel height when embedding
2018-12-05 10:32:48 +01:00
Torkel Ödegaard
311ec3c0af Merge pull request #14324 from grafana/panel-initialized-fix
fix for panel-initialized event not being called
2018-12-05 10:32:25 +01:00
Torkel Ödegaard
5f8001689b explore data source selector fix 2018-12-05 10:22:26 +01:00
Torkel Ödegaard
180ca021b5 Merge branch 'master' into develop 2018-12-05 10:17:22 +01:00
Johannes Schill
0a8f23d8a6 Update css to use the border-radius variable and add a new variable for the popper's distance to its ref 2018-12-05 09:39:03 +01:00
Torkel Ödegaard
769407cd34 Merge pull request #14314 from nitti/add_influxdb_cumulative_sum
added support for influxdb cumulative_sum function in tsdb
2018-12-05 09:29:04 +01:00
Torkel Ödegaard
735c28580d Update README.md 2018-12-05 09:26:01 +01:00
Torkel Ödegaard
1785e40e9d Merge pull request #14322 from grafana/develop-readme-fix
Readme: We should write Node.js the same way in all places in the readme
2018-12-05 09:24:50 +01:00
Torkel Ödegaard
757cada4a5 fix for panel-initialized event not being called 2018-12-05 09:23:47 +01:00
Torkel Ödegaard
0ad42641a2 Merge pull request #14303 from grafana/develop-keep-panel-settings
Develop keep panel settings when switching visualizations
2018-12-05 09:06:55 +01:00
Torkel Ödegaard
4872cef808 refactored and added tests for panel model remember properties 2018-12-05 07:33:21 +01:00
Torkel Ödegaard
a6ef156922 Merge pull request #14320 from briangann/20181104_remove_trace_output_for_routes
redact value for plugin proxy routes
2018-12-05 06:52:32 +01:00
Brian Gann
02365514f9 redact value for plugin proxy routes 2018-12-04 22:35:00 -06:00
Mario Trangoni
fadd816d89 pkg/*: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e devenv -e Unknwon -e Destory | grep pkg
./pkg/services/sqlstore/org_test.go:190:15: "frome" is a misspelling of "from"
./pkg/tsdb/elasticsearch/response_parser.go:544:24: "Unkown" is a misspelling of "Unknown"
./pkg/tsdb/opentsdb/opentsdb.go:87:20: "marshalling" is a misspelling of "marshaling"
./pkg/components/dynmap/dynmap_test.go:2:7: "Licence" is a misspelling of "License"
./pkg/components/dynmap/dynmap.go:2:7: "Licence" is a misspelling of "License"
2018-12-04 23:29:34 +01:00
Torkel Ödegaard
e31490ac68 fix for panel embedding. Solo panel height was not correctly set. Made panel--solo into panel-solo class. in develop branch we have remove the need for the panel class 2018-12-04 12:36:43 -08:00
Torkel Ödegaard
6c46a1c8ea Merge pull request #13873 from grafana/davkal/babel-7
JS tooling: upgrade to babel 7
2018-12-04 21:16:35 +01:00
Tom Nitti
1e53c12921 added support for influxdb cumulative_sum function in tsdb 2018-12-04 12:46:50 -06:00
Dominik Henneke
b450b778cb Use buildTableConstraint instead of buildSchemaConstraint to find the datatype of a column if using a table from a different database schema 2018-12-04 19:26:12 +01:00
Torkel Ödegaard
0c855fb974 Merge pull request #14308 from grafana/davkal/explore-dedup-number
Explore: Display duplicate row count as number
2018-12-04 17:57:09 +01:00
Johannes Schill
6d7374d982 Readme: We should write Node.js the same way in all places in the readme 2018-12-04 17:16:08 +01:00
Johannes Schill
e55659192a Small tooltip css-adjustments and add css for position "bottom-start" used by the panel header corner 2018-12-04 17:00:00 +01:00
Johannes Schill
c2aa64595a Merge pull request #14234 from grafana/gauge-value-options
Gauge value options
2018-12-04 16:30:34 +01:00
David Kaltschmidt
6980d2e142 Explore: Display duplicate row count as number
- the pips were hard to see
- make it really clear which rows are duplicates by allocating a column to show number
2018-12-04 16:21:27 +01:00
David
c4a89eb32d Merge pull request #14277 from grafana/davkal/explore-logging-live-preview
Explore: Logging query live preview of matches
2018-12-04 16:20:01 +01:00
David Kaltschmidt
b95b796a34 Adapt styles 2018-12-04 15:58:10 +01:00
David Kaltschmidt
6ee7459f22 Explore: Logging query live preview of matches
A logging query has a selector part and a regexp. The regexp matches are highlighted when results return.
This change adds live preview to matches when modifying the regexp in a search field.

- delegate retrieval of match query to datasource
- datasource returns search expressions to be used to highlight a live preview of matches
- logs row now takes preview highlights
- logs row renders preview highlights with dotted line to distinguish from query run matches (solid line)
- fix react-highlight-words version to ensure custom chunk matcher
- custom chunk matcher can now also take incomplete regexps, eg, `(level` without inifinte looping
- perf: debounce of live preview to 500ms
- perf: only top 100 rows get the live preview
- preview is only supported with one query row (multiple rows semantic makes this tricky: regexp for row n should only filter results for query n)
2018-12-04 15:47:51 +01:00
David
34b8c5bb61 Merge pull request #14278 from grafana/14272-scan-old-logs
only make it possible to scan for older logs if there is at least one…
2018-12-04 15:44:55 +01:00
Torkel Ödegaard
6cb639baaa Merge pull request #14283 from grafana/explore-styling-fixes
Misc styling fixes to explore
2018-12-04 15:17:10 +01:00
Torkel Ödegaard
33dd880e09 Merge pull request #14295 from grafana/develop-visualization-search
Add VizPicker search
2018-12-04 15:11:41 +01:00
Torkel Ödegaard
401b470ebb added max-widths to explore start pages boxes 2018-12-04 15:06:30 +01:00
Johannes Schill
fe9e4b51f1 Alert tab fails when datasource method targetContainsTemplate doesnt exist #14274 2018-12-04 15:00:37 +01:00
Erik Sundell
27c4db06fc improve comments 2018-12-04 15:00:24 +01:00
Torkel Ödegaard
1fddb6144d fixed promql and loggging syntax so all punctuation chars are treated the same, remove hover move 2018-12-04 14:57:01 +01:00
Erik Sundell
9c8bd34787 remove all query empty related code. root cause of the problem was to fix hasNonEmptyQuery 2018-12-04 14:55:56 +01:00
Johannes Schill
b8c6577626 Let the cached props from previous visualization be the masters, unless specified in keepLatestProps const 2018-12-04 14:39:56 +01:00
Johannes Schill
1ad4b44ec1 POC on how to save away settings from a viztype and restore when switching back to it #14274 2018-12-04 14:19:55 +01:00
Erik Sundell
8b3bb95007 remove redudant spread 2018-12-04 14:01:32 +01:00
Erik Sundell
4e591653bd Set query empty condition in render function. Also clear query transactions when no valid query is present 2018-12-04 13:26:26 +01:00
Erik Sundell
2af78aca8e Remove query empty from model 2018-12-04 13:23:26 +01:00
David
66c2854b11 Merge pull request #14275 from grafana/davkal/explore-logging-label-stats
Explore: Logging label stats
2018-12-04 13:02:29 +01:00
Torkel Ödegaard
47523f80dd fixed logging start page 2018-12-04 12:59:24 +01:00
Peter Holmberg
f77c354341 Merge remote-tracking branch 'origin/develop' into gauge-value-options 2018-12-04 12:56:54 +01:00
Torkel Ödegaard
ac6170a7cc Merge branch 'master' into explore-styling-fixes 2018-12-04 12:53:24 +01:00
David Kaltschmidt
ffa584baec Use popover styles for stats popover 2018-12-04 12:50:29 +01:00
David Kaltschmidt
a08042ea18 Fine tune stats styles 2018-12-04 12:41:32 +01:00
David Kaltschmidt
9f0b1e533f Tests for label stats calculation 2018-12-04 12:41:32 +01:00
David Kaltschmidt
5916cb3e7c Explore: Logging label stats
- added filter and stats icons to log stream labels
- removed click handler from label itself
- click on stats icon calculates label value distribution across loaded logs lines
- show stats in hover
- stats have indicator which value is the current one
- showing top 5 values for the given label
- if selected value is not among top 5, it is added
- summing up remaining label value distribution as Other
2018-12-04 12:41:32 +01:00
David
a69ab2fb3a Merge pull request #14299 from grafana/14273-clear-scanning
Explore: Stop scanning when clear all button is clicked
2018-12-04 12:37:04 +01:00
David
f73a479838 Merge pull request #14296 from grafana/davkal/explore-grid
Explore: return to grid layout for logs table
2018-12-04 12:34:58 +01:00
Erik Sundell
f8cef73b5b stop scanning when clear all button is clicked 2018-12-04 11:28:04 +01:00
Leonard Gram
9a771555f3 build: update latest when pushing docker. 2018-12-04 11:16:49 +01:00
Erik Sundell
2be92af456 Use origin meta 2018-12-04 11:13:16 +01:00
Erik Sundell
541a691aca only display scan button if there is at least one existing selector that returned an empty result 2018-12-04 11:00:21 +01:00
Peter Holmberg
5e1005f66c minor refactoring 2018-12-04 10:50:40 +01:00
David Kaltschmidt
4ce79349a3 Explore: return to grid layout for logs table
- better column control than flexbox
- increased gutter and row spacing
2018-12-04 10:48:28 +01:00
Johannes Schill
bc5a0d9120 Add VizPicker search #14274 2018-12-04 10:42:01 +01:00
Marcus Efraimsson
346e617a11 changelog: add notes about closing #11067 2018-12-04 10:24:38 +01:00
Marcus Efraimsson
d507c73c12 Merge pull request #14265 from danielbh/feat/prevent-remove-last-admin
Fix prevent removing last grafana admin permissions
2018-12-04 01:20:44 -08:00
Torkel Ödegaard
1283a3292d fixed grabage in markup 2018-12-04 10:16:51 +01:00
Pavel
bf55f36e95 Merge pull request #2 from grafana/master
Update master
2018-12-04 11:08:10 +02:00
Torkel Ödegaard
1828ace4b3 fix: align input backgrounds for code editors 2018-12-04 09:41:36 +01:00
Marcus Efraimsson
70eedc1fde Merge pull request #14294 from flopp999/patch-10
fixedUnit for Flow:l/min and mL/min
2018-12-04 00:36:27 -08:00
flopp999
8caeb13026 fixedUnit for Flow:l/min and mL/min
got stranged result with decimalSIPrefix
2018-12-04 08:03:25 +01:00
danielbh
d1b8f13c66 feat: #11067 prevent removing last grafana admin permissions 2018-12-03 20:05:52 -05:00
Torkel Ödegaard
729d1d1da9 another style fix for broken dark theme word highlight 2018-12-03 11:55:30 -08:00
Marcus Efraimsson
ad33cd5c5c fix time regions using zero hours 2018-12-03 18:06:37 +01:00
Torkel Ödegaard
44414c4346 Misc styling fixes to explore: start page, slate code editor colors, text highlight in auto completeter suggestion 2018-12-03 17:20:02 +01:00
Erik Sundell
e21ca3f545 Revert commit 2018-12-03 17:17:57 +01:00
ryan
b888aeec0d Merge remote-tracking branch 'grafana/master'
* grafana/master: (39 commits)
  update package.json to next version
  changelog: add notes about closing #13815
  changelog: add notes about closing #14246
  changelog: add notes about closing #12653
  Hid "Forgot your password" link from login menu when reset is disabled
  Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled
  update changelog
  update latest.json to latest stable version
  new stable docs version
  dataproxy: Override incoming Authorization header
  changelog: add notes about closing #14228
  Explore: Show logging errors from backend
  change obj order when merging so that correct format is being used
  Explore: Fix logging query parser for regex with quantifiers
  Update README.md
  Fixed typo in function name
  Explore: Fix label and history suggestions
  let each sql datasource handle timeFrom and timeTo macros
  Review feedback
  changelog: add notes about closing #14167
  ...
2018-12-03 08:14:13 -08:00
Erik Sundell
d9d84f45bc only make it possible to scan for older logs if there is at least one non failing selector 2018-12-03 16:58:46 +01:00
Marcus Efraimsson
e9a8185da1 update package.json to next version 2018-12-03 16:49:32 +01:00
David Kaltschmidt
d150b62d06 Stick to .tsx? for babel file test 2018-12-03 16:32:50 +01:00
Marcus Efraimsson
5641f45349 changelog: add notes about closing #13815 2018-12-03 15:52:16 +01:00
Marcus Efraimsson
95218c13ce Merge pull request #14262 from kornholi/fix/dataproxy-auth
dataproxy: Override incoming Authorization header
2018-12-03 06:49:31 -08:00
Marcus Efraimsson
b54061f4bd changelog: add notes about closing #14246 2018-12-03 15:04:48 +01:00
Peter Holmberg
b6ef10b8db arrow function 2018-12-03 15:02:41 +01:00
Marcus Efraimsson
ffec795fab Merge pull request #14232 from SilverFire/security-password-reset
Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled
2018-12-03 06:02:29 -08:00
Marcus Efraimsson
4de28ef88a changelog: add notes about closing #12653 2018-12-03 14:47:02 +01:00
Marcus Efraimsson
acb45867f8 Merge pull request #14179 from mattiarossi/master
Add support for offset in date histogram aggregation
2018-12-03 05:43:42 -08:00
Peter Holmberg
2f78f46afa fix for add/remove labels 2018-12-03 14:37:42 +01:00
SilverFire - Dmitry Naumenko
257802e750 Hid "Forgot your password" link from login menu when reset is disabled 2018-12-03 15:35:25 +02:00
SilverFire - Dmitry Naumenko
474197269e Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled 2018-12-03 15:32:26 +02:00
Peter Holmberg
b4d5ddd6f4 fix for initial options 2018-12-03 13:33:17 +01:00
Torkel Ödegaard
9cbdd07315 Merge branch 'panel-edit-in-react-sidemenu' into develop 2018-12-03 13:21:07 +01:00
Torkel Ödegaard
ab33cfd7c8 minor css fixes 2018-12-03 03:31:55 -08:00
Torkel Ödegaard
d16b348868 Merge pull request #14257 from grafana/davkal/fix-14250
Explore: Fix logging query parser for regex with quantifiers
2018-12-03 12:25:10 +01:00
Marcus Efraimsson
246c1ca79d update changelog 2018-12-03 12:18:11 +01:00
Marcus Efraimsson
9c1c21eed2 update latest.json to latest stable version 2018-12-03 12:17:02 +01:00
Marcus Efraimsson
5c4b91c65e new stable docs version 2018-12-03 12:16:08 +01:00
Torkel Ödegaard
bd89b4e6a5 Merge branch 'panel-edit-in-react' into develop 2018-12-03 02:58:51 -08:00
Torkel Ödegaard
9404d36ab5 Merge pull request #14135 from grafana/panel-edit-in-react
React Panel Editor Mode (For Angular and React Panels)
2018-12-03 11:50:06 +01:00
Torkel Ödegaard
d38a0a0b64 Merge pull request #14106 from grafana/unit-picker
Unit picker
2018-12-03 10:53:48 +01:00
David
ba18b470a4 Merge pull request #14260 from grafana/davkal/fix-14258
Explore: Show logging errors from backend
2018-12-03 10:00:22 +01:00
Torkel Ödegaard
c99861a7b3 minor css fix 2018-12-03 00:46:45 -08:00
Peter Holmberg
fd8fe35e29 redid props for gauge options 2018-12-03 09:37:45 +01:00
Carl Bergquist
3c8515bb77 Merge pull request #14220 from mjtrangoni/fix-misspell-issues
Fix misspelling issues using locale US
2018-12-03 09:18:46 +01:00
Kornelijus Survila
0cafd9a663 dataproxy: Override incoming Authorization header 2018-11-30 12:12:55 -07:00
David
fab2597650 Merge pull request #14259 from grafana/14237-prevent-table-crash
change obj order when merging so that correct format is being used
2018-11-30 16:37:50 +01:00
Marcus Efraimsson
314152ebf6 changelog: add notes about closing #14228 2018-11-30 16:24:24 +01:00
Marcus Efraimsson
901ec01992 Merge pull request #14254 from grafana/14228_mysql_time_from_to
Fix mysql $__timeFrom() and $__timeTo() should respect local time zone
2018-11-30 07:22:34 -08:00
Marcus Efraimsson
1abbdaaaae Merge pull request #14241 from yukihiratype2/master
Update README.md
2018-11-30 07:19:46 -08:00
David
c441b9eec3 Merge pull request #14256 from grafana/davkal/fix-14245
Explore: Fix label and history suggestions
2018-11-30 16:16:16 +01:00
David Kaltschmidt
47468fca68 Explore: Show logging errors from backend
- Logging datasource sends error string directly in the message body
- allowing response body to be an error when query transaction failed
- added throw in case we ever encounter unhandled errors again (forces us to fix the issue)
2018-11-30 16:09:56 +01:00
Erik Sundell
12ba314e24 change obj order when merging so that correct format is being used 2018-11-30 15:58:01 +01:00
David Kaltschmidt
11a53763e2 Explore: Fix logging query parser for regex with quantifiers
- ensure that selectors have to be preceded by whitespace or line beginning
- glacing over the fact that ` {0,1}` could be a valid regexp, but we're using space as query/regexp separators anyway, so I think it's fine for now
2018-11-30 15:49:54 +01:00
Minamiya_Natsuki
ecddf9d408 Update README.md 2018-11-30 22:47:57 +08:00
David
088c2e70d8 Merge pull request #14236 from grafana/davkal/explore-logging-rendeer
Explore: Logging render performance
2018-11-30 15:37:24 +01:00
David Kaltschmidt
a513130493 Fixed typo in function name 2018-11-30 15:19:09 +01:00
David Kaltschmidt
a61c8d23d4 Explore: Fix label and history suggestions
- fork promql's tokenizer (need to specify that labels context can only follow beginning of line or whitespace)
- remove unneeded syntax features
- only present history items when field is empty
2018-11-30 15:13:53 +01:00
Peter Holmberg
de9137a7c7 tidy import 2018-11-30 14:32:29 +01:00
Marcus Efraimsson
624e5e5b3d let each sql datasource handle timeFrom and timeTo macros 2018-11-30 14:30:02 +01:00
Erik Sundell
4f38af12a8 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-30 14:18:33 +01:00
Torkel Ödegaard
1db3885283 style changes for panel placeholder (move and resize) effect 2018-11-30 05:14:23 -08:00
Erik Sundell
3c556c4833 never load fallback query field. remove commented code 2018-11-30 13:53:39 +01:00
Erik Sundell
be85944d84 add an error alert component that will be displayed when there was an error loading ds in explore 2018-11-30 13:51:49 +01:00
Torkel Ödegaard
222f26ea80 Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-30 04:46:39 -08:00
Torkel Ödegaard
6c09373995 fix: minor style changes, removed hover scale increase 2018-11-30 04:45:25 -08:00
Johannes Schill
0b65558c21 react-panel: Add nullcheck to prevent error on datasources without meta options 2018-11-30 13:42:49 +01:00
Johannes Schill
e0fb89cf54 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-30 13:39:46 +01:00
Johannes Schill
363425d55e react-panel: Options button should always be enabled now when Time Range-options are there 2018-11-30 13:39:06 +01:00
Johannes Schill
d02839d2d1 react-panel: Move time range options to its own component and render it under the options button instead 2018-11-30 13:36:53 +01:00
Peter Holmberg
4c6897b411 created color enum 2018-11-30 13:17:17 +01:00
Torkel Ödegaard
a6c4ba4dfb Merge pull request #14242 from grafana/various-style-fixes
Fixed styling issues with new checkbox style
2018-11-30 12:52:24 +01:00
Erik Sundell
e55a0cceff Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-30 12:50:16 +01:00
Erik Sundell
c40bfb8eda make sure target obj is not destructured so that angular copy of objected can be mutated 2018-11-30 12:49:05 +01:00
David Kaltschmidt
979f3f3e0c Review feedback
- fixed typo
- moved result calculation to explore utils
- use component keys instead of componentWillReceiveProps
- require logs to have and id, to as use as Logs component key
- render delay based on row count
2018-11-30 12:26:57 +01:00
Johannes Schill
58da6e8c26 react-panel: Add test for Input with validation on blur 2018-11-30 12:26:45 +01:00
Johannes Schill
c722ea4f76 react-panel: Input validation should be optional 2018-11-30 11:04:56 +01:00
Torkel Ödegaard
cc210b11fb Merge branch 'panel-edit-in-react' into various-style-fixes 2018-11-30 01:46:41 -08:00
Torkel Ödegaard
6cbbffffb9 Merge pull request #14198 from grafana/panel-edit-in-react-query-inspector
Panel edit in react query inspector
2018-11-30 10:40:11 +01:00
Johannes Schill
a8e184c025 react-panel: Clean up input validation and increase code readability 2018-11-30 10:21:55 +01:00
Johannes Schill
69ae3d2e6a react-panel: Time range options moved to "Queries" tab 2018-11-30 10:21:54 +01:00
Johannes Schill
b7fcef3351 react-panel: Remove mock response button for now 2018-11-30 10:21:54 +01:00
Johannes Schill
a03900e6cf react-panel: Remove comments and improve readability in render() 2018-11-30 10:21:54 +01:00
Johannes Schill
3908e64ef0 react-panel: Use correct type for children prop to avoid the use of fragments <></> 2018-11-30 10:21:54 +01:00
Johannes Schill
13d0a11798 react-panel: Remove json-formatter-js since we will continue with the "patched" version 2018-11-30 10:21:54 +01:00
Johannes Schill
23ae1c7184 react-panel: Move all query inspector logic into QueryInspector component and start with the "Mock response" 2018-11-30 10:21:54 +01:00
Johannes Schill
857bd3d8ad react-panel: Toggle Expand/Collapse json nodes in Query Inspector 2018-11-30 10:21:54 +01:00
Johannes Schill
8254086ecb react-panel: Add CopyToClipboard-component and separate QueryInspector to its own component from QueriesTab 2018-11-30 10:21:53 +01:00
Johannes Schill
be67801e84 react-panel: Trigger panel refresh when opening inspector. Add loading-message 2018-11-30 10:21:53 +01:00
Johannes Schill
6242379915 react-panel: Replace JSONFormatter npm package with the current monkey patched JsonExplorer 2018-11-30 10:21:53 +01:00
Johannes Schill
5cca489acd react-panel: Clean up the JSONFormatter and make sure it updates both on mount and when props update 2018-11-30 10:21:53 +01:00
Johannes Schill
348f2e4ec4 react-panel: Get real datasource query for query inspector 2018-11-30 10:21:53 +01:00
Johannes Schill
82ce733e9e react-panel: Create component for JSON formatting and use it on query inspector 2018-11-30 10:21:53 +01:00
Marcus Efraimsson
1052b17af8 changelog: add notes about closing #14167 2018-11-30 09:53:21 +01:00
Marcus Efraimsson
e2e66ae608 Merge pull request #14238 from mmcoltman/14167-cloudwatch_add_codebuild
Add AWS/CodeBuild namespace for CloudWatch datasource
2018-11-30 00:50:27 -08:00
Erik Sundell
3d45b5ba73 make getAll return array instead of object 2018-11-30 09:48:59 +01:00
Erik Sundell
df75fb0e6d remove obsolete test 2018-11-30 09:32:36 +01:00
Minamiya_Natsuki
2db3464044 Update README.md
add notice to MacOS Docker user, if docker  memory limit is less than 2GiB, build process may fail when run ./node_modules/.bin/grunt build
2018-11-30 12:59:10 +08:00
Matthew Coltman
bbd0ec3a8b Add AWS/CodeBuild namespace for CloudWatch datasource 2018-11-29 21:02:44 +01:00
Torkel Ödegaard
93ac4e4717 Fixed styling issues with new checkbox style 2018-11-29 18:39:02 +01:00
Mario Trangoni
e4771a88dd Fix other misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e node_modules -e devenv -e unknwon -e destory -e yarn -e adn -e Spindel
2018-11-29 18:15:16 +01:00
Mario Trangoni
5d60d323e2 docs/*: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -vi -e vendor -e node_modules -e devenv -e unknwon | grep docs
2018-11-29 18:14:20 +01:00
Mario Trangoni
9c1b4793a6 CHANGELOG.md: Fix misspell issues
See,
$ find . -type f | xargs misspell -locale US | grep -v -e vendor -e node_modules -e devenv | grep CHANGELOG.md
./CHANGELOG.md:163:60: "organisation" is a misspelling of "organization"
./CHANGELOG.md:286:13: "Litre" is a misspelling of "Liter"
./CHANGELOG.md:394:163: "Spindel" is a misspelling of "Spindle"
./CHANGELOG.md:421:51: "metre" is a misspelling of "meter"
./CHANGELOG.md:738:73: "dashboad" is a misspelling of "dashboard"
./CHANGELOG.md:903:18: "organisation" is a misspelling of "organization"
./CHANGELOG.md:1031:48: "organisation" is a misspelling of "organization"
./CHANGELOG.md:1170:51: "cancelled" is a misspelling of "canceled"
./CHANGELOG.md:1874:97: "muliple" is a misspelling of "multiple"
./CHANGELOG.md:1909:60: "fullscren" is a misspelling of "fullscreen"
2018-11-29 18:14:20 +01:00
David Kaltschmidt
ae26f7126f Explore: Logging render performance
- moved from grid to flexbox
- calculate Explore results only when query transactions change to prevent expensive re-renders
- split up rendering of graph and log data
- render log results in 2 stages
2018-11-29 17:30:11 +01:00
Peter Holmberg
ea3e1a5876 remove log 2018-11-29 15:47:30 +01:00
Peter Holmberg
ef3c913981 min and max value 2018-11-29 15:23:16 +01:00
Peter Holmberg
60ec00ae52 update gauge on remove threshold 2018-11-29 15:07:31 +01:00
Peter Holmberg
201bd69a6a user added thresholds state 2018-11-29 15:04:49 +01:00
Peter Holmberg
efb71d1026 console logs and code layout 2018-11-29 14:22:43 +01:00
Erik Sundell
a4154fa925 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-29 14:20:55 +01:00
Erik Sundell
d1a2488392 pass data correctly to event handler 2018-11-29 14:20:15 +01:00
Peter Holmberg
b856ae3957 revert Label change 2018-11-29 14:12:18 +01:00
Peter Holmberg
909fe47050 update color on gauge when changing 2018-11-29 13:44:35 +01:00
David
8024a6aa9f Merge pull request #14214 from grafana/davkal/explore-logging-label-filter
Explore: Logging label filtering
2018-11-29 13:19:35 +01:00
Pavel
01c2a43699 Merge pull request #1 from grafana/master
Update local master
2018-11-29 12:40:55 +02:00
ijin08
46ec9bd6ad Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-29 10:51:56 +01:00
Erik Sundell
3162dda088 remove explore check - make it possible to load all datasources 2018-11-29 10:46:50 +01:00
Erik Sundell
58931c1316 add table support flag for stackdriver 2018-11-29 10:39:36 +01:00
Erik Sundell
d9236c1081 add table support flag for prometheus 2018-11-29 10:39:24 +01:00
Erik Sundell
e544f2bc74 add table support flag for postgres 2018-11-29 10:39:13 +01:00
Erik Sundell
699f6aecc6 add table support flag for opentsdb 2018-11-29 10:39:00 +01:00
Erik Sundell
e635005626 add table support flag for mysql 2018-11-29 10:38:45 +01:00
Erik Sundell
00d8e1f221 add table support flag for mssql 2018-11-29 10:38:33 +01:00
Erik Sundell
71f6235a8c add table support flag for logging 2018-11-29 10:38:20 +01:00
Erik Sundell
d66d2ae749 add table support flag for graphite 2018-11-29 10:38:04 +01:00
Carl Bergquist
9b20c9c3a5 Merge pull request #14225 from zicklam/patch-3
removed extra whitespace
2018-11-29 10:00:09 +01:00
Carl Bergquist
486ece329b Merge pull request #14227 from zicklam/patch-4
added google_tag_manager_id from defaults.ini
2018-11-29 09:59:35 +01:00
Florian Zicklam
3000818ab3 added google_tag_manager_id from defaults.ini 2018-11-29 09:30:03 +01:00
Florian Zicklam
d86ba20d10 removed extra whitespace
removed extra whitespace
2018-11-29 09:21:06 +01:00
Carl Bergquist
9785a8aba0 Merge pull request #14219 from orojina/patch-1
Update export_import.md
2018-11-29 08:24:09 +01:00
Omar Alejandro González Rojina
804bd822d0 Update export_import.md
Grafana v5.3.4 shows a new checkbox in the export modal "Export for sharing externally". If the checkbox is not checked then the "__inputs" section wont be included into the exported JSON file, would be great to add that note into the documentation for others to avoid confusions.
2018-11-28 11:17:36 -06:00
ijin08
2c943d9aec added new icons, fixed so different icons in different themes, added animation to hover on icons, styled choose visualization and datasource for both themes, made som styling adjustments to whole panel editor 2018-11-28 15:51:45 +01:00
Peter Holmberg
460d642b06 sorting tests 2018-11-28 15:43:49 +01:00
Peter Holmberg
e74db94a27 remove border 2018-11-28 15:25:10 +01:00
Peter Holmberg
3066f895fa color indicator 2018-11-28 15:23:14 +01:00
Erik Sundell
6f85fa6b35 add new flag in order to be able to indicate whether the datasource has native support for tables 2018-11-28 15:06:22 +01:00
Erik Sundell
18abd987bb prevent explore from crashing when table is not present in response 2018-11-28 14:31:20 +01:00
David Kaltschmidt
c3b67f3a13 Explore: Logging label filtering
- adds a custom label renderer to Logs viewer in Explore
- labels are no longer treated as strings, they are passed as parsed objects to the log row
- label renderer supports onClick handler for an action
- renamed Explore's `onClickTableCell` to `onClickLabel` and wired up log label renderers
- reuse Prometheus `addLabelToSelector` to modify Logging queries via click on label
- added tests to `addLabelToSelector`, changed to include the surrounding `{}`
- use label render also for common labels in the controls panel
- logging meta data section has now a custom renderer that can render numbers, strings, and labels
- style adjustments
2018-11-28 14:20:10 +01:00
David
8830c133d1 Merge pull request #14215 from grafana/davkal/fix-logging-selector-parsing
Logging: fix query parsing for selectors with multiple labels
2018-11-28 14:17:32 +01:00
David Kaltschmidt
9c316b55e9 Logging: fix query parsing for selectors with multiple labels
- simplify selector parsing
- added tests
2018-11-28 14:03:47 +01:00
Peter Holmberg
638c04e16b using percentage to not hide search when smaller screen 2018-11-28 11:41:40 +01:00
David
32511533c3 Merge pull request #14178 from grafana/davkal/explore-scan-log-range
Explore: Scan for older logs
2018-11-28 11:00:51 +01:00
Leonard Gram
ce9e1a8f38 build: explaining the linux build. 2018-11-28 09:25:48 +01:00
Ryan McKinley
b3e6da0cbd check for null with toLocalString (#14208) 2018-11-28 00:24:59 -08:00
Torkel Ödegaard
2faf8c722f Fix elastic ng-inject (build issue) (#14195)
fix elastic ng-inject issue in query editor
2018-11-28 00:20:49 -08:00
Ryan
1e94127070 Merge remote-tracking branch 'grafana/master' 2018-11-27 10:00:24 -08:00
Erik Sundell
4eebede9ef add current editor to panel targets 2018-11-27 16:50:09 +01:00
David Kaltschmidt
593cc38cfc Added stop scan button 2018-11-27 16:35:37 +01:00
David Kaltschmidt
4803b8f3c0 Explore: Scan for older logs
Sometimes log streams dont return any lines for the given range. Would be great to automate the search until some logs are found.

- Allow Explore to drive TimePicker via ref
- Show `Scan` link in Logs when there is no data
- Click on `Scan` sets Explore into scanning state
- While scanning, tell Timepicker to shift left
- TimePicker change triggers new queries with shifted time range
- Remember if query transaction was started via scan
- keep scanning until something was found
- Manual use of timepicker cancels scanning
2018-11-27 15:56:10 +01:00
Peter Holmberg
2919fe1d6a color picker 2018-11-27 15:06:39 +01:00
Erik Sundell
626a94be46 remove time srv initialization 2018-11-27 14:51:03 +01:00
Erik Sundell
7159b369a3 restructure imports 2018-11-27 14:49:03 +01:00
Erik Sundell
5e7d4beacf get intervals from explore function 2018-11-27 14:45:39 +01:00
Erik Sundell
b36db6ac04 unregister all query editor event listeners 2018-11-27 14:27:33 +01:00
Erik Sundell
c79d8b2a9b remove comments 2018-11-27 14:25:24 +01:00
Erik Sundell
c567d75320 temp remove until stackdriver implements explore 2018-11-27 14:22:39 +01:00
Peter Holmberg
b506697eda sort on value 2018-11-27 13:42:13 +01:00
Erik Sundell
1998c08df5 use default range from time picker 2018-11-27 13:13:26 +01:00
David
9afb8b64ed Merge pull request #14176 from grafana/davkal/explore-logging-level-filter
Explore: Filter logs by log level
2018-11-27 12:23:45 +01:00
Mattia Rossi
ce74b1ddc2 Requested Backend changes, removed link in popover description for the offset field 2018-11-27 03:42:20 -05:00
Torkel Ödegaard
15637af1af Merge pull request #14197 from qhartman/patch-1
Remove confusing <> from variable intro
2018-11-27 00:03:23 +01:00
Quentin Hartman
02a7916b26 Remove confusing <> from variable intro
The existing intro makes it look like you should use `$<varname>` to refer to a variable. That of course is incorrect, and you should use `$varname`. In my experience using the <> marker around variable names should only be used when there isn't something else explicit to set it off. In this case we have `$`. Below, you can see the <> are also not used, because we have the `[[]]` to set it off. The inconsistency is confusing.
2018-11-26 15:33:13 -07:00
Erik Sundell
109ff1a3e1 includes ranges correctly in the options object 2018-11-26 17:09:50 +01:00
Leonard Gram
bccce9922a docker: Upgrades base packages in the images.
Related to #14182
2018-11-26 16:41:46 +01:00
Peter Holmberg
ff606891e2 small fixes 2018-11-26 16:21:54 +01:00
Marcus Efraimsson
d9ff831bac Merge pull request #14194 from danielbh/pause-all-alerts-docs-fix
chore: correct pause-all-alerts auth in docs
2018-11-26 06:57:08 -08:00
Peter Holmberg
aac1b6c57b logic for adding rows, styling 2018-11-26 15:52:50 +01:00
Marcus Efraimsson
c0bf7c5f13 Merge pull request #14140 from grafana/fix_dashboard_service_log
log the actual error if failing to update alert data
2018-11-26 06:49:19 -08:00
Daniel Hollcraft
4a2e9b4bfa chore: correct pause-all-alerts auth in docs 2018-11-26 09:43:26 -05:00
Mattia Rossi
f6fc7f7b64 Requested Backend changes, added details to popover description for the offset field 2018-11-26 08:58:25 -05:00
Marcus Efraimsson
46c6594744 Merge pull request #14163 from grafana/14155_whats_new
docs: what's new in v5.4
2018-11-26 05:28:57 -08:00
David
2257f63543 Merge pull request #14192 from grafana/davkal/fix-14190
Explore: Fix JS error when switching between 2 prometheus datasources
2018-11-26 14:20:16 +01:00
Erik Sundell
3395b1caf6 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-26 13:44:32 +01:00
David Kaltschmidt
91ea8dccf5 Explore: Fix JS error when switching between 2 prometheus datasources
- since the DataQuery rewrite, Explore starts by submitting its queries (Explore cant know if the queries are emtpty)
- The datasource intercepts an empty query and returns an empty list of time series, and also no table for the table query.
- The query hinter then received no series to analyse and was not guarding against this.
- This PR adds this guard.
2018-11-26 13:43:22 +01:00
Peter Holmberg
1ca0d1deab color touches 2018-11-26 10:38:43 +01:00
Mattia Rossi
9825484176 Add support for Offset in elasticsearch datasource, date_histogram aggregation, fixes grafana #12653 2018-11-24 10:48:29 -05:00
Torkel Ödegaard
efcbb92b3f Merge pull request #14170 from grafana/davkal/explore-prometheus-range-sort
Sort Prometheus range suggestions by length
2018-11-23 19:22:24 +01:00
David Kaltschmidt
575d888472 Fix tests to account for sortText 2018-11-23 16:53:46 +01:00
Leonard Gram
539036fd0f build: always test publisher. 2018-11-23 16:51:01 +01:00
Leonard Gram
82c98a5ff4 build: packages linked to dl.grafana.com. 2018-11-23 16:51:01 +01:00
David Kaltschmidt
ae5ec44171 Fix tests to account for loglevel long names 2018-11-23 16:49:23 +01:00
David Kaltschmidt
4f55a238ed Explore: Filter logs by log level
- add `onToggleSeries` to Explore Graph props
- toggling a Logging Graph series from the legend propagates its hidden series to Logs
- Logs translates hidden series alias to LogLevels
- Logs filters out hidden log levels
2018-11-23 16:29:55 +01:00
Peter Holmberg
e1eb7ca571 styling 2018-11-23 16:25:46 +01:00
Peter Holmberg
5c992ba13a created test for some functions 2018-11-23 16:12:53 +01:00
Marcus Efraimsson
1949c8eb57 update changelog 2018-11-23 15:41:47 +01:00
Erik Sundell
7209c7cd0a mock interval data 2018-11-23 15:37:49 +01:00
Marcus Efraimsson
81a426f05d Merge pull request #14175 from grafana/11977_regression
Regression: fix handle of elasticsearch 6.0+ version
2018-11-23 06:36:51 -08:00
Marcus Efraimsson
a022284cb0 fix handle of elasticsearch 6.0+ version 2018-11-23 15:24:16 +01:00
Erik Sundell
1e6ea8b124 rename variable 2018-11-23 15:15:41 +01:00
Erik Sundell
65c744c39f hide row specific buttons when query editor is rendered from explore 2018-11-23 15:14:13 +01:00
Erik Sundell
ccddee4a4a add support for explore events 2018-11-23 15:12:20 +01:00
Torkel Ödegaard
92c5755175 minor style fix 2018-11-23 15:10:45 +01:00
Torkel Ödegaard
39a1b11cb3 minor fixes 2018-11-23 15:01:36 +01:00
Marcus Efraimsson
df218961e0 docs: various fixes of what's new in v5.4 2018-11-23 14:45:32 +01:00
Erik Sundell
fae3ae2580 use plugin_loader directly instead of using the wrapper 2018-11-23 14:32:56 +01:00
Marcus Efraimsson
9aa4d71550 docs: fix old ldap url redirect 2018-11-23 14:31:21 +01:00
Torkel Ödegaard
daee874ee6 Merge branch 'panel-edit-in-react' into panel-edit-in-react-sidemenu 2018-11-23 14:01:18 +01:00
Torkel Ödegaard
263381eac6 Merge branch 'develop' into panel-edit-in-react 2018-11-23 14:00:15 +01:00
Torkel Ödegaard
2dc44f6089 Merge branch 'master' into develop 2018-11-23 13:59:35 +01:00
Torkel Ödegaard
5038efe09e Merge branch 'master' into davkal/babel-7 2018-11-23 13:44:59 +01:00
Torkel Ödegaard
fd71abc301 fixed issue with babel plugin proposal class properties that initiated
properties to void 0. This breaks angularjs preAssignBinding which
applies bindings to this before constructor is called. Fixed by
using fork of babel plugin.

https://github.com/babel/babel/issues/8417
2018-11-23 13:41:45 +01:00
David
f4bc023147 Merge pull request #14171 from grafana/davkal/explore-fix-empty-suggestion
Explore: make query field suggestions more robust
2018-11-23 13:14:30 +01:00
David Kaltschmidt
f831836fa7 Explore: make query field suggestions more robust
- drop invalid history items
- make highlighter more robust by defaulting to empty string on text to highlight
2018-11-23 12:25:43 +01:00
flopp999
91d97ab5b5 Fix abbreviations of Litre/min and milliLitre/min (#14114) 2018-11-23 02:48:22 -08:00
David
16e7ae4e69 Merge pull request #14169 from grafana/davkal/explore-logging-keep-labels
Explore: switching to logging should keep prometheus labels in case o…
2018-11-23 11:47:39 +01:00
David Kaltschmidt
ecaee88efe Sort Prometheus range suggestions by length
- add sortText property to range completion items
2018-11-23 11:43:21 +01:00
Marcus Efraimsson
b55b9261f0 docs: what's new in v5.4 2018-11-23 11:15:53 +01:00
David Kaltschmidt
b778b5350a Explore: swtiching to logging should keep prometheus labels in case of error
Logging's query importer drops all labels that are not common to both datasources.

- keep labels if label lookup of logging datasource came back empty
- easier to remove labels than having to add them in the first place
2018-11-23 11:15:25 +01:00
Torkel Ödegaard
56d95e7913 tweaks to gf-inline-form style PR #14154 change 2018-11-23 08:06:48 +01:00
Torkel Ödegaard
ec23b4c607 Merge pull request #14154 from bergquist/gf-form-margin
Margin when listing multiple gf-form
2018-11-23 08:05:28 +01:00
Torkel Ödegaard
81cc24c123 Merge branch 'davkal/sticky-footer' 2018-11-23 07:50:47 +01:00
Torkel Ödegaard
0cb47cb3d4 Merge pull request #14162 from grafana/docs_signout_redirect_url
docs: signout_redirect_url description in auth overview
2018-11-23 07:46:24 +01:00
Torkel Ödegaard
9caae8c8c0 adding back button 2018-11-23 07:43:25 +01:00
Torkel Ödegaard
c8e42c0216 styling tweaks 2018-11-23 07:31:13 +01:00
Erik Sundell
eaf9a0b39a initial commit 2018-11-22 18:22:15 +01:00
Marcus Efraimsson
5ebb201caa docs: signout_redirect_url description in auth overview 2018-11-22 15:59:15 +01:00
Torkel Ödegaard
f8b1484265 minor style changes 2018-11-22 15:34:55 +01:00
Erik Sundell
1fb686cafa Merge branch 'develop' into panel-edit-in-react 2018-11-22 13:46:12 +01:00
Erik Sundell
a5947e820c Merge branch 'master' into develop 2018-11-22 13:43:25 +01:00
David Kaltschmidt
c928c546a3 Sticky footer for all pages
Currently the footer is based on top margins which looks odd on big screen sizes.
Also, the footer shows up on the top of the page on pages take a moment to load (while ng-view is rendering).

- True sticky footer based on flexbox
- Ensure footer stays at bottom while ng-view div does not exist yet
2018-11-22 13:15:29 +01:00
Torkel Ödegaard
300bd75b54 edit mode styling 2018-11-22 12:22:59 +01:00
Torkel Ödegaard
1b92bc62cb edit mode styling 2018-11-22 12:19:52 +01:00
Torkel Ödegaard
d70dfd5fd7 edit mode styling 2018-11-22 12:13:28 +01:00
David
377eaa891c Merge pull request #14147 from grafana/davkal/explore-data-query
Explore: Introduce DataQuery interface for query handling
2018-11-22 12:01:37 +01:00
David Kaltschmidt
9e94d22401 Added comments 2018-11-22 12:00:41 +01:00
Torkel Ödegaard
547044b65f style tweaks 2018-11-22 11:41:33 +01:00
Peter Holmberg
142cd92b54 render and sort 2018-11-22 11:41:09 +01:00
Marcus Efraimsson
36aec52c08 return actual error if failing to update alert data 2018-11-22 11:19:08 +01:00
David Kaltschmidt
21ee85b1e2 Fix issue with deleting a query (empty string not updating) 2018-11-22 11:14:46 +01:00
David Kaltschmidt
bbaa5b63c8 Fix history rendering for DataQuery 2018-11-22 11:02:53 +01:00
bergquist
dc2ebeb7c0 margin when listing multiple gf-form should be right
when listing multiple gf-form elements this style is
applied to all elements except the first. By having the
margin on the right side there will always be some margin
between all gf-forms
2018-11-22 11:00:27 +01:00
Marcus Efraimsson
dffb4c8a46 Merge pull request #14153 from zyseeker/patch-1
Fix a typo in doc about alerting
2018-11-22 00:17:56 -08:00
Torkel Ödegaard
9a2b2863fb styling progress 2018-11-22 08:46:54 +01:00
Zhang Yong
4f236ca465 Fix a typo
Fix a typo
2018-11-22 15:17:31 +08:00
Torkel Ödegaard
c7e296307a panel edit ux experiments 2018-11-21 20:32:04 +01:00
Marcus Efraimsson
572ca5a010 changelog: add notes about closing #14150 2018-11-21 18:28:05 +01:00
Marcus Efraimsson
40a38552a9 Merge pull request #14151 from grafana/14150_cloudwatch
Fix invalid time range causes panic in Cloudwatch datasources
2018-11-21 09:23:51 -08:00
Marcus Efraimsson
a6a1362ad1 temporary fix for starting grafana not running systemd 2018-11-21 18:15:28 +01:00
Marcus Efraimsson
3534762f49 cloudwatch: handle invalid time ranges 2018-11-21 17:51:02 +01:00
Marcus Efraimsson
879aed7d06 cloudwatch: recover/handle panics when executing queries 2018-11-21 17:49:17 +01:00
David
1125ca4d79 Merge pull request #14014 from miqh/feat/explore-toggle-series
Add ability to toggle visibility of graph series in explore section
2018-11-21 17:31:46 +01:00
Carl Bergquist
c3d64e0352 Merge pull request #14148 from bergquist/alerting_options_to
updates time range options for alert queries
2018-11-21 17:25:32 +01:00
Carl Bergquist
acf8d43682 Merge pull request #14056 from mjtrangoni/fix-errcheck-issues
Fix errcheck issues
2018-11-21 17:23:56 +01:00
David Kaltschmidt
331d419d4f Combine query functions 2018-11-21 17:21:13 +01:00
David Kaltschmidt
22987ee75f Renamed targets to queries 2018-11-21 16:28:30 +01:00
ijin08
e47fc40b13 added icons for panel-edit side menu 2018-11-21 16:05:01 +01:00
bergquist
14688766ef updates time range options for alert queries
add some new options for the to value.
removes '1s' option for from since thats unreasonable low

closes #12134
2018-11-21 15:43:37 +01:00
bergquist
60c291c8dc format: remove </input> and align tabs 2018-11-21 15:42:25 +01:00
Peter Holmberg
a061de8333 updating state 2018-11-21 15:18:12 +01:00
Carl Bergquist
c852acaeca Merge pull request #14143 from bergquist/docs_alerting_for
Adds example timeline in docs for alerting for
2018-11-21 15:15:39 +01:00
David Kaltschmidt
b3161bea5a Explore: Introduce DataQuery interface for query handling
- Queries in Explore have been string based
- This PR introduces the use of the DataQuery type to denote all queries handled in Explore
- Within Explore all handling of DataQueries is transparent
- Modifying DataQueries is left to the datasource
- Using `target` as variable names for DataQueries to be consistent with the rest of Grafana
2018-11-21 14:45:57 +01:00
Michael Huynh
a333c31ea8 Fix set utilities for explore section
Discovered implementation issues with the set utilities used in the
explore section after adding some tests. Added tests to reinforce the
expected behaviour of the utility functions.

Related: #13522
2018-11-21 21:42:53 +08:00
Marcus Efraimsson
f74a7cd97c typos in docs/sources/alerting/rules.md
Co-Authored-By: bergquist <carl@grafana.com>
2018-11-21 14:41:51 +01:00
Marcus Efraimsson
fdbccdc347 typos in docs/sources/alerting/rules.md
Co-Authored-By: bergquist <carl@grafana.com>
2018-11-21 14:41:35 +01:00
Torkel Ödegaard
1976e18591 Merge pull request #14145 from grafana/fix-legend-show-false
fixed issue with new legend not checking if panel.legend.show
2018-11-21 14:40:09 +01:00
Torkel Ödegaard
0731b8635b fixed failing graph tests 2018-11-21 13:53:32 +01:00
bergquist
4bd8b2c130 gfdev: fixes unparseable for duration 2018-11-21 11:41:54 +01:00
Johannes Schill
1a7b8a3931 Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-21 11:39:57 +01:00
Torkel Ödegaard
cab92f88af fixed issue with new legend not checking if panel.legend.show 2018-11-21 11:38:15 +01:00
bergquist
afbc16c499 gfdev: adds alert always in pending state 2018-11-21 11:34:21 +01:00
bergquist
1491ea1c75 docs: adds example timeline for alerting for 2018-11-21 11:11:46 +01:00
Leonard Gram
6c267cb592 build: docker build for ge. 2018-11-21 09:03:05 +01:00
Johannes Schill
69e5584d39 react-panel: Avoid duplicate keys 2018-11-20 17:11:47 +01:00
Torkel Ödegaard
874ff4a7af Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-20 17:10:38 +01:00
Torkel Ödegaard
9baa54e98c added alert tab to new react panel editor 2018-11-20 17:09:47 +01:00
bergquist
baba8a92ee update path to alerting for image 2018-11-20 17:09:21 +01:00
Peter Holmberg
6084275119 started on thresholds 2018-11-20 17:01:58 +01:00
Johannes Schill
97f7a7fbba react-panel: Add data source "options". Needs UX, WIP. 2018-11-20 16:33:26 +01:00
Marcus Efraimsson
e421c387ea update release publish script links 2018-11-20 16:23:24 +01:00
Torkel Ödegaard
51e719493b Merge branch 'panel-edit-in-react' of github.com:grafana/grafana into panel-edit-in-react 2018-11-20 16:07:11 +01:00
Torkel Ödegaard
5ea34844ba fixes to view mode for panels, can now go back as before 2018-11-20 16:00:19 +01:00
Michael Huynh
c7dc557e91 Add visibility toggle for explore graph series
The implemented toggling UX is similar to how the dashboard graph plugin
behaves. Also incorporates review feedback to persist series visibility
state by means of the alias property, with the limitation it carries
too.

Related: #13522
2018-11-20 21:52:42 +08:00
Marcus Efraimsson
8d75fcb6f7 what's new in v5.4 placeholder 2018-11-20 14:35:38 +01:00
Peter Holmberg
ac94fc9341 fix label and default threshold 2018-11-20 14:27:23 +01:00
Johannes Schill
bc9f3a33fe Merge branch 'panel-edit-in-react' of https://github.com/grafana/grafana into panel-edit-in-react 2018-11-20 14:17:46 +01:00
Johannes Schill
ff87cbd4db react-panel: Add data source "help" 2018-11-20 14:17:03 +01:00
Marcus Efraimsson
0b3e5ec4a7 Merge pull request #14137 from grafana/webpack-error-template-fix
fix for issue with error view in production builds
2018-11-20 04:59:12 -08:00
Torkel Ödegaard
34c70ca7ce fix for issue with error view in production builds 2018-11-20 13:47:45 +01:00
Daniel Lee
42d5003be3 changelog: adds note for #13561 2018-11-20 13:43:48 +01:00
Daniel Lee
4aeea56342 Merge pull request #14007 from grafana/stackdriver-template-query-editor
Stackdriver template query editor
2018-11-20 13:41:18 +01:00
Marcus Efraimsson
55fefde2a0 update changelog 2018-11-20 13:23:44 +01:00
Erik Sundell
7021e07ab2 stackdriver: remove not used variable 2018-11-20 13:22:43 +01:00
Torkel Ödegaard
5402a0e00d fixed menu to go to panel view mode 2018-11-20 13:18:48 +01:00
Erik Sundell
b200f92710 stackdriver: use angular dropdown so that we can restrict user input 2018-11-20 13:18:00 +01:00
Erik Sundell
7fc8ed942f stackdriver: make sure object type queries are also checked for vtemplate variables 2018-11-20 12:30:31 +01:00
Torkel Ödegaard
3b76d9ee17 minor style update 2018-11-20 11:26:01 +01:00
bergquist
8bd0aeb56e changelog: adds note about closing #13577 2018-11-20 11:21:17 +01:00
Carl Bergquist
db8bd8298a Merge pull request #14077 from bobmshannon/bs/metrics_endpoint_auth
Add basic authentication support to metrics endpoint
2018-11-20 11:19:55 +01:00
bergquist
c999394b49 adds basic auth configuration to default.ini 2018-11-20 11:07:39 +01:00
Torkel Ödegaard
0575307786 added header section to legacy tabs 2018-11-20 11:06:36 +01:00
Erik Sundell
aa65796ee1 stackdriver: reset defaults.ini 2018-11-20 10:00:01 +01:00
Marcus Efraimsson
b948c9bdf5 changelog: add notes about closing #14120 2018-11-20 09:59:35 +01:00
Marcus Efraimsson
9cc6c2128a Merge pull request #14120 from supercharlesliu/user-teams
Add API GET /api/users/:id/teams for GrafanaAdmin
2018-11-20 00:56:35 -08:00
Torkel Ödegaard
7f46b75330 Merge branch 'develop' into panel-edit-in-react 2018-11-20 09:51:06 +01:00
Marcus Efraimsson
49bf003df1 Merge pull request #14132 from cloudshapes/revert-14092-record-full-url-in-google-analytics
Revert "Update google analytics code to submit full URL not just path"
2018-11-20 00:49:46 -08:00
Marcus Efraimsson
8ec7fd56d4 changelog: add notes about closing #14129
[skip ci]
2018-11-20 09:47:24 +01:00
Torkel Ödegaard
649d727805 Merge branch 'master' into develop 2018-11-20 09:47:23 +01:00
Marcus Efraimsson
cab2c5189a Merge pull request #14129 from daktari/master
Add Cloudwatch/CloudHSM Metrics and dimensionMaps
2018-11-20 00:42:22 -08:00
Torkel Ödegaard
f44e634da4 switch slider changes 2018-11-20 09:39:56 +01:00
Leonard Gram
1a554e2421 linters. 2018-11-20 09:01:52 +01:00
Leonard Gram
7e2298ce31 build: correct filters for ge build artifacts. 2018-11-20 09:01:52 +01:00
Leonard Gram
84832cb6cb build: releaser supports releasing only some artifacts. 2018-11-20 09:01:52 +01:00
Leonard Gram
87707c964c Revert "docs: building Grafana on arm."
Further work-arounds are needed to make this work.
This reverts commit 8a2de58728.
2018-11-20 08:46:09 +01:00
supercharlesliu
a241f67fba Add doc for api "GET /api/users/:id/teams" 2018-11-20 10:17:46 +08:00
Bob Shannon
16ff8a182b Re-organize packages and add basic auth test 2018-11-19 13:54:13 -05:00
Roland Dunn
fa2c46edb9 Revert "Update google analytics code to submit full URL not just path" 2018-11-19 18:21:37 +00:00
Javier
0900470dda Add Cloudwatch/CloudHSM Metrics and dimensionMaps 2018-11-19 18:10:34 +01:00
Marcus Efraimsson
9af5e9a448 Merge pull request #14127 from grafana/team_members_fix
Remove react warning in team members page
2018-11-19 09:03:41 -08:00
Marcus Efraimsson
0aca6f587b remove react warning 2018-11-19 17:54:17 +01:00
Torkel Ödegaard
571cfab923 added chekbox and other tweaks 2018-11-19 17:41:48 +01:00
Peter Holmberg
4e1f49f883 refactor options, show labels and markers 2018-11-19 17:11:17 +01:00
Leonard Gram
8a2de58728 docs: building Grafana on arm. 2018-11-19 16:50:19 +01:00
Torkel Ödegaard
808a0aa6f0 Merge branch 'develop' into switch-slider-test 2018-11-19 16:48:16 +01:00
Torkel Ödegaard
1e7a23b0f1 Merge remote-tracking branch 'origin/12759-description-n-links' into develop 2018-11-19 16:47:29 +01:00
Erik Sundell
fa32310f8a stackdriver: add query keyword to service, metric and project since these were the only fields in the editor that was missing it in the whole editor 2018-11-19 16:37:42 +01:00
David
5a759a8317 Merge pull request #14118 from grafana/davkal/explore-logs-dedup
Explore: POC dedup logging rows
2018-11-19 15:36:26 +00:00
David Kaltschmidt
4771eaba5b Explore: POC dedup logging rows
- added dedup switches to logs view
- strategy 'exact' matches rows that are exact (except for dates)
- strategy 'numbers' strips all numbers
- strategy 'signature' strips all letters and numbers to that only whitespace and punctuation remains
- added duplication indicator next to log level
2018-11-19 16:26:47 +01:00
Erik Sundell
19d1d7f35a stackdriver: add query keyword style to query fields 2018-11-19 16:26:06 +01:00
Erik Sundell
164e9a4f9a stackdriver: fix failing test 2018-11-19 16:19:56 +01:00
David
d4e792dccd Merge pull request #14107 from grafana/davkal/explore-panel
Explore: collapsible result panels
2018-11-19 15:17:05 +00:00
David
c20c787b62 Merge pull request #14104 from grafana/davkal/prometheus-rule-expansion
Prometheus: fix rules expansion
2018-11-19 15:11:09 +00:00
Erik Sundell
0ec4491a52 stackdriver: reimplementing service variable query type 2018-11-19 16:06:30 +01:00
Peter Holmberg
e0064ed38e Revert "typo fix"
This reverts commit 9ded648bc5.
2018-11-19 16:05:46 +01:00
Peter Holmberg
9ded648bc5 typo fix 2018-11-19 16:05:15 +01:00
Peter Holmberg
22e64eb287 prefix and suffix 2018-11-19 16:00:18 +01:00
Peter Holmberg
37729bf9f1 decimals 2018-11-19 15:50:51 +01:00
Marcus Efraimsson
0d30f3ba52 update snapshot 2018-11-19 14:57:34 +01:00
Erik Sundell
795af5deed stackdriver: fix failing tests 2018-11-19 14:51:52 +01:00
Marcus Efraimsson
ebadcdb535 changelog: add notes about closing #13352
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
f5dfaacee3 changelog: add notes about closing #13810
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
34746e42ef changelog: add notes about closing #13605
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
dbb7396c77 changelog: add notes about closing #13876
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
8246ee343c changelog: add notes about closing #13946
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
a77c86169e changelog: add notes about closing #13555
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
1a64b44c91 changelog: add notes about closing #13425
[skip ci]
2018-11-19 14:50:39 +01:00
Marcus Efraimsson
3c91e4de56 changelog: add notes about closing #13655
[skip ci]
2018-11-19 14:50:39 +01:00
Erik Sundell
6aaaadac21 stackdriver: update docs 2018-11-19 14:48:26 +01:00
Erik Sundell
0aeaec1ac6 stackdriver: add support for template variables 2018-11-19 14:44:40 +01:00
Leonard Gram
abd796c65f Merge pull request #14122 from xlson/publisher-rhel-final-aware
Corrects an issue where nightly rpms would be misstagged.
2018-11-19 14:43:02 +01:00
Torkel Ödegaard
c67b55776c Merge pull request #14123 from grafana/switch-back-from-mixed
fixed issue switching back from mixed data source
2018-11-19 14:40:37 +01:00
Johannes Schill
00596f0afc react-panel: Finish the data source search on query tab and start moving switch-data-source-logic from angular 2018-11-19 14:35:16 +01:00
Leonard Gram
b041ad4134 linter. 2018-11-19 14:32:39 +01:00
Torkel Ödegaard
0053bee886 Merge pull request #14121 from grafana/panel-size-in-edit-mode-fix
fixed issue with panel size when going into edit mode
2018-11-19 14:21:37 +01:00
Torkel Ödegaard
1157a62375 fixed issue switching back from mixed data source, introduced by react panels changes 2018-11-19 14:20:19 +01:00
Leonard Gram
ac55aeff95 build: minor refactor. 2018-11-19 14:12:04 +01:00
Leonard Gram
8f0d3ff7ea build: fixes a bug where nightly rpm builds would be handled as stable. 2018-11-19 14:06:18 +01:00
Peter Holmberg
a8cf2dc501 some touch ups on unit 2018-11-19 14:03:32 +01:00
bergquist
862815d18d go meta lint errors 2018-11-19 14:00:20 +01:00
Marcus Efraimsson
638eca3cdb update changelog
[skip ci]
2018-11-19 13:59:20 +01:00
Leonard Gram
2d361eeabf builds: introduces enum for relase type. 2018-11-19 13:26:35 +01:00
Marcus Efraimsson
c22e7f4263 fix group sync cta link 2018-11-19 13:23:17 +01:00
Peter Holmberg
5722773467 Merge branch 'unit-picker' into gauge-value-options 2018-11-19 13:13:32 +01:00
Peter Holmberg
f72e751735 picker and functionaliy 2018-11-19 13:06:56 +01:00
Torkel Ödegaard
d81d2f00f6 fixed issue with panel size when going into edit mode 2018-11-19 12:26:15 +01:00
Erik Sundell
26b1cc5dcf stackdriver: join resource and metric labels. split them in values and keys 2018-11-19 11:34:40 +01:00
Marcus Efraimsson
6c68976cab changelog: add notes about closing #13924
[skip ci]
2018-11-19 11:29:03 +01:00
Marcus Efraimsson
05a32d19be Merge pull request #14110 from vinicyusmacedo/master
Added google oauth account id
2018-11-19 02:21:11 -08:00
Leonard Gram
e2007733f4 build: table-driven tests for publisher. 2018-11-19 11:20:44 +01:00
Marcus Efraimsson
60fd8ee9d4 fix id returned from google is a string 2018-11-19 11:11:13 +01:00
bergquist
8130067fd1 changelog: adds note about closing #7886 & #6202 2018-11-19 10:47:37 +01:00
Carl Bergquist
6049855dc7 Merge pull request #13947 from bergquist/alerting_for
Introduce alert debouncing
2018-11-19 10:38:02 +01:00
Torkel Ödegaard
c856c21b77 Merge pull request #14116 from cinaglia/fix-singlestat-xss
Mitigate XSS vulnerabilities in Singlestat panel
2018-11-19 10:36:44 +01:00
Marcus Efraimsson
959d7036a7 Merge pull request #14084 from xlson/internal-metrics-packaging
build: internal metrics for packaging.
2018-11-19 01:25:33 -08:00
bergquist
23b1fbcf48 changelog: adds note about closing #11893 2018-11-19 10:22:26 +01:00
Carl Bergquist
03ac9c5256 Merge pull request #12029 from Nick-Triller/11893_oauth_auto_login
11893 oauth auto login
2018-11-19 10:21:33 +01:00
supercharlesliu
215242128b Fix param 2018-11-19 17:09:45 +08:00
supercharlesliu
fb5c59c611 Add GET /api/users/:id/teams for orgAdmin 2018-11-19 17:08:10 +08:00
Johannes Schill
295fefb2dc Tooltip should be able to take up space when used on an absolute positioned element 2018-11-19 09:29:21 +01:00
Torkel Ödegaard
5d1c5502f1 minor fixes 2018-11-19 09:16:35 +01:00
Johannes Schill
5069c7f6bb panel-header: Move the corner information in the panel header to its own component 2018-11-19 09:16:35 +01:00
Marcus Efraimsson
919b1cd36c changelog: add notes about closing #12550
[skip ci]
2018-11-19 09:16:35 +01:00
Marcus Efraimsson
38b44799a3 fix selected home dashboard should show as selected even though its not starred 2018-11-19 09:16:35 +01:00
Johannes Schill
04571b8214 panel-header: Move the panel description/links/error container outside of panel header to not interfere with the react-grid stuff 2018-11-19 09:16:35 +01:00
Marcus Efraimsson
3f1388f214 reload browser after preferences been updated 2018-11-19 09:16:35 +01:00
Johannes Schill
93586491f4 panel-header: Unmount popper when not needed. 2018-11-19 09:16:35 +01:00
Marcus Efraimsson
362ee89449 fix snapshot tests 2018-11-19 09:16:34 +01:00
Johannes Schill
d6959c3b11 panel-header: Updated snapshots for popper 2018-11-19 09:16:34 +01:00
Johannes Schill
78e93a3a0f panel-header: Add fade in transition to tooltip 2018-11-19 09:16:34 +01:00
Torkel Ödegaard
32d72f345f Trying to reduce the amount of duplication with preferences 2018-11-19 09:16:34 +01:00
Johannes Schill
42154833cc panel-header: Make it possible to style the reference element and fix so panel description looks good 2018-11-19 09:15:08 +01:00
Torkel Ödegaard
1984f28f49 filter out alpha plugins in api call, fixes #14030 2018-11-19 09:15:08 +01:00
Johannes Schill
e5ea176a98 panel-header: Simplify condition 2018-11-19 09:15:08 +01:00
Johannes Schill
48d1a574b9 panel-header: Avoid undefined classNames and use the real panel description 2018-11-19 09:15:08 +01:00
Johannes Schill
7d74ca4a8d panel-header: Updates for the new react-popper api and make it possible to hover the tooltip popper without it closing 2018-11-19 09:15:08 +01:00
Johannes Schill
1fa85937bb panel-header: Bump @types/react, @types/react-dom, react, react-dom, react-popper to latest versions 2018-11-19 09:15:08 +01:00
Johannes Schill
b97e2c7240 panel-header: Display description in modal 2018-11-19 09:15:08 +01:00
Marcus Efraimsson
2d92d217eb update changelog
[skip ci]
2018-11-19 09:15:08 +01:00
Marcus Efraimsson
0652d8bbe2 changelog: add notes about closing #11977
[skip ci]
2018-11-19 09:15:08 +01:00
Marcus Efraimsson
63e817e7c8 changelog: add notes about closing #6367
[skip ci]
2018-11-19 09:15:07 +01:00
Marcus Efraimsson
db6af9eed1 docs: team http api update 2018-11-19 09:15:07 +01:00
stop-cran
ec19306260 [elasticsearch] Do not set a placeholder to index name, if it's already specified. 2018-11-19 09:15:07 +01:00
bergquist
bb66661cc6 changelog: adds note about closing #14043 2018-11-19 09:15:07 +01:00
Peter Holmberg
7b66120122 fixed issue with save. 2018-11-19 09:15:07 +01:00
Peter Holmberg
f6aab0fe4b fixed mutability issue in dashboard dropdowns 2018-11-19 09:15:07 +01:00
David Kaltschmidt
a1fad2d8d4 Explore: Fix table pagination styles
- get rid of drop shadow
- get rid of top border
- add min height for better no-data placement
- add margins
2018-11-19 09:15:07 +01:00
Marcus Efraimsson
a251461c62 team preferences ui 2018-11-19 09:15:07 +01:00
Marcus Efraimsson
b00542e194 feat: team preferences 2018-11-19 09:15:06 +01:00
David Kaltschmidt
b2e6b2485f Explore: Dont set datasource in state if navigated away
Datasource selection triggers a connection test, on success
the DS is set in the Explore state. If the test takes long and user
selects a different DS, and just after that the first test succeeds,
then the first DS overwrites the state.

* when test returns check if datasource is still the requested one
2018-11-19 09:15:06 +01:00
Marcus Efraimsson
ac3e175e54 fix switching from es raw document metric breaks query editor 2018-11-19 09:15:06 +01:00
bergquist
76cbd7f0de alerting: reduce the length of range queries
since we introduce deboucing the length should matter less.
But going below 5m as default might be weird depending on datasource.
2018-11-19 09:10:19 +01:00
Victor Cinaglia
ba5a002323 Mitigate XSS vulnerabilities in Singlestat panel
Sanitize `prefix` and `postfix` fields. Re-arrange code slightly in order to handle variable
interpolation.
2018-11-18 20:33:36 -05:00
Patrick
2de5a7119b Merge branch 'master' into add_google_hangouts_chat_notifier 2018-11-18 22:00:53 +01:00
Victor Cinaglia
4ed0a3d29a Retain decimal precision when exporting CSV
Using `Number.prototype.toLocaleString()` has the unexpected behavior of truncating anything
exceeding 3 decimal digits on floats.

Additionally, it introduces inconsistencies (comma vs period separators) which could make processing the
output CSV harder than it could be.  The proposed solution here is to simply let numbers be cast
automatically via string concatenation.

Fixes #13929
2018-11-18 12:40:43 -05:00
Vinicyus Macedo
152261413d Added Id to BasicUserInfo returns 2018-11-17 12:05:06 -02:00
Torkel Ödegaard
435079c6e7 Merge pull request #14102 from grafana/change-tab-in-edit-modefix
fix: dont setViewMode when nothing has changed
2018-11-17 14:46:16 +01:00
Vinicyus Macedo
057f611194 Added google oauth account id 2018-11-17 00:48:54 -02:00
Torkel Ödegaard
8d39ca76be switch style tweaks 2018-11-16 12:45:19 -08:00
David Kaltschmidt
adb2430a1b Explore: collapsible result panels
- replace the Graph/Table buttons with toggle control in a wrapper panel
- moved toggle control to left to be close to the label
- removed panel styles from Logs and Graph viewer
- moved loader animation to panel
2018-11-16 18:21:13 +00:00
Peter Holmberg
5916f76991 removing test page 2018-11-16 16:58:08 +01:00
Peter Holmberg
cc7bf31c3e Merge remote-tracking branch 'origin/develop' into unit-picker 2018-11-16 16:54:02 +01:00
Peter Holmberg
ee3b438269 format value 2018-11-16 16:41:01 +01:00
Peter Holmberg
02d8ffda5b default value 2018-11-16 16:35:42 +01:00
ijin08
ad8e9ae691 created classes for new checkbox and variables 2018-11-16 16:35:04 +01:00
David
634d71a657 Merge pull request #14052 from grafana/davkal/explore-query-importer
Explore: POC for datasource query importers
2018-11-16 14:55:19 +00:00
David Kaltschmidt
e3e8be16b3 Prometheus: fix rules expansion
Rules expansion (available via query hints in explore) was broken for expressions that contained selectors.

- fix replacing regexp to recognize `{` and `[` as the end of a rule name
- moved logic to language utils
- added tests
2018-11-16 14:38:20 +00:00
Peter Holmberg
0f4131b8d7 handle default value 2018-11-16 15:26:51 +01:00
Torkel Ödegaard
57de2475b0 various fixes to angular loading 2018-11-16 15:09:14 +01:00
David Kaltschmidt
411719bc70 Explore: POC for datasource query importers
Explore is about keeping context between datasources if possible. When
changing from metrics to logging, some of the filtering can be kept to
narrow down logging streams relevant to the metrics.

- adds `importQueries` function in language providers
- query import dependent on origin datasource
- implemented  prometheus-to-logging import: keeping label selectors
  that are common to both datasources
- added types
2018-11-16 13:52:58 +00:00
Leonard Gram
ac8731b9fb build: enabled darwin build. 2018-11-16 14:50:27 +01:00
Leonard Gram
ce63f5c0ee Merge pull request #14103 from xlson/darwin-compatible-build
build: darwin compatible build env.

Fixes #13763
2018-11-16 14:48:24 +01:00
Peter Holmberg
8ab86c2ceb expand groups when searching 2018-11-16 14:40:24 +01:00
Leonard Gram
badb36b3c8 build: darwin compatible build env. 2018-11-16 14:29:35 +01:00
Peter Holmberg
2b8eab8c8c maxHeight and style overrides 2018-11-16 14:11:51 +01:00
Marcus Efraimsson
2c7dfd74b4 Merge pull request #14100 from grafana/fix-save-redirect-issue
fix for save dashboard redirect issue
2018-11-16 04:03:47 -08:00
ijin08
c505fc3783 moved slider into label to make it clickable, styled slider in dark and light theme, created variables for slider 2018-11-16 13:02:29 +01:00
Marcus Efraimsson
f528142655 Merge pull request #14089 from grafana/fixed-alert-tab-location
fixed alert tab order and fixed some console logging issues
2018-11-16 03:58:13 -08:00
Torkel Ödegaard
96104e4372 fix: dont setViewMode when nothing has changed 2018-11-16 12:39:26 +01:00
Torkel Ödegaard
907c84f7d8 Merge pull request #14099 from alexanderzobnin/fix-14098
fix datasource testing
2018-11-16 11:34:30 +01:00
Torkel Ödegaard
e85a3f1d04 fix redirect issue, caused by timing of events between angular location change and redux state changes 2018-11-16 11:29:32 +01:00
Alexander Zobnin
8c7f4ac188 fix datasource testing 2018-11-16 13:17:41 +03:00
Torkel Ödegaard
7c72f8e028 panel options now load even when changing type 2018-11-16 10:44:39 +01:00
Torkel Ödegaard
f21fe65bb1 fixed issues when changing type, need to remove event listeners and cleanup props 2018-11-16 10:00:13 +01:00
Leonard Gram
438f7d0332 build: refactoring. 2018-11-16 09:03:46 +01:00
Torkel Ödegaard
dac02d3d73 React edit mode for angular panels progress 2018-11-16 08:31:29 +01:00
Torkel Ödegaard
4822c02534 Merge pull request #14092 from cloudshapes/record-full-url-in-google-analytics
Update google analytics code to submit full URL not just path
2018-11-16 07:58:55 +01:00
Torkel Ödegaard
ad3e683739 Merge branch 'develop' into panel-edit-in-react 2018-11-16 07:43:37 +01:00
Torkel Ödegaard
e21a140fcc minor fixes 2018-11-16 07:41:40 +01:00
Torkel Ödegaard
c4ae05c5e5 Merge pull request #14078 from grafana/12759-description-n-links
12759 React-panel: description and links
2018-11-16 06:57:42 +01:00
Torkel Ödegaard
905ef22075 fixed order of time range tab 2018-11-16 06:53:54 +01:00
Patrick Schuster
481dcb321d Update ReadMe. 2018-11-16 00:30:51 +01:00
Roland Dunn
242ceb6d95 Update google analytics code to submit full URL not just path 2018-11-15 20:12:48 +00:00
Marcus Efraimsson
18810ca77f devenv: elasticsearch datasources and dashboards 2018-11-15 19:07:38 +01:00
Marcus Efraimsson
9a8ad70013 fix pipeline aggregations on doc count 2018-11-15 19:06:47 +01:00
Marcus Efraimsson
cbd4125e69 changelog: add notes about closing #5930
[skip ci]
2018-11-15 17:50:18 +01:00
Marcus Efraimsson
0810aa2e60 Merge pull request #12371 from marefr/xaxis_thresholds
Time regions support in graph panel
2018-11-15 08:46:39 -08:00
David
fe45cb9aa1 Merge pull request #14032 from grafana/davkal/explore-prevent-term-completion
Explore: Don't suggest term items when text follows
2018-11-15 16:43:15 +00:00
Torkel Ödegaard
8ce1cc2d52 fixed alert tab order and fixed some console logging issues 2018-11-15 17:33:55 +01:00
Marcus Efraimsson
3b4a224a57 Add tooltip 2018-11-15 17:25:58 +01:00
Peter Holmberg
61a704a64e some progress on groups and options 2018-11-15 17:14:43 +01:00
Marcus Efraimsson
a8e6b241d6 changed time region color modes 2018-11-15 17:07:42 +01:00
Torkel Ödegaard
a87035312d Merge branch 'develop' into panel-edit-in-react 2018-11-15 17:04:00 +01:00
Torkel Ödegaard
03040159ca Merge branch 'master' into develop 2018-11-15 17:00:03 +01:00
Torkel Ödegaard
f5b63fc65d Merge branch 'master' into develop 2018-11-15 16:56:21 +01:00
Johannes Schill
83073dea2f panel-header: Move the corner information in the panel header to its own component 2018-11-15 16:52:39 +01:00
Marcus Efraimsson
36ff94668c changelog: add notes about closing #12550
[skip ci]
2018-11-15 16:38:11 +01:00
Marcus Efraimsson
f560c3297e Merge pull request #14034 from grafana/12550_team_preferences
Team preferences support
2018-11-15 07:35:10 -08:00
Marcus Efraimsson
48905a613d fix pending alert annotation tooltip icon 2018-11-15 16:29:58 +01:00
bergquist
caec36e7ec alert rule have to be pending before alerting is for is specified 2018-11-15 15:37:46 +01:00
Marcus Efraimsson
52a71596eb fix selected home dashboard should show as selected even though its not starred 2018-11-15 14:43:50 +01:00
Leonard Gram
2e8c4699b0 build: internal metrics for packaging. 2018-11-15 14:42:09 +01:00
Johannes Schill
0fa8ae4fac panel-header: Move the panel description/links/error container outside of panel header to not interfere with the react-grid stuff 2018-11-15 14:30:59 +01:00
bergquist
7ba04466a2 alerting: improve annotations for pending state 2018-11-15 14:30:36 +01:00
Marcus Efraimsson
9606491f6c reload browser after preferences been updated 2018-11-15 14:29:14 +01:00
Johannes Schill
e979ed140e panel-header: Unmount popper when not needed. 2018-11-15 14:16:26 +01:00
Marcus Efraimsson
b8539570d0 fix snapshot tests 2018-11-15 14:16:17 +01:00
Johannes Schill
9e9ce80740 panel-header: Updated snapshots for popper 2018-11-15 13:49:48 +01:00
Johannes Schill
2a5f7d1e05 panel-header: Add fade in transition to tooltip 2018-11-15 13:44:15 +01:00
Torkel Ödegaard
cf0db51659 Trying to reduce the amount of duplication with preferences 2018-11-15 13:37:29 +01:00
Erik Sundell
69137e6774 stackdriver: revert project test stuff 2018-11-15 13:23:42 +01:00
Erik Sundell
b9d5fa1b36 stackdriver: revert test code 2018-11-15 13:20:32 +01:00
Johannes Schill
e73466a80d panel-header: Make it possible to style the reference element and fix so panel description looks good 2018-11-15 12:47:32 +01:00
bergquist
e7260d77b3 adds pending filter for alert list page 2018-11-15 12:46:28 +01:00
bergquist
968bfd0139 adds pending state to alert list panel 2018-11-15 12:42:47 +01:00
bergquist
a70ea2101c alertmanager: adds tests for should notify 2018-11-15 12:36:11 +01:00
David Kaltschmidt
ce59acd141 Extracted language provider variables for readibility 2018-11-15 11:20:27 +00:00
Marcus Efraimsson
21e47d76d0 Merge pull request #14081 from grafana/filter-alpha-plugins
filter out alpha plugins in plugins api
2018-11-15 02:35:28 -08:00
Marcus Efraimsson
bd6dc01e6b devenv: graph time regions test dashboard 2018-11-15 11:32:27 +01:00
Marcus Efraimsson
116e367e71 fix time regions mutable bug 2018-11-15 11:30:49 +01:00
Torkel Ödegaard
2ff58d5241 Merge branch 'master' into 12550_team_preferences 2018-11-15 11:29:36 +01:00
Marcus Efraimsson
81efc00adf set default color mode 2018-11-15 11:21:30 +01:00
Torkel Ödegaard
480da34279 filter out alpha plugins in api call, fixes #14030 2018-11-15 11:10:47 +01:00
bergquist
28029ce4a7 alerting: support for on execution errors and notdata 2018-11-15 11:04:16 +01:00
Torkel Ödegaard
911646f913 poc: handling panel edit mode in react even for angular panels poc 2018-11-15 09:46:21 +01:00
Johannes Schill
0430bb47c2 panel-header: Simplify condition 2018-11-15 09:17:39 +01:00
Torkel Ödegaard
487fd12d66 wip: minor update 2018-11-15 07:33:59 +01:00
Torkel Ödegaard
bdf598ccb2 minor fix 2018-11-14 21:38:53 -08:00
Torkel Ödegaard
810e256787 css update to switch slider 2018-11-14 21:35:02 -08:00
bergquist
84eb3bd095 tests for supporting for with all alerting scenarios 2018-11-14 23:43:09 +01:00
bergquist
8fb997d935 should not notify when going from unknown to pending 2018-11-14 23:43:09 +01:00
Bob Shannon
dcc48860b8 Fix formatting and remove enabled toggle 2018-11-14 17:37:32 -05:00
Johannes Schill
0a5f920bf5 panel-header: Avoid undefined classNames and use the real panel description 2018-11-14 22:29:10 +01:00
Torkel Ödegaard
bae4c8d2e6 wip: switch slider test 2018-11-14 13:29:09 -08:00
Johannes Schill
af859b2f4d panel-header: Updates for the new react-popper api and make it possible to hover the tooltip popper without it closing 2018-11-14 22:28:00 +01:00
Johannes Schill
6cd5bca9ab panel-header: Bump @types/react, @types/react-dom, react, react-dom, react-popper to latest versions 2018-11-14 22:28:00 +01:00
Bob Shannon
362b3740ed Add basic authentication support to metrics endpoint 2018-11-14 16:27:41 -05:00
Johannes Schill
e20eea978a panel-header: Display description in modal 2018-11-14 22:18:48 +01:00
Torkel Ödegaard
330a5c6496 minor panel options type fix 2018-11-14 12:03:05 -08:00
Marcus Efraimsson
dea953003c docs: description about graph panel time regions feature 2018-11-14 18:47:35 +01:00
Marcus Efraimsson
b47a4954c9 Merge pull request #14074 from stop-cran/feature/14072
elasticsearch: do not set a placeholder to index name, if it's already specified
2018-11-14 09:21:15 -08:00
Marcus Efraimsson
0cba6da2b0 update changelog
[skip ci]
2018-11-14 18:16:41 +01:00
Marcus Efraimsson
75bc9b315d changelog: add notes about closing #11977
[skip ci]
2018-11-14 18:15:02 +01:00
Marcus Efraimsson
2ae3b97299 changelog: add notes about closing #6367
[skip ci]
2018-11-14 18:12:46 +01:00
Marcus Efraimsson
33469ecfab docs: team http api update 2018-11-14 17:59:32 +01:00
Torkel Ödegaard
159c5cdb63 wip: adding general tab for react panel edit mode 2018-11-14 17:57:37 +01:00
stop-cran
20214b3d6a [elasticsearch] Do not set a placeholder to index name, if it's already specified. 2018-11-14 18:45:18 +02:00
Marcus Efraimsson
2f65b06135 devenv: graph time regions test dashboard 2018-11-14 17:22:34 +01:00
Marcus Efraimsson
0f57c4b20e create time regions solely based on utc time 2018-11-14 17:21:20 +01:00
Peter Holmberg
063a1acf94 started on options and groups 2018-11-14 17:00:26 +01:00
Torkel Ödegaard
0a080149ae Merge pull request #14054 from marefr/6367_raw_document_reset
Fix switching from es raw document metric breaks query editor
2018-11-14 16:46:47 +01:00
Torkel Ödegaard
fade3c47ca Merge pull request #14071 from grafana/react-panels-query-editor-fixes
React panels query editor fixes
2018-11-14 16:37:50 +01:00
Torkel Ödegaard
c0197bcb15 fix: added events to MetricsTabCtrl to closer mimic MetricsPanelCtrl 2018-11-14 16:04:34 +01:00
David
19b3578bdd Merge pull request #14048 from grafana/davkal/explore-table-pagination-styles
Explore: Fix table pagination styles
2018-11-14 14:45:51 +00:00
David
f00f347099 Merge pull request #14033 from grafana/davkal/explore-slow-ds-load
Explore: Dont set datasource in state if navigated away
2018-11-14 14:45:35 +00:00
Torkel Ödegaard
ebc5b3e693 minor css change 2018-11-14 15:17:28 +01:00
Torkel Ödegaard
18308bf584 Merge pull request #14069 from grafana/panel-focus-in-react
Panel focus in react
2018-11-14 14:40:18 +01:00
Torkel Ödegaard
1eecda48f8 Moved query manipulations from metrics controller to metrics tab so they are more easily shared between angular and react panels 2018-11-14 14:40:03 +01:00
Torkel Ödegaard
888eb9d94c fixed panel focus for react panels 2018-11-14 13:31:40 +01:00
Torkel Ödegaard
3ce7197c8e Merge pull request #14067 from grafana/react-panels-minor-changes
minor changes to react panels
2018-11-14 13:30:45 +01:00
Torkel Ödegaard
080d611004 minor changes to react panels 2018-11-14 13:20:19 +01:00
Torkel Ödegaard
604add078b Merge pull request #14066 from grafana/panel-size-refactor
Panel size refactor
2018-11-14 12:38:21 +01:00
Torkel Ödegaard
6d65432c8a Merge branch 'toggle-panel-menu-withreact' into develop 2018-11-14 12:24:30 +01:00
Torkel Ödegaard
90c41bb087 changed how size is calcualted and propagated and added proper interval calc to DataPanel 2018-11-14 12:03:25 +01:00
bergquist
aa340b9099 changelog: adds note about closing #14043 2018-11-14 11:30:19 +01:00
Peter Holmberg
e4e41474b1 first stuff 2018-11-14 11:06:02 +01:00
Mario Trangoni
774ad3ff39 pkg/cmd/grafana-server/server.go: Check sendSystemdNotification return value.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=errcheck ./...
server.go:165:25⚠️ error return value not checked (sendSystemdNotification("READY=1")) (errcheck)
2018-11-13 21:21:18 +01:00
Mario Trangoni
dae7c11a5f pkg/cmd/grafana-server/server.go: check serviceGraph.Provide() errors
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=errcheck ./...
pkg/cmd/grafana-server/server.go:77:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: bus.GetBus()})) (errcheck)
pkg/cmd/grafana-server/server.go:78:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: g.cfg})) (errcheck)
pkg/cmd/grafana-server/server.go:79:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: routing.NewRouteRegister(middleware.RequestMetrics, middleware.RequestTracing)})) (errcheck)
pkg/cmd/grafana-server/server.go:80:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: cache.New(5*time.Minute, 10*time.Minute)})) (errcheck)
pkg/cmd/grafana-server/server.go:87:23⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: service.Instance})) (errcheck)
pkg/cmd/grafana-server/server.go:90:22⚠️ error return value not checked (serviceGraph.Provide(&inject.Object{Value: g})) (errcheck)
2018-11-13 20:02:55 +01:00
Mario Trangoni
a6d54d5d9f pkg/cmd/grafana-server/main.go: Fix error value not checked
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=errcheck ./...
pkg/cmd/grafana-server/main.go:56:23⚠️ error return value not checked (http.ListenAndServe(fmt.Sprintf("localhost:%d", *profilePort), nil)) (errcheck)
2018-11-13 19:51:32 +01:00
Torkel Ödegaard
dedeaf541e wip panel size handling 2018-11-13 18:50:12 +01:00
Peter Holmberg
655f4d0a8d fixed issue with save. 2018-11-13 18:23:35 +01:00
Peter Holmberg
03cf238fa7 fixed mutability issue in dashboard dropdowns 2018-11-13 18:23:00 +01:00
Torkel Ödegaard
8ad37ea926 Merge branch 'develop' of github.com:grafana/grafana into develop 2018-11-13 17:25:11 +01:00
Torkel Ödegaard
b530b9ce7f Merge branch 'master' into develop 2018-11-13 17:24:51 +01:00
Torkel Ödegaard
f50dc4e99d Merge pull request #14053 from grafana/singlestat-fix
fixed singlestat guage ceneterd dot rendering issue
2018-11-13 17:23:46 +01:00
Peter Holmberg
a9b5cbf381 adced clickoutside wrapper 2018-11-13 17:00:28 +01:00
Torkel Ödegaard
b5921ef287 fixed singlestat guage ceneterd dot rendering issue 2018-11-13 16:51:33 +01:00
Torkel Ödegaard
2c6963fc6f Merge branch 'master' of github.com:grafana/grafana into develop 2018-11-13 16:26:46 +01:00
Torkel Ödegaard
51a95963f3 Merge pull request #14020 from grafana/12759-timeshift
12759 timeshift and panelTimeOverrides
2018-11-13 16:26:30 +01:00
Torkel Ödegaard
6d91e06f4d refactoring back the interval calculation, needs to be different for react panels 2018-11-13 16:01:52 +01:00
Torkel Ödegaard
f026be3790 fix case where timeshift and time override is used 2018-11-13 15:23:13 +01:00
Torkel Ödegaard
f274195d81 wip: refactoring interval and time override handling 2018-11-13 15:05:07 +01:00
Carl Bergquist
81a5b90022 Merge pull request #14043 from bergquist/upgrade_macaron_session
Upgrades the go-macaroon package
2018-11-13 14:42:06 +01:00
bergquist
a0496d554a updates latest to 5.3.4 2018-11-13 14:04:28 +01:00
bergquist
3a672c6dc2 changelod: add release date for 5.3.3 and 5.3.4 2018-11-13 13:58:35 +01:00
Marcus Efraimsson
e8e189d111 devenv: graph time regions test dashboard 2018-11-13 12:39:10 +01:00
Marcus Efraimsson
63be43e3b2 graph: Time region support 2018-11-13 12:23:06 +01:00
David Kaltschmidt
7627de80f2 Explore: Fix table pagination styles
- get rid of drop shadow
- get rid of top border
- add min height for better no-data placement
- add margins
2018-11-13 11:00:32 +00:00
Marcus Efraimsson
1958de7220 devenv: update alerting with testdata dashboard 2018-11-13 11:51:06 +01:00
Erik Sundell
2e0cbe75ee stackdriver: use arrow functions 2018-11-13 11:06:08 +01:00
Erik Sundell
e698202fae stackdriver: use new naming convention for query editor all over 2018-11-13 10:57:10 +01:00
Marcus Efraimsson
aa47f80fd8 Merge pull request #14042 from grafana/restore_prefs_control
Restore user profile preferences
2018-11-13 01:42:51 -08:00
bergquist
5954ab2c0d adds redis devenv block 2018-11-13 10:27:57 +01:00
Marcus Efraimsson
69a57850c4 restore user profile preferences 2018-11-13 10:22:02 +01:00
Torkel Ödegaard
d49e857bc0 Merge branch 'develop' into 12759-timeshift 2018-11-13 09:56:58 +01:00
Torkel Ödegaard
700c9642db Merge pull request #14039 from grafana/minor-react-panels-refactor
minor react panels refafactor
2018-11-13 09:55:48 +01:00
Marcus Efraimsson
97c6f3560c changelog: add notes about closing #13328 #13949
[skip ci]
2018-11-13 09:44:35 +01:00
bergquist
d5555f123f updates macaron session package 2018-11-13 09:41:36 +01:00
Torkel Ödegaard
81a9a3a3c1 Merge branch 'develop' into 12759-timeshift 2018-11-13 08:51:48 +01:00
Torkel Ödegaard
7b805bdb81 minor react panels refafactor 2018-11-13 08:40:42 +01:00
Torkel Ödegaard
6b2a47f2af Merge pull request #14038 from grafana/plugin-not-found
Plugin not found
2018-11-13 08:25:47 +01:00
Torkel Ödegaard
e331d24a38 removed console.log 2018-11-13 08:11:03 +01:00
Torkel Ödegaard
9820c7806c some cleanup of unused stuff and type fixes 2018-11-13 08:09:12 +01:00
Torkel Ödegaard
9dbb0db684 completed work on panel not found view 2018-11-13 07:54:02 +01:00
Torkel Ödegaard
68eecf6ca6 Merge pull request #14037 from matschaffer/patch-2
Clarify wording of playlist protip
2018-11-13 07:04:27 +01:00
Mat Schaffer
f6313fe675 Clarify wording of playlist protip
Per discussion on 154fbe2413 (r31238888) it seemed like this wording might be easier to understand.
2018-11-13 14:56:32 +09:00
Marcus Efraimsson
1194ff282e team preferences ui 2018-11-12 20:58:59 +01:00
Marcus Efraimsson
5f9fecd254 feat: team preferences 2018-11-12 20:01:53 +01:00
David Kaltschmidt
9b48338d95 Explore: Dont set datasource in state if navigated away
Datasource selection triggers a connection test, on success
the DS is set in the Explore state. If the test takes long and user
selects a different DS, and just after that the first test succeeds,
then the first DS overwrites the state.

* when test returns check if datasource is still the requested one
2018-11-12 18:06:12 +00:00
David Kaltschmidt
ff0ed06441 Explore: Don't suggest term items when text follows
Tab completion gets in the way when constructing a query from the inside
out:

```
up| => |up => sum(|up)
```

At that point the language provider will not suggest anything.
2018-11-12 17:40:05 +00:00
Torkel Ödegaard
119e94f745 wip: panel plugin not found 2018-11-12 17:54:44 +01:00
Torkel Ödegaard
7a30220d01 fixed scrollbar autohide prop 2018-11-12 17:48:10 +01:00
Torkel Ödegaard
727efa5a03 Merge branch 'pane-edit-ux-tabs' into develop 2018-11-12 16:25:13 +01:00
Torkel Ödegaard
e0feb72637 Merge remote-tracking branch 'origin/data-source-settings-to-react' into develop 2018-11-12 16:17:05 +01:00
Torkel Ödegaard
a2a4458923 Merge pull request #14023 from grafana/gauge-panel
React Gauge Panel - first step
2018-11-12 15:58:54 +01:00
Johannes Schill
6d4d7c5032 wip: panel-header: On panel refresh, get new timeRange from timeSrv, not the old one from the state 2018-11-12 11:38:41 +01:00
Johannes Schill
e045169094 wip: panel-header: Avoid null returning to get better code readability. High five @ peterholmberg 2018-11-12 11:31:33 +01:00
Johannes Schill
a3f1a1c6b3 wip: panel-header: Remove the TimeData type 2018-11-12 11:31:33 +01:00
Johannes Schill
8117a7559f wip: panel-header: Add proper typings to maxDataPoints and interval + remove code in comment 2018-11-12 11:31:33 +01:00
Johannes Schill
e55f3f883f wip: panel-header: Move getResolution and calculateInterval into utils-functions and use the same code from react and angular 2018-11-12 11:31:33 +01:00
Johannes Schill
9fd62b80d9 wip: panel-header: Start implementing the applyPanelTimeOverrides in the react panels by moving it to a util, make it pure and call it from angular and react. 2018-11-12 11:31:33 +01:00
Peter Holmberg
490fb9e8e6 import changes 2018-11-12 11:25:47 +01:00
Carl Bergquist
fdbea75775 Merge pull request #14021 from mjtrangoni/fix-gofmt-issues
Fix gofmt issues
2018-11-12 11:22:12 +01:00
Peter Holmberg
9f1784d0e5 updated text styling when switching views 2018-11-12 10:59:35 +01:00
Mario Trangoni
89cd74715e Add gofmt -s to CircleCI 2018-11-12 10:51:43 +01:00
bergquist
2fb78a50d6 minor fixes based on code review 2018-11-12 10:50:56 +01:00
Mario Trangoni
8c04926326 Fix gofmt issues
See,
$ gometalinter --disable-all --enable=gofmt --deadline 10m --vendor ./...
build.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/externalrelease.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/localrelease.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/main.go:1:⚠️ file is not gofmted with -s (gofmt)
scripts/build/release_publisher/publisher_test.go:1:⚠️ file is not gofmted with -s (gofmt)
2018-11-12 10:47:27 +01:00
Athurg Feng
919d00437e Add pic into actionCard message 2018-11-12 11:18:53 +08:00
Torkel Ödegaard
46ebe245ab Merge pull request #13999 from roidelapluie/originreferer
Remove Origin and Referer while proxying requests
2018-11-11 17:49:15 +01:00
Torkel Ödegaard
a0620ac8f6 minor style fixes & polish 2018-11-11 17:46:40 +01:00
Torkel Ödegaard
057696a0f8 Merge pull request #14002 from Nexucis/bugfix/template-srv
[Bugfix] Don't drop the value when it's equal to None
2018-11-11 16:49:51 +01:00
Carl Bergquist
733f2b066a Merge pull request #14012 from mjtrangoni/fix-megacheck-issues
Fix last megacheck issues
2018-11-11 11:22:26 +01:00
Torkel Ödegaard
2aef5fbc3b minor update 2018-11-10 12:17:40 -08:00
Torkel Ödegaard
02cbb4076e disable custom webkit scrollbar styles 2018-11-10 17:38:12 +01:00
Torkel Ödegaard
c4ad069083 refactoring & cleaning up css 2018-11-10 17:28:28 +01:00
Torkel Ödegaard
f74f7b017f Minor progress on edit mode 2018-11-10 07:34:09 -08:00
ryan
594051b3fb Merge remote-tracking branch 'grafana/master'
* grafana/master: (116 commits)
  Adjust UI depth of query statistics
  Preserve suffix text when applying function suggestion
  changelog: adds note about closing #13993
  Refactored log stream merging, added types, tests, comments
  Fixes #13993 - adds more options for Slack notifications
  add auth.proxy headers to sample.ini
  add auth.proxy headers to default.ini
  fixed issue with reducer sharing url query instance with angular router
  fixed exporter bug missing adding requires for datasources only used via data source variable, fixes #13891
  minor text change in export modal
  build: removes unused.
  Fixed issues introduced by changing to PureComponent
  further refactoring of #13984
  minor fix
  refactorings and some clean-up / removal of things not used
  Update docs/sources/permissions/dashboard_folder_permissions.md
  Fix typo in docs/sources/reference/scripting.md
  move enterprise down in menu
  wip: panel-header: Fix shareModal compatibility with react and angular
  wip: panel-header: Remove custom menu items from panels completely
  ...
2018-11-09 12:28:29 -08:00
Torkel Ödegaard
c54ae5d124 improve dropdown pane connetion to tab toolbar 2018-11-09 11:33:33 -08:00
Mario Trangoni
a2275e8a1c Add megacheck to gometalinter CircleCI target
See, https://github.com/dominikh/go-tools/tree/master/cmd/megacheck
2018-11-09 19:46:40 +01:00
Mario Trangoni
e351e6e211 pkg/tsdb/influxdb/influxdb.go: Fix surrounding loop is unconditionally terminated.
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/tsdb/influxdb/influxdb.go:106:3⚠️ the surrounding loop is unconditionally terminated (SA4004) (megacheck)
2018-11-09 19:40:07 +01:00
Mario Trangoni
960651e510 scripts/build/release_publisher/publisher_test.go: Fix trivial megacheck warning.
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
scripts/build/release_publisher/publisher_test.go:14:2⚠️ should merge variable declaration with assignment on next line (S1021) (megacheck)
2018-11-09 19:36:14 +01:00
Peter Holmberg
656900516b draw gauge 2018-11-09 16:37:09 +01:00
Torkel Ödegaard
1bad8db94c data source picker demo state 2018-11-09 15:50:09 +01:00
David
0e7b6dcfb4 Merge pull request #14008 from miqh/fix/query-stats-depth
Adjust UI depth of query statistics
2018-11-09 15:06:17 +01:00
David
502b3c390d Merge pull request #13954 from miqh/fix/apply-function-suggestion
Preserve suffix text when applying function suggestion
2018-11-09 14:56:25 +01:00
Erik Sundell
30f9a324ac stackdriver: remove service query tyhpe 2018-11-09 14:36:50 +01:00
Erik Sundell
3b9eda2561 stackdriver: correct aligner name 2018-11-09 14:36:04 +01:00
Peter Holmberg
9163db02b4 fix in to not render multiple labels 2018-11-09 14:32:14 +01:00
Erik Sundell
f307fc4760 stackdriver: typescriptifying props 2018-11-09 14:30:28 +01:00
Erik Sundell
75da02e1f0 Merge branch 'stackdriver-template-query-editor' of https://github.com/grafana/grafana into stackdriver-template-query-editor 2018-11-09 14:28:05 +01:00
Erik Sundell
996b470dd0 stackdriver: remove redundant try catch 2018-11-09 14:24:21 +01:00
Erik Sundell
33411198ab Update stackdriver.md 2018-11-09 14:19:41 +01:00
Michael Huynh
5d9faef167 Adjust UI depth of query statistics
A z-index value of less than 1020 is needed because the time selection
dropdown shares the latter value via inheritance. Arbitrarily picked
1015 because it is a notch down.

Related: #14004
2018-11-09 21:09:22 +08:00
Erik Sundell
bb1f79ecdc stackdriver: rename query function 2018-11-09 13:55:16 +01:00
Erik Sundell
5424603052 stackdriver: rename query variable 2018-11-09 13:55:16 +01:00
Erik Sundell
f14b3e7fcf stackdriver: remove debug log 2018-11-09 13:55:16 +01:00
Erik Sundell
bdaa61a193 stackdriver: add documentation for the template query editor 2018-11-09 13:55:16 +01:00
Erik Sundell
9c85793dbb stackdriver: test saved variable 2018-11-09 13:55:15 +01:00
Erik Sundell
b262be73e0 stackdriver: fix failing tests 2018-11-09 13:55:15 +01:00
Erik Sundell
45f49c2e5b stackdriver: remove services query type 2018-11-09 13:55:15 +01:00
Erik Sundell
209b1c026e stackdriver: update tests 2018-11-09 13:55:15 +01:00
Erik Sundell
0280179d35 stackdriver: add tests for render snapshop and default query type 2018-11-09 13:55:15 +01:00
Erik Sundell
7bdf97d3e6 stackdriver: remove lodash since object assign will do the trick 2018-11-09 13:55:15 +01:00
Erik Sundell
85ef5c2523 stackdriver: make sure we don't crash when selected service doesnt have a value 2018-11-09 13:55:15 +01:00
Erik Sundell
8333bf0b76 stackdriver: add simple render test 2018-11-09 13:55:15 +01:00
Erik Sundell
24cb44e029 stackdriver: rename params 2018-11-09 13:55:15 +01:00
Erik Sundell
f168dd5d34 stackdriver: remove not used prop 2018-11-09 13:55:14 +01:00
Erik Sundell
1fe70721c9 stackdriver: persist template variable definition 2018-11-09 13:55:14 +01:00
Erik Sundell
2d14bd10f3 stackdriver: add default value for query type 2018-11-09 13:55:14 +01:00
Erik Sundell
588c5c045a stackdriver: pass query definition from react, making it possible to use another definition than the query string only 2018-11-09 13:55:14 +01:00
Erik Sundell
5069f4afc9 stackdriver: make it possible to use alignment period template variable 2018-11-09 13:55:14 +01:00
Erik Sundell
a027a87d50 stackdriver: make it possible to use aligner template variable 2018-11-09 13:55:14 +01:00
Erik Sundell
2a6aec721e stackdriver: make it possible to use aggregation template variable 2018-11-09 13:55:14 +01:00
Erik Sundell
a951e577b7 stackdriver: make it possible to use aggregation template variable 2018-11-09 13:55:14 +01:00
Erik Sundell
20f1956225 stackdriver: make it possible to use metric type template variable 2018-11-09 13:55:13 +01:00
Erik Sundell
4569527873 stackdriver: set currentdatasource when editview is enabled 2018-11-09 13:55:13 +01:00
Erik Sundell
40bb3551cf stackdriver: return correct value 2018-11-09 13:55:13 +01:00
Erik Sundell
3883643ea2 stackdriver: reset query value on datasource changed 2018-11-09 13:55:13 +01:00
Erik Sundell
fcf39a0839 stackdriver: fix default value bug 2018-11-09 13:55:13 +01:00
Erik Sundell
042d156e5f stackdriver: extend label width 2018-11-09 13:55:13 +01:00
Erik Sundell
21940c2ca3 stackdriver: revert refactoring 2018-11-09 13:55:12 +01:00
Erik Sundell
2780ef27fd stackdriver: extract variables for pickers 2018-11-09 13:55:12 +01:00
Erik Sundell
b3c34be648 stackdriver: cleanup 2018-11-09 13:55:12 +01:00
Erik Sundell
a46b9cb0bb stackriver: rename interface 2018-11-09 13:55:12 +01:00
Erik Sundell
e9e20224d4 stackriver: use type for state 2018-11-09 13:55:12 +01:00
Erik Sundell
e0c0dc1453 stackdriver: rename state vars 2018-11-09 13:55:12 +01:00
Erik Sundell
9872ea7d8c stackdriver: extract common function 2018-11-09 13:55:11 +01:00
Erik Sundell
c993a4d296 stackdriver: streamline the way labels are refreshed when a new value is picked in the dropdowns above 2018-11-09 13:55:11 +01:00
Erik Sundell
1791e7329c stackdriver: handle default state 2018-11-09 13:55:11 +01:00
Erik Sundell
3c5f8325f5 stackdriver: refactor dropdown component 2018-11-09 13:55:11 +01:00
Erik Sundell
3c1cf214bc stackdriver: replace components with basic stateless select 2018-11-09 13:55:11 +01:00
Erik Sundell
1194da0d04 stackdriver: remove not used func. wrap query in exception 2018-11-09 13:55:11 +01:00
Erik Sundell
3af1d74c6a stackdriver: reload all child dropdown and update selected accordingly 2018-11-09 13:55:10 +01:00
Erik Sundell
c40794c2b9 stackdriver: improve default state handling 2018-11-09 13:55:10 +01:00
Erik Sundell
16c6d79dd6 stackdriver: use standard naming convention for selects 2018-11-09 13:55:10 +01:00
Erik Sundell
d80025d215 stackdriver: streamline label change 2018-11-09 13:55:10 +01:00
Erik Sundell
727472a3cb stackdriver: refactor TemplateQueryComponent 2018-11-09 13:55:10 +01:00
Erik Sundell
f0b4af9f6c stackdriver: use enum for query type 2018-11-09 13:55:10 +01:00
Erik Sundell
ca77cdc37e stackdriver: add aggregation query 2018-11-09 13:55:09 +01:00
Erik Sundell
b1db07789b stackdriver: add alignment periods 2018-11-09 13:55:09 +01:00
Erik Sundell
a0b8c4acba stackdriver: add aligner query 2018-11-09 13:55:09 +01:00
Erik Sundell
b3edad40a9 stackdriver: add resource types query 2018-11-09 13:55:09 +01:00
Erik Sundell
cb0d563aae stackdriver: add support for resource label queries 2018-11-09 13:55:09 +01:00
Erik Sundell
8c3874ee30 stackdriver: return friendly display name 2018-11-09 13:55:08 +01:00
Erik Sundell
4ab278dca4 stackdriver: add metric labels query 2018-11-09 13:55:08 +01:00
Erik Sundell
cbb663015e stackdriver: move response parsing to datasource file 2018-11-09 13:55:08 +01:00
Erik Sundell
7ccce76b80 stackdriver: return values for services and metric types 2018-11-09 13:55:08 +01:00
Erik Sundell
f0cba0b0d8 stackdriver: rename default component 2018-11-09 13:55:08 +01:00
Erik Sundell
149c649132 stackdriver: more renaming 2018-11-09 13:55:08 +01:00
Erik Sundell
33c9217cc9 stackdriver: refactoring - rename react components and file structure changes 2018-11-09 13:55:08 +01:00
Erik Sundell
4bcf3bf1ff stackdriver: remove not used code 2018-11-09 13:53:44 +01:00
Erik Sundell
ba4d52e048 stackdriver: add selector components for service and metric type 2018-11-09 13:53:44 +01:00
Erik Sundell
1969ad41e8 stackdriver: refactor stackdriver query ctrl 2018-11-09 13:53:44 +01:00
Erik Sundell
4f7d3fccb7 stackdriver: make sure default template query editor state is propagted to parent angular scope 2018-11-09 13:53:44 +01:00
Erik Sundell
637b91ab8d stackdriver: conditional template component rendering 2018-11-09 13:53:44 +01:00
Erik Sundell
0792c182cc stackdriver: add react component for template query editor 2018-11-09 13:53:44 +01:00
Erik Sundell
94ac522109 stackdriver: make it possible to load react plugin components from template query page 2018-11-09 13:53:43 +01:00
Erik Sundell
efd3343d19 stackdriver: add basic directive for loading react plugin components 2018-11-09 13:51:37 +01:00
Michael Huynh
22b8b04dbe Preserve suffix text when applying function suggestion
Updates all PromQL function-like suggestions to omit parentheses
when inserted. Such insertions also preserve any suffix text.

Related: #13885
2018-11-09 20:43:20 +08:00
Torkel Ödegaard
a7daf58bb9 wip: progress on edit mode ux with tabs 2018-11-09 13:17:41 +01:00
Peter Holmberg
b536a9f760 can render something 2018-11-08 16:40:53 +01:00
Augustin Husson
2abf8a0e8b don't drop the value when it equals to None 2018-11-08 16:23:40 +01:00
bergquist
16bf269c31 changelog: adds note about closing #13993
[skip ci]
2018-11-08 15:04:16 +01:00
Carl Bergquist
a8b8af9742 Merge pull request #13994 from andreykaipov/feature/more-slack-alerting-options
Adds more options for Slack notifications
2018-11-08 14:59:56 +01:00
Julien Pivotto
62417ca69f Remove Origin and Referer headers while proxying requests
Fix #13949
Fix #13328

Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>
2018-11-08 14:57:47 +01:00
David
203078280f Merge pull request #13942 from grafana/davkal/explore-logging-graph
Explore: Logging graph overview and view options
2018-11-08 14:38:29 +01:00
David Kaltschmidt
6b8d7c89ac Refactored log stream merging, added types, tests, comments 2018-11-08 14:24:54 +01:00
bergquist
aa1b80fe45 docs: improve helper test for For 2018-11-08 14:16:58 +01:00
bergquist
975f0aa064 alerting: adds docs about the for setting 2018-11-08 13:52:06 +01:00
Torkel Ödegaard
8a9d721c00 panel-edit-ux-tabs on top alternative 2018-11-08 12:25:22 +01:00
Torkel Ödegaard
964a21b091 Merge branch 'master' into panel-edit-ux 2018-11-08 11:46:04 +01:00
Athurg Feng
b7787db34e Add new option to set where to open the message url 2018-11-08 18:44:00 +08:00
Marcus Efraimsson
662808f092 Merge pull request #13930 from grafana/enterprise-docs
docs: restructure and enhancement
2018-11-08 01:50:35 -08:00
Peter Holmberg
7799ad8108 added loading state 2018-11-08 09:34:14 +01:00
Torkel Ödegaard
7de07eb096 Merge pull request #13992 from grafana/auth_proxy_headers_default
add auth.proxy headers to default.ini
2018-11-08 08:57:33 +01:00
Andrey Kaipov
63fdffe8c0 Fixes #13993 - adds more options for Slack notifications 2018-11-07 22:08:26 -05:00
Marcus Efraimsson
f065af320d fix switching from es raw document metric breaks query editor 2018-11-08 01:00:20 +01:00
Dan Cech
8a74fe2b76 add auth.proxy headers to sample.ini 2018-11-07 18:21:25 -05:00
Torkel Ödegaard
3b4d8c9b9b Merge pull request #13984 from grafana/12759-panel-header-standard-menu-only
12759 panel header menu in React (standard options only)
2018-11-07 23:42:42 +01:00
Dan Cech
502290817a add auth.proxy headers to default.ini 2018-11-07 17:36:44 -05:00
Torkel Ödegaard
29e18fddd0 refactored how testing state was handled, using redux for this felt way to require way to much code 2018-11-07 14:28:44 -08:00
bergquist
0ddfd92f8c adds debounce duration for alert dashboards in ha_test 2018-11-07 22:30:23 +01:00
Torkel Ödegaard
8ff6bb07bc Merge branch 'data-source-settings-to-react' of github.com:grafana/grafana into data-source-settings-to-react 2018-11-07 11:51:02 -08:00
Torkel Ödegaard
dcb5015022 Merge pull request #13951 from marefr/11977_6x_terms
Fix terms agg order deprecation warning on es 6+
2018-11-07 20:47:41 +01:00
Torkel Ödegaard
d7655e0b54 fixed issue with reducer sharing url query instance with angular router 2018-11-07 11:44:50 -08:00
Torkel Ödegaard
4e49c453b9 Merge pull request #13990 from grafana/exporter-fix-13891
Exporter bug fix
2018-11-07 20:33:22 +01:00
Torkel Ödegaard
bcd0b2fcf7 Merge branch 'master' into 12759-panel-header-standard-menu-only 2018-11-07 11:22:30 -08:00
Torkel Ödegaard
99610e040f fixed exporter bug missing adding requires for datasources only used via data source variable, fixes #13891 2018-11-07 11:14:39 -08:00
Torkel Ödegaard
0712c52cbc Merge branch 'bergquist-export_dashboard_guidence' 2018-11-07 11:13:22 -08:00
Torkel Ödegaard
c52e91ee6c minor text change in export modal 2018-11-07 10:46:09 -08:00
Torkel Ödegaard
e73e18913c Merge branch 'export_dashboard_guidence' of https://github.com/bergquist/grafana into bergquist-export_dashboard_guidence 2018-11-07 10:34:15 -08:00
Torkel Ödegaard
0353c9ea9f Merge pull request #13988 from xlson/removes_old_ci
build: removes unused.
2018-11-07 19:32:34 +01:00
Leonard Gram
d88693fd6d build: removes unused. 2018-11-07 17:03:24 +01:00
Peter Holmberg
682697e2cd clear test box if success 2018-11-07 16:14:55 +01:00
Torkel Ödegaard
93b4cb562d Fixed issues introduced by changing to PureComponent 2018-11-07 16:03:33 +01:00
Peter Holmberg
b7d494551c Added testing state in reducer 2018-11-07 15:38:53 +01:00
Torkel Ödegaard
37eb7ca62b further refactoring of #13984 2018-11-07 13:55:02 +01:00
Marcus Efraimsson
d7edc59882 minor fix 2018-11-07 13:52:11 +01:00
Torkel Ödegaard
a24f6998f2 refactorings and some clean-up / removal of things not used 2018-11-07 13:36:35 +01:00
Marcus Efraimsson
454d74a176 Merge pull request #13982 from grafana/adeverteuil-patch-1
Fix typo in docs/sources/reference/scripting.md
2018-11-07 03:49:43 -08:00
Peter Holmberg
e25b2d0ab6 Merge branch 'master' into data-source-settings-to-react 2018-11-07 09:50:17 +01:00
Alexandre de Verteuil
d0794dbce1 Update docs/sources/permissions/dashboard_folder_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-07 09:17:36 +01:00
Alexandre de Verteuil
1d3b8e25ce Fix typo in docs/sources/reference/scripting.md
Change:
> In the folder grafana install folder under `public/dashboards/` there is a file named `scripted.js`.
…to:
> In the grafana install folder under `public/dashboards/` there is a file named `scripted.js`.
2018-11-06 15:41:37 -05:00
Torkel Ödegaard
7d87f57367 experimental option boxes 2018-11-06 18:55:35 +01:00
Torkel Ödegaard
5975c4a737 ux: changed panel selection ux 2018-11-06 18:34:37 +01:00
Marcus Efraimsson
f294dbdb86 move enterprise down in menu 2018-11-06 17:39:35 +01:00
Johannes Schill
08251425ca wip: panel-header: Fix shareModal compatibility with react and angular 2018-11-06 16:55:44 +01:00
Johannes Schill
9c28ff8f84 wip: panel-header: Remove custom menu items from panels completely 2018-11-06 16:44:13 +01:00
Johannes Schill
dd7437e9e9 wip: panel-header: Reverted a lot of code to pause the "custom menu options" for now 2018-11-06 16:37:51 +01:00
Johannes Schill
49550ccedf wip: panel-header: More merge conflicts during cherry pick 2018-11-06 16:12:04 +01:00
Johannes Schill
dbf7f3fb61 wip: panel-header: More merge conflicts during cherry pick 2018-11-06 16:05:34 +01:00
Dan Cech
1347ce5f75 Update docs/sources/permissions/datasource_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:57:14 +01:00
Dan Cech
850c0e7111 Update docs/sources/permissions/datasource_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:53 +01:00
Dan Cech
4ef770fe98 Update docs/sources/permissions/dashboard_folder_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:32 +01:00
Dan Cech
1bc3f0af07 Update docs/sources/http_api/datasource_permissions.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:56:12 +01:00
Dan Cech
8a52cb7714 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:53 +01:00
Dan Cech
d44b8968d2 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:42 +01:00
Dan Cech
803b36a059 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:28 +01:00
Dan Cech
5cdd53c5e7 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:55:05 +01:00
Dan Cech
32e001dba4 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:54:53 +01:00
Dan Cech
881c73fb93 Update docs/sources/enterprise/index.md
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:54:25 +01:00
Dan Cech
044505a213 minor change
Co-Authored-By: marefr <marcus.efraimsson@gmail.com>
2018-11-06 15:53:49 +01:00
Johannes Schill
6c0c1254fe wip: panel-header: More merge conflicts 2018-11-06 15:44:04 +01:00
David Kaltschmidt
dfc0c5052d Fix loglevel tests for Explore loggging 2018-11-06 15:40:29 +01:00
Johannes Schill
ca4612af26 wip: panel-header: Merge conflicts 2018-11-06 15:35:15 +01:00
Johannes Schill
f471482569 wip: panel-header: Fragment not needed anymore 2018-11-06 15:27:15 +01:00
Johannes Schill
443d381dd9 wip: panel-header: Add possibility to add custom actions to the menu by passing them in as props 2018-11-06 15:26:56 +01:00
Johannes Schill
f124b9de6a wip: panel-header: Separate all panel actions to its own file so we decouple them from react 2018-11-06 15:26:43 +01:00
Johannes Schill
6151310216 wip: panel-header: Start implementing the Toggle legend, but its not taken all the way 2018-11-06 15:26:34 +01:00
Johannes Schill
79da3dc9f6 wip: panel-header: Change DashboardPanel to a PureComponent to avoid unwanted rerenders 2018-11-06 15:25:59 +01:00
Johannes Schill
5375ce5ffd wip: panel-header: Refactor so "Share" use the same code in angular+react 2018-11-06 15:25:46 +01:00
Johannes Schill
f9dd516578 wip: panel-header: Add "Edit JSON" functionality + make sure everyone using the json editor pass in the model property instead of the scope property when triggering the json modal 2018-11-06 15:25:36 +01:00
Johannes Schill
edceb204e7 wip: panel-header: Add "Copy" functionality 2018-11-06 15:25:13 +01:00
Johannes Schill
b296d724e5 wip: panel-header: Add "Duplicate" 2018-11-06 15:25:07 +01:00
Johannes Schill
839057dc7a wip: Add "Share" to the react panels 2018-11-06 15:25:02 +01:00
Johannes Schill
bf8703edb8 wip: panel-header: Move code existing in both angular+react to utility functions 2018-11-06 15:24:25 +01:00
Johannes Schill
820e47b4c0 wip: panel-header: Remove panel 2018-11-06 15:24:06 +01:00
Johannes Schill
212c086162 Mobx is now Redux 2018-11-06 15:24:00 +01:00
Johannes Schill
9f6683de2c wip: Initial commit for PanelHeaderMenu 2018-11-06 15:23:52 +01:00
Torkel Ödegaard
b372b4323d Merge branch 'master' into panel-edit-ux 2018-11-06 15:01:16 +01:00
Marcus Efraimsson
b28b79100a changelog: add notes about closing #13903
[skip ci]
2018-11-06 13:50:30 +01:00
Marcus Efraimsson
a66dba1608 changelog: add notes about closing #13932
[skip ci]
2018-11-06 13:47:05 +01:00
Torkel Ödegaard
b592d5d731 Merge pull request #13977 from grafana/13932_ds_selector
fix selecting datasource using enter key
2018-11-06 13:27:59 +01:00
Torkel Ödegaard
eae754a0c6 Merge pull request #13971 from grafana/react-panel-options
React panel options
2018-11-06 13:16:30 +01:00
David Kaltschmidt
f5575459eb unify log level colors between rows and graph 2018-11-06 12:05:10 +01:00
David Kaltschmidt
a5ed86edba Graph log entries by log level 2018-11-06 12:00:05 +01:00
Marcus Efraimsson
e5e886ccb7 fix selecting datasource using enter key 2018-11-06 11:49:22 +01:00
David Kaltschmidt
e39e82949d Adaptive bar widths for log graph 2018-11-06 11:07:12 +01:00
Marcus Efraimsson
a3196a130e changelog: add notes about closing #13970
[skip ci]
2018-11-06 10:50:32 +01:00
Leonard Gram
34f531e113 build: fixes 2018-11-06 09:52:53 +01:00
Marcus Efraimsson
2be28ff247 Merge pull request #13970 from zcoffy/master
Adding Cloudwatch AWS/Connect metrics and dimensions
2018-11-06 09:51:33 +01:00
Leonard Gram
c9a4da4270 build: publisher handles nightly builds. 2018-11-06 09:41:31 +01:00
bergquist
7bde98aff9 rename and mark functions as private 2018-11-06 09:00:17 +01:00
Torkel Ödegaard
932ace299a drag handle css 2018-11-06 08:33:49 +01:00
Torkel Ödegaard
b60ebf92b2 moved drag handle 2018-11-06 08:01:00 +01:00
Torkel Ödegaard
562411af1a fixed options 2018-11-06 07:23:02 +01:00
David Kaltschmidt
c1ca1ed35e Time selection via graph 2018-11-05 23:36:58 +01:00
Torkel Ödegaard
b9612aaa23 minor code style change 2018-11-05 10:38:55 -08:00
Torkel Ödegaard
9393b06166 basic panel options working 2018-11-05 10:31:39 -08:00
Zac Coffy
9cce0f553a Adding Cloudwatch AWS/Connect metrics and dimensions 2018-11-05 13:15:03 -05:00
Torkel Ödegaard
35e62bbbe0 wip: react panel options architecture 2018-11-05 17:46:09 +01:00
bergquist
17adb58d80 export: provide more help regarding export format
this will provide the user with more info about
the export format and default to not use the format
for sharing on grafana.com etc.

ref #13781
2018-11-05 17:33:42 +01:00
Marcus Efraimsson
26cbc6be81 Merge pull request #13966 from marefr/alert_extractor_refactor
Refactor dashboard alert extractor
2018-11-05 17:06:27 +01:00
Leonard Gram
272c43f7b7 build: minor publisher fixes. 2018-11-05 16:57:30 +01:00
Peter Holmberg
ffc06e9962 extract store from configurestore 2018-11-05 16:54:48 +01:00
Leonard Gram
82b84c5906 Merge pull request #13968 from xlson/configurable-release-publisher
Configurable release publisher
2018-11-05 16:35:49 +01:00
Peter Holmberg
6dc3e0399d added actions 2018-11-05 16:33:43 +01:00
Leonard Gram
1de35c43a7 build: publishes grafana enterprise to grafana.com 2018-11-05 16:26:19 +01:00
bergquist
30e924611d changelog: adds note about closing #13322 2018-11-05 15:42:26 +01:00
Carl Bergquist
5abc884f5f Merge pull request #13964 from bergquist/alerting_deleted_folder
alerting: delete alerts when parent folder is deleted
2018-11-05 15:32:46 +01:00
Leonard Gram
d728a3c521 build: publisher uses local time.
Previously the local day was used but the timestamp
was set to midnight.
2018-11-05 15:06:52 +01:00
Leonard Gram
5da9760aeb build: publisher supports both local and remote. 2018-11-05 15:06:52 +01:00
Leonard Gram
d9eaec99e2 build: publisher can find artifacts from local sources. 2018-11-05 15:06:52 +01:00
Leonard Gram
c5c3e08442 build: refactor releaser. 2018-11-05 15:06:51 +01:00
Leonard Gram
e2d3382470 build: prepares release tool for finding local releases. 2018-11-05 15:06:51 +01:00
Leonard Gram
7e093a32a2 build: improved release publisher dry-run. 2018-11-05 15:06:51 +01:00
Leonard Gram
a1dca2117d build: use build workflow id instead of build number. (#13965)
* build: use build workflow id instead of build number.

The workflow id is unique across the whole workflow
while the build number is unique to every job in the
workflow. This change means that jobs that build
artifacts for the same commit but in different jobs
will now have the same id.

* build: fixes pkgver generation.
2018-11-05 15:05:12 +01:00
bergquist
423331dae0 alerting: delete alerts when parent folder is deleted
closes #13322
2018-11-05 14:25:26 +01:00
Marcus Efraimsson
9e0da02b6a refactor dashboard alert extractor 2018-11-05 14:25:19 +01:00
bergquist
3789583014 for: use 0m as default for existing alerts and 5m for new 2018-11-05 13:51:35 +01:00
Torkel Ödegaard
dd4eab1722 panel options wip 2018-11-05 13:44:09 +01:00
Peter Holmberg
52232f98b9 Exposing digest from angular component 2018-11-05 13:39:57 +01:00
bergquist
ae2d536740 adds tests for extracting for property 2018-11-05 13:29:33 +01:00
Torkel Ödegaard
c9802c283e minor fix 2018-11-05 12:33:40 +01:00
David
0df14f3fa8 Merge pull request #13927 from grafana/davkal/explore-start-task
Explore: fix metric selector for additional rows
2018-11-05 12:30:02 +01:00
David
24e5922d68 Merge pull request #13953 from miqh/fix/suppress-aggregation-suggestions
Handle suggestions for alternate syntax aggregation contexts
2018-11-05 12:15:37 +01:00
Marcus Efraimsson
c5ce8536d4 changelog: add notes about closing #13606
[skip ci]
2018-11-05 11:47:34 +01:00
Marcus Efraimsson
fdedb917a2 Merge pull request #13892 from grisme/13606-table-cell-background-color
Fix bug with background color in table cell with link
2018-11-05 11:43:47 +01:00
Marcus Efraimsson
32c93793a6 devenv: table panel links 2018-11-05 11:34:25 +01:00
bergquist
ccd89eee97 renames debouceduration to for 2018-11-05 11:05:30 +01:00
Marcus Efraimsson
5882e5bb46 Merge pull request #13900 from marefr/ds_cache_refactor
Datasource proxy cache refactor
2018-11-05 11:02:31 +01:00
bergquist
d25284a364 introduce state unknown for rules that have not been evaluated yet 2018-11-05 10:50:28 +01:00
bergquist
6f748d8a96 fixes go meta lint issue 2018-11-05 10:50:28 +01:00
bergquist
4526660cb2 wire up debounce setting in the ui 2018-11-05 10:50:28 +01:00
bergquist
2d3a575489 adds db migration for debounce_duration 2018-11-05 10:50:28 +01:00
bergquist
ccfd9c89b2 introduces hard coded deboucing for alerting 2018-11-05 10:50:28 +01:00
Marcus Efraimsson
818d48c2c0 always execute the user teams query 2018-11-05 10:49:56 +01:00
Torkel Ödegaard
3e7cd5fa99 Merge branch 'panel-edit-ux' of github.com:grafana/grafana into panel-edit-ux 2018-11-05 10:49:44 +01:00
Torkel Ödegaard
2f4ae1e2d8 Merge branch 'master' into panel-edit-ux 2018-11-05 10:17:09 +01:00
Marcus Efraimsson
5be2332c66 handle error before populating cache 2018-11-05 09:58:13 +01:00
Leonard Gram
5469a1a569 build: fixes gcp push path. 2018-11-05 09:55:19 +01:00
Carl Bergquist
c9aba023b5 Merge pull request #13962 from bergquist/alerting_median_tests
alerting: adds tests for the median reducer
2018-11-05 09:25:44 +01:00
Carl Bergquist
f43f4a94a7 Merge pull request #13961 from mtanda/cw_doc_math
add minimal permission to docs
2018-11-05 09:10:36 +01:00
bergquist
7c3dcb3702 alerting: adds tests for the median reducer
adds a test that verify that null values are not used
when calculating the median value in alerting

closes #10056
2018-11-05 09:03:35 +01:00
Carl Bergquist
03d02523fd Merge pull request #13956 from bbodenmiller/patch-1
Gitlab -> GitLab
2018-11-05 07:23:55 +01:00
Carl Bergquist
12d38d1fdd Merge pull request #13959 from bbodenmiller/patch-2
typo fix for "has"
2018-11-05 07:22:55 +01:00
Mitsuhiro Tanda
cb2a03a08c add minimal permission 2018-11-05 14:27:27 +09:00
ryan
eeb80a43f4 Merge remote-tracking branch 'grafana/master'
* grafana/master: (878 commits)
  changelog: adds note about closing #13945
  removed file I added accidentally
  fixed to template PR issues, #13938
  alerting: increase default duration for queries
  Load hash based styles in error.html, too
  Add [hash] to filename of grafana.{light,dark}.css
  Fix minor JSON typo in HTTP API docs
  Added new backend setting for license file
  changelog: add notes about closing #13925
  fix for responsive rule for footer
  Updated login page logo & wordmark and responsive behavior
  added new workmarks
  fixed react whitespace warning on teams page
  renamed org files to match new naming guide
  moved profile pages to it's own feature folder
  moved new teams page
  reload page after preferences update
  Add delta window function to postgres query builder
  Increase Telegram captions length limit.
  Explore: async starts of language provider
  ...
2018-11-04 15:33:04 -08:00
Ben Bodenmiller
355493bf6e typo fix for "has" 2018-11-04 03:22:25 -08:00
Ben Bodenmiller
d6cd2a2085 Gitlab -> GitLab 2018-11-04 00:48:30 -07:00
bergquist
65ace003c9 changelog: adds note about closing #13945 2018-11-03 14:03:41 +01:00
Carl Bergquist
d2a8a8358c Merge pull request #13945 from bergquist/alerting_increase_default_duration
alerting: increase default duration for queries
2018-11-03 14:02:03 +01:00
Michael Huynh
f79b790ef6 Add tests covering alternate syntax for aggregation contexts
Related: #13690
2018-11-03 08:07:08 +08:00
Michael Huynh
5e748243af Handle suggestions for alternate syntax aggregation contexts
In aggregation contexts using the alternate syntax form, labels will
precede metrics. A cursor at the label position cannot provide
meaningful suggestions unless a metric is specified. In the latter case,
no suggestions are presented at all.

Related: #13690
2018-11-03 07:56:13 +08:00
Marcus Efraimsson
5803bfd2c7 fix terms agg order deprecation warning on es 6+ 2018-11-02 17:53:47 +01:00
Marcus Efraimsson
6ef941ea17 fix failing tests 2018-11-02 16:03:12 +01:00
Marcus Efraimsson
940f510856 Merge branch 'cached-signed-in-user' into ds_cache_refactor 2018-11-02 15:42:05 +01:00
Torkel Ödegaard
4f601761df Merge pull request #13938 from tarekbecker/grafana-css-hash
Add [hash] to grafana.{light,dark}.css
2018-11-02 11:36:23 +01:00
Torkel Ödegaard
61ff9fe603 removed file I added accidentally 2018-11-02 11:13:56 +01:00
Torkel Ödegaard
b415d82611 fixed to template PR issues, #13938 2018-11-02 10:49:46 +01:00
bergquist
bc37e3caa2 alerting: increase default duration for queries
we should promote using longer queries since this should
increase the quality of the alerts. only using a 5min range
means that we will only have 4 datapoints in data is written
every min which is not good enough for the generic alert rule
2018-11-02 10:43:05 +01:00
David Kaltschmidt
583334df05 Explore: Logging graph overview and view options
- Logging gets a graph for log distribution (currently per stream, but I
  think I'll change that to per log-level)
- added grid columns for timestamp and unique labels
- show common labels of streams
- View options to show/hide time columns, label columns
- created `--small` modifier for Switch CSS classes
- merging of streams is now a datasource responsibility
2018-11-02 08:25:36 +01:00
Tarek Becker
70bb81c6eb Load hash based styles in error.html, too 2018-11-01 23:31:17 +01:00
Tarek Becker
4d4eb354b7 Add [hash] to filename of grafana.{light,dark}.css 2018-11-01 21:43:07 +01:00
Torkel Ödegaard
0e26fad30b minor tweak to back to dashboard buttons 2018-11-01 19:25:54 +01:00
Torkel Ödegaard
1bc3d8dad8 Merge branch 'master' into panel-edit-ux 2018-11-01 18:45:15 +01:00
Marcus Efraimsson
b770d52e29 Merge pull request #13936 from mminer/fix-minor-docs-typo
Fix minor JSON typo in HTTP API docs
2018-11-01 18:20:17 +01:00
Matthew Miner
7e13aa2cfb Fix minor JSON typo in HTTP API docs 2018-11-01 10:05:26 -07:00
Peter Holmberg
e37fa486ed remove replaced components 2018-11-01 14:31:14 +01:00
Peter Holmberg
16d4109599 reverting babel change 2018-11-01 14:03:02 +01:00
Peter Holmberg
f95b80b7e1 remove this 2018-11-01 14:01:06 +01:00
Peter Holmberg
f5966b44af removed these unused components 2018-11-01 13:59:12 +01:00
Peter Holmberg
6d5f5b644b reverting script change 2018-11-01 13:58:18 +01:00
Peter Holmberg
f15ed848f9 Merge branch 'master' into data-source-settings-to-react 2018-11-01 13:52:53 +01:00
Peter Holmberg
6493f96ac7 updated snap 2018-11-01 13:47:40 +01:00
Peter Holmberg
2837fd515f tests 2018-11-01 13:45:52 +01:00
Torkel Ödegaard
4c070bc781 minor doc tweaks 2018-11-01 12:35:51 +01:00
Torkel Ödegaard
5a27df2dc9 updated enterprise page 2018-11-01 12:19:19 +01:00
Torkel Ödegaard
28b0ae1d82 Added new backend setting for license file 2018-11-01 12:07:11 +01:00
Peter Holmberg
7fc4b1934b updating state and save 2018-11-01 11:19:40 +01:00
Marcus Efraimsson
a1b4ebc115 make permission sub items in sidemenu cleaner 2018-11-01 11:00:32 +01:00
Torkel Ödegaard
6a9e18c9cb Merge pull request #13922 from grafana/login-page-update
Updated login page logo & wordmark and responsive behavior
2018-11-01 10:42:34 +01:00
Marcus Efraimsson
8f5fa28a23 changelog: add notes about closing #13925
[skip ci]
2018-11-01 09:57:59 +01:00
Marcus Efraimsson
c2e1422c00 Merge pull request #13921 from svenklemm/postgres-delta
Add delta window function to postgres query builder
2018-11-01 09:55:26 +01:00
David Kaltschmidt
edd575b552 Explore: fix metric selector for additional rows
- race condition in language provider leads to only one row getting
  selector options
- fixed by always returning the start task promise
2018-11-01 09:46:05 +01:00
Torkel Ödegaard
ed0f521279 fix for responsive rule for footer 2018-10-31 13:44:22 -07:00
Torkel Ödegaard
4dad8d946e Updated login page logo & wordmark and responsive behavior 2018-10-31 13:40:58 -07:00
Torkel Ödegaard
74c9defede added new workmarks 2018-10-31 20:56:04 +01:00
David
e5aeb00636 Merge pull request #13918 from grafana/davkal/explore-syntax-start
Explore: async starts of language provider
2018-10-31 20:45:33 +01:00
Torkel Ödegaard
ee5b37eb2c Merge pull request #13878 from grafana/org-page-to-react
Org page to react
2018-10-31 20:39:56 +01:00
Torkel Ödegaard
d8e257e633 fixed react whitespace warning on teams page 2018-10-31 12:39:02 -07:00
Torkel Ödegaard
1f61b37bf7 Merge pull request #13919 from skgsergio/increase-telegram-caption-imit
Increase Telegram captions length limit
2018-10-31 20:34:11 +01:00
Torkel Ödegaard
d64edc4a29 renamed org files to match new naming guide 2018-10-31 12:28:26 -07:00
Torkel Ödegaard
dcf8327dc9 moved profile pages to it's own feature folder 2018-10-31 12:25:46 -07:00
Torkel Ödegaard
17386c49d4 moved new teams page 2018-10-31 12:21:16 -07:00
Torkel Ödegaard
99d0beeaa9 reload page after preferences update 2018-10-31 12:18:19 -07:00
Sven Klemm
f608340c35 Add delta window function to postgres query builder
Unlike the increase function delta doesn't check for resets
and can go negative. This is similar to the prometheus delta
function.
2018-10-31 19:26:18 +01:00
Sergio Conde Gomez
65a15b157f Increase Telegram captions length limit. 2018-10-31 18:07:09 +01:00
Torkel Ödegaard
74a0c0e618 update angular state on props update 2018-10-31 10:03:03 -07:00
Marcus Efraimsson
280c8631f9 docs: enhanced ldap 2018-10-31 18:01:30 +01:00
David Kaltschmidt
4f959648a7 Explore: async starts of language provider
- changed `start()` to return promise on main language feature task
- promise resolves to list of secondary tasks
- speeds up time to interaction of metric selector
- lazy loading of certain metric selector and log label selector items
- loading indication of metric and log label selectors
2018-10-31 17:53:28 +01:00
Torkel Ödegaard
7885453bcd listen for changes in angular land and propagate that back to react 2018-10-31 09:19:08 -07:00
Marcus Efraimsson
5495072c83 docs: fix datasource permissions keywords 2018-10-31 17:18:31 +01:00
Leonard Gram
5c1615292a build: grafana enterprise docker image. 2018-10-31 16:02:36 +01:00
Torkel Ödegaard
c105e91181 Merge pull request #13915 from grafana/IE11-graph-legend-below-fix
IE11 fix for legend tables below graph
2018-10-31 14:50:21 +01:00
Torkel Ödegaard
93453c2d94 added caching of signed in user DB calls 2018-10-31 06:47:14 -07:00
Peter Holmberg
2342f60a31 added actions 2018-10-31 14:28:16 +01:00
Torkel Ödegaard
07d78da5ec Merge branch 'ds_cache_refactor' of https://github.com/marefr/grafana into marefr-ds_cache_refactor 2018-10-31 06:06:24 -07:00
Torkel Ödegaard
d46c258933 IE11 fix for legend tables below graph 2018-10-31 06:03:26 -07:00
Torkel Ödegaard
749d7a2f0c Merge pull request #13913 from Yukinoshita-Yukino/master
Add only display date option to table panel column
2018-10-31 13:31:43 +01:00
Peter Holmberg
1656f03acd cleaned up render 2018-10-31 13:29:02 +01:00
Peter Holmberg
5140325a0d renders angular component 2018-10-31 13:23:05 +01:00
Torkel Ödegaard
32ca8b7aad updated api keys snapshot 2018-10-31 12:54:30 +01:00
Torkel Ödegaard
05dee9e340 Merge branch 'mondras-empty-cta-apikeys' 2018-10-31 12:51:36 +01:00
Torkel Ödegaard
95a8a59845 restored transition 2018-10-31 12:50:44 +01:00
Torkel Ödegaard
89cd15d98c removed logging call 2018-10-31 04:38:16 -07:00
Torkel Ödegaard
dfb9419f86 Merge branch 'graph-legend-to-react' 2018-10-31 04:26:44 -07:00
Yuan Liu
6daf73fec0 add table column date format 2018-10-31 18:51:34 +08:00
Torkel Ödegaard
36cd73819a fixed memory leaks and minor refactoring 2018-10-31 03:40:03 -07:00
Leonard Gram
baea76c4ea build: gpc credentials added to deploy. 2018-10-31 11:16:48 +01:00
Marcus Efraimsson
dab833a83c changelog: add notes about closing #13762
[skip ci]
2018-10-31 10:55:25 +01:00
Marcus Efraimsson
e331c0c1c7 update changelog
[skip ci]
2018-10-31 10:54:19 +01:00
Marcus Efraimsson
f348acccf3 Merge pull request #13758 from grafana/mysql_query_builder
mysql graphical query builder
2018-10-31 10:52:16 +01:00
Leonard Gram
4954a49da9 build: deploys to gcp. 2018-10-31 10:49:09 +01:00
Leonard Gram
1a0b75bc44 build: deploys to gcp. (#13911) 2018-10-31 09:51:11 +01:00
David
e99c1b4838 Merge pull request #13904 from grafana/davkal/explore-logging
Explore: repair logging after recent Explore restructuring
2018-10-31 09:19:38 +01:00
Marcus Efraimsson
fc6d7c9b6b datasource permission http api 2018-10-30 19:02:12 +01:00
Marcus Efraimsson
621525d10f restructure administration/permissions page into a section with sub pages 2018-10-30 18:43:54 +01:00
David Kaltschmidt
037167ff07 Fix TimePicker test by enforcing UTC on date string 2018-10-30 16:50:03 +01:00
Peter Holmberg
a7bd944098 updated view to use angular loader 2018-10-30 16:40:08 +01:00
David Kaltschmidt
c92f5462fe Explore: repair logging after code restructuring
this is a fix-up PR that cleans up Explore Logging after the recent
restructuring.

- log results need to be merged since query transactions have been
  introduced
- logging DS has its own language provider, query field, and start page
  (some of them based on prometheus components)
- added loader animation to log viewer
- removed logging logic from prometheus components
2018-10-30 16:35:49 +01:00
Marcus Efraimsson
a00999fd89 docs: schema -> database 2018-10-30 16:25:36 +01:00
Leonard Gram
3d452e5a46 build: deployment ci container. (#13902) 2018-10-30 15:56:52 +01:00
Marcus Efraimsson
00a997b7a8 docs: mysql 2018-10-30 15:45:39 +01:00
Torkel Ödegaard
a8e2840f15 minor progress 2018-10-30 15:25:10 +01:00
Torkel Ödegaard
e9928f6c52 Merge branch 'master' into enterprise-docs 2018-10-30 15:01:09 +01:00
David
758ec4bc70 Merge pull request #13844 from grafana/davkal/explore-empty-page
Explore: Pluggable components from datasource plugins
2018-10-30 14:54:34 +01:00
David Kaltschmidt
cf19ecc8f5 Make Explore plugin exports explicit 2018-10-30 14:38:34 +01:00
David
45d7516408 Merge pull request #13901 from grafana/davkal/grunt-newer
JS tooling: run TS grunt tasks only when files changed
2018-10-30 14:35:19 +01:00
Marcus Efraimsson
d0c00388e6 add functionality to override service in registry 2018-10-30 13:37:30 +01:00
Peter Holmberg
58e94fc0fa moved state 2018-10-30 13:09:59 +01:00
Marcus Efraimsson
6f9c0241af register datasource cache service with proper name 2018-10-30 12:32:14 +01:00
Marcus Efraimsson
5d4dc18bbc revert application lifecycle event support 2018-10-30 12:31:28 +01:00
bergquist
b58b4ef128 changelog: adds note about closing #13876 2018-10-30 11:20:49 +01:00
Carl Bergquist
42d902b07d Add new build info metrics that contains more info (#13876)
* Add new build info metrics that contains more info

The goal was to add more information about Grafana. But rather than
just adding those to the current metrics I created a new metric
since its a common pattern in the prometheus community to expose that
info in a metric named `*_build_info`.

We keep the old metric to avoid introducing any breaking changes but
we should be able to remove it the next breaking change
2018-10-30 11:18:43 +01:00
David Kaltschmidt
e8a895d58b JS tooling: run TS grunt tasks only when files changed
- using grunt-newer to prefix precommit tasks
- only got it to work for tslint and tsc

Not applied to:

- sasslint does not take the file arguments in a way that grunt-newer
  recognizes
- no-only-tests throws an error when used with `newer`, but it's
  sub-second runtime
2018-10-30 10:25:53 +01:00
Peter Holmberg
7a10bf0141 revert file name change 2018-10-30 09:45:47 +01:00
Marcus Efraimsson
2332b3e205 remove unused code 2018-10-30 09:34:09 +01:00
Marcus Efraimsson
52d825f535 log error on datasource access denied 2018-10-30 09:32:32 +01:00
Marcus Efraimsson
70ddf93688 include teams on signed in user 2018-10-30 09:32:32 +01:00
Marcus Efraimsson
9edaa3fa8c application lifecycle event support 2018-10-30 09:32:32 +01:00
Marcus Efraimsson
cfb061ddab refactor datasource caching 2018-10-30 09:31:56 +01:00
Anton
355e76a48e Fix cell coloring 2018-10-29 23:26:29 +03:00
Anton
6092fa4dc3 Fix bug with background color in table cell with link 2018-10-29 23:13:07 +03:00
Torkel Ödegaard
1dc8b898bb add dashnav responsive rule to hide tv button on smaller screens 2018-10-29 19:17:08 +01:00
Nick Triller
3414be18bc Implement oauth_auto_login setting
Redirect in backend
2018-10-29 18:46:52 +01:00
Carl Bergquist
c0c2df4da0 Merge pull request #13871 from crab86/patch-2
Updated grafana_stats.json
2018-10-29 17:42:44 +01:00
David
a0aaf70060 Merge pull request #13886 from grafana/davkal/explore-fix-cell-click
Explore: fix copy/paste on table cells
2018-10-29 17:06:54 +01:00
David Kaltschmidt
5a23723f2c Explore: fix copy/paste on table cells
When selecting text via mouse, our ReactTable cells' click handler
triggers an event.

- check event target to be the link, only then handle the event
2018-10-29 16:44:50 +01:00
Peter Holmberg
12a63b605f rename type 2018-10-29 16:01:14 +01:00
Peter Holmberg
12336e1548 using label component 2018-10-29 15:59:16 +01:00
David Kaltschmidt
d0776937b5 Pluggable components from datasource plugins
- when instantiating a datasource, the datasource service checks if the
  plugin module exports Explore components, and if so, attaches them to
  the datasource
- Explore component makes all major internal pluggable from a datasource
  `exploreComponents` property
- Moved Prometheus query field to promehteus datasource and registered
  it as an exported Explore component
- Added new Start page for Explore, also exported from the datasource
2018-10-29 15:14:36 +01:00
Peter Holmberg
70f6100d53 fixed type 2018-10-29 15:08:36 +01:00
David
b00e709aee Merge pull request #13842 from grafana/davkal/explore-error-handling
Explore: error handling and time fixes
2018-10-29 15:08:14 +01:00
Peter Holmberg
7c5e04277c Merge branch 'master' into org-page-to-react 2018-10-29 14:26:11 +01:00
Peter Holmberg
7dc5173a9b removed angular code 2018-10-29 14:21:11 +01:00
Torkel Ödegaard
befee108c4 Merge pull request #13872 from grafana/css-loading-sync
Revert to sync loading of css, sometimes js loaded before css which c…
2018-10-29 13:48:39 +01:00
Peter Holmberg
026588cbf1 test and some refactoring 2018-10-29 13:46:12 +01:00
Torkel Ödegaard
2481d19dc8 Merge pull request #13875 from bergquist/branch_param_to_build
build: adds branch info to binary build
2018-10-29 13:45:27 +01:00
bergquist
c9ac762fb1 build: adds branch info to binary build 2018-10-29 13:27:29 +01:00
Torkel Ödegaard
dc961a8274 Merge pull request #13870 from grafana/davkal/make-node_modules
Makefile: dependency-driven target to build node_modules
2018-10-29 12:31:23 +01:00
Torkel Ödegaard
2dde2c4f9b now that css is loaded sync again I can remove some styles from index html body css 2018-10-29 04:26:44 -07:00
David Kaltschmidt
c1347e4ecb WIP babel 7 2018-10-29 12:20:10 +01:00
Torkel Ödegaard
d06ad98ec9 Revert to sync loading of css, sometimes js loaded before css which caused issues 2018-10-29 04:19:45 -07:00
Sebastian
85aed0276e Update grafana_stats.json
The grafana_stats.json used the following prometheus query: "increase(grafana_alerting_result_total[1m])" But a metric called "grafana_alerting_result_total" is currently not there anymore. So i changed the query to "increase(grafana_alerting_active_alerts[1m])" and updated the title as well (Before: "Grafana alert results", Now: "Grafana active alerts").
2018-10-29 12:05:24 +01:00
David Kaltschmidt
a4ef1d6175 Makefile: dependency-driven target to build node_modules
- added `node_modules` as new target
- dependency on `package.json` and `yarn.lock` allows for quick `make
  node_modules` after a branch change, which noops when the deps have
 not changed
- also added `clean` target
2018-10-29 11:08:30 +01:00
Carl Bergquist
1f6df77a80 Merge pull request #13869 from bergquist/delete_old_deocs
removes old invalid release guide
2018-10-29 10:47:18 +01:00
bergquist
0e34a6be0f removes old invalid release guide
closes #13864
2018-10-29 10:37:30 +01:00
Torkel Ödegaard
1a65046b64 Merge branch 'empty-cta-apikeys' of https://github.com/mondras/grafana into mondras-empty-cta-apikeys 2018-10-29 09:52:27 +01:00
Torkel Ödegaard
e47de5602b added missing alpha state prop to graph2 panel 2018-10-28 12:46:18 -07:00
Torkel Ödegaard
e24dc37966 minor update 2018-10-28 12:44:47 -07:00
Torkel Ödegaard
5dd9247762 Merge branch 'master' into panel-edit-ux 2018-10-28 12:11:47 -07:00
Torkel Ödegaard
9f1f5805ec added switch form component 2018-10-28 12:10:49 -07:00
Torkel Ödegaard
7863d2d882 Merge branch 'master' of github.com:grafana/grafana 2018-10-28 11:34:25 -07:00
Torkel Ödegaard
52669032d0 updated graph tests dashboard 2018-10-28 11:29:55 -07:00
Torkel Ödegaard
d94cd3f2b4 Merge branch 'fix-missing-points' of https://github.com/jsferrei/grafana into jsferrei-fix-missing-points 2018-10-28 11:17:36 -07:00
Torkel Ödegaard
9f35b8a65e Merge pull request #13827 from grafana/remove-projectname-from-query-response
stackdriver: Remove redundant project name assignment
2018-10-28 19:08:38 +01:00
Torkel Ödegaard
6bf0531f81 fixed width of panel edit mode 2018-10-28 10:26:49 -07:00
David
121ac93d08 Merge pull request #13847 from miqh/fix/multi-line-aggregation
Fix label suggestions inside multi-line aggregation contexts
2018-10-28 18:05:31 +01:00
David Kaltschmidt
9245dad53e Fix query hint tests after refactor 2018-10-28 17:48:17 +01:00
David
2ec827f02f Merge pull request #13774 from miqh/feat/sum-query-suggestion
Implement sum aggregation suggestion with placeholder support
2018-10-28 17:37:42 +01:00
Torkel Ödegaard
8faf74d441 Merge pull request #13862 from buroa/master
Fixing issue 13855
2018-10-28 15:38:23 +01:00
Steve Kreitzer
e44dde3f14 Fixing issue 13855 2018-10-28 10:25:42 -04:00
Michael Huynh
d1d5e9f7d3 Add tests to cover PlaceholdersBuffer and sum hint
Related: #13615
2018-10-28 21:07:40 +08:00
Michael Huynh
c255b5da11 Add sum aggregation query suggestion
Implements rudimentary support for placeholder values inside a string
with the `PlaceholdersBuffer` class. The latter helps the newly added
sum aggregation query suggestion to automatically focus on the label
so users can easily choose from the available typeahead options.

Related: #13615
2018-10-28 21:03:39 +08:00
Torkel Ödegaard
60b6bd10a4 fixes to angular panel edit mode 2018-10-28 11:31:42 +01:00
Torkel Ödegaard
3da62f1083 Merge branch 'master' into panel-edit-ux 2018-10-27 17:44:04 +02:00
Torkel Ödegaard
add2e4447e Merge pull request #13849 from grafana/mode-change-performance-changes
Reduce re-renderings when changing view modes
2018-10-27 17:43:42 +02:00
Torkel Ödegaard
c5f9d8092f Reduce re-renderings when changing view modes 2018-10-27 16:54:04 +02:00
Torkel Ödegaard
4d4369b77f Merge branch 'master' into panel-edit-ux 2018-10-27 15:14:19 +02:00
Torkel Ödegaard
10e5d725bc updated singlestat logo 2018-10-27 15:13:57 +02:00
Torkel Ödegaard
b1b534a005 more ux progress 2018-10-27 15:09:36 +02:00
Michael Huynh
61843b58db Add tests to cover aggregation context cases
This should cover use cases involving multi-line queries and range
vector syntax inside aggregation contexts.

Related: #12890
2018-10-27 17:02:03 +08:00
Michael Huynh
2a4a19388f Fix label suggestions for multi-line aggregation queries
No label suggestions were being returned for multi-line aggregation
contexts because the parsed selector string does not see the full
context before a `by` or `without` clause.

This solution stitches together all text nodes that comprise the query
editor to ensure the selector has sufficient context to generate
suggestions.

Also, an additional workaround has been included to ensure range vector
syntax does not disrupt label suggestions in aggregation contexts.

Related: #12890
2018-10-27 16:54:12 +08:00
Torkel Ödegaard
a4674ecaa1 panel edit mode changes 2018-10-27 10:14:38 +02:00
Carlos Mondragon
35688b223a Update snapshots. 2018-10-26 10:20:03 -07:00
Carlos Mondragon
bb227d5c3a Use jest.fn instead of string. 2018-10-26 10:12:27 -07:00
David Kaltschmidt
bf1af66292 Explore: error handling and time fixes
- use global range types
- add ErrorBoundary around individual Explore components
- fix table merge on empty results
- fix TimePicker date parsing on ISO dates
- fix TimePicker range string after relative move
2018-10-26 18:16:00 +02:00
Torkel Ödegaard
bcf669fab5 ux experiments 2018-10-26 16:29:08 +02:00
Leonard Gram
58a567173e build: builds grafana docker for enterprise at release. 2018-10-26 15:19:53 +02:00
Jon Ferreira
07cb622729 Add code to flot that plots any datapoints which to not have neighbors
as 0.5 radius points
 - fixes https://github.com/grafana/grafana/issues/13605
2018-10-26 09:10:07 -04:00
Peter Holmberg
ccbff592d2 adding default value and update actions 2018-10-26 14:51:33 +02:00
Leonard Gram
a80e2e1acd build: ge build fix. 2018-10-26 14:37:51 +02:00
Leonard Gram
e2f74b55d2 build: grafana enterprise docker. (#13839) 2018-10-26 14:23:30 +02:00
Peter Holmberg
affb04a3ce moved state to redux, renamed entities 2018-10-26 14:15:37 +02:00
Torkel Ödegaard
94c35e2577 testing panel edit ux idea 2018-10-26 13:20:10 +02:00
David
239dfbc9ae Merge pull request #13824 from grafana/davkal/explore-plugins
Explore: move suggestions logic to datasource language provider
2018-10-26 11:40:52 +02:00
Marcus Efraimsson
361864bec6 changelog: add notes about closing #13769
[skip ci]
2018-10-26 09:06:32 +02:00
Marcus Efraimsson
6052257515 Merge pull request #13820 from grafana/13769_mysql_time_filter
mysql: fix timeFilter macro should respect local time zone
2018-10-26 09:02:59 +02:00
Torkel Ödegaard
b3c7a41e13 Merge pull request #13819 from mtanda/cw_desc_region
use default region to call DescribeRegions
2018-10-26 08:35:17 +02:00
Mitsuhiro Tanda
220c4f4ab4 add test 2018-10-26 03:13:02 +09:00
Mitsuhiro Tanda
3447b8b299 cache region result 2018-10-26 01:23:44 +09:00
Mitsuhiro Tanda
c40baa1a23 use default region to call DescribeRegions 2018-10-26 01:23:44 +09:00
Torkel Ödegaard
e7f6cdc625 Merge branch '13739/alert-to-react' 2018-10-25 17:44:23 +02:00
Torkel Ödegaard
4112591042 Merge pull request #13818 from mtanda/cw_stat_template
support template variable in stat field
2018-10-25 17:08:09 +02:00
Torkel Ödegaard
2b1ab9843d Merge pull request #13828 from bergquist/docs_es_provisioning
docs: improve ES provisioning examples
2018-10-25 17:06:47 +02:00
Torkel Ödegaard
f1660aa21a fix: updated backend srv to use appEvents and removed parts of alertsSrv 2018-10-25 17:05:17 +02:00
Peter Holmberg
a98f7e548f simple select 2018-10-25 16:56:49 +02:00
Leonard Gram
30cb28df55 build: correctly adds enterprise to the filename. (#13831) 2018-10-25 16:55:27 +02:00
Torkel Ödegaard
d505d83ee1 Merge pull request #13679 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-10-25 16:31:53 +02:00
bergquist
d9cd20e43e docs: improve ES provisioning examples
closes #12281
2018-10-25 14:36:31 +02:00
bergquist
946ca5477b changelog: adds note about closing #13723
[skip ci]
2018-10-25 14:31:43 +02:00
Erik Sundell
6a447a24fb stackdriver: don't set project name in query response since default project is now loaded in its own query 2018-10-25 14:16:01 +02:00
Athurg Feng
201dd6bf65 Optimize the Dingding match values format 2018-10-25 18:53:45 +08:00
Athurg Feng
cb86e38628 Add Dingding message type to support mass text notification 2018-10-25 18:34:34 +08:00
Alexander Zobnin
1dad52eaad graph legend: fix table padding 2018-10-25 13:28:05 +03:00
David Kaltschmidt
6f2315d5c5 Moved prom language features to datasource language provider 2018-10-25 12:24:24 +02:00
Athurg Feng
7f45afac63 Split text template into variable 2018-10-25 18:24:04 +08:00
Athurg Feng
ca6dd73923 Add match values into Dingding notification message 2018-10-25 18:23:37 +08:00
Alexander Zobnin
9e15d47e13 graph legend: fix phantomjs rendering when legend is on the right 2018-10-25 13:21:28 +03:00
Torkel Ödegaard
be6f68f341 fix for annotation promise clearing, bug introduced last week when merging react panels step1 2018-10-25 11:35:32 +02:00
Alexander Zobnin
533f35853b Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-25 11:56:02 +03:00
Torkel Ödegaard
df7915f3b4 Merge pull request #13822 from grafana/fix-solo-panel-size
fix panel solo size
2018-10-25 10:48:39 +02:00
Torkel Ödegaard
defccb5ab3 fix panel solo size 2018-10-25 10:32:23 +02:00
Marcus Efraimsson
97b22aa5a9 mysql: fix timeFilter macro should respect local time zone 2018-10-25 10:29:40 +02:00
Peter Holmberg
1f8b61f9a6 load preferences 2018-10-25 07:45:22 +02:00
Mitsuhiro Tanda
08631ea23f support template variable in stat field 2018-10-25 13:03:20 +09:00
Sven Klemm
9bb2b70a95 only look in current database in findMetricTable 2018-10-24 19:21:26 +02:00
Marcus Efraimsson
4ee79faff4 Merge pull request #13811 from Yukinoshita-Yukino/patch-1
Fix doc error for DingDIng alert
2018-10-24 16:45:26 +02:00
Alexander Zobnin
e4b3f31f82 graph legend: fix table alignment 2018-10-24 17:38:10 +03:00
Yuan Liu
eb255520cb fix dingding doc error 2018-10-24 22:28:59 +08:00
Peter Holmberg
596a83407e fixed routes and page 2018-10-24 16:17:25 +02:00
Alexander Zobnin
f5a0b0044a graph legend: minor refactor 2018-10-24 16:57:44 +03:00
Torkel Ödegaard
5a70327dcf Merge pull request #13805 from grafana/13804-fix-template-variable-check
Update the regex-matching in templateSrv to work with the new variabl…
2018-10-24 14:58:13 +02:00
Carl Bergquist
0d41904ee5 Merge pull request #13755 from Yukinoshita-Yukino/master
Fix cannot receive dingding alert when alert message is empty
2018-10-24 14:56:08 +02:00
David Kaltschmidt
54a3e2d1d1 Added types to query rows 2018-10-24 14:55:56 +02:00
Peter Holmberg
8c742a9530 Merge branch 'master' into data-source-settings-to-react 2018-10-24 14:50:33 +02:00
Marcus Efraimsson
259c243723 update latest.json to latest stable version
[skip ci]
2018-10-24 14:37:28 +02:00
Marcus Efraimsson
63c13198e3 changelog: update
[skip ci]
2018-10-24 14:36:26 +02:00
Peter Holmberg
f34cbae2dd cleaned up the flow 2018-10-24 14:33:53 +02:00
Marcus Efraimsson
3a1ece537c changelog: add notes about closing #13280
[skip ci]
2018-10-24 13:58:37 +02:00
Marcus Efraimsson
1bcd4c040b Merge pull request #13806 from bergquist/proviosioing_when_folder_is_deleted
Delete provisioning meta data when deleting Folder
2018-10-24 13:55:14 +02:00
bergquist
0a9bfc5529 delete provisioning meta data when deleting folder
prior to this fix Grafana didnt delete meta data
about the provisioned dashboard in `dashboard_provisioning`
which means that the dashboard wasn't inserted into
Grafana again if the folder was delete within Grafana.

closes #13280
2018-10-24 13:32:45 +02:00
Johannes Schill
b880f8d548 Update the regex-matching in templateSrv to work with the new variable-syntax and be more flexible to regex-changes #13804 2018-10-24 13:29:03 +02:00
David
a6fc74e35b Merge pull request #13803 from grafana/davkal/explore-fix-resize
Explore: fix graph resize on window resize
2018-10-24 12:32:27 +02:00
Marcus Efraimsson
1fbef171c5 changelog: add notes about closing #13600
[skip ci]
2018-10-24 12:08:33 +02:00
Marcus Efraimsson
27cbcbcbc2 changelog: update
[skip ci]
2018-10-24 12:07:27 +02:00
Johannes Schill
38c155403e Move the variable regex to constants to make sure we use the same reg… (#13801) 2018-10-24 12:06:09 +02:00
Marcus Efraimsson
758a5ecf51 docs: fix tutorials index page. Fixes #13799 2018-10-24 11:55:43 +02:00
David
8f7686c5a7 Merge pull request #13773 from miqh/fix/click-typeahead-suggestion
Fix click-based selection of typeahead suggestion
2018-10-24 11:42:58 +02:00
Alexander Zobnin
8a2921399e graph panel: fix legend alignment 2018-10-24 12:42:44 +03:00
David Kaltschmidt
d6ff16fe72 Explore: fix graph resize on window resize
- resize HOC wrapper only resized first child which in case of large
  graphs was the warning button
- moved warning button inside the panel parent
2018-10-24 11:30:32 +02:00
David
7d0eccdd23 Merge pull request #13787 from grafana/davkal/explore-transactions
Explore: query transactions for faster result display
2018-10-24 11:24:29 +02:00
Daniel Lee
57a7007421 changelog: adds note for #13691 2018-10-24 11:22:23 +02:00
Marcus Efraimsson
00d6707045 docs: fix tutorials index page. Fixes #13799 2018-10-24 11:21:34 +02:00
Erik Sundell
c5af0bf1c5 Resource type filter (#13784)
* stackdriver: add resource type to filter and group bys

* stackdriver: remove not used param

* stackdriver: refactor filter and group by code

* stackdriver: remove resource type if its already in filter list

* stackdriver: remove debug logging

* stackdriver: remove more debug logging

* stackdriver: append resource type to legend name if there are more than one type present in the response

* stackdriver: only make new request if filter has real value

* stackdriver: format legend support for resource type

* stackdriver: add resource type to documentation

* stackdriver: not returning promise from query function

* stackdriver: fix refactoring bug

* stackdriver: remove not used import
2018-10-24 11:18:49 +02:00
David Kaltschmidt
a121cd0e49 Fix race condition on add/remove query row 2018-10-24 11:08:15 +02:00
Peter Holmberg
ed99a543a5 moving things 2018-10-24 10:23:11 +02:00
Peter Holmberg
3e0a34ceca typing changes 2018-10-24 10:18:28 +02:00
Marcus Efraimsson
edba0880fc changelog: add notes about closing #13764
[skip ci]
2018-10-24 09:08:16 +02:00
Mario Trangoni
91447dcbf9 pkg/tsdb/stackdriver/stackdriver.go: Fix regular expression does not contain any meta characters.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/tsdb/stackdriver/stackdriver.go:171:26⚠️ regular expression does not contain any meta characters (SA6004) (megacheck)
2018-10-23 17:26:47 +02:00
Mario Trangoni
bb12a1bc99 pkg/tsdb/graphite/graphite.go: Fix regular expression does not contain any meta characters.
I found this article benchmarking Replace vs Regexp,
https://medium.com/codezillas/golang-replace-vs-regexp-de4e48482f53

See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/tsdb/graphite/graphite.go:167:28⚠️ regular expression does not contain any meta characters (SA6004) (megacheck)
pkg/tsdb/graphite/graphite.go:172:28⚠️ regular expression does not contain any meta characters (SA6004) (megacheck)
2018-10-23 17:26:46 +02:00
Mario Trangoni
3466969a7c pkg/login/ldap.go: Fix warning comparison to bool constant
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/login/ldap.go:188:40⚠️ should omit comparison to bool constant, can be simplified to !*extUser.IsGrafanaAdmin (S1002) (megacheck)
2018-10-23 17:26:46 +02:00
Peter Holmberg
bd2f9a38d9 Added margin and correct border radius 2018-10-23 17:25:16 +02:00
David Kaltschmidt
f19ffee5b4 Fix rebase, fix empty field still issuing query problem 2018-10-23 17:21:33 +02:00
Torkel Ödegaard
6932306995 Merge pull request #13795 from grafana/kiosk-mode-url-fix
Another fix for kiosk mode handling
2018-10-23 17:07:29 +02:00
Leonard Gram
6579070fd2 Changelog: Adds curl to docker image in 5.3.2 2018-10-23 16:22:48 +02:00
Torkel Ödegaard
53d9619cb9 fix: another fix for #13764 , #13793 2018-10-23 16:22:00 +02:00
Torkel Ödegaard
102d495af9 Merge pull request #13793 from grafana/kiosk-mode-url-fix
Kiosk mode url fix
2018-10-23 16:15:50 +02:00
David Kaltschmidt
0cd89e80ca Submit query when enabling result viewer 2018-10-23 16:13:23 +02:00
David Kaltschmidt
fbed57ab43 Get query hints per query transaction 2018-10-23 16:10:52 +02:00
Leonard Gram
4cc89f1753 docker: adds curl back into the docker image for utility. (#13794) 2018-10-23 16:10:23 +02:00
David Kaltschmidt
2e02a8c855 Explore: query transactions
Existing querying was grouped together before handed over to the
datasource. This slowed down result display to however long the slowest
query took.

- create one query transaction per result viewer (graph, table, etc.)
  and query row
- track latencies for each transaction
- show results as soon as they are being received
- loading indicator on graph and query button to indicate that queries
  are still running and that results are incomplete
- properly discard transactions when removing or changing queries
2018-10-23 16:09:48 +02:00
Torkel Ödegaard
15e1e41540 Merge pull request #13768 from davewat/feat-toggle-legend-shortcut
Feat - keyboard shortcut to toggle legend
2018-10-23 16:06:32 +02:00
David
e761fb1936 Merge pull request #13761 from grafana/davkal/explore-reuse-table-merge
Explore: reuse table merge from table panel
2018-10-23 16:00:57 +02:00
Peter Holmberg
bb6409384e connected to store, self remove logic 2018-10-23 16:00:04 +02:00
Torkel Ödegaard
2107f88fc1 Merge pull request #13770 from ceh-forks/editor-duplicate-placeholder
ux: remove duplicate placeholder attribute
2018-10-23 15:52:33 +02:00
Torkel Ödegaard
8a1e0cd83b fix: kiosk url fix, fixes #13764 2018-10-23 15:37:11 +02:00
Marcus Efraimsson
f84db5107d changelog: add notes about closing #13633
[skip ci]
2018-10-23 14:17:57 +02:00
Marcus Efraimsson
88e546128c changelog: add notes about closing #13666
[skip ci]
2018-10-23 14:10:05 +02:00
Johannes Schill
22a0f3cf94 fix: Text box variables with empty values should not be considered fa… (#13791)
* fix: text box template variable doesn't work properly without a default value
2018-10-23 14:05:10 +02:00
Alexander Zobnin
f150c34b66 Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-23 14:35:55 +03:00
Peter Holmberg
bbd02dd616 renaming things 2018-10-23 13:34:27 +02:00
Alexander Zobnin
fa5fad5c7e graph legend: review fixes 2018-10-23 14:08:30 +03:00
Marcus Efraimsson
8a3b1cf484 Merge pull request #13785 from grafana/13729_perm_debug
Add debug logging of dashboard permission checks
2018-10-23 11:50:47 +02:00
Marcus Efraimsson
b371f2d91f add debug logging of folder/dashbord permission checks 2018-10-23 11:08:57 +02:00
Sven Klemm
2f254187fc Merge remote-tracking branch 'upstream/master' into mysql_query_builder 2018-10-23 10:06:34 +02:00
Sven Klemm
261122ff4b sync mysql query editor template with postgres 2018-10-23 10:04:45 +02:00
Sven Klemm
fdaa153c95 add char as datatype for metric and group columns 2018-10-23 09:51:17 +02:00
Leonard Gram
ab4cc6a9bf build: indentation mistake. 2018-10-23 08:53:36 +02:00
Leonard Gram
3aa0a0ca98 build: fixes filename issues. 2018-10-23 08:33:52 +02:00
Marcus Efraimsson
e6abc0691e fix injecting dependencies to graph legend directive 2018-10-22 19:23:40 +02:00
Daniel Lee
41018fc788 changelog: adds note for #13669 2018-10-22 18:52:53 +02:00
Daniel Lee
693a3adc72 Merge pull request #13671 from grafana/gce-automatic-authentication
Stackdriver: Add possibility to authenticate using GCE metadata server
2018-10-22 18:46:54 +02:00
Marcus Efraimsson
ead6a051df docs: update debian installation instructions 2018-10-22 18:31:31 +02:00
Alexander Zobnin
5a4c362985 Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-22 17:18:35 +03:00
Daniel Lee
6e0728ad88 stackdriver: some tweaks to the text on the config page and in docs 2018-10-22 16:14:17 +02:00
Erik Sundell
6abbf5b3b8 stackdriver: refactoring request builder 2018-10-22 16:12:55 +02:00
Erik Sundell
1756e82d8b stackdriver: remove not used struct 2018-10-22 16:12:55 +02:00
Erik Sundell
89958f2933 stackdriver: remove not needed scope 2018-10-22 16:12:55 +02:00
Erik Sundell
a1fee2fd8a stackdriver: add provisioning example for gce authentication 2018-10-22 16:12:55 +02:00
Erik Sundell
0109051b2a stackdriver: add documentation for gce default account authentication 2018-10-22 16:12:22 +02:00
Erik Sundell
e13e2f8a45 stackdriver: change name of authentication type 2018-10-22 16:12:22 +02:00
Erik Sundell
5b9cd830d2 stackdriver: improve config page info box documentation 2018-10-22 16:12:22 +02:00
Erik Sundell
dd745e0cf0 stackdriver: prevent backend query from being made when there are not yet any defined targets 2018-10-22 16:12:22 +02:00
Erik Sundell
5deba92d05 stackdriver: fix failing tests 2018-10-22 16:12:22 +02:00
Erik Sundell
ae8a765190 stackdriver: improve error handling 2018-10-22 16:12:22 +02:00
Alexander Zobnin
91636ec122 graph legend: fix legend when series are having the same alias 2018-10-22 17:12:18 +03:00
Erik Sundell
5b04a8b6c2 stackdriver: remove not used query file 2018-10-22 16:11:17 +02:00
Erik Sundell
1a329e4e47 stackdriver: remove test datasource query. use ensuredefaultproject instead 2018-10-22 16:11:17 +02:00
Erik Sundell
b02a8127ff stackdriver: remove debug comments 2018-10-22 16:11:17 +02:00
Erik Sundell
a56c5841e9 stackdriver: improve error handling in the datasource 2018-10-22 16:11:17 +02:00
Erik Sundell
afe0b4b8db stackdriver: fix typo 2018-10-22 16:11:17 +02:00
Erik Sundell
b2c6c743ce stackdriver: add debug logging 2018-10-22 16:11:17 +02:00
Erik Sundell
3999578300 stackdriver: fix broken braces 2018-10-22 16:11:17 +02:00
Erik Sundell
277cae2d85 stackdriver: fix broken condition after rebase 2018-10-22 16:11:17 +02:00
Erik Sundell
3935f9d24c stackdriver: use constant instead of variable 2018-10-22 16:11:17 +02:00
Erik Sundell
569fe2327e stackdriver: remove debug log 2018-10-22 16:11:17 +02:00
Erik Sundell
fa1d225743 stackdriver: fix failing test 2018-10-22 16:11:17 +02:00
Erik Sundell
8b4fff8b87 stackdriver: use gce variable 2018-10-22 16:11:17 +02:00
Erik Sundell
4a51d05477 stackdriver: add variable for gce authentication type 2018-10-22 16:11:17 +02:00
Erik Sundell
b9cb4649bb stackdriver: get default project from backend. also ensure default project could be retrieved when authentication type is gce 2018-10-22 16:11:17 +02:00
Erik Sundell
09fb1760a1 stackdriver: only load default project from backend if it's not available on the target. this might happen when using gce authentication and provisioning 2018-10-22 16:08:11 +02:00
Erik Sundell
835f1d788e stackdriver: display error message if project name is not present in jwt file 2018-10-22 16:03:14 +02:00
Erik Sundell
9fb1d3a9a6 stackdriver: only load project name if it's not already stored in the ds info json 2018-10-22 16:03:14 +02:00
Erik Sundell
cd7b454e25 stackdriver: add default value for authentication type 2018-10-22 16:03:14 +02:00
Erik Sundell
823838a839 stackdriver: wip - remove debug code 2018-10-22 16:03:14 +02:00
Erik Sundell
aa2e64e160 stackdriver: improve ui for toggling authentication type 2018-10-22 16:03:14 +02:00
Erik Sundell
0b82fda49c stackdriver: only get default token from metadata server when applying route 2018-10-22 16:03:14 +02:00
Erik Sundell
2b1709b875 stackdriver: only get default token from metadata server when applying route 2018-10-22 16:03:13 +02:00
Erik Sundell
dd9e9ed419 stackdriver: make backend query a pure test datasource function 2018-10-22 16:03:13 +02:00
Erik Sundell
9c7022be86 stackdriver: add status code 2018-10-22 16:03:13 +02:00
Erik Sundell
412a1f6d99 stackdriver: wip - return metric descriptors in the format of tablew 2018-10-22 16:03:13 +02:00
Erik Sundell
ff5f281508 stackdriver: wip - get metric descriptors in the backend 2018-10-22 16:03:13 +02:00
Erik Sundell
60617d0bf7 stackdriver: wip - add logic for retrieving token from gce metadata server in the auth provider 2018-10-22 16:03:13 +02:00
Erik Sundell
77e4c4249d stackdriver: wip - add very basic checkbox for gce auto authentication 2018-10-22 16:03:13 +02:00
Erik Sundell
102f531c1e stackdriver: break out project name resolving into its own function in the stackdriver.go file 2018-10-22 16:03:12 +02:00
Erik Sundell
3f9ed2efaa stackdriver: wip - temp remove jwt token auth 2018-10-22 16:03:12 +02:00
Erik Sundell
b2de0d8c3e stackdriver: wip - always use gce default account for stackdriver 2018-10-22 16:03:12 +02:00
Erik Sundell
2002162073 stackdriver: wip - add scope and remove debug code 2018-10-22 16:03:12 +02:00
Erik Sundell
df215d9d09 stackdriver: WIP - test retrieving project id from gce metadata 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
fbe0ffd10b skip jwt token auth if privateKey is empty 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
43aa6603a3 fetch token from GCE metadata server 2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
022a45becd Revert "for development"
This reverts commit cf2f110e42bb0ca041be7bb0ebf549bf565c51bc.
2018-10-22 16:03:12 +02:00
Mitsuhiro Tanda
5b53c0497a for development 2018-10-22 16:03:11 +02:00
Alexander Zobnin
011d7ffa70 graph legend: fix quotes displaying
React already escapes all strings, so it's no need to pass escaped alias
2018-10-22 16:46:13 +03:00
Alexander Zobnin
36354856f9 graph legend: minor refactor 2018-10-22 15:59:08 +03:00
Peter Holmberg
c92813f313 Merge branch 'master' into data-source-settings-to-react 2018-10-22 14:49:41 +02:00
Leonard Gram
6c473d33f4 Enterprise crosscompilation (#13783)
* build: crosscompilation and release of enterprise.
2018-10-22 14:33:19 +02:00
Peter Holmberg
b7d821b524 component working 2018-10-22 14:22:40 +02:00
Alexander Zobnin
302158fb2b graph legend: fix rendering after legend changes 2018-10-22 15:02:06 +03:00
Alexander Zobnin
4b9462993e graph legend: refactor, fix another review issues 2018-10-22 14:17:46 +03:00
Torkel Ödegaard
16a2b207cc fix: DataPanel isFirstLoad state fix 2018-10-22 09:54:43 +02:00
Michael Huynh
3bb0b0a551 Fix click-based selection of typeahead suggestion
In short, the underlying problem appears to be the `onChange()` handler
being triggered after handling the blur event. Since the contents have
not actually changed this forces the typeahead state to reset which
undesirably puts a stop to propagating the selected suggestion back up
to get set.

Related: #13604
2018-10-21 12:51:21 +08:00
Emil Hessman
30baaa48fe ux: remove duplicate placeholder attribute 2018-10-20 15:08:38 +02:00
Dave Waters
4b524fafa5 initial work to add shortcut to toggle legend - generic 2018-10-19 16:33:23 -04:00
Mario Trangoni
9108966fcb scripts/build/publish.go: Fix warning on err variable.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
scripts/build/publish.go:126:48⚠️ argument err is overwritten before first use (SA4009) (megacheck)
2018-10-19 19:49:04 +02:00
Mario Trangoni
68507e8855 pkg/services/alerting/reader.go: Fix should use for range instead of for { select {} }.
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/services/alerting/reader.go:37:2⚠️ should use for range instead of for { select {} } (S1000) (megacheck)
2018-10-19 19:49:04 +02:00
Mario Trangoni
e673337cb9 pkg/middleware/middleware.go: Fix empty branch warning.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/middleware/middleware.go:46:3⚠️ empty branch (SA9003) (megacheck)
2018-10-19 19:49:04 +02:00
Mario Trangoni
abb6b135a3 pkg/plugins/plugins.go: remove ineffective break statement.
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/plugins/plugins.go:124:4⚠️ ineffective break statement. Did you mean to break out of the outer loop? (SA4011) (megacheck)
2018-10-19 19:49:04 +02:00
Sven Klemm
7c8b4915c1 fix order for mysql, remove postgres specific code 2018-10-19 18:23:03 +02:00
Marcus Efraimsson
8be4490e75 Merge pull request #13760 from grafana/stackdriver-provisioning-documentation
Add defaultProject to Stackdriver provisioning documentation
2018-10-19 15:55:11 +02:00
Peter Holmberg
5f515bb3fc using react component 2018-10-19 15:33:16 +02:00
David Kaltschmidt
374fe9dcb4 Explore: reuse table merge from table panel
- Extracted table panel's merge logic to combine multiple tables into one
- Put the merge logic into the table model as it merges multiple table
  models
- make use of merge in Explore's table query response handler
- copied tests over to table model spec, kept essential tests in
  transformer spec
2018-10-19 15:29:58 +02:00
Alexander Zobnin
daa95c2375 graph legend: refactor, move behaviour logic into component 2018-10-19 16:20:00 +03:00
Erik Sundell
93a9885d67 stackdriver: add default project to provisioning documentation 2018-10-19 15:15:45 +02:00
Sven Klemm
8ce7e113d9 adjust meta data queries for mysql 2018-10-19 15:07:38 +02:00
Sven Klemm
aae21a631e fix references to postgres datatypes 2018-10-19 14:52:25 +02:00
Alexander Zobnin
44ed188c84 graph legend: review fixes 2018-10-19 14:32:37 +03:00
Marcus Efraimsson
eabb04cec2 changelog: add notes about closing #13667
[skip ci]
2018-10-19 13:27:21 +02:00
Torkel Ödegaard
4f4bba7f8c Merge pull request #13578 from grafana/react-panels-step1
WIP: React panels step1
2018-10-19 12:59:09 +02:00
Marcus Efraimsson
4e6d59d4f4 changelog: add notes about closing #13718
[skip ci]
2018-10-19 11:39:18 +02:00
Torkel Ödegaard
5b8178cdae fixed gofmt issue after go update 2018-10-19 11:32:36 +02:00
Yuan Liu
68c460a957 fix cannot receive dingding alert bug 2018-10-19 17:17:38 +08:00
Torkel Ödegaard
b95d64e7a0 fix: fixed variable srv tests 2018-10-19 11:14:02 +02:00
Marcus Efraimsson
b124ba9a83 Merge pull request #13726 from mtanda/cw_unit_override
Allow unit overwrite if cloudwatch/stackdriver datasource response doesn't include unit
2018-10-19 11:02:42 +02:00
Erik Sundell
b2932058c7 stackdriver: only add unit to resonse obj if it has a value 2018-10-19 10:42:57 +02:00
Sven Klemm
215ca50cc1 make interpolateVariable arrow function 2018-10-19 10:19:33 +02:00
Torkel Ödegaard
936fe56080 fix: another set of fixes for refresh 2018-10-19 10:05:48 +02:00
Torkel Ödegaard
11f66bb909 fixed issue with template refresh 2018-10-19 09:43:54 +02:00
Torkel Ödegaard
dddbe62d6c Merge branch 'master' into react-panels-step1 2018-10-19 09:15:37 +02:00
Sven Klemm
c4452ba335 Fix tslint errors 2018-10-18 20:01:40 +02:00
Sven Klemm
5d8826d034 Merge remote-tracking branch 'upstream/master' into mysql_query_builder 2018-10-18 19:28:52 +02:00
Torkel Ödegaard
5bd11744dd Merge pull request #13670 from svenklemm/metrics-segment-xss
Escape values in metric segment and sql part
2018-10-18 17:24:47 +02:00
Erik Sundell
0f0763b6b8 stackdriver: fix failing tests 2018-10-18 16:45:46 +02:00
Erik Sundell
d1740f090a stackdriver: make sure unit is not returned to the panel if mapping from stackdriver unit to grafana unit can't be made 2018-10-18 16:42:08 +02:00
Sven Klemm
2803cdca40 Fix variable highlighting 2018-10-18 15:04:54 +02:00
David Kaltschmidt
34ef5e77b7 Fixed yarn.lock (previous merge took out integrity) 2018-10-18 14:51:26 +02:00
Marcus Efraimsson
9f2bdea99d changelog: add notes about closing #13710
[skip ci]
2018-10-18 14:50:00 +02:00
Torkel Ödegaard
5c95a01229 Merge branch 'master' of github.com:grafana/grafana 2018-10-18 14:38:43 +02:00
Torkel Ödegaard
10d706dccf wip: enterprise docs 2018-10-18 14:34:25 +02:00
Torkel Ödegaard
0f592679f9 Merge pull request #13742 from Cdiscount/feature/fix_ldap_server_admin
fix LDAP Grafana admin logic
2018-10-18 14:15:47 +02:00
Mitsuhiro Tanda
4687ce2f7b allow unit override if cloudwatch response unit is none 2018-10-18 20:51:46 +09:00
Mitsuhiro Tanda
e465b2d53a Revert "don't overwrite unit if user set"
This reverts commit 9dd33b79e037fc75ddc5f3a6b294edba99e99b94.
2018-10-18 20:51:46 +09:00
Mitsuhiro Tanda
287ba77abf don't overwrite unit if user set 2018-10-18 20:51:46 +09:00
Marcus Efraimsson
d3c28a814a changelog: add notes about closing #13674
[skip ci]
2018-10-18 13:45:50 +02:00
Marcus Efraimsson
77f23018a5 Merge pull request #13684 from mtanda/cw_concurrent_map
fix concurrent map writes
2018-10-18 13:41:39 +02:00
Torkel Ödegaard
0b490912bd Merge pull request #13716 from grafana/davkal/13613-fix-split-layout
Explore: fix render issues in split view
2018-10-18 13:00:23 +02:00
David
bf1a0585ed Merge pull request #13712 from grafana/davkal/explore-react-table
Explore: Use react-table as table component
2018-10-18 12:44:56 +02:00
Adrien Fillon
781e66ba3c fix LDAP Grafana admin logic
Co-authored-by: Adrien Fillon <adrien.fillon@cdiscount.com>
Co-authored-by: Remi Buisson <remi.buisson@cdiscount.com>
2018-10-18 12:36:48 +02:00
Alexander Zobnin
5f712ab529 graph legend: remove unused code 2018-10-18 12:31:06 +03:00
Alexander Zobnin
fe0c5c73dd graph legend: refactor 2018-10-18 12:30:34 +03:00
Leonard Gram
287d0e8333 docs: cleanup of how to build for docker.
[skip ci]
2018-10-18 11:10:39 +02:00
David Kaltschmidt
9e647590ac Review feedback, increased height 2018-10-18 10:42:25 +02:00
Marcus Efraimsson
367a2af1c2 changelog: add notes about closing #12342
[skip ci]
2018-10-18 09:50:21 +02:00
Marcus Efraimsson
a776120bee update changelog
[skip ci]
2018-10-18 09:47:18 +02:00
Marcus Efraimsson
1d0dee189c Merge pull request #13705 from Yukinoshita-Yukino/master
Add socket support for mysql data source
2018-10-18 09:45:50 +02:00
Peter Holmberg
ab2be340f7 remove not used file 2018-10-18 09:34:51 +02:00
Peter Holmberg
02769b6d3c Merge branch 'master' into datasource-dashboards-to-react 2018-10-18 08:34:31 +02:00
Yuan Liu
f640df7a2c simplify code 2018-10-18 01:45:14 +08:00
David Kaltschmidt
a1410b54a5 Explore: fix render issues in split view
- avoid line wrap in row tools (add/remove/clear)
- avoid text overflow in query field
2018-10-17 17:59:03 +02:00
David
1d60c45a04 Merge pull request #13663 from miqh/fix/label-value-suggestions
Fix typeahead behaviour for QueryField
2018-10-17 16:56:02 +02:00
Marcus Efraimsson
da89c27caf Merge pull request #13702 from grafana/data-source-instance-to-react
Support Data source permissions
2018-10-17 16:54:57 +02:00
Leonard Gram
675bf00727 A list of where to make changes when upgrading Go and Node.js (#13693) 2018-10-17 16:39:03 +02:00
Peter Holmberg
84bbfe11ca tests 2018-10-17 16:14:45 +02:00
Michael Huynh
22e0ff8b9c Update PromQueryField tests to address fixed bug
Related: #13484
2018-10-17 22:09:21 +08:00
Michael Huynh
a8c5ab76b3 Fix typeahead behaviour for QueryField
These changes were originally intended to address a bug whereby a
suggestion for an already selected label value continues to appear.
However, they also appear to fix several other problems in the area:

- Wrong suggestions when using negated label matching operators
- Misaligned label value suggestion replacements

Related: #13484
2018-10-17 22:09:03 +08:00
Leonard Gram
3245227016 permissions: cleanup. 2018-10-17 15:58:52 +02:00
Peter Holmberg
c2c3e15022 hooked up actions 2018-10-17 15:56:34 +02:00
David Kaltschmidt
ff67213b42 Explore: Use react-table as table component
- adds react-table as dependency
- replaces custom table component in Explore
- vendors react-table styles and overrides them (currently in
  explore.scss)
2018-10-17 14:58:04 +02:00
Peter Holmberg
f25a843a2c created view 2018-10-17 14:36:18 +02:00
Leonard Gram
cd96ef3590 docs: installing custom plugins in docker.
[skip ci]
2018-10-17 14:34:40 +02:00
Nick Triller
6d0d07a55b Document oauth_auto_login setting 2018-10-17 13:49:43 +02:00
Marcus Efraimsson
b036678c89 changelog: add notes about closing #13692
[skip ci]
2018-10-17 13:46:41 +02:00
Marcus Efraimsson
cf93b1e700 Merge pull request #13708 from svenklemm/interpolateVariable
postgres: fix template variables error
2018-10-17 13:42:47 +02:00
Marcus Efraimsson
7b656097a7 postgres: use arrow function declaration of interpolateVariable 2018-10-17 13:30:07 +02:00
Sven Klemm
ec0fd96f08 Use closure for calling interpolateVariable 2018-10-17 12:30:07 +02:00
Marcus Efraimsson
6a89874290 changelog: add notes about closing #12308
[skip ci]
2018-10-17 12:01:27 +02:00
Marcus Efraimsson
62f21a254a Merge pull request #12337 from mtanda/cw_regions
show all CloudWatch regions (avoid hard coding)
2018-10-17 11:55:43 +02:00
Yuan Liu
36dbc5f51c Add socket support for mysql data source 2018-10-17 17:45:06 +08:00
Yuan Liu
76fc48e2eb Merge pull request #1 from grafana/master
Syncing
2018-10-17 17:14:13 +08:00
bergquist
2afec0e7fb changelog: adds note about closing #12330 and #6696
[skip ci]
2018-10-17 11:12:39 +02:00
Peter Holmberg
314fffeae1 Merge branch 'data-source-instance-to-react' into datasource-dashboards-to-react 2018-10-17 11:12:13 +02:00
Carl Bergquist
94e2d2b483 Merge pull request #13680 from davewat/add-notification-channel-option-to-disable-resolved-alert
Add channel option to disable the resolved alert (OK Message)
2018-10-17 11:08:39 +02:00
Peter Holmberg
b7b0ce0107 remove addpermissions component 2018-10-17 11:07:17 +02:00
Torkel Ödegaard
29f1c9259a Merge pull request #13352 from amuraru/patch-2
Updated phantomjs render script to take full height screenshots
2018-10-17 11:00:44 +02:00
Marcus Efraimsson
52f398e7f7 cloudwatch: return a distinct list of regions 2018-10-17 10:58:06 +02:00
Marcus Efraimsson
518e485e36 docs: update cloudwatch iam policy description 2018-10-17 10:52:46 +02:00
Peter Holmberg
34c0bed922 Merge pull request #13700 from grafana/permissions-code-to-enterprise
Permissions code to enterprise
2018-10-17 10:46:53 +02:00
bergquist
70385119bc removes d in disableResolvedMessage 2018-10-17 10:41:18 +02:00
Peter Holmberg
dd2fb7961f removed snaps 2018-10-17 10:37:56 +02:00
Peter Holmberg
776f9aa288 Merge remote-tracking branch 'origin/data-source-instance-to-react' into permissions-code-to-enterprise 2018-10-17 10:00:18 +02:00
bergquist
5566a61aef alerting: tests default value for disable resolve message 2018-10-17 09:53:03 +02:00
Marcus Efraimsson
176c857900 Merge pull request #13696 from Yukinoshita-Yukino/patch-1
Update doc due to Dingtalk client layout change
2018-10-17 09:37:08 +02:00
Mitsuhiro Tanda
c64a5a6e0e re-add hard coded region list 2018-10-17 14:02:02 +09:00
Yuan Liu
7946a405f5 update doc due to client layout change 2018-10-17 10:24:05 +08:00
Dave Waters
a3137e731d clean up tests 2018-10-16 20:39:07 -04:00
Dave Waters
e9b8051724 Merge branch 'master' of http://github.com/grafana/grafana into add-notification-channel-option-to-disable-resolved-alert 2018-10-16 17:43:26 -04:00
Dave Waters
0eae7b077d fix gofmt, add test, correct noted concerns with default value 2018-10-16 17:38:59 -04:00
Dave Waters
c4dcf5a4ee fix gofmt, add test, correct noted concerns with default value 2018-10-16 17:33:38 -04:00
Marcus Efraimsson
03b8bcc43f changelog: add notes about closing #13629
[skip ci]
2018-10-16 19:22:22 +02:00
Marcus Efraimsson
3612a1c00e Merge pull request #13678 from ramiro/add-encrypt-mssql-ds-option
Add encrypt setting to MSSQL data source.
2018-10-16 19:07:00 +02:00
Ramiro Morales
49a3bd3097 add encrypt connstr param conditionally on the value chosen via GUI. 2018-10-16 13:14:22 -03:00
Alexander Zobnin
46ec15a11e graph legend: add color picker (react) 2018-10-16 16:50:43 +03:00
Peter Holmberg
66311a065c removing datasource permissions states from grafana 2018-10-16 15:36:33 +02:00
Marcus Efraimsson
a825f42aaf update latest.json to latest stable version
[skip ci]
2018-10-16 15:00:28 +02:00
Marcus Efraimsson
c9db7f7cfa update changelog
[skip ci]
2018-10-16 14:59:17 +02:00
Leonard Gram
f1ab0ea491 build: Upgraded nodejs to 8 on appveyor 2018-10-16 14:32:25 +02:00
Leonard Gram
1329c70965 codestyle 2018-10-16 14:22:50 +02:00
Dave Waters
18c73631ea rename UI Option, align with control, update tests 2018-10-16 07:12:32 -04:00
Alexander Zobnin
5a2e399d2d Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-10-16 13:49:13 +03:00
Peter Holmberg
ee0cc9bd77 Merge branch 'master' into data-source-instance-to-react 2018-10-16 12:14:11 +02:00
Peter Holmberg
ef0def2277 Merge branch 'master' into permissions-code-to-enterprise 2018-10-16 11:09:58 +02:00
Peter Holmberg
8ef705f2b5 pausing for now 2018-10-16 09:59:03 +02:00
Torkel Ödegaard
c1399a0404 Merge pull request #13686 from grafana/logo-alt-text
Logo alt text + unwanted char
2018-10-16 09:58:35 +02:00
Johannes Schill
2a82b57d93 Remove unwanted char 2018-10-16 08:11:26 +02:00
Johannes Schill
6d3f037ef1 Fix incorrect alt text on logo 2018-10-16 07:50:44 +02:00
Mitsuhiro Tanda
fce50cf1b8 return default region list from backend 2018-10-16 12:20:39 +09:00
Mitsuhiro Tanda
a417d6fa21 don't merge hard coded region list 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda
61e2710961 add error message 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda
6564abd5f3 get regions from after datasource save 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda
f6cb01d38a show all CloudWatch regions 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda
2b20402d7d get region list from ec2:DescribeRegions 2018-10-16 12:03:33 +09:00
Mitsuhiro Tanda
48aef0c50e fix concurrent map writes 2018-10-16 11:45:58 +09:00
Ramiro Morales
cf6faabd12 update, don't remove 'Known Issues' docs section. 2018-10-15 21:51:21 -03:00
Ramiro Morales
6a8d1c4546 update provisioning docs. 2018-10-15 21:46:26 -03:00
Ramiro Morales
90de703ef2 fix new setting default value handling. 2018-10-15 21:41:00 -03:00
Ramiro Morales
d859a6aeb8 rename new JSON data attrbute. 2018-10-15 20:34:03 -03:00
Marcus Efraimsson
f4b7b003be changelog: add notes about closing #13464
[skip ci]
2018-10-16 01:08:37 +02:00
Marcus Efraimsson
baa3985478 changelog: add notes about closing #13553
[skip ci]
2018-10-16 01:05:45 +02:00
Marcus Efraimsson
e86027e3d3 update changelog
[skip ci]
2018-10-16 01:03:20 +02:00
Carl Bergquist
efe9d27820 Merge pull request #13683 from eripe970/patch-2
Small readme update, link to license
2018-10-15 23:59:56 +02:00
Carl Bergquist
795a24d027 Merge pull request #13681 from eripe970/patch-1
Small fixes to documentation
2018-10-15 23:59:27 +02:00
Erik Pettersson
85597862f3 doc(documentation) license
Link to the grafana license file from the docs.
2018-10-15 23:42:49 +02:00
Erik Pettersson
25b68809b0 doc(documenation)
Use same name for Elasticsearch. The docs contained a mix of Elastic and Elasticsearch.
2018-10-15 23:35:47 +02:00
Dave Waters
6376154b16 add channel option to disable the resolved alert (OK Message) that is sent when condition returns to normal. 2018-10-15 17:16:14 -04:00
Torkel Ödegaard
ae7a1bc139 Can render graph 2018-10-15 21:52:24 +02:00
Ramiro Morales
37f16ca80a Add 'encrypt' setting to MSSQL data source.
Fixes #13629
2018-10-15 14:47:54 -03:00
Torkel Ödegaard
938541be2e Merge pull request #13660 from grafana/alerting-validation-messages
Alerting: Propagate alert validation issues to the api/user
2018-10-15 18:16:29 +02:00
Marcus Efraimsson
709458501e Merge pull request #13675 from ankon/patch-1
Fix grammar in log message
2018-10-15 17:27:02 +02:00
Peter Holmberg
7c3d101253 rendering settings 2018-10-15 16:45:39 +02:00
Leonard Gram
6fd3430677 build: makes sure publisher.sh is available when deploying. 2018-10-15 14:54:21 +02:00
Andreas Kohn
272274220c Fix grammar in log message 2018-10-15 14:37:12 +02:00
Marcus Efraimsson
bac937f079 changelog: add notes about closing #13641 #13650
[skip ci]
2018-10-15 14:28:47 +02:00
Sven Klemm
20c1a58488 Escape typeahead values in query_part 2018-10-15 14:05:07 +02:00
Sven Klemm
3a25a0de83 Escape values in metric segment and sql part 2018-10-15 13:53:37 +02:00
Marcus Efraimsson
e830352d38 changelog: add notes about closing #13628
[skip ci]
2018-10-15 11:46:12 +02:00
Marcus Efraimsson
9f85a7494a Merge pull request #13651 from grafana/13628_fix_dag
Make sure to add all variable nodes to directed acyclic graph (dag) before linking variables
2018-10-15 11:42:59 +02:00
Marcus Efraimsson
d9b73418f1 update .bra.toml for using latest bra version 2018-10-15 11:03:24 +02:00
Carl Bergquist
3f6f98a532 Merge pull request #13661 from mjtrangoni/remove-os-kill
Remove os.Kill as it cannot be trapped
2018-10-15 08:47:26 +02:00
Torkel Ödegaard
a28c25a2e0 progress on react time series infra 2018-10-15 08:22:20 +02:00
Torkel Ödegaard
9adad76f52 wip: began first steps for a react graph component 2018-10-14 22:24:18 +02:00
Torkel Ödegaard
2fb721d3c6 various fixes to to queries tab (in react mode) 2018-10-14 21:14:11 +02:00
Torkel Ödegaard
8e85295b2b react panels query processing 2018-10-14 18:19:49 +02:00
Torkel Ödegaard
543c67a297 react panels: got data 2018-10-14 16:31:20 +02:00
Torkel Ödegaard
cd4619dad1 working on react data / query exectution 2018-10-14 15:39:34 +02:00
Torkel Ödegaard
2e1d45a875 changed DataPanel from HOC to use render props 2018-10-14 12:41:09 +02:00
Torkel Ödegaard
0662b5f962 fixing unit tests 2018-10-14 11:13:04 +02:00
Torkel Ödegaard
631af46c48 Merge branch 'master' into react-panels-step1 2018-10-14 10:44:38 +02:00
Torkel Ödegaard
a029492d91 Merge pull request #13355 from jsferrei/jsferrei/fix-annotation-render-issue
Fix graph render blocked by annotations issue
2018-10-14 10:35:16 +02:00
Torkel Ödegaard
5e9ef5f699 Merge pull request #13664 from steaksauce-/master
Removed reference to plugin_api.md (SDK Readme)
2018-10-14 10:23:46 +02:00
Torkel Ödegaard
3de439ddca Update CHANGELOG.md 2018-10-14 10:23:15 +02:00
Torkel Ödegaard
40e3758698 Merge pull request #13662 from franciscocpg/adding-time-clock
Adding time clock
2018-10-14 10:19:39 +02:00
Torkel Ödegaard
37548792f5 Merge pull request #13659 from grafana/graph-time-format-fix
fix for graph time formating for Last 24h ranges
2018-10-14 10:16:37 +02:00
steaksauce-
77856d090b Removed reference to plugin_api.md (SDK Readme) on the development page as the file that it points to no longer exists. This addresses an open issue on the grafana.org repo 2018-10-13 22:16:47 -05:00
Francisco Guimarães
b4bca473db Adding tests 2018-10-13 09:32:21 -03:00
Francisco Guimarães
3db5d14214 Adding time clockms and clocks 2018-10-13 09:03:16 -03:00
Mario Trangoni
6218fadf21 pkg/cmd/grafana-server/main.go: remove os.Kill as it cannot be trapped
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/cmd/grafana-server/main.go:103:42⚠️ os.Kill cannot be trapped (did you mean syscall.SIGTERM?) (SA1016) (megacheck)
2018-10-13 11:02:36 +02:00
Torkel Ödegaard
ba67dc7689 changed to plain errors further down the alerting validation model so error did not get double wrapping in ValidationError 2018-10-12 23:15:23 -07:00
Torkel Ödegaard
ec4698fb96 alerting: propagate alert validation issues to the user instead of just 'invalid alert data' message 2018-10-12 23:03:54 -07:00
Torkel Ödegaard
d17025fb43 Merge pull request #13631 from mjtrangoni/fix-megacheck-issues
Fix trivial megacheck issues
2018-10-13 06:56:29 +02:00
Torkel Ödegaard
7051a150cf updated gitignore 2018-10-12 21:55:45 -07:00
Torkel Ödegaard
193829adac Merge pull request #13656 from olshansky/fix-label-values-regex
fix: label values regex for single letter labels
2018-10-13 06:53:33 +02:00
Torkel Ödegaard
8452bbceb3 Merge pull request #13657 from i-ky/patch-1
Typos in plugin development documentation
2018-10-13 06:53:00 +02:00
Torkel Ödegaard
551e0843fa fix for graph time formating for Last 24h ranges, fixes #13650 2018-10-12 21:51:21 -07:00
Mario Trangoni
74533a7a19 pkg/services/sqlstore/user_auth_test.go: comment unused users slice
See,
$ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./...
pkg/services/sqlstore/user_auth_test.go:28:18⚠️ this result of append is never used, except maybe in other appends (SA4010) (megacheck)
2018-10-13 02:35:03 +02:00
i-ky
e950fa7983 fixed a typo 2018-10-13 01:15:16 +03:00
i-ky
7acea2a109 fixed a typo 2018-10-13 00:45:05 +03:00
olshansky
91e201ffa8 fix: label values regex for single letter labels
Closes: #13641
2018-10-12 23:13:11 +03:00
Peter Holmberg
e642fce4a5 created component for http settings 2018-10-12 16:16:06 +02:00
Torkel Ödegaard
4fefb2039d Merge pull request #13649 from grafana/update-jest-23-10
updated jest to 23.10
2018-10-12 15:16:12 +02:00
Leonard Gram
97a3a4f33a removes debug log. 2018-10-12 15:13:55 +02:00
Marcus Efraimsson
4b1a2d3b11 make sure to add all variable nodes to dag before linking variables 2018-10-12 14:15:44 +02:00
Daniel Lee
23d38ffc8d changelog: adds note for #13607 2018-10-12 14:00:52 +02:00
Torkel Ödegaard
e78c1b4abc Merge pull request #13644 from grafana/backend-hooks-service
Adds backend hooks service so extensions can modify index data
2018-10-12 13:47:40 +02:00
Torkel Ödegaard
50083da29c updated jest to 23.10 2018-10-12 13:46:30 +02:00
Daniel Lee
09c9c2a57b Merge pull request #13624 from grafana/filter-option-fix
Stackdriver: Prevent filter from crashing
2018-10-12 13:36:41 +02:00
Torkel Ödegaard
8ba865bf57 Merge branch 'master' into react-panels-step1 2018-10-12 13:31:20 +02:00
Torkel Ödegaard
ca6bfebb7b Update CHANGELOG.md 2018-10-12 11:40:19 +02:00
Torkel Ödegaard
8c9939df72 Adds backend hooks service so extensions can modify index data 2018-10-12 11:26:42 +02:00
Peter Holmberg
c5946ebd27 Merge branch 'data-source-instance-to-react' into data-source-settings-to-react 2018-10-12 09:20:43 +02:00
Torkel Ödegaard
b5e1a8d7be Merge pull request #13638 from grafana/minor-setting-refactoring
minor setting refactorings
2018-10-12 08:58:21 +02:00
Peter Holmberg
c9721bf8cc fix route issue 2018-10-12 08:54:37 +02:00
Torkel Ödegaard
d6292f8345 removed unused setting variable 2018-10-12 08:15:01 +02:00
Torkel Ödegaard
d5d8d7efa6 minor setting refactorings 2018-10-12 07:55:36 +02:00
Torkel Ödegaard
c1fd4265a9 renamed extension point in the frontend 2018-10-12 07:19:05 +02:00
Torkel Ödegaard
cdfbcbce22 updated circleci build-container version 2018-10-11 22:06:36 +02:00
Torkel Ödegaard
4aa7dc0c85 minor change to cloudwatch code formatting 2018-10-11 12:58:17 -07:00
Torkel Ödegaard
caf995bb94 Merge branch 'update-cloudwatch-extended-stats-check' of https://github.com/apalaniuk/grafana into apalaniuk-update-cloudwatch-extended-stats-check 2018-10-11 12:55:09 -07:00
Torkel Ödegaard
a69013c833 Merge pull request #13611 from grafana/remove-user-from-org-and-system
Remove user form org in single org setup improvement
2018-10-11 21:54:07 +02:00
Torkel Ödegaard
69e0311cbc Merge branch '13425-team-picker-bug' 2018-10-11 12:52:48 -07:00
Torkel Ödegaard
c368c72d40 minor ux fix for new select 2018-10-11 12:50:58 -07:00
Torkel Ödegaard
b49f4a8c86 Merge pull request #13632 from mrudelle/master
13340 complete oauth doc
2018-10-11 21:30:42 +02:00
Dan Cech
19b69a82af fmt 2018-10-11 15:26:06 -04:00
Matthieu Rudelle
3aef519cdc grafana/grafana#13340 complete oauth doc 2018-10-11 21:22:02 +02:00
Torkel Ödegaard
b671b9704f changed property name to UserWasDeleted and added an assert for it 2018-10-11 12:20:53 -07:00
Adam Palaniuk
58a156ba03 Update check for invalid percentile statistics 2018-10-11 14:00:34 -05:00
Mario Trangoni
9c44c75936 pkg/services/alerting/notifiers/telegram.go: check error before close.
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/services/alerting/notifiers/telegram.go:130:2⚠️ should check returned error before deferring imageFile.Close() (SA5001) (megacheck)
2018-10-11 19:51:54 +02:00
Mario Trangoni
18e127db2a pkg/tsdb/*: Fix do not pass a nil Context
See,
$ gometalinter --vendor --deadline 6m --disable-all --enable=megacheck ./...
pkg/tsdb/mssql/mssql_test.go:695:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:772:32⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:704:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-11 19:03:54 +02:00
Marcus Efraimsson
bcdda7b9ad devenv: fix influxdb block 2018-10-11 17:17:10 +02:00
Marcus Efraimsson
90f6817f6f docs: refer to v5.3 instead of v5.2 2018-10-11 16:36:28 +02:00
Marcus Efraimsson
ff5e4e2885 Merge pull request #13618 from grafana/stackdriver-docs-update
stackdriver docs: metric query editor and annotations
2018-10-11 16:25:23 +02:00
Peter Holmberg
6a35eda862 removed unsused function 2018-10-11 15:55:33 +02:00
Daniel Lee
03fefd7bea docs: stackdriver fixes after review
- index page datasource order changed
- image links changed to the image box format
- incorrect sentence fixed
2018-10-11 15:42:47 +02:00
Peter Holmberg
8ab2d8b0b9 fix mutability bug, removed unused constructor 2018-10-11 15:32:13 +02:00
Erik Sundell
c84cf1f598 stackdriver: check if array is empty to prevent filter from crashing. This closes #13607 2018-10-11 15:10:47 +02:00
Johannes Schill
7689e9bbf2 Handle DescriptionPicker's initial state #13425 2018-10-11 15:06:51 +02:00
Daniel Lee
9f660a7b18 stackdriver docs: metric query editor and annotations 2018-10-11 14:42:34 +02:00
Torkel Ödegaard
b7599212e0 Merge pull request #13620 from grafana/frontend-extensions
Frontend extensions
2018-10-11 14:41:11 +02:00
Johannes Schill
2787284033 Update snapshots after merge 2018-10-11 14:01:13 +02:00
Leonard Gram
d360d8cebc Requests for ds via backend blocked for users without permissions. 2018-10-11 13:52:23 +02:00
Leonard Gram
ec9ed5c830 Removes unused code. 2018-10-11 13:52:23 +02:00
Johannes Schill
dc9e822cc7 Remove CTA when CTA-action is clicked instead of a /new route #13471 2018-10-11 13:52:09 +02:00
Carlos Mondragon
b121700103 Add fancy delete button for ApiKeys. 2018-10-11 13:50:54 +02:00
Carlos Mondragon
5f5840b24c Add form to both the CTA page and the regular list. 2018-10-11 13:50:53 +02:00
Carlos Mondragon
0937335f14 Add onClick handler to CTA. 2018-10-11 13:50:53 +02:00
Carlos Mondragon
af985743d2 Updated tests for new protip. 2018-10-11 13:50:53 +02:00
Carlos Mondragon
081cb7a695 Updated protip, not sure what to write there. 2018-10-11 13:50:53 +02:00
Carlos Mondragon
f03fa364df Update tests for ApiKeys CTA screen. 2018-10-11 13:50:53 +02:00
Marcus Efraimsson
db1325cc24 changelog: add notes about closing #13616
[skip ci]
2018-10-11 13:49:50 +02:00
Carlos Mondragon
d2573a6bc8 Show CTA if there are no ApiKeys, otherwise show table. 2018-10-11 13:48:15 +02:00
Marcus Efraimsson
776b14f7bb Merge pull request #13617 from grafana/13616_phantomjs_legend
fix phantomjs render of graph panel when legend displayed as table to the right
2018-10-11 13:47:34 +02:00
Carlos Mondragon
0bf2d5ebcd Extract ApiKeyCount from state. 2018-10-11 13:31:52 +02:00
Torkel Ödegaard
795b0ca90f Merge pull request #13619 from grafana/13591/loading-indicators-config-pages
Adding loading spinner to org pages
2018-10-11 13:02:47 +02:00
Torkel Ödegaard
abef94b0da made it possible to have frontend code in symlinked folders that can add routes 2018-10-11 12:36:04 +02:00
Peter Holmberg
02e7d713a1 Added Loading state on org pages 2018-10-11 11:49:34 +02:00
Marcus Efraimsson
fc79ba30ae fix phantomjs render of graph panel when legend as table to the right 2018-10-11 11:46:07 +02:00
Marcus Efraimsson
026463f902 changelog: add notes about closing #13172
[skip ci]
2018-10-11 10:26:13 +02:00
Marcus Efraimsson
1b32ff5795 Merge pull request #13609 from Yukinoshita-Yukino/master
elasticsearch: fix no limit size in terms aggregation for alerting queries
2018-10-11 10:21:58 +02:00
Yuan Liu
18dfdc4f0d add test for es alert when group by has no limit 2018-10-11 16:04:57 +08:00
Torkel Ödegaard
5b46c08844 Merge remote-tracking branch 'origin/enterprise' into frontend-extensions 2018-10-11 09:41:57 +02:00
Torkel Ödegaard
f4a9817b94 poc: frontend extensions 2018-10-11 08:49:12 +02:00
Torkel Ödegaard
9585dc7825 added the UserWasRemoved flag to make api aware of what happened to return correct message to UI 2018-10-11 07:58:22 +02:00
Torkel Ödegaard
5b5cb6622d Remove user form org now completely removes the user from the system if the user is orphaned 2018-10-11 07:48:35 +02:00
Yuan Liu
f8a8b213f9 remove tab 2018-10-11 11:40:23 +08:00
Yuan Liu
567db87c3a bug fix
bug fix
2018-10-11 11:36:40 +08:00
Yuan Liu
3b9ab6e204 Update time_series_query.go
fix alert no data when elasticsearch group by terms size is set to no limit
2018-10-11 11:21:06 +08:00
Marcus Efraimsson
974eddee8f changelog: add notes about closing #11711
[skip ci]
2018-10-10 19:24:13 +02:00
Marcus Efraimsson
bc3b7357bd Merge pull request #13400 from connection-reset/concurrent-sql
Run queries for sql data sources for panels with multiple queries concurrently
Also make max open connections, max idle connections and max connection 
lifetime configurable in the data source settings
2018-10-10 19:12:38 +02:00
Dan Cech
a4f90fd10d add admin page to show enterprise license status 2018-10-10 13:04:54 -04:00
Marcus Efraimsson
4757ca2242 docs: add version notes 2018-10-10 18:59:09 +02:00
Torkel Ödegaard
39b25e0596 Merge pull request #13536 from grafana/davkal/explore-text-match
Explore: highlight typed text in suggestions
2018-10-10 18:50:14 +02:00
Peter Holmberg
3ca9c10fe4 Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-10 17:05:22 +02:00
Peter Holmberg
037e9ad0bd tests 2018-10-10 17:04:48 +02:00
Johannes Schill
a42227cdff Css fix for selected option 2018-10-10 16:21:08 +02:00
Leonard Gram
721dd532e4 User without permission to a datasource won't see it. 2018-10-10 15:55:16 +02:00
Johannes Schill
127b7d92f8 Merge branch '13425-team-picker-bug' of https://github.com/grafana/grafana into 13425-team-picker-bug 2018-10-10 15:05:04 +02:00
Johannes Schill
9a8a476776 Updated test snapshot #13425 2018-10-10 15:02:13 +02:00
Peter Holmberg
707446170d Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-10 14:58:18 +02:00
David Kaltschmidt
dcee0771ad Initialize Explore datasource correctly 2018-10-10 14:55:41 +02:00
Leonard Gram
ccfcf02e33 Refactors ds permissions to a filter. 2018-10-10 14:25:57 +02:00
Johannes Schill
501d974eaa Remove the fixed widths and make it possible to pass it in as a prop instead #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
77d06a0924 User filtering now works properly at the backend #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
779691a072 Removed old code #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
ffae3e7a58 Rename css class "gf-form-select2" to "gf-form-select-box" #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
9afcef985c Use new class names #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
e20fa1ba70 Fixes for the tag filtering in the search #13425 2018-10-10 14:15:28 +02:00
Johannes Schill
4d2be024f4 Start implementing the upgraded react-select in the tag filter box #13425 2018-10-10 14:15:28 +02:00
Marcus Efraimsson
c0b7ca3902 fix /api/org/users so that query and limit querystrings works 2018-10-10 14:15:28 +02:00
Johannes Schill
a94c1eaf4b Bump grafana/build-container to 1.2.0 2018-10-10 14:15:27 +02:00
Johannes Schill
314b8b8ed9 Revert "Lock down node version to see if we get rid of the circleci build issue"
This reverts commit 9080b2c4ff9cff9a1ca99c983051fb35a0789515.
2018-10-10 14:15:27 +02:00
Johannes Schill
a1853d782d Revert "Try to remove circleci cache to see if that solves the build issue"
This reverts commit f19fc935918721a29fe149fec8abfb78866b262f.
2018-10-10 14:15:27 +02:00
Johannes Schill
1f27f90cbe Try to remove circleci cache to see if that solves the build issue 2018-10-10 14:15:27 +02:00
Johannes Schill
a6fdbad2bb Generate yarn.lock from older yarn 2018-10-10 14:15:27 +02:00
Johannes Schill
c695bbfa25 Revert "Add node version output for debugging"
This reverts commit 16a931d535d02a2759e26c2ae3dc66454aa4fe89.
2018-10-10 14:15:27 +02:00
Johannes Schill
118c3b1746 Add node version output for debugging 2018-10-10 14:15:27 +02:00
Johannes Schill
878433bcfa Lock down node version to see if we get rid of the circleci build issue 2018-10-10 14:15:27 +02:00
Johannes Schill
8620804b9f Lock down webpack to 4.19.1 to avoid issue with webpack-cli (https://github.com/webpack/webpack/issues/8082) 2018-10-10 14:15:27 +02:00
Johannes Schill
67d77e6061 Bump react-select to 2.1.0 #13425 2018-10-10 14:15:27 +02:00
Johannes Schill
b28008cb5c Updated lockfile to get rid of build error #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
5c842f3ed3 Add frontend filtering of users in user picker #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
e5e7611547 Replace $white with a color working in both themes #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
f552a7a421 Replace System.import() with import() to get rid of warning 2018-10-10 14:15:26 +02:00
Johannes Schill
cc20b8de36 Clean up css for react-select v2 #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
be7ed3ebca Upgrade Datasources-picker on Explore page #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
52b329562d Enable trailing on the debounce in the TeamPicker (same as in UserPicker) #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
a29d80df4e Update typescript notifications #13425 2018-10-10 14:15:26 +02:00
Johannes Schill
2d65845bac Update (js-) tests and snapshots for react-select 2 #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
7e7c7fe64c Remove variables not used #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
087ff2fa74 wip: Remove code for old react-select component #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
d703b8062f wip: The pickers are stateful nowadays, no need to pass in the current value #13425 2018-10-10 14:15:25 +02:00
Johannes Schill
d9434ba1b1 wip: Upgrade react-select #13425 2018-10-10 14:15:25 +02:00
bergquist
cecf87571f set v5.3 as root docs 2018-10-10 14:00:51 +02:00
Daniel Lee
76ea12b5b0 Merge pull request #13403 from grafana/5.3-release-post
wip: whats new for 5.3
2018-10-10 13:58:32 +02:00
Peter Holmberg
8583788119 disable permissions 2018-10-10 13:50:42 +02:00
Daniel Lee
0a64f0bdc7 whatsnew: adds image for Stackdriver
Plus a few tweaks to the text
2018-10-10 13:46:10 +02:00
Daniel Lee
8b5d03096d Merge pull request #13587 from grafana/nikoalch-patch-4
Update mac.md
2018-10-10 13:35:19 +02:00
Peter Holmberg
83480a1de6 fixing weird arrow in select 2018-10-10 13:28:48 +02:00
bergquist
62d23e3f8d update latest.json to 5.3.0 2018-10-10 13:20:06 +02:00
bergquist
37032a435d changelog: set date for 5.3.0 release 2018-10-10 13:06:29 +02:00
Daniel Lee
7bbd303c23 Merge pull request #13586 from grafana/nikoalch-patch-3
Update windows.md
2018-10-10 11:54:52 +02:00
Daniel Lee
7c2efbac0d Merge pull request #13585 from grafana/nikoalch-patch-2
Update rpm.md
2018-10-10 11:54:20 +02:00
Peter Holmberg
f150f35112 fixing permission rows 2018-10-10 11:22:08 +02:00
Marcus Efraimsson
baa91ce471 changelog: add notes about closing #13575
[skip ci]
2018-10-10 10:52:43 +02:00
Peter Holmberg
8ed5594dbc enable permissions for data source 2018-10-10 10:39:48 +02:00
Erik Sundell
ae44a6b6e9 Use correct naming convention 2018-10-10 10:39:10 +02:00
Erik Sundell
840a6e45da Fix typo 2018-10-10 10:02:13 +02:00
Erik Sundell
939be51496 Provide more information about what's included in the Stackdriver plugin 2018-10-10 09:57:43 +02:00
Marcus Efraimsson
6eb4633dfe changelog: add notes about closing #13575
[skip ci]
2018-10-10 09:54:49 +02:00
Marcus Efraimsson
5f69854e2a Merge pull request #13571 from mtanda/cw_unit
cloudwatch: automatically set graph yaxis unit 

fixes #13575
2018-10-10 09:52:10 +02:00
Marcus Efraimsson
0612ce9b75 cloudwatch: return early if execute query returns error
This will stop a segfault from happening
2018-10-10 09:38:42 +02:00
Torkel Ödegaard
ee1d4ce0e2 fix tab switching 2018-10-10 09:26:17 +02:00
Torkel Ödegaard
b91c410134 Merge pull request #13568 from praveensastry/render-drag-handle-only-edit-mode
Render Dashboard Row drag handle only in edit mode
2018-10-10 09:01:45 +02:00
Daniel Lee
aff752e7f0 Merge pull request #13583 from mtanda/cw_fix_id_validation
fix CloudWatch id validation
2018-10-10 08:44:06 +02:00
Daniel Lee
bbd5e19a34 Merge pull request #13584 from grafana/nikoalch-patch-1
Update debian.md
2018-10-10 08:34:33 +02:00
Mitsuhiro Tanda
f0fb8123ae add test for automatically unit set 2018-10-10 14:07:08 +09:00
Mitsuhiro Tanda
37e749f6da fix crach bug 2018-10-10 13:56:58 +09:00
Mitsuhiro Tanda
6e32c9bb3f fix id validation 2018-10-10 12:19:57 +09:00
praveensastry
1093f9da7e refactoring after review comments 2018-10-10 09:57:37 +11:00
Daniel Lee
d50ed30c15 changelog: adds note for #13559 2018-10-09 21:01:16 +02:00
Daniel Lee
a1d4675169 Merge pull request #13490 from mtanda/stackdriver_distribution
Stackdriver heatmap support. Fixes #13559
2018-10-09 20:57:21 +02:00
Torkel Ödegaard
565edc1ed3 added setting top hide plugins in alpha state 2018-10-09 17:47:43 +02:00
Torkel Ödegaard
d2bdf8cff1 wip: fixed issues now things are starting to work as before for angular panels 2018-10-09 17:07:13 +02:00
Peter Holmberg
363592a97b pausing permissions list 2018-10-09 16:53:59 +02:00
Jon Ferreira
be64af168b Block graph queries from being queued until annotation datasource promises resolve 2018-10-09 10:27:26 -04:00
Peter Holmberg
a810bed2f5 Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-09 16:06:04 +02:00
Peter Holmberg
d71ae7bd4d Redone with DataSourcePermissions 2018-10-09 16:05:40 +02:00
Marcus Efraimsson
17a5e32f23 remove datasource permission admin for now 2018-10-09 15:23:28 +02:00
Peter Holmberg
78b56dd528 reverted AddPermissions 2018-10-09 14:50:46 +02:00
Carl Bergquist
8962ca81a6 Merge pull request #13574 from grafana/update-stackdriver-provisioning-docs
Improve Stackdriver provisioning docs
2018-10-09 12:39:13 +02:00
David Kaltschmidt
76a3b1a793 Explore: highlight typed text in suggestions
- use react-highlight-words
- add highlighting (color and border) to the matching substring of the
  suggested items in the typeahead
- extracted match finding from logging datasource
- created new utils/text.ts class for text-related functions
- added more types
2018-10-09 12:33:25 +02:00
Antoine Cordier
6bab602ecc Update provisioning.md (#13572) 2018-10-09 12:24:23 +02:00
Erik Sundell
1a838ce75d stackdriver: update docs, showing how to escape private key and use yaml multiline strings 2018-10-09 11:40:07 +02:00
Peter Holmberg
ac6bee621c modified AddPermissions component 2018-10-09 11:07:23 +02:00
Mitsuhiro Tanda
6ed1cbd5bb set unit for CloudWatch GetMetricStatistics result 2018-10-09 17:02:56 +09:00
David
c1164f5c00 Merge pull request #13570 from praveensastry/skip-duplicate-labels
Remove duplicate labels in the datasource query
2018-10-09 07:40:44 +02:00
praveensastry
61bbe280ed Remove duplicate labels in the datasource query 2018-10-09 15:34:58 +11:00
praveensastry
b74e76298f render drag handle only in edit mode 2018-10-09 13:40:17 +11:00
Daniel Lee
c1fd2e5534 Merge pull request #13550 from grafana/stackdriver-query-help-css
ux: minor update to look of stackdriver query help
2018-10-08 23:39:18 +02:00
Torkel Ödegaard
3fa83d2755 ux: minor update to look of stackdriver query help 2018-10-08 23:29:29 +02:00
Daniel Lee
6599279f41 changelog: adds note for #13495 2018-10-08 23:21:10 +02:00
Dan Cech
d20b15834f add gopkg.in/square/go-jose.v2 to dependencies, update github.com/hashicorp/yamux 2018-10-08 17:11:24 -04:00
David
352961b3d7 Merge pull request #13540 from grafana/davkal/explore-compact-url-state
Explore: compact state URLs
2018-10-08 19:25:56 +02:00
David
6fcc062bda Merge pull request #13541 from grafana/davkal/13535-fix-syntax-reload
Explore: trigger a query field render to fix highlighting
2018-10-08 19:25:40 +02:00
David
4a85d012e1 Merge pull request #13542 from grafana/davkal/13531-fix-default-suggestions
Explore: do not show default suggestions after expressions
2018-10-08 19:25:18 +02:00
Daniel Lee
98071ccd17 Merge pull request #13496 from grafana/stackdriver-filter-wildcards
Stackdriver filter wildcards
2018-10-08 16:52:58 +02:00
Daniel Lee
562f62a763 Merge pull request #13564 from grafana/13562-stackdriver-undefined-name
stackdriver metric name fix. Fixes #13562
2018-10-08 16:31:29 +02:00
Peter Holmberg
87793ea30d Merge branch 'data-source-instance-to-react' of https://github.com/grafana/grafana into data-source-instance-to-react 2018-10-08 16:07:15 +02:00
Peter Holmberg
b283845e4e adding permissions component 2018-10-08 16:05:37 +02:00
Marcus Efraimsson
2b812b8825 Merge branch 'noop-services-poc' into data-source-instance-to-react 2018-10-08 16:04:21 +02:00
Marcus Efraimsson
4d719b0d05 Merge remote-tracking branch 'origin/master' into noop-services-poc 2018-10-08 16:02:44 +02:00
Peter Holmberg
61cac5fd61 reverted back and using angular for settings and dashboards 2018-10-08 16:01:17 +02:00
Erik Sundell
11b9f9691c stackdriver: improve filter docs for wildcards and regular expressions 2018-10-08 15:57:31 +02:00
Erik Sundell
8d53799bcd stackdriver: always use regex full match for =~ and !=~operator 2018-10-08 15:57:31 +02:00
Erik Sundell
7e6a5c0a74 stackdriver: add tests from regex matching 2018-10-08 15:57:30 +02:00
Erik Sundell
46ca306c2f stackdriver: always use regex full match for =~ and !=~operator 2018-10-08 15:57:30 +02:00
Erik Sundell
a3122a4b85 stackdriver: test build filter string 2018-10-08 15:57:30 +02:00
Erik Sundell
5f7795aa1f stackdriver: test that no interpolation is done when there are no wildcards 2018-10-08 15:57:30 +02:00
Erik Sundell
2a0d7a8803 stackdriver: remove debug logging 2018-10-08 15:57:30 +02:00
Erik Sundell
035be6cbbe stackdriver: add more tests 2018-10-08 15:57:30 +02:00
Erik Sundell
68332c5951 stackdriver: fix broken substring. also adds tests 2018-10-08 15:57:30 +02:00
Erik Sundell
2e665fba0f stackdriver: remove not necessary helper functions 2018-10-08 15:57:30 +02:00
Erik Sundell
4d8f594d31 stackdriver: interpolate stackdriver filter wildcards when asterix is used in filter 2018-10-08 15:57:30 +02:00
Daniel Lee
6fce178ec7 stackdriver metric name fix. Fixes #13562
Sets metric name even when the metric does not have a displayName field. Closes #13562.
2018-10-08 15:34:28 +02:00
Peter Holmberg
4ecd33c79c Fixed nav model 2018-10-08 14:09:02 +02:00
Torkel Ödegaard
ed349075a0 Merge pull request #13556 from grafana/influxdb-annotation-fix
fix for influxdb annotation issue that caused text to be shown twice
2018-10-08 09:29:21 +02:00
Torkel Ödegaard
67f5bb2c4e fix for influxdb annotation issue that caused text to be shown twice, fixes #13553 2018-10-08 09:19:48 +02:00
Torkel Ödegaard
2f84101fe7 wip: restoring old angular panel tabs / edit mode 2018-10-07 10:39:47 -07:00
Torkel Ödegaard
07eba60e24 Merge pull request #13537 from grafana/new-data-source-as-separate-page
New data source as separate page
2018-10-06 20:42:13 +02:00
Torkel Ödegaard
9346ee006c Merge pull request #13547 from ceh-forks/docs-typos
docs: fix minor typos
2018-10-06 20:40:21 +02:00
Torkel Ödegaard
b411e8eb25 Merge pull request #13548 from neufeldtech/playlist_fix
Fix text overflow on playlist search  #13464
2018-10-06 20:39:42 +02:00
Torkel Ödegaard
2e4a1f317d ux: final fixes to new datasource page 2018-10-06 19:22:16 +02:00
Jordan Neufeld
4815f92f6f Fix text overflow on playlist search #13464 2018-10-06 10:17:26 -05:00
Emil Hessman
69cf131f81 docs: fix minor typos 2018-10-06 17:09:41 +02:00
Torkel Ödegaard
3c6a6e69a6 Merge pull request #13538 from narqo/circleci-fix-gofmt-test
fix gofmt tests output
2018-10-06 08:47:58 +02:00
Daniel Lee
f4f97d2e65 Merge pull request #13543 from jodli/patch-1
Fixed typo in query editor placeholder text.
2018-10-06 00:01:03 +02:00
Torkel Ödegaard
8e2859625f ux: more minor ds setting tweaks 2018-10-05 13:13:04 -07:00
Torkel Ödegaard
4f852bb4ae ux: more minor ds setting tweaks 2018-10-05 13:09:41 -07:00
Torkel Ödegaard
2860a50065 ux: tweaks to add datasource page and datasource settings page 2018-10-05 12:55:34 -07:00
Jan-Olaf Becker
82aa0a3674 Fixed typo in query editor placeholder text. 2018-10-05 20:41:48 +02:00
David Kaltschmidt
6260a6d2f3 Explore: do not show default suggestions after expressions
- an expression ends on closing braces
- exclude expressions from the default/empty suggestions
2018-10-05 18:51:49 +02:00
David Kaltschmidt
e0b8b1b7af Explore: trigger a query field render to fix highlighting
- some syntax rules are loaded asynchronously
- when they have been received, the query field needs to re-render
- trigger re-render via bogus edit (tried other methods but could not
  find any)
2018-10-05 18:27:33 +02:00
David Kaltschmidt
5ec9adb7a7 Explore: compact state URLs
- allow positional state array in URL
- key-based parsing as fallback
- fix issue where split state was kept in URL after closing split
2018-10-05 17:09:40 +02:00
David
f6d332562a Merge pull request #13529 from grafana/davkal/13517-resize-graph
Explore: resize graph on window resize
2018-10-05 16:14:25 +02:00
Vladimir Varankin
f5e81e45cc fix gofmt tests output
Print the whole command in "Execute ..." and "... returned 1" logs.
Fix "binary operator expected" by passing quoted output from
`gofmt` to `test`.
2018-10-05 14:42:25 +02:00
Peter Holmberg
e1c77f634d Merge branch 'master' into new-data-source-as-separate-page 2018-10-05 13:15:26 +02:00
Peter Holmberg
841ca49942 removed duplicate route 2018-10-05 13:09:06 +02:00
David Kaltschmidt
64af094204 Use size-me to resize explore Graph, added types 2018-10-05 11:39:00 +02:00
Peter Holmberg
b5681e9802 algorithm to find new name if it exists 2018-10-05 11:33:41 +02:00
Torkel Ödegaard
61d64c41fc Merge pull request #13534 from grafana/misc-react-migration-fixes
ux: misc react migration fixes and info box style improvement
2018-10-05 09:55:39 +02:00
Torkel Ödegaard
848f19a4a1 ux: misc react migration fixes and info box style improvement 2018-10-05 08:43:56 +02:00
Marcus Efraimsson
c670897c6a docs: new variable type text box that allows free text input 2018-10-04 18:45:47 +02:00
Marcus Efraimsson
b03a25198b docs: annotations tag filter with template variable support 2018-10-04 18:25:16 +02:00
Torkel Ödegaard
1da352822a Merge pull request #13530 from grafana/davkal/13485-cursor-suggestions
Explore: reset typeahead on cursor move
2018-10-04 18:05:32 +02:00
David
5aa91fc1c5 Merge pull request #13528 from grafana/davkal/fix-rate-hint
Explore: fix rate hint for series with null values
2018-10-04 17:51:05 +02:00
Daniel Lee
a44e8c5917 docs: whats new in 5.3 - a few tweaks 2018-10-04 17:46:16 +02:00
Marcus Efraimsson
79929c1f00 mysql: note about connection max lifetime and wait_timeout 2018-10-04 17:42:34 +02:00
David Kaltschmidt
a0b21db053 Explore: reset typeahead on cursor move 2018-10-04 17:25:31 +02:00
David Kaltschmidt
5cb9dc99ca Explore: resize graph on window resize 2018-10-04 16:56:54 +02:00
David Kaltschmidt
107bef2d6d Fix rate function hint for series with nulls 2018-10-04 16:32:32 +02:00
David
b0172427b1 Extract query hints 2018-10-04 16:27:18 +02:00
David
1a6b0adbd7 Merge pull request #13525 from grafana/davkal/contributing.md
Moving contributing.md to top level
2018-10-04 15:50:23 +02:00
David
406b6144a5 Merge pull request #13491 from grafana/davkal/explore-perf
Explore: typeahead and render performance improvements
2018-10-04 15:48:08 +02:00
David Kaltschmidt
bdae399322 Prevent Explore from updating when typing query
- remove `edited` property of query objects
- query object semantics changes to be initial values only
- resetting or externally modifying a query is done via giving it a new
  react key, which replaces the row completely
- query changes while typing are sent up to Explore to be saved in a
  local property that is not part of the component state (prevent
  control circle)
- all Explore functions using the queries must access the local property
  for current values
2018-10-04 15:32:28 +02:00
David Kaltschmidt
dc4b0cf2ca Avoid new metrics options being passed selector, made PromField pure 2018-10-04 15:28:33 +02:00
David Kaltschmidt
538ea1127e Perf on query field and typeahead
- Lower debounce
- refactor suggestion selection
- make Portal pure
- use prev suggestions object if suggestions are the same
2018-10-04 15:28:33 +02:00
David Kaltschmidt
9914071cc0 Dont rebuild datasource options on each render 2018-10-04 15:28:32 +02:00
Marcus Efraimsson
9ae6f68500 Merge pull request #13498 from svenklemm/sql-macros2
move timeFrom, timeTo, unixEpochFrom and unixEpochTo macros to sql_engine
2018-10-04 15:21:46 +02:00
David Kaltschmidt
c1786ae753 contributing.md 2018-10-04 15:20:55 +02:00
Marcus Efraimsson
3ed4defc91 changelog: add notes about closing #13326
[skip ci]
2018-10-04 15:15:01 +02:00
Marcus Efraimsson
2b1e4d001a Merge pull request #13326 from ryantxu/proxy-slash
Keep trailing slash for datasource proxy requests
2018-10-04 14:38:34 +02:00
Torkel Ödegaard
0aa0ae0eb1 react-2-angular: added generic angular directive loader util that can be used from react 2018-10-04 13:02:29 +02:00
Peter Holmberg
85603dbc21 search data source types 2018-10-04 11:42:17 +02:00
Torkel Ödegaard
b7ba73819c mini fix 2018-10-04 09:14:47 +02:00
Torkel Ödegaard
dcb7f0d492 Merge branch 'master' into react-panels-ux-idea2 2018-10-04 09:08:19 +02:00
Torkel Ödegaard
019d0ee179 Merge pull request #13506 from mjtrangoni/fix-megacheck-issues
Fix megacheck issues
2018-10-03 20:10:01 +02:00
Torkel Ödegaard
30eda62fe7 css: minor fix to search 2018-10-03 11:07:20 -07:00
Torkel Ödegaard
31d4cf9aff Merge pull request #13514 from grafana/13441-center-search-item
centered dashboard icon in search with flexbox
2018-10-03 20:03:41 +02:00
bergquist
81824370db bump master version to 5.4.0-pre1 2018-10-03 17:38:52 +02:00
bergquist
4498d75b17 provisioning: adds more logging about failed to deletion of provisioned dashboards 2018-10-03 17:38:10 +02:00
Marcus Efraimsson
d2dc770c79 various fixes and improvements 2018-10-03 17:10:41 +02:00
bergquist
75ed71a455 changelog: set date for 5.3.0-beta3 release 2018-10-03 16:48:07 +02:00
bergquist
96a0c9c56d build: fix for invalid pathing for release publisher 2018-10-03 16:47:37 +02:00
bergquist
00b4c175c6 changlog: adds note about closing #13551 and #13507 2018-10-03 16:30:26 +02:00
Marcus Efraimsson
30fca2b181 Merge remote-tracking branch 'origin/master' into 5.3-release-post 2018-10-03 16:25:44 +02:00
Peter Holmberg
262fee0a42 new grid layout add data source 2018-10-03 16:04:30 +02:00
Daniel Lee
d6ba90815d Merge pull request #13511 from grafana/stackdriver-nginject-fix
stackdriver: adds missing nginject attribute
2018-10-03 15:09:26 +02:00
Torkel Ödegaard
a83f0e9ba2 test: updated react snapshot 2018-10-03 14:58:34 +02:00
Torkel Ödegaard
81c44eb312 Merge branch 'revert-13502-revert-13488-org-users-to-react' 2018-10-03 14:52:50 +02:00
Torkel Ödegaard
9b4dd31095 ux: minor tweak to link 2018-10-03 14:52:13 +02:00
Daniel Lee
6d8a3ce1a3 stackdriver: adds missing nginject attribute 2018-10-03 14:42:41 +02:00
Carl Bergquist
f35fd0c5a3 Merge pull request #13509 from grafana/13507-permissions-on-role-fix
Fix issue with updating role permissions #13507
2018-10-03 14:20:12 +02:00
Carl Bergquist
99f2342fa1 Merge pull request #13508 from grafana/release_publisher
build: automatically publish releases to grafana.com.
2018-10-03 14:10:17 +02:00
Leonard Gram
00843037d4 docs: better wording and docs links. 2018-10-03 13:56:43 +02:00
Johannes Schill
97802f30ae Fix issue with updating role permissions #13507 2018-10-03 13:37:00 +02:00
Peter Holmberg
ef5180bae0 fixed toggle buttons 2018-10-03 13:04:31 +02:00
Marcus Efraimsson
3fa8088192 dataproxy should forward a trailing slash to proxy 2018-10-03 12:55:01 +02:00
Marcus Efraimsson
8bf4d68035 add datasource proxy test to verify trailing slashes are forwarded 2018-10-03 12:28:30 +02:00
Patrick O'Carroll
9c889f8d68 centered dashboard icon in search with flexbox 2018-10-03 11:42:18 +02:00
Marcus Efraimsson
6407ec4128 mssql: fix tests 2018-10-03 11:26:52 +02:00
bergquist
add6cee742 build: automatically publish releases to grafana.com. 2018-10-03 11:17:46 +02:00
Peter Holmberg
45113e6c8b updated after pr feedback 2018-10-03 10:54:15 +02:00
Mario Trangoni
afab9085eb pkg/tsdb/postgres/postgres_test.go: pass context.Background() instead of nil
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/tsdb/postgres/postgres_test.go:120:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:200:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:257:34⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:282:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:336:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:363:32⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:453:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:475:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:497:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:519:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:541:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:563:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:585:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:607:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:629:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:652:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:677:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:738:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:761:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:787:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:817:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:847:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:877:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:905:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/postgres/postgres_test.go:933:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 10:32:51 +02:00
Mario Trangoni
3632e9c756 pkg/tsdb/mysql/mysql_test.go: pass context.Background() instead of nil
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/tsdb/mysql/mysql_test.go:132:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:220:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:267:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:330:34⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:355:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:381:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:476:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:498:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:520:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:542:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:564:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:586:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:608:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:630:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:652:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:674:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:696:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:719:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:744:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:805:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:828:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:854:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:884:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:914:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:944:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:972:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mysql/mysql_test.go:1000:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 10:24:06 +02:00
Mario Trangoni
0f25dec117 pkg/tsdb/mssql/mssql_test.go: pass context.Background() instead of nil
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/tsdb/mssql/mssql_test.go:131:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:221:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:268:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:330:34⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:355:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:444:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:466:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:488:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:510:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:532:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:554:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:576:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:598:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:620:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:643:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:666:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:742:34⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:819:34⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:895:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:918:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:944:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:974:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:1004:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:1034:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:1062:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/mssql/mssql_test.go:1090:33⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 10:22:26 +02:00
Sven Klemm
e303468c0c adjust mssql tests 2018-10-03 10:21:16 +02:00
Mario Trangoni
88efb87b0d pkg/tsdb/elasticsearch/client/client_test.go: pass context.Background() instead of nil
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/tsdb/elasticsearch/client/client_test.go:28:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/elasticsearch/client/client_test.go:39:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/elasticsearch/client/client_test.go:51:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/elasticsearch/client/client_test.go:63:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/elasticsearch/client/client_test.go:76:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/tsdb/elasticsearch/client/client_test.go:89:25⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 09:59:10 +02:00
Peter Holmberg
44f2041cf3 added data source type type 2018-10-03 09:56:15 +02:00
Mario Trangoni
d1e1fb7e72 pkg/services/alerting/notifiers/telegram_test.go: pass context.Background() instead of nil
See,
$ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./...
pkg/services/alerting/notifiers/telegram_test.go:55:44⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/services/alerting/notifiers/telegram_test.go:71:45⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/services/alerting/notifiers/telegram_test.go:88:45⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
pkg/services/alerting/notifiers/telegram_test.go:104:45⚠️ do not pass a nil Context, even if a function permits it; pass context.TODO if you are unsure about which Context to use (SA1012) (megacheck)
2018-10-03 09:47:54 +02:00
Sven Klemm
af22213462 remove generic macros from macros_test and add integration test for generic macros 2018-10-03 09:46:17 +02:00
Torkel Ödegaard
afdec3d1b0 Revert "Revert "Org users to react"" 2018-10-03 09:43:10 +02:00
Torkel Ödegaard
d59c86ccbb Merge pull request #13502 from grafana/revert-13488-org-users-to-react
Revert "Org users to react"
2018-10-03 09:43:05 +02:00
Torkel Ödegaard
fe4f2f71c3 Revert "Org users to react" 2018-10-03 09:40:37 +02:00
Sven Klemm
744e8617ff add postgres test for global macros 2018-10-03 09:35:42 +02:00
Torkel Ödegaard
38637f056f Merge pull request #13488 from grafana/org-users-to-react
Org users to react
2018-10-03 09:30:08 +02:00
Mitsuhiro Tanda
c2c0cdb49c add test 2018-10-03 16:27:11 +09:00
Mitsuhiro Tanda
6770f2e940 stackdriver heatmap support 2018-10-03 16:27:04 +09:00
Torkel Ödegaard
c3a8dd28d5 Merge pull request #13500 from grafana/testdata-tables
Testdata tables
2018-10-03 08:54:08 +02:00
Torkel Ödegaard
ed0c2296b6 added slow queries scenario to test data source, added new panel test dashboard with slow queries 2018-10-02 13:00:54 -07:00
Torkel Ödegaard
4a77a62949 Merge pull request #13499 from dadosch/patch-1
Update configuration doc to include socket at [server]
2018-10-02 21:38:08 +02:00
dadosch
2500fe27f1 Fix "appropriate"-typo 2018-10-02 19:20:48 +00:00
dadosch
b138ae9d4c Update configuration doc to include socket@server
`protocol=socket` and `socket=` path in [server]

fixes https://github.com/grafana/grafana/issues/8701
2018-10-02 18:59:55 +00:00
Sven Klemm
94d6d51726 move timeFrom, timeTo, unixEpochFrom and unixEpochTo macros to sql_engine 2018-10-02 20:19:34 +02:00
Torkel Ödegaard
9e72588cec wip: began work on support for testdata tables & annotations support 2018-10-02 18:50:30 +02:00
Marcus Efraimsson
3932e4db5a Merge remote-tracking branch 'origin/master' into concurrent-sql 2018-10-02 17:44:33 +02:00
Marcus Efraimsson
e5c376aead docs: connection limits for sql datasources 2018-10-02 17:43:54 +02:00
Marcus Efraimsson
12230dfa71 ux: put connection limits under own section 2018-10-02 17:43:15 +02:00
Peter Holmberg
a381db3237 fiddling with validation 2018-10-02 16:50:34 +02:00
bergquist
1935497813 changelog: adds note about closing #13492 2018-10-02 16:38:13 +02:00
Peter Holmberg
7a39e5554b view and route 2018-10-02 16:18:42 +02:00
Torkel Ödegaard
6c41cfb72c wip: made sqlstore dialect accessable from outside 2018-10-02 16:14:29 +02:00
Peter Holmberg
c3f87b56ee removed duplicate route 2018-10-02 14:13:30 +02:00
Peter Holmberg
908bf8e834 deleting obsolete things 2018-10-02 13:53:11 +02:00
Axel Pirek
dd09ece8c9 Make max open, max idle connections and connection max life time configurable 2018-10-02 13:42:06 +02:00
Peter Holmberg
cc57995070 snap 2018-10-02 13:30:09 +02:00
Peter Holmberg
6d6416c04d fix after merge from master 2018-10-02 13:19:11 +02:00
Peter Holmberg
09b681326e Merge branch 'master' into org-users-to-react 2018-10-02 11:18:01 +02:00
Peter Holmberg
cc1e22925f snaps 2018-10-02 11:11:36 +02:00
Peter Holmberg
a188ceacbc invitees 2018-10-02 11:04:55 +02:00
Torkel Ödegaard
162a95bff9 wip: going in circles 2018-10-01 19:31:03 +02:00
Peter Holmberg
3c8820ab55 invites table 2018-10-01 18:01:26 +02:00
Torkel Ödegaard
b3c78f1265 wip: data source permissions hooks 2018-10-01 15:38:55 +02:00
Peter Holmberg
13666c8462 tests 2018-10-01 14:17:28 +02:00
Peter Holmberg
a43ede70bc added default prop instead of specifying prop 2018-10-01 14:02:13 +02:00
Peter Holmberg
3211df7303 filter users in selector based on search 2018-10-01 13:45:00 +02:00
Peter Holmberg
94971abd9c functions and tests 2018-10-01 12:01:53 +02:00
Peter Holmberg
8f99276606 first crude display 2018-09-28 17:21:00 +02:00
Peter Holmberg
da856187d8 snaps 2018-09-28 14:57:56 +02:00
Torkel Ödegaard
d2464812eb noop services poc 2018-09-28 14:52:12 +02:00
Peter Holmberg
21cfc11009 implemented general actionbar 2018-09-28 14:34:58 +02:00
ryan
b4fad40c5a Merge remote-tracking branch 'grafana/master' into proxy-slash
* grafana/master: (127 commits)
  alerting: move all notification conditions to defaultShouldNotify
  filter NULL values for column value suggestions
  imguploader: Add support for ECS credential provider for S3
  Remove .dropdown-menu-open on body click fixes #13409
  Remove option r from ln command since its not working everywhere
  fix: updated tests
  Fix spelling of your and you're
  Changed setting to be an alerting setting
  Remove non-existing css prop
  fix: Legend to the right, as table, should follow the width prop. Removing css conflicting with baron's width calculation. #13312
  rendering: Added concurrent rendering limits
  devenv: fix uid for bulk alert dashboards
  Explore: moved code to app/features/explore
  target gfdev-prometheus datasource
  devenv: adds script for creating many dashboards with alerts
  Fix goconst issues
  When stacking graphs, always include the y-offset so that tooltips can render proper values for individual points
  provisioning: changed provisioning default update interval from 3 to 10 seconds
  Fix https://github.com/grafana/grafana/issues/13387 metric segment options displays after blur
  docs: improve oauth generic azure ad instructions
  ...
2018-09-26 20:24:08 -07:00
ryan
16ac02f9c7 Merge remote-tracking branch 'grafana/master'
* grafana/master: (127 commits)
  alerting: move all notification conditions to defaultShouldNotify
  filter NULL values for column value suggestions
  imguploader: Add support for ECS credential provider for S3
  Remove .dropdown-menu-open on body click fixes #13409
  Remove option r from ln command since its not working everywhere
  fix: updated tests
  Fix spelling of your and you're
  Changed setting to be an alerting setting
  Remove non-existing css prop
  fix: Legend to the right, as table, should follow the width prop. Removing css conflicting with baron's width calculation. #13312
  rendering: Added concurrent rendering limits
  devenv: fix uid for bulk alert dashboards
  Explore: moved code to app/features/explore
  target gfdev-prometheus datasource
  devenv: adds script for creating many dashboards with alerts
  Fix goconst issues
  When stacking graphs, always include the y-offset so that tooltips can render proper values for individual points
  provisioning: changed provisioning default update interval from 3 to 10 seconds
  Fix https://github.com/grafana/grafana/issues/13387 metric segment options displays after blur
  docs: improve oauth generic azure ad instructions
  ...
2018-09-26 20:23:33 -07:00
Leonard Gram
06d24df7b4 docs: postgres gif. 2018-09-24 16:58:39 +02:00
Leonard Gram
ac5d585902 docs: whats new for 5.3 2018-09-24 16:31:59 +02:00
Axel Pirek
e35f06b938 Run all sql data source queries for one panel concurrently 2018-09-24 14:53:39 +02:00
Adrian Muraru
bd1f87ed45 Update render.js 2018-09-22 00:54:56 +03:00
Adrian Muraru
b7feabdb58 Update render.js 2018-09-22 00:49:50 +03:00
Torkel Ödegaard
5b52225450 wip: panel options idea2 2018-09-20 09:01:06 +02:00
Ryan McKinley
7168190f7a make sure we don't add the slash twice 2018-09-19 10:02:04 -07:00
Adrian Muraru
ba4d5ddaaa Update render.js 2018-09-19 19:36:56 +03:00
Adrian Muraru
dbcd242b09 Updated phantomjs render script to take full height screenshots 2018-09-19 18:43:33 +03:00
Ryan McKinley
7c6227c061 remove the test that does not do anything 2018-09-18 11:18:55 -07:00
Ryan McKinley
bc68aa99b2 add the trailing slash 2018-09-18 11:16:09 -07:00
Torkel Ödegaard
3c7e54461f updated 2018-09-18 15:32:06 +02:00
Torkel Ödegaard
be3b684140 Merge branch 'master' into react-panels 2018-09-18 15:19:43 +02:00
Ryan McKinley
71dfeff782 add a test 2018-09-17 12:28:36 -07:00
ryan
9f4d4a93b4 Merge remote-tracking branch 'grafana/master'
* grafana/master: (368 commits)
  Adhoc-filtering for prometheus dashboards (#13212)
  fix: url update loop fix (#13243)
  fix theme parameter not working problem while prefer theme set to light (#13232)
  fix: added type export to fix failing test
  fix: fixed typescript test error
  another circleci fix
  Another circleci fix
  changed gometalinter to use github master
  commented out metalinter as gopkg is having issues
  Fix prometheus label filtering for comparison queries (#13213)
  Upgrade react and enzyme (#13224)
  Teams page replace mobx (#13219)
  upgrade of typescript and tslint and jest (#13223)
  fix nil pointer dereference (#13221)
  removes protoc from makefile
  changelog: note about closing #11681
  Adding Centrify configuration for Oauth
  refactor: moved stuff into new features dir manage-dashboards
  move: moved styleguide to admin
  fix: fixed singlestat test broken due to file move
  ...
2018-09-12 17:46:53 -07:00
Torkel Ödegaard
3ceab9484d wip: moving option tabs into viz tab 2018-09-10 19:04:56 +02:00
Torkel Ödegaard
c82bf7f67f fix: changing edit / view fullscreen modes now work 2018-09-10 17:55:06 +02:00
Torkel Ödegaard
df822a660b initial render/refresh timing issues 2018-09-10 16:19:28 +02:00
Torkel Ödegaard
100ab0ba23 Merge branch 'master' into react-panels 2018-09-10 15:42:36 +02:00
Alexander Zobnin
e4a488baf1 graph legend: use refactored version of scrollbar, #13175 2018-09-07 16:12:28 +03:00
Alexander Zobnin
29899003ff Merge remote-tracking branch 'upstream/master' into graph-legend-to-react 2018-09-07 16:07:42 +03:00
Alexander Zobnin
349b2787cb scrollbar: use enzyme for tests instead of react-test-renderer 2018-09-07 14:31:56 +03:00
Alexander Zobnin
729cc94daf graph legend: scroll component refactor 2018-09-06 22:52:56 +03:00
Alexander Zobnin
e67b8a3e1a scrollbar refactor: replace HOC by component with children 2018-09-06 22:52:14 +03:00
Alexander Zobnin
28cc605e32 tests for withScrollBar() wrapper 2018-09-06 15:36:22 +03:00
Alexander Zobnin
8db2960d0d graph legend: use 'react-custom-scrollbars' for legend scroll 2018-09-06 15:06:54 +03:00
Alexander Zobnin
b2ba9c5166 wrapper for react-custom-scrollbars component 2018-09-06 15:03:24 +03:00
Benjamin Schweizer
4bf8f80657 Merge remote-tracking branch 'upstream/master' 2018-09-04 17:42:15 +02:00
Alexander Zobnin
b891a858ca graph legend: implement series toggling and sorting 2018-09-04 12:52:02 +03:00
Alexander Zobnin
e8a52117a5 graph legend: react component refactor 2018-09-04 10:37:23 +03:00
Benjamin Schweizer
f4b29b5782 fixed testcase 2018-09-03 16:08:52 +02:00
Benjamin Schweizer
82554ffd67 Merge remote-tracking branch 'upstream/master' 2018-09-03 15:55:44 +02:00
Simon Podlipsky
e67d3df14c Fix array display from url 2018-09-01 14:13:48 +02:00
Sven Klemm
bcfb841cb4 pass timerange in meta data queries 2018-08-31 18:24:09 +02:00
Sven Klemm
cd708d6cb2 ignore information_schema tables 2018-08-31 16:52:26 +02:00
Alexander Zobnin
60146109ab graph legend: minor refactor 2018-08-31 17:27:57 +03:00
Sven Klemm
8d73f53e97 use quoting functions from MysqlQuery in datasource 2018-08-31 16:27:48 +02:00
Sven Klemm
390472aa99 render query from query builder 2018-08-31 15:40:58 +02:00
Alexander Zobnin
329f39e4d7 graph: make table markup corresponding to standards 2018-08-31 16:34:22 +03:00
Alexander Zobnin
0e10fdb415 graph: legend as React component 2018-08-31 16:32:05 +03:00
Marcus Efraimsson
41b5dae606 start implementing mysql query editor as a copy of postgres query editor 2018-08-30 16:52:12 +02:00
ryan
048fd87a54 Merge remote-tracking branch 'grafana/master'
* grafana/master:
  added rule prefer const to tslint (#13071)
  dep ensure (#13074)
  changed var to const 2 (#13068)
  changed var to const (#13061)
  update latest.json to latest stable version
  docs: corrected docs description for setting
  changelog: add notes about 4.6.4 and 5.2.3 releases
2018-08-29 22:20:53 -07:00
ryan
8cfad74af3 Merge remote-tracking branch 'grafana/master'
* grafana/master: (52 commits)
  Moved tooltip icon from input to label #12945 (#13059)
  added empty cta to playlist page + hid playlist table when empty (#12841)
  Update provisioning.md
  changelog: add notes about closing #12865
  fixed so validation of empty fields works again
  tslint: tslint to const fixes part3 (#13036)
  tslint: more const fixes (#13035)
  tslint: changing vars -> const (#13034)
  tslint: autofix of let -> const (#13033)
  WIP Update tslint (#12922)
  changelog: add notes about closing #12952 #12965
  build: fixes rpm build when using defaults.
  changelog: add notes about closing #12486
  docs: changes
  fixed so animation starts as soon as one pushes the button and animation stops if login failed
  added link to getting started to all, changed wording
  tests: fix missing tests (with .jest suffix)
  heatmap: fix tooltip bug in firefox
  Update notifications.md
  sql: added code migration type
  ...
2018-08-28 20:43:40 -07:00
Torkel Ödegaard
864c4691da fix: minor fix to changing type 2018-08-25 12:38:25 -07:00
Torkel Ödegaard
fd81f89509 wip: angular panels now have similar edit mode and panel type selection enabling quick changing between panel react and angular panel types 2018-08-25 12:22:50 -07:00
Torkel Ödegaard
6ba8f6c5ab wip: major change for refresh and render events flow 2018-08-25 08:49:39 -07:00
Torkel Ödegaard
4424bdd1b1 fix: going from fullscreen fix 2018-08-25 07:37:37 -07:00
Torkel Ödegaard
91b343403c wip: minor fixes 2018-08-25 07:21:00 -07:00
Torkel Ödegaard
1c97816275 wip: trying to align react & angular edit modes 2018-08-24 18:46:17 +02:00
Torkel Ödegaard
0b794ff685 Merge branch 'master' into react-panels 2018-08-24 17:29:10 +02:00
ryan
8c86a1c4a9 Merge remote-tracking branch 'grafana/master'
* grafana/master: (187 commits)
  build: duplicate docker run-script removed.
  Set User-Agent header in all proxied datasource requests
  docs: cloudwatch dimensions reference link.
  docs: remove message property in response from get alerts http api
  changelog: add notes about closing #5623
  build: cleanup
  build: fixes rpm verification.
  docs: add grafana version note for gitlab oauth
  docs: gitlab: add note about more restrictive API scope
  social: gitlab_oauth: set user ID in case email changes
  docs: document GitLab authentication backend
  social: add GitLab authentication backend
  build: verifies the rpm packages signatures.
  changelog: add notes about closing #12224
  docs: update
  feat: add auto fit panels to shortcut modal, closes #12768
  changelog: add notes about closing #12680
  docs: update postgres provisioning
  Remove dependencies
  Rename test files
  ...
2018-08-15 18:02:34 -07:00
Benjamin Schweizer
a653b277f3 switched to lowercase 2018-08-06 22:04:33 +02:00
Benjamin Schweizer
9220f83b3d replaced escape() call, renamed formatter to be more expressive 2018-08-06 21:54:12 +02:00
ryan
27e96179c1 Merge remote-tracking branch 'grafana/master'
* grafana/master: (104 commits)
  Change to arrow functions
  Add all tests to one file
  changelog: add notes about closing #12561
  Remove angularMocks
  All tests passing
  changelog: add notes about closing #12762
  fix: team email tooltip was not showing
  fix: test data api route used old name for test data datasource, fixes #12773
  changelog: add notes about closing #12300
  Weird execution order for the tests...
  changelog: add notes about closing #12744
  changelog: add notes about closing #12727
  add aws_dx to cloudwatch datasource
  also fixed "Watt per square metre"
  fixed that missing one
  add version note to metric prefix and fix typo
  devenv: update sql dashboards
  mssql: update tests
  fix usage of metric column types so that you don't need to specify metric alias
  Begin conversion
  ...
2018-08-01 21:07:36 -07:00
Benjamin Schweizer
7da9c33ae4 fixed test result 2018-07-30 17:28:50 +02:00
Benjamin Schweizer
a2967565de added urlescape formatting option 2018-07-30 17:19:41 +02:00
ryan
56927e55b6 Merge remote-tracking branch 'grafana/master'
* grafana/master: (51 commits)
  changing callback fn into arrow functions for correct usage of this (#12673)
  Fix requested changes
  Update CHANGELOG.md
  Add support for interval in query variable
  Change to arrow functions
  Add graph_ctrl jest
  changelog: add notes about closing #12691
  Update kbn.ts
  Add jest test file
  Id validation of CloudWatch GetMetricData
  changelog: adds note for #11487
  Datasource for Grafana logging platform
  fix: postgres/mysql engine cache was not being used, fixes #12636 (#12642)
  added: replaces added to grafana
  fix: datasource search was not working properly
  docs: minor docs fix
  Fix label suggestions in Explore query field
  pluginloader: expose flot gauge plugin
  alert: add missing test after refactor
  Handle query string in storage public_url (#9351) (#12555)
  ...
2018-07-23 14:31:33 -07:00
Torkel Ödegaard
4e089229fb minor fix for legacy panels 2018-07-16 14:56:40 +02:00
ryan
14d816aff9 Merge remote-tracking branch 'grafana/master'
* grafana/master: (29 commits)
  skip backend request if extended statistics is invalid. (#12495)
  Refactor team pages to react & design change (#12574)
  (prometheus) prevent error to use $__interval_ms in query (#12533)
  fix: folder picker did not notify parent that the initial folder had been changed, fixes #12543 (#12554)
  Add support for skipping variable value in URL, fixes #12174 (#12541)
  Don't build-all for PRs
  fix: requests/sec instead of requets (#12557)
  Add folder name to dashboard title (#12545)
  Fix css loading in plugins (#12573)
  Add new sequential color scales
  move go vet out of scripts and fixing warning (#12552)
  Cleanup and remove some jest.fn()
  Remove irrelevant tests and templateSrv stub
  Update CHANGELOG.md
  fix diff and percent_diff (#12515)
  Update lodash/moment version (#12532)
  Add mock to test files
  Create new instance in beforeEach
  Remove comments
  Karma to Jest: Cloudwatch datasource
  ...
2018-07-12 11:39:34 +02:00
Torkel Ödegaard
211e0f2199 wip: another baby step, another million to go 2018-07-11 12:11:21 -07:00
Torkel Ödegaard
902eba90d0 Merge branch 'master' into react-panels 2018-07-11 11:39:22 -07:00
nikoalch
f34f5008ba Update mac.md
added local login info
2018-07-11 08:15:23 -07:00
nikoalch
a0e1f58815 Update windows.md 2018-07-11 08:14:25 -07:00
nikoalch
bcb11d6747 Update rpm.md
added local login info
2018-07-11 08:13:48 -07:00
nikoalch
e944803f10 Update debian.md
added local login info
2018-07-11 08:13:15 -07:00
Torkel Ödegaard
dc3a81200b wip: you can now change panel type in edit mode 2018-07-09 13:24:15 -07:00
Torkel Ödegaard
761283231c react panels: working on changing type 2018-07-09 18:17:51 +02:00
Torkel Ödegaard
e052e165e9 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-09 15:35:31 +02:00
Torkel Ödegaard
4fd2107071 Merge branch 'master' of github.com:grafana/grafana into react-panels 2018-07-09 15:35:16 +02:00
Torkel Ödegaard
51f8d3ca42 fix: minor css change 2018-07-08 13:03:22 -07:00
Torkel Ödegaard
8036c49ffe wip: minopr progress on react panel edit infra 2018-07-08 12:29:23 -07:00
ryan
5425b76e33 Merge remote-tracking branch 'grafana/master'
* grafana/master:
  Tabs to spaces in tslint (#12529)
2018-07-08 18:30:24 +02:00
Torkel Ödegaard
50f24c98f7 wip: minor progres on react panels edit mode 2018-07-08 07:39:25 -07:00
ryan
fc5dba27b8 revert 2018-07-08 11:08:01 +02:00
ryan
6e4b199bc2 tabs to spaces
testing commit permisions :)
2018-07-08 11:07:01 +02:00
Torkel Ödegaard
dbe191fd55 wip: viz editor started 2018-07-07 05:10:42 -07:00
Torkel Ödegaard
dec62d7340 another baby step 2018-07-06 04:42:59 -07:00
Torkel Ödegaard
c86fc6fb47 react-panels: minor progress on data flow 2018-07-05 13:10:39 -07:00
Torkel Ödegaard
447bc3a6e0 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-07-05 09:37:42 -07:00
Torkel Ödegaard
09ad8360ea Merge branch 'master' into react-panels 2018-07-05 09:36:03 -07:00
Torkel Ödegaard
ab9e1b35cd wip: minor progress on DataPanel 2018-07-01 17:34:42 +02:00
Torkel Ödegaard
70c808130f react panels wip 2018-06-28 04:31:55 -07:00
Torkel Ödegaard
682c792dfb wip: react panels editor mode, tabs working 2018-06-26 12:07:41 -07:00
Torkel Ödegaard
2f5bcd37ec react panels wip 2018-06-26 16:45:42 +02:00
Torkel Ödegaard
cec70c1ed8 feat: panels v2, metrics-tab loading 2018-06-26 16:32:01 +02:00
Torkel Ödegaard
0f97d38485 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-06-26 16:07:12 +02:00
Torkel Ödegaard
1420147ccb Merge branch 'master' into react-panels 2018-06-26 15:18:54 +02:00
Torkel Ödegaard
1099daec38 wip: react panels, query editor loading from react PanelEditor view 2018-06-20 12:05:03 +02:00
Torkel Ödegaard
230606146d wip: react panel minor progrss 2018-06-19 21:25:57 +02:00
Torkel Ödegaard
65b96e1161 Merge branch 'react-panels' of github.com:grafana/grafana into react-panels 2018-06-19 20:00:46 +02:00
Torkel Ödegaard
c74a1c18fb Merge branch 'master' of github.com:grafana/grafana into react-panels 2018-06-19 20:00:01 +02:00
Torkel Ödegaard
13bc9f6fb2 updated 2018-06-19 17:30:10 +02:00
Torkel Ödegaard
db52ea66bd react panels minor progress 2018-06-19 16:57:55 +02:00
Torkel Ödegaard
aa5c9f199a react panel minor progress 2018-06-19 14:51:57 +02:00
Torkel Ödegaard
35403c1875 wip: react panel makeover mini progress 2018-06-19 08:42:41 +02:00
Torkel Ödegaard
542da8dc45 Merge branch 'master' into react-panels 2018-06-18 15:08:06 +02:00
Patrick Schuster
3091aece2b Add Google Hangouts Chat notifier. 2018-03-28 11:56:54 +02:00
Torkel Ödegaard
636cca8332 poc: merge sync 2018-02-02 16:01:01 +01:00
Torkel Ödegaard
5aeded8cf3 Merge branch 'master' into react-panels 2018-02-02 15:47:13 +01:00
Torkel Ödegaard
456b4d2a66 poc: began react panel experiments, step2 2018-01-03 13:33:54 +01:00
Torkel Ödegaard
3eb5f23209 poc: began react panel experiments, step2 2018-01-03 13:03:26 +01:00
Torkel Ödegaard
13efc529ec poc: began react panel experiments 2018-01-02 14:52:30 +01:00
3931 changed files with 452729 additions and 196931 deletions

11
.babelrc Normal file
View File

@@ -0,0 +1,11 @@
{
"presets": [
[
"@babel/preset-env",
{
"targets": { "browsers": "last 3 versions" },
"useBuiltIns": "entry"
}
]
]
}

View File

@@ -1,9 +1,11 @@
[run]
init_cmds = [
["go", "run", "build.go", "-dev", "build-server"],
["./bin/grafana-server", "cfg:app_mode=development"]
["go", "run", "build.go", "-dev", "build-cli"],
["go", "run", "build.go", "-dev", "build-server"],
["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
]
watch_all = true
follow_symlinks = true
watch_dirs = [
"$WORKDIR/pkg",
"$WORKDIR/public/views",
@@ -13,5 +15,5 @@ watch_exts = [".go", ".ini", ".toml", ".template.html"]
build_delay = 1500
cmds = [
["go", "run", "build.go", "-dev", "build-server"],
["./bin/grafana-server", "cfg:app_mode=development"]
["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
]

4
.browserslistrc Normal file
View File

@@ -0,0 +1,4 @@
>1%,
Chrome > 20
last 4 versions,
Firefox ESR

View File

@@ -19,7 +19,7 @@ version: 2
jobs:
mysql-integration-test:
docker:
- image: circleci/golang:1.11
- image: circleci/golang:1.12.6
- image: circleci/mysql:5.6-ram
environment:
MYSQL_ROOT_PASSWORD: rootpass
@@ -35,11 +35,11 @@ jobs:
- run: cat devenv/docker/blocks/mysql_tests/setup.sql | mysql -h 127.0.0.1 -P 3306 -u root -prootpass
- run:
name: mysql integration tests
command: 'GRAFANA_TEST_DB=mysql go test ./pkg/services/sqlstore/... ./pkg/tsdb/mysql/... '
command: './scripts/circle-test-mysql.sh'
postgres-integration-test:
docker:
- image: circleci/golang:1.11
- image: circleci/golang:1.12.6
- image: circleci/postgres:9.3-ram
environment:
POSTGRES_USER: grafanatest
@@ -54,7 +54,49 @@ jobs:
- run: 'PGPASSWORD=grafanatest psql -p 5432 -h 127.0.0.1 -U grafanatest -d grafanatest -f devenv/docker/blocks/postgres_tests/setup.sql'
- run:
name: postgres integration tests
command: 'GRAFANA_TEST_DB=postgres go test ./pkg/services/sqlstore/... ./pkg/tsdb/postgres/...'
command: './scripts/circle-test-postgres.sh'
cache-server-test:
docker:
- image: circleci/golang:1.12.6
- image: circleci/redis:4-alpine
- image: memcached
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run: dockerize -wait tcp://127.0.0.1:11211 -timeout 120s
- run: dockerize -wait tcp://127.0.0.1:6379 -timeout 120s
- run:
name: cache server tests
command: './scripts/circle-test-cache-servers.sh'
end-to-end-test:
docker:
- image: circleci/node:10-browsers
- image: grafana/grafana-dev:master-$CIRCLE_SHA1
steps:
- run: dockerize -wait tcp://127.0.0.1:3000 -timeout 120s
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run:
name: yarn install
command: 'yarn install --pure-lockfile --no-progress'
no_output_timeout: 5m
- save_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
- node_modules
- run:
name: run end-to-end tests
command: 'env BASE_URL=http://127.0.0.1:3000 yarn e2e-tests'
no_output_timeout: 5m
- store_artifacts:
path: public/e2e-test/screenShots/theTruth
destination: expected-screenshots
- store_artifacts:
path: public/e2e-test/screenShots/theOutput
destination: output-screenshots
codespell:
docker:
@@ -67,37 +109,27 @@ jobs:
- run:
# Important: all words have to be in lowercase, and separated by "\n".
name: exclude known exceptions
command: 'echo -e "unknwon" > words_to_ignore.txt'
command: 'echo -e "unknwon\nreferer\nerrorstring" > words_to_ignore.txt'
- run:
name: check documentation spelling errors
command: 'codespell -I ./words_to_ignore.txt docs/'
gometalinter:
lint-go:
docker:
- image: circleci/golang:1.11
- image: circleci/golang:1.12.6
environment:
# we need CGO because of go-sqlite3
CGO_ENABLED: 1
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run: 'go get -u github.com/alecthomas/gometalinter'
- run: 'go get -u github.com/tsenart/deadcode'
- run: 'go get -u github.com/jgautheron/goconst/cmd/goconst'
- run: 'go get -u github.com/gordonklaus/ineffassign'
- run: 'go get -u github.com/opennota/check/cmd/structcheck'
- run: 'go get -u github.com/mdempsky/unconvert'
- run: 'go get -u github.com/opennota/check/cmd/varcheck'
- run:
name: run linters
command: 'gometalinter --enable-gc --vendor --deadline 10m --disable-all --enable=deadcode --enable=goconst --enable=ineffassign --enable=structcheck --enable=unconvert --enable=varcheck ./...'
- run:
name: run go vet
command: 'go vet ./pkg/...'
name: Lint Go
command: 'make lint-go'
test-frontend:
docker:
- image: circleci/node:8
- image: circleci/node:10
steps:
- checkout
- restore_cache:
@@ -116,7 +148,7 @@ jobs:
test-backend:
docker:
- image: circleci/golang:1.11
- image: circleci/golang:1.12.6
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -126,7 +158,7 @@ jobs:
build-all:
docker:
- image: grafana/build-container:1.1.0
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -158,18 +190,19 @@ jobs:
name: sha-sum packages
command: 'go run build.go sha-dist'
- run:
name: Build Grafana.com publisher
command: 'go build -o scripts/publish scripts/build/publish.go'
name: Test and build Grafana.com release publisher
command: 'cd scripts/build/release_publisher && go test . && go build -o release_publisher .'
- persist_to_workspace:
root: .
paths:
- dist/grafana*
- dist/*
- scripts/*.sh
- scripts/publish
- scripts/build/release_publisher/release_publisher
- scripts/build/publish.sh
build:
docker:
- image: grafana/build-container:1.1.0
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
@@ -185,56 +218,186 @@ jobs:
- run:
name: sha-sum packages
command: 'go run build.go sha-dist'
- run:
name: Test Grafana.com release publisher
command: 'cd scripts/build/release_publisher && go test .'
- persist_to_workspace:
root: .
paths:
- dist/grafana*
- dist/*
grafana-docker-master:
build-fast-backend:
docker:
- image: docker:stable-git
steps:
- checkout
- attach_workspace:
at: .
- setup_remote_docker
- run: docker info
- run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
- run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}"
grafana-docker-pr:
docker:
- image: docker:stable-git
steps:
- checkout
- attach_workspace:
at: .
- setup_remote_docker
- run: docker info
- run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
- run: cd packaging/docker && ./build.sh "${CIRCLE_SHA1}"
grafana-docker-release:
docker:
- image: docker:stable-git
steps:
- checkout
- attach_workspace:
at: .
- setup_remote_docker
- run: docker info
- run: cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
- run: cd packaging/docker && ./build-deploy.sh "${CIRCLE_TAG}"
build-enterprise:
docker:
- image: grafana/build-container:v0.1
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: build, test and package grafana enterprise
command: './scripts/build/build_enterprise.sh'
name: prepare build tools
command: '/tmp/bootstrap.sh'
- run:
name: build grafana backend
command: './scripts/build/build.sh --fast --backend-only'
- persist_to_workspace:
root: .
paths:
- bin/*
build-fast-frontend:
docker:
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: prepare build tools
command: '/tmp/bootstrap.sh'
- restore_cache:
key: frontend-dependency-cache-{{ checksum "yarn.lock" }}
- run:
name: build grafana frontend
command: './scripts/build/build.sh --fast --frontend-only'
- save_cache:
key: frontend-dependency-cache-{{ checksum "yarn.lock" }}
paths:
- node_modules
- persist_to_workspace:
root: .
paths:
- public/build/*
- tools/phantomjs/*
build-fast-package:
docker:
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- attach_workspace:
at: .
- restore_cache:
key: frontend-dependency-cache-{{ checksum "yarn.lock" }}
- run:
name: prepare build tools
command: '/tmp/bootstrap.sh'
- run:
name: package grafana
command: './scripts/build/build.sh --fast --package-only'
- run:
name: sha-sum packages
command: 'go run build.go sha-dist'
- run:
name: Test Grafana.com release publisher
command: 'cd scripts/build/release_publisher && go test .'
- persist_to_workspace:
root: /go/src/github.com/grafana/grafana
paths:
- dist/*
build-fast-save:
docker:
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- attach_workspace:
at: .
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run:
name: debug cache
command: 'ls -al /go/src/github.com/grafana/grafana/node_modules'
- run:
name: prepare build tools
command: '/tmp/bootstrap.sh'
- run:
name: build grafana backend
command: './scripts/build/build.sh --fast --backend-only'
- run:
name: build grafana frontend
command: './scripts/build/build.sh --fast --frontend-only'
- save_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
- /go/src/github.com/grafana/grafana/node_modules
- run:
name: package grafana
command: './scripts/build/build.sh --fast --package-only'
- run:
name: sign packages
command: './scripts/build/sign_packages.sh'
- run:
name: sha-sum packages
command: 'go run build.go sha-dist'
- run:
name: Test Grafana.com release publisher
command: 'cd scripts/build/release_publisher && go test .'
- persist_to_workspace:
root: .
paths:
- dist/*
grafana-docker-master:
machine:
image: circleci/classic:201808-01
steps:
- checkout
- attach_workspace:
at: .
- run: docker info
- run: docker run --privileged linuxkit/binfmt:v0.6
- run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
- run: cd packaging/docker && ./build-deploy.sh "master-${CIRCLE_SHA1}"
- run: rm packaging/docker/grafana-latest.linux-*.tar.gz
- run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
- run: cd packaging/docker && ./build-enterprise.sh "master"
grafana-docker-pr:
machine:
image: circleci/classic:201808-01
steps:
- checkout
- attach_workspace:
at: .
- run: docker info
- run: docker run --privileged linuxkit/binfmt:v0.6
- run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
- run: cd packaging/docker && ./build.sh --fast "${CIRCLE_SHA1}"
grafana-docker-release:
machine:
image: circleci/classic:201808-01
steps:
- checkout
- attach_workspace:
at: .
- run: docker info
- run: docker run --privileged linuxkit/binfmt:v0.6
- run: cp dist/grafana-latest.linux-*.tar.gz packaging/docker
- run: cd packaging/docker && ./build-deploy.sh "${CIRCLE_TAG}"
- run: rm packaging/docker/grafana-latest.linux-*.tar.gz
- run: cp enterprise-dist/grafana-enterprise-*.linux-amd64.tar.gz packaging/docker/grafana-latest.linux-x64.tar.gz
- run: cd packaging/docker && ./build-enterprise.sh "${CIRCLE_TAG}"
build-enterprise:
docker:
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: prepare build tools
command: '/tmp/bootstrap.sh'
- run:
name: checkout enterprise
command: './scripts/build/prepare-enterprise.sh'
- run:
name: test enterprise
command: 'go test ./pkg/extensions/...'
- run:
name: build and package enterprise
command: './scripts/build/build.sh -enterprise'
- run:
name: sign packages
command: './scripts/build/sign_packages.sh'
@@ -247,30 +410,119 @@ jobs:
- persist_to_workspace:
root: .
paths:
- enterprise-dist/grafana-enterprise*
- enterprise-dist/*
build-all-enterprise:
docker:
- image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana
steps:
- checkout
- run:
name: prepare build tools
command: '/tmp/bootstrap.sh'
- run:
name: checkout enterprise
command: './scripts/build/prepare-enterprise.sh'
- restore_cache:
key: phantomjs-binaries-{{ checksum "scripts/build/download-phantomjs.sh" }}
- run:
name: download phantomjs binaries
command: './scripts/build/download-phantomjs.sh'
- save_cache:
key: phantomjs-binaries-{{ checksum "scripts/build/download-phantomjs.sh" }}
paths:
- /tmp/phantomjs
- run:
name: test enterprise
command: 'go test ./pkg/extensions/...'
- run:
name: build and package grafana
command: './scripts/build/build-all.sh -enterprise'
- run:
name: sign packages
command: './scripts/build/sign_packages.sh'
- run:
name: verify signed packages
command: |
mkdir -p ~/.rpmdb/pubkeys
curl -s https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana > ~/.rpmdb/pubkeys/grafana.key
./scripts/build/verify_signed_packages.sh dist/*.rpm
- run:
name: sha-sum packages
command: 'go run build.go sha-dist'
- run:
name: move enterprise packages into their own folder
command: 'mv dist enterprise-dist'
- persist_to_workspace:
root: .
paths:
- enterprise-dist/*
deploy-enterprise-master:
docker:
- image: circleci/python:2.7-stretch
- image: grafana/grafana-ci-deploy:1.2.2
steps:
- attach_workspace:
at: .
- run:
name: install awscli
command: 'sudo pip install awscli'
name: gcp credentials
command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
- run:
name: sign in to gcp
command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
- run:
name: deploy to s3
command: 'aws s3 sync ./enterprise-dist s3://$ENTERPRISE_BUCKET_NAME/master'
- run:
name: deploy to gcp
command: '/opt/google-cloud-sdk/bin/gsutil cp ./enterprise-dist/* gs://$GCP_BUCKET_NAME/enterprise/master'
- run:
name: Deploy to grafana.com
command: |
cd enterprise-dist
../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -enterprise -version "v$(cat grafana.version)" --nightly
deploy-enterprise-release:
docker:
- image: grafana/grafana-ci-deploy:1.2.2
steps:
- checkout
- attach_workspace:
at: .
- run:
name: gcp credentials
command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
- run:
name: sign in to gcp
command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
- run:
name: deploy to s3
command: 'aws s3 sync ./enterprise-dist s3://$ENTERPRISE_BUCKET_NAME/release'
- run:
name: deploy to gcp
command: '/opt/google-cloud-sdk/bin/gsutil cp ./enterprise-dist/* gs://$GCP_BUCKET_NAME/enterprise/release'
- run:
name: Deploy to Grafana.com
command: './scripts/build/publish.sh --enterprise'
- run:
name: Load GPG private key
command: './scripts/build/load-signing-key.sh'
- run:
name: Update Debian repository
command: './scripts/build/update_repo/update-deb.sh "enterprise" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "enterprise-dist"'
- run:
name: Update RPM repository
command: './scripts/build/update_repo/update-rpm.sh "enterprise" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "enterprise-dist"'
deploy-master:
docker:
- image: circleci/python:2.7-stretch
- image: grafana/grafana-ci-deploy:1.2.2
steps:
- attach_workspace:
at: .
- run:
name: install awscli
command: 'sudo pip install awscli'
- run:
name: deploy to s3
command: |
@@ -280,27 +532,96 @@ jobs:
- run:
name: Trigger Windows build
command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master'
- run:
name: gcp credentials
command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
- run:
name: sign in to gcp
command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
- run:
name: deploy to gcp
command: '/opt/google-cloud-sdk/bin/gsutil cp ./dist/* gs://$GCP_BUCKET_NAME/oss/master'
- run:
name: Publish to Grafana.com
command: |
rm dist/grafana-master-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
./scripts/publish -apiKey ${GRAFANA_COM_API_KEY}
rm dist/*latest*
cd dist && ../scripts/build/release_publisher/release_publisher -apikey ${GRAFANA_COM_API_KEY} -version "v$(cat grafana.version)" --nightly
deploy-release:
docker:
- image: circleci/python:2.7-stretch
- image: grafana/grafana-ci-deploy:1.2.2
steps:
- checkout
- attach_workspace:
at: .
- run:
name: install awscli
command: 'sudo pip install awscli'
- run:
name: deploy to s3
command: 'aws s3 sync ./dist s3://$BUCKET_NAME/release'
- run:
name: Trigger Windows build
command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} release'
name: gcp credentials
command: 'echo ${GCP_GRAFANA_UPLOAD_KEY} > /tmp/gcpkey.json'
- run:
name: sign in to gcp
command: '/opt/google-cloud-sdk/bin/gcloud auth activate-service-account --key-file=/tmp/gcpkey.json'
- run:
name: deploy to gcp
command: '/opt/google-cloud-sdk/bin/gsutil cp ./dist/* gs://$GCP_BUCKET_NAME/oss/release'
- run:
name: Deploy to Grafana.com
command: './scripts/build/publish.sh'
- run:
name: Load GPG private key
command: './scripts/build/load-signing-key.sh'
- run:
name: Update Debian repository
command: './scripts/build/update_repo/update-deb.sh "oss" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "dist"'
- run:
name: Update RPM repository
command: './scripts/build/update_repo/update-rpm.sh "oss" "$GPG_KEY_PASSWORD" "$CIRCLE_TAG" "dist"'
build-oss-msi:
docker:
- image: grafana/wix-toolset-ci:v3
steps:
- checkout
- attach_workspace:
at: .
- run:
name: Build OSS MSI
command: './scripts/build/ci-msi-build/ci-msi-build-oss.sh'
- persist_to_workspace:
root: .
paths:
- dist/grafana-*.msi
- dist/grafana-*.msi.sha256
store-build-artifacts:
docker:
- image: circleci/node:10
steps:
- attach_workspace:
at: .
- store_artifacts:
path: ./dist
trigger-docs-update:
docker:
- image: circleci/python:3.6.8
steps:
- checkout
- run:
name: Trigger Docs update
command: |
if git diff --name-only HEAD^ | grep -q "^docs"; then
echo "Build URL:"
curl -s -u "$DOCS_CIRCLE_TOKEN:" \
-d build_parameters[CIRCLE_JOB]=pull-submodule-changes \
https://circleci.com/api/v1.1/project/github/grafana/docs.grafana.com/tree/staging \
| jq .build_url
else
echo "-- no changes to docs files --"
fi
workflows:
version: 2
@@ -308,11 +629,11 @@ workflows:
jobs:
- build-all:
filters: *filter-only-master
- build-enterprise:
- build-all-enterprise:
filters: *filter-only-master
- codespell:
filters: *filter-only-master
- gometalinter:
- lint-go:
filters: *filter-only-master
- test-frontend:
filters: *filter-only-master
@@ -328,17 +649,19 @@ workflows:
- test-backend
- test-frontend
- codespell
- gometalinter
- lint-go
- mysql-integration-test
- postgres-integration-test
- build-oss-msi
filters: *filter-only-master
- grafana-docker-master:
requires:
- build-all
- build-all-enterprise
- test-backend
- test-frontend
- codespell
- gometalinter
- lint-go
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-master
@@ -348,19 +671,38 @@ workflows:
- test-backend
- test-frontend
- codespell
- gometalinter
- lint-go
- mysql-integration-test
- postgres-integration-test
- build-enterprise
- build-all-enterprise
filters: *filter-only-master
- build-oss-msi:
requires:
- build-all
- test-backend
- test-frontend
- codespell
- lint-go
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-master
- end-to-end-test:
requires:
- grafana-docker-master
filters: *filter-only-master
- trigger-docs-update:
requires:
- end-to-end-test
filters: *filter-only-master
release:
jobs:
- build-all:
filters: *filter-only-release
- build-all-enterprise:
filters: *filter-only-release
- codespell:
filters: *filter-only-release
- gometalinter:
- lint-go:
filters: *filter-only-release
- test-frontend:
filters: *filter-only-release
@@ -376,28 +718,58 @@ workflows:
- test-backend
- test-frontend
- codespell
- gometalinter
- lint-go
- mysql-integration-test
- postgres-integration-test
- build-oss-msi
filters: *filter-only-release
- deploy-enterprise-release:
requires:
- build-all
- build-all-enterprise
- test-backend
- test-frontend
- codespell
- lint-go
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-release
- grafana-docker-release:
requires:
- build-all
- build-all-enterprise
- test-backend
- test-frontend
- codespell
- gometalinter
- lint-go
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-release
- build-oss-msi:
requires:
- build-all
- test-backend
- test-frontend
- codespell
- lint-go
- mysql-integration-test
- postgres-integration-test
filters: *filter-only-release
build-branches-and-prs:
jobs:
- build:
- build-fast-backend:
filters: *filter-not-release-or-master
- build-fast-frontend:
filters: *filter-not-release-or-master
- build-fast-package:
filters: *filter-not-release-or-master
requires:
- build-fast-backend
- build-fast-frontend
- codespell:
filters: *filter-not-release-or-master
- gometalinter:
- lint-go:
filters: *filter-not-release-or-master
- test-frontend:
filters: *filter-not-release-or-master
@@ -407,13 +779,27 @@ workflows:
filters: *filter-not-release-or-master
- postgres-integration-test:
filters: *filter-not-release-or-master
- cache-server-test:
filters: *filter-not-release-or-master
- grafana-docker-pr:
requires:
- build
- build-fast-package
- test-backend
- test-frontend
- codespell
- gometalinter
- lint-go
- mysql-integration-test
- postgres-integration-test
- cache-server-test
filters: *filter-not-release-or-master
- store-build-artifacts:
requires:
- build-fast-package
- test-backend
- test-frontend
- codespell
- lint-go
- mysql-integration-test
- postgres-integration-test
- cache-server-test
filters: *filter-not-release-or-master

View File

@@ -18,3 +18,7 @@ insert_final_newline = true
[*.md]
trim_trailing_whitespace = false
[Makefile]
indent_style = tab
indent_size = 2

View File

@@ -1,22 +0,0 @@
Follow the setup guide in README.md
### Rebuild frontend assets on source change
```
yarn watch
```
### Rerun tests on source change
```
yarn jest
```
### Run tests for backend assets before commit
```
test -z "$(gofmt -s -l . | grep -v -E 'vendor/(github.com|golang.org|gopkg.in)' | tee /dev/stderr)"
```
### Run tests for frontend assets before commit
```
yarn test
go test -v ./pkg/...
```

View File

@@ -1,16 +0,0 @@
Read before posting:
- Questions should be posted to https://community.grafana.com. Please search there and here on GitHub for similar issues before creating a new issue.
- Checkout FAQ: https://community.grafana.com/c/howto/faq
- Checkout How to troubleshoot metric query issues: https://community.grafana.com/t/how-to-troubleshoot-metric-query-issues/50
Please include this information:
### What Grafana version are you using?
### What datasource are you using?
### What OS are you running grafana on?
### What did you do?
### What was the expected result?
### What happened instead?
### If related to metric query / data viz:
### Include raw network request & response: get by opening Chrome Dev Tools (F12, Ctrl+Shift+I on windows, Cmd+Opt+I on Mac), go the network tab.

27
.github/ISSUE_TEMPLATE/1-bug_report.md vendored Normal file
View File

@@ -0,0 +1,27 @@
---
name: Bug report
about: Report a bug you found when using Grafana
labels: 'type: bug'
---
<!--
Please use this template while reporting a bug and provide as much info as possible.
Questions should be posted to https://community.grafana.com
Use query inspector to troubleshoot issues: https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630
-->
**What happened**:
**What you expected to happen**:
**How to reproduce it (as minimally and precisely as possible)**:
**Anything else we need to know?**:
**Environment**:
- Grafana version:
- Data source type & version:
- OS Grafana is installed on:
- User OS & Browser:
- Grafana plugins:
- Others:

View File

@@ -0,0 +1,11 @@
---
name: Enhancement request
about: Suggest an enhancement or new feature for the Grafana project
labels: 'type: feature request'
---
<!-- Please only use this template for submitting feature requests -->
**What would you like to be added**:
**Why is this needed**:

View File

@@ -0,0 +1,26 @@
---
name: Accessibility issue
about: Help make Grafana be better at keyboard navigation, screen-readable and accessible to all.
labels: 'type: accessibility'
---
<!--
Please only use this template for submitting accessibility issues.
This is a new feature area for Grafana that we want to improve. We have long way to go
to really improve accessibility and would like your help to know where to start.
-->
**Steps to reproduce**:
**Actual Result**:
**Expected Result**
**Relevant WCAG Criteria:** [#.#.# WCAG Criterion](link to https://www.w3.org/WAI/WCAG21/quickref/?versions=2.0)
**Environment**:
- Grafana version:
- Data source type & version:
- User OS & Browser:
- Others:

14
.github/ISSUE_TEMPLATE/4-question.md vendored Normal file
View File

@@ -0,0 +1,14 @@
---
name: Support request
about: 'Question or support request relating to using Grafana'
title: ''
labels: ''
assignees: ''
---
STOP -- PLEASE READ!
GitHub is not the right place for questions and support requests.
Please ask questions on our community site: [https://community.grafana.com/](https://community.grafana.com/)

View File

@@ -1,4 +1,21 @@
* Link the PR to an issue for new features
* Rebase your PR if it gets out of sync with master
<!-- Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our [`CONTRIBUTING.md`](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guide.
2. Ensure you have added or ran the appropriate tests for your PR.
3. If it's a new feature or config option it will need a docs update. Docs are under the docs folder in repo root.
4. If the PR is unfinished, mark it as a draft PR.
5. Rebase your PR if it gets out of sync with master
6. Name your PR as `<FeatureArea>: Describe your change`. If it's a fix or feature relevant for changelog describe the user impact in the title. The PR title is used in changelog for issues marked with `add to changelog` label.
-->
**What this PR does / why we need it**:
**Which issue(s) this PR fixes**:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes #
**Special notes for your reviewer**:
**REMOVE THE TEXT ABOVE BEFORE CREATING THE PULL REQUEST**

17
.gitignore vendored
View File

@@ -8,6 +8,7 @@ awsconfig
/dist
/public/build
/public/views/index.html
/public/views/error.html
/emails/dist
/public_gen
/public/vendor/npm
@@ -45,6 +46,7 @@ devenv/docker-compose.yaml
/conf/provisioning/**/custom.yaml
/conf/provisioning/**/dev.yaml
/conf/ldap_dev.toml
/conf/ldap_freeipa.toml
profile.cov
/grafana
/local
@@ -54,6 +56,7 @@ profile.cov
/pkg/cmd/grafana-server/grafana-server
/pkg/cmd/grafana-server/debug
/pkg/extensions
/public/app/extensions
debug.test
/examples/*/dist
/packaging/**/*.rpm
@@ -68,8 +71,20 @@ debug.test
/vendor/**/*.yml
/vendor/**/*_test.go
/vendor/**/.editorconfig
/vendor/**/appengine*
*.orig
/devenv/bulk-dashboards/*.json
/devenv/bulk_alerting_dashboards/*.json
/scripts/build/release_publisher/release_publisher
*.patch
# Ignoring frontend packages specifics
/packages/**/dist
/packages/**/compiled
/packages/**/.rpt2_cache
theOutput/
# Ignore go local build dependencies
/scripts/go/bin/**

9
.prettierignore Normal file
View File

@@ -0,0 +1,9 @@
.git
.github
dist/
pkg/
node_modules
public/vendor/
vendor/
data/

View File

@@ -1,4 +1,570 @@
# 5.3.0 (unreleased)
# 6.3.0 (unreleased)
# 6.2.5 (2019-06-25)
### Features / Enhancements
* **Grafana-CLI**: Wrapper for `grafana-cli` within RPM/DEB packages and config/homepath are now global flags. [#17695](https://github.com/grafana/grafana/pull/17695), [@gotjosh](https://github.com/gotjosh)
* **Panel**: Fully escape html in drilldown links (was only sanitized before) . [#17731](https://github.com/grafana/grafana/pull/17731), [@dehrax](https://github.com/dehrax)
### Bug Fixes
* **Config**: Fix connectionstring for remote_cache in defaults.ini. [#17675](https://github.com/grafana/grafana/pull/17675), [@kylebrandt](https://github.com/kylebrandt)
* **Elasticsearch**: Fix empty query (via template variable) should be sent as wildcard. [#17488](https://github.com/grafana/grafana/pull/17488), [@davewat](https://github.com/davewat)
* **HTTP-Server**: Fix Strict-Transport-Security header. [#17644](https://github.com/grafana/grafana/pull/17644), [@kylebrandt](https://github.com/kylebrandt)
* **TablePanel**: fix annotations display. [#17646](https://github.com/grafana/grafana/pull/17646), [@ryantxu](https://github.com/ryantxu)
# 6.2.4 (2019-06-18)
### Bug Fixes
* **Grafana-CLI**: Fix receiving flags via command line . [#17617](https://github.com/grafana/grafana/pull/17617), [@gotjosh](https://github.com/gotjosh)
* **HTTPServer**: Fix X-XSS-Protection header formatting. [#17620](https://github.com/grafana/grafana/pull/17620), [@yverry](https://github.com/yverry)
# 6.2.3 (2019-06-17)
### Known issues
* **grafana-cli**: The argument `--pluginsDir` is not working.
* **docker**: Due to above problem with grafana-cli the docker run will fail to start the container if you're installing plugins using the `GF_INSTALL_PLUGINS` environment variable. We have removed 6.2.3 tag from docker hub and latest tag now points to 6.2.2.
More details in bug report: https://github.com/grafana/grafana/issues/17613
### Features / Enhancements
* **AuthProxy**: Optimistic lock pattern for remote cache Set. [#17485](https://github.com/grafana/grafana/pull/17485), [@papagian](https://github.com/papagian)
* **HTTPServer**: Options for returning new headers X-Content-Type-Options, X-XSS-Protection and Strict-Transport-Security. [#17522](https://github.com/grafana/grafana/pull/17522), [@kylebrandt](https://github.com/kylebrandt)
### Bug Fixes
* **Auth Proxy**: Fix non-negative cache TTL. [#17495](https://github.com/grafana/grafana/pull/17495), [@kylebrandt](https://github.com/kylebrandt)
* **Grafana-CLI**: Fix receiving configuration flags from the command line. [#17606](https://github.com/grafana/grafana/pull/17606), [@gotjosh](https://github.com/gotjosh)
* **OAuth**: Fix for wrong user token updated on OAuth refresh in DS proxy. [#17541](https://github.com/grafana/grafana/pull/17541), [@redbaron](https://github.com/redbaron)
* **remote_cache**: Fix redis. [#17483](https://github.com/grafana/grafana/pull/17483), [@kylebrandt](https://github.com/kylebrandt)
# 6.2.2 (2019-06-05)
### Features / Enhancements
* **Security**: Prevent CSV formula injection attack when exporting data. [#17363](https://github.com/grafana/grafana/pull/17363), [@DanCech](https://github.com/DanCech)
### Bug Fixes
* **CloudWatch**: Fixes error when hiding/disabling queries . [#17283](https://github.com/grafana/grafana/pull/17283), [@jpiccari](https://github.com/jpiccari)
* **Database**: Fixed slow permission query in folder/dashboard search. [#17427](https://github.com/grafana/grafana/pull/17427), [@aocenas](https://github.com/aocenas)
* **Explore**: Fixed updating time range before running queries. [#17349](https://github.com/grafana/grafana/pull/17349), [@marefr](https://github.com/marefr)
* **Plugins**: Fixed plugin config page navigation when using subpath. [#17364](https://github.com/grafana/grafana/pull/17364), [@torkelo](https://github.com/torkelo)
# 6.2.1 (2019-05-27)
### Features / Enhancements
* **CLI**: Add command to migrate all datasources to use encrypted password fields . [#17118](https://github.com/grafana/grafana/pull/17118), [@aocenas](https://github.com/aocenas)
* **Gauge/BarGauge**: Improvements to auto value font size . [#17292](https://github.com/grafana/grafana/pull/17292), [@torkelo](https://github.com/torkelo)
### Bug Fixes
* **Auth Proxy**: Resolve database is locked errors. [#17274](https://github.com/grafana/grafana/pull/17274), [@marefr](https://github.com/marefr)
* **Database**: Retry transaction if sqlite returns database is locked error. [#17276](https://github.com/grafana/grafana/pull/17276), [@marefr](https://github.com/marefr)
* **Explore**: Fixes so clicking in a Prometheus Table the query is filtered by clicked value. [#17083](https://github.com/grafana/grafana/pull/17083), [@hugohaggmark](https://github.com/hugohaggmark)
* **Singlestat**: Fixes issue with value placement and line wraps. [#17249](https://github.com/grafana/grafana/pull/17249), [@torkelo](https://github.com/torkelo)
* **Tech**: Update jQuery to 3.4.1 to fix issue on iOS 10 based browers as well as Chrome 53.x . [#17290](https://github.com/grafana/grafana/pull/17290), [@timbutler](https://github.com/timbutler)
# 6.2.0 (2019-05-22)
### Bug Fixes
* **BarGauge**: Fix for negative min values. [#17192](https://github.com/grafana/grafana/pull/17192), [@torkelo](https://github.com/torkelo)
* **Gauge/BarGauge**: Fix for issues editing min & max options. [#17174](https://github.com/grafana/grafana/pull/17174)
* **Search**: Make only folder name only open search with current folder filter. [#17226](https://github.com/grafana/grafana/pull/17226)
* **AzureMonitor**: Revert to clearing chained dropdowns. [#17212](https://github.com/grafana/grafana/pull/17212)
### Breaking Changes
* **Plugins**: Data source plugins that process hidden queries need to add a "hiddenQueries: true" attribute in plugin.json. [#17124](https://github.com/grafana/grafana/pull/17124), [@ryantxu](https://github.com/ryantxu)
### Removal of old deprecated package repository
5 months ago we deprecated our old package cloud repository and [replaced it](https://grafana.com/blog/2019/01/05/moving-to-packages.grafana.com/) with our own. We will remove the old depreciated
repo on July 1st. Make sure you have switched to the new repo by then. The new repository has all our old releases so you are not required to upgrade just to switch package repository.
# 6.2.0-beta2 (2019-05-15)
### Features / Enhancements
* **Plugins**: Support templated urls in plugin routes. [#16599](https://github.com/grafana/grafana/pull/16599), [@briangann](https://github.com/briangann)
* **Packaging**: New MSI windows installer package**. [#17073](https://github.com/grafana/grafana/pull/17073), [@briangann](https://github.com/briangann)
### Bug Fixes
* **Dashboard**: Fixes blank dashboard after window resize with panel without title. [#16942](https://github.com/grafana/grafana/pull/16942), [@torkelo](https://github.com/torkelo)
* **Dashboard**: Fixes lazy loading & expanding collapsed rows on mobile. [#17055](https://github.com/grafana/grafana/pull/17055), [@torkelo](https://github.com/torkelo)
* **Dashboard**: Fixes scrolling issues for Edge browser. [#17033](https://github.com/grafana/grafana/pull/17033), [@jschill](https://github.com/jschill)
* **Dashboard**: Show refresh button in first kiosk(tv) mode. [#17032](https://github.com/grafana/grafana/pull/17032), [@torkelo](https://github.com/torkelo)
* **Explore**: Fix empty result from datasource should render logs container. [#16999](https://github.com/grafana/grafana/pull/16999), [@marefr](https://github.com/marefr)
* **Explore**: Fixes so clicking in a Prometheus Table the query is filtered by clicked value. [#17083](https://github.com/grafana/grafana/pull/17083), [@hugohaggmark](https://github.com/hugohaggmark)
* **Explore**: Makes it possible to zoom in Explore/Loki/Graph without exception. [#16991](https://github.com/grafana/grafana/pull/16991), [@hugohaggmark](https://github.com/hugohaggmark)
* **Gauge**: Fixes orientation issue after switching from BarGauge to Gauge. [#17064](https://github.com/grafana/grafana/pull/17064), [@torkelo](https://github.com/torkelo)
* **GettingStarted**: Fixes layout issues in getting started panel. [#16941](https://github.com/grafana/grafana/pull/16941), [@torkelo](https://github.com/torkelo)
* **InfluxDB**: Fix HTTP method should default to GET. [#16949](https://github.com/grafana/grafana/pull/16949), [@StephenSorriaux](https://github.com/StephenSorriaux)
* **Panels**: Fixed alert icon position in panel header. [#17070](https://github.com/grafana/grafana/pull/17070), [@torkelo](https://github.com/torkelo)
* **Panels**: Fixes panel error tooltip not showing. [#16993](https://github.com/grafana/grafana/pull/16993), [@torkelo](https://github.com/torkelo)
* **Plugins**: Fix how datemath utils are exposed to plugins. [#16976](https://github.com/grafana/grafana/pull/16976), [@marefr](https://github.com/marefr)
* **Singlestat**: fixed centering issue for very small panels. [#16944](https://github.com/grafana/grafana/pull/16944), [@torkelo](https://github.com/torkelo)
* **Search**: Scroll issue in dashboard search in latest Chrome. [#17054](https://github.com/grafana/grafana/pull/17054), [@jschill](https://github.com/jschill)
* **Docker**: Prevent a permission denied error when writing files to the default provisioning directory. [#16831](https://github.com/grafana/grafana/pull/16831), [@wmedlar](https://github.com/wmedlar)
* **Gauge**: Adds background shade to gauge track and improves height usage. [#17019](https://github.com/grafana/grafana/pull/17019), [@torkelo](https://github.com/torkelo)
* **RemoteCache**: Avoid race condition in Set causing error on insert. . [#17082](https://github.com/grafana/grafana/pull/17082), [@bergquist](https://github.com/bergquist)
# 6.2.0-beta1 (2019-05-07)
### Features / Enhancements
* **Admin**: Add more stats about roles. [#16667](https://github.com/grafana/grafana/pull/16667), [@bergquist](https://github.com/bergquist)
* **Alert list panel**: Support variables in filters. [#16892](https://github.com/grafana/grafana/pull/16892), [@psschand](https://github.com/psschand)
* **Alerting**: Adjust label for send on all alerts to default . [#16554](https://github.com/grafana/grafana/pull/16554), [@simPod](https://github.com/simPod)
* **Alerting**: Makes timeouts and retries configurable. [#16259](https://github.com/grafana/grafana/pull/16259), [@kobehaha](https://github.com/kobehaha)
* **Alerting**: No notification when going from no data to pending. [#16905](https://github.com/grafana/grafana/pull/16905), [@bergquist](https://github.com/bergquist)
* **Alerting**: Pushover alert, support for different sound for OK. [#16525](https://github.com/grafana/grafana/pull/16525), [@Hofls](https://github.com/Hofls)
* **Auth**: Enable retries and transaction for some db calls for auth tokens . [#16785](https://github.com/grafana/grafana/pull/16785), [@bergquist](https://github.com/bergquist)
* **AzureMonitor**: Adds support for multiple subscriptions per datasource. [#16922](https://github.com/grafana/grafana/pull/16922), [@daniellee](https://github.com/daniellee)
* **Bar Gauge**: New multi series enabled gauge like panel with horizontal and vertical layouts and 3 display modes. [#16918](https://github.com/grafana/grafana/pull/16918), [@torkelo](https://github.com/torkelo)
* **Build**: Upgrades to golang 1.12.4. [#16545](https://github.com/grafana/grafana/pull/16545), [@bergquist](https://github.com/bergquist)
* **CloudWatch**: Update AWS/IoT metric and dimensions. [#16337](https://github.com/grafana/grafana/pull/16337), [@nonamef](https://github.com/nonamef)
* **Config**: Show user-friendly error message instead of stack trace. [#16564](https://github.com/grafana/grafana/pull/16564), [@Hofls](https://github.com/Hofls)
* **Dashboard**: Enable filtering dashboards in search by current folder. [#16790](https://github.com/grafana/grafana/pull/16790), [@dprokop](https://github.com/dprokop)
* **Dashboard**: Lazy load out of view panels . [#15554](https://github.com/grafana/grafana/pull/15554), [@ryantxu](https://github.com/ryantxu)
* **DataProxy**: Restore Set-Cookie header after proxy request. [#16838](https://github.com/grafana/grafana/pull/16838), [@marefr](https://github.com/marefr)
* **Datasources**: Add pattern validation for time input on datasource config pages. [#16837](https://github.com/grafana/grafana/pull/16837), [@aocenas](https://github.com/aocenas)
* **Elasticsearch**: Add 7.x version support. [#16646](https://github.com/grafana/grafana/pull/16646), [@alcidesv](https://github.com/alcidesv)
* **Explore**: Adds reconnect for failing datasource. [#16226](https://github.com/grafana/grafana/pull/16226), [@hugohaggmark](https://github.com/hugohaggmark)
* **Explore**: Support user timezone. [#16469](https://github.com/grafana/grafana/pull/16469), [@marefr](https://github.com/marefr)
* **InfluxDB**: Add support for POST HTTP verb. [#16690](https://github.com/grafana/grafana/pull/16690), [@StephenSorriaux](https://github.com/StephenSorriaux)
* **Loki**: Search is now case insensitive. [#15948](https://github.com/grafana/grafana/pull/15948), [@steven-sheehy](https://github.com/steven-sheehy)
* **OAuth**: Update jwt regexp to include `=`. [#16521](https://github.com/grafana/grafana/pull/16521), [@DanCech](https://github.com/DanCech)
* **Panels**: No title will no longer make panel header take up space. [#16884](https://github.com/grafana/grafana/pull/16884), [@torkelo](https://github.com/torkelo)
* **Prometheus**: Adds tracing headers for Prometheus datasource. [#16724](https://github.com/grafana/grafana/pull/16724), [@svagner](https://github.com/svagner)
* **Provisioning**: Add API endpoint to reload provisioning configs. [#16579](https://github.com/grafana/grafana/pull/16579), [@aocenas](https://github.com/aocenas)
* **Provisioning**: Do not allow deletion of provisioned dashboards. [#16211](https://github.com/grafana/grafana/pull/16211), [@aocenas](https://github.com/aocenas)
* **Provisioning**: Interpolate env vars in provisioning files. [#16499](https://github.com/grafana/grafana/pull/16499), [@aocenas](https://github.com/aocenas)
* **Provisioning**: Support FolderUid in Dashboard Provisioning Config. [#16559](https://github.com/grafana/grafana/pull/16559), [@swtch1](https://github.com/swtch1)
* **Security**: Add new setting allow_embedding. [#16853](https://github.com/grafana/grafana/pull/16853), [@marefr](https://github.com/marefr)
* **Security**: Store datasource passwords encrypted in secureJsonData. [#16175](https://github.com/grafana/grafana/pull/16175), [@aocenas](https://github.com/aocenas)
* **UX**: Improve Grafana usage for smaller screens. [#16783](https://github.com/grafana/grafana/pull/16783), [@torkelo](https://github.com/torkelo)
* **Units**: Add angle units, Arc Minutes and Seconds. [#16271](https://github.com/grafana/grafana/pull/16271), [@Dripoul](https://github.com/Dripoul)
### Bug Fixes
* **Build**: Fix bug where grafana didn't start after mysql on rpm packages. [#16917](https://github.com/grafana/grafana/pull/16917), [@bergquist](https://github.com/bergquist)
* **CloudWatch**: Fixes query order not affecting series ordering & color. [#16408](https://github.com/grafana/grafana/pull/16408), [@mtanda](https://github.com/mtanda)
* **CloudWatch**: Use default alias if there is no alias for metrics. [#16732](https://github.com/grafana/grafana/pull/16732), [@utkarshcmu](https://github.com/utkarshcmu)
* **Config**: Fixes bug where timeouts for alerting was not parsed correctly. [#16784](https://github.com/grafana/grafana/pull/16784), [@aocenas](https://github.com/aocenas)
* **Elasticsearch**: Fix view percentiles metric in table without date histogram. [#15686](https://github.com/grafana/grafana/pull/15686), [@Igor-Ratsuk](https://github.com/Igor-Ratsuk)
* **Explore**: Prevents histogram loading from killing Prometheus instance. [#16768](https://github.com/grafana/grafana/pull/16768), [@hugohaggmark](https://github.com/hugohaggmark)
* **Graph**: Allow override decimals to fully override. [#16414](https://github.com/grafana/grafana/pull/16414), [@torkelo](https://github.com/torkelo)
* **Mixed Datasource**: Fix error when one query is disabled. [#16409](https://github.com/grafana/grafana/pull/16409), [@marefr](https://github.com/marefr)
* **Search**: Fixes search limits and adds a page parameter. [#16458](https://github.com/grafana/grafana/pull/16458), [@torkelo](https://github.com/torkelo)
* **Security**: Responses from backend should not be cached. [#16848](https://github.com/grafana/grafana/pull/16848), [@marefr](https://github.com/marefr)
### Breaking changes
* **Gauge Panel**: The suffix / prefix options have been removed from the new Gauge Panel (introduced in v6.0). [#16870](https://github.com/grafana/grafana/issues/16870).
# 6.1.6 (2019-04-29)
### Features / Enhancements
* **Security**: Bump jQuery to 3.4.0 . [#16761](https://github.com/grafana/grafana/pull/16761), [@dprokop](https://github.com/dprokop)
### Bug Fixes
* **Playlist**: Fix loading dashboards by tag. [#16727](https://github.com/grafana/grafana/pull/16727), [@marefr](https://github.com/marefr)
# 6.1.5 (2019-04-29)
* **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2019/04/29/grafana-5.4.4-and-6.1.6-released-with-important-security-fix/)
# 6.1.4 (2019-04-16)
### Bug Fixes
* **DataPanel**: Added missing built-in interval variables to scopedVars. [#16556](https://github.com/grafana/grafana/pull/16556), [@torkelo](https://github.com/torkelo)
* **Explore**: Adds maxDataPoints to data source query options . [#16513](https://github.com/grafana/grafana/pull/16513), [@hugohaggmark](https://github.com/hugohaggmark)
* **Explore**: Fixes so intervals are recalculated on run query. [#16510](https://github.com/grafana/grafana/pull/16510), [@hugohaggmark](https://github.com/hugohaggmark)
* **Heatmap**: Fix for empty graph when panel is too narrow (#16378). [#16460](https://github.com/grafana/grafana/pull/16460), [@alexanderzobnin](https://github.com/alexanderzobnin)
* **Heatmap**: Fixed auto decimals when bucket name is not number. [#16609](https://github.com/grafana/grafana/pull/16609), [@torkelo](https://github.com/torkelo)
* **QueryInspector**: Now shows error responses again. [#16514](https://github.com/grafana/grafana/pull/16514), [@torkelo](https://github.com/torkelo)
# 6.1.3 (2019-04-09)
### Bug Fixes
* **Graph**: Fixed auto decimals in legend values for some units like `ms` and `s`. [#16455](https://github.com/grafana/grafana/pull/16455), [@torkelo](https://github.com/torkelo)
* **Graph**: Fixed png rendering with legend to the right. [#16463](https://github.com/grafana/grafana/pull/16463), [@torkelo](https://github.com/torkelo)
* **Singlestat**: Use decimals when manually specified. [#16451](https://github.com/grafana/grafana/pull/16451), [@torkelo](https://github.com/torkelo)
* **UI Switch**: Fix broken UI switches. Fixes Default Data Source switch, Explore Logs switches, Gauge option switches. [#16303](https://github.com/grafana/grafana/pull/16303), [@dprokop](https://github.com/dprokop)
# 6.1.2 (2019-04-08)
### Bug Fixes
* **Graph**: Fixed series legend color for hidden series. [#16438](https://github.com/grafana/grafana/pull/16438), [@Ijin08](https://github.com/Ijin08)
* **Graph**: Fixed tooltip highlight on white theme. [#16429](https://github.com/grafana/grafana/pull/16429), [@torkelo](https://github.com/torkelo)
* **Styles**: Fixed menu hover highlight border. [#16431](https://github.com/grafana/grafana/pull/16431), [@torkelo](https://github.com/torkelo)
* **Singlestat Panel**: Correctly use the override decimals. [#16413](https://github.com/grafana/grafana/pull/16413), [@torkelo](https://github.com/torkelo)
# 6.1.1 (2019-04-05)
### Bug Fixes
* **Alerting**: Notification channel http api fixes. [#16379](https://github.com/grafana/grafana/pull/16379), [@marefr](https://github.com/marefr)
* **Graphite**: Editing graphite query function now works again. [#16390](https://github.com/grafana/grafana/pull/16390), [@torkelo](https://github.com/torkelo)
* **Playlist**: Kiosk & auto fit panels modes are working normally again . [#16403](https://github.com/grafana/grafana/pull/16403), [@torkelo](https://github.com/torkelo)
* **QueryEditors**: Toggle edit mode now always work on slower computers. [#16394](https://github.com/grafana/grafana/pull/16394), [@seanlaff](https://github.com/seanlaff)
# 6.1.0 (2019-04-03)
### Bug Fixes
* **CloudWatch**: Fix for dimension value list when changing dimension key. [#16356](https://github.com/grafana/grafana/pull/16356), [@mtanda](https://github.com/mtanda)
* **Graphite**: Editing function arguments now works again. [#16297](https://github.com/grafana/grafana/pull/16297), [@torkelo](https://github.com/torkelo)
* **InfluxDB**: Fix tag names with periods in alert evaluation. [#16255](https://github.com/grafana/grafana/pull/16255), [@floyd-may](https://github.com/floyd-may)
* **PngRendering**: Fix for panel height & title centering . [#16351](https://github.com/grafana/grafana/pull/16351), [@torkelo](https://github.com/torkelo)
* **Templating**: Fix for editing query variables. [#16299](https://github.com/grafana/grafana/pull/16299), [@torkelo](https://github.com/torkelo)
# 6.1.0-beta1 (2019-03-27)
### New Features
* **Prometheus**: adhoc filter support [#8253](https://github.com/grafana/grafana/issues/8253), thx [@mtanda](https://github.com/mtanda)
* **Permissions**: Editors can become admin for dashboards, folders and teams they create. [#15977](https://github.com/grafana/grafana/pull/15977), [@xlson](https://github.com/xlson)
### Minor
* **Auth**: Support listing and revoking auth tokens via API [#15836](https://github.com/grafana/grafana/issues/15836)
* **Alerting**: DingDing notification channel now includes alert values. [#13825](https://github.com/grafana/grafana/pull/13825), [@athurg](https://github.com/athurg)
* **Alerting**: Notification channel http api enhancements. [#16219](https://github.com/grafana/grafana/pull/16219), [@marefr](https://github.com/marefr)
* **CloudWatch**: Update metrics/dimensions list. [#16137](https://github.com/grafana/grafana/pull/16137), [@mtanda](https://github.com/mtanda)
* **Cloudwatch**: Add AWS RDS MaximumUsedTransactionIDs metric [#15077](https://github.com/grafana/grafana/pull/15077), thx [@activeshadow](https://github.com/activeshadow)
* **Cache**: Adds support for using out of proc caching in the backend [#10816](https://github.com/grafana/grafana/issues/10816)
* **Dashboard**: New keyboard shortcut `d l` toggles all Graph legends in a dashboard. [#15770](https://github.com/grafana/grafana/pull/15770), [@jsferrei](https://github.com/jsferrei)
* **Datasource**: Only log connection string in dev environment [#16001](https://github.com/grafana/grafana/issues/16001)
* **DataProxy**: Add custom header (X-Grafana-User) to data source requests with the current username. [#15998](https://github.com/grafana/grafana/pull/15998), [@aocenas](https://github.com/aocenas)
* **DataProxy**: Make it possible to add user details to requests sent to the dataproxy [#6359](https://github.com/grafana/grafana/issues/6359) and [#15931](https://github.com/grafana/grafana/issues/15931)
* **DataProxy**: Adds oauth pass-through option for datasources. [#15205](https://github.com/grafana/grafana/pull/15205), [@seanlaff](https://github.com/seanlaff)
* **Explore**: Hide empty duplicates column in logs viewer. [#15982](https://github.com/grafana/grafana/pull/15982), [@steven-sheehy](https://github.com/steven-sheehy)
* **Explore**: Make it possible to close left pane of split view. [#16155](https://github.com/grafana/grafana/pull/16155), [@dprokop](https://github.com/dprokop)
* **Explore**: Move back / forward with browser buttons now works. [#16150](https://github.com/grafana/grafana/pull/16150), [@hugohaggmark](https://github.com/hugohaggmark)
* **Explore**: Update Loki labels when label selector is opened. [#16131](https://github.com/grafana/grafana/pull/16131), [@dprokop](https://github.com/dprokop)
* **Graph Panel**: New options for X-axis Min & Max (for histograms). [#14877](https://github.com/grafana/grafana/pull/14877), [@papagian](https://github.com/papagian)
* **Heatmap**: You can now choose to hide buckets with zero value. [#15934](https://github.com/grafana/grafana/pull/15934), [@alexanderzobnin](https://github.com/alexanderzobnin)
* **Heatmap**: `Middle` bucket bound option [#15683](https://github.com/grafana/grafana/issues/15683)
* **Heatmap**: `Reverse order` option for changing order of buckets [#15683](https://github.com/grafana/grafana/issues/15683)
* **Prometheus**: Change alignment of range queries to end before now and not in future. [#16110](https://github.com/grafana/grafana/pull/16110), [@davkal](https://github.com/davkal)
* **Prometheus**: Dedup annotations events with same timestamp . [#16152](https://github.com/grafana/grafana/pull/16152), [@torkelo](https://github.com/torkelo)
* **SQL**: Use default min interval of 1m for all SQL data sources. [#15799](https://github.com/grafana/grafana/pull/15799), [@marefr](https://github.com/marefr)
* **TablePanel**: Column color style now works even after removing columns. [#16227](https://github.com/grafana/grafana/pull/16227), [@torkelo](https://github.com/torkelo)
* **Templating**: Custom variable value now escapes all backslashes properly. [#15980](https://github.com/grafana/grafana/pull/15980), [@srid12](https://github.com/srid12)
* **Templating**: Data source variable now supports multi-value for uses cases that involve repeating panels & rows. [#15914](https://github.com/grafana/grafana/pull/15914), [@torkelo](https://github.com/torkelo)
* **VictorOps**: Adds more information to the victor ops notifiers [#15744](https://github.com/grafana/grafana/issues/15744), thx [@zhulongcheng](https://github.com/zhulongcheng)
### Bug Fixes
* **Alerting**: Don't include non-existing image in MS Teams notifications. [#16116](https://github.com/grafana/grafana/pull/16116), [@SGI495](https://github.com/SGI495)
* **Api**: Invalid org invite code [#10506](https://github.com/grafana/grafana/issues/10506)
* **Annotations**: Fix for native annotations filtered by template variable with pipe. [#15515](https://github.com/grafana/grafana/pull/15515), [@marefr](https://github.com/marefr)
* **Dashboard**: Fix for time regions spanning across midnight. [#16201](https://github.com/grafana/grafana/pull/16201), [@marefr](https://github.com/marefr)
* **Datasource**: Handles nil jsondata field gracefully [#14239](https://github.com/grafana/grafana/issues/14239)
* **Datasource**: Empty user/password was not updated when updating datasources [#15608](https://github.com/grafana/grafana/pull/15608), thx [@Maddin-619](https://github.com/Maddin-619)
* **Elasticsearch**: Fixes using template variables in the alias field. [#16229](https://github.com/grafana/grafana/pull/16229), [@daniellee](https://github.com/daniellee)
* **Elasticsearch**: Fix incorrect index pattern padding in alerting queries. [#15892](https://github.com/grafana/grafana/pull/15892), [@sandlis](https://github.com/sandlis)
* **Explore**: Fix for Prometheus autocomplete not working in Firefox. [#16192](https://github.com/grafana/grafana/pull/16192), [@hugohaggmark](https://github.com/hugohaggmark)
* **Explore**: Fix for url does not keep query after browser refresh. [#16189](https://github.com/grafana/grafana/pull/16189), [@hugohaggmark](https://github.com/hugohaggmark)
* **Gauge**: Interpolate scoped variables in repeated gauges [#15739](https://github.com/grafana/grafana/issues/15739)
* **Graphite**: Fixed issue with using series ref and series by tag. [#16111](https://github.com/grafana/grafana/pull/16111), [@torkelo](https://github.com/torkelo)
* **Graphite**: Fixed variable quoting when variable value is nummeric. [#16149](https://github.com/grafana/grafana/pull/16149), [@torkelo](https://github.com/torkelo)
* **Heatmap**: Fixes Y-axis tick labels being in wrong order for some Prometheus queries. [#15932](https://github.com/grafana/grafana/pull/15932), [@alexanderzobnin](https://github.com/alexanderzobnin)
* **Heatmap**: Negative values are now displayed correctly in graph & legend. [#15953](https://github.com/grafana/grafana/pull/15953), [@alexanderzobnin](https://github.com/alexanderzobnin)
* **Heatmap**: legend shows wrong colors for small values [#14019](https://github.com/grafana/grafana/issues/14019)
* **InfluxDB**: Always close request body even for error status codes. [#16207](https://github.com/grafana/grafana/pull/16207), [@ramongtx](https://github.com/ramongtx)
* **ManageDashboards**: Fix for checkboxes not appearing properly Firefox . [#15981](https://github.com/grafana/grafana/pull/15981), [@srid12](https://github.com/srid12)
* **Playlist**: Leaving playlist now always stops playlist . [#15791](https://github.com/grafana/grafana/pull/15791), [@peterholmberg](https://github.com/peterholmberg)
* **Prometheus**: fixes regex ad-hoc filters variables with wildcards. [#16234](https://github.com/grafana/grafana/pull/16234), [@daniellee](https://github.com/daniellee)
* **TablePanel**: Column color style now works even after removing columns. [#16227](https://github.com/grafana/grafana/pull/16227), [@torkelo](https://github.com/torkelo)
* **TablePanel**: Fix for white text on white background when value is null. [#16199](https://github.com/grafana/grafana/pull/16199), [@peterholmberg](https://github.com/peterholmberg)
# 6.0.2 (2019-03-19)
### Bug Fixes
* **Alerting**: Fixed issue with AlertList panel links resulting in panel not found errors. [#15975](https://github.com/grafana/grafana/pull/15975), [@torkelo](https://github.com/torkelo)
* **Dashboard**: Improved error handling when rendering dashboard panels. [#15970](https://github.com/grafana/grafana/pull/15970), [@torkelo](https://github.com/torkelo)
* **LDAP**: Fix allow anonymous server bind for ldap search. [#15872](https://github.com/grafana/grafana/pull/15872), [@marefr](https://github.com/marefr)
* **Discord**: Fix discord notifier so it doesn't crash when there are no image generated. [#15833](https://github.com/grafana/grafana/pull/15833), [@marefr](https://github.com/marefr)
* **Panel Edit**: Prevent search in VizPicker from stealing focus. [#15802](https://github.com/grafana/grafana/pull/15802), [@peterholmberg](https://github.com/peterholmberg)
* **Datasource admin**: Fixed url of back button in datasource edit page, when root_url configured. [#15759](https://github.com/grafana/grafana/pull/15759), [@dprokop](https://github.com/dprokop)
# 6.0.1 (2019-03-06)
### Bug Fixes
* **Metrics**: Fixes broken usagestats metrics for /metrics [#15651](https://github.com/grafana/grafana/issues/15651)
* **Dashboard**: Fixes kiosk mode should have &kiosk appended to the url [#15765](https://github.com/grafana/grafana/issues/15765)
* **Dashboard**: Fixes kiosk=tv mode with autofitpanels should respect header [#15650](https://github.com/grafana/grafana/issues/15650)
* **Image rendering**: Fixed image rendering issue for dashboards with auto refresh, . [#15818](https://github.com/grafana/grafana/pull/15818), [@torkelo](https://github.com/torkelo)
* **Dashboard**: Fix only users that can edit a dashboard should be able to update panel json. [#15805](https://github.com/grafana/grafana/pull/15805), [@marefr](https://github.com/marefr)
* **LDAP**: fix allow anonymous initial bind for ldap search. [#15803](https://github.com/grafana/grafana/pull/15803), [@marefr](https://github.com/marefr)
* **UX**: Fixed scrollbar not visible initially (only after manual scroll). [#15798](https://github.com/grafana/grafana/pull/15798), [@torkelo](https://github.com/torkelo)
* **Datasource admin** TestData [#15793](https://github.com/grafana/grafana/pull/15793), [@hugohaggmark](https://github.com/hugohaggmark)
* **Dashboard**: Fixed scrolling issue that caused scroll to be locked to bottom. [#15792](https://github.com/grafana/grafana/pull/15792), [@torkelo](https://github.com/torkelo)
* **Explore**: Viewers with viewers_can_edit should be able to access /explore. [#15787](https://github.com/grafana/grafana/pull/15787), [@jschill](https://github.com/jschill)
* **Security** fix: limit access to org admin and alerting pages. [#15761](https://github.com/grafana/grafana/pull/15761), [@marefr](https://github.com/marefr)
* **Panel Edit** minInterval changes did not persist [#15757](https://github.com/grafana/grafana/pull/15757), [@hugohaggmark](https://github.com/hugohaggmark)
* **Teams**: Fixed bug when getting teams for user. [#15595](https://github.com/grafana/grafana/pull/15595), [@hugohaggmark](https://github.com/hugohaggmark)
* **Stackdriver**: fix for float64 bounds for distribution metrics [#14509](https://github.com/grafana/grafana/issues/14509)
* **Stackdriver**: no reducers available for distribution type [#15179](https://github.com/grafana/grafana/issues/15179)
# 6.0.0 stable (2019-02-25)
### Bug Fixes
* **Dashboard**: fixes click after scroll in series override menu [#15621](https://github.com/grafana/grafana/issues/15621)
* **MySQL**: fix mysql query using _interval_ms variable throws error [#14507](https://github.com/grafana/grafana/issues/14507)
# 6.0.0-beta3 (2019-02-19)
### Minor
* **CLI**: Grafana CLI should preserve permissions for backend binaries for Linux and Darwin [#15500](https://github.com/grafana/grafana/issues/15500)
* **Alerting**: Allow image rendering 90 percent of alertTimeout [#15395](https://github.com/grafana/grafana/pull/15395)
### Bug fixes
* **Influxdb**: Add support for alerting on InfluxDB queries that use the non_negative_difference function [#15415](https://github.com/grafana/grafana/issues/15415), thx [@kiran3394](https://github.com/kiran3394)
* **Alerting**: Fix percent_diff calculation when points are nulls [#15443](https://github.com/grafana/grafana/issues/15443), thx [@max-neverov](https://github.com/max-neverov)
* **Alerting**: Fixed handling of alert urls with true flags [#15454](https://github.com/grafana/grafana/issues/15454)
# 6.0.0-beta2 (2019-02-11)
### New Features
* **AzureMonitor**: Enable alerting by converting Azure Monitor API to Go [#14623](https://github.com/grafana/grafana/issues/14623)
### Minor
* **Alerting**: Adds support for images in pushover notifier [#10780](https://github.com/grafana/grafana/issues/10780), thx [@jpenalbae](https://github.com/jpenalbae)
* **Graphite/InfluxDB/OpenTSDB**: Fix always take dashboard timezone into consideration when handle custom time ranges [#15284](https://github.com/grafana/grafana/issues/15284)
* **Stackdriver**: Template variables in filters using globbing format [#15182](https://github.com/grafana/grafana/issues/15182)
* **Cloudwatch**: Add `resource_arns` template variable query function [#8207](https://github.com/grafana/grafana/issues/8207), thx [@jeroenvollenbrock](https://github.com/jeroenvollenbrock)
* **Cloudwatch**: Add AWS/Neptune metrics [#14231](https://github.com/grafana/grafana/issues/14231), thx [@tcpatterson](https://github.com/tcpatterson)
* **Cloudwatch**: Add AWS/EC2/API metrics [#14233](https://github.com/grafana/grafana/issues/14233), thx [@tcpatterson](https://github.com/tcpatterson)
* **Cloudwatch**: Add AWS RDS ServerlessDatabaseCapacity metric [#15265](https://github.com/grafana/grafana/pull/15265), thx [@larsjoergensen](https://github.com/larsjoergensen)
* **MySQL**: Adds datasource SSL CA/client certificates support [#8570](https://github.com/grafana/grafana/issues/8570), thx [@bugficks](https://github.com/bugficks)
* **MSSQL**: Timerange are now passed for template variable queries [#13324](https://github.com/grafana/grafana/issues/13324), thx [@thatsparesh](https://github.com/thatsparesh)
* **Annotations**: Support PATCH verb in annotations http api [#12546](https://github.com/grafana/grafana/issues/12546), thx [@SamuelToh](https://github.com/SamuelToh)
* **Templating**: Add json formatting to variable interpolation [#15291](https://github.com/grafana/grafana/issues/15291), thx [@mtanda](https://github.com/mtanda)
* **Login**: Anonymous usage stats for token auth [#15288](https://github.com/grafana/grafana/issues/15288)
* **AzureMonitor**: improve autocomplete for Log Analytics and App Insights editor [#15131](https://github.com/grafana/grafana/issues/15131)
* **LDAP**: Fix IPA/FreeIPA v4.6.4 does not allow LDAP searches with empty attributes [#14432](https://github.com/grafana/grafana/issues/14432)
* **Provisioning**: Allow testing data sources that were added by config [#12164](https://github.com/grafana/grafana/issues/12164)
* **Security**: Fix CSRF Token validation for POSTs [#1441](https://github.com/grafana/grafana/issues/1441)
### Breaking changes
* **Internal Metrics** Edition has been added to the build_info metric. This will break any Graphite queries using this metric. Edition will be a new label for the Prometheus metric. [#15363](https://github.com/grafana/grafana/pull/15363)
### Bug fixes
* **Gauge**: Fix issue with gauge requests being cancelled [#15366](https://github.com/grafana/grafana/issues/15366)
* **Gauge**: Accept decimal inputs for thresholds [#15372](https://github.com/grafana/grafana/issues/15372)
* **UI**: Fix error caused by named colors that are not part of named colors palette [#15373](https://github.com/grafana/grafana/issues/15373)
* **Search**: Bug pressing special regexp chars in input fields [#12972](https://github.com/grafana/grafana/issues/12972)
* **Permissions**: No need to have edit permissions to be able to "Save as" [#13066](https://github.com/grafana/grafana/issues/13066)
# 6.0.0-beta1 (2019-01-30)
### New Features
* **Alerting**: Adds support for Google Hangouts Chat notifications [#11221](https://github.com/grafana/grafana/issues/11221), thx [@PatrickSchuster](https://github.com/PatrickSchuster)
* **Elasticsearch**: Support bucket script pipeline aggregations [#5968](https://github.com/grafana/grafana/issues/5968)
* **Influxdb**: Add support for time zone (`tz`) clause [#10322](https://github.com/grafana/grafana/issues/10322), thx [@cykl](https://github.com/cykl)
* **Snapshots**: Enable deletion of public snapshot [#14109](https://github.com/grafana/grafana/issues/14109)
* **Provisioning**: Provisioning support for alert notifiers [#10487](https://github.com/grafana/grafana/issues/10487), thx [@pbakulev](https://github.com/pbakulev)
* **Explore**: A whole new way to do ad-hoc metric queries and exploration. Split view in half and compare metrics & logs and much much more. [Read more here](http://docs.grafana.org/features/explore/)
* **Auth**: Replace remember me cookie solution for Grafana's builtin, LDAP and OAuth authentication with a solution based on short-lived tokens [#15303](https://github.com/grafana/grafana/issues/15303)
### Minor
* **Templating**: Built in time range variables `$__from` and `$__to`, [#1909](https://github.com/grafana/grafana/issues/1909)
* **Alerting**: Use separate timeouts for alert evals and notifications [#14701](https://github.com/grafana/grafana/issues/14701), thx [@sharkpc0813](https://github.com/sharkpc0813)
* **Elasticsearch**: Add support for offset in date histogram aggregation [#12653](https://github.com/grafana/grafana/issues/12653), thx [@mattiarossi](https://github.com/mattiarossi)
* **Elasticsearch**: Add support for moving average and derivative using doc count (metric count) [#8843](https://github.com/grafana/grafana/issues/8843) [#11175](https://github.com/grafana/grafana/issues/11175)
* **Elasticsearch**: Add support for template variable interpolation in alias field [#4075](https://github.com/grafana/grafana/issues/4075), thx [@SamuelToh](https://github.com/SamuelToh)
* **Influxdb**: Fix autocomplete of measurements does not escape search string properly [#11503](https://github.com/grafana/grafana/issues/11503), thx [@SamuelToh](https://github.com/SamuelToh)
* **Stackdriver**: Aggregating series returns more than one series [#14581](https://github.com/grafana/grafana/issues/14581) and [#13914](https://github.com/grafana/grafana/issues/13914), thx [@kinok](https://github.com/kinok)
* **Cloudwatch**: Fix Assume Role Arn [#14722](https://github.com/grafana/grafana/issues/14722), thx [@jaken551](https://github.com/jaken551)
* **Postgres/MySQL/MSSQL**: Nanosecond timestamp support (`$__unixEpochNanoFilter`, `$__unixEpochNanoFrom`, `$__unixEpochNanoTo`) [#14711](https://github.com/grafana/grafana/pull/14711), thx [@ander26](https://github.com/ander26)
* **Provisioning**: Fixes bug causing infinite growth in dashboard_version table. [#12864](https://github.com/grafana/grafana/issues/12864)
* **Auth**: Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled [#14246](https://github.com/grafana/grafana/issues/14246), thx [@SilverFire](https://github.com/SilverFire)
* **Admin**: Fix prevent removing last grafana admin permissions [#11067](https://github.com/grafana/grafana/issues/11067), thx [@danielbh](https://github.com/danielbh)
* **Admin**: When multiple user invitations, all links are the same as the first user who was invited [#14483](https://github.com/grafana/grafana/issues/14483)
* **LDAP**: Upgrade go-ldap to v3 [#14548](https://github.com/grafana/grafana/issues/14548)
* **OAuth**: Support OAuth providers that are not RFC6749 compliant [#14562](https://github.com/grafana/grafana/issues/14562), thx [@tdabasinskas](https://github.com/tdabasinskas)
* **Proxy whitelist**: Add CIDR capability to auth_proxy whitelist [#14546](https://github.com/grafana/grafana/issues/14546), thx [@jacobrichard](https://github.com/jacobrichard)
* **Dashboard**: `Min width` changed to `Max per row` for repeating panels. This lets you specify the maximum number of panels to show per row and by that repeated panels will always take up full width of row [#12991](https://github.com/grafana/grafana/pull/12991), thx [@pgiraud](https://github.com/pgiraud)
* **Dashboard**: Retain decimal precision when exporting CSV [#13929](https://github.com/grafana/grafana/issues/13929), thx [@cinaglia](https://github.com/cinaglia)
* **Templating**: Escaping "Custom" template variables [#13754](https://github.com/grafana/grafana/issues/13754), thx [@IntegersOfK](https://github.com/IntegersOfK)
* **Templating**: Add percentencode formatting to variable interpolation to be used mainly for url escaping [#12764](https://github.com/grafana/grafana/issues/12764), thx [@cxcv](https://github.com/cxcv)
* **Units**: Add blood glucose level units mg/dL and mmol/L [#14519](https://github.com/grafana/grafana/issues/14519), thx [@kjedamzik](https://github.com/kjedamzik)
* **Units**: Add Floating Point Operations per Second units [#14558](https://github.com/grafana/grafana/pull/14558), thx [@hahnjo](https://github.com/hahnjo)
* **Table**: Renders epoch string as date if date column style [#14484](https://github.com/grafana/grafana/issues/14484)
* **Dataproxy**: Override incoming Authorization header [#13815](https://github.com/grafana/grafana/issues/13815), thx [@kornholi](https://github.com/kornholi)
* **Dataproxy**: Add global datasource proxy timeout setting [#5699](https://github.com/grafana/grafana/issues/5699), thx [@RangerRick](https://github.com/RangerRick)
* **Database**: Support specifying database host using IPV6 for backend database and sql datasources [#13711](https://github.com/grafana/grafana/issues/13711), thx [@ellisvlad](https://github.com/ellisvlad)
* **Database**: Support defining additonal database connection string args when using `url` property in database settings [#14709](https://github.com/grafana/grafana/pull/14709), thx [@tpetr](https://github.com/tpetr)
* **Stackdriver**: crossSeriesAggregation not being sent with the query [#15129](https://github.com/grafana/grafana/issues/15129), thx [@Legogris](https://github.com/Legogris)
### Bug fixes
* **Search**: Fix for issue with scrolling the "tags filter" dropdown, fixes [#14486](https://github.com/grafana/grafana/issues/14486)
* **Prometheus**: Query for annotation always uses 60s step regardless of dashboard range, fixes [#14795](https://github.com/grafana/grafana/issues/14795)
* **Annotations**: Fix creating annotation when graph panel has no data points position the popup outside viewport [#13765](https://github.com/grafana/grafana/issues/13765), thx [@banjeremy](https://github.com/banjeremy)
* **Piechart/Flot**: Fixes multiple piechart instances with donut bug [#15062](https://github.com/grafana/grafana/pull/15062)
* **Postgres**: Fix default port not added when port not configured [#15189](https://github.com/grafana/grafana/issues/15189)
* **Alerting**: Fixes crash bug when alert notifier folders are missing [#15295](https://github.com/grafana/grafana/issues/15295)
* **Dashboard**: Fix save provisioned dashboard modal [#15219](https://github.com/grafana/grafana/pull/15219)
* **Dashboard**: Fix having a long query in prometheus dashboard query editor blocks 30% of the query field when on OSX and having native scrollbars [#15122](https://github.com/grafana/grafana/issues/15122)
* **Explore**: Fix issue with wrapping on long queries [#15222](https://github.com/grafana/grafana/issues/15222)
* **Explore**: Fix cut & paste adds newline before and after selection [#15223](https://github.com/grafana/grafana/issues/15223)
* **Dataproxy**: Fix global datasource proxy timeout not added to correct http client [#15258](https://github.com/grafana/grafana/issues/15258) [#5699](https://github.com/grafana/grafana/issues/5699)
### Breaking changes
* **Text Panel**: The text panel does no longer by default allow unsantizied HTML. [#4117](https://github.com/grafana/grafana/issues/4117). This means that if you have text panels with scripts tags they will no longer work as before. To enable unsafe javascript execution in text panels enable the settings `disable_sanitize_html` under the section `[panels]` in your Grafana ini file, or set env variable `GF_PANELS_DISABLE_SANITIZE_HTML=true`.
* **Dashboard**: Panel property `minSpan` replaced by `maxPerRow`. Dashboard migration will automatically migrate all dashboard panels using the `minSpan` property to the new `maxPerRow` property [#12991](https://github.com/grafana/grafana/pull/12991)
# 5.4.4 (2019-04-29)
* **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2019/04/29/grafana-5.4.4-and-6.1.6-released-with-important-security-fix/)
# 5.4.3 (2019-01-14)
### Tech
* **Docker**: Build and publish docker images for armv7 and arm64 [#14617](https://github.com/grafana/grafana/pull/14617), thx [@johanneswuerbach](https://github.com/johanneswuerbach)
* **Backend**: Upgrade to golang 1.11.4 [#14580](https://github.com/grafana/grafana/issues/14580)
* **MySQL** only update session in mysql database when required [#14540](https://github.com/grafana/grafana/pull/14540)
### Bug fixes
* **Alerting** Invalid frequency causes division by zero in alert scheduler [#14810](https://github.com/grafana/grafana/issues/14810)
* **Dashboard** Dashboard links do not update when time range changes [#14493](https://github.com/grafana/grafana/issues/14493)
* **Limits** Support more than 1000 datasources per org [#13883](https://github.com/grafana/grafana/issues/13883)
* **Backend** fix signed in user for orgId=0 result should return active org id [#14574](https://github.com/grafana/grafana/pull/14574)
* **Provisioning** Adds orgId to user dto for provisioned dashboards [#14678](https://github.com/grafana/grafana/pull/14678)
# 5.4.2 (2018-12-13)
* **Datasource admin**: Fix for issue creating new data source when same name exists [#14467](https://github.com/grafana/grafana/issues/14467)
* **OAuth**: Fix for oauth auto login setting, can now be set using env variable [#14435](https://github.com/grafana/grafana/issues/14435)
* **Dashboard search**: Fix for searching tags in tags filter dropdown.
# 5.4.1 (2018-12-10)
* **Stackdriver**: Fixes issue with data proxy and Authorization header [#14262](https://github.com/grafana/grafana/issues/14262)
* **Units**: fixedUnit for Flow:l/min and mL/min [#14294](https://github.com/grafana/grafana/issues/14294), thx [@flopp999](https://github.com/flopp999).
* **Logging**: Fix for issue where data proxy logged a secret when debug logging was enabled, now redacted. [#14319](https://github.com/grafana/grafana/issues/14319)
* TSDB**: Fix always take dashboard timezone into consideration when handle custom time ranges**: Add support for alerting on InfluxDB queries that use the cumulative_sum function. [#14314](https://github.com/grafana/grafana/pull/14314), thx [@nitti](https://github.com/nitti)
* **Plugins**: Panel plugins should no receive the panel-initialized event again as usual.
* **Embedded Graphs**: Iframe graph panels should now work as usual. [#14284](https://github.com/grafana/grafana/issues/14284)
* **Postgres**: Improve PostgreSQL Query Editor if using different Schemas, [#14313](
https://github.com/grafana/grafana/pull/14313)
* **Quotas**: Fixed for updating org & user quotas. [#14347](https://github.com/grafana/grafana/pull/14347), thx [#moznion](https://github.com/moznion)
* **Cloudwatch**: Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate to auto complete list. [#14401](https://github.com/grafana/grafana/pull/14401), thx [@sglajchEG](https://github.com/sglajchEG)
* **Dashboard Search**: Fixed filtering by tag issues.
* **Graph**: Fixed time region issues, [#14425](https://github.com/grafana/grafana/issues/14425), [#14280](https://github.com/grafana/grafana/issues/14280)
* **Graph**: Fixed issue with series color picker popover being placed outside window.
# 5.4.0 (2018-12-03)
* **Cloudwatch**: Fix invalid time range causes segmentation fault [#14150](https://github.com/grafana/grafana/issues/14150)
* **Cloudwatch**: AWS/CodeBuild metrics and dimensions [#14167](https://github.com/grafana/grafana/issues/14167), thx [@mmcoltman](https://github.com/mmcoltman)
* **MySQL**: Fix `$__timeFrom()` and `$__timeTo()` should respect local time zone [#14228](https://github.com/grafana/grafana/issues/14228)
### 5.4.0-beta1 fixes
* **Graph**: Fix legend always visible even if configured to be hidden [#14144](https://github.com/grafana/grafana/issues/14144)
* **Elasticsearch**: Fix regression when using datasource version 6.0+ and alerting [#14175](https://github.com/grafana/grafana/pull/14175)
# 5.4.0-beta1 (2018-11-20)
### New Features
* **Alerting**: Introduce alert debouncing with the `FOR` setting. [#7886](https://github.com/grafana/grafana/issues/7886) & [#6202](https://github.com/grafana/grafana/issues/6202)
* **Alerting**: Option to disable OK alert notifications [#12330](https://github.com/grafana/grafana/issues/12330) & [#6696](https://github.com/grafana/grafana/issues/6696), thx [@davewat](https://github.com/davewat)
* **Postgres/MySQL/MSSQL**: Adds support for configuration of max open/idle connections and connection max lifetime. Also, panels with multiple SQL queries will now be executed concurrently [#11711](https://github.com/grafana/grafana/issues/11711), thx [@connection-reset](https://github.com/connection-reset)
* **MySQL**: Graphical query builder [#13762](https://github.com/grafana/grafana/issues/13762), thx [svenklemm](https://github.com/svenklemm)
* **MySQL**: Support connecting thru Unix socket for MySQL datasource [#12342](https://github.com/grafana/grafana/issues/12342), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
* **MSSQL**: Add encrypt setting to allow configuration of how data sent between client and server are encrypted [#13629](https://github.com/grafana/grafana/issues/13629), thx [@ramiro](https://github.com/ramiro)
* **Stackdriver**: Not possible to authenticate using GCE metadata server [#13669](https://github.com/grafana/grafana/issues/13669)
* **Teams**: Team preferences (theme, home dashboard, timezone) support [#12550](https://github.com/grafana/grafana/issues/12550)
* **Graph**: Time regions support enabling highlight of weekdays and/or certain timespans [#5930](https://github.com/grafana/grafana/issues/5930)
* **OAuth**: Automatic redirect to sign-in with OAuth [#11893](https://github.com/grafana/grafana/issues/11893), thx [@Nick-Triller](https://github.com/Nick-Triller)
* **Stackdriver**: Template query editor [#13561](https://github.com/grafana/grafana/issues/13561)
### Minor
* **Security**: Upgrade macaron session package to fix security issue. [#14043](https://github.com/grafana/grafana/pull/14043)
* **Cloudwatch**: Show all available CloudWatch regions [#12308](https://github.com/grafana/grafana/issues/12308), thx [@mtanda](https://github.com/mtanda)
* **Cloudwatch**: AWS/Connect metrics and dimensions [#13970](https://github.com/grafana/grafana/pull/13970), thx [@zcoffy](https://github.com/zcoffy)
* **Cloudwatch**: CloudHSM metrics and dimensions [#14129](https://github.com/grafana/grafana/pull/14129), thx [@daktari](https://github.com/daktari)
* **Cloudwatch**: Enable using variables in the stats field [#13810](https://github.com/grafana/grafana/issues/13810), thx [@mtanda](https://github.com/mtanda)
* **Postgres**: Add delta window function to postgres query builder [#13925](https://github.com/grafana/grafana/issues/13925), thx [svenklemm](https://github.com/svenklemm)
* **Elasticsearch**: Fix switching to/from es raw document metric query [#6367](https://github.com/grafana/grafana/issues/6367)
* **Elasticsearch**: Fix deprecation warning about terms aggregation order key in Elasticsearch 6.x [#11977](https://github.com/grafana/grafana/issues/11977)
* **Graph**: Render dots when no connecting line can be made [#13605](https://github.com/grafana/grafana/issues/13605), thx [@jsferrei](https://github.com/jsferrei)
* **Table**: Fix CSS alpha background-color applied twice in table cell with link [#13606](https://github.com/grafana/grafana/issues/13606), thx [@grisme](https://github.com/grisme)
* **Singlestat**: Fix XSS in prefix/postfix [#13946](https://github.com/grafana/grafana/issues/13946), thx [@cinaglia](https://github.com/cinaglia)
* **Units**: New clock time format, to format ms or second values as for example `01h:59m`, [#13635](https://github.com/grafana/grafana/issues/13635), thx [@franciscocpg](https://github.com/franciscocpg)
* **Alerting**: Increaste default duration for queries [#13945](https://github.com/grafana/grafana/pull/13945)
* **Alerting**: More options for the Slack Alert notifier [#13993](https://github.com/grafana/grafana/issues/13993), thx [@andreykaipov](https://github.com/andreykaipov)
* **Alerting**: Can't receive DingDing alert when alert is triggered [#13723](https://github.com/grafana/grafana/issues/13723), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
* **Alerting**: Increase Telegram captions length limit [#13876](https://github.com/grafana/grafana/pull/13876), thx [@skgsergio](https://github.com/skgsergio)
* **Internal metrics**: Renamed `grafana_info` to `grafana_build_info` and added branch, goversion and revision [#13876](https://github.com/grafana/grafana/pull/13876)
* **Datasource Proxy**: Keep trailing slash for datasource proxy requests [#13326](https://github.com/grafana/grafana/pull/13326), thx [@ryantxu](https://github.com/ryantxu)
* **OAuth**: Fix Google OAuth relies on email, not google account id [#13924](https://github.com/grafana/grafana/issues/13924), thx [@vinicyusmacedo](https://github.com/vinicyusmacedo)
* **Dashboard**: Toggle legend using keyboard shortcut [#13655](https://github.com/grafana/grafana/issues/13655), thx [@davewat](https://github.com/davewat)
* **Dashboard**: Fix render dashboard row drag handle only in edit mode [#13555](https://github.com/grafana/grafana/issues/13555), thx [@praveensastry](https://github.com/praveensastry)
* **Teams**: Fix cannot select team if not included in initial search [#13425](https://github.com/grafana/grafana/issues/13425)
* **Render**: Support full height screenshots using phantomjs render script [#13352](https://github.com/grafana/grafana/pull/13352), thx [@amuraru](https://github.com/amuraru)
* **HTTP API**: Support retrieving teams by user [#14120](https://github.com/grafana/grafana/pull/14120), thx [@supercharlesliu](https://github.com/supercharlesliu)
* **Metrics**: Add basic authentication to metrics endpoint [#13577](https://github.com/grafana/grafana/issues/13577), thx [@bobmshannon](https://github.com/bobmshannon)
### Breaking changes
* Postgres/MySQL/MSSQL datasources now per default uses `max open connections` = `unlimited` (earlier 10), `max idle connections` = `2` (earlier 10) and `connection max lifetime` = `4` hours (earlier unlimited).
# 5.3.4 (2018-11-13)
* **Alerting**: Delete alerts when parent folder was deleted [#13322](https://github.com/grafana/grafana/issues/13322)
* **MySQL**: Fix `$__timeFilter()` should respect local time zone [#13769](https://github.com/grafana/grafana/issues/13769)
* **Dashboard**: Fix datasource selection in panel by enter key [#13932](https://github.com/grafana/grafana/issues/13932)
* **Graph**: Fix table legend height when positioned below graph and using Internet Explorer 11 [#13903](https://github.com/grafana/grafana/issues/13903)
* **Dataproxy**: Drop origin and referer http headers [#13328](https://github.com/grafana/grafana/issues/13328) [#13949](https://github.com/grafana/grafana/issues/13949), thx [@roidelapluie](https://github.com/roidelapluie)
# 5.3.3 (2018-11-13)
### File Exfiltration vulnerability Security fix
See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-6-5-security-update/11961) for details.
# 5.3.2 (2018-10-24)
* **InfluxDB/Graphite/Postgres**: Prevent cross site scripting (XSS) in query editor [#13667](https://github.com/grafana/grafana/issues/13667), thx [@svenklemm](https://github.com/svenklemm)
* **Postgres**: Fix template variables error [#13692](https://github.com/grafana/grafana/issues/13692), thx [@svenklemm](https://github.com/svenklemm)
* **Cloudwatch**: Fix service panic because of race conditions [#13674](https://github.com/grafana/grafana/issues/13674), thx [@mtanda](https://github.com/mtanda)
* **Cloudwatch**: Fix check for invalid percentile statistics [#13633](https://github.com/grafana/grafana/issues/13633), thx [@apalaniuk](https://github.com/apalaniuk)
* **Stackdriver/Cloudwatch**: Allow user to change unit in graph panel if cloudwatch/stackdriver datasource response doesn't include unit [#13718](https://github.com/grafana/grafana/issues/13718), thx [@mtanda](https://github.com/mtanda)
* **Stackdriver**: stackdriver user-metrics duplicated response when multiple resource types [#13691](https://github.com/grafana/grafana/issues/13691)
* **Variables**: Fix text box template variable doesn't work properly without a default value [#13666](https://github.com/grafana/grafana/issues/13666)
* **Variables**: Fix variable dependency check when using `${var}` format [#13600](https://github.com/grafana/grafana/issues/13600)
* **Dashboard**: Fix kiosk=1 url parameter should put dashboard in kiosk mode [#13764](https://github.com/grafana/grafana/pull/13764)
* **LDAP**: Fix super admins can also be admins of orgs [#13710](https://github.com/grafana/grafana/issues/13710), thx [@adrien-f](https://github.com/adrien-f)
* **Provisioning**: Fix deleting provisioned dashboard folder should cleanup provisioning meta data [#13280](https://github.com/grafana/grafana/issues/13280)
### Minor
* **Docker**: adds curl back into the docker image for utility. [#13794](https://github.com/grafana/grafana/pull/13794)
# 5.3.1 (2018-10-16)
* **Render**: Fix PhantomJS render of graph panel when legend displayed as table to the right [#13616](https://github.com/grafana/grafana/issues/13616)
* **Stackdriver**: Filter option disappears after removing initial filter [#13607](https://github.com/grafana/grafana/issues/13607)
* **Elasticsearch**: Fix no limit size in terms aggregation for alerting queries [#13172](https://github.com/grafana/grafana/issues/13172), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
* **InfluxDB**: Fix for annotation issue that caused text to be shown twice [#13553](https://github.com/grafana/grafana/issues/13553)
* **Variables**: Fix nesting variables leads to exception and missing refresh [#13628](https://github.com/grafana/grafana/issues/13628)
* **Variables**: Prometheus: Single letter labels are not supported [#13641](https://github.com/grafana/grafana/issues/13641), thx [@olshansky](https://github.com/olshansky)
* **Graph**: Fix graph time formatting for Last 24h ranges [#13650](https://github.com/grafana/grafana/issues/13650)
* **Playlist**: Fix cannot add dashboards with long names to playlist [#13464](https://github.com/grafana/grafana/issues/13464), thx [@neufeldtech](https://github.com/neufeldtech)
* **HTTP API**: Fix /api/org/users so that query and limit querystrings works
# 5.3.0 (2018-10-10)
* **Stackdriver**: Filter wildcards and regex matching are not yet supported [#13495](https://github.com/grafana/grafana/issues/13495)
* **Stackdriver**: Support the distribution metric type for heatmaps [#13559](https://github.com/grafana/grafana/issues/13559)
* **Cloudwatch**: Automatically set graph yaxis unit [#13575](https://github.com/grafana/grafana/issues/13575), thx [@mtanda](https://github.com/mtanda)
# 5.3.0-beta3 (2018-10-03)
* **Stackdriver**: Fix for missing ngInject [#13511](https://github.com/grafana/grafana/pull/13511)
* **Permissions**: Fix for broken permissions selector [#13507](https://github.com/grafana/grafana/issues/13507)
* **Alerting**: Alert reminders deduping not working as expected when running multiple Grafana instances [#13492](https://github.com/grafana/grafana/issues/13492)
# 5.3.0-beta2 (2018-10-01)
@@ -39,7 +605,7 @@
* **Profile**: List teams that the user is member of in current/active organization [#12476](https://github.com/grafana/grafana/issues/12476)
* **Configuration**: Allow auto-assigning users to specific organization (other than Main. Org) [#1823](https://github.com/grafana/grafana/issues/1823) [#12801](https://github.com/grafana/grafana/issues/12801), thx [@gzzo](https://github.com/gzzo) and [@ofosos](https://github.com/ofosos)
* **Dataproxy**: Pass configured/auth headers to a Datasource [#10971](https://github.com/grafana/grafana/issues/10971), thx [@mrsiano](https://github.com/mrsiano)
* **Cloudwatch**: CloudWatch GetMetricData support [#11487](https://github.com/grafana/grafana/issues/11487), thx [@mtanda](https://github.com/mtanda)
* **CloudWatch**: GetMetricData support [#11487](https://github.com/grafana/grafana/issues/11487), thx [@mtanda](https://github.com/mtanda)
* **Postgres**: TimescaleDB support, e.g. use `time_bucket` for grouping by time when option enabled [#12680](https://github.com/grafana/grafana/pull/12680), thx [svenklemm](https://github.com/svenklemm)
* **Cleanup**: Make temp file time to live configurable [#11607](https://github.com/grafana/grafana/issues/11607), thx [@xapon](https://github.com/xapon)
@@ -50,7 +616,7 @@
* **Alerting**: Fix rendering timeout which could cause notifications to not be sent due to rendering timing out [#12151](https://github.com/grafana/grafana/issues/12151)
* **Docker**: Make it possible to set a specific plugin url [#12861](https://github.com/grafana/grafana/pull/12861), thx [ClementGautier](https://github.com/ClementGautier)
* **GrafanaCli**: Fixed issue with grafana-cli install plugin resulting in corrupt http response from source error. Fixes [#13079](https://github.com/grafana/grafana/issues/13079)
* **Provisioning**: Should allow one default datasource per organisation [#12229](https://github.com/grafana/grafana/issues/12229)
* **Provisioning**: Should allow one default datasource per organization [#12229](https://github.com/grafana/grafana/issues/12229)
* **Github OAuth**: Allow changes of user info at Github to be synched to Grafana when signing in [#11818](https://github.com/grafana/grafana/issues/11818), thx [@rwaweber](https://github.com/rwaweber)
* **OAuth**: Fix overriding tls_skip_verify_insecure using environment variable [#12747](https://github.com/grafana/grafana/issues/12747), thx [@jangaraj](https://github.com/jangaraj)
* **Prometheus**: Fix graph panel bar width issue in aligned prometheus queries [#12379](https://github.com/grafana/grafana/issues/12379)
@@ -173,7 +739,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
* **Dashboard**: Prevent double-click when saving dashboard [#11963](https://github.com/grafana/grafana/issues/11963)
* **Dashboard**: AutoFocus the add-panel search filter [#12189](https://github.com/grafana/grafana/pull/12189) thx [@ryantxu](https://github.com/ryantxu)
* **Units**: W/m2 (energy), l/h (flow) and kPa (pressure) [#11233](https://github.com/grafana/grafana/pull/11233), thx [@flopp999](https://github.com/flopp999)
* **Units**: Litre/min (flow) and milliLitre/min (flow) [#12282](https://github.com/grafana/grafana/pull/12282), thx [@flopp999](https://github.com/flopp999)
* **Units**: Liter/min (flow) and milliLiter/min (flow) [#12282](https://github.com/grafana/grafana/pull/12282), thx [@flopp999](https://github.com/flopp999)
* **Alerting**: Fix mobile notifications for Microsoft Teams alert notifier [#11484](https://github.com/grafana/grafana/pull/11484), thx [@manacker](https://github.com/manacker)
* **Influxdb**: Add support for mode function [#12286](https://github.com/grafana/grafana/issues/12286)
* **Cloudwatch**: Fixes panic caused by bad timerange settings [#12199](https://github.com/grafana/grafana/issues/12199)
@@ -308,7 +874,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
* **Units**: Use B/s instead Bps for Bytes per second [#9342](https://github.com/grafana/grafana/pull/9342), thx [@mayli](https://github.com/mayli)
* **Units**: Radiation units [#11001](https://github.com/grafana/grafana/issues/11001), thx [@victorclaessen](https://github.com/victorclaessen)
* **Units**: Timeticks unit [#11183](https://github.com/grafana/grafana/pull/11183), thx [@jtyr](https://github.com/jtyr)
* **Units**: Concentration units and "Normal cubic metre" [#11211](https://github.com/grafana/grafana/issues/11211), thx [@flopp999](https://github.com/flopp999)
* **Units**: Concentration units and "Normal cubic meter" [#11211](https://github.com/grafana/grafana/issues/11211), thx [@flopp999](https://github.com/flopp999)
* **Units**: New currency - Czech koruna [#11384](https://github.com/grafana/grafana/pull/11384), thx [@Rohlik](https://github.com/Rohlik)
* **Avatar**: Fix DISABLE_GRAVATAR option [#11095](https://github.com/grafana/grafana/issues/11095)
* **Heatmap**: Disable log scale when using time time series buckets [#10792](https://github.com/grafana/grafana/issues/10792)
@@ -625,7 +1191,7 @@ See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-
## Enhancements
* **GitHub OAuth**: Support for GitHub organizations with 100+ teams. [#8846](https://github.com/grafana/grafana/issues/8846), thx [@skwashd](https://github.com/skwashd)
* **Graphite**: Calls to Graphite api /metrics/find now include panel or dashboad time range (from & until) in most cases, [#8055](https://github.com/grafana/grafana/issues/8055)
* **Graphite**: Calls to Graphite api /metrics/find now include panel or dashboard time range (from & until) in most cases, [#8055](https://github.com/grafana/grafana/issues/8055)
* **Graphite**: Added new graphite 1.0 functions, available if you set version to 1.0.x in data source settings. New Functions: mapSeries, reduceSeries, isNonNull, groupByNodes, offsetToZero, grep, weightedAverage, removeEmptySeries, aggregateLine, averageOutsidePercentile, delay, exponentialMovingAverage, fallbackSeries, integralByInterval, interpolate, invert, linearRegression, movingMin, movingMax, movingSum, multiplySeriesWithWildcards, pow, powSeries, removeBetweenPercentile, squareRoot, timeSlice, closes [#8261](https://github.com/grafana/grafana/issues/8261)
- **Elasticsearch**: Ad-hoc filters now use query phrase match filters instead of term filters, works on non keyword/raw fields [#9095](https://github.com/grafana/grafana/issues/9095).
@@ -790,7 +1356,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
* **InfluxDB**: Influxb Datasource test passes even if the Database doesn't exist [#7864](https://github.com/grafana/grafana/issues/7864)
* **Prometheus**: Displaying Prometheus annotations is incredibly slow [#7750](https://github.com/grafana/grafana/issues/7750), thx [@mtanda](https://github.com/mtanda)
* **Graphite**: grafana generates empty find query to graphite -> 422 Unprocessable Entity [#7740](https://github.com/grafana/grafana/issues/7740)
* **Admin**: make organisation filter case insensitive [#8194](https://github.com/grafana/grafana/issues/8194), thx [@Alexander-N](https://github.com/Alexander-N)
* **Admin**: make organization filter case insensitive [#8194](https://github.com/grafana/grafana/issues/8194), thx [@Alexander-N](https://github.com/Alexander-N)
## Changes
* **Elasticsearch**: Changed elasticsearch Terms aggregation to default to Min Doc Count to 1, and sort order to Top [#8321](https://github.com/grafana/grafana/issues/8321)
@@ -808,7 +1374,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
* **Docs**: Added some details about Sessions in Postgres [#7694](https://github.com/grafana/grafana/pull/7694) thx [@rickard-von-essen](https://github.com/rickard-von-essen)
* **Influxdb**: Allow commas in template variables [#7681](https://github.com/grafana/grafana/issues/7681) thx [@thuck](https://github.com/thuck)
* **Cloudwatch**: stop using deprecated session.New() [#7736](https://github.com/grafana/grafana/issues/7736) thx [@mtanda](https://github.com/mtanda)
* **OpenTSDB**: Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified [#7743](https://github.com/grafana/grafana/pull/7743) thx [@r4um](https://github.com/r4um)
*TSDB**: Fix always take dashboard timezone into consideration when handle custom time ranges**: Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified [#7743](https://github.com/grafana/grafana/pull/7743) thx [@r4um](https://github.com/r4um)
* **Templating**: support full resolution for $interval variable [#7696](https://github.com/grafana/grafana/pull/7696) thx [@mtanda](https://github.com/mtanda)
* **Elasticsearch**: Unique Count on string fields in ElasticSearch [#3536](https://github.com/grafana/grafana/issues/3536), thx [@pyro2927](https://github.com/pyro2927)
* **Templating**: Data source template variable that refers to other variable in regex filter [#6365](https://github.com/grafana/grafana/issues/6365) thx [@rlodge](https://github.com/rlodge)
@@ -918,7 +1484,7 @@ Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
* **CLI**: Make it possible to reset the admin password using the grafana-cli. [#5479](https://github.com/grafana/grafana/issues/5479)
* **Influxdb**: Support multiple tags in InfluxDB annotations. [#4550](https://github.com/grafana/grafana/pull/4550), thx [@adrianlzt](https://github.com/adrianlzt)
* **LDAP**: Basic Auth now supports LDAP username and password, [#6940](https://github.com/grafana/grafana/pull/6940), thx [@utkarshcmu](https://github.com/utkarshcmu)
* **LDAP**: Now works with Auth Proxy, role and organisation mapping & sync will regularly be performed. [#6895](https://github.com/grafana/grafana/pull/6895), thx [@Seuf](https://github.com/seuf)
* **LDAP**: Now works with Auth Proxy, role and organization mapping & sync will regularly be performed. [#6895](https://github.com/grafana/grafana/pull/6895), thx [@Seuf](https://github.com/seuf)
* **Alerting**: Adds OK as no data option. [#6866](https://github.com/grafana/grafana/issues/6866)
* **Alert list**: Order alerts based on state. [#6676](https://github.com/grafana/grafana/issues/6676)
* **Alerting**: Add api endpoint for pausing all alerts. [#6589](https://github.com/grafana/grafana/issues/6589)
@@ -1057,7 +1623,7 @@ due to too many connections/file handles on the data source backend. This proble
* **Scripts**: Use restart instead of start for deb package script, closes [#5282](https://github.com/grafana/grafana/pull/5282)
* **Logging**: Moved to structured logging lib, and moved to component specific level filters via config file, closes [#4590](https://github.com/grafana/grafana/issues/4590)
* **OpenTSDB**: Support nested template variables in tag_values function, closes [#4398](https://github.com/grafana/grafana/issues/4398)
* **Datasource**: Pending data source requests are cancelled before new ones are issues (Graphite & Prometheus), closes [#5321](https://github.com/grafana/grafana/issues/5321)
* **Datasource**: Pending data source requests are canceled before new ones are issues (Graphite & Prometheus), closes [#5321](https://github.com/grafana/grafana/issues/5321)
### Breaking changes
* **Logging** : Changed default logging output format (now structured into message, and key value pairs, with logger key acting as component). You can also no change in config to json log output.
@@ -1761,7 +2327,7 @@ Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-rele
#### Fixes
- [Issue #126](https://github.com/grafana/grafana/issues/126). Graphite query lexer change, can now handle regex parameters for aliasSub function
- [Issue #447](https://github.com/grafana/grafana/issues/447). Filter option loading when having muliple nested filters now works better. Options are now reloaded correctly and there are no multiple renders/refresh in between.
- [Issue #447](https://github.com/grafana/grafana/issues/447). Filter option loading when having multiple nested filters now works better. Options are now reloaded correctly and there are no multiple renders/refresh in between.
- [Issue #412](https://github.com/grafana/grafana/issues/412). After a filter option is changed and a nested template param is reloaded, if the current value exists after the options are reloaded the current selected value is kept.
- [Issue #460](https://github.com/grafana/grafana/issues/460). Legend Current value did not display when value was zero
- [Issue #328](https://github.com/grafana/grafana/issues/328). Fix to series toggling bug that caused annotations to be hidden when toggling/hiding series.
@@ -1796,7 +2362,7 @@ Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-rele
- Graphite errors are now much easier to see and troubleshoot with the new inspector ([Issue #265](https://github.com/grafana/grafana/issues/265))
- Use influxdb aliases to distinguish between multiple columns ([Issue #283](https://github.com/grafana/grafana/issues/283))
- Correction to ms axis formater, now formats days correctly. ([Issue #189](https://github.com/grafana/grafana/issues/189))
- Css fix for Firefox and using top menu dropdowns in panel fullscren / edit mode ([Issue #106](https://github.com/grafana/grafana/issues/106))
- Css fix for Firefox and using top menu dropdowns in panel fullscreen / edit mode ([Issue #106](https://github.com/grafana/grafana/issues/106))
- Browser page title is now Grafana - {{dashboard title}} ([Issue #294](https://github.com/grafana/grafana/issues/294))
- Disable auto refresh zooming in (every time you change to an absolute time range), refresh will be restored when you change time range back to relative ([Issue #282](https://github.com/grafana/grafana/issues/282))
- More graphite functions

View File

@@ -2,7 +2,7 @@
## Our Pledge
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to make participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
## Our Standards

62
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,62 @@
# Contributing
Grafana uses GitHub to manage contributions.
Contributions take the form of pull requests that will be reviewed by the core team.
- If you are a new contributor see: [Steps to Contribute](#steps-to-contribute)
- If you have a trivial fix or improvement, go ahead and create a pull request.
- If you plan to do something more involved, discuss your idea on the respective [issue](https://github.com/grafana/grafana/issues) or create a [new issue](https://github.com/grafana/grafana/issues/new) if it does not exist. This will avoid unnecessary work and surely give you and us a good deal of inspiration.
- Sign our [CLA](http://docs.grafana.org/contribute/cla/).
- Make sure to follow the code style guides
- [Backend](https://github.com/grafana/grafana/tree/master/pkg)
- [Frontend](https://github.com/grafana/grafana/tree/master/style_guides)
## Steps to Contribute
Should you wish to work on a GitHub issue, check first if it is not already assigned to someone. If it is free, you claim it by commenting on the issue that you want to work on it. This is to prevent duplicated efforts from contributors on the same issue.
Please check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) and [`help wanted`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) labels to find issues that are good for getting started. If you have questions about one of the issues, with or without the tag, please comment on them and one of the core team or the original poster will clarify it.
To setup a local development environment we recommend reading [Building Grafana from source](http://docs.grafana.org/project/building_from_source/)
## Pull Request Checklist
- Branch from the master branch and, if needed, rebase to the current master branch before submitting your pull request. If it doesn't merge cleanly with master you may be asked to rebase your changes.
- If your patch is not getting reviewed or you need a specific person to review it, you can @-reply a reviewer asking for a review in the pull request or a comment.
- Add tests relevant to the fixed bug or new feature.
- Follow [PR and commit messages guidelines](#PR-and-commit-messages-guidelines)
### Pull Requests titles and message
Pull request titles should follow this format: `Area: Name of the change`.
Titles are used to generate the changelog so they should be as descriptive as possible in one line.
Good Examples
- `Explore: Adds Live option for supported datasources`
- `GraphPanel: Don't sort series when legend table & sort column is not visible`
- `Build: Support publishing MSI to grafana.com`
The message in the Pull requests should contain a reference so the issue if there is one. Ex `Closes #<issue number>`, `Fixes #<issue number>`, or `Ref #<issue number>` if the change is related to an issue but does not close it. Make sure to explain what problem the pull request is solving and why its implemented this way. As a new contributor its often better to overcommunicate to avoid back and forth communication, as it consumes time and energy.
### GIT commit formating.
Grafana Squash Pull requests when merging them into master. This means the maintainer will be responsible for the title in the git commit message.
The commit message of the commits in the Pull Request can still be part of the git commit body. So it's always encouraged to write informative commit messages.
The Git commit title should be short, descriptive and include the Pull Request ID.
Good Examples
- `Explore: Live supprt in datasources (#12345)`
- `GraphPanel: Fix legend sorting issues (#12345)`
- `Build: Support publishing MSI to grafana.com (#12345)`
Its also good practice to include a reference to the issue in the git commit body when possible.

View File

@@ -1,16 +1,12 @@
# Golang build container
FROM golang:1.11
FROM golang:1.12.4
WORKDIR $GOPATH/src/github.com/grafana/grafana
COPY Gopkg.toml Gopkg.lock ./
COPY go.mod go.sum ./
COPY vendor vendor
ARG DEP_ENSURE=""
RUN if [ ! -z "${DEP_ENSURE}" ]; then \
go get -u github.com/golang/dep/cmd/dep && \
dep ensure --vendor-only; \
fi
RUN go mod verify
COPY pkg pkg
COPY build.go build.go
@@ -19,11 +15,13 @@ COPY package.json package.json
RUN go run build.go build
# Node build container
FROM node:8
FROM node:10.14.2
WORKDIR /usr/src/app/
COPY package.json yarn.lock ./
COPY packages packages
RUN yarn install --pure-lockfile --no-progress
COPY Gruntfile.js tsconfig.json tslint.json ./
@@ -35,7 +33,9 @@ ENV NODE_ENV production
RUN ./node_modules/.bin/grunt build
# Final container
FROM debian:stretch-slim
FROM ubuntu:latest
LABEL maintainer="Grafana team <hello@grafana.com>"
ARG GF_UID="472"
ARG GF_GID="472"
@@ -50,7 +50,8 @@ ENV PATH=/usr/share/grafana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bi
WORKDIR $GF_PATHS_HOME
RUN apt-get update && apt-get install -qq -y libfontconfig ca-certificates && \
RUN apt-get update && apt-get upgrade -y && \
apt-get install -qq -y libfontconfig1 ca-certificates && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*
@@ -61,13 +62,14 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
useradd -r -u $GF_UID -g grafana grafana && \
mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
"$GF_PATHS_PROVISIONING/dashboards" \
"$GF_PATHS_PROVISIONING/notifiers" \
"$GF_PATHS_LOGS" \
"$GF_PATHS_PLUGINS" \
"$GF_PATHS_DATA" && \
cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" && \
chmod 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS"
chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
chmod 777 -R "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
COPY --from=0 /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/
COPY --from=1 /usr/src/app/public ./public

684
Gopkg.lock generated
View File

@@ -1,684 +0,0 @@
# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
[[projects]]
name = "cloud.google.com/go"
packages = ["compute/metadata"]
revision = "056a55f54a6cc77b440b31a56a5e7c3982d32811"
version = "v0.22.0"
[[projects]]
name = "github.com/BurntSushi/toml"
packages = ["."]
revision = "b26d9c308763d68093482582cea63d69be07a0f0"
version = "v0.3.0"
[[projects]]
branch = "master"
name = "github.com/Unknwon/com"
packages = ["."]
revision = "7677a1d7c1137cd3dd5ba7a076d0c898a1ef4520"
[[projects]]
branch = "master"
name = "github.com/VividCortex/mysqlerr"
packages = ["."]
revision = "6c6b55f8796f578c870b7e19bafb16103bc40095"
[[projects]]
name = "github.com/aws/aws-sdk-go"
packages = [
"aws",
"aws/awserr",
"aws/awsutil",
"aws/client",
"aws/client/metadata",
"aws/corehandlers",
"aws/credentials",
"aws/credentials/ec2rolecreds",
"aws/credentials/endpointcreds",
"aws/credentials/stscreds",
"aws/csm",
"aws/defaults",
"aws/ec2metadata",
"aws/endpoints",
"aws/request",
"aws/session",
"aws/signer/v4",
"internal/sdkio",
"internal/sdkrand",
"internal/shareddefaults",
"private/protocol",
"private/protocol/ec2query",
"private/protocol/eventstream",
"private/protocol/eventstream/eventstreamapi",
"private/protocol/query",
"private/protocol/query/queryutil",
"private/protocol/rest",
"private/protocol/restxml",
"private/protocol/xml/xmlutil",
"service/cloudwatch",
"service/ec2",
"service/ec2/ec2iface",
"service/s3",
"service/sts"
]
revision = "fde4ded7becdeae4d26bf1212916aabba79349b4"
version = "v1.14.12"
[[projects]]
branch = "master"
name = "github.com/benbjohnson/clock"
packages = ["."]
revision = "7dc76406b6d3c05b5f71a86293cbcf3c4ea03b19"
[[projects]]
branch = "master"
name = "github.com/beorn7/perks"
packages = ["quantile"]
revision = "3a771d992973f24aa725d07868b467d1ddfceafb"
[[projects]]
branch = "master"
name = "github.com/bmizerany/assert"
packages = ["."]
revision = "b7ed37b82869576c289d7d97fb2bbd8b64a0cb28"
[[projects]]
branch = "master"
name = "github.com/bradfitz/gomemcache"
packages = ["memcache"]
revision = "1952afaa557dc08e8e0d89eafab110fb501c1a2b"
[[projects]]
branch = "master"
name = "github.com/codahale/hdrhistogram"
packages = ["."]
revision = "3a0bb77429bd3a61596f5e8a3172445844342120"
[[projects]]
name = "github.com/codegangsta/cli"
packages = ["."]
revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"
version = "v1.20.0"
[[projects]]
name = "github.com/davecgh/go-spew"
packages = ["spew"]
revision = "346938d642f2ec3594ed81d874461961cd0faa76"
version = "v1.1.0"
[[projects]]
name = "github.com/denisenkom/go-mssqldb"
packages = [
".",
"internal/cp"
]
revision = "270bc3860bb94dd3a3ffd047377d746c5e276726"
[[projects]]
branch = "master"
name = "github.com/facebookgo/inject"
packages = ["."]
revision = "cc1aa653e50f6a9893bcaef89e673e5b24e1e97b"
[[projects]]
branch = "master"
name = "github.com/facebookgo/structtag"
packages = ["."]
revision = "217e25fb96916cc60332e399c9aa63f5c422ceed"
[[projects]]
name = "github.com/fatih/color"
packages = ["."]
revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"
version = "v1.7.0"
[[projects]]
name = "github.com/go-ini/ini"
packages = ["."]
revision = "6529cf7c58879c08d927016dde4477f18a0634cb"
version = "v1.36.0"
[[projects]]
name = "github.com/go-ldap/ldap"
packages = ["."]
revision = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9"
version = "v2.5.1"
[[projects]]
branch = "master"
name = "github.com/go-macaron/binding"
packages = ["."]
revision = "ac54ee249c27dca7e76fad851a4a04b73bd1b183"
[[projects]]
branch = "master"
name = "github.com/go-macaron/gzip"
packages = ["."]
revision = "cad1c6580a07c56f5f6bc52d66002a05985c5854"
[[projects]]
branch = "master"
name = "github.com/go-macaron/inject"
packages = ["."]
revision = "d8a0b8677191f4380287cfebd08e462217bac7ad"
[[projects]]
branch = "master"
name = "github.com/go-macaron/session"
packages = [
".",
"memcache",
"postgres",
"redis"
]
revision = "b8e286a0dba8f4999042d6b258daf51b31d08938"
[[projects]]
name = "github.com/go-sql-driver/mysql"
packages = ["."]
revision = "2cc627ac8defc45d65066ae98f898166f580f9a4"
[[projects]]
name = "github.com/go-stack/stack"
packages = ["."]
revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"
version = "v1.7.0"
[[projects]]
name = "github.com/go-xorm/builder"
packages = ["."]
revision = "bad0a612f0d6277b953910822ab5dfb30dd18237"
version = "v0.2.0"
[[projects]]
name = "github.com/go-xorm/core"
packages = ["."]
revision = "da1adaf7a28ca792961721a34e6e04945200c890"
version = "v0.5.7"
[[projects]]
name = "github.com/go-xorm/xorm"
packages = ["."]
revision = "1933dd69e294c0a26c0266637067f24dbb25770c"
version = "v0.6.4"
[[projects]]
branch = "master"
name = "github.com/golang/protobuf"
packages = [
"proto",
"ptypes",
"ptypes/any",
"ptypes/duration",
"ptypes/timestamp"
]
revision = "927b65914520a8b7d44f5c9057611cfec6b2e2d0"
[[projects]]
branch = "master"
name = "github.com/gopherjs/gopherjs"
packages = ["js"]
revision = "8dffc02ea1cb8398bb73f30424697c60fcf8d4c5"
[[projects]]
name = "github.com/gorilla/websocket"
packages = ["."]
revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
version = "v1.2.0"
[[projects]]
name = "github.com/gosimple/slug"
packages = ["."]
revision = "e9f42fa127660e552d0ad2b589868d403a9be7c6"
version = "v1.1.1"
[[projects]]
branch = "master"
name = "github.com/grafana/grafana-plugin-model"
packages = [
"go/datasource",
"go/renderer"
]
revision = "84176c64269d8060f99e750ee8aba6f062753336"
[[projects]]
branch = "master"
name = "github.com/hashicorp/go-hclog"
packages = ["."]
revision = "69ff559dc25f3b435631604f573a5fa1efdb6433"
[[projects]]
name = "github.com/hashicorp/go-plugin"
packages = ["."]
revision = "e8d22c780116115ae5624720c9af0c97afe4f551"
[[projects]]
branch = "master"
name = "github.com/hashicorp/go-version"
packages = ["."]
revision = "23480c0665776210b5fbbac6eaaee40e3e6a96b7"
[[projects]]
branch = "master"
name = "github.com/hashicorp/yamux"
packages = ["."]
revision = "2658be15c5f05e76244154714161f17e3e77de2e"
[[projects]]
name = "github.com/inconshreveable/log15"
packages = ["."]
revision = "0decfc6c20d9ca0ad143b0e89dcaa20f810b4fb3"
version = "v2.13"
[[projects]]
name = "github.com/jmespath/go-jmespath"
packages = ["."]
revision = "0b12d6b5"
[[projects]]
name = "github.com/jtolds/gls"
packages = ["."]
revision = "77f18212c9c7edc9bd6a33d383a7b545ce62f064"
version = "v4.2.1"
[[projects]]
name = "github.com/klauspost/compress"
packages = [
"flate",
"gzip"
]
revision = "6c8db69c4b49dd4df1fff66996cf556176d0b9bf"
version = "v1.2.1"
[[projects]]
name = "github.com/klauspost/cpuid"
packages = ["."]
revision = "ae7887de9fa5d2db4eaa8174a7eff2c1ac00f2da"
version = "v1.1"
[[projects]]
name = "github.com/klauspost/crc32"
packages = ["."]
revision = "cb6bfca970f6908083f26f39a79009d608efd5cd"
version = "v1.1"
[[projects]]
name = "github.com/kr/pretty"
packages = ["."]
revision = "73f6ac0b30a98e433b289500d779f50c1a6f0712"
version = "v0.1.0"
[[projects]]
name = "github.com/kr/text"
packages = ["."]
revision = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f"
version = "v0.1.0"
[[projects]]
branch = "master"
name = "github.com/lib/pq"
packages = [
".",
"oid"
]
revision = "d34b9ff171c21ad295489235aec8b6626023cd04"
[[projects]]
name = "github.com/mattn/go-colorable"
packages = ["."]
revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"
version = "v0.0.9"
[[projects]]
name = "github.com/mattn/go-isatty"
packages = ["."]
revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"
version = "v0.0.3"
[[projects]]
name = "github.com/mattn/go-sqlite3"
packages = ["."]
revision = "323a32be5a2421b8c7087225079c6c900ec397cd"
version = "v1.7.0"
[[projects]]
name = "github.com/matttproud/golang_protobuf_extensions"
packages = ["pbutil"]
revision = "3247c84500bff8d9fb6d579d800f20b3e091582c"
version = "v1.0.0"
[[projects]]
branch = "master"
name = "github.com/mitchellh/go-testing-interface"
packages = ["."]
revision = "a61a99592b77c9ba629d254a693acffaeb4b7e28"
[[projects]]
name = "github.com/oklog/run"
packages = ["."]
revision = "4dadeb3030eda0273a12382bb2348ffc7c9d1a39"
version = "v1.0.0"
[[projects]]
name = "github.com/opentracing/opentracing-go"
packages = [
".",
"ext",
"log"
]
revision = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"
version = "v1.0.2"
[[projects]]
name = "github.com/patrickmn/go-cache"
packages = ["."]
revision = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"
version = "v2.1.0"
[[projects]]
name = "github.com/pkg/errors"
packages = ["."]
revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
version = "v0.8.0"
[[projects]]
name = "github.com/prometheus/client_golang"
packages = [
"api",
"api/prometheus/v1",
"prometheus",
"prometheus/promhttp"
]
revision = "967789050ba94deca04a5e84cce8ad472ce313c1"
version = "v0.9.0-pre1"
[[projects]]
branch = "master"
name = "github.com/prometheus/client_model"
packages = ["go"]
revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"
[[projects]]
branch = "master"
name = "github.com/prometheus/common"
packages = [
"expfmt",
"internal/bitbucket.org/ww/goautoneg",
"model"
]
revision = "d811d2e9bf898806ecfb6ef6296774b13ffc314c"
[[projects]]
branch = "master"
name = "github.com/prometheus/procfs"
packages = [
".",
"internal/util",
"nfs",
"xfs"
]
revision = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e"
[[projects]]
branch = "master"
name = "github.com/rainycape/unidecode"
packages = ["."]
revision = "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c"
[[projects]]
name = "github.com/sergi/go-diff"
packages = ["diffmatchpatch"]
revision = "1744e2970ca51c86172c8190fadad617561ed6e7"
version = "v1.0.0"
[[projects]]
name = "github.com/smartystreets/assertions"
packages = [
".",
"internal/go-render/render",
"internal/oglematchers"
]
revision = "7678a5452ebea5b7090a6b163f844c133f523da2"
version = "1.8.3"
[[projects]]
name = "github.com/smartystreets/goconvey"
packages = [
"convey",
"convey/gotest",
"convey/reporting"
]
revision = "9e8dc3f972df6c8fcc0375ef492c24d0bb204857"
version = "1.6.3"
[[projects]]
branch = "master"
name = "github.com/teris-io/shortid"
packages = ["."]
revision = "771a37caa5cf0c81f585d7b6df4dfc77e0615b5c"
[[projects]]
name = "github.com/uber/jaeger-client-go"
packages = [
".",
"config",
"internal/baggage",
"internal/baggage/remote",
"internal/spanlog",
"internal/throttler",
"internal/throttler/remote",
"log",
"rpcmetrics",
"thrift",
"thrift-gen/agent",
"thrift-gen/baggage",
"thrift-gen/jaeger",
"thrift-gen/sampling",
"thrift-gen/zipkincore",
"utils"
]
revision = "b043381d944715b469fd6b37addfd30145ca1758"
version = "v2.14.0"
[[projects]]
name = "github.com/uber/jaeger-lib"
packages = ["metrics"]
revision = "ed3a127ec5fef7ae9ea95b01b542c47fbd999ce5"
version = "v1.5.0"
[[projects]]
name = "github.com/yudai/gojsondiff"
packages = [
".",
"formatter"
]
revision = "7b1b7adf999dab73a6eb02669c3d82dbb27a3dd6"
version = "1.0.0"
[[projects]]
branch = "master"
name = "github.com/yudai/golcs"
packages = ["."]
revision = "ecda9a501e8220fae3b4b600c3db4b0ba22cfc68"
[[projects]]
branch = "master"
name = "golang.org/x/crypto"
packages = [
"md4",
"pbkdf2"
]
revision = "1a580b3eff7814fc9b40602fd35256c63b50f491"
[[projects]]
branch = "master"
name = "golang.org/x/net"
packages = [
"context",
"context/ctxhttp",
"http/httpguts",
"http2",
"http2/hpack",
"idna",
"internal/timeseries",
"trace"
]
revision = "2491c5de3490fced2f6cff376127c667efeed857"
[[projects]]
branch = "master"
name = "golang.org/x/oauth2"
packages = [
".",
"google",
"internal",
"jws",
"jwt"
]
revision = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269"
[[projects]]
branch = "master"
name = "golang.org/x/sync"
packages = ["errgroup"]
revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"
[[projects]]
branch = "master"
name = "golang.org/x/sys"
packages = ["unix"]
revision = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b"
[[projects]]
name = "golang.org/x/text"
packages = [
"collate",
"collate/build",
"internal/colltab",
"internal/gen",
"internal/tag",
"internal/triegen",
"internal/ucd",
"language",
"secure/bidirule",
"transform",
"unicode/bidi",
"unicode/cldr",
"unicode/norm",
"unicode/rangetable"
]
revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
version = "v0.3.0"
[[projects]]
name = "google.golang.org/appengine"
packages = [
".",
"cloudsql",
"internal",
"internal/app_identity",
"internal/base",
"internal/datastore",
"internal/log",
"internal/modules",
"internal/remote_api",
"internal/urlfetch",
"urlfetch"
]
revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a"
version = "v1.0.0"
[[projects]]
branch = "master"
name = "google.golang.org/genproto"
packages = ["googleapis/rpc/status"]
revision = "7bb2a897381c9c5ab2aeb8614f758d7766af68ff"
[[projects]]
name = "google.golang.org/grpc"
packages = [
".",
"balancer",
"balancer/base",
"balancer/roundrobin",
"codes",
"connectivity",
"credentials",
"encoding",
"encoding/proto",
"grpclb/grpc_lb_v1/messages",
"grpclog",
"health",
"health/grpc_health_v1",
"internal",
"keepalive",
"metadata",
"naming",
"peer",
"resolver",
"resolver/dns",
"resolver/passthrough",
"stats",
"status",
"tap",
"transport"
]
revision = "1e2570b1b19ade82d8dbb31bba4e65e9f9ef5b34"
version = "v1.11.1"
[[projects]]
branch = "v3"
name = "gopkg.in/alexcesaro/quotedprintable.v3"
packages = ["."]
revision = "2caba252f4dc53eaf6b553000885530023f54623"
[[projects]]
name = "gopkg.in/asn1-ber.v1"
packages = ["."]
revision = "379148ca0225df7a432012b8df0355c2a2063ac0"
version = "v1.2"
[[projects]]
name = "gopkg.in/bufio.v1"
packages = ["."]
revision = "567b2bfa514e796916c4747494d6ff5132a1dfce"
version = "v1"
[[projects]]
name = "gopkg.in/ini.v1"
packages = ["."]
revision = "6529cf7c58879c08d927016dde4477f18a0634cb"
version = "v1.36.0"
[[projects]]
name = "gopkg.in/macaron.v1"
packages = ["."]
revision = "c1be95e6d21e769e44e1ec33cec9da5837861c10"
version = "v1.3.1"
[[projects]]
branch = "v2"
name = "gopkg.in/mail.v2"
packages = ["."]
revision = "5bc5c8bb07bd8d2803831fbaf8cbd630fcde2c68"
[[projects]]
name = "gopkg.in/redis.v2"
packages = ["."]
revision = "e6179049628164864e6e84e973cfb56335748dea"
version = "v2.3.2"
[[projects]]
name = "gopkg.in/yaml.v2"
packages = ["."]
revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
version = "v2.2.1"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "6e9458f912a5f0eb3430b968f1b4dbc4e3b7671b282cf4fe1573419a6d9ba0d4"
solver-name = "gps-cdcl"
solver-version = 1

View File

@@ -1,209 +0,0 @@
# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"
ignored = [
"github.com/grafana/grafana/data/*",
"github.com/grafana/grafana/public/*",
"github.com/grafana/grafana/node_modules/*"
]
[[constraint]]
name = "github.com/BurntSushi/toml"
version = "0.3.0"
[[constraint]]
branch = "master"
name = "github.com/Unknwon/com"
#version = "1.0.0"
[[constraint]]
name = "github.com/aws/aws-sdk-go"
version = "1.13.56"
[[constraint]]
branch = "master"
name = "github.com/benbjohnson/clock"
[[constraint]]
branch = "master"
name = "github.com/bmizerany/assert"
[[constraint]]
name = "github.com/codegangsta/cli"
version = "1.20.0"
[[constraint]]
name = "github.com/davecgh/go-spew"
version = "1.1.0"
[[constraint]]
name = "github.com/fatih/color"
version = "1.5.0"
[[constraint]]
name = "github.com/go-ldap/ldap"
version = "2.5.1"
[[constraint]]
branch = "master"
name = "github.com/go-macaron/binding"
[[constraint]]
branch = "master"
name = "github.com/go-macaron/gzip"
[[constraint]]
branch = "master"
name = "github.com/go-macaron/session"
[[constraint]]
name = "github.com/go-sql-driver/mysql"
revision = "2cc627ac8defc45d65066ae98f898166f580f9a4"
#version = "1.3.0" //keeping this since we would rather depend on version then commit
[[constraint]]
name = "github.com/go-stack/stack"
version = "1.7.0"
[[constraint]]
name = "github.com/go-xorm/core"
version = "=0.5.7"
[[constraint]]
name = "github.com/go-xorm/xorm"
version = "=0.6.4"
[[constraint]]
name = "github.com/gorilla/websocket"
version = "1.2.0"
[[constraint]]
name = "github.com/gosimple/slug"
version = "1.1.1"
[[constraint]]
branch = "master"
name = "github.com/grafana/grafana-plugin-model"
[[constraint]]
branch = "master"
name = "github.com/hashicorp/go-hclog"
[[constraint]]
name = "github.com/hashicorp/go-plugin"
revision = "e8d22c780116115ae5624720c9af0c97afe4f551"
[[constraint]]
branch = "master"
name = "github.com/hashicorp/go-version"
[[constraint]]
name = "github.com/inconshreveable/log15"
version = "2.13.0"
[[constraint]]
branch = "master"
name = "github.com/lib/pq"
[[constraint]]
name = "github.com/mattn/go-isatty"
version = "0.0.3"
[[constraint]]
name = "github.com/mattn/go-sqlite3"
version = "1.7.0"
[[constraint]]
name = "github.com/opentracing/opentracing-go"
version = "1.0.2"
[[constraint]]
name = "github.com/patrickmn/go-cache"
version = "2.1.0"
[[constraint]]
name = "github.com/prometheus/client_golang"
version = "0.9.0-pre1"
[[constraint]]
branch = "master"
name = "github.com/prometheus/client_model"
[[constraint]]
branch = "master"
name = "github.com/prometheus/common"
[[constraint]]
name = "github.com/smartystreets/goconvey"
version = "1.6.3"
[[constraint]]
name = "github.com/uber/jaeger-client-go"
version = "2.11.2"
[[constraint]]
name = "github.com/yudai/gojsondiff"
version = "1.0.0"
[[constraint]]
branch = "master"
name = "golang.org/x/net"
[[constraint]]
branch = "master"
name = "golang.org/x/oauth2"
[[constraint]]
branch = "master"
name = "golang.org/x/sync"
[[constraint]]
name = "gopkg.in/mail.v2"
branch = "v2"
[[constraint]]
name = "gopkg.in/ini.v1"
version = "1.32.0"
[[constraint]]
name = "gopkg.in/macaron.v1"
version = "1.2.4"
[[constraint]]
branch = "v2"
name = "gopkg.in/yaml.v2"
[prune]
non-go = true
go-tests = true
unused-packages = true
[[constraint]]
branch = "master"
name = "github.com/teris-io/shortid"
[[constraint]]
name = "github.com/denisenkom/go-mssqldb"
revision = "270bc3860bb94dd3a3ffd047377d746c5e276726"
[[constraint]]
name = "github.com/VividCortex/mysqlerr"
branch = "master"

View File

@@ -9,12 +9,17 @@ module.exports = function (grunt) {
destDir: 'dist',
tempDir: 'tmp',
platform: process.platform.replace('win32', 'windows'),
enterprise: false,
};
if (grunt.option('platform')) {
config.platform = grunt.option('platform');
}
if (grunt.option('enterprise')) {
config.enterprise = true;
}
if (grunt.option('arch')) {
config.arch = grunt.option('arch');
} else {

384
ISSUE_TRIAGE.md Normal file
View File

@@ -0,0 +1,384 @@
Triaging of issues
------------------
Grafana being a popular open source project there are a lot of incoming issues. The main goal of issue triage is to categorize all incoming issues and make sure it has all basic information needed for anyone else to understand and/or being able to start working with it.
The core maintainers of the Grafana project is responsible for categorizing all incoming issues and delegate any critical and/or important issue to other maintainers. Currently there's one maintainer each week responsible. Besides that part, triage provides an important way to contribute to an open source project. Triage helps ensure issues resolve quickly by:
* Describing the issue's intent and purpose is conveyed precisely. This is necessary because it can be difficult for an issue to explain how an end user experiences a problem and what actions they took.
* Giving a contributor the information they need before they commit to resolving an issue.
* Lowering the issue count by preventing duplicate issues.
* Streamlining the development process by preventing duplicate discussions.
* If you don't have the knowledge or time to code, consider helping with triage. The community will thank you for saving them time by spending some of yours.
**Simplified flowchart diagram of the issue triage process:**
<!-- https://textik.com/#610afa78553def29 -->
```
+--------------------------+
+----------------+ New issue opened/ |
| | more information added |
| +-------------+------------+
| Ask for more |
| information +-------------+------------+
| | All information needed |
| +--------+ to categorize the issue? +--------+
| | | | |
| | NO +--------------------------+ YES |
| | |
+------+-------+-------------+ +------------+---------+ +----------------------------+
| | | | | |
| label: needs more details | | Needs investigation? +--YES---+ label: needs investigation |
| | | | | |
+----------------------------+ +----------------+-----+ +--------------+-------------+
NO | |
| Investigate |
+-----------+----------+ |
| label: type/* | |
| label: area/* +------------------+
| label: datasource/* |
+-----|----------+-----+
| |
| |
| +--+--------------------+ +--------------------+
| | | | label: priority/* |
| | Needs priority? +--YES---+| milestone? |
| | | | |
| +--------------------+--+ +----+---------------+
| NO | |
| | |
+----+-------------+ +---+----------+ |
| | | | |
| Close issue +----------+ Done +------+
| | | |
+------------------+ +--------------+
```
## How you can help
There are multiple ways that you can help with the Grafana project, especially without writing a single line of code. Everyone in the Grafana community will be greatly thankful you for helping out with any of the below tasks.
### Answer/ask questions
The [community site](https://community.grafana.com/) is the main channel to be used for asking and answering questions related to the Grafana project. This may be the first place a new or existing Grafana user look/ask for help after they found that the [documentation](https://grafana.com/docs) wasn't answering their questions. It's very important to help new and existing users so that these new users can find proper answers and eventually help out other users and by that keep growing the Grafana community.
Please signup to the Grafana [community site](https://community.grafana.com/) and start help other Grafana users by answering their questions and/or ask for help.
### Report documentation enhancements
If you visit the [documentation site](https://grafana.com/docs) and find typos/error/lack of information please report these by clicking on the `Request doc changes` link found on every page and/or contribute the changes yourself by clicking on `Edit this page` and open a pull request. Everyone in the community will greatly thank you for.
Please read about how documentation issues is triaged [below](#documentation-issue) to understand what kind of documentation may be suitable to request/add.
### Report a security vulnerability
Please review the [security policy](https://github.com/grafana/grafana/security/policy) for more details.
### Report bugs
Report a bug you found when using Grafana by [opening a new bug report](https://github.com/grafana/grafana/issues/new?labels=type%3A+bug&template=1-bug_report.md).
### Request enhancements/new features
Suggest an enhancement or new feature for the Grafana project by [opening a new enhancement issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+feature+request&template=2-feature_request.md).
Alternatively, help make Grafana be better at being accessible to all by [opening a new accessibility issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+accessibility&template=3-accessibility.md).
### Report inaccurate issue information
If you find an issue that have a badly formatted title and/or description, bad language/grammar and/or wrong labels it's important to let the issue author or maintainers know so it can be fixed. See [good practices](#good-practices) regarding basic information for issues below.
### Request closing of issues
The Grafana project have a lot of open issues and the main goal is to only have issues open if their still relevant. If you find an issue that you think already have been resolved or no longer is relevant please report by adding a comment and explain why you think it should be closed including related issues (`#<issue number>`), if applicable, and optionally mention one of the maintainers.
### Investigate issues
See [investigation of issues](#investigation-of-issues).
### Vote on enhancements/bugs
Helping the Grafana project to know which issues are most important by users and the community is crucial for the success of the project. Read more about [prioritizing issues](#4-prioritization-of-issues) for details about how issues are being prioritized. The Grafana project use GitGub issues and reactions for collecting votes on enhancement and bugs.
**Please don't add `+1` issue comments or similar since that will notify everyone that have subscribed to an issue and it doesn't add any useful update, rather it creates a bad .**
If you want to show your interest or importance of an issue, please use [GitHub's reactions](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments).
### Report duplicates
If you find two issues describing the same bug/enhancement/feature please add a comment in one of the issue and explain which issues (`#<issue number>`) you think is a duplicate of another issue (`#<issue number>`).
### Suggest ideas for resolving bugs/enhancements
Related to how [issues are being prioritized](#4-prioritization-of-issues) it's important to help anyone that's interested in contributing code for resolving a bug or enhancement. This can be anything from getting started and setup the development environment to reference code and files where changes probably needs to be made and/or suggest ideas on how enhancements may function/be implemented.
Please read about how [help from the community](#5-requesting-help-from-the-community) may be requested when issues being triaged.
## 1. Find uncategorized issues
To get started with issue triage and finding issues that haven't been triaged you have two alternatives.
### Browse unlabeled issues
The easiest and straigt forward way of getting started and finding issues that haven't been triaged is to browse [unlabeled issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+no%3Alabel) and starting from the bottom and working yourself to the top.
### Subscribe to all notifications
The more advanced, but recommended way is to subscribe to all notifications from this repository which means that all new issues, pull requests, comments and important status changes are sent to your configured email address. Read this [guide](https://help.github.com/en/articles/watching-and-unwatching-repositories#watching-a-single-repository) for help with setting this up.
It's highly recommended that you setup filters to automatically remove emails from the inbox and label/categorize them accordingly to make it easy for you to understand when you need to act upon a notification or where to look for finding issues that haven't been triaged etc.
Instructions for setting up filters in Gmail can be found [here](#setting-up-gmail-filters). Another alternative is to use [Trailer](https://github.com/ptsochantaris/trailer) or similar software.
## 2. Ensure the issue contains basic information
Before triaging an issue very far, make sure that the issue's author provided the standard issue information. This will help you make an educated recommendation on how to categorize the issue. The Grafana project utilizes [GitHub issue templates](https://help.github.com/en/articles/creating-issue-templates-for-your-repository) to guide contributors to provide standard information that must be included for each type of template or type of issue.
### Standard issue information that must be included
Given a certain [issue template]([template](https://github.com/grafana/grafana/issues/new/choose)) have been used by the issue author or depending how the issue is perceived by the issue triage responsible, the following should help you understand what standard issue information that must be included.
#### Bug report?
Should explain what happened, what was expected and how to reproduce it together with any additional information that may help giving a complete picture of what happened such as screenshots, [query inspector](https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630) output and any environment related information that's applicable and/or maybe related to the reported problem:
- Grafana version
- Data source type & version
- Platform & OS Grafana is installed on
- User OS & Browser + versions
- Using docker + what environment
- Which plugins
- Configuration database in use (sqlite, mysql, postgres)
- Reverse proxy in front of Grafana, what version and configuration
- Non-default configuration settings
- Development environment like Go and Node versions, if applicable
#### Enhancement request?
Should explain what enhancement or feature that the author wants to be added and why that is needed.
#### Accessibility issue?
This is a mix between a bug report and enhancement request but focused on accessibility issues to help make Grafana improve keyboard navigation, screen-reader support and being accessible to everyone. The report should include relevant WCAG criteria, if applicable.
#### Support request?
In general, if the issue description and title is perceived as a question no more information is needed.
### Good practices
To make it easier for everyone to understand and find issues they're searching for it's suggested as a general rule of thumbs to:
* Make sure that issue titles are named to explain the subject of the issue, has a correct spelling and doesn't include irrelevant information and/or sensitive information.
* Make sure that issue descriptions doesn't include irrelevant information, information from template that haven't been filled out and/or sensitive information.
* Do your best effort to change title and description or request suggested changes by adding a comment.
Note: Above rules is applicable to both new and existing issues of the Grafana project.
### Do you have all the information needed to categorize an issue?
Depending on the issue, you might not feel all this information is needed. Use your best judgement. If you cannot triage an issue using what its author provided, explain kindly to the author that they must provide the above information to clarify the problem. Label issue with `needs more detail` and add any related `area/*` or `datasource/*` labels.
If the author provides the standard information but you are still unable to triage the issue, request additional information. Do this kindly and politely because you are asking for more of the author's time.
If the author does not respond requested information within the timespan of a week, close the issue with a kind note stating that the author can request for the issue to be reopened when the necessary information is provided.
When you feel you have all the information needed you're ready to [categorizing the issue](#3-categorizing-an-issue).
## 3. Categorizing an issue
An issue can have multiple of the following labels. Typically, a properly categorized issue should at least have:
- One label identifying its type (`type/*`).
- One or multiple labels identifying the functional areas of interest or component (`area/*`) and/or datasource (`datasource/*`), if applicable.
Label | Description
------- | --------
`type/bug` | A feature isn't working as expected given design or documentation.
`type/feature-request` | Request for a new feature or enhancement.
`type/docs` | Documentation problem or enhancement.
`type/accessibility` | Accessibility problem or enhancement.
`type/question` | Issue is or perceived as a question.
`type/duplicate` | An existing issue of the same subject/request have already been reported.
`type/works-as-intended` | A reported bug works as intended/by design.
`type/build-packaging` | Build or packaging problem or enhancement.
`area/*` | Subject is related to a functional area of interest or component.
`datasource/*` | Subject is related to a core datasource plugin.
### Duplicate issue?
Make sure that it's not a duplicate by searching existing issues using related terms from the issue title and description. If you think you know there are an existing issue, but can't find it please reach out to one of the maintainers and ask for help. If you identify that the issue is a duplicate of an existing issue:
1. Add a comment `Duplicate of #<issue number>`. GitHub will recognize this and add some additional context to the issue activity.
2. Close the issue and label it with `type/duplicate`.
3. Optionally add any related `area/*` or `datasource/*` labels.
4. If applicable, add a comment with additional information.
### Bug report?
If it's not perfectly clear that it's an actual bug, quickly try to reproduce it.
**It's a bug/it can be reproduced:**
1. Add a comment describing detailed steps for how to reproduce it, if applicable.
2. Label the issue `type/bug` and at least one `area/*` or `datasource/*` label.
3. If you know that maintainers wont be able to put any resources into it for some time then label the issue with `help wanted` and optionally `beginner friendly` together with pointers on which code to update to fix the bug. This should signal to the community that we would appreciate any help we can get to resolve this.
4. Move on to [prioritizing the issue](#4-prioritization-of-issues).
**It can't be reproduced:**
1. Either [ask for more information](#2-ensure-the-issue-contains-basic-information) needed to investigate it more thoroughly.
2. Either [delegate further investigations](#investigation-of-issues) to someone else.
**It works as intended/by design:**
1. Kindly and politely add a comment explaining briefly why we think it works as intended and close the issue.
2. Label the issue `type/works-as-intended`.
### Enhancement/feature?
1. Label the issue `type/feature-request` and at least one `area/*` or `datasource/*` label.
2. Move on to [prioritizing the issue](#4-prioritization-of-issues).
### Documentation issue?
First, evaluate if the documentation makes sense to be included in the Grafana project:
- Is this something we want/can maintain as a project?
- Is this referring to usage of some specific integration/tool and in that case are those a popular use case in combination with Grafana?
- If unsure, kindly and politely add a comment explaining that we would need [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) to identify that lots of other users wants/needs this.
Second, label the issue `type/docs` and at least one `area/*` or `datasource/*` label.
**Minor typo/error/lack of information:**
There's a minor typo/error/lack of information that adds a lot of confusion for users and given the amount of work is a big win to make sure fixing it:
1. Either update the documentation yourself and open a pull request.
2. Either delegate the work to someone else by assigning that person to the issue and add the issue to next major/minor milestone.
**Major error/lack of information:**
1. Label the issue with `help wanted` and `beginner friendly`, if applicable, to signal that we find this important to fix and we would appreciate any help we can get from the community.
2. Move on to [prioritizing the issue](#4-prioritization-of-issues).
### Accessibility issue?
1. Label the issue `type/accessibility` and at least one `area/*` or `datasource/*` label.
### Support request?
1. Kindly and politely direct the issue author to the [community site](https://community.grafana.com/) and explain that GitHub is mainly used for tracking bugs and feature requests. If possible, it's usually a good idea to add some pointers to the issue author's question.
2. Close the issue and label it with `type/question`.
## 4. Prioritization of issues
In general bugs and enhancement issues should be labeled with a priority.
This is the most difficult thing with triaging issues since it requires a lot of knowledge, context and experience before being able to think of and start feel comfortable adding a certain priority label.
The key here is asking for help and discuss issues to understand how more experienced project members thinks and reason. By doing that you learn more and eventually be more and more comfortable with prioritizing issues.
In any case there are uncertainty around the priorization of an issue, please ask the maintainers for help.
Label | Description
------- | --------
`priority/critical` | Highest priority. Must be actively worked on as someone's top priority right now.
`priority/support-subscription` | This is important for one or several customers having a paid Grafana support subscription.
`priority/important-soon` | Must be staffed and worked on either currently, or very soon, ideally in time for the next release.
`priority/important-longterm` | Important over the long term, but may not be staffed and/or may need multiple releases to complete.
`priority/nice-to-have` | It's a good idea, but not scheduled for any release.
`priority/awaiting-more-evidence` | Lowest priority. Possibly useful, but not yet enough interest in it.
`priority/unscheduled` | Something to look into before and to be discussed during the planning of the next (upcoming) major/minor stable release.
**Critical bug?**
1. If a bug have been categorized and any of the following problems applies the bug should be labeled as critical and must be actively worked on as someone's top priority right now.
- Results in any data loss
- Critical security or performance issues
- Problem that makes a feature unusable
- Multiple users experience a severe problem affecting their business, users etc.
2. Label the issue `priority/critical`.
3. If applicable, label the issue `priority/support-subscription`.
4. Add the issue to the next upcoming patch release milestone. Create a new milestone if there are none.
5. Escalate the problem to the maintainers.
6. Assign or ask a maintainer for help assigning someone to make this issue their top priority right now.
**Important short-term?**
1. Label the issue `priority/important-soon`.
2. If applicable, label the issue `priority/support-subscription`.
3. Add the issue to the next upcoming patch or major/minor stable release milestone. Ask maintainers for help if unsure if it's a patch or not. Create a new milestone if there are none.
4. Make sure to add the issue to a suitable backlog of a GitHub project and prioritize it or assign someone to work on it now or very soon.
5. Consider requesting [help from the community](#5-requesting-help-from-the-community), even though it may be problematic given a short amount of time until it should be released.
**Important long-term?**
1. Label the issue `priority/important-longterm`.
2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
**Nice to have?**
1. Label the issue `priority/nice-to-have`.
2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
**Not critical, but unsure?**
1. Label the issue `priority/unscheduled`.
2. Consider requesting [help from the community](#5-requesting-help-from-the-community).
## 5. Requesting help from the community
Depending on the issue and/or priority, it's always a good idea to consider signalling to the community that help from community is appreciated and needed in case an issue is not prioritized to be worked on by maintainers. Use your best judgement. In general, when requesting help from the community it means a contribution has a good chance of getting accepted and merged.
In many cases the issue author or community as a whole is more suitable to contribute changes since they're experts in their domain. It's also quite common that someone has tried to get something to work using the documentation without success and made an effort to get it to work and/or reached out to the [community site](https://community.grafana.com/) to get the missing information. In especially these areas it's more likely that there exists experts in their own domain and usually a good idea to request help from contributors:
- Database setups
- Authentication like OAuth providers and LDAP setups
- Platform specific things
- Reverse proxy setups
- Alert notifiers
1. Kindly and politely add a comment to signal to users subscribed to updates of the issue.
- Explain that the issue would be nice to get resolved, but it isn't prioritized to work on by maintainers for an unforseen future.
- If possible or applicable, try to help contributors getting starting by adding pointers and references to what code/files need to be changed and/or ideas of a good way to solve/implement the issue.
2. Label the issue with `help wanted`.
3. If applicable, label the issue with `beginner friendly` to denote that the issue is suitable for a beginner to work on.
4. If possible, try to estimate the amount of work by adding `effort/small`, `effort/medium` or `effort/large`.
## Investigation of issues
When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported problem at a first glance, the issue is labeled [Needs investigation](https://github.com/grafana/grafana/labels/needs%20investigation). Depending of the perceived severity and/or number of [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments), the investigation will either be delegated to another maintainer for further investigation or either put on hold until someone else (maintainer or contributor) picks it up and eventually start investigating it.
Investigating issues can be a very time consuming task, especially for the maintainers given the huge number of combinations of plugins, datasources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services etc that are being used with Grafana. There are a certain amount of combinations that are more common than others and these are in general easier for maintainers to investigate.
For some other combinations there may not be possible at all for a maintainer to setup a proper test environment for being able to investigate. In these cases we really appreciate any help we can get from the community. Otherwise the issue is highly likely to be closed.
Even if you don't have the time or knowledge to investigate an issue we highly recommend that you [upvote](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) the issue if you happen to have the same problem. If you have further details that may help investigating the issue please provide as much information as possible.
## Appendix
### Setting up Gmail filters
If you're using Gmail it's highly recommened that you setup filters to automatically remove email from the inbox and label them accordingly to make it easy for you to understand when you need to act upon a notification or process all incoming issues that haven't been triaged.
This may be setup by personal preference, but here's a working configuration for reference.
1. Follow instructions in [gist](https://gist.github.com/marefr/9167c2e31466f6316c1cba118874e74f)
2. In Gmail, go to Settings -> Filters and Blocked Addresses
3. Import filters -> select xml file -> Open file
4. Review filters
5. Optional, Check Apply new filters to existing email
6. Create filters
This will give you a structure of labels in the sidebar similar to the following:
```
- Inbox
...
- Github (mine)
- activity
- assigned
- mentions
- Github (other)
- Grafana
```
* All notifications youll need to read/take action on shows up as unread in Github (mine) and its sub-labels.
* All other notifications you dont need to take action on shows up as unread in Github (other) and its sub-labels
* This is convenient for issue triage and to follow the activity in the Grafana project.

202
LICENSE Normal file
View File

@@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2015 Grafana Labs
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

111
Makefile
View File

@@ -1,45 +1,138 @@
-include local/Makefile
.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go gosec revive golangci-lint go-vet test-go test-js test run clean devenv devenv-down revive-alerting
GO := GO111MODULE=on go
GO_FILES := ./pkg/...
all: deps build
deps-go:
go run build.go setup
deps-js:
yarn install --pure-lockfile --no-progress
deps-js: node_modules
deps: deps-js
build-go:
go run build.go build
@echo "build go files"
GO111MODULE=on go run build.go build
build-server:
go run build.go build-server
@echo "build server"
GO111MODULE=on go run build.go build-server
build-cli:
go run build.go build-cli
@echo "build in CI environment"
GO111MODULE=on go run build.go build-cli
build-js:
@echo "build frontend"
yarn run build
build: build-go build-js
build-docker-dev:
@echo "build development container"
@echo "\033[92mInfo:\033[0m the frontend code is expected to be built already."
go run build.go -goos linux -pkg-arch amd64 ${OPT} build package-only latest
GO111MODULE=on go run build.go -goos linux -pkg-arch amd64 ${OPT} build pkg-archive latest
cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
cd packaging/docker && docker build --tag grafana/grafana:dev .
build-docker-full:
@echo "build docker container"
docker build --tag grafana/grafana:dev .
test-go:
go test -v ./pkg/...
@echo "test backend"
GO111MODULE=on go test -v ./pkg/...
test-js:
@echo "test frontend"
yarn test
test: test-go test-js
run:
./bin/grafana-server
clean:
@echo "cleaning"
rm -rf node_modules
rm -rf public/build
node_modules: package.json yarn.lock
@echo "install frontend dependencies"
yarn install --pure-lockfile --no-progress
scripts/go/bin/revive: scripts/go/go.mod
@cd scripts/go; \
$(GO) build -o ./bin/revive github.com/mgechev/revive
scripts/go/bin/gosec: scripts/go/go.mod
@cd scripts/go; \
$(GO) build -o ./bin/gosec github.com/securego/gosec/cmd/gosec
scripts/go/bin/bra: scripts/go/go.mod
@cd scripts/go; \
$(GO) build -o ./bin/bra github.com/Unknwon/bra
scripts/go/bin/golangci-lint: scripts/go/go.mod
@cd scripts/go; \
$(GO) build -o ./bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
revive: scripts/go/bin/revive
@echo "lint via revive"
@scripts/go/bin/revive \
-formatter stylish \
-config ./scripts/go/configs/revive.toml \
$(GO_FILES)
revive-alerting: scripts/go/bin/revive
@echo "lint alerting via revive"
@scripts/go/bin/revive \
-formatter stylish \
./pkg/services/alerting/...
# TODO recheck the rules and leave only necessary exclusions
gosec: scripts/go/bin/gosec
@echo "lint via gosec"
@scripts/go/bin/gosec -quiet \
-exclude=G104,G107,G201,G202,G204,G301,G304,G401,G402,G501 \
-conf=./scripts/go/configs/gosec.json \
$(GO_FILES)
golangci-lint: scripts/go/bin/golangci-lint
@echo "lint via golangci-lint"
@scripts/go/bin/golangci-lint run \
--config ./scripts/go/configs/.golangci.yml \
$(GO_FILES)
go-vet:
@echo "lint via go vet"
@go vet $(GO_FILES)
lint-go: go-vet golangci-lint revive revive-alerting gosec
run: scripts/go/bin/bra
@scripts/go/bin/bra run
# create docker-compose file with provided sources and start them
# example: make devenv sources=postgres,openldap
ifeq ($(sources),)
devenv:
@printf 'You have to define sources for this command \nexample: make devenv sources=postgres,openldap\n'
else
devenv: devenv-down
$(eval targets := $(shell echo '$(sources)' | tr "," " "))
@cd devenv; \
./create_docker_compose.sh $(targets) || \
(rm -rf docker-compose.yaml; exit 1)
@cd devenv; \
docker-compose up -d --build
endif
# drop down the envs
devenv-down:
@cd devenv; \
test -f docker-compose.yaml && \
docker-compose down || exit 0;

View File

@@ -1,13 +1,13 @@
# Plugin Development
This document is not meant as complete guide for developing plugins but more as a changelog for changes in
Grafana that can impact plugin development. When ever you as plugin author encounter an issue with your plugin after
This document is not meant as a complete guide for developing plugins but more as a changelog for changes in
Grafana that can impact plugin development. Whenever you as a plugin author encounter an issue with your plugin after
upgrading Grafana please check here before creating an issue.
## Links
- [Datasource plugin written in typescript](https://github.com/grafana/typescript-template-datasource)
- [Simple json dataource plugin](https://github.com/grafana/simple-json-datasource)
- [Datasource plugin written in TypeScript](https://github.com/grafana/typescript-template-datasource)
- [Simple JSON datasource plugin](https://github.com/grafana/simple-json-datasource)
- [Plugin development guide](http://docs.grafana.org/plugins/developing/development/)
- [Webpack Grafana plugin template project](https://github.com/CorpGlory/grafana-plugin-template-webpack)
@@ -27,3 +27,8 @@ If you think we missed exposing a crucial lib or Grafana component let us know b
The angular directive `<spectrum-picker>` is now deprecated (will still work for a version more) but we recommend plugin authors
to upgrade to new `<color-picker color="ctrl.color" onChange="ctrl.onSparklineColorChange"></color-picker>`
## Changes in v6.0
### DashboardSrv.ts
If you utilize [DashboardSrv](https://github.com/grafana/grafana/commit/8574dca081002f36e482b572517d8f05fd44453f#diff-1ab99561f9f6a10e1fafcddc39bc1d65) in your plugin code, `dash` was renamed to `dashboard`

140
README.md
View File

@@ -1,5 +1,5 @@
[Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) [![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana) [![codecov](https://codecov.io/gh/grafana/grafana/branch/master/graph/badge.svg)](https://codecov.io/gh/grafana/grafana)
================
# [Grafana](https://grafana.com) [![Circle CI](https://circleci.com/gh/grafana/grafana.svg?style=svg)](https://circleci.com/gh/grafana/grafana) [![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana) [![codecov](https://codecov.io/gh/grafana/grafana/branch/master/graph/badge.svg)](https://codecov.io/gh/grafana/grafana)
[Website](https://grafana.com) |
[Twitter](https://twitter.com/grafana) |
[Community & Forum](https://community.grafana.com)
@@ -7,77 +7,116 @@
Grafana is an open source, feature rich metrics dashboard and graph editor for
Graphite, Elasticsearch, OpenTSDB, Prometheus and InfluxDB.
<!---
![](http://docs.grafana.org/assets/img/features/dashboard_ex1.png)
-->
## Installation
Head to [docs.grafana.org](http://docs.grafana.org/installation/) and [download](https://grafana.com/get)
the latest release.
If you have any problems please read the [troubleshooting guide](http://docs.grafana.org/installation/troubleshooting/).
Head to [docs.grafana.org](http://docs.grafana.org/installation/) for documentation or [download](https://grafana.com/get) to get the latest release.
## Documentation & Support
Be sure to read the [getting started guide](http://docs.grafana.org/guides/gettingstarted/) and the other feature guides.
## Run from master
If you want to build a package yourself, or contribute - Here is a guide for how to do that. You can always find
If you want to build a package yourself, or contribute - here is a guide for how to do that. You can always find
the latest master builds [here](https://grafana.com/grafana/download)
### Dependencies
- Go 1.11
- NodeJS LTS
- Go (Latest Stable)
- Node.js LTS
- yarn [`npm install -g yarn`]
### Get the project
**The project located in the go-path will be your working directory.**
### Building the backend
```bash
go get github.com/grafana/grafana
cd $GOPATH/src/github.com/grafana/grafana
go run build.go setup
go run build.go build
```
### Building frontend assets
### Run and rebuild on source change
For this you need nodejs (v.6+).
#### Backend
To run the backend and rebuild on source change:
To build the assets, rebuild on file change, and serve them by Grafana's webserver (http://localhost:3000):
```bash
npm install -g yarn
yarn install --pure-lockfile
yarn watch
make run
```
#### Frontend
Rebuild on file change, and serve them by Grafana's webserver (http://localhost:3000):
```bash
yarn start
```
Build the assets, rebuild on file change with Hot Module Replacement (HMR), and serve them by webpack-dev-server (http://localhost:3333):
```bash
yarn start
# OR set a theme
env GRAFANA_THEME=light yarn start
```
Note: HMR for Angular is not supported. If you edit files in the Angular part of the app, the whole page will reload.
Run tests
```bash
yarn start:hot
# OR set a theme
env GRAFANA_THEME=light yarn start:hot
```
_Note: HMR for Angular is not supported. If you edit files in the Angular part of the app, the whole page will reload._
Run tests and rebuild on source change:
```bash
yarn jest
```
### Recompile backend on source change
**Open grafana in your browser (default: e.g. `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).**
### Building
#### The backend
To rebuild on source change.
```bash
go get github.com/Unknwon/bra
bra run
go run build.go setup
go run build.go build
```
Open grafana in your browser (default: `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).
#### Frontend assets
### Building a docker image (on linux/amd64)
_For this you need Node.js (LTS version)._
This builds a docker image from your local sources:
```bash
yarn install --pure-lockfile
```
### Building a Docker image
There are two different ways to build a Grafana docker image. If your machine is setup for Grafana development and you run linux/amd64 you can build just the image. Otherwise, there is the option to build Grafana completely within Docker.
Run the image you have built using: `docker run --rm -p 3000:3000 grafana/grafana:dev`
#### Building on linux/amd64 (fast)
1. Build the frontend `go run build.go build-frontend`
2. Build the docker image `make build-docker-dev`
The resulting image will be tagged as `grafana/grafana:dev`
#### Building anywhere (slower)
Choose this option to build on platforms other than linux/amd64 and/or not have to setup the Grafana development environment.
1. `make build-docker-full` or `docker build -t grafana/grafana:dev .`
The resulting image will be tagged as `grafana/grafana:dev`
Notice: If you are using Docker for MacOS, be sure to set the memory limit to be larger than 2 GiB (at docker -> Preferences -> Advanced), otherwise `grunt build` may fail.
## Development
### Dev config
Create a custom.ini in the conf directory to override default configuration options.
@@ -91,7 +130,9 @@ In your custom.ini uncomment (remove the leading `;`) sign. And set `app_mode =
### Running tests
#### Frontend
Execute all frontend tests
```bash
yarn test
```
@@ -102,6 +143,7 @@ Writing & watching frontend tests
- Jest will run all test files that end with the name ".test.ts"
#### Backend
```bash
# Run Golang tests using sqlite3 as database (default)
go test ./pkg/...
@@ -113,24 +155,39 @@ GRAFANA_TEST_DB=mysql go test ./pkg/...
GRAFANA_TEST_DB=postgres go test ./pkg/...
```
## Building custom docker image
#### End-to-end
Execute all end-to-end tests
You can build a custom image using Docker, which doesn't require installing any dependencies besides docker itself.
```bash
git clone https://github.com/grafana/grafana
cd grafana
docker build -t grafana:dev .
docker run -d --name=grafana -p 3000:3000 grafana:dev
yarn e2e-tests
```
Open grafana in your browser (default: `http://localhost:3000`) and login with admin user (default: `user/pass = admin/admin`).
Execute all end-to-end tests using using a specific url
```bash
ENV BASE_URL=http://localhost:3333 yarn e2e-tests
```
Debugging all end-to-end tests (BROWSER=1 will start the browser and SLOWMO=1 will delay each puppeteer operation by 100ms)
```bash
ENV BROWSER=1 SLOWMO=1 yarn e2e-tests
```
### Datasource and dashboard provisioning
[Here](https://github.com/grafana/grafana/tree/master/devenv) you can find helpful scripts and docker-compose setup
that will populate your dev environment for quicker testing end experimenting.
## Contribute
If you have any idea for an improvement or found a bug, do not hesitate to open an issue.
And if you have time clone this repo and submit a pull request and help me make Grafana
If you have any ideas for improvement or have found a bug, do not hesitate to open an issue.
And if you have time, clone this repo and submit a pull request to help me make Grafana
the kickass metrics & devops dashboard we all dream about!
Read the [contributing](https://github.com/grafana/grafana/blob/master/CONTRIBUTING.md) guide then check the [`beginner friendly`](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) label to find issues that are easy and that we would like help with.
## Plugin development
Checkout the [Plugin Development Guide](http://docs.grafana.org/plugins/developing/development/) and checkout the [PLUGIN_DEV.md](https://github.com/grafana/grafana/blob/master/PLUGIN_DEV.md) file for changes in Grafana that relate to
@@ -138,5 +195,4 @@ plugin development.
## License
Grafana is distributed under Apache 2.0 License.
Grafana is distributed under [Apache 2.0 License](https://github.com/grafana/grafana/blob/master/LICENSE).

View File

@@ -1,28 +1,4 @@
# Roadmap (2018-08-07)
This roadmap is a tentative plan for the core development team. Things change constantly as PRs come in and priorities change.
But it will give you an idea of our current vision and plan.
### Short term (1-2 months)
- PRs & Bugs
- Multi-Stat panel
- Metrics & Log Explore UI
### Mid term (2-4 months)
- React Panels
- Change visualization (panel type) on the fly.
- Templating Query Editor UI Plugin hook
- Backend plugins
### Long term (4 - 8 months)
- Alerting improvements (silence, per series tracking, etc)
- Progress on React migration
### In a distant future far far away
- Meta queries
- Integrated light weight TSDB
- Web socket & live data sources
### Outside contributions
We know this is being worked on right now by contributors (and we hope to merge it when it's ready).
Go to the Issues tab on GitHub. There you will find, at the top, 3 pinned roadmap issues.

17
SECURITY.md Normal file
View File

@@ -0,0 +1,17 @@
Reporting Security Issues
------------------
If you think you have found a security vulnerability, please send a report to [security@grafana.com](mailto:security@grafana.com). This address can be used for all of Grafana Labs's open source and commercial products (including but not limited to Grafana, Grafana Cloud, Grafana Enterprise, and grafana.com). We can accept only vulnerability reports at this address. We would prefer that you encrypt your message to us; please use our PGP key. The key fingerprint is:
F988 7BEA 027A 049F AE8E 5CAA D125 8932 BE24 C5CA
The key is available from [pgp.mit.edu](https://pgp.mit.edu/pks/lookup?op=get&search=0xF9887BEA027A049FAE8E5CAAD1258932BE24C5CA) by searching for [grafana](https://pgp.mit.edu/pks/lookup?search=grafana&op=index).
Grafana Labs will send you a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
**Important:** We ask you to not disclose the vulnerability before it have been fixed and announced, unless you have got a response from the Grafana Labs security team that you can do that.
### Security Announcements
We maintain a category on the community site called [Security Announcements](https://community.grafana.com/c/security-announcements),
where we will post a summary, remediation, and mitigation details for any patch containing security fixes. You can also subscribe to email updates to this category if you have a grafana.com account and sign on to the community site or track updates via an [RSS feed](https://community.grafana.com/c/security-announcements.rss).

9
SUPPORT.md Normal file
View File

@@ -0,0 +1,9 @@
Need help or support?
------------------
**Please note:**
- Only submit issues for bug reports, feature requests or enhancements.
- Grafana project uses GitHub mainly for tracking bugs and feature requests.
- Asking a question by opening an issue will directly result in issue being closed.
If you require help or support then ask a question and/or find existing questions/answers in the [Grafana community site](https://community.grafana.com/).

112
UPGRADING_DEPENDENCIES.md Normal file
View File

@@ -0,0 +1,112 @@
# Guide to Upgrading Dependencies
Upgrading Go or Node.js requires making changes in many different files. See below for a list and explanation for each.
## Go
- CircleCi
- `grafana/build-container`
- Appveyor
- Dockerfile
## Node.js
- CircleCI
- `grafana/build-container`
- Appveyor
- Dockerfile
## Go Dependencies
The Grafana project uses [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages. This requires a working Go environment with version 1.11 or greater installed.
All dependencies are vendored in the `vendor/` directory.
_Note:_ Since most developers of Grafana still use the `GOPATH` we need to specify `GO111MODULE=on` to make `go mod` and `got get` work as intended. If you have setup Grafana outside of the `GOPATH` on your machine you can skip `GO111MODULE=on` when running the commands below.
To add or update a new dependency, use the `go get` command:
```bash
# The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
# Pick the latest tagged release.
GO111MODULE=on go get example.com/some/module/pkg
# Pick a specific version.
GO111MODULE=on go get example.com/some/module/pkg@vX.Y.Z
```
Tidy up the `go.mod` and `go.sum` files and copy the new/updated dependency to the `vendor/` directory:
```bash
# The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
GO111MODULE=on go mod tidy
GO111MODULE=on go mod vendor
```
You have to commit the changes to `go.mod`, `go.sum` and the `vendor/` directory before submitting the pull request.
## Node.js Dependencies
Updated using `yarn`.
- `package.json`
## Where to make changes
### CircleCI
Our builds run on CircleCI through our build script.
#### Files
- `.circleci/config.yml`.
#### Dependencies
- nodejs
- golang
- grafana/build-container (our custom docker build container)
### grafana/build-container
The main build step (in CircleCI) is built using a custom build container that comes pre-baked with some of the necessary dependencies.
Link: [grafana/build-container](https://github.com/grafana/grafana/tree/master/scripts/build/ci-build)
#### Dependencies
- fpm
- nodejs
- golang
- crosscompiling (several compilers)
### Appveyor
Master and release builds trigger test runs on Appveyors build environment so that tests will run on Windows.
#### Files:
- `appveyor.yml`
#### Dependencies
- nodejs
- golang
### Dockerfile
There is a Docker build for Grafana in the root of the project that allows anyone to build Grafana just using Docker.
#### Files
- `Dockerfile`
#### Dependencies
- nodejs
- golang
### Local developer environments
Please send out a notice in the grafana-dev slack channel when updating Go or Node.js to make it easier for everyone to update their local developer environments.

165
build.go
View File

@@ -41,11 +41,16 @@ var (
race bool
phjsToRelease string
workingDir string
includeBuildNumber bool = true
buildNumber int = 0
binaries []string = []string{"grafana-server", "grafana-cli"}
includeBuildId bool = true
buildId string = "0"
serverBinary string = "grafana-server"
cliBinary string = "grafana-cli"
binaries []string = []string{serverBinary, cliBinary}
isDev bool = false
enterprise bool = false
skipRpmGen bool = false
skipDebGen bool = false
printGenVersion bool = false
)
func main() {
@@ -54,6 +59,8 @@ func main() {
ensureGoPath()
var buildIdRaw string
flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
flag.StringVar(&goos, "goos", runtime.GOOS, "GOOS")
flag.StringVar(&gocc, "cc", "", "CC")
@@ -61,18 +68,28 @@ func main() {
flag.StringVar(&pkgArch, "pkg-arch", "", "PKG ARCH")
flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary")
flag.BoolVar(&race, "race", race, "Use race detector")
flag.BoolVar(&includeBuildNumber, "includeBuildNumber", includeBuildNumber, "IncludeBuildNumber in package name")
flag.BoolVar(&includeBuildId, "includeBuildId", includeBuildId, "IncludeBuildId in package name")
flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana")
flag.IntVar(&buildNumber, "buildNumber", 0, "Build number from CI system")
flag.StringVar(&buildIdRaw, "buildId", "0", "Build ID from CI system")
flag.BoolVar(&isDev, "dev", isDev, "optimal for development, skips certain steps")
flag.BoolVar(&skipRpmGen, "skipRpm", skipRpmGen, "skip rpm package generation (default: false)")
flag.BoolVar(&skipDebGen, "skipDeb", skipDebGen, "skip deb package generation (default: false)")
flag.BoolVar(&printGenVersion, "gen-version", printGenVersion, "generate Grafana version and output (default: false)")
flag.Parse()
buildId = shortenBuildId(buildIdRaw)
readVersionFromPackageJson()
if pkgArch == "" {
pkgArch = goarch
}
if printGenVersion {
printGeneratedVersion()
return
}
log.Printf("Version: %s, Linux Version: %s, Package Iteration: %s\n", version, linuxPackageVersion, linuxPackageIteration)
if flag.NArg() == 0 {
@@ -124,6 +141,8 @@ func main() {
if goos == linux {
createLinuxPackages()
}
case "pkg-archive":
grunt(gruntBuildArg("package")...)
case "pkg-rpm":
grunt(gruntBuildArg("release")...)
@@ -158,6 +177,9 @@ func makeLatestDistCopies() {
"_amd64.deb": "dist/grafana_latest_amd64.deb",
".x86_64.rpm": "dist/grafana-latest-1.x86_64.rpm",
".linux-amd64.tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
".linux-armv7.tar.gz": "dist/grafana-latest.linux-armv7.tar.gz",
".linux-armv6.tar.gz": "dist/grafana-latest.linux-armv6.tar.gz",
".linux-arm64.tar.gz": "dist/grafana-latest.linux-arm64.tar.gz",
}
for _, file := range files {
@@ -197,9 +219,9 @@ func readVersionFromPackageJson() {
}
// add timestamp to iteration
if includeBuildNumber {
if buildNumber != 0 {
linuxPackageIteration = fmt.Sprintf("%d%s", buildNumber, linuxPackageIteration)
if includeBuildId {
if buildId != "0" {
linuxPackageIteration = fmt.Sprintf("%s%s", buildId, linuxPackageIteration)
} else {
linuxPackageIteration = fmt.Sprintf("%d%s", time.Now().Unix(), linuxPackageIteration)
}
@@ -208,7 +230,9 @@ func readVersionFromPackageJson() {
type linuxPackageOptions struct {
packageType string
packageArch string
homeDir string
homeBinDir string
binPath string
serverBinPath string
cliBinPath string
@@ -219,22 +243,26 @@ type linuxPackageOptions struct {
initdScriptFilePath string
systemdServiceFilePath string
postinstSrc string
initdScriptSrc string
defaultFileSrc string
systemdFileSrc string
postinstSrc string
initdScriptSrc string
defaultFileSrc string
systemdFileSrc string
cliBinaryWrapperSrc string
depends []string
}
func createDebPackages() {
previousPkgArch := pkgArch
if pkgArch == "armv7" {
pkgArch = "armhf"
debPkgArch := pkgArch
if pkgArch == "armv7" || pkgArch == "armv6" {
debPkgArch = "armhf"
}
createPackage(linuxPackageOptions{
packageType: "deb",
packageArch: debPkgArch,
homeDir: "/usr/share/grafana",
homeBinDir: "/usr/share/grafana/bin",
binPath: "/usr/sbin",
configDir: "/etc/grafana",
etcDefaultPath: "/etc/default",
@@ -242,27 +270,29 @@ func createDebPackages() {
initdScriptFilePath: "/etc/init.d/grafana-server",
systemdServiceFilePath: "/usr/lib/systemd/system/grafana-server.service",
postinstSrc: "packaging/deb/control/postinst",
initdScriptSrc: "packaging/deb/init.d/grafana-server",
defaultFileSrc: "packaging/deb/default/grafana-server",
systemdFileSrc: "packaging/deb/systemd/grafana-server.service",
postinstSrc: "packaging/deb/control/postinst",
initdScriptSrc: "packaging/deb/init.d/grafana-server",
defaultFileSrc: "packaging/deb/default/grafana-server",
systemdFileSrc: "packaging/deb/systemd/grafana-server.service",
cliBinaryWrapperSrc: "packaging/wrappers/grafana-cli",
depends: []string{"adduser", "libfontconfig"},
depends: []string{"adduser", "libfontconfig1"},
})
pkgArch = previousPkgArch
}
func createRpmPackages() {
previousPkgArch := pkgArch
rpmPkgArch := pkgArch
switch {
case pkgArch == "armv7":
pkgArch = "armhfp"
rpmPkgArch = "armhfp"
case pkgArch == "arm64":
pkgArch = "aarch64"
rpmPkgArch = "aarch64"
}
createPackage(linuxPackageOptions{
packageType: "rpm",
packageArch: rpmPkgArch,
homeDir: "/usr/share/grafana",
homeBinDir: "/usr/share/grafana/bin",
binPath: "/usr/sbin",
configDir: "/etc/grafana",
etcDefaultPath: "/etc/sysconfig",
@@ -270,19 +300,24 @@ func createRpmPackages() {
initdScriptFilePath: "/etc/init.d/grafana-server",
systemdServiceFilePath: "/usr/lib/systemd/system/grafana-server.service",
postinstSrc: "packaging/rpm/control/postinst",
initdScriptSrc: "packaging/rpm/init.d/grafana-server",
defaultFileSrc: "packaging/rpm/sysconfig/grafana-server",
systemdFileSrc: "packaging/rpm/systemd/grafana-server.service",
postinstSrc: "packaging/rpm/control/postinst",
initdScriptSrc: "packaging/rpm/init.d/grafana-server",
defaultFileSrc: "packaging/rpm/sysconfig/grafana-server",
systemdFileSrc: "packaging/rpm/systemd/grafana-server.service",
cliBinaryWrapperSrc: "packaging/wrappers/grafana-cli",
depends: []string{"/sbin/service", "fontconfig", "freetype", "urw-fonts"},
})
pkgArch = previousPkgArch
}
func createLinuxPackages() {
createDebPackages()
createRpmPackages()
if !skipDebGen {
createDebPackages()
}
if !skipRpmGen {
createRpmPackages()
}
}
func createPackage(options linuxPackageOptions) {
@@ -296,10 +331,12 @@ func createPackage(options linuxPackageOptions) {
runPrint("mkdir", "-p", filepath.Join(packageRoot, "/usr/lib/systemd/system"))
runPrint("mkdir", "-p", filepath.Join(packageRoot, "/usr/sbin"))
// copy binary
for _, binary := range binaries {
runPrint("cp", "-p", filepath.Join(workingDir, "tmp/bin/"+binary), filepath.Join(packageRoot, "/usr/sbin/"+binary))
}
// copy grafana-cli wrapper
runPrint("cp", "-p", options.cliBinaryWrapperSrc, filepath.Join(packageRoot, "/usr/sbin/"+cliBinary))
// copy grafana-server binary
runPrint("cp", "-p", filepath.Join(workingDir, "tmp/bin/"+serverBinary), filepath.Join(packageRoot, "/usr/sbin/"+serverBinary))
// copy init.d script
runPrint("cp", "-p", options.initdScriptSrc, filepath.Join(packageRoot, options.initdScriptFilePath))
// copy environment var file
@@ -311,6 +348,13 @@ func createPackage(options linuxPackageOptions) {
// remove bin path
runPrint("rm", "-rf", filepath.Join(packageRoot, options.homeDir, "bin"))
// create /bin within home
runPrint("mkdir", "-p", filepath.Join(packageRoot, options.homeBinDir))
// The grafana-cli binary is exposed through a wrapper to ensure a proper
// configuration is in place. To enable that, we need to store the original
// binary in a separate location to avoid conflicts.
runPrint("cp", "-p", filepath.Join(workingDir, "tmp/bin/"+cliBinary), filepath.Join(packageRoot, options.homeBinDir, cliBinary))
args := []string{
"-s", "dir",
"--description", "Grafana",
@@ -331,6 +375,11 @@ func createPackage(options linuxPackageOptions) {
name += "-enterprise"
args = append(args, "--replaces", "grafana")
}
fmt.Printf("pkgArch is set to '%s', generated arch is '%s'\n", pkgArch, options.packageArch)
if pkgArch == "armv6" {
name += "-rpi"
args = append(args, "--replaces", "grafana")
}
args = append(args, "--name", name)
description := "Grafana"
@@ -351,15 +400,15 @@ func createPackage(options linuxPackageOptions) {
args = append(args, "--deb-no-default-config-files")
}
if pkgArch != "" {
args = append(args, "-a", pkgArch)
if options.packageArch != "" {
args = append(args, "-a", options.packageArch)
}
if linuxPackageIteration != "" {
args = append(args, "--iteration", linuxPackageIteration)
}
// add dependenciesj
// add dependencies
for _, dep := range options.depends {
args = append(args, "--depends", dep)
}
@@ -390,29 +439,40 @@ func grunt(params ...string) {
}
}
func genPackageVersion() string {
if includeBuildId {
return fmt.Sprintf("%v-%v", linuxPackageVersion, linuxPackageIteration)
} else {
return version
}
}
func gruntBuildArg(task string) []string {
args := []string{task}
if includeBuildNumber {
args = append(args, fmt.Sprintf("--pkgVer=%v-%v", linuxPackageVersion, linuxPackageIteration))
} else {
args = append(args, fmt.Sprintf("--pkgVer=%v", version))
}
args = append(args, fmt.Sprintf("--pkgVer=%v", genPackageVersion()))
if pkgArch != "" {
args = append(args, fmt.Sprintf("--arch=%v", pkgArch))
}
if phjsToRelease != "" {
args = append(args, fmt.Sprintf("--phjsToRelease=%v", phjsToRelease))
}
if enterprise {
args = append(args, "--enterprise")
}
args = append(args, fmt.Sprintf("--platform=%v", goos))
return args
}
func setup() {
runPrint("go", "get", "-v", "github.com/golang/dep")
runPrint("go", "install", "-v", "./pkg/cmd/grafana-server")
}
func printGeneratedVersion() {
fmt.Print(genPackageVersion())
}
func test(pkg string) {
setBuildEnv()
runPrint("go", "test", "-short", "-timeout", "60s", pkg)
@@ -467,6 +527,7 @@ func ldflags() string {
b.WriteString(fmt.Sprintf(" -X main.version=%s", version))
b.WriteString(fmt.Sprintf(" -X main.commit=%s", getGitSha()))
b.WriteString(fmt.Sprintf(" -X main.buildstamp=%d", buildStamp()))
b.WriteString(fmt.Sprintf(" -X main.buildBranch=%s", getGitBranch()))
return b.String()
}
@@ -514,6 +575,14 @@ func setBuildEnv() {
}
}
func getGitBranch() string {
v, err := runError("git", "rev-parse", "--abbrev-ref", "HEAD")
if err != nil {
return "master"
}
return string(v)
}
func getGitSha() string {
v, err := runError("git", "rev-parse", "--short", "HEAD")
if err != nil {
@@ -619,3 +688,11 @@ func shaFile(file string) error {
return out.Close()
}
func shortenBuildId(buildId string) string {
buildId = strings.Replace(buildId, "-", "", -1)
if len(buildId) < 9 {
return buildId
}
return buildId[0:8]
}

View File

@@ -34,7 +34,7 @@ protocol = http
# The ip address to bind to, empty will bind to all interfaces
http_addr =
# The http port to use
# The http port to use
http_port = 3000
# The public facing domain name used to access grafana from a browser
@@ -47,6 +47,9 @@ enforce_domain = false
# The full public facing url
root_url = %(protocol)s://%(domain)s:%(http_port)s/
# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
serve_from_sub_path = false
# Log web requests
router_logging = false
@@ -103,36 +106,19 @@ server_cert_name =
# For "sqlite3" only, path relative to data_path setting
path = grafana.db
#################################### Session #############################
[session]
# Either "memory", "file", "redis", "mysql", "postgres", "memcache", default is "file"
provider = file
# For "sqlite3" only. cache mode setting used for connecting to the database
cache_mode = private
# Provider config options
# memory: not have any config yet
# file: session dir path, is relative to grafana data_path
# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
# postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable
# mysql: go-sql-driver/mysql dsn config string, examples:
# `user:password@tcp(127.0.0.1:3306)/database_name`
# `user:password@unix(/var/run/mysqld/mysqld.sock)/database_name`
#################################### Cache server #############################
[remote_cache]
# Either "redis", "memcached" or "database" default is "database"
type = database
# cache connectionstring options
# database: will use Grafana primary database.
# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0`. Only addr is required.
# memcache: 127.0.0.1:11211
provider_config = sessions
# Session cookie name
cookie_name = grafana_sess
# If you use session in https only, default is false
cookie_secure = false
# Session life time, default is 86400
session_life_time = 86400
gc_interval_time = 86400
# Connection Max Lifetime default is 14400 (means 14400 seconds or 4 hours)
conn_max_lifetime = 14400
connstr =
#################################### Data proxy ###########################
[dataproxy]
@@ -140,6 +126,12 @@ conn_max_lifetime = 14400
# This enables data proxy logging, default is false
logging = false
# How long the data proxy should wait before timing out default is 30 (seconds)
timeout = 30
# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
send_user_header = false
#################################### Analytics ###########################
[analytics]
# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
@@ -166,17 +158,12 @@ google_tag_manager_id =
# default admin user, created on startup
admin_user = admin
# default admin password, can be changed before first start of grafana, or in profile settings
# default admin password, can be changed before first start of grafana, or in profile settings
admin_password = admin
# used for signing
secret_key = SW2YcwTIb9zpOOhoPsMm
# Auto-login remember days
login_remember_days = 7
cookie_username = grafana_user
cookie_remember_name = grafana_remember
# disable gravatar profile images
disable_gravatar = false
@@ -186,6 +173,40 @@ data_source_proxy_whitelist =
# disable protection against brute force login attempts
disable_brute_force_login_protection = false
# set to true if you host Grafana behind HTTPS. default is false.
cookie_secure = false
# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
cookie_samesite = lax
# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
allow_embedding = false
# Set to true if you want to enable http strict transport security (HSTS) response header.
# This is only sent when HTTPS is enabled in this configuration.
# HSTS tells browsers that the site should only be accessed using HTTPS.
# The default will change to true in the next minor release, 6.3.
strict_transport_security = false
# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
strict_transport_security_max_age_seconds = 86400
# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
strict_transport_security_preload = false
# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
strict_transport_security_subdomains = false
# Set to true to enable the X-Content-Type-Options response header.
# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
x_content_type_options = false
# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
x_xss_protection = false
#################################### Snapshots ###########################
[snapshots]
# snapshot sharing options
@@ -224,6 +245,7 @@ verify_email_enabled = false
# Background text for the user field on the login page
login_hint = email or username
password_hint = password
# Default UI theme ("dark" or "light")
default_theme = dark
@@ -236,7 +258,22 @@ external_manage_info =
# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
viewers_can_edit = false
# Editors can administrate dashboard, folders and teams they create
editors_can_admin = false
[auth]
# Login cookie name
login_cookie_name = grafana_session
# The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days.
login_maximum_inactive_lifetime_days = 7
# The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
login_maximum_lifetime_days = 30
# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
token_rotation_interval_minutes = 10
# Set to true to disable (hide) the login form, useful if you use OAuth
disable_login_form = false
@@ -246,6 +283,13 @@ disable_signout_menu = false
# URL to redirect the user to after sign out
signout_redirect_url =
# Set to true to attempt login with OAuth automatically, skipping the login screen.
# This setting is ignored if multiple OAuth providers are configured.
oauth_auto_login = false
# limit of api_key seconds to live before expiration
api_key_max_seconds_to_live = -1
#################################### Anonymous Auth ######################
[auth.anonymous]
# enable anonymous access
@@ -331,6 +375,20 @@ tls_skip_verify_insecure = false
tls_client_cert =
tls_client_key =
tls_client_ca =
send_client_credentials_via_post = false
#################################### SAML Auth ###########################
[auth.saml] # Enterprise only
enabled = false
private_key =
private_key_path =
certificate =
certificate_path =
idp_metadata =
idp_metadata_path =
idp_metadata_url =
max_issue_delay = 90s
metadata_valid_duration = 48h
#################################### Basic Auth ##########################
[auth.basic]
@@ -344,6 +402,7 @@ header_property = username
auto_sign_up = true
ldap_sync_ttl = 60
whitelist =
headers =
#################################### Auth LDAP ###########################
[auth.ldap]
@@ -351,6 +410,11 @@ enabled = false
config_file = /etc/grafana/ldap.toml
allow_sign_up = true
# LDAP backround sync (Enterprise only)
# At 1 am every day
sync_cron = "0 0 1 * * *"
active_sync_enabled = true
#################################### SMTP / Emailing #####################
[smtp]
enabled = false
@@ -371,7 +435,7 @@ templates_pattern = emails/*.html
#################################### Logging ##########################
[log]
# Either "console", "file", "syslog". Default is console and file
# Either "console", "file", "syslog". Default is console and file
# Use space to separate multiple modes, e.g. "console file"
mode = console file
@@ -478,10 +542,20 @@ nodata_or_nullvalues = no_data
# This limit will protect the server from render overloading and make sure notifications are sent out quickly
concurrent_render_limit = 5
# Default setting for alert calculation timeout. Default value is 30
evaluation_timeout_seconds = 30
# Default setting for alert notification timeout. Default value is 30
notification_timeout_seconds = 30
# Default setting for max attempts to sending alert notifications. Default value is 3
max_attempts = 3
#################################### Explore #############################
[explore]
# Enable the Explore section
enabled = false
enabled = true
#################################### Internal Grafana Metrics ############
# Metrics available at HTTP API Url /metrics
@@ -489,6 +563,10 @@ enabled = false
enabled = true
interval_seconds = 10
#If both are set, basic auth will be required for the metrics endpoint.
basic_auth_username =
basic_auth_password =
# Send internal Grafana metrics to graphite
[metrics.graphite]
# Enable by setting the address setting (ex localhost:2003)
@@ -517,6 +595,11 @@ sampler_type = const
# and indicates the initial sampling rate before the actual one
# is received from the mothership
sampler_param = 1
# Whether or not to use Zipkin span propagation (x-b3- HTTP headers).
zipkin_propagation = false
# Setting this to true disables shared RPC spans.
# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
disable_shared_zipkin_spans = false
#################################### External Image Storage ##############
[external_image_storage]
@@ -554,3 +637,15 @@ container_name =
# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
server_url =
callback_url =
[panels]
# here for to support old env variables, can remove after a few months
enable_alpha = false
disable_sanitize_html = false
[plugins]
enable_alpha = false
app_tls_skip_verify_insecure = false
[enterprise]
license_path =

53
conf/ldap_multiple.toml Normal file
View File

@@ -0,0 +1,53 @@
# --- First LDAP Server ---
[[servers]]
host = "10.0.0.1"
port = 389
use_ssl = false
start_tls = false
ssl_skip_verify = false
bind_dn = "cn=admin,dc=grafana,dc=org"
bind_password = 'grafana'
search_filter = "(cn=%s)"
search_base_dns = ["ou=users,dc=grafana,dc=org"]
[servers.attributes]
name = "givenName"
surname = "sn"
username = "cn"
member_of = "memberOf"
email = "email"
[[servers.group_mappings]]
group_dn = "cn=admins,ou=groups,dc=grafana,dc=org"
org_role = "Admin"
grafana_admin = true
# --- Second LDAP Server ---
[[servers]]
host = "10.0.0.2"
port = 389
use_ssl = false
start_tls = false
ssl_skip_verify = false
bind_dn = "cn=admin,dc=grafana,dc=org"
bind_password = 'grafana'
search_filter = "(cn=%s)"
search_base_dns = ["ou=users,dc=grafana,dc=org"]
[servers.attributes]
name = "givenName"
surname = "sn"
username = "cn"
member_of = "memberOf"
email = "email"
[[servers.group_mappings]]
group_dn = "cn=editors,ou=groups,dc=grafana,dc=org"
org_role = "Editor"
[[servers.group_mappings]]
group_dn = "*"
org_role = "Viewer"

View File

@@ -5,6 +5,7 @@ apiVersion: 1
# - name: 'default'
# orgId: 1
# folder: ''
# folderUid: ''
# type: file
# options:
# path: /var/lib/grafana/dashboards

View File

@@ -7,7 +7,7 @@ apiVersion: 1
# orgId: 1
# # list of datasources to insert/update depending
# # on what's available in the datbase
# # on what's available in the database
#datasources:
# # <string, required> name of the datasource. Required
# - name: Graphite

View File

@@ -0,0 +1,25 @@
# # config file version
apiVersion: 1
# notifiers:
# - name: default-slack-temp
# type: slack
# org_name: Main Org.
# is_default: true
# uid: notifier1
# settings:
# recipient: "XXX"
# token: "xoxb"
# uploadImage: true
# url: https://slack.com
# - name: default-email
# type: email
# org_id: 1
# uid: notifier2
# is_default: false
# settings:
# addresses: example11111@example.com
# delete_notifiers:
# - name: default-slack-temp
# org_name: Main Org.
# uid: notifier1

View File

@@ -48,6 +48,9 @@
# If you use reverse proxy and sub path specify full url (with sub path)
;root_url = http://localhost:3000
# Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
;serve_from_sub_path = false
# Log web requests
;router_logging = false
@@ -97,29 +100,21 @@
;conn_max_lifetime = 14400
# Set to true to log the sql calls and execution times.
log_queries =
;log_queries =
#################################### Session ####################################
[session]
# Either "memory", "file", "redis", "mysql", "postgres", default is "file"
;provider = file
# For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
;cache_mode = private
# Provider config options
# memory: not have any config yet
# file: session dir path, is relative to grafana data_path
# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=grafana`
# mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`
# postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable
;provider_config = sessions
#################################### Cache server #############################
[remote_cache]
# Either "redis", "memcached" or "database" default is "database"
;type = database
# Session cookie name
;cookie_name = grafana_sess
# If you use session in https only, default is false
;cookie_secure = false
# Session life time, default is 86400
;session_life_time = 86400
# cache connectionstring options
# database: will use Grafana primary database.
# redis: config like redis server e.g. `addr=127.0.0.1:6379,pool_size=100,db=0`. Only addr is required.
# memcache: 127.0.0.1:11211
;connstr =
#################################### Data proxy ###########################
[dataproxy]
@@ -127,6 +122,12 @@ log_queries =
# This enables data proxy logging, default is false
;logging = false
# How long the data proxy should wait before timing out default is 30 (seconds)
;timeout = 30
# If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
;send_user_header = false
#################################### Analytics ####################################
[analytics]
# Server reporting, sends usage counters to stats.grafana.org every 24 hours.
@@ -145,6 +146,9 @@ log_queries =
# Google Analytics universal tracking code, only enabled if you specify an id here
;google_analytics_ua_id =
# Google Tag Manager ID, only enabled if you specify an id here
;google_tag_manager_id =
#################################### Security ####################################
[security]
# default admin user, created on startup
@@ -156,11 +160,6 @@ log_queries =
# used for signing
;secret_key = SW2YcwTIb9zpOOhoPsMm
# Auto-login remember days
;login_remember_days = 7
;cookie_username = grafana_user
;cookie_remember_name = grafana_remember
# disable gravatar profile images
;disable_gravatar = false
@@ -170,6 +169,39 @@ log_queries =
# disable protection against brute force login attempts
;disable_brute_force_login_protection = false
# set to true if you host Grafana behind HTTPS. default is false.
;cookie_secure = false
# set cookie SameSite attribute. defaults to `lax`. can be set to "lax", "strict" and "none"
;cookie_samesite = lax
# set to true if you want to allow browsers to render Grafana in a <frame>, <iframe>, <embed> or <object>. default is false.
;allow_embedding = false
# Set to true if you want to enable http strict transport security (HSTS) response header.
# This is only sent when HTTPS is enabled in this configuration.
# HSTS tells browsers that the site should only be accessed using HTTPS.
# The default version will change to true in the next minor release, 6.3.
;strict_transport_security = false
# Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
;strict_transport_security_max_age_seconds = 86400
# Set to true if to enable HSTS preloading option. Only applied if strict_transport_security is enabled.
;strict_transport_security_preload = false
# Set to true if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled.
;strict_transport_security_subdomains = false
# Set to true to enable the X-Content-Type-Options response header.
# The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
;x_content_type_options = false
# Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
;x_xss_protection = false
#################################### Snapshots ###########################
[snapshots]
# snapshot sharing options
@@ -201,6 +233,7 @@ log_queries =
# Background text for the user field on the login page
;login_hint = email or username
;password_hint = password
# Default UI theme ("dark" or "light")
;default_theme = dark
@@ -213,7 +246,22 @@ log_queries =
# Viewers can edit/inspect dashboard settings in the browser. But not save the dashboard.
;viewers_can_edit = false
# Editors can administrate dashboard, folders and teams they create
;editors_can_admin = false
[auth]
# Login cookie name
;login_cookie_name = grafana_session
# The lifetime (days) an authenticated user can be inactive before being required to login at next visit. Default is 7 days,
;login_maximum_inactive_lifetime_days = 7
# The maximum lifetime (days) an authenticated user can be logged in since login time before being required to login. Default is 30 days.
;login_maximum_lifetime_days = 30
# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
;token_rotation_interval_minutes = 10
# Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false
;disable_login_form = false
@@ -223,7 +271,11 @@ log_queries =
# URL to redirect the user to after sign out
;signout_redirect_url =
#################################### Anonymous Auth ##########################
# Set to true to attempt login with OAuth automatically, skipping the login screen.
# This setting is ignored if multiple OAuth providers are configured.
;oauth_auto_login = false
#################################### Anonymous Auth ######################
[auth.anonymous]
# enable anonymous access
;enabled = false
@@ -277,6 +329,23 @@ log_queries =
;tls_client_key =
;tls_client_ca =
; Set to true to enable sending client_id and client_secret via POST body instead of Basic authentication HTTP header
; This might be required if the OAuth provider is not RFC6749 compliant, only supporting credentials passed via POST payload
;send_client_credentials_via_post = false
#################################### SAML Auth ###########################
;[auth.saml] # Enterprise only
;enabled = false
;private_key =
;private_key_path =
;certificate =
;certificate_path =
;idp_metadata =
;idp_metadata_path =
;idp_metadata_url =
;max_issue_delay = 90s
;metadata_valid_duration = 48h
#################################### Grafana.com Auth ####################
[auth.grafana_com]
;enabled = false
@@ -294,6 +363,7 @@ log_queries =
;auto_sign_up = true
;ldap_sync_ttl = 60
;whitelist = 192.168.1.1, 192.168.2.1
;headers = Email:X-User-Email, Name:X-User-Name
#################################### Basic Auth ##########################
[auth.basic]
@@ -305,6 +375,11 @@ log_queries =
;config_file = /etc/grafana/ldap.toml
;allow_sign_up = true
# LDAP backround sync (Enterprise only)
# At 1 am every day
;sync_cron = "0 0 1 * * *"
;active_sync_enabled = true
#################################### SMTP / Emailing ##########################
[smtp]
;enabled = false
@@ -397,10 +472,20 @@ log_queries =
# This limit will protect the server from render overloading and make sure notifications are sent out quickly
;concurrent_render_limit = 5
# Default setting for alert calculation timeout. Default value is 30
;evaluation_timeout_seconds = 30
# Default setting for alert notification timeout. Default value is 30
;notification_timeout_seconds = 30
# Default setting for max attempts to sending alert notifications. Default value is 3
;max_attempts = 3
#################################### Explore #############################
[explore]
# Enable the Explore section
;enabled = false
;enabled = true
#################################### Internal Grafana Metrics ##########################
# Metrics available at HTTP API Url /metrics
@@ -433,6 +518,11 @@ log_queries =
# and indicates the initial sampling rate before the actual one
# is received from the mothership
;sampler_param = 1
# Whether or not to use Zipkin propagation (x-b3- HTTP headers).
;zipkin_propagation = false
# Setting this to true disables shared RPC spans.
# Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
;disable_shared_zipkin_spans = false
#################################### Grafana.com integration ##########################
# Url used to import dashboards directly from Grafana.com
@@ -475,3 +565,15 @@ log_queries =
# Options to configure external image rendering server like https://github.com/grafana/grafana-image-renderer
;server_url =
;callback_url =
[enterprise]
# Path to a valid Grafana Enterprise license.jwt file
;license_path =
[panels]
# If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
;disable_sanitize_html = false
[plugins]
;enable_alpha = false
;app_tls_skip_verify_insecure = false

View File

@@ -2,15 +2,32 @@ This folder contains useful scripts and configuration for...
* Configuring dev datasources in Grafana
* Configuring dev & test scenarios dashboards.
* Creating docker-compose file with DBs and fake data.
# Dev dashboards and data sources
```bash
./setup.sh
```
After restarting grafana server there should now be a number of datasources named `gdev-<type>` provisioned as well as a dashboard folder named `gdev dashboards`. This folder contains dashboard & panel features tests dashboards.
After restarting grafana server there should now be a number of datasources named `gdev-<type>` provisioned as well as
a dashboard folder named `gdev dashboards`. This folder contains dashboard & panel features tests dashboards.
# Dev dashboards
#### Dev dashboards
Please update these dashboards or make new ones as new panels & dashboards features are developed or new bugs are found. The dashboards are located in the `devenv/dev-dashboards` folder.
Please update these dashboards or make new ones as new panels & dashboards features are developed or new bugs are
found. The dashboards are located in the `devenv/dev-dashboards` folder.
# docker-compose with databases
```bash
./create_docker_compose.sh influxdb prometheus2 elastic5
docker-compose up
```
This command will create a docker compose file with specified databases configured and ready to run. Each database has
a prepared image with some fake data ready to use. For available databases see `docker/blocks` directory. Mind that
for some databases there are multiple images, for example there is prometheus_mac specifically for Macs or different
version.

View File

@@ -3,7 +3,8 @@ apiVersion: 1
providers:
- name: 'gdev dashboards'
folder: 'gdev dashboards'
folderUid: ''
type: file
updateIntervalSeconds: 60
options:
path: devenv/dev-dashboards

View File

@@ -1,31 +1,49 @@
apiVersion: 1
datasources:
- name: gdev-graphite
type: graphite
access: proxy
url: http://localhost:8080
url: http://localhost:8180
jsonData:
graphiteVersion: "1.1"
- name: gdev-prometheus
type: prometheus
access: proxy
isDefault: true
url: http://localhost:9090
- name: gdev-slow-prometheus
type: prometheus
access: proxy
url: http://localhost:3011
- name: gdev-testdata
type: testdata
isDefault: true
- name: gdev-influxdb
type: influxdb
access: proxy
database: site
user: grafana
password: grafana
url: http://localhost:8086
jsonData:
timeInterval: "15s"
secureJsonData:
password: grafana
- name: gdev-influxdb-telegraf
type: influxdb
access: proxy
database: telegraf
user: grafana
url: http://localhost:8086
jsonData:
timeInterval: "10s"
secureJsonData:
password: grafana
- name: gdev-opentsdb
type: opentsdb
@@ -35,7 +53,7 @@ datasources:
tsdbResolution: 1
tsdbVersion: 1
- name: gdev-elasticsearch-metrics
- name: gdev-elasticsearch-v2-metrics
type: elasticsearch
access: proxy
database: "[metrics-]YYYY.MM.DD"
@@ -43,20 +61,128 @@ datasources:
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 2
- name: gdev-elasticsearch-v2-logs
type: elasticsearch
access: proxy
database: "[logs-]YYYY.MM.DD"
url: http://localhost:9200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 2
- name: gdev-elasticsearch-v5-metrics
type: elasticsearch
access: proxy
database: "[metrics-]YYYY.MM.DD"
url: http://localhost:10200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 5
- name: gdev-elasticsearch-v5-logs
type: elasticsearch
access: proxy
database: "[logs-]YYYY.MM.DD"
url: http://localhost:10200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 5
- name: gdev-elasticsearch-v6-metrics
type: elasticsearch
access: proxy
database: "[metrics-]YYYY.MM.DD"
url: http://localhost:11200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 60
- name: gdev-elasticsearch-v6-logs
type: elasticsearch
access: proxy
database: "[logs-]YYYY.MM.DD"
url: http://localhost:11200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 60
- name: gdev-elasticsearch-v6-filebeat
type: elasticsearch
access: proxy
database: "[filebeat-]YYYY.MM.DD"
url: http://localhost:11200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 60
- name: gdev-elasticsearch-v7-metrics
type: elasticsearch
access: proxy
database: "[metrics-]YYYY.MM.DD"
url: http://localhost:12200
jsonData:
timeInterval: 10s
interval: Daily
timeField: "@timestamp"
esVersion: 70
- name: gdev-elasticsearch-v7-logs
type: elasticsearch
access: proxy
database: "[logs-]YYYY.MM.DD"
url: http://localhost:12200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 70
- name: gdev-elasticsearch-v7-filebeat
type: elasticsearch
access: proxy
database: "[filebeat-]YYYY.MM.DD"
url: http://localhost:12200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 70
timeInterval: "10s"
logMessageField: message
logLevelField: fields.level
- name: gdev-elasticsearch-v7-metricbeat
type: elasticsearch
access: proxy
database: "[metricbeat-]YYYY.MM.DD"
url: http://localhost:12200
jsonData:
interval: Daily
timeField: "@timestamp"
esVersion: 70
timeInterval: "10s"
- name: gdev-mysql
type: mysql
url: localhost:3306
database: grafana
user: grafana
password: password
secureJsonData:
password: password
- name: gdev-mysql-ds-tests
type: mysql
url: localhost:3306
database: grafana_ds_tests
user: grafana
password: password
secureJsonData:
password: password
- name: gdev-mssql
type: mssql
@@ -101,4 +227,10 @@ datasources:
authType: credentials
defaultRegion: eu-west-2
- name: gdev-loki
type: loki
access: proxy
url: http://localhost:3100
editable: false

View File

@@ -927,6 +927,123 @@
"title": "",
"type": "text"
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 0,
"gridPos": {
"h": 7,
"w": 16,
"x": 0,
"y": 44
},
"id": 21,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "C-series",
"steppedLine": true
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "",
"hide": false,
"refId": "B",
"scenarioId": "csv_metric_values",
"stringInput": "1,null,40,null,90,null,null,100,null,null,100,null,null,80,null",
"target": ""
},
{
"alias": "",
"hide": false,
"refId": "C",
"scenarioId": "csv_metric_values",
"stringInput": "20,null40,null,null,50,null,70,null,100,null,10,null,30,null",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Null between points",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"content": "Left is showing null between values for a normal line graph and staircase graph. Orphaned data points should be rendered as points",
"editable": true,
"error": false,
"gridPos": {
"h": 7,
"w": 8,
"x": 16,
"y": 44
},
"id": 22,
"links": [],
"mode": "markdown",
"title": "",
"type": "text"
},
{
"aliasColors": {},
"bars": false,
@@ -939,7 +1056,7 @@
"h": 7,
"w": 24,
"x": 0,
"y": 44
"y": 51
},
"id": 20,
"legend": {
@@ -1024,7 +1141,7 @@
"h": 7,
"w": 12,
"x": 0,
"y": 51
"y": 58
},
"id": 16,
"legend": {
@@ -1127,7 +1244,7 @@
"h": 7,
"w": 12,
"x": 12,
"y": 51
"y": 58
},
"id": 17,
"legend": {
@@ -1266,7 +1383,7 @@
"h": 7,
"w": 12,
"x": 0,
"y": 58
"y": 65
},
"id": 18,
"legend": {
@@ -1370,7 +1487,7 @@
"h": 7,
"w": 12,
"x": 12,
"y": 58
"y": 65
},
"id": 19,
"legend": {
@@ -1553,6 +1670,5 @@
},
"timezone": "browser",
"title": "Panel Tests - Graph",
"uid": "5SdHCadmz",
"version": 3
"version": 1
}

View File

@@ -0,0 +1,510 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 0
},
"id": 2,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "gray",
"fill": true,
"fillColor": "rgba(255, 255, 255, 0.03)",
"from": "08:30",
"fromDayOfWeek": 1,
"line": false,
"lineColor": "rgba(255, 255, 255, 0.2)",
"op": "time",
"to": "16:45",
"toDayOfWeek": 5
}
],
"timeShift": null,
"title": "Business Hours",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 8
},
"id": 4,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "red",
"fill": true,
"fillColor": "rgba(255, 255, 255, 0.03)",
"from": "20:00",
"fromDayOfWeek": 7,
"line": false,
"lineColor": "rgba(255, 255, 255, 0.2)",
"op": "time",
"to": "23:00",
"toDayOfWeek": 7
}
],
"timeShift": null,
"title": "Sunday's 20-23",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"A-series": "#d683ce"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 16
},
"id": 3,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 0.5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 0, 0, 0.22)",
"from": "",
"fromDayOfWeek": 1,
"line": true,
"lineColor": "rgba(255, 0, 0, 0.32)",
"op": "time",
"to": "",
"toDayOfWeek": 1
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 127, 0, 0.22)",
"fromDayOfWeek": 2,
"line": true,
"lineColor": "rgba(255, 127, 0, 0.32)",
"op": "time",
"toDayOfWeek": 2
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 255, 0, 0.22)",
"fromDayOfWeek": 3,
"line": true,
"lineColor": "rgba(255, 255, 0, 0.22)",
"op": "time",
"toDayOfWeek": 3
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(0, 255, 0, 0.22)",
"fromDayOfWeek": 4,
"line": true,
"lineColor": "rgba(0, 255, 0, 0.32)",
"op": "time",
"toDayOfWeek": 4
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(0, 0, 255, 0.22)",
"fromDayOfWeek": 5,
"line": true,
"lineColor": "rgba(0, 0, 255, 0.32)",
"op": "time",
"toDayOfWeek": 5
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(75, 0, 130, 0.22)",
"fromDayOfWeek": 6,
"line": true,
"lineColor": "rgba(75, 0, 130, 0.32)",
"op": "time",
"toDayOfWeek": 6
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(148, 0, 211, 0.22)",
"fromDayOfWeek": 7,
"line": true,
"lineColor": "rgba(148, 0, 211, 0.32)",
"op": "time",
"toDayOfWeek": 7
}
],
"timeShift": null,
"title": "Each day of week",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 24
},
"id": 5,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "red",
"fill": false,
"from": "05:00",
"line": true,
"op": "time"
}
],
"timeShift": null,
"title": "05:00",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"refresh": false,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"panel-tests"
],
"templating": {
"list": []
},
"time": {
"from": "now-30d",
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "browser",
"title": "Panel Tests - Graph (Time Regions)",
"version": 1
}

View File

@@ -3338,6 +3338,5 @@
},
"timezone": "",
"title": "Panel Tests - Polystat",
"uid": "Kp9Z0hTik",
"version": 5
}

View File

@@ -0,0 +1,715 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [177],
"type": "gt"
},
"query": {
"params": ["A", "5m", "now"]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"enabled": true,
"executionErrorState": "alerting",
"for": "0m",
"frequency": "60s",
"handler": 1,
"name": "TestData - Always Alerting",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 10,
"x": 0,
"y": 0
},
"id": 4,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "csv_metric_values",
"stringInput": "200,445,100,150,200,220,190",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 177
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Always Alerting",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [100],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": ["A", "5m", "now"]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"executionErrorState": "alerting",
"for": "900000h",
"frequency": "1m",
"handler": 1,
"name": "Always Pending",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 10,
"x": 10,
"y": 0
},
"id": 7,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "csv_metric_values",
"stringInput": "200,445,100,150,200,220,190",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 100
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Always Alerting with For",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"dashboardFilter": "",
"dashboardTags": [],
"folderId": null,
"gridPos": {
"h": 20,
"w": 4,
"x": 20,
"y": 0
},
"id": 9,
"limit": 10,
"links": [],
"nameFilter": "$namefilter",
"onlyAlertsOnDashboard": false,
"show": "current",
"sortOrder": 1,
"stateFilter": [],
"timeFrom": null,
"timeShift": null,
"title": "Alert list",
"type": "alertlist"
},
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [177],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": ["A", "15m", "now"]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"executionErrorState": "alerting",
"for": "1m",
"frequency": "1m",
"handler": 1,
"name": "TestData - Always Pending",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 6,
"w": 10,
"x": 0,
"y": 7
},
"id": 6,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "csv_metric_values",
"stringInput": "200,445,100,150,200,220,190",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 177
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Always Alerting with For",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [60],
"type": "gt"
},
"query": {
"params": ["A", "5m", "now"]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"enabled": true,
"frequency": "60s",
"handler": 1,
"name": "TestData - Always OK",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 6,
"w": 10,
"x": 10,
"y": 7
},
"id": 3,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 60
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Always OK",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": "125",
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [1],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": ["A", "15m", "now"]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"executionErrorState": "alerting",
"for": "5m",
"frequency": "1m",
"handler": 1,
"name": "TestData - No data",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"gridPos": {
"h": 7,
"w": 10,
"x": 0,
"y": 13
},
"id": 5,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "no_data_points",
"stringInput": "",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 1
}
],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "No data",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"revision": 2,
"schemaVersion": 18,
"style": "dark",
"tags": ["gdev", "alerting"],
"templating": {
"list": [
{
"allValue": null,
"current": {
"text": "TestData",
"value": "TestData"
},
"hide": 0,
"includeAll": false,
"label": "alert name filter",
"multi": false,
"name": "namefilter",
"options": [
{
"selected": true,
"text": "TestData",
"value": "TestData"
},
{
"selected": false,
"text": "Prometheus",
"value": "Prometheus"
},
{
"selected": false,
"text": "Graphite",
"value": "Graphite"
}
],
"query": "TestData,Prometheus,Graphite",
"skipUrlSync": false,
"type": "custom"
}
]
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "browser",
"title": "Alerting with TestData",
"uid": "7MeksYbmk",
"version": 1
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,682 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": false,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"limit": 100,
"name": "Annotations & Alerts",
"showIn": 0,
"type": "dashboard"
},
{
"datasource": "Elastic 5 Logs",
"enable": false,
"iconColor": "rgba(255, 96, 96, 1)",
"limit": 100,
"name": "test",
"query": "",
"showIn": 0,
"textField": "description",
"type": "alert"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1554310942895,
"links": [
{
"asDropdown": true,
"icon": "external link",
"tags": ["gdev", "elasticsearch", "datasource-test"],
"title": "Dashboards",
"type": "dashboards"
}
],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v2-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 0
},
"id": 1,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "3",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "1",
"size": "5"
},
"type": "terms"
},
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "max"
}
],
"query": "*",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Top 5 servers",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v2-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 0,
"y": 7
},
"id": 2,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "5m",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {
"percents": [25, 50, 75, 95, 99]
},
"type": "percentiles"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Percentiles & Metric filter",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v2-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 12,
"y": 7
},
"id": 3,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {
"std_deviation_bounds_lower": true,
"std_deviation_bounds_upper": true
},
"settings": {},
"type": "extended_stats"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Standard dev",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [
{
"text": "@hostname",
"value": "@hostname"
},
{
"text": "Average",
"value": "Average"
},
{
"text": "Max",
"value": "Max"
},
{
"text": "Sum",
"value": "Sum"
}
],
"datasource": "gdev-elasticsearch-v2-metrics",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 13
},
"id": 6,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
},
{
"colorMode": null,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "2",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "_term",
"size": "0"
},
"type": "terms"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
},
{
"field": "@value",
"id": "3",
"meta": {},
"settings": {},
"type": "max"
},
{
"field": "@value",
"id": "4",
"meta": {},
"settings": {},
"type": "sum"
}
],
"refId": "B",
"timeField": "@timestamp"
}
],
"title": "ES Metrics",
"transform": "table",
"type": "table"
},
{
"columns": [
{
"text": "@timestamp",
"value": "@timestamp"
},
{
"text": "@message",
"value": "@message"
},
{
"text": "tags",
"value": "tags"
},
{
"text": "description",
"value": "description"
}
],
"datasource": "gdev-elasticsearch-v2-logs",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 20
},
"id": 5,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
}
],
"targets": [
{
"bucketAggs": [],
"dsType": "elasticsearch",
"metrics": [
{
"field": "select field",
"id": "1",
"meta": {},
"settings": {
"size": 500
},
"type": "raw_document"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"title": "ES Log query",
"transform": "json",
"type": "table"
},
{
"circleMaxSize": 30,
"circleMinSize": 2,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"datasource": "gdev-elasticsearch-v2-metrics",
"decimals": 0,
"esGeoPoint": "@location",
"esMetric": "Average",
"gridPos": {
"h": 12,
"w": 24,
"x": 0,
"y": 27
},
"hideEmpty": false,
"hideZero": false,
"id": 8,
"initialZoom": 1,
"links": [],
"locationData": "geohash",
"mapCenter": "(0°, 0°)",
"mapCenterLatitude": 0,
"mapCenterLongitude": 0,
"maxDataPoints": 1,
"mouseWheelZoom": false,
"showLegend": true,
"stickyLabels": false,
"tableQueryOptions": {
"geohashField": "geohash",
"latitudeField": "latitude",
"longitudeField": "longitude",
"metricField": "metric",
"queryType": "geohash"
},
"targets": [
{
"bucketAggs": [
{
"fake": true,
"field": "@location",
"id": "3",
"settings": {
"precision": 2
},
"type": "geohash_grid"
}
],
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": "0,10",
"title": "World map panel",
"type": "grafana-worldmap-panel",
"unitPlural": "",
"unitSingle": "",
"valueName": "total"
}
],
"schemaVersion": 18,
"style": "dark",
"tags": ["elasticsearch", "gdev", "datasource-test"],
"templating": {
"list": [
{
"datasource": "gdev-elasticsearch-v2-metrics",
"filters": [],
"hide": 0,
"label": "",
"name": "Filters",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "now-30m",
"to": "now"
},
"timepicker": {
"collapse": false,
"enable": true,
"notice": false,
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"status": "Stable",
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"type": "timepicker"
},
"timezone": "browser",
"title": "Datasource tests - Elasticsearch v2",
"uid": "RlqLq2fiz",
"version": 5
}

View File

@@ -0,0 +1,683 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": false,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"limit": 100,
"name": "Annotations & Alerts",
"showIn": 0,
"type": "dashboard"
},
{
"datasource": "Elastic 5 Logs",
"enable": false,
"iconColor": "rgba(255, 96, 96, 1)",
"limit": 100,
"name": "test",
"query": "",
"showIn": 0,
"textField": "description",
"type": "alert"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1554310560048,
"links": [
{
"asDropdown": true,
"icon": "external link",
"tags": ["gdev", "elasticsearch", "datasource-test"],
"title": "Dashboards",
"type": "dashboards"
}
],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v5-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 0
},
"id": 1,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "3",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "1",
"size": "5"
},
"type": "terms"
},
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "max"
}
],
"query": "*",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Top 5 servers",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v5-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 0,
"y": 7
},
"id": 2,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "5m",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {
"percents": [25, 50, 75, 95, 99]
},
"type": "percentiles"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Percentiles & Metric filter",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v5-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 12,
"y": 7
},
"id": 3,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {
"std_deviation_bounds_lower": true,
"std_deviation_bounds_upper": true
},
"settings": {},
"type": "extended_stats"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Standard dev",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [
{
"text": "@hostname",
"value": "@hostname"
},
{
"text": "Average",
"value": "Average"
},
{
"text": "Max",
"value": "Max"
},
{
"text": "Sum",
"value": "Sum"
}
],
"datasource": "gdev-elasticsearch-v5-metrics",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 13
},
"id": 6,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
},
{
"colorMode": null,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "2",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "_term",
"size": "0"
},
"type": "terms"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
},
{
"field": "@value",
"id": "3",
"meta": {},
"settings": {},
"type": "max"
},
{
"field": "@value",
"id": "4",
"meta": {},
"settings": {},
"type": "sum"
}
],
"refId": "B",
"timeField": "@timestamp"
}
],
"title": "ES Metrics",
"transform": "table",
"type": "table"
},
{
"columns": [
{
"text": "@timestamp",
"value": "@timestamp"
},
{
"text": "@message",
"value": "@message"
},
{
"text": "tags",
"value": "tags"
},
{
"text": "description",
"value": "description"
}
],
"datasource": "gdev-elasticsearch-v5-logs",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 20
},
"id": 5,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
}
],
"targets": [
{
"bucketAggs": [],
"dsType": "elasticsearch",
"metrics": [
{
"field": "select field",
"id": "1",
"meta": {},
"settings": {
"size": 500
},
"type": "raw_document"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"title": "ES Log query",
"transform": "json",
"type": "table"
},
{
"circleMaxSize": 30,
"circleMinSize": 2,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"datasource": "gdev-elasticsearch-v5-metrics",
"decimals": 0,
"esGeoPoint": "@location",
"esLocationName": "",
"esMetric": "Average",
"gridPos": {
"h": 12,
"w": 24,
"x": 0,
"y": 27
},
"hideEmpty": false,
"hideZero": false,
"id": 8,
"initialZoom": 1,
"links": [],
"locationData": "geohash",
"mapCenter": "(0°, 0°)",
"mapCenterLatitude": 0,
"mapCenterLongitude": 0,
"maxDataPoints": 1,
"mouseWheelZoom": false,
"showLegend": true,
"stickyLabels": false,
"tableQueryOptions": {
"geohashField": "geohash",
"latitudeField": "latitude",
"longitudeField": "longitude",
"metricField": "metric",
"queryType": "geohash"
},
"targets": [
{
"bucketAggs": [
{
"fake": true,
"field": "@location",
"id": "3",
"settings": {
"precision": 2
},
"type": "geohash_grid"
}
],
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": "0,10",
"title": "World map panel",
"type": "grafana-worldmap-panel",
"unitPlural": "",
"unitSingle": "",
"valueName": "total"
}
],
"schemaVersion": 18,
"style": "dark",
"tags": ["elasticsearch", "gdev", "datasource-test"],
"templating": {
"list": [
{
"datasource": "gdev-elasticsearch-v5-metrics",
"filters": [],
"hide": 0,
"label": "",
"name": "Filters",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "now-30m",
"to": "now"
},
"timepicker": {
"collapse": false,
"enable": true,
"notice": false,
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"status": "Stable",
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"type": "timepicker"
},
"timezone": "browser",
"title": "Datasource tests - Elasticsearch v5",
"uid": "8HjT32Bmz",
"version": 5
}

View File

@@ -0,0 +1,682 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": false,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"limit": 100,
"name": "Annotations & Alerts",
"showIn": 0,
"type": "dashboard"
},
{
"datasource": "gdev-elasticsearch-v6-logs",
"enable": false,
"iconColor": "rgba(255, 96, 96, 1)",
"limit": 100,
"name": "test",
"query": "",
"showIn": 0,
"textField": "description",
"type": "alert"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1554310839317,
"links": [
{
"asDropdown": true,
"icon": "external link",
"tags": ["gdev", "elasticsearch", "datasource-test"],
"title": "Dashboards",
"type": "dashboards"
}
],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v6-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 0
},
"id": 1,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "3",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "1",
"size": "5"
},
"type": "terms"
},
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "max"
}
],
"query": "*",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Top 5 servers",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v6-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 0,
"y": 7
},
"id": 2,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "5m",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {
"percents": [25, 50, 75, 95, 99]
},
"type": "percentiles"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Percentiles & Metric filter",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v6-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 12,
"y": 7
},
"id": 3,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {
"std_deviation_bounds_lower": true,
"std_deviation_bounds_upper": true
},
"settings": {},
"type": "extended_stats"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Standard dev",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [
{
"text": "@hostname",
"value": "@hostname"
},
{
"text": "Average",
"value": "Average"
},
{
"text": "Max",
"value": "Max"
},
{
"text": "Sum",
"value": "Sum"
}
],
"datasource": "gdev-elasticsearch-v6-metrics",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 13
},
"id": 6,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
},
{
"colorMode": null,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "2",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "_term",
"size": "0"
},
"type": "terms"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
},
{
"field": "@value",
"id": "3",
"meta": {},
"settings": {},
"type": "max"
},
{
"field": "@value",
"id": "4",
"meta": {},
"settings": {},
"type": "sum"
}
],
"refId": "B",
"timeField": "@timestamp"
}
],
"title": "ES Metrics",
"transform": "table",
"type": "table"
},
{
"columns": [
{
"text": "@timestamp",
"value": "@timestamp"
},
{
"text": "@message",
"value": "@message"
},
{
"text": "tags",
"value": "tags"
},
{
"text": "description",
"value": "description"
}
],
"datasource": "gdev-elasticsearch-v6-logs",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 20
},
"id": 5,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
}
],
"targets": [
{
"bucketAggs": [],
"dsType": "elasticsearch",
"metrics": [
{
"field": "select field",
"id": "1",
"meta": {},
"settings": {
"size": 500
},
"type": "raw_document"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"title": "ES Log query",
"transform": "json",
"type": "table"
},
{
"circleMaxSize": 30,
"circleMinSize": 2,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"datasource": "gdev-elasticsearch-v6-metrics",
"decimals": 0,
"esGeoPoint": "@location",
"esMetric": "Average",
"gridPos": {
"h": 12,
"w": 24,
"x": 0,
"y": 27
},
"hideEmpty": false,
"hideZero": false,
"id": 8,
"initialZoom": "1",
"links": [],
"locationData": "geohash",
"mapCenter": "(0°, 0°)",
"mapCenterLatitude": 0,
"mapCenterLongitude": 0,
"maxDataPoints": 1,
"mouseWheelZoom": false,
"showLegend": true,
"stickyLabels": false,
"tableQueryOptions": {
"geohashField": "geohash",
"latitudeField": "latitude",
"longitudeField": "longitude",
"metricField": "metric",
"queryType": "geohash"
},
"targets": [
{
"bucketAggs": [
{
"fake": true,
"field": "@location",
"id": "3",
"settings": {
"precision": 2
},
"type": "geohash_grid"
}
],
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": "0,10",
"title": "World map panel",
"type": "grafana-worldmap-panel",
"unitPlural": "",
"unitSingle": "",
"valueName": "total"
}
],
"schemaVersion": 18,
"style": "dark",
"tags": ["elasticsearch", "gdev", "datasource-test"],
"templating": {
"list": [
{
"datasource": "gdev-elasticsearch-v6-metrics",
"filters": [],
"hide": 0,
"label": "",
"name": "Filters",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "now-30m",
"to": "now"
},
"timepicker": {
"collapse": false,
"enable": true,
"notice": false,
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"status": "Stable",
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"type": "timepicker"
},
"timezone": "browser",
"title": "Datasource tests - Elasticsearch v6",
"uid": "NF8Pq2Biz",
"version": 5
}

View File

@@ -0,0 +1,263 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1554902936982,
"links": [
{
"asDropdown": true,
"icon": "external link",
"tags": ["gdev", "elasticsearch", "datasource-test"],
"title": "Dashboards",
"type": "dashboards"
}
],
"panels": [
{
"aliasColors": {
"error": "red"
},
"bars": true,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v6-filebeat",
"fill": 1,
"gridPos": {
"h": 5,
"w": 24,
"x": 0,
"y": 0
},
"id": 4,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": false,
"linewidth": 1,
"nullPointMode": "null",
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": true,
"steppedLine": false,
"targets": [
{
"bucketAggs": [
{
"fake": true,
"field": "fields.level",
"id": "3",
"settings": {
"min_doc_count": 1,
"order": "desc",
"orderBy": "_term",
"size": "10"
},
"type": "terms"
},
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "5m",
"min_doc_count": 1,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"metrics": [
{
"field": "select field",
"id": "1",
"type": "count"
}
],
"query": "fields.app:grafana",
"refId": "A",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Panel Title",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [
{
"text": "@timestamp",
"value": "@timestamp"
},
{
"text": "fields.level",
"value": "fields.level"
},
{
"text": "message",
"value": "message"
}
],
"datasource": "gdev-elasticsearch-v6-filebeat",
"fontSize": "100%",
"gridPos": {
"h": 22,
"w": 24,
"x": 0,
"y": 5
},
"id": 2,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"alias": "Time",
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
},
{
"alias": "Level",
"colorMode": null,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "fields.level",
"thresholds": [""],
"type": "string",
"unit": "short",
"valueMaps": []
},
{
"alias": "Message",
"colorMode": null,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "message",
"preserveFormat": false,
"sanitize": false,
"thresholds": [],
"type": "string",
"unit": "short"
}
],
"targets": [
{
"bucketAggs": [],
"metrics": [
{
"field": "select field",
"id": "1",
"meta": {},
"settings": {
"size": 500
},
"type": "raw_document"
}
],
"query": "fields.app:grafana",
"refId": "A",
"timeField": "@timestamp"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Panel Title",
"transform": "json",
"type": "table"
}
],
"schemaVersion": 18,
"style": "dark",
"tags": ["gdev", "elasticsearch", "datasource-test"],
"templating": {
"list": [
{
"datasource": "gdev-elasticsearch-v6-filebeat",
"filters": [],
"hide": 0,
"label": "",
"name": "Filters",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "now-1h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Datasource tests - Elasticsearch v6 Filebeat",
"uid": "06tPt4gZz",
"version": 8
}

View File

@@ -0,0 +1,683 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": false,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"limit": 100,
"name": "Annotations & Alerts",
"showIn": 0,
"type": "dashboard"
},
{
"datasource": "gdev-elasticsearch-v7-logs",
"enable": false,
"iconColor": "rgba(255, 96, 96, 1)",
"limit": 100,
"name": "test",
"query": "",
"showIn": 0,
"textField": "description",
"type": "alert"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": 2342,
"iteration": 1555593977614,
"links": [
{
"asDropdown": true,
"icon": "external link",
"tags": ["gdev", "elasticsearch", "datasource-test"],
"title": "Dashboards",
"type": "dashboards"
}
],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v7-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 0
},
"id": 1,
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": true,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "3",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "1",
"size": "5"
},
"type": "terms"
},
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "max"
}
],
"query": "*",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Top 5 servers",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v7-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 0,
"y": 7
},
"id": 2,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "5m",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {
"percents": [25, 50, 75, 95, 99]
},
"type": "percentiles"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Percentiles & Metric filter",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"Count": "#6ED0E0"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v7-metrics",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"gridPos": {
"h": 6,
"w": 12,
"x": 12,
"y": 7
},
"id": 3,
"legend": {
"alignAsTable": true,
"avg": true,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": true
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [
{
"alias": "Count",
"lines": false,
"yaxis": 2,
"zindex": -1
}
],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "{{metric}}",
"bucketAggs": [
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "auto",
"min_doc_count": 0,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {
"std_deviation_bounds_lower": true,
"std_deviation_bounds_upper": true
},
"settings": {},
"type": "extended_stats"
}
],
"query": "@metric:cpu",
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Standard dev",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [
{
"text": "@hostname",
"value": "@hostname"
},
{
"text": "Average",
"value": "Average"
},
{
"text": "Max",
"value": "Max"
},
{
"text": "Sum",
"value": "Sum"
}
],
"datasource": "gdev-elasticsearch-v7-metrics",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 13
},
"id": 6,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
},
{
"colorMode": null,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"bucketAggs": [
{
"field": "@hostname",
"id": "2",
"settings": {
"min_doc_count": 1,
"order": "asc",
"orderBy": "_term",
"size": "0"
},
"type": "terms"
}
],
"dsType": "elasticsearch",
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
},
{
"field": "@value",
"id": "3",
"meta": {},
"settings": {},
"type": "max"
},
{
"field": "@value",
"id": "4",
"meta": {},
"settings": {},
"type": "sum"
}
],
"refId": "B",
"timeField": "@timestamp"
}
],
"title": "ES Metrics",
"transform": "table",
"type": "table"
},
{
"columns": [
{
"text": "@timestamp",
"value": "@timestamp"
},
{
"text": "@message",
"value": "@message"
},
{
"text": "tags",
"value": "tags"
},
{
"text": "description",
"value": "description"
}
],
"datasource": "gdev-elasticsearch-v7-logs",
"editable": true,
"error": false,
"fontSize": "100%",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 20
},
"id": 5,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
}
],
"targets": [
{
"bucketAggs": [],
"dsType": "elasticsearch",
"metrics": [
{
"field": "select field",
"id": "1",
"meta": {},
"settings": {
"size": 500
},
"type": "raw_document"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"title": "ES Log query",
"transform": "json",
"type": "table"
},
{
"circleMaxSize": 30,
"circleMinSize": 2,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"datasource": "gdev-elasticsearch-v7-metrics",
"decimals": 0,
"esGeoPoint": "@location",
"esMetric": "Average",
"gridPos": {
"h": 12,
"w": 24,
"x": 0,
"y": 27
},
"hideEmpty": false,
"hideZero": false,
"id": 8,
"initialZoom": "1",
"links": [],
"locationData": "geohash",
"mapCenter": "(0°, 0°)",
"mapCenterLatitude": 0,
"mapCenterLongitude": 0,
"maxDataPoints": 1,
"mouseWheelZoom": false,
"showLegend": true,
"stickyLabels": false,
"tableQueryOptions": {
"geohashField": "geohash",
"latitudeField": "latitude",
"longitudeField": "longitude",
"metricField": "metric",
"queryType": "geohash"
},
"targets": [
{
"bucketAggs": [
{
"fake": true,
"field": "@location",
"id": "3",
"settings": {
"precision": 2
},
"type": "geohash_grid"
}
],
"metrics": [
{
"field": "@value",
"id": "1",
"meta": {},
"settings": {},
"type": "avg"
}
],
"refId": "A",
"target": "",
"timeField": "@timestamp"
}
],
"thresholds": "0,10",
"title": "World map panel",
"type": "grafana-worldmap-panel",
"unitPlural": "",
"unitSingle": "",
"valueName": "total"
}
],
"schemaVersion": 18,
"style": "dark",
"tags": ["elasticsearch", "gdev", "datasource-test"],
"templating": {
"list": [
{
"datasource": "gdev-elasticsearch-v7-metrics",
"filters": [],
"hide": 0,
"label": "",
"name": "Filters",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "now-30m",
"to": "now"
},
"timepicker": {
"collapse": false,
"enable": true,
"notice": false,
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"status": "Stable",
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"type": "timepicker"
},
"timezone": "browser",
"title": "Datasource tests - Elasticsearch v7",
"uid": "Y-RvmuRWk",
"version": 1
}

View File

@@ -0,0 +1,264 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": 2341,
"iteration": 1555591591930,
"links": [
{
"asDropdown": true,
"icon": "external link",
"tags": ["gdev", "elasticsearch", "datasource-test"],
"title": "Dashboards",
"type": "dashboards"
}
],
"panels": [
{
"aliasColors": {
"error": "red"
},
"bars": true,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-elasticsearch-v7-filebeat",
"fill": 1,
"gridPos": {
"h": 5,
"w": 24,
"x": 0,
"y": 0
},
"id": 4,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": false,
"linewidth": 1,
"nullPointMode": "null",
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": true,
"steppedLine": false,
"targets": [
{
"bucketAggs": [
{
"fake": true,
"field": "fields.level",
"id": "3",
"settings": {
"min_doc_count": 1,
"order": "desc",
"orderBy": "_term",
"size": "10"
},
"type": "terms"
},
{
"field": "@timestamp",
"id": "2",
"settings": {
"interval": "5m",
"min_doc_count": 1,
"trimEdges": 0
},
"type": "date_histogram"
}
],
"metrics": [
{
"field": "select field",
"id": "1",
"type": "count"
}
],
"query": "fields.app:grafana",
"refId": "A",
"timeField": "@timestamp"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Panel Title",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"columns": [
{
"text": "@timestamp",
"value": "@timestamp"
},
{
"text": "fields.level",
"value": "fields.level"
},
{
"text": "message",
"value": "message"
}
],
"datasource": "gdev-elasticsearch-v7-filebeat",
"fontSize": "100%",
"gridPos": {
"h": 22,
"w": 24,
"x": 0,
"y": 5
},
"id": 2,
"links": [],
"pageSize": null,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"alias": "Time",
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "@timestamp",
"type": "date"
},
{
"alias": "Level",
"colorMode": null,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "fields.level",
"thresholds": [""],
"type": "string",
"unit": "short",
"valueMaps": []
},
{
"alias": "Message",
"colorMode": null,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "message",
"preserveFormat": false,
"sanitize": false,
"thresholds": [],
"type": "string",
"unit": "short"
}
],
"targets": [
{
"bucketAggs": [],
"metrics": [
{
"field": "select field",
"id": "1",
"meta": {},
"settings": {
"size": 500
},
"type": "raw_document"
}
],
"query": "fields.app:grafana",
"refId": "A",
"timeField": "@timestamp"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Panel Title",
"transform": "json",
"type": "table"
}
],
"schemaVersion": 18,
"style": "dark",
"tags": ["elasticsearch", "gdev", "datasource-test"],
"templating": {
"list": [
{
"datasource": "gdev-elasticsearch-v7-filebeat",
"filters": [],
"hide": 0,
"label": "",
"name": "Filters",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "now-1h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Datasource tests - Elasticsearch v7 Filebeat",
"uid": "M94gguRWz",
"version": 1
}

View File

@@ -0,0 +1,323 @@
{
"annotations": {
"enable": false,
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"iteration": 1556259111212,
"links": [],
"panels": [
{
"aliasColors": {},
"annotate": {
"enable": false
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-influxdb",
"editable": true,
"error": false,
"fill": 2,
"grid": {},
"gridPos": {
"h": 9,
"w": 24,
"x": 0,
"y": 0
},
"id": 1,
"interval": "$summarize",
"legend": {
"alignAsTable": true,
"avg": false,
"current": false,
"max": false,
"min": false,
"rightSide": true,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"resolution": 100,
"scale": 1,
"seriesOverrides": [],
"spaceLength": 10,
"stack": true,
"steppedLine": false,
"targets": [
{
"alias": "$tag_hostname",
"dsType": "influxdb",
"groupBy": [
{
"params": ["auto"],
"type": "time"
},
{
"params": ["hostname"],
"type": "tag"
}
],
"measurement": "logins.count",
"policy": "default",
"query": "SELECT mean(\"value\") FROM \"logins.count\" WHERE \"hostname\" =~ /$Hostname$/ AND $timeFilter GROUP BY time($interval), \"hostname\"",
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": ["value"],
"type": "field"
},
{
"params": [],
"type": "mean"
}
]
],
"tags": [
{
"key": "datacenter",
"operator": "=~",
"value": "/^$datacenter$/"
},
{
"condition": "AND",
"key": "hostname",
"operator": "=~",
"value": "/^$host$/"
}
],
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Selected Servers",
"tooltip": {
"msResolution": false,
"query_as_alias": true,
"shared": false,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
},
"zerofill": true
}
],
"refresh": false,
"schemaVersion": 18,
"style": "dark",
"tags": ["gdev", "datasource-test", "influxdb"],
"templating": {
"list": [
{
"allValue": null,
"current": {
"text": "America",
"value": "America"
},
"datasource": "gdev-influxdb",
"definition": "",
"hide": 0,
"includeAll": false,
"label": null,
"multi": false,
"name": "datacenter",
"options": [],
"query": "SHOW TAG VALUES WITH KEY = \"datacenter\" ",
"refresh": 1,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": null,
"tags": [],
"tagsQuery": null,
"type": "query",
"useTags": false
},
{
"allFormat": "regex values",
"allValue": null,
"current": {
"text": "All",
"value": "$__all"
},
"datasource": "gdev-influxdb",
"definition": "",
"hide": 0,
"includeAll": true,
"label": null,
"multi": true,
"multiFormat": "regex values",
"name": "host",
"options": [],
"query": "SHOW TAG VALUES WITH KEY = \"hostname\" WHERE \"datacenter\" =~ /^$datacenter$/",
"refresh": 1,
"refresh_on_load": false,
"regex": "",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": null,
"tags": [],
"tagsQuery": null,
"type": "query",
"useTags": false
},
{
"allFormat": "glob",
"auto": true,
"auto_count": 5,
"auto_min": "10s",
"current": {
"text": "1m",
"value": "1m"
},
"datasource": null,
"hide": 0,
"includeAll": false,
"label": "",
"name": "summarize",
"options": [
{
"selected": false,
"text": "auto",
"value": "$__auto_interval_summarize"
},
{
"selected": true,
"text": "1m",
"value": "1m"
},
{
"selected": false,
"text": "10m",
"value": "10m"
},
{
"selected": false,
"text": "30m",
"value": "30m"
},
{
"selected": false,
"text": "1h",
"value": "1h"
},
{
"selected": false,
"text": "6h",
"value": "6h"
},
{
"selected": false,
"text": "12h",
"value": "12h"
},
{
"selected": false,
"text": "1d",
"value": "1d"
},
{
"selected": false,
"text": "7d",
"value": "7d"
},
{
"selected": false,
"text": "14d",
"value": "14d"
},
{
"selected": false,
"text": "30d",
"value": "30d"
}
],
"query": "1m,10m,30m,1h,6h,12h,1d,7d,14d,30d",
"refresh": 2,
"refresh_on_load": false,
"skipUrlSync": false,
"type": "interval"
},
{
"datasource": "InfluxDB",
"filters": [],
"hide": 0,
"label": null,
"name": "adhoc",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "now-1h",
"to": "now"
},
"timepicker": {
"collapse": false,
"enable": true,
"notice": false,
"now": true,
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"status": "Stable",
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
"type": "timepicker"
},
"timezone": "browser",
"title": "Datasource tests - InfluxDB Templated",
"uid": "000000002",
"version": 2
}

View File

@@ -319,11 +319,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -346,7 +342,7 @@
],
"schemaVersion": 16,
"style": "dark",
"tags": ["gdev", "mssql", "fake-data-gen"],
"tags": ["gdev", "mssql", "datasource-test"],
"templating": {
"list": [
{
@@ -486,32 +482,11 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Datasource tests - MSSQL",
"uid": "86Js1xRmk",
"version": 1
}
}

View File

@@ -90,11 +90,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -143,11 +139,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -197,11 +189,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -251,11 +239,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -305,11 +289,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -2124,9 +2104,7 @@
"mode": "series",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2212,9 +2190,7 @@
"mode": "series",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2299,9 +2275,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"current"
]
"values": ["current"]
},
"yaxes": [
{
@@ -2387,9 +2361,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2474,9 +2446,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"current"
]
"values": ["current"]
},
"yaxes": [
{
@@ -2562,9 +2532,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2649,9 +2617,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"current"
]
"values": ["current"]
},
"yaxes": [
{
@@ -2737,9 +2703,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2768,10 +2732,7 @@
"refresh": false,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"mssql"
],
"tags": ["gdev", "mssql", "datasource-test"],
"templating": {
"list": [
{
@@ -2871,32 +2832,11 @@
"to": "2018-03-15T13:55:01.000Z"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Datasource tests - MSSQL (unit test)",
"uid": "GlAqcPgmz",
"version": 2
}
}

View File

@@ -323,11 +323,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -352,11 +348,7 @@
],
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"fake-data-gen",
"mysql"
],
"tags": ["gdev", "mysql", "datasource-tags"],
"templating": {
"list": [
{
@@ -502,32 +494,11 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Datasource tests - MySQL",
"uid": "DGsCac3kz",
"version": 8
}
}

View File

@@ -90,11 +90,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -143,11 +139,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -197,11 +189,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -251,11 +239,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -305,11 +289,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -1938,9 +1918,7 @@
"mode": "series",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2026,9 +2004,7 @@
"mode": "series",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2113,9 +2089,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"current"
]
"values": ["current"]
},
"yaxes": [
{
@@ -2201,9 +2175,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2288,9 +2260,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"current"
]
"values": ["current"]
},
"yaxes": [
{
@@ -2376,9 +2346,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2463,9 +2431,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"current"
]
"values": ["current"]
},
"yaxes": [
{
@@ -2551,9 +2517,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2582,10 +2546,7 @@
"refresh": false,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"mysql"
],
"tags": ["gdev", "mysql", "datasource-test"],
"templating": {
"list": [
{
@@ -2683,32 +2644,11 @@
"to": "2018-03-15T13:55:01.000Z"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Datasource tests - MySQL (unittest)",
"uid": "Hmf8FDkmz",
"version": 2
}
}

View File

@@ -75,7 +75,7 @@
{
"alias": "",
"format": "time_series",
"rawSql": "SELECT\n $__timeGroup(\"createdAt\",'$summarize'),\n min(value) as \"value\",\n 'total avg' as \"metric\"\nFROM \n grafana_metric\nWHERE\n $__timeFilter(\"createdAt\") AND\n measurement = 'logins.count'\nGROUP BY time",
"rawSql": "SELECT\n $__timeGroup(\"createdAt\",'$summarize'),\n min(value) as \"value\",\n 'total avg' as \"metric\"\nFROM \n grafana_metric\nWHERE\n $__timeFilter(\"createdAt\") AND\n measurement = 'logins.count'\nGROUP BY time\nORDER BY time",
"refId": "B"
}
],
@@ -323,11 +323,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -351,11 +347,7 @@
],
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"fake-data-gen",
"postgres"
],
"tags": ["gdev", "postgres", "datasource-test"],
"templating": {
"list": [
{
@@ -501,32 +493,11 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Datasource tests - Postgres",
"uid": "JYola5qzz",
"version": 4
}
}

View File

@@ -90,11 +90,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -143,11 +139,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -197,11 +189,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -251,11 +239,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -305,11 +289,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -1914,9 +1894,7 @@
"mode": "series",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2002,9 +1980,7 @@
"mode": "series",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2089,9 +2065,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"current"
]
"values": ["current"]
},
"yaxes": [
{
@@ -2177,9 +2151,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2264,9 +2236,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"current"
]
"values": ["current"]
},
"yaxes": [
{
@@ -2352,9 +2322,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2439,9 +2407,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"current"
]
"values": ["current"]
},
"yaxes": [
{
@@ -2527,9 +2493,7 @@
"mode": "histogram",
"name": null,
"show": true,
"values": [
"total"
]
"values": ["total"]
},
"yaxes": [
{
@@ -2558,10 +2522,7 @@
"refresh": false,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"postgres"
],
"tags": ["gdev", "postgres", "datasource-test"],
"templating": {
"list": [
{
@@ -2570,9 +2531,7 @@
"selected": true,
"tags": [],
"text": "All",
"value": [
"$__all"
]
"value": ["$__all"]
},
"datasource": "gdev-postgres-ds-tests",
"hide": 0,
@@ -2663,32 +2622,11 @@
"to": "2018-03-15T13:55:01.000Z"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Datasource tests - Postgres (unittest)",
"uid": "vHQdlVziz",
"version": 1
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,149 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"folderId": null,
"gridPos": {
"h": 26,
"w": 6,
"x": 0,
"y": 0
},
"headings": true,
"id": 7,
"limit": 100,
"links": [],
"query": "",
"recent": true,
"search": false,
"starred": true,
"tags": [],
"timeFrom": null,
"timeShift": null,
"title": "Starred",
"type": "dashlist"
},
{
"folderId": null,
"gridPos": {
"h": 13,
"w": 6,
"x": 6,
"y": 0
},
"headings": false,
"id": 2,
"limit": 1000,
"links": [],
"query": "",
"recent": false,
"search": true,
"starred": false,
"tags": ["panel-tests"],
"timeFrom": null,
"timeShift": null,
"title": "tag: panel-tests",
"type": "dashlist"
},
{
"folderId": null,
"gridPos": {
"h": 26,
"w": 6,
"x": 12,
"y": 0
},
"headings": false,
"id": 3,
"limit": 1000,
"links": [],
"query": "",
"recent": false,
"search": true,
"starred": false,
"tags": ["gdev", "demo"],
"timeFrom": null,
"timeShift": null,
"title": "tag: dashboard-demo",
"type": "dashlist"
},
{
"folderId": null,
"gridPos": {
"h": 26,
"w": 6,
"x": 18,
"y": 0
},
"headings": false,
"id": 5,
"limit": 1000,
"links": [],
"query": "",
"recent": false,
"search": true,
"starred": false,
"tags": ["gdev", "datasource-test"],
"timeFrom": null,
"timeShift": null,
"title": "Data source tests",
"type": "dashlist"
},
{
"folderId": null,
"gridPos": {
"h": 13,
"w": 6,
"x": 6,
"y": 13
},
"headings": false,
"id": 4,
"limit": 1000,
"links": [],
"query": "",
"recent": false,
"search": true,
"starred": false,
"tags": ["templating", "gdev"],
"timeFrom": null,
"timeShift": null,
"title": "tag: templating ",
"type": "dashlist"
}
],
"schemaVersion": 18,
"style": "dark",
"tags": [],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Grafana Dev Overview & Home",
"uid": "j6T00KRZz",
"version": 2
}

View File

@@ -0,0 +1,665 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"id": 7501,
"links": [],
"panels": [
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 7,
"w": 24,
"x": 0,
"y": 0
},
"id": 2,
"links": [],
"options": {
"displayMode": "lcd",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"max": 100,
"min": 0,
"unit": "decgbytes"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "orange",
"index": 1,
"value": 60
},
{
"color": "red",
"index": 2,
"value": 80
}
],
"values": false
},
"orientation": "vertical"
},
"targets": [
{
"alias": "sda1",
"refId": "A",
"scenarioId": "random_walk"
},
{
"alias": "sda2",
"refId": "B",
"scenarioId": "random_walk"
},
{
"alias": "sda3",
"refId": "C",
"scenarioId": "random_walk"
},
{
"alias": "sda4",
"refId": "D",
"scenarioId": "random_walk"
},
{
"alias": "sda5",
"refId": "E",
"scenarioId": "random_walk"
},
{
"alias": "sda6",
"refId": "F",
"scenarioId": "random_walk"
},
{
"alias": "sda7",
"refId": "G",
"scenarioId": "random_walk"
},
{
"alias": "sda8",
"refId": "H",
"scenarioId": "random_walk"
},
{
"alias": "sda9",
"refId": "I",
"scenarioId": "random_walk"
},
{
"alias": "sda10",
"refId": "J",
"scenarioId": "random_walk"
},
{
"alias": "sda11",
"refId": "K",
"scenarioId": "random_walk"
},
{
"alias": "sda12",
"refId": "L",
"scenarioId": "random_walk"
},
{
"alias": "sda13",
"refId": "M",
"scenarioId": "random_walk"
},
{
"alias": "sda14",
"refId": "N",
"scenarioId": "random_walk"
},
{
"alias": "sda15",
"refId": "O",
"scenarioId": "random_walk"
},
{
"alias": "sda16",
"refId": "P",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "",
"transparent": true,
"type": "bargauge"
},
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 10,
"w": 16,
"x": 0,
"y": 7
},
"id": 4,
"links": [],
"options": {
"displayMode": "gradient",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"decimals": null,
"max": 100,
"min": 0,
"unit": "celsius"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "blue",
"index": 0,
"value": null
},
{
"color": "green",
"index": 1,
"value": 20
},
{
"color": "orange",
"index": 2,
"value": 40
},
{
"color": "red",
"index": 3,
"value": 80
}
],
"values": false
},
"orientation": "horizontal"
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"alias": "Inside",
"refId": "H",
"scenarioId": "csv_metric_values",
"stringInput": "100,100,100"
},
{
"alias": "Outhouse",
"refId": "A",
"scenarioId": "random_walk"
},
{
"alias": "Area B",
"refId": "B",
"scenarioId": "random_walk"
},
{
"alias": "Basement",
"refId": "C",
"scenarioId": "random_walk"
},
{
"alias": "Garage",
"refId": "D",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Gradient mode",
"type": "bargauge"
},
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 10,
"w": 6,
"x": 16,
"y": 7
},
"id": 6,
"links": [],
"options": {
"displayMode": "basic",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"decimals": null,
"max": 100,
"min": 0,
"unit": "watt"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "blue",
"index": 0,
"value": null
},
{
"color": "green",
"index": 1,
"value": 42.5
},
{
"color": "orange",
"index": 2,
"value": 80
},
{
"color": "red",
"index": 3,
"value": 90
}
],
"values": false
},
"orientation": "horizontal"
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"refId": "H",
"scenarioId": "csv_metric_values",
"stringInput": "100,100,100"
},
{
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "J",
"scenarioId": "random_walk"
},
{
"refId": "K",
"scenarioId": "random_walk"
},
{
"refId": "L",
"scenarioId": "random_walk"
},
{
"refId": "M",
"scenarioId": "random_walk"
},
{
"refId": "N",
"scenarioId": "random_walk"
},
{
"refId": "O",
"scenarioId": "random_walk"
},
{
"refId": "P",
"scenarioId": "random_walk"
},
{
"refId": "Q",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Basic",
"type": "bargauge"
},
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 22,
"w": 2,
"x": 22,
"y": 7
},
"id": 8,
"links": [],
"options": {
"displayMode": "lcd",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"max": 100,
"min": 0
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "red",
"index": 0,
"value": null
},
{
"color": "red",
"index": 1,
"value": 90
}
],
"values": false
},
"orientation": "vertical"
},
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Completion",
"type": "bargauge"
},
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 12,
"w": 22,
"x": 0,
"y": 17
},
"id": 10,
"links": [],
"options": {
"displayMode": "gradient",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"max": 100,
"min": 0,
"unit": "decgbytes"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "blue",
"index": 0,
"value": null
},
{
"color": "green",
"index": 1,
"value": 30
},
{
"color": "orange",
"index": 2,
"value": 60
},
{
"color": "red",
"index": 3,
"value": 80
}
],
"values": false
},
"orientation": "vertical"
},
"targets": [
{
"alias": "sda1",
"refId": "A",
"scenarioId": "random_walk"
},
{
"alias": "sda2",
"refId": "B",
"scenarioId": "random_walk"
},
{
"alias": "sda3",
"refId": "C",
"scenarioId": "random_walk"
},
{
"alias": "sda4",
"refId": "D",
"scenarioId": "random_walk"
},
{
"alias": "sda5",
"refId": "E",
"scenarioId": "random_walk"
},
{
"alias": "sda6",
"refId": "F",
"scenarioId": "random_walk"
},
{
"alias": "sda7",
"refId": "G",
"scenarioId": "random_walk"
},
{
"alias": "sda8",
"refId": "H",
"scenarioId": "random_walk"
},
{
"alias": "sda9",
"refId": "I",
"scenarioId": "random_walk"
},
{
"alias": "sda10",
"refId": "J",
"scenarioId": "random_walk"
},
{
"alias": "sda11",
"refId": "K",
"scenarioId": "random_walk"
},
{
"alias": "sda12",
"refId": "L",
"scenarioId": "random_walk"
},
{
"alias": "sda13",
"refId": "M",
"scenarioId": "random_walk"
},
{
"alias": "sda14",
"refId": "N",
"scenarioId": "random_walk"
},
{
"alias": "sda15",
"refId": "O",
"scenarioId": "random_walk"
},
{
"alias": "sda16",
"refId": "P",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "",
"type": "bargauge"
},
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 29
},
"id": 11,
"links": [],
"options": {
"displayMode": "basic",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"max": 100,
"min": 0,
"unit": "decgbytes"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "blue",
"index": 0,
"value": null
},
{
"color": "green",
"index": 1,
"value": 30
},
{
"color": "orange",
"index": 2,
"value": 60
},
{
"color": "red",
"index": 3,
"value": 80
}
],
"values": false
},
"orientation": "vertical"
},
"targets": [
{
"alias": "sda1",
"refId": "A",
"scenarioId": "random_walk"
},
{
"alias": "sda2",
"refId": "B",
"scenarioId": "random_walk"
},
{
"alias": "sda3",
"refId": "C",
"scenarioId": "random_walk"
},
{
"alias": "sda4",
"refId": "D",
"scenarioId": "random_walk"
},
{
"alias": "sda5",
"refId": "E",
"scenarioId": "random_walk"
},
{
"alias": "sda6",
"refId": "F",
"scenarioId": "random_walk"
},
{
"alias": "sda7",
"refId": "G",
"scenarioId": "random_walk"
},
{
"alias": "sda8",
"refId": "H",
"scenarioId": "random_walk"
},
{
"alias": "sda9",
"refId": "I",
"scenarioId": "random_walk"
},
{
"alias": "sda10",
"refId": "J",
"scenarioId": "random_walk"
},
{
"alias": "sda11",
"refId": "K",
"scenarioId": "random_walk"
},
{
"alias": "sda12",
"refId": "L",
"scenarioId": "random_walk"
},
{
"alias": "sda13",
"refId": "M",
"scenarioId": "random_walk"
},
{
"alias": "sda14",
"refId": "N",
"scenarioId": "random_walk"
},
{
"alias": "sda15",
"refId": "O",
"scenarioId": "random_walk"
},
{
"alias": "sda16",
"refId": "P",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "",
"type": "bargauge"
}
],
"refresh": "10s",
"schemaVersion": 18,
"style": "dark",
"tags": ["gdev", "demo"],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["2s", "5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Bar Gauge Demo",
"uid": "vmie2cmWz",
"version": 3
}

View File

@@ -0,0 +1,829 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"gridPos": {
"h": 7,
"w": 6,
"x": 0,
"y": 0
},
"id": 6,
"links": [],
"options": {
"displayMode": "gradient",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"decimals": null,
"max": 100,
"min": 0,
"unit": "celsius"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "blue",
"index": 0,
"value": null
},
{
"color": "green",
"index": 1,
"value": 20
},
{
"color": "orange",
"index": 2,
"value": 40
},
{
"color": "red",
"index": 3,
"value": 80
}
],
"values": false
},
"orientation": "horizontal"
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"alias": "Inside",
"refId": "H",
"scenarioId": "csv_metric_values",
"stringInput": "100,100,100"
},
{
"alias": "Outhouse",
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "F",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Title above bar",
"type": "bargauge"
},
{
"gridPos": {
"h": 7,
"w": 5,
"x": 6,
"y": 0
},
"id": 12,
"links": [],
"options": {
"displayMode": "gradient",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"decimals": null,
"max": 100,
"min": 0,
"unit": "celsius"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "blue",
"index": 0,
"value": null
},
{
"color": "green",
"index": 1,
"value": 20
},
{
"color": "orange",
"index": 2,
"value": 40
},
{
"color": "red",
"index": 3,
"value": 80
}
],
"values": false
},
"orientation": "horizontal"
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"alias": "Inside",
"refId": "H",
"scenarioId": "csv_metric_values",
"stringInput": "100,100,100"
},
{
"alias": "Outhouse",
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "F",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
},
{
"refId": "C",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Title to left of bar",
"type": "bargauge"
},
{
"gridPos": {
"h": 7,
"w": 7,
"x": 11,
"y": 0
},
"id": 13,
"links": [],
"options": {
"displayMode": "basic",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"decimals": null,
"max": 100,
"min": 0,
"unit": "celsius"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "blue",
"index": 0,
"value": null
},
{
"color": "green",
"index": 1,
"value": 20
},
{
"color": "orange",
"index": 2,
"value": 40
},
{
"color": "red",
"index": 3,
"value": 80
}
],
"values": false
},
"orientation": "horizontal"
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"alias": "Inside",
"refId": "H",
"scenarioId": "csv_metric_values",
"stringInput": "100,100,100"
},
{
"alias": "Outhouse",
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "F",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
},
{
"refId": "C",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Basic mode",
"type": "bargauge"
},
{
"gridPos": {
"h": 7,
"w": 6,
"x": 18,
"y": 0
},
"id": 14,
"links": [],
"options": {
"displayMode": "lcd",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"decimals": null,
"max": 100,
"min": 0,
"unit": "celsius"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "blue",
"index": 0,
"value": null
},
{
"color": "green",
"index": 1,
"value": 20
},
{
"color": "orange",
"index": 2,
"value": 40
},
{
"color": "red",
"index": 3,
"value": 80
}
],
"values": false
},
"orientation": "horizontal"
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"alias": "Inside",
"refId": "H",
"scenarioId": "csv_metric_values",
"stringInput": "100,100,100"
},
{
"alias": "Outhouse",
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "F",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
},
{
"refId": "C",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "LED",
"type": "bargauge"
},
{
"gridPos": {
"h": 9,
"w": 11,
"x": 0,
"y": 7
},
"id": 7,
"links": [],
"options": {
"displayMode": "lcd",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"decimals": null,
"max": 100,
"min": 0,
"unit": "watt"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "orange",
"index": 1,
"value": 40
},
{
"color": "red",
"index": 2,
"value": 80
}
],
"values": false
},
"orientation": "vertical"
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"refId": "E",
"scenarioId": "csv_metric_values",
"stringInput": "10003,33333"
},
{
"refId": "F",
"scenarioId": "random_walk"
},
{
"refId": "G",
"scenarioId": "random_walk"
},
{
"refId": "H",
"scenarioId": "csv_metric_values",
"stringInput": "100,100,100"
},
{
"refId": "I",
"scenarioId": "random_walk"
},
{
"refId": "J",
"scenarioId": "random_walk"
},
{
"refId": "K",
"scenarioId": "random_walk"
},
{
"refId": "L",
"scenarioId": "random_walk"
},
{
"refId": "M",
"scenarioId": "random_walk"
},
{
"refId": "N",
"scenarioId": "random_walk"
},
{
"refId": "O",
"scenarioId": "random_walk"
},
{
"refId": "P",
"scenarioId": "random_walk"
},
{
"refId": "Q",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "LED Vertical",
"type": "bargauge"
},
{
"gridPos": {
"h": 9,
"w": 13,
"x": 11,
"y": 7
},
"id": 8,
"links": [],
"options": {
"displayMode": "basic",
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"decimals": null,
"max": 100,
"min": 0,
"unit": "watt"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "purple",
"index": 1,
"value": 50
},
{
"color": "blue",
"index": 2,
"value": 70
}
],
"values": false
},
"orientation": "vertical"
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"refId": "H",
"scenarioId": "csv_metric_values",
"stringInput": "100,100,100"
},
{
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
},
{
"refId": "C",
"scenarioId": "random_walk"
},
{
"refId": "D",
"scenarioId": "random_walk"
},
{
"refId": "I",
"scenarioId": "random_walk"
},
{
"refId": "J",
"scenarioId": "random_walk"
},
{
"refId": "K",
"scenarioId": "random_walk"
},
{
"refId": "L",
"scenarioId": "random_walk"
},
{
"refId": "M",
"scenarioId": "random_walk"
},
{
"refId": "N",
"scenarioId": "random_walk"
},
{
"refId": "O",
"scenarioId": "random_walk"
},
{
"refId": "P",
"scenarioId": "random_walk"
},
{
"refId": "Q",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Basic vertical ",
"type": "bargauge"
},
{
"gridPos": {
"h": 7,
"w": 11,
"x": 0,
"y": 16
},
"id": 16,
"links": [],
"options": {
"displayMode": "lcd",
"fieldOptions": {
"calcs": ["last"],
"defaults": {
"max": 100,
"min": 0
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "blue",
"index": 1,
"value": 40
},
{
"color": "red",
"index": 2,
"value": 80
}
],
"values": false
},
"orientation": "horizontal"
},
"pluginVersion": "6.3.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0,-100"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Negative value below min",
"type": "bargauge"
},
{
"gridPos": {
"h": 7,
"w": 3,
"x": 11,
"y": 16
},
"id": 17,
"links": [],
"options": {
"displayMode": "lcd",
"fieldOptions": {
"calcs": ["last"],
"defaults": {
"max": 100,
"min": 0
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "blue",
"index": 1,
"value": 40
},
{
"color": "red",
"index": 2,
"value": 80
}
],
"values": false
},
"orientation": "vertical"
},
"pluginVersion": "6.3.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0,-100"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Negative value below min",
"type": "bargauge"
},
{
"gridPos": {
"h": 7,
"w": 3,
"x": 14,
"y": 16
},
"id": 18,
"links": [],
"options": {
"displayMode": "lcd",
"fieldOptions": {
"calcs": ["last"],
"defaults": {
"max": 100,
"min": -10
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "blue",
"index": 1,
"value": 40
},
{
"color": "red",
"index": 2,
"value": 80
}
],
"values": false
},
"orientation": "vertical"
},
"pluginVersion": "6.3.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,6"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Positive value above min",
"type": "bargauge"
},
{
"gridPos": {
"h": 7,
"w": 3,
"x": 17,
"y": 16
},
"id": 19,
"links": [],
"options": {
"displayMode": "lcd",
"fieldOptions": {
"calcs": ["last"],
"defaults": {
"max": 35,
"min": -20
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "blue",
"index": 0,
"value": null
},
{
"color": "green",
"index": 1,
"value": 5
},
{
"color": "#EAB839",
"index": 2,
"value": 25
},
{
"color": "red",
"index": 3,
"value": 30
}
],
"values": false
},
"orientation": "vertical"
},
"pluginVersion": "6.3.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,6"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Negative min ",
"type": "bargauge"
},
{
"gridPos": {
"h": 7,
"w": 4,
"x": 20,
"y": 16
},
"id": 20,
"links": [],
"options": {
"displayMode": "gradient",
"fieldOptions": {
"calcs": ["last"],
"defaults": {
"max": 35,
"min": -20
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "blue",
"index": 0,
"value": null
},
{
"color": "green",
"index": 1,
"value": 5
},
{
"color": "#EAB839",
"index": 2,
"value": 25
},
{
"color": "red",
"index": 3,
"value": 30
}
],
"values": false
},
"orientation": "vertical"
},
"pluginVersion": "6.3.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "30,30"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Negative min",
"type": "bargauge"
}
],
"schemaVersion": 18,
"style": "dark",
"tags": ["gdev", "panel-tests"],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Panel Tests - Bar Gauge",
"uid": "O6f11TZWk",
"version": 12
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,904 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"cacheTimeout": null,
"colorBackground": false,
"colorValue": false,
"colors": ["#299c46", "#5794F2", "#d44a3a"],
"description": "asdasdas",
"format": "ms",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": false,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 4,
"w": 11,
"x": 0,
"y": 0
},
"id": 8,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "100%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"thresholds": "",
"timeFrom": null,
"timeShift": "2h",
"title": "Title",
"type": "singlestat",
"valueFontSize": "120%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "avg"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorValue": false,
"colors": ["#299c46", "#5794F2", "#d44a3a"],
"description": "asdasdas",
"format": "ms",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": false,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 4,
"w": 13,
"x": 11,
"y": 0
},
"id": 2,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "100%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"thresholds": "",
"timeFrom": null,
"timeShift": "2h",
"title": "",
"type": "singlestat",
"valueFontSize": "120%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "avg"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorValue": false,
"colors": ["#299c46", "#5794F2", "#d44a3a"],
"description": "asdasdas",
"format": "ms",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": false,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 4,
"w": 11,
"x": 0,
"y": 4
},
"id": 4,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "100%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": true,
"lineColor": "rgb(31, 120, 193)",
"show": true
},
"tableColumn": "",
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"thresholds": "",
"timeFrom": null,
"timeShift": "2h",
"title": "Panel Title",
"type": "singlestat",
"valueFontSize": "120%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "avg"
},
{
"cacheTimeout": null,
"description": "asdasdas",
"gridPos": {
"h": 4,
"w": 6,
"x": 11,
"y": 4
},
"id": 9,
"links": [],
"options": {
"maxValue": 100,
"minValue": 0,
"orientation": "auto",
"showThresholdLabels": false,
"showThresholdMarkers": true,
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "red",
"index": 1,
"value": 80
}
],
"valueMappings": [],
"valueOptions": {
"decimals": null,
"prefix": "",
"stat": "mean",
"suffix": "",
"unit": "none"
}
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": "2h",
"title": "Panel Title",
"type": "gauge"
},
{
"cacheTimeout": null,
"description": "asdasdas",
"gridPos": {
"h": 4,
"w": 7,
"x": 17,
"y": 4
},
"id": 11,
"links": [],
"options": {
"maxValue": 100,
"minValue": 0,
"orientation": "auto",
"showThresholdLabels": false,
"showThresholdMarkers": true,
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "red",
"index": 1,
"value": 80
}
],
"valueMappings": [],
"valueOptions": {
"decimals": null,
"prefix": "",
"stat": "mean",
"suffix": "",
"unit": "none"
}
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": "2h",
"title": "Panel Title",
"type": "gauge"
},
{
"gridPos": {
"h": 4,
"w": 11,
"x": 0,
"y": 8
},
"id": 15,
"links": [],
"options": {
"content": "# Title\n\nFor markdown syntax help: [commonmark.org/help](https://commonmark.org/help/)\n\n\n",
"mode": "markdown"
},
"timeFrom": null,
"timeShift": null,
"title": "",
"type": "text2"
},
{
"cacheTimeout": null,
"colorBackground": false,
"colorValue": false,
"colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
"description": "asdasdas",
"format": "none",
"gauge": {
"maxValue": 100,
"minValue": 0,
"show": true,
"thresholdLabels": false,
"thresholdMarkers": true
},
"gridPos": {
"h": 4,
"w": 6,
"x": 11,
"y": 8
},
"id": 10,
"interval": null,
"links": [],
"mappingType": 1,
"mappingTypes": [
{
"name": "value to text",
"value": 1
},
{
"name": "range to text",
"value": 2
}
],
"maxDataPoints": 100,
"nullPointMode": "connected",
"nullText": null,
"pluginVersion": "6.2.0-pre",
"postfix": "",
"postfixFontSize": "50%",
"prefix": "",
"prefixFontSize": "50%",
"rangeMaps": [
{
"from": "null",
"text": "N/A",
"to": "null"
}
],
"sparkline": {
"fillColor": "rgba(31, 118, 189, 0.18)",
"full": false,
"lineColor": "rgb(31, 120, 193)",
"show": false
},
"tableColumn": "",
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"thresholds": "",
"timeFrom": null,
"timeShift": "2h",
"title": "",
"type": "singlestat",
"valueFontSize": "80%",
"valueMaps": [
{
"op": "=",
"text": "N/A",
"value": "null"
}
],
"valueName": "avg"
},
{
"cacheTimeout": null,
"description": "asdasdas",
"gridPos": {
"h": 4,
"w": 7,
"x": 17,
"y": 8
},
"id": 12,
"links": [],
"options": {
"maxValue": 100,
"minValue": 0,
"orientation": "auto",
"showThresholdLabels": false,
"showThresholdMarkers": true,
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "red",
"index": 1,
"value": 80
}
],
"valueMappings": [],
"valueOptions": {
"decimals": null,
"prefix": "",
"stat": "mean",
"suffix": "",
"unit": "none"
}
},
"pluginVersion": "6.2.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": "2h",
"title": "",
"type": "gauge"
},
{
"cacheTimeout": null,
"description": "",
"gridPos": {
"h": 6,
"w": 11,
"x": 0,
"y": 12
},
"id": 3,
"links": [],
"options": {
"displayMode": "gradient",
"fieldOptions": {
"defaults": {
"max": 100,
"min": 0
},
"mappings": [],
"override": {},
"stats": ["mean"],
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "red",
"index": 1,
"value": 80
}
],
"title": "Testing",
"values": false
},
"maxValue": 100,
"minValue": 0,
"orientation": "horizontal",
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "red",
"index": 1,
"value": 80
}
],
"valueMappings": [],
"valueOptions": {
"decimals": null,
"prefix": "",
"stat": "mean",
"suffix": "",
"unit": "none"
}
},
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": "2h",
"title": "",
"type": "bargauge"
},
{
"cacheTimeout": null,
"description": "asdasdas",
"gridPos": {
"h": 6,
"w": 13,
"x": 11,
"y": 12
},
"id": 5,
"links": [],
"options": {
"displayMode": "gradient",
"fieldOptions": {
"defaults": {
"max": 100,
"min": 0
},
"mappings": [],
"override": {},
"stats": ["mean"],
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "red",
"index": 1,
"value": 80
}
],
"title": "Testing",
"values": false
},
"maxValue": 100,
"minValue": 0,
"orientation": "horizontal",
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "red",
"index": 1,
"value": 80
}
],
"valueMappings": [],
"valueOptions": {
"decimals": null,
"prefix": "",
"stat": "mean",
"suffix": "",
"unit": "none"
}
},
"targets": [
{
"refId": "A",
"scenarioId": "slow_query",
"stringInput": "1s"
},
{
"refId": "B",
"scenarioId": "slow_query",
"stringInput": "1s"
}
],
"timeFrom": null,
"timeShift": "2h",
"title": "My cool pane title",
"type": "bargauge"
},
{
"cacheTimeout": null,
"description": "asdasdas",
"gridPos": {
"h": 4,
"w": 24,
"x": 0,
"y": 18
},
"id": 7,
"links": [],
"options": {
"displayMode": "gradient",
"fieldOptions": {
"defaults": {
"max": 100,
"min": 0
},
"mappings": [],
"override": {},
"stats": ["mean"],
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "red",
"index": 1,
"value": 80
}
],
"title": "Testing",
"values": false
},
"maxValue": 100,
"minValue": 0,
"orientation": "horizontal",
"thresholds": [
{
"color": "green",
"index": 0,
"value": null
},
{
"color": "red",
"index": 1,
"value": 80
}
],
"valueMappings": [],
"valueOptions": {
"decimals": null,
"prefix": "",
"stat": "mean",
"suffix": "",
"unit": "none"
}
},
"targets": [
{
"refId": "A",
"scenarioId": "slow_query",
"stringInput": "10s"
}
],
"timeFrom": null,
"timeShift": null,
"title": "My cool pane title",
"type": "bargauge"
},
{
"aliasColors": {},
"bars": false,
"cacheTimeout": null,
"dashLength": 10,
"dashes": false,
"description": "asdasdas",
"fill": 1,
"gridPos": {
"h": 6,
"w": 11,
"x": 0,
"y": 22
},
"id": 6,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "slow_query",
"stringInput": "5s"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "My cool pane title",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"cacheTimeout": null,
"dashLength": 10,
"dashes": false,
"description": "",
"fill": 1,
"gridPos": {
"h": 6,
"w": 13,
"x": 11,
"y": 22
},
"id": 13,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "slow_query",
"stringInput": "5s"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"schemaVersion": 18,
"style": "dark",
"tags": ["gdev", "panel-tests"],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Panel Tests - With & Without title",
"uid": "2WaUpZmWk",
"version": 23
}

View File

@@ -0,0 +1,265 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 8,
"w": 20,
"x": 0,
"y": 0
},
"id": 6,
"links": [],
"options": {
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"decimals": 0,
"max": 100,
"min": 0,
"unit": "none"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "#7EB26D",
"index": 0,
"value": null
},
{
"color": "#EAB839",
"index": 1,
"value": 50
},
{
"color": "#6ED0E0",
"index": 2,
"value": 75
},
{
"color": "#EF843C",
"index": 3,
"value": 87.5
},
{
"color": "#E24D42",
"index": 4,
"value": 93.75
},
{
"color": "#1F78C1",
"index": 5,
"value": 96.875
}
],
"values": false
},
"orientation": "auto",
"showThresholdLabels": false,
"showThresholdMarkers": true
},
"pluginVersion": "6.3.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
},
{
"refId": "C",
"scenarioId": "random_walk"
},
{
"refId": "D",
"scenarioId": "random_walk"
},
{
"refId": "E",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Horizontal with range variable",
"type": "gauge"
},
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 28,
"w": 4,
"x": 20,
"y": 0
},
"id": 4,
"links": [],
"options": {
"fieldOptions": {
"calcs": ["max"],
"defaults": {
"decimals": 0,
"max": "200",
"min": 0,
"unit": "none"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "#7EB26D",
"index": 0,
"value": null
},
{
"color": "#EAB839",
"index": 1,
"value": 50
},
{
"color": "#6ED0E0",
"index": 2,
"value": 75
}
],
"values": false
},
"orientation": "auto",
"showThresholdLabels": false,
"showThresholdMarkers": true
},
"pluginVersion": "6.3.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
},
{
"refId": "C",
"scenarioId": "random_walk"
},
{
"refId": "D",
"scenarioId": "random_walk"
},
{
"refId": "E",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Vertical",
"type": "gauge"
},
{
"datasource": "gdev-testdata",
"gridPos": {
"h": 20,
"w": 20,
"x": 0,
"y": 8
},
"id": 2,
"links": [],
"options": {
"fieldOptions": {
"calcs": ["mean"],
"defaults": {
"decimals": 0,
"max": 100,
"min": 0,
"unit": "none"
},
"mappings": [],
"override": {},
"thresholds": [
{
"color": "#7EB26D",
"index": 0,
"value": null
},
{
"color": "#EAB839",
"index": 1,
"value": 50
}
],
"values": false
},
"orientation": "auto",
"showThresholdLabels": false,
"showThresholdMarkers": true
},
"pluginVersion": "6.3.0-pre",
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
},
{
"refId": "B",
"scenarioId": "random_walk"
},
{
"refId": "C",
"scenarioId": "random_walk"
},
{
"refId": "D",
"scenarioId": "random_walk"
},
{
"refId": "E",
"scenarioId": "random_walk"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Repeat horizontal",
"type": "gauge"
}
],
"schemaVersion": 18,
"style": "dark",
"tags": ["panel-tests", "gdev", "gauge"],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Panel Tests - Gauge Multi Series",
"uid": "szkuR1umk",
"version": 2
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,383 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"aliasColors": {
"A-series": "rgb(48, 139, 237)"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"fill": 1,
"fillGradient": 5,
"gridPos": {
"h": 8,
"w": 11,
"x": 0,
"y": 0
},
"id": 2,
"interval": "1m",
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"options": {},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Req/s",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"A-series": "rgb(87, 186, 242)"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"fill": 4,
"fillGradient": 4,
"gridPos": {
"h": 15,
"w": 13,
"x": 11,
"y": 0
},
"id": 11,
"interval": "1m",
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"options": {},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Req/s",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"A-series": "red"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"fill": 1,
"fillGradient": 5,
"gridPos": {
"h": 7,
"w": 11,
"x": 0,
"y": 8
},
"id": 7,
"interval": "1m",
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"options": {},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Memory",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "decgbytes",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"A-series": "green"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"fill": 2,
"fillGradient": 10,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 15
},
"id": 10,
"interval": "1m",
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 0,
"links": [],
"nullPointMode": "null",
"options": {},
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
"title": "Req/s",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"schemaVersion": 18,
"style": "dark",
"tags": ["gdev", "panel-tests", "graph"],
"templating": {
"list": []
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Panel Tests - Graph - Gradient Area Fills",
"uid": "37Dq903mk",
"version": 25
}

View File

@@ -0,0 +1,580 @@
{
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"links": [],
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 0
},
"id": 2,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "gray",
"fill": true,
"fillColor": "rgba(255, 255, 255, 0.03)",
"from": "08:30",
"fromDayOfWeek": 1,
"line": false,
"lineColor": "rgba(255, 255, 255, 0.2)",
"op": "time",
"to": "16:45",
"toDayOfWeek": 5
}
],
"timeShift": null,
"title": "Business Hours",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 8
},
"id": 4,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "red",
"fill": true,
"fillColor": "rgba(255, 255, 255, 0.03)",
"from": "20:00",
"fromDayOfWeek": 7,
"line": false,
"lineColor": "rgba(255, 255, 255, 0.2)",
"op": "time",
"to": "23:00",
"toDayOfWeek": 7
}
],
"timeShift": null,
"title": "Sunday's 20-23",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {
"A-series": "#d683ce"
},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 16
},
"id": 3,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 0.5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 0, 0, 0.22)",
"from": "",
"fromDayOfWeek": 1,
"line": true,
"lineColor": "rgba(255, 0, 0, 0.32)",
"op": "time",
"to": "",
"toDayOfWeek": 1
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 127, 0, 0.22)",
"fromDayOfWeek": 2,
"line": true,
"lineColor": "rgba(255, 127, 0, 0.32)",
"op": "time",
"toDayOfWeek": 2
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(255, 255, 0, 0.22)",
"fromDayOfWeek": 3,
"line": true,
"lineColor": "rgba(255, 255, 0, 0.22)",
"op": "time",
"toDayOfWeek": 3
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(0, 255, 0, 0.22)",
"fromDayOfWeek": 4,
"line": true,
"lineColor": "rgba(0, 255, 0, 0.32)",
"op": "time",
"toDayOfWeek": 4
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(0, 0, 255, 0.22)",
"fromDayOfWeek": 5,
"line": true,
"lineColor": "rgba(0, 0, 255, 0.32)",
"op": "time",
"toDayOfWeek": 5
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(75, 0, 130, 0.22)",
"fromDayOfWeek": 6,
"line": true,
"lineColor": "rgba(75, 0, 130, 0.32)",
"op": "time",
"toDayOfWeek": 6
},
{
"colorMode": "custom",
"fill": true,
"fillColor": "rgba(148, 0, 211, 0.22)",
"fromDayOfWeek": 7,
"line": true,
"lineColor": "rgba(148, 0, 211, 0.32)",
"op": "time",
"toDayOfWeek": 7
}
],
"timeShift": null,
"title": "Each day of week",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 2,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 24
},
"id": 5,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"expr": "",
"format": "time_series",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "random_walk",
"target": ""
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "red",
"fill": false,
"from": "05:00",
"line": true,
"op": "time"
}
],
"timeShift": null,
"title": "05:00",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "gdev-testdata",
"fill": 1,
"gridPos": {
"h": 8,
"w": 24,
"x": 0,
"y": 32
},
"id": 7,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "null",
"percentage": false,
"pointradius": 2,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenarioId": "random_walk"
}
],
"thresholds": [],
"timeFrom": null,
"timeRegions": [
{
"colorMode": "gray",
"fill": true,
"fillColor": "rgba(234, 112, 112, 0.12)",
"from": "22:00",
"line": false,
"lineColor": "rgba(237, 46, 24, 0.60)",
"op": "time",
"to": "00:30"
}
],
"timeShift": null,
"title": "From 22:00 to 00:30 (crossing midnight)",
"tooltip": {
"shared": true,
"sort": 0,
"value_type": "individual"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
],
"yaxis": {
"align": false,
"alignLevel": null
}
}
],
"refresh": false,
"schemaVersion": 18,
"style": "dark",
"tags": ["gdev", "panel-tests", "graph"],
"templating": {
"list": []
},
"time": {
"from": "now-30d",
"to": "now"
},
"timepicker": {
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "browser",
"title": "Panel Tests - Graph Time Regions",
"uid": "XMjIZPmik",
"version": 9
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -21,11 +21,7 @@
"cacheTimeout": null,
"colorBackground": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
@@ -106,11 +102,7 @@
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#d44a3a",
"rgba(237, 129, 40, 0.89)",
"#299c46"
],
"colors": ["#d44a3a", "rgba(237, 129, 40, 0.89)", "#299c46"],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
@@ -191,11 +183,7 @@
"colorBackground": true,
"colorPrefix": false,
"colorValue": false,
"colors": [
"#d44a3a",
"rgba(237, 129, 40, 0.89)",
"#299c46"
],
"colors": ["#d44a3a", "rgba(237, 129, 40, 0.89)", "#299c46"],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
@@ -276,11 +264,7 @@
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
@@ -361,11 +345,7 @@
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
@@ -446,11 +426,7 @@
"colorBackground": false,
"colorPrefix": false,
"colorValue": true,
"colors": [
"#299c46",
"rgba(237, 129, 40, 0.89)",
"#d44a3a"
],
"colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
"datasource": "gdev-testdata",
"decimals": null,
"description": "",
@@ -531,10 +507,7 @@
"revision": 8,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"panel-tests"
],
"tags": ["gdev", "panel-tests"],
"templating": {
"list": []
},
@@ -543,29 +516,8 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "browser",
"title": "Panel Tests - Singlestat",

View File

@@ -46,49 +46,31 @@
{
"alias": "",
"colorMode": "cell",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorCell",
"thresholds": [
"5",
"10"
],
"thresholds": ["5", "10"],
"type": "number",
"unit": "currencyUSD"
},
{
"alias": "",
"colorMode": "value",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorValue",
"thresholds": [
"5",
"10"
],
"thresholds": ["5", "10"],
"type": "number",
"unit": "Bps"
},
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -159,49 +141,31 @@
{
"alias": "",
"colorMode": "cell",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorCell",
"thresholds": [
"5",
"10"
],
"thresholds": ["5", "10"],
"type": "number",
"unit": "currencyUSD"
},
{
"alias": "",
"colorMode": "value",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorValue",
"thresholds": [
"5",
"10"
],
"thresholds": ["5", "10"],
"type": "number",
"unit": "Bps"
},
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -259,30 +223,19 @@
{
"alias": "",
"colorMode": "row",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "/Color/",
"thresholds": [
"5",
"10"
],
"thresholds": ["5", "10"],
"type": "number",
"unit": "currencyUSD"
},
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -334,49 +287,31 @@
{
"alias": "",
"colorMode": "cell",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorCell",
"thresholds": [
"5",
"10"
],
"thresholds": ["5", "10"],
"type": "number",
"unit": "currencyUSD"
},
{
"alias": "",
"colorMode": "value",
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"mappingType": 1,
"pattern": "ColorValue",
"thresholds": [
"5",
"10"
],
"thresholds": ["5", "10"],
"type": "number",
"unit": "Bps"
},
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
@@ -404,16 +339,101 @@
"title": "Column style thresholds & units",
"transform": "timeseries_to_columns",
"type": "table"
},
{
"columns": [],
"datasource": "gdev-testdata",
"fontSize": "100%",
"gridPos": {
"h": 10,
"w": 24,
"x": 0,
"y": 26
},
"id": 6,
"links": [],
"pageSize": 20,
"scroll": true,
"showHeader": true,
"sort": {
"col": 0,
"desc": true
},
"styles": [
{
"alias": "Time",
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"pattern": "Time",
"type": "date"
},
{
"alias": "",
"colorMode": "cell",
"colors": ["rgba(245, 54, 54, 0.5)", "rgba(237, 129, 40, 0.5)", "rgba(50, 172, 45, 0.5)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"link": true,
"linkTargetBlank": true,
"linkTooltip": "",
"linkUrl": "http://www.grafana.com",
"mappingType": 1,
"pattern": "ColorCell",
"thresholds": ["5", "10"],
"type": "number",
"unit": "currencyUSD"
},
{
"alias": "",
"colorMode": "value",
"colors": ["rgba(245, 54, 54, 0.5)", "rgba(237, 129, 40, 0.5)", "rgba(50, 172, 45, 0.5)"],
"dateFormat": "YYYY-MM-DD HH:mm:ss",
"decimals": 2,
"link": true,
"linkUrl": "http://www.grafana.com",
"mappingType": 1,
"pattern": "ColorValue",
"thresholds": ["5", "10"],
"type": "number",
"unit": "Bps"
},
{
"alias": "",
"colorMode": null,
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
"type": "number",
"unit": "short"
}
],
"targets": [
{
"alias": "ColorValue",
"expr": "",
"format": "table",
"intervalFactor": 1,
"refId": "A",
"scenarioId": "csv_metric_values",
"stringInput": "null,1,20,90,30,5,0,20,10"
},
{
"alias": "ColorCell",
"refId": "B",
"scenarioId": "csv_metric_values",
"stringInput": "null,5,1,2,3,4,5,10,20"
}
],
"title": "Column style thresholds and links",
"transform": "timeseries_to_columns",
"type": "table"
}
],
"refresh": false,
"revision": 8,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"panel-tests"
],
"tags": ["gdev", "panel-tests"],
"templating": {
"list": []
},
@@ -422,32 +442,11 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "browser",
"title": "Panel Tests - Table",
"uid": "pttable",
"version": 1
"version": 2
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,287 +0,0 @@
{
"revision": 2,
"title": "Alerting with TestData",
"tags": [
"grafana-test"
],
"style": "dark",
"timezone": "browser",
"editable": true,
"hideControls": false,
"sharedCrosshair": false,
"rows": [
{
"collapse": false,
"editable": true,
"height": 255.625,
"panels": [
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [
60
],
"type": "gt"
},
"query": {
"params": [
"A",
"5m",
"now"
]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"enabled": true,
"frequency": "60s",
"handler": 1,
"name": "TestData - Always OK",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"id": 3,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"span": 6,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "csv_metric_values",
"stringInput": "1,20,90,30,5,0",
"target": ""
}
],
"thresholds": [
{
"value": 60,
"op": "gt",
"fill": true,
"line": true,
"colorMode": "critical"
}
],
"timeFrom": null,
"timeShift": null,
"title": "Always OK",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": "125",
"min": "0",
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
]
},
{
"alert": {
"conditions": [
{
"evaluator": {
"params": [
177
],
"type": "gt"
},
"query": {
"params": [
"A",
"5m",
"now"
]
},
"reducer": {
"params": [],
"type": "avg"
},
"type": "query"
}
],
"enabled": true,
"frequency": "60s",
"handler": 1,
"name": "TestData - Always Alerting",
"noDataState": "no_data",
"notifications": []
},
"aliasColors": {},
"bars": false,
"datasource": "gdev-testdata",
"editable": true,
"error": false,
"fill": 1,
"id": 4,
"isNew": true,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 5,
"points": false,
"renderer": "flot",
"seriesOverrides": [],
"span": 6,
"stack": false,
"steppedLine": false,
"targets": [
{
"refId": "A",
"scenario": "random_walk",
"scenarioId": "csv_metric_values",
"stringInput": "200,445,100,150,200,220,190",
"target": ""
}
],
"thresholds": [
{
"colorMode": "critical",
"fill": true,
"line": true,
"op": "gt",
"value": 177
}
],
"timeFrom": null,
"timeShift": null,
"title": "Always Alerting",
"tooltip": {
"msResolution": false,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": "0",
"show": true
},
{
"format": "short",
"label": "",
"logBase": 1,
"max": null,
"min": null,
"show": true
}
]
}
],
"title": "New row"
}
],
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"templating": {
"list": []
},
"annotations": {
"list": []
},
"schemaVersion": 13,
"version": 4,
"links": [],
"gnetId": null
}

View File

@@ -0,0 +1,7 @@
FROM golang:latest
ADD main.go /
WORKDIR /
RUN go build -o main .
EXPOSE 3010
ENTRYPOINT ["/main"]

View File

@@ -0,0 +1,5 @@
alert_webhook_listener:
build: docker/blocks/alert_webhook_listener
network_mode: host
ports:
- "3010:3010"

View File

@@ -0,0 +1,24 @@
package main
import (
"fmt"
"io"
"io/ioutil"
"net/http"
)
func hello(w http.ResponseWriter, r *http.Request) {
body, err := ioutil.ReadAll(r.Body)
if err != nil {
return
}
line := fmt.Sprintf("webbhook: -> %s", string(body))
fmt.Println(line)
io.WriteString(w, line)
}
func main() {
http.HandleFunc("/", hello)
http.ListenAndServe(":3010", nil)
}

View File

@@ -5,7 +5,7 @@
- "9200:9200"
- "9300:9300"
volumes:
- ./blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
- ./docker/blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
fake-elastic-data:
image: grafana/fake-data-gen

View File

@@ -1,15 +1,15 @@
# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
elasticsearch5:
image: elasticsearch:5
command: elasticsearch
ports:
- "10200:9200"
- "10300:9300"
- '10200:9200'
- '10300:9300'
fake-elastic5-data:
image: grafana/fake-data-gen
network_mode: bridge
links:
- elasticsearch5
# network_mode: bridge
environment:
FD_DATASOURCE: elasticsearch
FD_PORT: 10200

View File

@@ -1,7 +1,7 @@
# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
elasticsearch6:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4
image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.1
command: elasticsearch
ports:
- "11200:9200"
@@ -13,3 +13,11 @@
environment:
FD_DATASOURCE: elasticsearch6
FD_PORT: 11200
filebeat6:
image: docker.elastic.co/beats/filebeat-oss:6.7.1
command: filebeat -e -strict.perms=false
volumes:
- ./docker/blocks/elastic6/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
- /var/log:/var/log:ro
- ../data/log:/var/log/grafana:ro

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,39 @@
# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
elasticsearch7:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0
command: elasticsearch -E "discovery.type=single-node"
ports:
- "12200:9200"
- "12300:9300"
fake-elastic7-data:
image: grafana/fake-data-gen
network_mode: bridge
environment:
FD_DATASOURCE: elasticsearch7
FD_PORT: 12200
filebeat7:
image: docker.elastic.co/beats/filebeat-oss:7.0.0
command: filebeat -e -strict.perms=false
volumes:
- ./docker/blocks/elastic7/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
- /var/log:/var/log:ro
- ../data/log:/var/log/grafana:ro
metricbeat7:
image: docker.elastic.co/beats/metricbeat-oss:7.0.0
network_mode: host
command: metricbeat -e -strict.perms=false
user: root
volumes:
- ./docker/blocks/elastic7/metricbeat.yml:/usr/share/metricbeat/metricbeat.yml:ro
- /var/run/docker.sock:/var/run/docker.sock:ro
kibana7:
image: docker.elastic.co/kibana/kibana-oss:7.0.0
ports:
- "5601:5601"
environment:
ELASTICSEARCH_HOSTS: http://elasticsearch7:9200

View File

@@ -0,0 +1,2 @@
script.inline: on
script.indexed: on

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,38 @@
metricbeat.config:
modules:
path: ${path.config}/modules.d/*.yml
# Reload module configs as they change:
reload.enabled: false
metricbeat.autodiscover:
providers:
- type: docker
hints.enabled: true
metricbeat.modules:
- module: docker
metricsets:
- "container"
- "cpu"
- "diskio"
- "healthcheck"
- "info"
#- "image"
- "memory"
- "network"
hosts: ["unix:///var/run/docker.sock"]
period: 10s
enabled: true
processors:
- add_cloud_metadata: ~
output.elasticsearch:
hosts: ["localhost:12200"]
index: "metricbeat-%{+yyyy.MM.dd}"
setup.template.name: "metricbeat"
setup.template.pattern: "metricbeat-*"
setup.template.settings:
index.number_of_shards: 1
index.number_of_replicas: 1

View File

@@ -0,0 +1,54 @@
version: '3'
volumes:
freeipa_data: {}
services:
freeipa:
image: freeipa/freeipa-server:fedora-29
container_name: freeipa
stdin_open: true
tty: true
sysctls:
- net.ipv6.conf.all.disable_ipv6=0
hostname: ipa.example.test
environment:
# - DEBUG_TRACE=1
- IPA_SERVER_IP=172.17.0.2
- DEBUG_NO_EXIT=1
- IPA_SERVER_HOSTNAME=ipa.example.test
- PASSWORD=Secret123
- HOSTNAME=ipa.example.test
command:
- --admin-password=Secret123
- --ds-password=Secret123
- -U
- --realm=EXAMPLE.TEST
ports:
# FreeIPA WebUI
- "80:80"
- "443:443"
# Kerberos
- "88:88/udp"
- "88:88"
- "464:464/udp"
- "464:464"
# LDAP
- "389:389"
- "636:636"
# DNS
# - "53:53/udp"
# - "53:53"
# NTP
- "123:123/udp"
# other
- "7389:7389"
- "9443:9443"
- "9444:9444"
- "9445:9445"
tmpfs:
- /run
- /tmp
volumes:
- freeipa_data:/data:Z
- /sys/fs/cgroup:/sys/fs/cgroup:ro

View File

@@ -0,0 +1,74 @@
# To troubleshoot and get more log info enable ldap debug logging in grafana.ini
# [log]
# filters = ldap:debug
[[servers]]
# Ldap server host (specify multiple hosts space separated)
host = "172.17.0.1"
# Default port is 389 or 636 if use_ssl = true
port = 389
# Set to true if ldap server supports TLS
use_ssl = false
# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS)
start_tls = false
# set to true if you want to skip ssl cert validation
ssl_skip_verify = false
# set to the path to your root CA certificate or leave unset to use system defaults
# root_ca_cert = "/path/to/certificate.crt"
# Search user bind dn
bind_dn = "uid=admin,cn=users,cn=accounts,dc=example,dc=test"
# Search user bind password
# If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
bind_password = 'Secret123'
# User search filter, for example "(cn=%s)" or "(sAMAccountName=%s)" or "(uid=%s)"
search_filter = "(uid=%s)"
# An array of base dns to search through
search_base_dns = ["cn=users,cn=accounts,dc=example,dc=test"]
# In POSIX LDAP schemas, without memberOf attribute a secondary query must be made for groups.
# This is done by enabling group_search_filter below. You must also set member_of= "cn"
# in [servers.attributes] below.
# Users with nested/recursive group membership and an LDAP server that supports LDAP_MATCHING_RULE_IN_CHAIN
# can set group_search_filter, group_search_filter_user_attribute, group_search_base_dns and member_of
# below in such a way that the user's recursive group membership is considered.
#
# Nested Groups + Active Directory (AD) Example:
#
# AD groups store the Distinguished Names (DNs) of members, so your filter must
# recursively search your groups for the authenticating user's DN. For example:
#
# group_search_filter = "(member:1.2.840.113556.1.4.1941:=%s)"
# group_search_filter_user_attribute = "distinguishedName"
# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
#
# [servers.attributes]
# ...
# member_of = "distinguishedName"
## Group search filter, to retrieve the groups of which the user is a member (only set if memberOf attribute is not available)
# group_search_filter = "(&(objectClass=posixGroup)(memberUid=%s))"
## Group search filter user attribute defines what user attribute gets substituted for %s in group_search_filter.
## Defaults to the value of username in [server.attributes]
## Valid options are any of your values in [servers.attributes]
## If you are using nested groups you probably want to set this and member_of in
## [servers.attributes] to "distinguishedName"
# group_search_filter_user_attribute = "distinguishedName"
## An array of the base DNs to search through for groups. Typically uses ou=groups
# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
# Specify names of the ldap attributes your ldap uses
[servers.attributes]
name = "givenName"
username = "uid"
member_of = "memberOf"
# surname = "sn"
# email = "mail"
[[servers.group_mappings]]
# If you want to match all (or no ldap groups) then you can use wildcard
group_dn = "*"
org_role = "Viewer"

View File

@@ -0,0 +1,32 @@
# Notes on FreeIPA LDAP Docker Block
Users have to be created manually. The docker-compose up command takes a few minutes to run.
## Create a user
`docker exec -it freeipa /bin/bash`
To create a user with username: `ldap-viewer` and password: `grafana123`
```bash
kinit admin
```
Log in with password `Secret123`
```bash
ipa user-add ldap-viewer --first ldap --last viewer
ipa passwd ldap-viewer
ldappasswd -D uid=ldap-viewer,cn=users,cn=accounts,dc=example,dc=org -w test -a test -s grafana123
```
## Enabling FreeIPA LDAP in Grafana
Copy the ldap_freeipa.toml file in this folder into your `conf` folder (it is gitignored already). To enable it in the .ini file to get Grafana to use this block:
```ini
[auth.ldap]
enabled = true
config_file = conf/ldap_freeipa.toml
; allow_sign_up = true
```

View File

@@ -1,17 +1,27 @@
influxdb:
image: influxdb:latest
image: influxdb:1.7.6
container_name: influxdb
ports:
- "2004:2004"
- "8083:8083"
- "8086:8086"
- '2004:2004'
- '8083:8083'
- '8086:8086'
volumes:
- ./blocks/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf
- ./docker/blocks/influxdb/influxdb.conf:/etc/influxdb/influxdb.conf
fake-influxdb-data:
image: grafana/fake-data-gen
network_mode: bridge
links:
- influxdb
environment:
FD_DATASOURCE: influxdb
FD_PORT: 8086
telegraf:
image: telegraf:1.10.4
links:
- influxdb
volumes:
- ./docker/blocks/influxdb/telegraf.conf:/etc/telegraf/telegraf.conf:ro
- /var/log:/var/log
- ../data/log:/var/log/grafana

View File

@@ -69,6 +69,7 @@ reporting-disabled = false
unix-socket-enabled = false # enable http service over unix domain socket
# bind-socket = "/var/run/influxdb.sock"
flux-enabled = true
[subscriber]
enabled = true

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,27 @@
server:
http_listen_port: 9080
grpc_listen_port: 0
positions:
filename: /tmp/positions.yaml
client:
url: http://loki:3100/api/prom/push
scrape_configs:
- job_name: system
entry_parser: raw
static_configs:
- targets:
- localhost
labels:
job: varlogs
__path__: /var/log/*log
- job_name: grafana
entry_parser: raw
static_configs:
- targets:
- localhost
labels:
job: grafana
__path__: /var/log/grafana/*log

View File

@@ -0,0 +1,14 @@
loki:
image: grafana/loki:master
ports:
- "3100:3100"
command: -config.file=/etc/loki/local-config.yaml
promtail:
image: grafana/promtail:master
volumes:
- ./docker/blocks/loki/config.yaml:/etc/promtail/docker-config.yaml
- /var/log:/var/log
- ../data/log:/var/log/grafana
command:
-config.file=/etc/promtail/docker-config.yaml

View File

@@ -0,0 +1,30 @@
# Fork of https://github.com/dinkel/docker-openldap
FROM debian:jessie
LABEL maintainer="Grafana team <hello@grafana.com>"
ENV OPENLDAP_VERSION 2.4.40
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
slapd=${OPENLDAP_VERSION}* \
ldap-utils && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
RUN mv /etc/ldap /etc/ldap.dist
EXPOSE 389
VOLUME ["/etc/ldap", "/var/lib/ldap"]
COPY admins-ldap-server/modules/ /etc/ldap.dist/modules
COPY admins-ldap-server/prepopulate/ /etc/ldap.dist/prepopulate
COPY ./entrypoint.sh /entrypoint.sh
COPY ./prepopulate.sh /prepopulate.sh
ENTRYPOINT ["/entrypoint.sh"]
CMD ["slapd", "-d", "32768", "-u", "openldap", "-g", "openldap"]

View File

@@ -0,0 +1,33 @@
dn: cn=module,cn=config
cn: module
objectClass: olcModuleList
objectClass: top
olcModulePath: /usr/lib/ldap
olcModuleLoad: memberof.la
dn: olcOverlay={0}memberof,olcDatabase={1}hdb,cn=config
objectClass: olcConfig
objectClass: olcMemberOf
objectClass: olcOverlayConfig
objectClass: top
olcOverlay: memberof
olcMemberOfDangling: ignore
olcMemberOfRefInt: TRUE
olcMemberOfGroupOC: groupOfNames
olcMemberOfMemberAD: member
olcMemberOfMemberOfAD: memberOf
dn: cn=module,cn=config
cn: module
objectClass: olcModuleList
objectClass: top
olcModulePath: /usr/lib/ldap
olcModuleLoad: refint.la
dn: olcOverlay={1}refint,olcDatabase={1}hdb,cn=config
objectClass: olcConfig
objectClass: olcOverlayConfig
objectClass: olcRefintConfig
objectClass: top
olcOverlay: {1}refint
olcRefintAttribute: memberof member manager owner

View File

@@ -0,0 +1,9 @@
dn: ou=groups,dc=grafana,dc=org
ou: Groups
objectclass: top
objectclass: organizationalUnit
dn: ou=users,dc=grafana,dc=org
ou: Users
objectclass: top
objectclass: organizationalUnit

View File

@@ -0,0 +1,20 @@
# ldap-admin
dn: cn=ldap-admin,ou=users,dc=grafana,dc=org
mail: ldap-admin@grafana.com
userPassword: grafana
objectClass: person
objectClass: top
objectClass: inetOrgPerson
objectClass: organizationalPerson
sn: ldap-admin
cn: ldap-admin
dn: cn=ldap-torkel,ou=users,dc=grafana,dc=org
mail: ldap-torkel@grafana.com
userPassword: grafana
objectClass: person
objectClass: top
objectClass: inetOrgPerson
objectClass: organizationalPerson
sn: ldap-torkel
cn: ldap-torkel

View File

@@ -0,0 +1,6 @@
dn: cn=admins,ou=groups,dc=grafana,dc=org
cn: admins
objectClass: groupOfNames
objectClass: top
member: cn=ldap-admin,ou=users,dc=grafana,dc=org
member: cn=ldap-torkel,ou=users,dc=grafana,dc=org

Some files were not shown because too many files have changed in this diff Show More